906 files changed, 35915 insertions, 67215 deletions

diff --git a/ChangeLog b/ChangeLog
index 182f422ba80..ead5e81e2cc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,63 @@
+Fri Aug 19 07:56:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        Merged changes from the AnyRefactor branch as below
+
+        Wed Aug 17 07:01:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/MakeProjectCreator/config/anytypecode.mpb:
+        * bin/MakeProjectCreator/config/taoclient.mpb:
+        * bin/MakeProjectCreator/config/taoidldefaults.mpb:
+          By default we now suppress Any and Typecode generation with -Sa
+          and -St but when the AnyTypeCode library is used, then these
+          options are removed from the idl flags. This way simple apps
+          don't get this lib by default
+
+        Tue Aug 16 19:00:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/config-win32-msvc-7.h:
+        * ace/config-win32-msvc-8.h:
+          Removed disabling of warning 4290
+
+        * ace/CORBA_macros.h:
+          Removed special ACE_THROW_RETURN for win32 and HP aCC, this
+          is not needed and only gives a lot of warnings at level 4
+          with msvc
+
+        Thu Aug 11 10:48:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/MakeProjectCreator/config/orbsvcsexe.mpb:
+          Added AnyTypeCode
+
+        Wed Aug 10 11:40:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/MakeProjectCreator/config/orbsvcslib.mpb:
+          Added AnyTypeCode as base project.
+
+        Wed Aug 10 09:34:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/MakeProjectCreator/config/valuetype.mpb:
+          Added AnyTypeCode as base project
+
+        Wed Aug 10 08:14:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/MakeProjectCreator/config/taoclient.mpb:
+          Just for short, added anytypecode to the client. This should really be
+          dependent on the idl compiler flags
+
+        Fri Jul 29 18:30:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/MakeProjectCreator/config/codecfactory.mpb
+        * bin/MakeProjectCreator/config/dynamicany.mpb
+        * bin/MakeProjectCreator/config/ifr_client.mpb
+        * bin/MakeProjectCreator/config/iormanip.mpb
+        * bin/MakeProjectCreator/config/strategies.mpb
+          Added AnyTypeCode as base project
+
+        Thu Jul 28 12:33:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * bin/MakeProjectCreator/config/anytypecode.mpb:
+          New base project
+
 Thu Aug 18 09:34:12 UTC 2005  Martin Corino  <mcorino@remedy.nl>
 
         * ace/Socket_Connect.cpp:
diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog
index c43a5367c73..219971bf649 100644
--- a/TAO/CIAO/ChangeLog
+++ b/TAO/CIAO/ChangeLog
@@ -1,3 +1,10 @@
+
+        * DAnCE/Config_Handlers/Any_Handler.cpp:
+        * DAnCE/Config_Handlers/DataType_Handler.cpp:
+        * DAnCE/Old_Config_Handlers/DT_Handler.cpp:
+        * DAnCE/ciao/ComponentsC.h:
+        * ciao/ComponentsC.h:
+          Updated for AnyTypeCode refactoring
 Tue Aug 16 15:16:10 2005  Nanbor Wang  <nanbor@exothermic.txcorp.com>
 
 	* docs/schema/CIAOServerResources.xsd: Changed to define most of
@@ -41,8 +48,8 @@ Mon Aug 15 12:03:43 2005  William Otte  <wotte@dre.vanderbilt.edu>
 	* DAnCE/Config_Handlers/test.cpp
 
 	Checked in support for IDL->XSC->XML mapping.  Thanks to Lucas
-	Seibert <heynonynony at yahoo dot com> for completing this work. 
-	
+	Seibert <heynonynony at yahoo dot com> for completing this work.
+
 Mon Aug 15 00:01:01 2005  Boris Kolpackov  <boris@kolpackov.net>
 
 	* CIDLC/cidlc.cpp: Made ErrorHandler auto-detach itself
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/Any_Handler.cpp b/TAO/CIAO/DAnCE/Config_Handlers/Any_Handler.cpp
index c9cf1821924..d351b324c9a 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/Any_Handler.cpp
+++ b/TAO/CIAO/DAnCE/Config_Handlers/Any_Handler.cpp
@@ -5,7 +5,7 @@
 #include "Any_Handler.h"
 #include "DataType_Handler.h"
 #include "Basic_Deployment_Data.hpp"
-#include "tao/Any.h"
+#include "tao/AnyTypeCode/Any.h"
 
 
 namespace CIAO
@@ -32,9 +32,9 @@ namespace CIAO
 
       if (value.short_p ())
         {
-          toconfig <<= 
+          toconfig <<=
             CORBA::Short (static_cast < ::XMLSchema::short_ const & > (value.short_ ()));
-          
+
           //  static_cast<CORBA::Short> (value.short_ ());
         }
       else if (value.ushort_p ())
@@ -56,12 +56,12 @@ namespace CIAO
         }
       else if (value.boolean_p ())
         {
-          toconfig <<= 
+          toconfig <<=
 	    CORBA::Any::from_boolean (static_cast < ::XMLSchema::boolean const& > (value.boolean ()));
         }
       else if (value.double_p ())
         {
-          toconfig <<= 
+          toconfig <<=
 #ifdef __BORLANDC__
             CORBA::Double (static_cast < double &> (value.double_ ()));
 #else
@@ -70,7 +70,7 @@ namespace CIAO
         }
       else if (value.float_p ())
         {
-          toconfig <<= 
+          toconfig <<=
 #ifdef __BORLANDC__
             CORBA::Float (static_cast < float & > (value.float_ ()));
 #else
diff --git a/TAO/CIAO/DAnCE/Config_Handlers/DataType_Handler.cpp b/TAO/CIAO/DAnCE/Config_Handlers/DataType_Handler.cpp
index 7072c71028b..562a5b4d4ca 100644
--- a/TAO/CIAO/DAnCE/Config_Handlers/DataType_Handler.cpp
+++ b/TAO/CIAO/DAnCE/Config_Handlers/DataType_Handler.cpp
@@ -1,7 +1,7 @@
 //$Id$
 
 #include "DataType_Handler.h"
-#include "tao/TypeCode.h"
+#include "tao/AnyTypeCode/TypeCode.h"
 
 namespace CIAO{
 
diff --git a/TAO/CIAO/DAnCE/Old_Config_Handlers/DT_Handler.cpp b/TAO/CIAO/DAnCE/Old_Config_Handlers/DT_Handler.cpp
index 3100a2b6bbb..b5515fa225c 100644
--- a/TAO/CIAO/DAnCE/Old_Config_Handlers/DT_Handler.cpp
+++ b/TAO/CIAO/DAnCE/Old_Config_Handlers/DT_Handler.cpp
@@ -2,7 +2,7 @@
 
 #include "DT_Handler.h"
 #include "Utils.h"
-#include "tao/TypeCode.h"
+#include "tao/AnyTypeCode/TypeCode.h"
 #include "ace/Auto_Ptr.h"
 #include "ace/OS_NS_string.h"
 
diff --git a/TAO/CIAO/DAnCE/ciao/ComponentsC.h b/TAO/CIAO/DAnCE/ciao/ComponentsC.h
index bce4b4ce63d..a1c75c61736 100644
--- a/TAO/CIAO/DAnCE/ciao/ComponentsC.h
+++ b/TAO/CIAO/DAnCE/ciao/ComponentsC.h
@@ -39,7 +39,7 @@
 
 #include "tao/CDR.h"
 #include "tao/Environment.h"
-#include "tao/TypeCode.h"
+#include "tao/AnyTypeCode/TypeCode.h"
 
 #include "CCM_ContainerC.h"
 
diff --git a/TAO/CIAO/ciao/ComponentsC.h b/TAO/CIAO/ciao/ComponentsC.h
index bce4b4ce63d..a1c75c61736 100644
--- a/TAO/CIAO/ciao/ComponentsC.h
+++ b/TAO/CIAO/ciao/ComponentsC.h
@@ -39,7 +39,7 @@
 
 #include "tao/CDR.h"
 #include "tao/Environment.h"
-#include "tao/TypeCode.h"
+#include "tao/AnyTypeCode/TypeCode.h"
 
 #include "CCM_ContainerC.h"
 
diff --git a/TAO/CIAO/tools/XML_Helpers/RTConfiguration.idl b/TAO/CIAO/tools/XML_Helpers/RTConfiguration.idl
index 263704c9d91..30d7c26f1f4 100644
--- a/TAO/CIAO/tools/XML_Helpers/RTConfiguration.idl
+++ b/TAO/CIAO/tools/XML_Helpers/RTConfiguration.idl
@@ -9,6 +9,7 @@
  */
 
 #include "tao/RTCORBA/RTCORBA_include.pidl"
+#include "tao/Policy_Forward.pidl"
 
 module CIAO
 {
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index c5a87f091f4..9ee390cb74c 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,2570 @@
+Fri Aug 19 07:56:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        Merged AnyRefactor branch, a lot of files where moved to the
+        AnyTypeCode directory. Regenerated all files in the repo, add
+        AnyTypeCode as base project for a lot of MPC files, zapped
+        explicit templates
+
+        * TAO_IDL/be/be_codegen.cpp
+        * TAO_IDL/be/be_global.cpp
+        * TAO_IDL/be/be_produce.cpp
+        * TAO_IDL/be/be_visitor_arg_traits.cpp
+        * TAO_IDL/be/be_visitor_context.cpp
+        * TAO_IDL/be/be_visitor_root.cpp
+        * TAO_IDL/be/be_visitor_argument/invoke_cs.cpp
+        * TAO_IDL/be/be_visitor_argument/marshal_ss.cpp
+        * TAO_IDL/be/be_visitor_argument/paramlist.cpp
+        * TAO_IDL/be/be_visitor_array/any_op_ch.cpp
+        * TAO_IDL/be/be_visitor_enum/any_op_ch.cpp
+        * TAO_IDL/be/be_visitor_exception/any_op_ch.cpp
+        * TAO_IDL/be/be_visitor_exception/exception_cs.cpp
+        * TAO_IDL/be/be_visitor_field/cdr_op_cs.cpp
+        * TAO_IDL/be/be_visitor_field/serializer_op_cs.cpp
+        * TAO_IDL/be/be_visitor_interface/any_op_ch.cpp
+        * TAO_IDL/be/be_visitor_interface/any_op_cs.cpp
+        * TAO_IDL/be/be_visitor_interface/interface_ch.cpp
+        * TAO_IDL/be/be_visitor_interface/interface_cs.cpp
+        * TAO_IDL/be/be_visitor_interface_fwd/any_op_ch.cpp
+        * TAO_IDL/be/be_visitor_module/module_ch.cpp
+        * TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_cs.cpp
+        * TAO_IDL/be/be_visitor_root/any_op.cpp
+        * TAO_IDL/be/be_visitor_root/root.cpp
+        * TAO_IDL/be/be_visitor_sequence/any_op_ch.cpp
+        * TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp
+        * TAO_IDL/be/be_visitor_sequence/serializer_op_cs.cpp
+        * TAO_IDL/be/be_visitor_structure/any_op_ch.cpp
+        * TAO_IDL/be/be_visitor_typecode/typecode_decl.cpp
+        * TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp
+        * TAO_IDL/be/be_visitor_union/any_op_ch.cpp
+        * TAO_IDL/be/be_visitor_union/cdr_op_cs.cpp
+        * TAO_IDL/be/be_visitor_union/serializer_op_cs.cpp
+        * TAO_IDL/be/be_visitor_union_branch/cdr_op_cs.cpp
+        * TAO_IDL/be/be_visitor_union_branch/serializer_op_cs.cpp
+        * TAO_IDL/be/be_visitor_valuebox/any_op_ch.cpp
+        * TAO_IDL/be/be_visitor_valuebox/valuebox_ci.cpp
+        * TAO_IDL/be/be_visitor_valuebox/valuebox_cs.cpp
+        * TAO_IDL/be/be_visitor_valuetype/any_op_ch.cpp
+        * TAO_IDL/be/be_visitor_valuetype/field_cdr_cs.cpp
+        * TAO_IDL/be/be_visitor_valuetype_fwd/any_op_ch.cpp
+        * TAO_IDL/be_include/be_codegen.h
+        * TAO_IDL/be_include/be_global.h
+        * TAO_IDL/be_include/be_visitor_arg_traits.h
+        * TAO_IDL/be_include/be_visitor_context.h
+        * TAO_IDL/be_include/be_visitor_root/root.h
+        * TAO_IDL/driver/drv_args.cpp
+        * docs/compiler.html
+        * docs/releasenotes/index.html
+        * examples/Buffered_AMI/client.cpp
+        * examples/Buffered_Oneways/client.cpp
+        * examples/Kokyu_dsrt_schedulers/FP_Scheduling.idl
+        * examples/Kokyu_dsrt_schedulers/Kokyu_qos.idl
+        * examples/Kokyu_dsrt_schedulers/MIF_Scheduling.idl
+        * examples/Kokyu_dsrt_schedulers/MUF_Scheduling.idl
+        * examples/POA/DSI/Database_i.cpp
+        * examples/POA/Default_Servant/POA_Default_Servant.mpc
+        * examples/POA/Forwarding/POA_Forwarding.mpc
+        * examples/POA/POA_BiDir/POA_BiDir.cpp
+        * examples/POA/TIE/POA_TIE.mpc
+        * examples/POA/TIE/client.cpp
+        * examples/POA/TIE/server.cpp
+        * examples/Simulator/NavWeap.idl
+        * examples/Simulator/Event_Supplier/Event_Con.cpp
+        * interop-tests/wchar/interop_wchar.mpc
+        * orbsvcs/IFR_Service/ifr_adding_visitor_union.cpp
+        * orbsvcs/PSS/PSDL_Code_Gen.cpp
+        * orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.cpp
+        * orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly.mpc
+        * orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly_i.cpp
+        * orbsvcs/examples/ORT/Gateway_i.cpp
+        * orbsvcs/orbsvcs/PortableGroup.mpc
+        * orbsvcs/orbsvcs/AV/AVStreams_i.cpp
+        * orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.h
+        * orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h
+        * orbsvcs/orbsvcs/ETCL/ETCL_Constraint.cpp
+        * orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp
+        * orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.cpp
+        * orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.h
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp
+        * orbsvcs/orbsvcs/HTIOP/htiop_endpointsC.cpp
+        * orbsvcs/orbsvcs/IFRService/ConstantDef_i.cpp
+        * orbsvcs/orbsvcs/IFRService/Container_i.cpp
+        * orbsvcs/orbsvcs/IFRService/IFR_BaseS.cpp
+        * orbsvcs/orbsvcs/IFRService/IFR_BaseS.h
+        * orbsvcs/orbsvcs/IFRService/IFR_BaseS.inl
+        * orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.cpp
+        * orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.h
+        * orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.inl
+        * orbsvcs/orbsvcs/IFRService/IFR_BasicS.cpp
+        * orbsvcs/orbsvcs/IFRService/IFR_BasicS.h
+        * orbsvcs/orbsvcs/IFRService/IFR_BasicS.inl
+        * orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.cpp
+        * orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.h
+        * orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.inl
+        * orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.cpp
+        * orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.h
+        * orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.inl
+        * orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.cpp
+        * orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.h
+        * orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.inl
+        * orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.cpp
+        * orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.h
+        * orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.inl
+        * orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.cpp
+        * orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.h
+        * orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.inl
+        * orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp
+        * orbsvcs/orbsvcs/IFRService/IRObject_i.cpp
+        * orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp
+        * orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp
+        * orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp
+        * orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.h
+        * orbsvcs/orbsvcs/Log/PersistStore.cpp
+        * orbsvcs/orbsvcs/Log/PersistStore.h
+        * orbsvcs/orbsvcs/Naming/Naming_Server.cpp
+        * orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp
+        * orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.h
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp
+        * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h
+        * orbsvcs/orbsvcs/SSLIOP/ssl_endpointsC.cpp
+        * orbsvcs/orbsvcs/Security/SL3_PolicyFactory.cpp
+        * orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp
+        * orbsvcs/orbsvcs/Trader/Interpreter_Utils.h
+        * orbsvcs/performance-tests/RTEvent/lib/SyncScope_Setup.cpp
+        * orbsvcs/tests/BiDir_CORBALOC/BiDirCORBALOC.mpc
+        * orbsvcs/tests/BiDir_CORBALOC/TimeServer.cpp
+        * orbsvcs/tests/Bug_1630_Regression/test.mpc
+        * orbsvcs/tests/Bug_1630_Regression/testclient.cpp
+        * orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/test.idl
+        * orbsvcs/tests/HTIOP/BiDirectional/client.cpp
+        * orbsvcs/tests/HTIOP/BiDirectional/server.cpp
+        * orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp
+        * orbsvcs/tests/Notify/Reconnecting/Consumer.cpp
+        * orbsvcs/tests/Security/BiDirectional/client.cpp
+        * orbsvcs/tests/Security/BiDirectional/server.cpp
+        * orbsvcs/tests/Security/Big_Request/Big_Request.mpc
+        * performance-tests/Anyop/Anyop.mpc
+        * performance-tests/Anyop/anyop.cpp
+        * performance-tests/Callback/client.cpp
+        * performance-tests/Callback/server.cpp
+        * performance-tests/Cubit/TAO/DII_Cubit/client.cpp
+        * performance-tests/Latency/DII/client.cpp
+        * performance-tests/Latency/DSI/Roundtrip.cpp
+        * performance-tests/Latency/Deferred/client.cpp
+        * performance-tests/RTCorba/Oneways/Reliable/client.cpp
+        * performance-tests/Sequence_Latency/DII/client.cpp
+        * performance-tests/Sequence_Latency/DSI/Roundtrip.cpp
+        * performance-tests/Sequence_Latency/Deferred/client.cpp
+        * tao/Arg_Traits_T.h
+        * tao/Argument.cpp
+        * tao/Argument.h
+        * tao/Array_VarOut_T.h
+        * tao/Array_VarOut_T.inl
+        * tao/Asynch_Queued_Message.h
+        * tao/BD_String_Argument_T.cpp
+        * tao/BD_String_Argument_T.h
+        * tao/BD_String_Argument_T.inl
+        * tao/Basic_Argument_T.cpp
+        * tao/Basic_Argument_T.h
+        * tao/Basic_Argument_T.inl
+        * tao/Basic_Arguments.h
+        * tao/BiDir_GIOP.mpc
+        * tao/Block_Flushing_Strategy.h
+        * tao/BooleanSeqC.cpp
+        * tao/BooleanSeqC.h
+        * tao/BooleanSeqS.h
+        * tao/Buffering_Constraint_Policy.cpp
+        * tao/Buffering_Constraint_Policy.h
+        * tao/CONV_FRAMEC.cpp
+        * tao/CONV_FRAMEC.h
+        * tao/CONV_FRAMES.h
+        * tao/CORBANAME_Parser.cpp
+        * tao/CORBA_methods.h
+        * tao/Cache_Entries.h
+        * tao/Cache_Entries.inl
+        * tao/CharSeqC.h
+        * tao/CodecFactory.mpc
+        * tao/CurrentC.cpp
+        * tao/CurrentC.h
+        * tao/CurrentS.h
+        * tao/Domain.mpc
+        * tao/DomainC.cpp
+        * tao/DomainC.h
+        * tao/DoubleSeqC.h
+        * tao/DynamicAny.mpc
+        * tao/DynamicInterface.mpc
+        * tao/Dynamic_Adapter.cpp
+        * tao/Exception.cpp
+        * tao/Exception.h
+        * tao/Fixed_Array_Argument_T.cpp
+        * tao/Fixed_Array_Argument_T.h
+        * tao/Fixed_Array_Argument_T.inl
+        * tao/Fixed_Size_Argument_T.cpp
+        * tao/Fixed_Size_Argument_T.h
+        * tao/Fixed_Size_Argument_T.inl
+        * tao/FloatSeqC.cpp
+        * tao/FloatSeqC.h
+        * tao/FloatSeqS.h
+        * tao/Flushing_Strategy.h
+        * tao/GIOPC.cpp
+        * tao/GIOPC.h
+        * tao/GIOPS.h
+        * tao/GIOP_Message_Generator_Parser_10.cpp
+        * tao/GIOP_Message_Generator_Parser_12.cpp
+        * tao/GIOP_Message_Lite.cpp
+        * tao/IFR_Client.mpc
+        * tao/IFR_Client_Adapter.h
+        * tao/IIOP.pidl
+        * tao/IIOPC.cpp
+        * tao/IIOPC.h
+        * tao/IIOP_Acceptor.cpp
+        * tao/IIOP_EndpointsC.h
+        * tao/IOPC.cpp
+        * tao/IOPC.h
+        * tao/IOPS.h
+        * tao/IOP_IORC.cpp
+        * tao/IOP_IORC.h
+        * tao/IOP_IORS.h
+        * tao/IORInterceptor.mpc
+        * tao/IORManipulation.mpc
+        * tao/IORTable.mpc
+        * tao/ImR_Client.mpc
+        * tao/Invocation_Adapter.h
+        * tao/Invocation_Base.cpp
+        * tao/Invocation_Base.h
+        * tao/Invocation_Base.inl
+        * tao/Leader_Follower_Flushing_Strategy.h
+        * tao/LongDoubleSeqC.h
+        * tao/LongLongSeqC.h
+        * tao/LongSeqC.h
+        * tao/Messaging.mpc
+        * tao/Messaging_PolicyValue.pidl
+        * tao/Messaging_PolicyValueC.h
+        * tao/ORB.cpp
+        * tao/ORB.h
+        * tao/ORBInitializer_Registry_Adapter.h
+        * tao/ORB_Core.cpp
+        * tao/ORB_Core.h
+        * tao/ORB_Core.i
+        * tao/ORB_Core_Auto_Ptr.h
+        * tao/ORB_Core_TSS_Resources.cpp
+        * tao/ORB_Core_TSS_Resources.h
+        * tao/ORB_Table.h
+        * tao/ObjRefTemplate.mpc
+        * tao/Object.cpp
+        * tao/Object.h
+        * tao/ObjectIdListC.h
+        * tao/Object_Argument_T.cpp
+        * tao/Object_Argument_T.h
+        * tao/Object_Argument_T.inl
+        * tao/Object_KeyC.cpp
+        * tao/OctetSeq.pidl
+        * tao/OctetSeqC.cpp
+        * tao/OctetSeqC.h
+        * tao/OctetSeqS.h
+        * tao/PI.mpc
+        * tao/PI_ForwardC.cpp
+        * tao/PI_ForwardC.h
+        * tao/PI_Server.mpc
+        * tao/ParameterModeC.h
+        * tao/PolicyC.cpp
+        * tao/PolicyC.h
+        * tao/Policy_Current.cpp
+        * tao/Policy_ForwardC.cpp
+        * tao/Policy_ForwardC.h
+        * tao/Policy_ForwardS.h
+        * tao/PortableInterceptor.pidl
+        * tao/PortableInterceptorC.cpp
+        * tao/PortableInterceptorC.h
+        * tao/PortableInterceptorS.h
+        * tao/PortableServer.mpc
+        * tao/Profile.h
+        * tao/Profile_Transport_Resolver.h
+        * tao/Protocols_Hooks.h
+        * tao/RTCORBA.mpc
+        * tao/RTPortableServer.mpc
+        * tao/RTScheduler.mpc
+        * tao/Reactive_Flushing_Strategy.h
+        * tao/Refcounted_ObjectKey.h
+        * tao/Remote_Object_Proxy_Broker.cpp
+        * tao/ServerRequestInterceptor_Adapter.h
+        * tao/Services.pidl
+        * tao/ServicesC.cpp
+        * tao/ServicesC.h
+        * tao/ServicesS.h
+        * tao/ShortSeqC.cpp
+        * tao/ShortSeqC.h
+        * tao/ShortSeqS.h
+        * tao/SmartProxies.mpc
+        * tao/Special_Basic_Argument_T.cpp
+        * tao/Special_Basic_Argument_T.h
+        * tao/Special_Basic_Argument_T.inl
+        * tao/Special_Basic_Arguments.h
+        * tao/Strategies.mpc
+        * tao/StringSeqC.cpp
+        * tao/StringSeqC.h
+        * tao/StringSeqS.h
+        * tao/Synch_Invocation.cpp
+        * tao/Synch_Invocation.h
+        * tao/Synch_Queued_Message.h
+        * tao/Synch_Reply_Dispatcher.h
+        * tao/SystemException.cpp
+        * tao/SystemException.h
+        * tao/TAOC.cpp
+        * tao/TAOC.h
+        * tao/TAOS.h
+        * tao/TAO_Server_Request.cpp
+        * tao/TAO_Server_Request.h
+        * tao/TAO_Server_Request.i
+        * tao/TSS_Resources.h
+        * tao/TimeBaseC.h
+        * tao/Transport.cpp
+        * tao/Transport.h
+        * tao/TypeCodeFactory.mpc
+        * tao/TypeCodeFactory_Adapter.cpp
+        * tao/TypeCodeFactory_Adapter.h
+        * tao/UB_String_Argument_T.cpp
+        * tao/UB_String_Argument_T.h
+        * tao/UB_String_Argument_T.inl
+        * tao/UB_String_Arguments.h
+        * tao/ULongLongSeqC.cpp
+        * tao/ULongLongSeqC.h
+        * tao/ULongLongSeqS.h
+        * tao/ULongSeqC.cpp
+        * tao/ULongSeqC.h
+        * tao/ULongSeqS.h
+        * tao/UShortSeqC.h
+        * tao/UserException.cpp
+        * tao/UserException.h
+        * tao/UserException.inl
+        * tao/Utils.mpc
+        * tao/Valuetype.mpc
+        * tao/Valuetype_Adapter.cpp
+        * tao/Var_Array_Argument_T.cpp
+        * tao/Var_Array_Argument_T.h
+        * tao/Var_Array_Argument_T.inl
+        * tao/Var_Size_Argument_T.cpp
+        * tao/Var_Size_Argument_T.h
+        * tao/Var_Size_Argument_T.inl
+        * tao/WCharSeqC.cpp
+        * tao/WCharSeqC.h
+        * tao/WCharSeqS.h
+        * tao/WStringSeqC.cpp
+        * tao/WStringSeqC.h
+        * tao/WStringSeqS.h
+        * tao/Wait_On_LF_No_Upcall.h
+        * tao/Wait_On_Leader_Follower.h
+        * tao/Wait_On_Reactor.h
+        * tao/Wait_On_Read.h
+        * tao/Wait_Strategy.h
+        * tao/WrongTransactionC.cpp
+        * tao/WrongTransactionC.h
+        * tao/corba.h
+        * tao/corbafwd.h
+        * tao/extra_core.mpb
+        * tao/operation_details.cpp
+        * tao/operation_details.h
+        * tao/operation_details.i
+        * tao/orb.idl
+        * tao/orb_typesC.cpp
+        * tao/orb_typesC.h
+        * tao/orb_typesS.h
+        * tao/params.h
+        * tao/tao.mpc
+        * tao/BiDir_GIOP/BiDir_PolicyFactory.cpp
+        * tao/CodecFactory/CDR_Encaps_Codec.cpp
+        * tao/CodecFactory/IOP_CodecA.cpp
+        * tao/CodecFactory/IOP_CodecC.h
+        * tao/Domain/DomainS.cpp
+        * tao/DynamicAny/DynAny_i.cpp
+        * tao/DynamicAny/DynArray_i.cpp
+        * tao/DynamicAny/DynCommon.cpp
+        * tao/DynamicAny/DynEnum_i.cpp
+        * tao/DynamicAny/DynSequence_i.cpp
+        * tao/DynamicAny/DynStruct_i.cpp
+        * tao/DynamicAny/DynUnion_i.cpp
+        * tao/DynamicAny/DynamicAnyC.h
+        * tao/DynamicInterface/Context.cpp
+        * tao/DynamicInterface/DII_Arguments.cpp
+        * tao/DynamicInterface/DII_Arguments.h
+        * tao/DynamicInterface/DII_Invocation.cpp
+        * tao/DynamicInterface/Dynamic_Implementation.cpp
+        * tao/DynamicInterface/Dynamic_Implementation.h
+        * tao/DynamicInterface/ExceptionList.cpp
+        * tao/DynamicInterface/Request.cpp
+        * tao/DynamicInterface/Request.h
+        * tao/DynamicInterface/Server_Request.cpp
+        * tao/DynamicInterface/Unknown_User_Exception.cpp
+        * tao/DynamicInterface/Unknown_User_Exception.h
+        * tao/IFR_Client/IFR_Base.pidl
+        * tao/IFR_Client/IFR_BaseC.cpp
+        * tao/IFR_Client/IFR_BaseC.h
+        * tao/IFR_Client/IFR_BaseC.inl
+        * tao/IFR_Client/IFR_BaseS.h
+        * tao/IFR_Client/IFR_Basic.pidl
+        * tao/IFR_Client/IFR_BasicC.cpp
+        * tao/IFR_Client/IFR_BasicC.h
+        * tao/IFR_Client/IFR_BasicC.inl
+        * tao/IFR_Client/IFR_Client_Adapter_Impl.cpp
+        * tao/IFR_Client/IFR_Client_Adapter_Impl.h
+        * tao/IFR_Client/IFR_Components.pidl
+        * tao/IFR_Client/IFR_ComponentsC.cpp
+        * tao/IFR_Client/IFR_ComponentsC.h
+        * tao/IFR_Client/IFR_ComponentsC.inl
+        * tao/IFR_Client/IFR_Extended.pidl
+        * tao/IFR_Client/IFR_ExtendedC.cpp
+        * tao/IFR_Client/IFR_ExtendedC.h
+        * tao/IFR_Client/IFR_ExtendedC.inl
+        * tao/IORInterceptor/IORInfoC.cpp
+        * tao/IORManipulation/IORA.cpp
+        * tao/ImR_Client/ImplRepo.pidl
+        * tao/ImR_Client/ImplRepoA.cpp
+        * tao/ImR_Client/ImplRepoC.cpp
+        * tao/ImR_Client/ImplRepoS.cpp
+        * tao/ImR_Client/ServerObjectA.cpp
+        * tao/ImR_Client/ServerObjectS.cpp
+        * tao/Messaging/Connection_Timeout_Policy_i.cpp
+        * tao/Messaging/Messaging.cpp
+        * tao/Messaging/MessagingA.cpp
+        * tao/Messaging/MessagingC.cpp
+        * tao/Messaging/MessagingS.cpp
+        * tao/Messaging/Messaging_No_ImplA.cpp
+        * tao/Messaging/Messaging_PolicyFactory.cpp
+        * tao/Messaging/Messaging_PolicyFactory.h
+        * tao/Messaging/Messaging_Policy_i.cpp
+        * tao/Messaging/Messaging_RT_PolicyA.cpp
+        * tao/Messaging/Messaging_SyncScope_PolicyA.cpp
+        * tao/Messaging/PollableC.cpp
+        * tao/Messaging/TAO_ExtA.cpp
+        * tao/ObjRefTemplate/Default_ORTA.cpp
+        * tao/ObjRefTemplate/ObjectReferenceTemplateA.cpp
+        * tao/ObjRefTemplate/ObjectReferenceTemplateC.cpp
+        * tao/PI/ClientRequestInfo.cpp
+        * tao/PI/ClientRequestInfo.h
+        * tao/PI/ClientRequestInfoA.cpp
+        * tao/PI/ClientRequestInfoC.h
+        * tao/PI/ClientRequestInterceptorA.cpp
+        * tao/PI/InterceptorA.cpp
+        * tao/PI/ORBInitInfo.cpp
+        * tao/PI/ORBInitInfoA.cpp
+        * tao/PI/ORBInitializerA.cpp
+        * tao/PI/ORBInitializer_Registry_Impl.cpp
+        * tao/PI/ORBInitializer_Registry_Impl.h
+        * tao/PI/PI.h
+        * tao/PI/PIForwardRequestA.cpp
+        * tao/PI/PolicyFactoryA.cpp
+        * tao/PI/PolicyFactoryC.h
+        * tao/PI/RequestInfo.pidl
+        * tao/PI/RequestInfoA.cpp
+        * tao/PI/RequestInfoC.h
+        * tao/PI_Server/POA_Current.cpp
+        * tao/PI_Server/PS_CurrentA.cpp
+        * tao/PI_Server/ServerInterceptorAdapter.cpp
+        * tao/PI_Server/ServerInterceptorAdapter.h
+        * tao/PI_Server/ServerRequestInfo.cpp
+        * tao/PI_Server/ServerRequestInfoA.cpp
+        * tao/PI_Server/ServerRequestInfoC.h
+        * tao/PI_Server/ServerRequestInterceptorA.cpp
+        * tao/PortableServer/AdapterActivatorA.cpp
+        * tao/PortableServer/AdapterActivatorC.cpp
+        * tao/PortableServer/AdapterActivatorC.h
+        * tao/PortableServer/Any_SArg_Traits.h
+        * tao/PortableServer/BD_String_SArgument_T.cpp
+        * tao/PortableServer/BD_String_SArgument_T.h
+        * tao/PortableServer/BD_String_SArgument_T.inl
+        * tao/PortableServer/Basic_SArgument_T.cpp
+        * tao/PortableServer/Basic_SArgument_T.h
+        * tao/PortableServer/Basic_SArgument_T.inl
+        * tao/PortableServer/Basic_SArguments.h
+        * tao/PortableServer/Fixed_Array_SArgument_T.cpp
+        * tao/PortableServer/Fixed_Array_SArgument_T.h
+        * tao/PortableServer/Fixed_Array_SArgument_T.inl
+        * tao/PortableServer/Fixed_Size_SArgument_T.cpp
+        * tao/PortableServer/Fixed_Size_SArgument_T.h
+        * tao/PortableServer/Fixed_Size_SArgument_T.inl
+        * tao/PortableServer/ForwardRequestA.cpp
+        * tao/PortableServer/ForwardRequestC.cpp
+        * tao/PortableServer/ForwardRequestC.h
+        * tao/PortableServer/IdAssignmentPolicyA.cpp
+        * tao/PortableServer/IdAssignmentPolicyC.cpp
+        * tao/PortableServer/IdAssignmentPolicyC.h
+        * tao/PortableServer/IdUniquenessPolicyA.cpp
+        * tao/PortableServer/IdUniquenessPolicyC.cpp
+        * tao/PortableServer/IdUniquenessPolicyC.h
+        * tao/PortableServer/ImplicitActivationPolicyA.cpp
+        * tao/PortableServer/ImplicitActivationPolicyC.cpp
+        * tao/PortableServer/ImplicitActivationPolicyC.h
+        * tao/PortableServer/LifespanPolicyA.cpp
+        * tao/PortableServer/LifespanPolicyC.cpp
+        * tao/PortableServer/LifespanPolicyC.h
+        * tao/PortableServer/Object_SArg_Traits.h
+        * tao/PortableServer/Object_SArgument_T.cpp
+        * tao/PortableServer/Object_SArgument_T.h
+        * tao/PortableServer/Object_SArgument_T.inl
+        * tao/PortableServer/POAManagerC.cpp
+        * tao/PortableServer/POAManagerC.h
+        * tao/PortableServer/POA_Current_Impl.cpp
+        * tao/PortableServer/PS_ForwardA.cpp
+        * tao/PortableServer/PS_ForwardC.cpp
+        * tao/PortableServer/PS_ForwardC.h
+        * tao/PortableServer/PolicyS.cpp
+        * tao/PortableServer/PortableServer.h
+        * tao/PortableServer/PortableServerA.cpp
+        * tao/PortableServer/PortableServerC.cpp
+        * tao/PortableServer/PortableServerC.h
+        * tao/PortableServer/PortableServerS.h
+        * tao/PortableServer/PortableServer_includeC.h
+        * tao/PortableServer/PortableServer_includeS.h
+        * tao/PortableServer/RequestProcessingPolicyA.cpp
+        * tao/PortableServer/RequestProcessingPolicyC.cpp
+        * tao/PortableServer/RequestProcessingPolicyC.h
+        * tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp
+        * tao/PortableServer/Root_POA.cpp
+        * tao/PortableServer/ServantActivatorA.cpp
+        * tao/PortableServer/ServantActivatorC.cpp
+        * tao/PortableServer/ServantActivatorC.h
+        * tao/PortableServer/ServantLocatorA.cpp
+        * tao/PortableServer/ServantLocatorC.cpp
+        * tao/PortableServer/ServantLocatorC.h
+        * tao/PortableServer/ServantManagerA.cpp
+        * tao/PortableServer/ServantManagerC.cpp
+        * tao/PortableServer/ServantManagerC.h
+        * tao/PortableServer/ServantRetentionPolicyA.cpp
+        * tao/PortableServer/ServantRetentionPolicyC.cpp
+        * tao/PortableServer/ServantRetentionPolicyC.h
+        * tao/PortableServer/Servant_Base.cpp
+        * tao/PortableServer/Special_Basic_SArgument_T.cpp
+        * tao/PortableServer/Special_Basic_SArgument_T.h
+        * tao/PortableServer/Special_Basic_SArgument_T.inl
+        * tao/PortableServer/Special_Basic_SArguments.h
+        * tao/PortableServer/ThreadPolicyA.cpp
+        * tao/PortableServer/ThreadPolicyC.cpp
+        * tao/PortableServer/ThreadPolicyC.h
+        * tao/PortableServer/TypeCode_SArg_Traits.h
+        * tao/PortableServer/UB_String_SArgument_T.cpp
+        * tao/PortableServer/UB_String_SArgument_T.h
+        * tao/PortableServer/UB_String_SArguments.h
+        * tao/PortableServer/Upcall_Wrapper.cpp
+        * tao/PortableServer/Var_Array_SArgument_T.cpp
+        * tao/PortableServer/Var_Array_SArgument_T.h
+        * tao/PortableServer/Var_Array_SArgument_T.inl
+        * tao/PortableServer/Var_Size_SArgument_T.cpp
+        * tao/PortableServer/Var_Size_SArgument_T.h
+        * tao/PortableServer/Var_Size_SArgument_T.inl
+        * tao/RTCORBA/RTCORBAA.cpp
+        * tao/RTCORBA/RT_Policy_i.cpp
+        * tao/RTCORBA/RT_Thread_Lane_Resources_Manager.cpp
+        * tao/RTPortableServer/RTPortableServerA.cpp
+        * tao/RTScheduling/Current.cpp
+        * tao/RTScheduling/RTSchedulerA.cpp
+        * tao/RTScheduling/RTSchedulerC.cpp
+        * tao/RTScheduling/Request_Interceptor.cpp
+        * tao/Strategies/sciop_endpointsC.cpp
+        * tao/Strategies/uiop_endpointsC.cpp
+        * tao/TypeCodeFactory/Recursive_TypeCode.h
+        * tao/TypeCodeFactory/TypeCodeFactoryA.cpp
+        * tao/TypeCodeFactory/TypeCodeFactoryC.h
+        * tao/TypeCodeFactory/TypeCodeFactory_i.cpp
+        * tao/Valuetype/AbstractBase.h
+        * tao/Valuetype/StringValueC.cpp
+        * tao/Valuetype/ValueBase.cpp
+        * tao/Valuetype/ValueBase.h
+        * tests/AMI_Buffering/AMI_Buffering.mpc
+        * tests/AMI_Buffering/client.cpp
+        * tests/AMI_Timeouts/AMI_Timeouts.mpc
+        * tests/AMI_Timeouts/timeout_client.cpp
+        * tests/Any/Recursive/RecursiveHello.mpc
+        * tests/BiDirectional/BiDirectional.mpc
+        * tests/BiDirectional/client.cpp
+        * tests/BiDirectional/server.cpp
+        * tests/BiDirectional_MultipleORB/destroy.cpp
+        * tests/BiDirectional_MultipleORB/destroy.mpc
+        * tests/BiDirectional_NestedUpcall/client.cpp
+        * tests/BiDirectional_NestedUpcall/server.cpp
+        * tests/Big_Reply/Big_Reply.mpc
+        * tests/Big_Request_Muxing/Client_Task.cpp
+        * tests/Blocking_Sync_None/client.cpp
+        * tests/Bug_1020_Basic_Regression/client.cpp
+        * tests/Bug_1020_Regression/client.cpp
+        * tests/Bug_1269_Regression/client.cpp
+        * tests/Bug_1270_Regression/client.cpp
+        * tests/Bug_1361_Regression/client.cpp
+        * tests/Bug_1476_Regression/Client_Task.cpp
+        * tests/Bug_1476_Regression/client.cpp
+        * tests/Bug_1482_Regression/client.cpp
+        * tests/Bug_1551_Regression/client.cpp
+        * tests/Bug_1627_Regression/test.mpc
+        * tests/Bug_2174_Regression/Bug_2174_Regression.mpc
+        * tests/Bug_2183_Regression/Bug_2183_Regression.mpc
+        * tests/CDR/CDR.mpc
+        * tests/CDR/basic_types.cpp
+        * tests/CDR/tc.cpp
+        * tests/Client_Leaks/Client_Leaks.mpc
+        * tests/CodeSets/simple/CodeSets_simple.mpc
+        * tests/Collocation/Collocation.mpc
+        * tests/Collocation_Oneway_Tests/Client_Task.cpp
+        * tests/Connection_Timeout/client.cpp
+        * tests/Crashed_Callback/client.cpp
+        * tests/Crashed_Callback/server.cpp
+        * tests/DLL_ORB/DLL_ORB.mpc
+        * tests/DynAny_Test/data.cpp
+        * tests/DynAny_Test/data.h
+        * tests/File_IO/File_IO.mpc
+        * tests/Forwarding/Forwarding.mpc
+        * tests/Hello/Hello.mpc
+        * tests/IDL_Test/IDL_Test.mpc
+        * tests/IDL_Test/main.cpp
+        * tests/InterOp-Naming/InterOp-Naming.mpc
+        * tests/MProfile_Connection_Timeout/client.cpp
+        * tests/MProfile_Forwarding/MProfile_Forwarding.mpc
+        * tests/MT_BiDir/client.cpp
+        * tests/MT_BiDir/server.cpp
+        * tests/MT_Client/MT_Client.mpc
+        * tests/MT_Server/MT_Server.mpc
+        * tests/MT_Timeout/Client_Task.cpp
+        * tests/Muxing/Muxing.mpc
+        * tests/Native_Exceptions/Native_Exceptions.mpc
+        * tests/Nested_Upcall_Crash/client.cpp
+        * tests/Nested_Upcall_Crash/scavenger.cpp
+        * tests/Nested_Upcall_Crash/server.cpp
+        * tests/No_Server_MT_Connect_Test/No_Server_Connect_Test.mpc
+        * tests/ORT/ORT.mpc
+        * tests/Objref_Sequence_Test/Objref_Sequence_Test.mpc
+        * tests/OctetSeq/OctetSeq.mpc
+        * tests/Oneway_Buffering/client.cpp
+        * tests/POA/Current/Current.mpc
+        * tests/POA/MT_Servant_Locator/MT_Servant_Locator.cpp
+        * tests/POA/Policies/Policies.cpp
+        * tests/Param_Test/Param_Test.mpc
+        * tests/Param_Test/param_test.idl
+        * tests/Policies/Manipulation.cpp
+        * tests/Portable_Interceptors/Benchmark/client_interceptors.cpp
+        * tests/Portable_Interceptors/Benchmark/server_interceptors.cpp
+        * tests/Portable_Interceptors/Collocated/Dynamic/interceptors.cpp
+        * tests/Portable_Interceptors/Dynamic/client_interceptor.cpp
+        * tests/Portable_Interceptors/Dynamic/server_interceptor.cpp
+        * tests/Portable_Interceptors/ForwardRequest/test.idl
+        * tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.cpp
+        * tests/Portable_Interceptors/IORInterceptor/PI_IORInterceptor.mpc
+        * tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.h
+        * tests/Portable_Interceptors/PICurrent/client.cpp
+        * tests/Portable_Interceptors/PICurrent/test_i.h
+        * tests/Portable_Interceptors/PolicyFactory/PolicyFactory.cpp
+        * tests/Portable_Interceptors/Request_Interceptor_Flow/Client_Request_Interceptor.cpp
+        * tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.cpp
+        * tests/RTCORBA/Persistent_IOR/RTCORBA_Persistent_IOR.mpc
+        * tests/RTCORBA/Policies/Policies.cpp
+        * tests/Reliable_Oneways/client.cpp
+        * tests/Server_Leaks/Server_Leaks.mpc
+        * tests/Stack_Recursion/Stack_Recursion.mpc
+        * tests/Timed_Buffered_Oneways/client.cpp
+        * tests/Timeout/client.cpp
+        * tests/Two_Objects/Two_Objects.mpc
+        * tests/Typedef_String_Array/typedef_string_array.mpc
+        * tests/UNKNOWN_Exception/UNKNOWN_Exception.mpc
+        * utils/catior/catior.cpp
+          Updated these files because of the AnyTypeCode refactoring
+
+        * tao/AnyTypeCode/Alias_TypeCode.cpp
+        * tao/AnyTypeCode/Alias_TypeCode.h
+        * tao/AnyTypeCode/Alias_TypeCode.inl
+        * tao/AnyTypeCode/Alias_TypeCode_Static.cpp
+        * tao/AnyTypeCode/Alias_TypeCode_Static.h
+        * tao/AnyTypeCode/Alias_TypeCode_Static.inl
+        * tao/AnyTypeCode/Any.cpp
+        * tao/AnyTypeCode/Any.h
+        * tao/AnyTypeCode/Any.inl
+        * tao/AnyTypeCode/AnySeq.pidl
+        * tao/AnyTypeCode/AnySeqA.cpp
+        * tao/AnyTypeCode/AnySeqA.h
+        * tao/AnyTypeCode/AnySeqC.cpp
+        * tao/AnyTypeCode/AnySeqC.h
+        * tao/AnyTypeCode/AnySeqS.h
+        * tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.cpp
+        * tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.h
+        * tao/AnyTypeCode/AnyTypeCode_methods.h
+        * tao/AnyTypeCode/Any_Arg_Traits.h
+        * tao/AnyTypeCode/Any_Array_Impl_T.cpp
+        * tao/AnyTypeCode/Any_Array_Impl_T.h
+        * tao/AnyTypeCode/Any_Array_Impl_T.inl
+        * tao/AnyTypeCode/Any_Basic_Impl.cpp
+        * tao/AnyTypeCode/Any_Basic_Impl.h
+        * tao/AnyTypeCode/Any_Basic_Impl_T.cpp
+        * tao/AnyTypeCode/Any_Basic_Impl_T.h
+        * tao/AnyTypeCode/Any_Basic_Impl_T.inl
+        * tao/AnyTypeCode/Any_Dual_Impl_T.cpp
+        * tao/AnyTypeCode/Any_Dual_Impl_T.h
+        * tao/AnyTypeCode/Any_Dual_Impl_T.inl
+        * tao/AnyTypeCode/Any_Impl.cpp
+        * tao/AnyTypeCode/Any_Impl.h
+        * tao/AnyTypeCode/Any_Impl_T.cpp
+        * tao/AnyTypeCode/Any_Impl_T.h
+        * tao/AnyTypeCode/Any_Impl_T.inl
+        * tao/AnyTypeCode/Any_Special_Impl_T.cpp
+        * tao/AnyTypeCode/Any_Special_Impl_T.h
+        * tao/AnyTypeCode/Any_Special_Impl_T.inl
+        * tao/AnyTypeCode/Any_SystemException.cpp
+        * tao/AnyTypeCode/Any_SystemException.h
+        * tao/AnyTypeCode/Any_Unknown_IDL_Type.cpp
+        * tao/AnyTypeCode/Any_Unknown_IDL_Type.h
+        * tao/AnyTypeCode/BooleanSeqA.cpp
+        * tao/AnyTypeCode/BooleanSeqA.h
+        * tao/AnyTypeCode/Bounds.pidl
+        * tao/AnyTypeCode/BoundsA.cpp
+        * tao/AnyTypeCode/BoundsA.h
+        * tao/AnyTypeCode/BoundsC.cpp
+        * tao/AnyTypeCode/BoundsC.h
+        * tao/AnyTypeCode/CONV_FRAMEA.cpp
+        * tao/AnyTypeCode/CONV_FRAMEA.h
+        * tao/AnyTypeCode/CharSeqA.cpp
+        * tao/AnyTypeCode/CharSeqA.h
+        * tao/AnyTypeCode/CurrentA.cpp
+        * tao/AnyTypeCode/CurrentA.h
+        * tao/AnyTypeCode/DomainA.cpp
+        * tao/AnyTypeCode/DomainA.h
+        * tao/AnyTypeCode/DoubleSeqA.cpp
+        * tao/AnyTypeCode/DoubleSeqA.h
+        * tao/AnyTypeCode/Dynamic.pidl
+        * tao/AnyTypeCode/DynamicA.cpp
+        * tao/AnyTypeCode/DynamicA.h
+        * tao/AnyTypeCode/DynamicC.cpp
+        * tao/AnyTypeCode/DynamicC.h
+        * tao/AnyTypeCode/DynamicS.h
+        * tao/AnyTypeCode/Dynamic_Parameter.pidl
+        * tao/AnyTypeCode/Dynamic_ParameterA.cpp
+        * tao/AnyTypeCode/Dynamic_ParameterA.h
+        * tao/AnyTypeCode/Dynamic_ParameterC.cpp
+        * tao/AnyTypeCode/Dynamic_ParameterC.h
+        * tao/AnyTypeCode/Empty_Param_TypeCode.cpp
+        * tao/AnyTypeCode/Empty_Param_TypeCode.h
+        * tao/AnyTypeCode/Empty_Param_TypeCode.inl
+        * tao/AnyTypeCode/Enum_TypeCode.cpp
+        * tao/AnyTypeCode/Enum_TypeCode.h
+        * tao/AnyTypeCode/Enum_TypeCode.inl
+        * tao/AnyTypeCode/Enum_TypeCode_Static.cpp
+        * tao/AnyTypeCode/Enum_TypeCode_Static.h
+        * tao/AnyTypeCode/Enum_TypeCode_Static.inl
+        * tao/AnyTypeCode/ExceptionA.cpp
+        * tao/AnyTypeCode/ExceptionA.h
+        * tao/AnyTypeCode/Fixed_TypeCode.cpp
+        * tao/AnyTypeCode/Fixed_TypeCode.h
+        * tao/AnyTypeCode/Fixed_TypeCode.inl
+        * tao/AnyTypeCode/FloatSeqA.cpp
+        * tao/AnyTypeCode/FloatSeqA.h
+        * tao/AnyTypeCode/GIOPA.cpp
+        * tao/AnyTypeCode/GIOPA.h
+        * tao/AnyTypeCode/IIOPA.cpp
+        * tao/AnyTypeCode/IIOPA.h
+        * tao/AnyTypeCode/IIOP_EndpointsA.cpp
+        * tao/AnyTypeCode/IIOP_EndpointsA.h
+        * tao/AnyTypeCode/IOPA.cpp
+        * tao/AnyTypeCode/IOPA.h
+        * tao/AnyTypeCode/IOP_IORA.cpp
+        * tao/AnyTypeCode/IOP_IORA.h
+        * tao/AnyTypeCode/LongDoubleSeqA.cpp
+        * tao/AnyTypeCode/LongDoubleSeqA.h
+        * tao/AnyTypeCode/LongLongSeqA.cpp
+        * tao/AnyTypeCode/LongLongSeqA.h
+        * tao/AnyTypeCode/LongSeqA.cpp
+        * tao/AnyTypeCode/LongSeqA.h
+        * tao/AnyTypeCode/Marshal.cpp
+        * tao/AnyTypeCode/Marshal.h
+        * tao/AnyTypeCode/Marshal.inl
+        * tao/AnyTypeCode/Messaging_PolicyValueA.cpp
+        * tao/AnyTypeCode/Messaging_PolicyValueA.h
+        * tao/AnyTypeCode/Messaging_SyncScopeA.h
+        * tao/AnyTypeCode/NVList.cpp
+        * tao/AnyTypeCode/NVList.h
+        * tao/AnyTypeCode/NVList.inl
+        * tao/AnyTypeCode/NVList_Adapter_Impl.cpp
+        * tao/AnyTypeCode/NVList_Adapter_Impl.h
+        * tao/AnyTypeCode/Null_RefCount_Policy.h
+        * tao/AnyTypeCode/ObjectIdListA.cpp
+        * tao/AnyTypeCode/ObjectIdListA.h
+        * tao/AnyTypeCode/Objref_TypeCode.cpp
+        * tao/AnyTypeCode/Objref_TypeCode.h
+        * tao/AnyTypeCode/Objref_TypeCode.inl
+        * tao/AnyTypeCode/Objref_TypeCode_Static.cpp
+        * tao/AnyTypeCode/Objref_TypeCode_Static.h
+        * tao/AnyTypeCode/Objref_TypeCode_Static.inl
+        * tao/AnyTypeCode/OctetSeqA.cpp
+        * tao/AnyTypeCode/OctetSeqA.h
+        * tao/AnyTypeCode/PI_ForwardA.cpp
+        * tao/AnyTypeCode/PI_ForwardA.h
+        * tao/AnyTypeCode/ParameterModeA.cpp
+        * tao/AnyTypeCode/ParameterModeA.h
+        * tao/AnyTypeCode/PolicyA.cpp
+        * tao/AnyTypeCode/PolicyA.h
+        * tao/AnyTypeCode/Policy_ForwardA.cpp
+        * tao/AnyTypeCode/Policy_ForwardA.h
+        * tao/AnyTypeCode/PortableInterceptorA.cpp
+        * tao/AnyTypeCode/PortableInterceptorA.h
+        * tao/AnyTypeCode/Recursive_Type_TypeCode.cpp
+        * tao/AnyTypeCode/Recursive_Type_TypeCode.h
+        * tao/AnyTypeCode/Recursive_Type_TypeCode.inl
+        * tao/AnyTypeCode/RefCount_Policy_Traits.h
+        * tao/AnyTypeCode/Sequence_TypeCode.cpp
+        * tao/AnyTypeCode/Sequence_TypeCode.h
+        * tao/AnyTypeCode/Sequence_TypeCode.inl
+        * tao/AnyTypeCode/Sequence_TypeCode_Static.cpp
+        * tao/AnyTypeCode/Sequence_TypeCode_Static.h
+        * tao/AnyTypeCode/Sequence_TypeCode_Static.inl
+        * tao/AnyTypeCode/ServicesA.cpp
+        * tao/AnyTypeCode/ServicesA.h
+        * tao/AnyTypeCode/ShortSeqA.cpp
+        * tao/AnyTypeCode/ShortSeqA.h
+        * tao/AnyTypeCode/StringSeqA.cpp
+        * tao/AnyTypeCode/StringSeqA.h
+        * tao/AnyTypeCode/String_TypeCode.cpp
+        * tao/AnyTypeCode/String_TypeCode.h
+        * tao/AnyTypeCode/String_TypeCode.inl
+        * tao/AnyTypeCode/String_TypeCode_Static.cpp
+        * tao/AnyTypeCode/String_TypeCode_Static.h
+        * tao/AnyTypeCode/String_TypeCode_Static.inl
+        * tao/AnyTypeCode/String_TypeCode_Traits.h
+        * tao/AnyTypeCode/Struct_TypeCode.cpp
+        * tao/AnyTypeCode/Struct_TypeCode.h
+        * tao/AnyTypeCode/Struct_TypeCode.inl
+        * tao/AnyTypeCode/Struct_TypeCode_Static.cpp
+        * tao/AnyTypeCode/Struct_TypeCode_Static.h
+        * tao/AnyTypeCode/Struct_TypeCode_Static.inl
+        * tao/AnyTypeCode/SystemExceptionA.cpp
+        * tao/AnyTypeCode/SystemExceptionA.h
+        * tao/AnyTypeCode/TAOA.cpp
+        * tao/AnyTypeCode/TAOA.h
+        * tao/AnyTypeCode/TAO_AnyTypeCode_Export.h
+        * tao/AnyTypeCode/TC_Constants_Forward.h
+        * tao/AnyTypeCode/TimeBaseA.cpp
+        * tao/AnyTypeCode/TimeBaseA.h
+        * tao/AnyTypeCode/True_RefCount_Policy.cpp
+        * tao/AnyTypeCode/True_RefCount_Policy.h
+        * tao/AnyTypeCode/True_RefCount_Policy.inl
+        * tao/AnyTypeCode/TypeCode.cpp
+        * tao/AnyTypeCode/TypeCode.h
+        * tao/AnyTypeCode/TypeCode.inl
+        * tao/AnyTypeCode/TypeCodeA.cpp
+        * tao/AnyTypeCode/TypeCode_Base_Attributes.cpp
+        * tao/AnyTypeCode/TypeCode_Base_Attributes.h
+        * tao/AnyTypeCode/TypeCode_Base_Attributes.inl
+        * tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp
+        * tao/AnyTypeCode/TypeCode_CDR_Extraction.h
+        * tao/AnyTypeCode/TypeCode_Case_Base_T.cpp
+        * tao/AnyTypeCode/TypeCode_Case_Base_T.h
+        * tao/AnyTypeCode/TypeCode_Case_Base_T.inl
+        * tao/AnyTypeCode/TypeCode_Case_T.cpp
+        * tao/AnyTypeCode/TypeCode_Case_T.h
+        * tao/AnyTypeCode/TypeCode_Case_T.inl
+        * tao/AnyTypeCode/TypeCode_Constants.cpp
+        * tao/AnyTypeCode/TypeCode_Constants.h
+        * tao/AnyTypeCode/TypeCode_Struct_Field.h
+        * tao/AnyTypeCode/TypeCode_Traits.h
+        * tao/AnyTypeCode/TypeCode_Value_Field.h
+        * tao/AnyTypeCode/Typecode_typesA.h
+        * tao/AnyTypeCode/ULongLongSeqA.cpp
+        * tao/AnyTypeCode/ULongLongSeqA.h
+        * tao/AnyTypeCode/ULongSeqA.cpp
+        * tao/AnyTypeCode/ULongSeqA.h
+        * tao/AnyTypeCode/UShortSeqA.cpp
+        * tao/AnyTypeCode/UShortSeqA.h
+        * tao/AnyTypeCode/Union_TypeCode.cpp
+        * tao/AnyTypeCode/Union_TypeCode.h
+        * tao/AnyTypeCode/Union_TypeCode.inl
+        * tao/AnyTypeCode/Union_TypeCode_Static.cpp
+        * tao/AnyTypeCode/Union_TypeCode_Static.h
+        * tao/AnyTypeCode/Union_TypeCode_Static.inl
+        * tao/AnyTypeCode/ValueModifier.pidl
+        * tao/AnyTypeCode/ValueModifierA.cpp
+        * tao/AnyTypeCode/ValueModifierA.h
+        * tao/AnyTypeCode/ValueModifierC.cpp
+        * tao/AnyTypeCode/ValueModifierC.h
+        * tao/AnyTypeCode/ValueModifierS.h
+        * tao/AnyTypeCode/Value_TypeCode.cpp
+        * tao/AnyTypeCode/Value_TypeCode.h
+        * tao/AnyTypeCode/Value_TypeCode.inl
+        * tao/AnyTypeCode/Value_TypeCode_Static.cpp
+        * tao/AnyTypeCode/Value_TypeCode_Static.h
+        * tao/AnyTypeCode/Value_TypeCode_Static.inl
+        * tao/AnyTypeCode/Visibility.pidl
+        * tao/AnyTypeCode/VisibilityA.cpp
+        * tao/AnyTypeCode/VisibilityA.h
+        * tao/AnyTypeCode/VisibilityC.cpp
+        * tao/AnyTypeCode/VisibilityC.h
+        * tao/AnyTypeCode/VisibilityS.h
+        * tao/AnyTypeCode/WCharSeqA.cpp
+        * tao/AnyTypeCode/WCharSeqA.h
+        * tao/AnyTypeCode/WStringSeqA.cpp
+        * tao/AnyTypeCode/WStringSeqA.h
+        * tao/AnyTypeCode/WrongTransactionA.cpp
+        * tao/AnyTypeCode/WrongTransactionA.h
+        * tao/AnyTypeCode/append.cpp
+        * tao/AnyTypeCode/orb_typesA.cpp
+        * tao/AnyTypeCode/orb_typesA.h
+        * tao/AnyTypeCode/skip.cpp
+        * examples/Kokyu_dsrt_schedulers/EDF_Scheduling.idl
+        * tao/AnyTypeCode.mpc
+        * tao/AnyTypeCode_Adapter.cpp
+        * tao/AnyTypeCode_Adapter.h
+        * tao/Any_Insert_Policy_T.h
+        * tao/NVList_Adapter.cpp
+        * tao/NVList_Adapter.h
+        * tao/IFR_Client/IFR_BaseA.h
+        * tao/IFR_Client/IFR_BasicA.h
+        * tao/IFR_Client/IFR_ComponentsA.h
+        * tao/ObjRefTemplate/ObjectReferenceTemplate_includeA.h
+        * tao/PI/InvalidSlot.pidl
+        * tao/PI/InvalidSlotA.cpp
+        * tao/PI/InvalidSlotA.h
+        * tao/PI/InvalidSlotC.cpp
+        * tao/PI/InvalidSlotC.h
+        * tao/PI/InvalidSlotS.h
+        * tao/PortableServer/PortableServer_includeA.h
+        * tao/PortableServer/RequestProcessingPolicyA.h
+        * tao/PortableServer/SArg_Traits_T.h
+        * tao/PortableServer/ServantActivatorA.h
+        * tao/PortableServer/ServantLocatorA.h
+        * tao/PortableServer/ServantManagerA.h
+        * tao/PortableServer/ServantRetentionPolicyA.h
+        * tao/PortableServer/ThreadPolicyA.h
+        * tao/PI/PICurrent.cpp
+        * tao/PI/PICurrent.h
+        * tao/PI/PICurrent.inl
+        * tao/PI/PICurrent.pidl
+        * tao/PI/PICurrentA.cpp
+        * tao/PI/PICurrentA.h
+        * tao/PI/PICurrentC.cpp
+        * tao/PI/PICurrentC.h
+        * tao/PI/PICurrentS.h
+        * tao/PI/PICurrent_Copy_Callback.cpp
+        * tao/PI/PICurrent_Copy_Callback.h
+        * tao/PI/PICurrent_Impl.cpp
+        * tao/PI/PICurrent_Impl.h
+        * tao/PI/PICurrent_Impl.inl
+        * tao/PI/PICurrent_Loader.cpp
+        * tao/PI/PICurrent_Loader.h
+        * tao/RTCORBA/RTCORBA_includeA.h
+        * tao/ImR_Client/ImplRepoA.h
+        * tao/IFR_Client/IFR_ExtendedA.h
+        * tao/RTScheduling/RTScheduler_includeA.h
+        * tao/PortableServer/ForwardRequestA.h
+        * tao/PortableServer/IdAssignmentPolicyA.h
+        * tao/PortableServer/IdUniquenessPolicyA.h
+        * tao/ImR_Client/ServerObjectA.h
+        * tao/PortableServer/ImplicitActivationPolicyA.h
+        * tao/PortableServer/LifespanPolicyA.h
+        * tao/PortableServer/AdapterActivatorA.h
+        * tao/PortableServer/PS_ForwardA.h
+        * tao/PI/RequestInfo_Util.cpp
+        * tao/PI/RequestInfo_Util.h
+        * tao/PI_Server/PICurrent_Guard.cpp
+        * tao/PI_Server/PICurrent_Guard.h
+        * tao/PI_Server/PI_Server_include.pidl
+        * tao/PI_Server/PI_Server_includeA.h
+        * tao/PI_Server/PI_Server_includeC.h
+        * tao/PI_Server/PI_Server_includeS.h
+          Added these files to the repo
+
+        * tao/UShortSeqA.cpp
+        * tao/Union_TypeCode.cpp
+        * tao/Union_TypeCode.h
+        * tao/Union_TypeCode.inl
+        * tao/Union_TypeCode_Static.cpp
+        * tao/Union_TypeCode_Static.h
+        * tao/Union_TypeCode_Static.inl
+        * tao/Dynamic.pidl
+        * tao/DynamicA.cpp
+        * tao/DynamicC.cpp
+        * tao/DynamicC.h
+        * tao/DynamicS.h
+        * tao/Dynamic_Parameter.pidl
+        * tao/Dynamic_ParameterA.cpp
+        * tao/Dynamic_ParameterC.cpp
+        * tao/Dynamic_ParameterC.h
+        * tao/Empty_Param_TypeCode.cpp
+        * tao/Empty_Param_TypeCode.h
+        * tao/Empty_Param_TypeCode.inl
+        * tao/Enum_TypeCode.cpp
+        * tao/Enum_TypeCode.h
+        * tao/Enum_TypeCode.inl
+        * tao/Enum_TypeCode_Static.cpp
+        * tao/Enum_TypeCode_Static.h
+        * tao/Enum_TypeCode_Static.inl
+        * tao/Valuetype/Seq_Tmplinst.cpp
+        * TAO_IDL/be/be_visitor_tmplinst.cpp
+        * TAO_IDL/be/be_visitor_tmplinst/arg_tmplinst.cpp
+        * TAO_IDL/be/be_visitor_tmplinst/tmplinst.cpp
+        * TAO_IDL/be/be_visitor_tmplinst/tmplinst_cs.cpp
+        * TAO_IDL/be/be_visitor_tmplinst/tmplinst_ss.cpp
+        * examples/Kokyu_dsrt_schedulers/EDF_Scheduling.pidl
+        * examples/Kokyu_dsrt_schedulers/EDF_SchedulingC.cpp
+        * examples/Kokyu_dsrt_schedulers/EDF_SchedulingC.h
+        * examples/Kokyu_dsrt_schedulers/EDF_SchedulingC.h.diff
+        * examples/Kokyu_dsrt_schedulers/EDF_SchedulingC.i
+        * TAO_IDL/be_include/be_visitor_tmplinst.h
+        * TAO_IDL/be_include/be_visitor_tmplinst/arg_tmplinst.h
+        * TAO_IDL/be_include/be_visitor_tmplinst/tmplinst.h
+        * TAO_IDL/be_include/be_visitor_tmplinst/tmplinst_cs.h
+        * TAO_IDL/be_include/be_visitor_tmplinst/tmplinst_ss.h
+        * tao/ULongSeqA.cpp
+        * orbsvcs/orbsvcs/IFRService/tmplinst.cpp
+        * tao/Alias_TypeCode.cpp
+        * tao/Alias_TypeCode.h
+        * tao/Alias_TypeCode.inl
+        * tao/Alias_TypeCode_Static.cpp
+        * tao/Alias_TypeCode_Static.h
+        * tao/Alias_TypeCode_Static.inl
+        * tao/Any.cpp
+        * tao/Any.h
+        * tao/Any.i
+        * tao/AnySeq.pidl
+        * tao/AnySeqA.cpp
+        * tao/AnySeqC.cpp
+        * tao/AnySeqC.h
+        * tao/AnySeqS.h
+        * tao/Any_Arg_Traits.h
+        * tao/Any_Array_Impl_T.cpp
+        * tao/Any_Array_Impl_T.h
+        * tao/Any_Array_Impl_T.inl
+        * tao/Any_Basic_Impl.cpp
+        * tao/Any_Basic_Impl.h
+        * tao/Any_Basic_Impl_T.cpp
+        * tao/SystemExceptionA.cpp
+        * tao/TAOA.cpp
+        * tao/IFR_Client/IFR_ExtendedA.cpp
+        * tao/Any_Basic_Impl_T.h
+        * tao/Any_Basic_Impl_T.inl
+        * tao/Any_Dual_Impl_T.cpp
+        * tao/Any_Dual_Impl_T.h
+        * tao/Any_Dual_Impl_T.inl
+        * tao/Any_Impl.cpp
+        * tao/Any_Impl.h
+        * tao/Any_Impl_T.cpp
+        * tao/Any_Impl_T.h
+        * tao/Any_Impl_T.inl
+        * tao/IFR_Client/IFR_ComponentsA.cpp
+        * tao/IFR_Client/IFR_BaseA.cpp
+        * tao/IFR_Client/IFR_BasicA.cpp
+        * tao/ValueModifier.pidl
+        * tao/ValueModifierC.cpp
+        * tao/ValueModifierC.h
+        * tao/ValueModifierS.h
+        * tao/Value_TypeCode.cpp
+        * tao/Value_TypeCode.h
+        * tao/Value_TypeCode.inl
+        * tao/Value_TypeCode_Static.cpp
+        * tao/Value_TypeCode_Static.h
+        * tao/Value_TypeCode_Static.inl
+        * tao/Any_Special_Impl_T.cpp
+        * tao/Any_Special_Impl_T.h
+        * tao/Any_Special_Impl_T.inl
+        * tao/Any_SystemException.cpp
+        * tao/Any_SystemException.h
+        * tao/Any_Unknown_IDL_Type.cpp
+        * tao/Any_Unknown_IDL_Type.h
+        * tao/BooleanSeqA.cpp
+        * tao/Bounds.pidl
+        * tao/BoundsA.cpp
+        * tao/BoundsC.cpp
+        * tao/BoundsC.h
+        * tao/CONV_FRAMEA.cpp
+        * tao/CurrentA.cpp
+        * tao/DomainA.cpp
+        * tao/DoubleSeqA.cpp
+        * tao/PortableServer/PICurrent_Guard.cpp
+        * tao/PortableServer/PICurrent_Guard.h
+        * tao/PortableServer/POAManagerA.cpp
+        * tao/TC_Constants_Forward.h
+        * tao/TimeBaseA.cpp
+        * tao/True_RefCount_Policy.cpp
+        * tao/True_RefCount_Policy.h
+        * tao/True_RefCount_Policy.inl
+        * tao/TypeCode.h
+        * tao/TypeCode.inl
+        * tao/TypeCodeA.cpp
+        * tao/TypeCode_Base_Attributes.cpp
+        * tao/TypeCode_Base_Attributes.h
+        * tao/TypeCode_Base_Attributes.inl
+        * tao/TypeCode_CDR_Extraction.cpp
+        * tao/Visibility.pidl
+        * tao/VisibilityC.cpp
+        * tao/VisibilityC.h
+        * tao/VisibilityS.h
+        * tao/WCharSeqA.cpp
+        * tao/WStringSeqA.cpp
+        * tao/WrongTransactionA.cpp
+        * tao/append.cpp
+        * tao/skip.cpp
+        * tao/TypeCode_CDR_Extraction.h
+        * tao/TypeCode_Case.cpp
+        * tao/TypeCode_Case.h
+        * tao/TypeCode_Case.inl
+        * tao/TypeCode_Case_T.cpp
+        * tao/TypeCode_Case_T.h
+        * tao/TypeCode_Case_T.inl
+        * tao/TypeCode_Constants.cpp
+        * tao/TypeCode_Constants.h
+        * tao/TypeCode_Struct_Field.h
+        * tao/TypeCode_Traits.h
+        * tao/TypeCode_Value_Field.h
+        * tao/ULongLongSeqA.cpp
+        * tao/CharSeqA.cpp
+        * tao/Fixed_TypeCode.cpp
+        * tao/Fixed_TypeCode.h
+        * tao/Fixed_TypeCode.inl
+        * tao/FloatSeqA.cpp
+        * tao/GIOPA.cpp
+        * tao/IIOPA.cpp
+        * tao/IIOP_EndpointsA.cpp
+        * tao/IOP_IORA.cpp
+        * tao/InvalidSlot.pidl
+        * tao/InvalidSlotA.cpp
+        * tao/InvalidSlotC.cpp
+        * tao/InvalidSlotC.h
+        * tao/InvalidSlotS.h
+        * tao/Marshal.cpp
+        * tao/LongSeqA.cpp
+        * tao/LongDoubleSeqA.cpp
+        * tao/LongLongSeqA.cpp
+        * tao/Marshal.h
+        * tao/Marshal.i
+        * tao/Messaging_PolicyValueA.cpp
+        * tao/NVList.cpp
+        * tao/NVList.h
+        * tao/NVList.i
+        * tao/Null_RefCount_Policy.h
+        * tao/ObjectIdListA.cpp
+        * tao/Objref_TypeCode.cpp
+        * tao/Objref_TypeCode.h
+        * tao/Objref_TypeCode.inl
+        * tao/Objref_TypeCode_Static.cpp
+        * tao/Objref_TypeCode_Static.h
+        * tao/Objref_TypeCode_Static.inl
+        * tao/OctetSeqA.cpp
+        * tao/PICurrent.cpp
+        * tao/PICurrent.h
+        * tao/PICurrent.inl
+        * tao/PICurrent.pidl
+        * tao/PICurrentA.cpp
+        * tao/PICurrentC.cpp
+        * tao/PICurrentC.h
+        * tao/PICurrentS.h
+        * tao/PICurrent_Copy_Callback.cpp
+        * tao/PICurrent_Copy_Callback.h
+        * tao/PICurrent_Impl.cpp
+        * tao/PICurrent_Impl.h
+        * tao/PICurrent_Impl.inl
+        * tao/PICurrent_Loader.cpp
+        * tao/PICurrent_Loader.h
+        * tao/ParameterModeA.cpp
+        * tao/PolicyA.cpp
+        * tao/Policy_ForwardA.cpp
+        * tao/Recursive_Type_TypeCode.cpp
+        * tao/Recursive_Type_TypeCode.h
+        * tao/Recursive_Type_TypeCode.inl
+        * tao/RefCount_Policy_Traits.h
+        * tao/RequestInfo_Util.cpp
+        * tao/RequestInfo_Util.h
+        * tao/Sequence_TypeCode.cpp
+        * tao/Sequence_TypeCode.h
+        * tao/Sequence_TypeCode.inl
+        * tao/Sequence_TypeCode_Static.cpp
+        * tao/Sequence_TypeCode_Static.h
+        * tao/Sequence_TypeCode_Static.inl
+        * tao/ServicesA.cpp
+        * tao/ShortSeqA.cpp
+        * tao/StringSeqA.cpp
+        * tao/String_TypeCode.cpp
+        * tao/String_TypeCode.h
+        * tao/String_TypeCode.inl
+        * tao/String_TypeCode_Static.cpp
+        * tao/String_TypeCode_Static.h
+        * tao/String_TypeCode_Static.inl
+        * tao/String_TypeCode_Traits.h
+        * tao/Struct_TypeCode.cpp
+        * tao/Struct_TypeCode.h
+        * tao/Struct_TypeCode.inl
+        * tao/Struct_TypeCode_Static.cpp
+        * tao/Struct_TypeCode_Static.h
+        * tao/Struct_TypeCode_Static.inl
+          Removed these files from the repo
+
+        Thu Aug 18 14:28:45 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * examples/Simulator/Event_Supplier/Event_Con.cpp:
+
+          Removed uses of Any::value() and replaced them with the
+          generated extraction operator.
+
+        Thu Aug 18 07:43:16 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_visitor_arg_traits.cpp:
+        * TAO_IDL/be_include/be_visitor_arg_traits.h:
+          When Any generation is not enabled, generate Any_Insert_Policy_Noop
+          as insert policy for the any, that way we don't get dependent
+          on the AnyTypeCode library
+
+        Wed Aug 17 13:27:16 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_codegen.cpp:
+
+          In generating the include of *C.h in *A.h, added generation
+          of the prefix "tao/" if we are processing a .pidl file, since
+          in that case, the *A.h file will not be in the same directory.
+
+        Wed Aug 17 12:39:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_cs.cpp:
+          Generate explicit casts to suppress warnings at level 4 with msvc7
+
+        Wed Aug 17 10:49:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/Upcall_Wrapper.cpp:
+        * tao/ServerRequestInterceptor_Adapter.h:
+        * tao/TAO_Server_Request.{h,cpp,i}:
+        * tao/PI_Server/ServerInterceptorAdapter.{h,cpp}:
+          Made PICurrent working again
+
+        Wed Aug 17 08:34:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_visitor_arg_traits.cpp
+        * tao/AnyTypeCode_Adapter.h
+        * tao/BD_String_Argument_T.h
+        * tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.cpp
+        * tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.h
+        * tao/PortableServer/BD_String_SArgument_T.h
+          Removed the specialization for bound (w)string from the TAO
+          lib and just generate the full Arg_Trait in the IDL compiler,
+          this makes it not needed anymore to have an insertion
+          method for the bound (w)string in the AnyTypeCode adapter
+
+        Tue Aug 16 20:03:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_visitor_interface_fwd/any_op_ch.cpp:
+          Generate the correct export macro
+
+        Tue Aug 16 19:53:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/*:
+          Regenerated
+
+        Tue Aug 16 18:52:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_codegen.cpp:
+          Removed pragma push/pop for msvs, those warnings are already
+          disabled in general
+
+        * tao/Array_VarOut_T.{h,inl}:
+          In the TAO_Array_Forany_T make the pointer in the constructor
+          const to get things compiling with the new any insertion
+
+        Mon Aug 15 19:56:10 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_visitor_nodule/module_ch.cpp:
+
+          Where namespace openings and closings are generated, add
+          generation of the same openings and closings in the *A.h
+          file, if the -GA option is being used. This change ensures
+          that typecode declarations for types nested in one or more
+          modules will themselves appear in the same scope.
+
+        Mon Aug 15 19:52:50 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * tao/PI/PICurrent_Loader.cpp:
+        * tao/PI/PICurrent_Loader.h:
+
+          Change library name in ACE_FACTORY_DEFINE and ACE_FACTORY_DECLARE
+          to TAO_PI (where the modified files are located) instad of TAO.
+
+        Mon Aug 15 19:14:16 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * orbsvcs/tests/BiDir_CORBALOC/TimeServer.cpp:
+
+          Added #include of "tao/AnyTypeCode/Any.h".
+
+        Mon Aug 15 19:10:43 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * orbsvcs/orbsvcs/PortableGroup.mpc:
+
+          Removed the extra subgroup labeled OBRSVCS_COMPONENTS. This is
+          not used on any platform and it creates an extra subdirectory
+          in the MSVC 7.1 solution browser.
+
+        Mon Aug 15 09:52:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_codegen.cpp:
+          Generate the A.h includes in the header file instead of the cpp file.
+          When A.idl includes B.pidl which includes C.pidl, when we generate
+          the includes in the header file, then in AC.h we don't have the types
+          from CC.h.
+
+        Fri Aug 12 12:59:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PI/ORBInitializer_Registry_Impl.cpp:
+        * tao/PI/PICurrent.{h,cpp,inl}:
+          Made PICurrent on the client side working again. When PICurrent is
+          requested and used, then we allocate a key in the orb tss resources
+          and create the PICurrent_Impl at that moment. The server side of
+          PICurrent is now the next todo.
+
+        Fri Aug 12 09:54:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/ORB.cpp:
+        * tao/ORBInitializer_Registry_Adapter.h:
+        * tao/PI/ORBInitializer_Registry_Impl.{h,cpp}:
+          Changed the way the number of allocated slots is passed to PICurrent.
+          This is now completely handled in the PI library, it is not up
+          to the ORB anymore. This makes the ORB unaware of PICurrent
+
+        Thu Aug 11 15:56:51 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_codegen.cpp:
+
+          Fixed the logic of generating a *A.h include associated
+          with an included .pidl file to determine whether the
+          .pidl file is located in $TAO_ROOT/tao or in a subdirectory,
+          and thus whether to include the *A.h file from the
+          AnyTypeCode library or not. Only .pidl files in the
+          $TAO_ROOT/tao directory itself have their associated
+          *A.* files moved to the AnyTypeCode library.
+
+        Thu Aug 11 09:52:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PI/PI.h:
+        * orbsvcs/IFR_Service/ifr_adding_visitor_union.cpp
+        * orbsvcs/orbsvcs/ETCL/ETCL_Constraint.cpp
+        * orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp
+        * orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.h
+        * orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp
+        * orbsvcs/orbsvcs/IFRService/ConstantDef_i.cpp
+        * orbsvcs/orbsvcs/IFRService/Container_i.cpp
+        * orbsvcs/orbsvcs/IFRService/IFR_BaseS.cpp
+        * orbsvcs/orbsvcs/IFRService/IFR_BasicS.cpp
+        * orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.cpp
+        * orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.cpp
+        * orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp
+        * orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp
+        * orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp
+        * orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.h
+        * orbsvcs/orbsvcs/Log/PersistStore.cpp
+        * orbsvcs/orbsvcs/Log/PersistStore.h
+        * orbsvcs/orbsvcs/Naming/Naming_Server.cpp
+        * orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp
+        * orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.h
+        * orbsvcs/orbsvcs/Security/SL3_PolicyFactory.cpp
+        * orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp
+        * orbsvcs/orbsvcs/Trader/Interpreter_Utils.h
+        * orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp
+        * examples/POA/DSI/Database_i.cpp
+        * examples/POA/POA_BiDir/POA_BiDir.cpp
+        * examples/Simulator/Event_Supplier/Event_Con.cpp
+        * orbsvcs/PSS/PSDL_Code_Gen.cpp
+        * orbsvcs/examples/ORT/Gateway_i.cpp
+        * orbsvcs/tests/Notify/Reconnecting/Consumer.cpp
+        * tao/IFR_Client.mpc
+        * tao/tao.mpc
+        * tests/Nested_Upcall_Crash/client.cpp
+        * tests/Nested_Upcall_Crash/scavenger.cpp
+        * tests/Nested_Upcall_Crash/server.cpp
+        * tests/Oneway_Buffering/client.cpp
+        * tests/POA/Policies/Policies.cpp
+        * tests/Portable_Interceptors/PICurrent/client.cpp
+
+        Wed Aug 10 19:47:30 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_codegen.cpp:
+        * TAO_IDL/be/be_global.cpp:
+        * TAO_IDL/be/be_visitor_root.cpp:
+        * TAO_IDL/be/be_visitor_root/root.cpp:
+        * TAO_IDL/be_include/be_global.h:
+        * TAO_IDL/be_include/be_visitor_root/root.h:
+
+          Removed calls to the visitor classes in the files
+          below that have been removed, and removed the -GT
+          command line option and the associated usage message.
+          The IDL compiler now generates no explicit template
+          instantiations, and has no command line option to
+          do so.
+
+        * TAO_IDL/be_include/be_visitor_tmplinst/arg_tmplinst.h:
+        * TAO_IDL/be_include/be_visitor_tmplinst/tmplinst.h:
+        * TAO_IDL/be_include/be_visitor_tmplinst/tmplinst_cs.h:
+        * TAO_IDL/be_include/be_visitor_tmplinst/tmplinst_ss.h:
+        * TAO_IDL/be/be_visitor_tmplinst/arg_tmplinst.cpp:
+        * TAO_IDL/be/be_visitor_tmplinst/tmplinst.cpp:
+        * TAO_IDL/be/be_visitor_tmplinst/tmplinst_cs.cpp:
+        * TAO_IDL/be/be_visitor_tmplinst/tmplinst_ss.cpp:
+        * TAO_IDL/be_include/be_visitor_tmplinst.h:
+        * TAO_IDL/be/be_visitor_tmplinst.cpp:
+
+          Unused visitor classes related to generation of
+          explicit template instantiations, their files
+          have been removed from CVS.
+
+        * docs/compiler.html:
+
+          Removed the -GT command line option from the table.
+
+        * docs/releasenotes/index.html:
+
+          Updated documentation of the IDL compiler to reflect
+          the above changes.
+
+        Wed Aug 10 13:38:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/PortableInterceptors/Benchmark/client_interceptors.cpp
+        * tests/PortableInterceptors/Benchmark/server_interceptors.cpp
+        * tests/PortableInterceptors/Collocated/Dynamic/interceptors.cpp
+        * tests/PortableInterceptors/Dynamic/client_interceptor.cpp
+        * tests/PortableInterceptors/Dynamic/server_interceptor.cpp
+        * tests/PortableInterceptors/PolicyFactory/PolicyFactory.cpp
+
+        Wed Aug 10 13:27:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * examples/Buffered_AMI/client.cpp
+        * examples/Buffered_Oneways/client.cpp
+        * orbsvcs/orbsvcs/AV/AVStreams_i.cpp
+        * orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.h
+        * orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h
+        * tests/MProfile_Connection_Timeout/client.cpp
+        * tests/MProfile_Forwarding/MProfile_Forwarding.mpc
+        * tests/MT_BiDir/client.cpp
+        * tests/MT_BiDir/server.cpp
+        * tests/MT_Client/MT_Client.mpc
+        * tests/MT_Server/MT_Server.mpc
+        * tests/MT_Timeout/Client_Task.cpp
+        * performance_tests/Anyop/Anyop.mpc
+        * performance_tests/Anyop/anyop.cpp
+        * performance_tests/Callback/client.cpp
+        * performance_tests/Callback/server.cpp
+        * performance_tests/Cubit/TAO/DII_Cubit/client.cpp
+        * performance_tests/Latency/DII/client.cpp
+        * performance_tests/Latency/DSI/Roundtrip.cpp
+        * performance_tests/Latency/Deferred/client.cpp
+        * performance_tests/RTCorba/Oneways/Reliable/client.cpp
+        * performance_tests/Sequence_Latency/DII/client.cpp
+        * performance_tests/Sequence_Latency/DSI/Roundtrip.cpp
+        * performance_tests/Sequence_Latency/Deferred/client.cpp
+          Updated for moves.
+
+        Wed Aug 10 12:59:06 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_visitor_interface/any_op_ch.cpp:
+        * TAO_IDL/be/be_visitor_interface/any_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_interface/interface_ch.cpp:
+        * TAO_IDL/be/be_visitor_interface/interface_cs.cpp:
+
+          Removed generation of Any operators for local interfaces.
+
+        Wed Aug 10 11:39:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tests/MProfile_Forwarding/MProfile_Forwarding.mpc
+        * tests/MT_Client/MT_Client.mpc
+        * tests/MT_Server/MT_Server.mpc
+        * tests/DLL_ORB/DLL_ORB.mpc
+        * tests/CDR/CDR.mpc:
+        * tests/AMI_Buffering/AMI_Buffering.mpc:
+        * tests/AMI_Timeouts/AMI_Timeouts.mpc:
+        * tests/BiDirectional/BiDirectional.mpc:
+        * tests/BiDirectional_MultipleORB/destroy.mpc:
+        * tests/Collocation/Collocation.mpc:
+        * CDR/CDR.mpc
+          Simplified this MPC file
+
+        * orbsvcs/orbsvcs/AV/AVStreams_i.cpp
+        * orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.h
+        * orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h
+        * orbsvcs/orbsvcs/Security/SL3_PolicyFactory.cpp
+        * tests/MProfile_Connection_Timeout/client.cpp
+        * tests/MT_BiDir/client.cpp
+        * tests/MT_BiDir/server.cpp
+        * tests/MT_Timeout/Client_Task.cpp
+        * tests/CDR/tc.cpp:
+        * tests/AMI_Buffering/client.cpp:
+        * tests/AMI_Timeouts/timeout_client.cpp:
+        * tests/BiDirectional/client.cpp:
+        * tests/BiDirectional/server.cpp:
+        * tests/BiDirectional_MultipleORB/destroy.cpp:
+        * tests/BiDirectional_NestedUpcall/client.cpp:
+        * tests/BiDirectional_NestedUpcall/server.cpp:
+        * tests/Big_Request_Muxing/Client_Task.cpp:
+        * Blocking_Sync_None/client.cpp
+        * Bug_1020_Basic_Regression/client.cpp
+        * Bug_1020_Regression/client.cpp
+        * Bug_1269_Regression/client.cpp
+        * Bug_1270_Regression/client.cpp
+        * Bug_1361_Regression/client.cpp
+        * Bug_1476_Regression/Client_Task.cpp
+        * Bug_1476_Regression/client.cpp
+        * Bug_1482_Regression/client.cpp
+        * Bug_1551_Regression/client.cpp
+        * CDR/basic_types.cpp
+        * tests/Connection_Timeout/client.cpp
+        * tests/Crashed_Callback/client.cpp
+        * tests/Crashed_Callback/server.cpp
+        * tests/DynAny_Test/data.cpp
+        * tests/DynAny_Test/data.h
+          Added missing includes that are needed because of file moves
+
+        * tests/Any/Recursive/RecursiveHello.mpc:
+          Don't use -GA, causes problems with the recursive structs
+
+        * tao/corba.h:
+          Removed AnySeqC, file moved to a seperate library
+
+        * tao/BD_String_Argument_T.h:
+        * tao/PortableServer/BD_String_SArgument_T.{h,inl}:
+          Fixed some errors in these files
+
+        * tao/Fixed_Size_Argument_T.cpp
+        * tao/Fixed_Size_Argument_T.h
+        * tao/Fixed_Size_Argument_T.inl
+        * tao/PortableServer/Fixed_Size_SArgument_T.h
+        * tao/PortableServer/Fixed_Size_SArgument_T.inl
+          Updated
+
+        * tao/orb.idl
+          Removed moved files
+
+        Wed Aug 10 08:14:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_codegen.cpp:
+          Added AnyTypeCode to include path of Any_Arg_Traits.h
+
+        Wed Aug 10 08:06:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/IFR_Client/*:
+          Removed -GA in the generation options and removed all *A.cpp
+          files. The IFR_Client has a struct defined in an interface, then
+          the generation of seperate *A.h file will not work.
+
+        * tao/AnyTypeCode/ValueModifier*.*:
+          Added A.{h,cpp} file.
+
+        Tue Aug  9 13:46:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/Any_SArg_Traits.h
+        * tao/PortableServer/BD_String_SArgument_T.cpp
+        * tao/PortableServer/BD_String_SArgument_T.h
+        * tao/PortableServer/BD_String_SArgument_T.inl
+        * tao/PortableServer/Basic_SArgument_T.cpp
+        * tao/PortableServer/Basic_SArgument_T.h
+        * tao/PortableServer/Basic_SArgument_T.inl
+        * tao/PortableServer/Basic_SArguments.h
+        * tao/PortableServer/Fixed_Array_SArgument_T.cpp
+        * tao/PortableServer/Fixed_Array_SArgument_T.h
+        * tao/PortableServer/Fixed_Array_SArgument_T.inl
+        * tao/PortableServer/Fixed_Size_SArgument_T.cpp
+        * tao/PortableServer/Fixed_Size_SArgument_T.h
+        * tao/PortableServer/Fixed_Size_SArgument_T.inl
+        * tao/PortableServer/Object_SArg_Traits.h
+        * tao/PortableServer/Object_SArgument_T.cpp
+        * tao/PortableServer/Object_SArgument_T.h
+        * tao/PortableServer/Object_SArgument_T.inl
+        * tao/PortableServer/PolicyS.cpp
+        * tao/PortableServer/Special_Basic_SArgument_T.cpp
+        * tao/PortableServer/Special_Basic_SArgument_T.h
+        * tao/PortableServer/Special_Basic_SArgument_T.inl
+        * tao/PortableServer/Special_Basic_SArguments.h
+        * tao/PortableServer/TypeCode_SArg_Traits.h
+          Updated also all SArg_Traits templates
+
+        Tue Aug  9 12:37:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_visitor_arg_traits.cpp:
+          Updated Arg traits generation
+
+        Tue Aug  9 11:51:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * AnyTypeCode_Adapter.h
+        * BD_String_Argument_T.cpp
+        * BD_String_Argument_T.h
+        * BD_String_Argument_T.inl
+        * Basic_Argument_T.cpp
+        * Basic_Argument_T.h
+        * Basic_Argument_T.inl
+        * Basic_Arguments.h
+        * DomainC.cpp
+        * Fixed_Array_Argument_T.cpp
+        * Fixed_Array_Argument_T.h
+        * Fixed_Array_Argument_T.inl
+        * ORB_Core_TSS_Resources.cpp
+        * ORB_Core_TSS_Resources.h
+        * Object.cpp
+        * Object.h
+        * Object_Argument_T.cpp
+        * Object_Argument_T.h
+        * Object_Argument_T.inl
+        * PolicyC.cpp
+        * Special_Basic_Argument_T.cpp
+        * Special_Basic_Argument_T.h
+        * Special_Basic_Argument_T.inl
+        * Special_Basic_Arguments.h
+        * UB_String_Argument_T.cpp
+        * UB_String_Argument_T.h
+        * UB_String_Argument_T.inl
+        * UB_String_Arguments.h
+        * Var_Array_Argument_T.cpp
+        * Var_Array_Argument_T.h
+        * Var_Array_Argument_T.inl
+        * Var_Size_Argument_T.cpp
+        * Var_Size_Argument_T.h
+        * Var_Size_Argument_T.inl
+        * AnyTypeCode/AnyTypeCode_Adapter_Impl.h
+        * AnyTypeCode/Any_Arg_Traits.h
+        * AnyTypeCode/TypeCode.h
+        * Domain/DomainS.cpp
+        * IFR_Client/IFR_BaseC.cpp
+        * IORInterceptor/IORInfoC.cpp
+        * ImR_Client/ImplRepoC.cpp
+        * ImR_Client/ImplRepoS.cpp
+        * ObjRefTemplate/ObjectReferenceTemplateC.cpp
+        * PortableServer/PolicyS.cpp
+        * PortableServer/PortableServerC.cpp
+        * RTScheduling/RTSchedulerC.cpp
+        * Valuetype/AbstractBase.h
+        * Valuetype/ValueBase.h
+          Updated Argument classes to use new Any Insert Policy  template
+
+        Mon Aug  8 09:13:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/ORB.cpp:
+        * tao/ORB_Core.{h,cpp,i}:
+        * tao/PI/ClientRequestInfo.cpp:
+        * tao/PI_Server/POA_Current.cpp:
+        * tao/PI_Server/ServerRequestInfo.cpp:
+          Updated partly for PI changes. Idea is now to store PICurrent in the
+          ORB Core as Object_ptr, a dynamic cast can then be done in the PI libs
+
+        * tao/Argument.cpp
+        * tao/Argument.h
+        * tao/BD_String_Argument_T.cpp
+        * tao/BD_String_Argument_T.h
+        * tao/Basic_Argument_T.cpp
+        * tao/Basic_Argument_T.h
+        * tao/Basic_Arguments.h
+        * tao/DomainC.cpp
+        * tao/Fixed_Array_Argument_T.cpp
+        * tao/Fixed_Array_Argument_T.h
+        * tao/Fixed_Size_Argument_T.cpp
+        * tao/Fixed_Size_Argument_T.h
+        * tao/IFR_Client_Adapter.h
+        * tao/Object.cpp
+        * tao/Object.h
+        * tao/Object_Argument_T.cpp
+        * tao/Object_Argument_T.h
+        * tao/PolicyC.cpp
+        * tao/Special_Basic_Argument_T.cpp
+        * tao/Special_Basic_Argument_T.h
+        * tao/UB_String_Argument_T.cpp
+        * tao/UB_String_Argument_T.h
+        * tao/Var_Array_Argument_T.cpp
+        * tao/Var_Array_Argument_T.h
+        * tao/Var_Size_Argument_T.cpp
+        * tao/Var_Size_Argument_T.h
+        * tao/DynamicInterface/DII_Arguments.cpp
+        * tao/DynamicInterface/DII_Arguments.h
+        * tao/IFR_Client/IFR_BaseC.cpp
+        * tao/IFR_Client/IFR_BasicC.cpp
+        * tao/IFR_Client/IFR_Client_Adapter_Impl.cpp
+        * tao/IFR_Client/IFR_Client_Adapter_Impl.h
+        * tao/IFR_Client/IFR_ComponentsC.cpp
+        * tao/IFR_Client/IFR_ExtendedC.cpp
+        * tao/ImR_Client/ImplRepoC.cpp
+        * tao/ImR_Client/ServerObjectC.cpp
+        * tao/ObjRefTemplate/ObjectReferenceTemplateC.cpp
+        * tao/PI/ClientRequestInfo.cpp
+        * tao/PI_Server/ServerRequestInfo.cpp
+        * tao/PortableServer/BD_String_SArgument_T.cpp
+        * tao/PortableServer/BD_String_SArgument_T.h
+        * tao/PortableServer/Basic_SArgument_T.cpp
+        * tao/PortableServer/Basic_SArgument_T.h
+        * tao/PortableServer/Basic_SArguments.h
+        * tao/PortableServer/Fixed_Array_SArgument_T.cpp
+        * tao/PortableServer/Fixed_Array_SArgument_T.h
+        * tao/PortableServer/Fixed_Size_SArgument_T.cpp
+        * tao/PortableServer/Fixed_Size_SArgument_T.h
+        * tao/PortableServer/Object_SArgument_T.cpp
+        * tao/PortableServer/Object_SArgument_T.h
+        * tao/PortableServer/PolicyS.cpp
+        * tao/PortableServer/Special_Basic_SArgument_T.cpp
+        * tao/PortableServer/Special_Basic_SArgument_T.h
+        * tao/PortableServer/UB_String_SArgument_T.cpp
+        * tao/PortableServer/UB_String_SArgument_T.h
+        * tao/PortableServer/Var_Array_SArgument_T.cpp
+        * tao/PortableServer/Var_Array_SArgument_T.h
+        * tao/PortableServer/Var_Size_SArgument_T.cpp
+        * tao/PortableServer/Var_Size_SArgument_T.h
+          Changed the interface of TAO::Argument. Instead of using
+          Dynamic::Parameter as argument, use the method interceptor_
+          value that gets an Any* argument and a separate mode argument
+          to get the mode of the argument (in/out/inout). Instead of
+          duplicating this mode method, added InArgument, InoutArgument,
+          OutArgument and RetArgument class that implement this method.
+          All templates are then derived from the correct base method.
+
+        Mon Aug  8 20:26:22 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * tao/AnyTypeCode/NVList_Adapter_Impl.h:
+
+          Corrected the export macro.
+
+        Mon Aug  8 19:55:07 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_visitor_exception/exception_cs.cpp:
+
+          Moved generation of the _tao_type() method for user exceptions
+          to the *A.cpp file if we are using the -GA option.
+
+        * TAO_IDL/be/be_codegen.cp:
+
+          Added code generation of *A.h includes from the AnyTypeCode
+          library corresponding to included .pidl files.
+
+        Thu Aug  4 18:52:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Cache_Entries.{h,inl}:
+          Removed non const index method
+
+        * tao/PortableServer/SArg_Traits_T.h:
+        * tao/PortableServer/Basic_SArguments.h:
+        * tao/PortableServer/Special_Basic_SArguments.h:
+        * tao/PortableServer/UB_String_SArguments.h:
+        * tao/Arg_Traits_T.h:
+          Moved SArg_Traits to its own file and updated includes
+
+        * tao/PI_Server/ServerRequestInfo.cpp:
+        * tao/PI_Server/ServerInterceptorAdapter.cpp:
+          Updated for PICurrent changes
+
+        * tao/PI/ClientRequestInfo.{h,cpp}:
+          Implemented several methods here instead of using
+          functionality that was in the TAO lib for interceptors
+
+        * tao/DynamicInterface/DII_Invocation.cpp:
+          Updated include of RequestInfo_Util.h
+
+        * tao/Invocation_Base.{h,cpp}:
+        * tao/operation_details.{h,cpp,i}:
+          Removed several methods that are just there for the
+          ClientRequestInfo. The functionality moved to the
+          ClientRequestInfo class in the PI library where we just
+          access the operation details.
+
+        * tao/tao.mpc:
+          Removed files
+
+        * tao/RequestInfo_Util.{h,cpp}:
+        * tao/PI/RequestInfo_Util.{h,cpp}:
+          Moved to the PI lib
+
+        * tao/Invocation_Adapter.h:
+          Removed obsolete forward declaration of TAO_Exception_Data
+
+        * tao/AnyTypeCode/TypeCode.cpp:
+          Applied some patches Ossama did to the main branch also
+
+        * tao/Argument.cpp:
+          Use true instead of 1
+
+        * tao/PI/InvalidSlotA.h:
+        * tao/PI/InvalidSlotC.h:
+          Corrected export macro
+
+        * tao/DynamicInterface/Unknown_User_Exception.{h,cpp}:
+          Removed _is_a method
+
+        * tao/operation_details.{h,i}:
+          Removed non const version of addressing_mode
+
+        * tao/Invocation_Base.{h,inl}:
+          Added accessor for operation details
+
+        Tue Aug  2 13:13:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/TC_Constants_Forward.h:
+        * tao/AnyTypeCode/TC_Constants_Forward.h:
+          Moved to AnyTypeCode lib
+
+        Tue Aug  2 12:49:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/CORBA_methods.h:
+          Removed not needed forward declarations
+
+        * tao/Dynamic_Adapter.cpp:
+          Removed not needed includes and explicit templates
+
+        * tao/NVList_Adapter.{h,cpp}:
+          New NVList adapter
+
+        * tao/ORB.{h,cpp}:
+          Use new NVList Adapter
+
+        * tao/tao.mpc:
+          Added NVList_Adapter files
+
+        * tao/AnyTypeCode.mpc:
+          Added new files
+
+        * tao/NVList.h:
+          Updated friends
+
+        * tao/NVList_Adapter_Impl.{h,cpp}:
+          Concrete NVList Adapter implementation
+
+        Tue Aug  2 12:17:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.{h,cpp}:
+          Adapter implementation. _tao_type for all systemexceptions
+          is not available
+
+        Tue Aug  2 12:02:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/AnyTypeCode/ExceptionA.cpp:
+          Reenabled CORBA::Exception Any operators now _tao_type is available
+          again
+
+        Mon Aug  1 19:18:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Exception.{h,cpp}:
+          Removed class TAO_DONT_CATCH, it is not used at all. Also removed
+          the emulated exception argument from create_system_exception, it
+          is not needed
+
+        Mon Aug  1 19:06:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/AnyTypeCode_Adapter.{h,cpp}:
+        * tao/SystemException.cpp:
+          Added first version of Adapter interface and implemented
+          SystemException::_tao_type to call the adapter method.
+
+        * tao/tao.mpc:
+          Added new file
+
+        Mon Aug  1 18:10:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Exception.{h,cpp}:
+        * tao/SystemException.{h,cpp}:
+        * tao/UserException.{h,cpp}:
+          Removed _is_a, it is TAO specific to handle environments without
+          RTTI but we require and use that, so zapped this method.
+          Reimplemented SystemException::_tao_get_omg_exception_description
+          to use dynamic_cast to check for the specific exception type
+
+        Mon Aug  1 15:22:59 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * tao/AnyTypeCode/DynamicA.h:
+        * tao/AnyTypeCode/DynamicC.h:
+
+          Fixed some export macros that were not changed when these
+          files were moved to the AnyTypeCode library.
+
+        Mon Aug  1 14:20:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Exception.h:
+        * tao/SystemException.h:
+        * tao/UserException.h:
+          Documentation improvements
+
+        Mon Aug  1 12:30:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Exception.{h,cpp}:
+          Declared _tao_type as pure virtual. No need to have a default
+          implementation here
+
+        * tao/ORB.{h,cpp}:
+          Optimized InvalidName::_downcast. Implemented _tao_type as
+          return 0, we don't have a default implementatio anymore in the
+          base
+
+        * tao/PolicyC.{h,cpp}:
+        * tao/WrongTransactionC.{h,cpp}:
+          Made _tao_type active again, implement this as return 0 at this
+          moment, have to call a new adapter later
+
+        * tao/SystemException.{h,cpp}:
+          Added _tao_type again, implemented it as return 0, have to add
+          a call to an adapter later for all system exceptions
+
+        * tao/UserException.{h,cpp}:
+          Added _tao_type with return 0 as default implementation, coming
+          from the base
+
+        * tao/AnyTypeCode/BoundsC.{h,cpp}:
+        * tao/PI/InvalidSlotC.{h,cpp}:
+          Added _tao_type again.
+
+        * tao/AnyTypeCode/TypeCode.{h,cpp}:
+          Added _tao_type with return 0
+
+        Mon Aug  1 11:19:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/AnyTypeCode.mpc:
+          Updated for a lot of changes
+
+        * tao/Basic_Argument_T.cpp:
+          Added a temporarily specialization for unsigned int, will need to be
+          removed soon
+
+        * tao/Object_Argument_T.cpp
+          Added a temporarily specialization for Policy, will need to be
+          removed soon
+
+        * tao/Special_Basic_Argument_T.cpp:
+          Added a temporarily specialization for bool, will need to be
+          removed soon
+
+        * tao/UB_String_Argument_T.cpp:
+          Added a temporarily specialization for string, will need to be
+          removed soon
+
+        * tao/BD_String_Argument_T.cpp:
+        * tao/Fixed_Array_Argument_T.cpp:
+        * tao/Fixed_Size_Argument_T.cpp:
+          Removed include of Dynamic_ParameterC.h
+
+        * tao/Block_Flushing_Strategy.h:
+        * tao/Flushing_Strategy.h:
+        * tao/Leader_Follower_Flushing_Strategy.h:
+        * tao/Reactive_Flushing_Strategy.h:
+        * tao/Wait_On_Leader_Follower.h:
+        * tao/Wait_On_LF_No_Upcall.h:
+        * tao/Wait_On_Reactor.h:
+        * tao/Wait_On_Read.h:
+        * tao/Wait_Strategy.h:
+          No need to export the class in this file
+
+        * tao/DomainC.cpp:
+          Pass the Dynamic_Parameter to the IFR Adapter, this way we don't
+          depend on Any
+
+        * tao/IFR_Client_Adapter.h:
+          Pass the Dynamic::Parameter to interfacedef_any_insert
+
+        * tao/InvalidSlot*.*:
+          Moved to the PI library
+
+        * tao/Invocation_Base.cpp:
+        * tao/operation_details.cpp:
+          Commented out several methods which need to be reimplemented
+          using a new adapter
+
+        * tao/ORB.cpp:
+        * tao/ORB_Core.{h,cpp,i}:
+        * tao/ORB_Core_TSS_Resources.{h,cpp}:
+          Commented out creation of PICurrent, will have to reimplement this
+          now PICurrent moved to the PI lib
+
+        * tao/PortableInterceptor.pidl:
+        * tao/PortableInterceptorC.h:
+          Removed the files that moved to the PI lib
+
+        * tao/PICurrent.{h,cpp,inl,pidl}:
+        * tao/PICurrent_Copy_Callback.{h,cpp}:
+        * tao/PICurrent_Impl.{h,cpp,inl}:
+        * tao/PICurrent_Loader.{h,cpp}:
+        * tao/PICurrentC.{h,cpp}:
+        * tao/PICurrentS.h:
+          Moved to the PI lib
+
+        * tao/Server_Request.{h,cpp,inl}:
+          Use pointers for the PI stuff, will need to update this soon
+
+        * tao/TypeCodeFactory_Adapter.h:
+          Added forward declaration for ValueModifier
+
+        * tao/ValueModifier.pidl:
+        * tao/ValueModifierC.{h,cpp}:
+        * tao/ValueModifierS.h:
+          Moved to AnyTypeCode lib
+
+        * tao/Visibility.pidl:
+        * tao/VisibilityC.{h,cpp}:
+        * tao/VisibilityS.h:
+          Moved to AnyTypeCode lib
+
+        * tao/AnyTypeCode/PICurrentA.{h,cpp}:
+        * tao/AnyTypeCode/InvalidSlotA.{h,cpp}:
+          Moved to the PI lib
+
+        * tao/AnyTypeCode/PortableInterceptorA.h:
+          Removed some includes
+
+        * tao/AnyTypeCode/TypeCode.h:
+        * tao/AnyTypeCode/Value_TypeCode:
+        * tao/AnyTypeCode/Value_TypeCode_Static.h:
+          Updated includes
+
+        * tao/IFR_Client/*C.cpp:
+          Added include of Dynamic_Parameter.h
+
+        * tao/PI/ClientRequestInfo.{h,cpp}:
+          Updated includes
+
+        * tao/PI/PICurrent*.*:
+          Moved here from the tao lib
+
+        * tao/PoratbleServer/Basic_SArgument_T.cpp
+        * tao/PoratbleServer/BD_String_SArgument_T.cpp
+        * tao/PoratbleServer/Fixed_Array_SArgument_T.cpp
+        * tao/PoratbleServer/Fixed_Size_SArgument_T.cpp
+        * tao/PoratbleServer/Object_SArgument_T.cpp
+        * tao/PoratbleServer/Special_Basic_SArgument_T.cpp
+        * tao/PoratbleServer/UB_String_SArgument_T.cpp
+        * tao/PoratbleServer/Var_Array_SArgument_T.cpp
+        * tao/PoratbleServer/Var_Size_SArgument_T.cpp
+          Update includes
+
+        * tao/PortableServer/Upcall_Wrapper.cpp:
+          Temporarily commented out PICurrent_Guard. Need to change this
+          to a call to the PI adapter and an auto_ptr
+
+        Fri Jul 29 19:23:17 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_global.cpp:
+        * TAO_IDL/be_include/be_global.h:
+
+          Added -oA <path> option to direct the output of generated
+          *A.* files. The -oA option overrides path specified by
+          -o, if any.
+
+        * docs/compiler.html:
+
+          Added above option to commandline option table.
+
+        Fri Jul 29 18:32:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/DynamicAny.mpc
+        * tao/IFR_Client.mpc
+        * tao/IORManipulation.mpc
+        * tao/Strategies.mpc
+        * tao/Valuetype.mpc
+        * tao/Var_Size_Argument_T.cpp
+        * tao/corba.h
+        * tao/AnyTypeCode/DynamicA.cpp
+        * tao/AnyTypeCode/DynamicA.h
+        * tao/AnyTypeCode/DynamicC.cpp
+        * tao/AnyTypeCode/DynamicC.h
+        * tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp
+        * tao/AnyTypeCode/orb_typesA.h
+        * tao/DynamicInterface/DII_Arguments.cpp
+        * tao/DynamicInterface/Request.cpp
+        * tao/DynamicInterface/Request.h
+        * tao/DynamicInterface/Server_Request.cpp
+        * tao/IFR_Client/IFR_BaseA.cpp
+        * tao/IFR_Client/IFR_BaseC.cpp
+        * tao/IFR_Client/IFR_BasicA.cpp
+        * tao/IFR_Client/IFR_BasicC.cpp
+        * tao/IFR_Client/IFR_Client_Adapter_Impl.cpp
+        * tao/IFR_Client/IFR_ComponentsA.cpp
+        * tao/IFR_Client/IFR_ExtendedA.cpp
+        * tao/IORManipulation/IORA.cpp
+        * tao/ImR_Client/ImplRepoA.cpp
+        * tao/Messaging/Messaging_PolicyFactory.cpp
+        * tao/Messaging/Messaging_Policy_i.cpp
+        * tao/Messaging/Messaging_RT_PolicyA.cpp
+        * tao/ObjRefTemplate/Default_ORTA.cpp
+        * tao/ObjRefTemplate/ObjectReferenceTemplateA.cpp
+        * tao/PI/ClientRequestInfoA.cpp
+        * tao/PI/ClientRequestInterceptorA.cpp
+        * tao/PI/InterceptorA.cpp
+        * tao/PI/ORBInitInfoA.cpp
+        * tao/PI/RequestInfo.pidl
+        * tao/PI/RequestInfoA.cpp
+        * tao/PI_Server/ServerRequestInfoA.cpp
+        * tao/PI_Server/ServerRequestInterceptorA.cpp
+        * tao/PortableServer/Var_Size_SArgument_T.cpp
+        * tao/RTCORBA/RTCORBAA.cpp
+        * tao/RTCORBA/RT_Policy_i.cpp
+        * tao/RTPortableServer/RTPortableServerA.cpp
+        * tao/RTScheduling/RTSchedulerA.cpp
+        * tao/Strategies/sciop_endpointsC.cpp
+        * tao/Strategies/uiop_endpointsC.cpp
+        * tao/TypeCodeFactory/Recursive_TypeCode.h
+        * tao/TypeCodeFactory/TypeCodeFactoryA.cpp
+        * tao/TypeCodeFactory/TypeCodeFactory_i.cpp
+        * tao/Valuetype/StringValueC.cpp
+        * tao/Valuetype/ValueBase.cpp
+          All kinds of changes to get things compiling again
+
+        * AnyTypeCode/Union_TypeCode.{h,cpp,inl}:
+        * AnyTypeCode/Union_TypeCode_T.{h,cpp,inl}:
+          Renamed _T back to normal file
+
+        Fri Jul 29 15:26:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/DynamicInterface/DynamicParameter*.{h,cpp}:
+        * tao/AnyTypeCode/DynamicParameter*.{h,cpp}:
+          Moved DynamicParameter to the AnyTypeCode lib. The PI lib uses this
+          and having it in DynamicInterface will make PI dependent on
+          DynamicInterface
+
+        Fri Jul 29 11:02:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Exception.{h,cpp}:
+        * tao/AnyTypeCode/Exception.{h,cpp}:
+          Moved Any code from Exception to AnyTypeCode. Have to solve the
+          _tao_type issue.
+
+        Fri Jul 29 10:42:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/AnyTypeCode/AnyTypeCode_methods.h:
+        * tao/AnyTypeCode/TypeCode.h:
+          Moved is_nil and release from TypeCode.h to AnyTypeCode_methods.h
+
+        Fri Jul 29 04:19:55 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * tao/CORBA_methods.h:
+
+          Removed static CORBA is_nil() and release() methods for
+          NamedValue and NVList.
+
+        * tao/SystemException.cpp:
+
+          Restored definition of static _tao_any_destructor()
+          methods for system exceptions. They are used by Anys,
+          but do not depend on them. This move eliminated
+          'inconsistent dll linkage' warnings on MSVC.
+
+        * tao/SystemException.h:
+
+          Removed declarations of typecodes and Any operators
+          for the system exceptions.
+
+        * tao/AnyTypeCode/NVList.h:
+
+          Added include of the new AnyTypeCode_methods.h file below.
+
+        * tao/AnyTypeCode/SystemExceptionA.cpp:
+
+          Removed definition of static _tao_any_destructor()
+          methods for system exceptions.
+
+        * tao/AnyTypeCode/SystemExceptionA.h:
+
+          New file, contains typecode and Any operator declarations
+          for system exceptions.
+
+        * tao/AnyTypeCode/AnyTypeCode_methods.h:
+
+          New file, contains declarations of static CORBA is_nil()
+          and release() methods for NamedValue and NVList. This
+          move eliminated 'inconsistent dll linkage' warnings on
+          MSVC.
+
+        Thu Jul 28 22:40:26 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_codegen.cpp:
+        * TAO_IDL/be/be_global.cpp:
+        * TAO_IDL/be/be_visitor_context.cpp:
+        * TAO_IDL/be/be_visitor_typecode/typecode_decl.cpp:
+        * TAO_IDL/be_include/be_visitor_context.h:
+
+          Added logic to make the anyop export macro and export include
+          default to the corresponding stub values, if any, when the
+          former values have not been set on the command line, but -GA
+          is used. This behavior will enable the *A.* files to be
+          generated, but compiled into the same library as the stub
+          files, if desired.
+
+        Thu Jul 28 18:35:07 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Buffering_Constraint_Policy.{h,cpp}:
+        * tao/Messaging/Messaging_PolicyFactory.{h,cpp}:
+          Moved the create method to extract a BufferingConstraint out of
+          an Any to the Messaging lib. It is used there and not needed at
+          all in the core TAO lib. In the future we probably will move the
+          complete Buffering_Constraint_Policy to the Messaging lib
+
+        Thu Jul 28 16:43:07 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_codegen.cpp:
+
+          Added code generation to include *A.h files (in the
+          *A.cpp file) for each included IDL file. If possible,
+          existence checks for these included files will be added
+          at a future date.
+
+        * TAO_IDL/be/be_visitor_typecode/typecode_decl.cpp:
+
+          Switched generation of the typecode declaration to the
+          *A.h file, if the -GA option is used.
+
+        * TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp:
+
+          Updated comment.
+
+        * TAO_IDL/be/be_global.cpp:
+
+          Fixed typo in generated usage message.
+
+        * TAO_IDL/driver/drv_args.cpp:
+
+          Added usage messages for each individual recognized
+          -W[p|b] option.
+
+        * docs/compiler.html:
+
+          Updated command line option table with the new -Wb options
+          for export macro and export include in *A.h files.
+
+        Thu Jul 28 12:41:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/PortableServer/AdapterActivatorA.cpp
+        * tao/PortableServer/ForwardRequestA.cpp
+        * tao/PortableServer/IdAssignmentPolicyA.cpp
+        * tao/PortableServer/IdUniquenessPolicyA.cpp
+        * tao/PortableServer/ImplicitActivationPolicyA.cpp
+        * tao/PortableServer/LifespanPolicyA.cpp
+        * tao/PortableServer/POAManagerA.cpp
+        * tao/PortableServer/PolicyS.cpp
+        * tao/PortableServer/PortableServerA.cpp
+        * tao/PortableServer/PS_ForwardA.cpp
+        * tao/PortableServer/RequestProcessingPolicyA.cpp
+        * tao/PortableServer/ServantActivatorA.cpp
+        * tao/PortableServer/ServantLocatorA.cpp
+        * tao/PortableServer/ServantManagerA.cpp
+        * tao/PortableServer/ServantRetentionPolicyA.cpp
+        * tao/PortableServer/ThreadPolicyA.cpp
+          Updated includes to the new AnyTypeCode library. Just a quick
+          search and replace to get this lib compiling again. Only have
+          an unresolved link error I have to investigate
+
+        Thu Jul 28 11:31:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_codegen.cpp:
+          Generate post include in A.h file, updated generated
+          includes for moving of files
+
+        * TAO_IDL/be/be_visitor_interface/any_op_ch.cpp:
+          Zapped starting spaces
+
+        * tao/PortableServer/Basic_SArgument_T.cpp:
+        * tao/PortableServer/Object_SArgument_T.cpp:
+        * tao/PortableServer/Special_Basic_SArgument_T.cpp:
+        * tao/PortableServer/UB_String_SArgument_T.cpp:
+          Only include DynamicParameter.h when interceptors are enabled
+
+        Thu Jul 28 11:18:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/AnyTypeCode.mpc:
+          New MPC file
+
+        * tao/Alias_TypeCode.cpp
+        * tao/Alias_TypeCode.h
+        * tao/Alias_TypeCode.inl
+        * tao/Alias_TypeCode_Static.cpp
+        * tao/Alias_TypeCode_Static.h
+        * tao/Alias_TypeCode_Static.inl
+        * tao/Any.cpp
+        * tao/Any.h
+        * tao/Any.i
+        * tao/AnySeq.pidl
+        * tao/AnySeqA.cpp
+        * tao/AnySeqC.cpp
+        * tao/AnySeqC.h
+        * tao/AnySeqS.h
+        * tao/Any_Arg_Traits.h
+        * tao/Any_Array_Impl_T.cpp
+        * tao/Any_Array_Impl_T.h
+        * tao/Any_Array_Impl_T.inl
+        * tao/Any_Basic_Impl.cpp
+        * tao/Any_Basic_Impl.h
+        * tao/Any_Basic_Impl_T.cpp
+        * tao/Any_Basic_Impl_T.h
+        * tao/Any_Basic_Impl_T.inl
+        * tao/Any_Dual_Impl_T.cpp
+        * tao/Any_Dual_Impl_T.h
+        * tao/Any_Dual_Impl_T.inl
+        * tao/Any_Impl.cpp
+        * tao/Any_Impl.h
+        * tao/Any_Impl_T.cpp
+        * tao/Any_Impl_T.h
+        * tao/Any_Impl_T.inl
+        * tao/Any_Special_Impl_T.cpp
+        * tao/Any_Special_Impl_T.h
+        * tao/Any_Special_Impl_T.inl
+        * tao/Any_SystemException.cpp
+        * tao/Any_SystemException.h
+        * tao/Any_Unknown_IDL_Type.cpp
+        * tao/Any_Unknown_IDL_Type.h
+        * tao/BooleanSeqA.cpp
+        * tao/Bounds.pidl
+        * tao/BoundsA.cpp
+        * tao/BoundsC.cpp
+        * tao/BoundsC.h
+        * tao/CONV_FRAMEA.cpp
+        * tao/CharSeqA.cpp
+        * tao/CurrentA.cpp
+        * tao/DomainA.cpp
+        * tao/DoubleSeqA.cpp
+        * tao/Dynamic.pidl
+        * tao/DynamicA.cpp
+        * tao/DynamicC.cpp
+        * tao/DynamicC.h
+        * tao/DynamicS.h
+        * tao/Dynamic_Parameter.pidl
+        * tao/Dynamic_ParameterA.cpp
+        * tao/Dynamic_ParameterC.cpp
+        * tao/Dynamic_ParameterC.h
+        * tao/Empty_Param_TypeCode.cpp
+        * tao/Empty_Param_TypeCode.h
+        * tao/Empty_Param_TypeCode.inl
+        * tao/Enum_TypeCode.cpp
+        * tao/Enum_TypeCode.h
+        * tao/Enum_TypeCode.inl
+        * tao/Enum_TypeCode_Static.cpp
+        * tao/Enum_TypeCode_Static.h
+        * tao/Enum_TypeCode_Static.inl
+        * tao/Fixed_TypeCode.cpp
+        * tao/Fixed_TypeCode.h
+        * tao/Fixed_TypeCode.inl
+        * tao/FloatSeqA.cpp
+        * tao/GIOPA.cpp
+        * tao/IIOPA.cpp
+        * tao/IIOP_EndpointsA.cpp
+        * tao/IOP_IORA.cpp
+        * tao/InvalidSlotA.cpp
+        * tao/LongDoubleSeqA.cpp
+        * tao/LongLongSeqA.cpp
+        * tao/LongSeqA.cpp
+        * tao/Marshal.cpp
+        * tao/Marshal.h
+        * tao/Marshal.i
+        * tao/Messaging_PolicyValueA.cpp
+        * tao/NVList.cpp
+        * tao/NVList.h
+        * tao/NVList.i
+        * tao/Null_RefCount_Policy.h
+        * tao/ObjectIdListA.cpp
+        * tao/Objref_TypeCode.cpp
+        * tao/Objref_TypeCode.h
+        * tao/Objref_TypeCode.inl
+        * tao/Objref_TypeCode_Static.cpp
+        * tao/Objref_TypeCode_Static.h
+        * tao/Objref_TypeCode_Static.inl
+        * tao/OctetSeqA.cpp
+        * tao/PICurrentA.cpp
+        * tao/ParameterModeA.cpp
+        * tao/PolicyA.cpp
+        * tao/Policy_ForwardA.cpp
+        * tao/Recursive_Type_TypeCode.cpp
+        * tao/Recursive_Type_TypeCode.h
+        * tao/Recursive_Type_TypeCode.inl
+        * tao/RefCount_Policy_Traits.h
+        * tao/Sequence_TypeCode.cpp
+        * tao/Sequence_TypeCode.h
+        * tao/Sequence_TypeCode.inl
+        * tao/Sequence_TypeCode_Static.cpp
+        * tao/Sequence_TypeCode_Static.h
+        * tao/Sequence_TypeCode_Static.inl
+        * tao/ShortSeqA.cpp
+        * tao/StringSeqA.cpp
+        * tao/String_TypeCode.cpp
+        * tao/String_TypeCode.h
+        * tao/String_TypeCode.inl
+        * tao/String_TypeCode_Static.cpp
+        * tao/String_TypeCode_Static.h
+        * tao/String_TypeCode_Static.inl
+        * tao/String_TypeCode_Traits.h
+        * tao/Struct_TypeCode.cpp
+        * tao/Struct_TypeCode.h
+        * tao/Struct_TypeCode.inl
+        * tao/Struct_TypeCode_Static.cpp
+        * tao/Struct_TypeCode_Static.h
+        * tao/Struct_TypeCode_Static.inl
+        * tao/SystemExceptionA.cpp
+        * tao/TAOA.cpp
+        * tao/TimeBaseA.cpp
+        * tao/True_RefCount_Policy.cpp
+        * tao/True_RefCount_Policy.h
+        * tao/True_RefCount_Policy.inl
+        * tao/TypeCode.cpp
+        * tao/TypeCode.h
+        * tao/TypeCode.inl
+        * tao/TypeCodeA.cpp
+        * tao/TypeCode_Base_Attributes.cpp
+        * tao/TypeCode_Base_Attributes.h
+        * tao/TypeCode_Base_Attributes.inl
+        * tao/TypeCode_CDR_Extraction.cpp
+        * tao/TypeCode_CDR_Extraction.h
+        * tao/TypeCode_Case.cpp
+        * tao/TypeCode_Case.h
+        * tao/TypeCode_Case.inl
+        * tao/TypeCode_Case_T.cpp
+        * tao/TypeCode_Case_T.h
+        * tao/TypeCode_Case_T.inl
+        * tao/TypeCode_Constants.cpp
+        * tao/TypeCode_Constants.h
+        * tao/TypeCode_Struct_Field.h
+        * tao/TypeCode_Traits.h
+        * tao/TypeCode_Value_Field.h
+        * tao/ULongLongSeqA.cpp
+        * tao/ULongSeqA.cpp
+        * tao/UShortSeqA.cpp
+        * tao/Union_TypeCode.cpp
+        * tao/Union_TypeCode.h
+        * tao/Union_TypeCode.inl
+        * tao/Union_TypeCode_Static.cpp
+        * tao/Union_TypeCode_Static.h
+        * tao/Union_TypeCode_Static.inl
+        * tao/Value_TypeCode.cpp
+        * tao/Value_TypeCode.h
+        * tao/Value_TypeCode.inl
+        * tao/Value_TypeCode_Static.cpp
+        * tao/Value_TypeCode_Static.h
+        * tao/Value_TypeCode_Static.inl
+        * tao/WCharSeqA.cpp
+        * tao/WStringSeqA.cpp
+        * tao/WrongTransactionA.cpp
+        * tao/append.cpp
+        * tao/skip.cpp
+          All these files are moved to the AnyTypeCode directory
+
+        * tao/UB_String_Argument_T.cpp:
+        * tao/Special_Basic_Argument_T.cpp:
+        * tao/Basic_Argument_T.cpp:
+        * tao/Object_Argument_T.cpp:
+        * tao/operation_details.cpp
+        * tao/Invocation_Base.cpp
+          Only include Dynamic_ParameterC.h when interceptors are enabled
+
+        * tao/SystemException.{h,cpp}:
+          Moved excp_factory to this file, we need it here, temporarily
+          removed _tao_type, we need to work on this.
+
+        * tao/RequestInfo_Util.{h,cpp}:
+          Don't build these when interceptors are disabled
+
+        * tao/ORB_Core.cpp
+          Include ace/Message_Block.h to get ACE_Data_Block
+
+        * tao/ORB_Core.h:
+          Added forward declaration of ACE_Data_Block
+
+        * tao/extra_core.mpb:
+          Removed NVList
+
+        * tao/corba.h:
+          Removed BoundsC.h
+
+        * tao/PortableInterceptorC.cpp
+        * tao/VisibilityC.cpp
+        * tao/orb_typesC.cpp
+        * tao/ORB.cpp
+        * tao/PI_ForwardC.cpp
+        * tao/InvalidSlotC.cpp
+        * tao/WrongTransactionC.cpp
+        * tao/GIOPC.cpp
+
+        * tao/Exception.{h,cpp}:
+          Commented out the Any operators, they should go to another lib,
+          will handle this later
+
+        * tao/Buffering_Constraint_Policy.cpp:
+          Commented out Any usage, needs to be addressed
+
+        * tao/WrongTransactionC.{h,cpp}:
+        * tao/PolicyC.cpp:
+          Commented out _tao_type for exceptions, we have to solve this
+          because exceptions now use TypeCode but we have subsetted that
+
+        * tao/UShortSeqC.h
+        * tao/ULongSeqC.h
+        * tao/WCharSeqC.h
+        * tao/Typecode_typesC.h
+        * tao/ULongLongSeqC.h
+        * tao/StringSeqC.h
+        * tao/TAOC.h
+        * tao/TimeBaseC.h
+        * tao/Policy_ForwardC.h
+        * tao/PortableInterceptorC.h
+        * tao/ShortSeqC.h
+        * tao/VisibilityC.h
+        * tao/LongDoubleSeqC.h
+        * tao/LongLongSeqC.h
+        * tao/LongSeqC.h
+        * tao/Messaging_PolicyValueC.h
+        * tao/ObjectIdListC.h
+        * tao/OctetSeqC.h
+        * tao/PICurrentC.h
+        * tao/PI_ForwardC.h
+        * tao/ParameterModeC.h
+        * tao/PolicyC.h
+        * tao/GIOPC.h
+        * tao/IIOPC.h
+        * tao/IIOP_EndpointsC.h
+        * tao/IOP_IORC.h
+        * tao/InvalidSlotC.h
+        * tao/DomainC.h
+        * tao/CharSeqC.h
+        * tao/CurrentC.h
+        * tao/DoubleSeqC.h
+        * tao/Exception.h
+        * tao/FloatSeqC.h
+        * tao/WStringSeqC.h
+        * tao/WrongTransactionC.h
+        * tao/orb_typesC.h
+        * tao/BooleanSeqC.h
+        * tao/CONV_FRAMEC.h
+          Removed TypeCode and Any operators, these are now all
+          in AnyTypeCode/*.h. This has been by hand, with the
+          change of Jeff below we can automate this
+
+        * tao.mpc
+          Removed a lot of files
+
+        Thu Jul 28 02:15:01 UTC 2005  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_codegen.cpp:
+        * TAO_IDL/be/be_global.cpp:
+        * TAO_IDL/be/be_produce.cpp:
+        * TAO_IDL/be/be_visitor_context.cpp:
+        * TAO_IDL/be/be_visitor_array/any_op_ch.cpp:
+        * TAO_IDL/be/be_visitor_enum/any_op_ch.cpp:
+        * TAO_IDL/be/be_visitor_exception/any_op_ch.cpp:
+        * TAO_IDL/be/be_visitor_interface/any_op_ch.cpp:
+        * TAO_IDL/be/be_visitor_root/any_op.cpp:
+        * TAO_IDL/be/be_visitor_root/root.cpp:
+        * TAO_IDL/be/be_visitor_sequence/any_op_ch.cpp:
+        * TAO_IDL/be/be_visitor_structure/any_op_ch.cpp:
+        * TAO_IDL/be/be_visitor_union/any_op_ch.cpp:
+        * TAO_IDL/be/be_visitor_valuebox/any_op_ch.cpp:
+        * TAO_IDL/be/be_visitor_valuetype/any_op_ch.cpp:
+        * TAO_IDL/be_include/be_codegen.h:
+        * TAO_IDL/be_include/be_global.h:
+        * TAO_IDL/be_include/be_visitor_context.h:
+
+          Modified -GA option to generate a *A.h file as well as
+          a *A.cpp file, and added -Wb options 'anyop_export_macro'
+          and 'anyop_export_include' to optionally compile the *A.*
+          files into a separate library.
+
+        Wed Jul 27 17:51:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * TAO_IDL/be/be_visitor_argument/invoke_cs.cpp:
+        * TAO_IDL/be/be_visitor_argument/marshal_ss.cpp:
+        * TAO_IDL/be/be_visitor_argument/paramlist.cpp:
+        * TAO_IDL/be/be_visitor_field/cdr_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_field/serializer_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_sequence/serializer_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_union/cdr_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_union/serializer_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_union_branch/cdr_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_union_branch/serializer_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_valuebox/valuebox_ci.cpp:
+        * TAO_IDL/be/be_visitor_valuebox/valuebox_cs.cpp:
+        * TAO_IDL/be/be_visitor_valuetype/field_cdr_cs.cpp:
+          Use ACE_OutputCDR::from_octet and ACE_InputCDR:to_octet instead
+          of CORBA::Any::from_octect and CORBA::Any::to_octet
+
+        Wed Jul 27 14:56:12 UTC 2005  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/GIOP_Message_Generator_Parser_10.cpp:
+        * tao/GIOP_Message_Generator_Parser_12.cpp:
+        * tao/GIOP_Message_Lite.cpp:
+          Use ACE_OutputCDR::from_octet and ACE_InputCDR:to_octet
+
 Thu Aug 18 13:59:52 2005  J.T. Conklin  <jtc@acorntoolworks.com>
 
 	* orbsvcs/orbsvcs/Log/LogActivator.cpp:
diff --git a/TAO/TAO_IDL/be/be_codegen.cpp b/TAO/TAO_IDL/be/be_codegen.cpp
index 48fcc7959f2..96bf9c9917a 100644
--- a/TAO/TAO_IDL/be/be_codegen.cpp
+++ b/TAO/TAO_IDL/be/be_codegen.cpp
@@ -44,6 +44,7 @@ TAO_CodeGen::TAO_CodeGen (void)
     server_template_skeletons_ (0),
     server_inline_ (0),
     server_template_inline_ (0),
+    anyop_header_ (0),
     anyop_source_ (0),
     gperf_input_stream_ (0),
     gperf_input_filename_ (0),
@@ -202,7 +203,7 @@ TAO_CodeGen::start_client_header (const char *fname)
   // We must include all the client headers corresponding to
   // IDL files included by the current IDL file.
   // We will use the included IDL file names as they appeared
-  // in the original main IDL file, not the one  which went
+  // in the original main IDL file, not the one which went
   // thru CC preprocessor.
   for (size_t j = 0; j < nfiles; ++j)
     {
@@ -228,9 +229,10 @@ TAO_CodeGen::start_client_header (const char *fname)
         }
       else
         {
-          ACE_ERROR ((LM_WARNING,
-                      ACE_TEXT ("\nWARNING, invalid file '%s' included"),
-                      idl_name));
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             ACE_TEXT ("\nERROR, invalid file '%s' included"),
+                             idl_name),
+                            -1);
         }
     }
 
@@ -241,22 +243,6 @@ TAO_CodeGen::start_client_header (const char *fname)
   *this->client_header_ << "#define TAO_EXPORT_MACRO "
                         << be_global->stub_export_macro ();
 
-  *this->client_header_ << "\n\n#if defined(_MSC_VER)\n"
-                        << "#pragma warning(push)\n"
-                        << "#pragma warning(disable:4250)";
-
-  if (be_global->use_raw_throw ())
-    {
-      *this->client_header_ << "\n#pragma warning(disable:4290)";
-    }
-
-  *this->client_header_ << "\n#endif /* _MSC_VER */";
-
-  *this->client_header_
-      << "\n\n#if defined (__BORLANDC__)\n"
-      << "#pragma option push -w-rvl -w-rch -w-ccc -w-inl\n"
-      << "#endif /* __BORLANDC__ */";
-
   return 0;
 }
 
@@ -291,14 +277,10 @@ TAO_CodeGen::start_client_stubs (const char *fname)
                        << "// " << __FILE__ << ":" << __LINE__
                        << be_nl << be_nl;
 
-  // Generate the ident string, if any.
-  this->gen_ident_string (this->client_stubs_);
-
   this->gen_stub_src_includes ();
 
-  *this->client_stubs_ << "\n\n#if defined (__BORLANDC__)\n"
-                       << "#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig\n"
-                       << "#endif /* __BORLANDC__ */";
+  // Generate the ident string, if any.
+  this->gen_ident_string (this->client_stubs_);
 
   // Only when we generate a client inline file generate the include
   if (be_global->gen_client_inline ())
@@ -311,7 +293,7 @@ TAO_CodeGen::start_client_stubs (const char *fname)
                            << "\"";
       *this->client_stubs_ << "\n#endif /* !defined INLINE */";
     }
-    
+
   return 0;
 }
 
@@ -468,23 +450,6 @@ TAO_CodeGen::start_server_header (const char *fname)
         }
     }
 
-  *this->server_header_ << be_nl << be_nl
-                        << "#if defined(_MSC_VER)\n"
-                        << "#pragma warning(push)\n"
-                        << "#pragma warning(disable:4250)";
-
-  if (be_global->use_raw_throw ())
-    {
-      *this->server_header_ << "\n#pragma warning(disable:4290)";
-    }
-
-  *this->server_header_ << "\n#endif /* _MSC_VER */";
-
-  *this->server_header_
-      << "\n\n#if defined (__BORLANDC__)\n"
-      << "#pragma option push -w-rvl -w-rch -w-ccc -w-inl\n"
-      << "#endif /* __BORLANDC__ */";
-
   if (be_global->skel_export_include () != 0)
     {
       *this->server_header_ << "\n\n#include \""
@@ -552,17 +517,6 @@ TAO_CodeGen::start_server_template_header (const char *fname)
                                      << "\"";
     }
 
-  *this->server_template_header_ << "\n\n#if defined(_MSC_VER)\n"
-                                 << "#pragma warning(push)\n"
-                                 << "#pragma warning(disable:4250)\n";
-
-  if (be_global->use_raw_throw ())
-    {
-      *this->server_template_header_ << "#pragma warning(disable:4290)\n";
-    }
-
-  *this->server_template_header_ << "#endif /* _MSC_VER */\n";
-
   return 0;
 }
 
@@ -624,10 +578,6 @@ TAO_CodeGen::start_server_skeletons (const char *fname)
 
   this->gen_skel_src_includes ();
 
-  *this->server_skeletons_ << "\n\n#if defined (__BORLANDC__)\n"
-                           << "#pragma option -w-rvl -w-rch -w-ccc -w-aus\n"
-                           << "#endif /* __BORLANDC__ */";
-
   // Only when we generate a server inline file generate the include
   if (be_global->gen_server_inline ())
     {
@@ -780,6 +730,146 @@ TAO_CodeGen::server_template_inline (void)
 }
 
 int
+TAO_CodeGen::start_anyop_header (const char *fname)
+{
+  // Retrieve the singleton instance to the outstream factory.
+  TAO_OutStream_Factory *factory = TAO_OUTSTREAM_FACTORY::instance ();
+
+  // Retrieve a specialized instance.
+  this->anyop_header_ = factory->make_outstream ();
+
+  if (!this->anyop_header_)
+    {
+      return -1;
+    }
+
+  if (this->anyop_header_->open (fname,
+                                 TAO_OutStream::TAO_CLI_HDR)
+       == -1)
+    {
+      return -1;
+    }
+
+  *this->anyop_header_ << be_nl << "// TAO_IDL - Generated from" << be_nl
+                       << "// " << __FILE__ << ":" << __LINE__
+                       << be_nl << be_nl;
+
+  // Generate the #ident string, if any.
+  this->gen_ident_string (this->anyop_header_);
+
+  // Generate the #ifndef clause.
+  this->gen_ifndef_string (fname,
+                           this->anyop_header_,
+                           "_TAO_IDL_",
+                           "_H_");
+
+  if (be_global->pre_include () != 0)
+    {
+      *this->anyop_header_ << "#include /**/ \""
+                           << be_global->pre_include ()
+                           << "\"\n";
+    }
+
+  // If anyop macro hasn't been set, default to stub macro.
+  if (be_global->anyop_export_include () != 0)
+    {
+      *this->anyop_header_ << "\n#include \""
+                           << be_global->anyop_export_include ()
+                           << "\"";
+    }
+  else if (be_global->stub_export_include () != 0)
+    {
+      *this->anyop_header_ << "\n#include \""
+                           << be_global->stub_export_include ()
+                           << "\"";
+    }
+
+  char *tao_prefix = "";
+  ACE_CString pidl_checker (idl_global->filename ()->get_string ());
+  bool got_pidl =
+    (pidl_checker.substr (pidl_checker.length () - 5) == ".pidl");
+
+  // If we're here and we have a .pidl file, we need to generate
+  // the *A.h include from the AnyTypeCode library.
+  if (got_pidl)
+    {
+      tao_prefix = "tao/";
+    }
+
+  // Generate the include statement for the client header. We just
+  // need to put only the base names. Path info is not required.
+  *this->anyop_header_ << "\n#include \"" << tao_prefix
+                       << be_global->be_get_client_hdr_fname ()
+                       << "\"";
+
+  // If we have not suppressed Any operator generation and also
+  // are not generating the operators in a separate file, we
+  // need to include the *A.h file from all .pidl files here.
+  if (be_global->any_support ())
+    {
+      for (size_t j = 0; j < idl_global->n_included_idl_files (); ++j)
+        {
+          char* idl_name = idl_global->included_idl_files ()[j];
+
+          // Make a String out of it.
+          UTL_String idl_name_str = idl_name;
+
+          const char *anyop_hdr =
+            BE_GlobalData::be_get_anyop_header (&idl_name_str, 1);
+
+          ACE_CString pidl_checker (idl_name);
+          bool got_pidl =
+            (pidl_checker.substr (pidl_checker.length () - 5) == ".pidl");
+
+          // If we're here and we have a .pidl file, we need to generate
+          // the *A.h include from the AnyTypeCode library.
+          if (got_pidl)
+            {
+              // Stripped off any scope in the name and add the
+              // AnyTypeCode prefix.
+              ACE_CString work_hdr (anyop_hdr);
+              ACE_CString final_hdr = "tao/AnyTypeCode/";
+              int pos = work_hdr.rfind ('/');
+
+              if (pos != ACE_SString::npos)
+                {
+                  ACE_CString scope (work_hdr.substr (0, pos - 1));
+
+                  // If we find a '/' in the containing scope name, it
+                  // means we are including a .pidl file from a
+                  // subdirectory of $TAO_ROOT/tao, and so we should
+                  // include the anyop_hdr string as is, and not strip
+                  // off the scope name and prepend "tao/AnyTypeCode/".
+                  // Only .pidl files in $TAO_ROOT/tao itself have
+                  // their generated *A.* files moved to the AnyTypeCode
+                  // library.
+                  if (scope.find ('/') == ACE_SString::npos)
+                    {
+                      work_hdr = work_hdr.substr (pos + 1);
+                      final_hdr += work_hdr;
+                    }
+                  else
+                    {
+                      final_hdr = work_hdr;
+                    }
+                }
+
+              this->anyop_header_->print ("\n#include \"%s\"",
+                                          final_hdr.c_str ());
+            }
+          else
+            {
+              this->anyop_header_->print ("\n#include \"%s\"",
+                                          anyop_hdr);
+            }
+        }
+    }
+  *this->anyop_header_ << "\n";
+
+  return 0;
+}
+
+int
 TAO_CodeGen::start_anyop_source (const char *fname)
 {
   // Retrieve the singleton instance to the outstream factory.
@@ -811,16 +901,21 @@ TAO_CodeGen::start_anyop_source (const char *fname)
   // Generate the include statement for the client header. We just
   // need to put only the base names. Path info is not required.
   *this->anyop_source_ << "\n#include \""
-                       << be_global->be_get_client_hdr_fname (1)
+                       << be_global->be_get_anyop_header_fname (1)
                        << "\"";
 
-
   this->gen_typecode_includes (this->anyop_source_);
 
   return 0;
 }
 
 TAO_OutStream *
+TAO_CodeGen::anyop_header (void)
+{
+  return this->anyop_header_;
+}
+
+TAO_OutStream *
 TAO_CodeGen::anyop_source (void)
 {
   return this->anyop_source_;
@@ -830,12 +925,6 @@ TAO_CodeGen::anyop_source (void)
 int
 TAO_CodeGen::start_implementation_header (const char *fname)
 {
-  // @@ We are making use of "included_idl_files" that is in the
-  // idl_global. We need to make sure the validity of those files.
-
-
-  idl_global->validate_included_idl_files ();
-
   // Retrieve the singleton instance to the outstream factory.
   TAO_OutStream_Factory *factory = TAO_OUTSTREAM_FACTORY::instance ();
 
@@ -898,10 +987,6 @@ TAO_CodeGen::implementation_header (void)
 int
 TAO_CodeGen::start_implementation_skeleton (const char *fname)
 {
-  // @@ We are making use of "included_idl_files" that is in the
-  // idl_global. We need to make sure the validity of those files.
-  idl_global->validate_included_idl_files ();
-
   // Retrieve the singleton instance to the outstream factory.
   TAO_OutStream_Factory *factory = TAO_OUTSTREAM_FACTORY::instance ();
 
@@ -965,14 +1050,6 @@ TAO_CodeGen::end_client_header (void)
       *this->client_header_ << "#endif /* defined INLINE */";
     }
 
-  *this->client_header_ << "\n\n#if defined(_MSC_VER)\n"
-                        << "#pragma warning(pop)\n"
-                        << "#endif /* _MSC_VER */";
-
-  *this->client_header_ << "\n\n#if defined (__BORLANDC__)\n"
-                        << "#pragma option pop\n"
-                        << "#endif /* __BORLANDC__ */";
-
   // Code to put the last #endif.
   *this->client_header_ << "\n\n";
 
@@ -1014,14 +1091,6 @@ TAO_CodeGen::end_server_header (void)
       *this->server_header_ << "#endif /* defined INLINE */";
     }
 
-  *this->server_header_ << "\n\n#if defined(_MSC_VER)\n"
-                        << "#pragma warning(pop)\n"
-                        << "#endif /* _MSC_VER */";
-
-  *this->server_header_ << "\n\n#if defined (__BORLANDC__)\n"
-                        << "#pragma option pop\n"
-                        << "#endif /* __BORLANDC__ */";
-
   // Code to put the last #endif.
   *this->server_header_ << "\n\n";
 
@@ -1121,10 +1190,6 @@ TAO_CodeGen::end_server_template_header (void)
       << "\")";
   *this->server_template_header_ << "\n#endif /* defined REQUIRED PRAGMA */";
 
-  *this->server_template_header_ << "\n\n#if defined(_MSC_VER)\n"
-                                 << "#pragma warning(pop)\n"
-                                 << "#endif /* _MSC_VER */";
-
   // Code to put the last #endif.
   *this->server_template_header_ << "\n\n";
 
@@ -1166,13 +1231,26 @@ TAO_CodeGen::end_server_skeletons (void)
 }
 
 int
-TAO_CodeGen::end_anyop_source (void)
+TAO_CodeGen::end_anyop_header (void)
 {
-  if (!be_global->gen_tmplinst ())
+  if (be_global->post_include () != 0)
     {
-      *this->anyop_source_ << "\n";
+      *this->anyop_header_ << "\n\n#include /**/ \""
+                           << be_global->post_include ()
+                           << "\"";
     }
 
+  // Code to put the last #endif.
+  *this->anyop_header_ << "\n\n#endif /* ifndef */\n";
+
+  return 0;
+}
+
+int
+TAO_CodeGen::end_anyop_source (void)
+{
+  *this->anyop_source_ << "\n";
+
   return 0;
 }
 
@@ -1426,27 +1504,27 @@ TAO_CodeGen::gen_stub_hdr_includes (void)
   // If not included here, it will appear in *C.cpp, if TCs not suppressed.
   this->gen_cond_file_include (
       idl_global->typecode_seen_,
-      "tao/TypeCode.h",
+      "tao/AnyTypeCode/TypeCode.h",
       this->client_header_
     );
 
   this->gen_cond_file_include (
       idl_global->any_seen_
       | idl_global->typecode_seen_,
-      "tao/TypeCode_Constants.h",
+      "tao/AnyTypeCode/TypeCode_Constants.h",
       this->client_header_);
 
   // This is true if we have an 'any' in the IDL file.
   // If not included here, it will appear in *C.cpp, if Anys not suppressed.
   this->gen_cond_file_include (
       idl_global->any_seen_,
-      "tao/Any.h",
+      "tao/AnyTypeCode/Any.h",
       this->client_header_
     );
 
   this->gen_cond_file_include (
       idl_global->any_seen_,
-      "tao/TypeCode.h",
+      "tao/AnyTypeCode/TypeCode.h",
       this->client_header_
     );
 
@@ -1465,6 +1543,65 @@ TAO_CodeGen::gen_stub_hdr_includes (void)
                                   "tao/SmartProxies/Smart_Proxies.h");
     }
 
+  // If we have not suppressed Any operator generation and also
+  // are not generating the operators in a separate file, we
+  // need to include the *A.h file from all .pidl files here.
+  if (be_global->any_support () && !be_global->gen_anyop_files ())
+    {
+      for (size_t j = 0; j < idl_global->n_included_idl_files (); ++j)
+        {
+          char* idl_name = idl_global->included_idl_files ()[j];
+
+          ACE_CString pidl_checker (idl_name);
+          bool got_pidl =
+            (pidl_checker.substr (pidl_checker.length () - 5) == ".pidl");
+
+          // If we're here and we have a .pidl file, we need to generate
+          // the *A.h include from the AnyTypeCode library.
+          if (got_pidl)
+            {
+              // Make a String out of it.
+              UTL_String idl_name_str = idl_name;
+
+              const char *anyop_hdr =
+                BE_GlobalData::be_get_anyop_header (&idl_name_str, 1);
+
+              // Stripped off any scope in the name and add the
+              // AnyTypeCode prefix.
+              ACE_CString work_hdr (anyop_hdr);
+              ACE_CString final_hdr = "tao/AnyTypeCode/";
+              int pos = work_hdr.rfind ('/');
+
+              if (pos != ACE_SString::npos)
+                {
+                  ACE_CString scope (work_hdr.substr (0, pos));
+
+                  // If we find a '/' in the containing scope name, it
+                  // means we are including a .pidl file from a
+                  // subdirectory of $TAO_ROOT/tao, and so we should
+                  // include the anyop_hdr string as is, and not strip
+                  // off the scope name and prepend "tao/AnyTypeCode/".
+                  // Only .pidl files in $TAO_ROOT/tao itself have
+                  // their generated *A.* files moved to the AnyTypeCode
+                  // library.
+                  if (scope.find ('/') == ACE_SString::npos)
+                    {
+                      work_hdr = work_hdr.substr (pos + 1);
+                      final_hdr += work_hdr;
+                    }
+                  else
+                    {
+                      final_hdr = work_hdr;
+                    }
+                }
+
+              this->client_header_->print ("\n#include \"%s\"",
+                                           final_hdr.c_str ());
+            }
+        }
+    }
+
+
   // Must have knowledge of the base class.
   this->gen_seq_file_includes ();
 
@@ -1495,11 +1632,15 @@ TAO_CodeGen::gen_stub_src_includes (void)
 
   // Conditional includes.
 
-  // Operations for local interfaces are pure virtual.
-  if (idl_global->non_local_op_seen_)
+   if (idl_global->non_local_op_seen_)
     {
       this->gen_standard_include (this->client_stubs_,
                                   "tao/Exception_Data.h");
+    }
+
+  // Operations for local interfaces are pure virtual.
+  if (idl_global->non_local_op_seen_)
+    {
       this->gen_standard_include (this->client_stubs_,
                                   "tao/Invocation_Adapter.h");
     }
@@ -1591,7 +1732,7 @@ TAO_CodeGen::gen_stub_src_includes (void)
   // strlen() for DCPS marshaling or
   // strcmp() is used with interfaces and exceptions.
   if ((be_global->gen_dcps_type_support ()
-	  && (idl_global->string_seen_ 
+	  && (idl_global->string_seen_
 	      || idl_global->string_seq_seen_
 		  || idl_global->wstring_seq_seen_) )
 	  || idl_global->interface_seen_
@@ -1673,9 +1814,9 @@ TAO_CodeGen::gen_skel_src_includes (void)
   this->gen_standard_include (this->server_skeletons_,
                               "tao/Object_T.h");
   this->gen_standard_include (this->server_skeletons_,
-                              "tao/TypeCode.h");
+                              "tao/AnyTypeCode/TypeCode.h");
   this->gen_standard_include (this->server_skeletons_,
-                              "tao/DynamicC.h");
+                              "tao/AnyTypeCode/DynamicC.h");
   this->gen_standard_include (this->server_skeletons_,
                               "tao/CDR.h");
   this->gen_standard_include (this->server_skeletons_,
@@ -1742,13 +1883,13 @@ TAO_CodeGen::gen_any_file_includes (void)
           this->gen_standard_include (stream,
                                       "tao/CDR.h");
           this->gen_standard_include (stream,
-                                      "tao/Any.h");
+                                      "tao/AnyTypeCode/Any.h");
         }
 
       this->gen_cond_file_include (
           idl_global->interface_seen_
           | idl_global->valuetype_seen_,
-          "tao/Any_Impl_T.h",
+          "tao/AnyTypeCode/Any_Impl_T.h",
           stream
         );
 
@@ -1756,19 +1897,19 @@ TAO_CodeGen::gen_any_file_includes (void)
           idl_global->aggregate_seen_
           | idl_global->seq_seen_
           | idl_global->exception_seen_,
-          "tao/Any_Dual_Impl_T.h",
+          "tao/AnyTypeCode/Any_Dual_Impl_T.h",
           stream
         );
 
       this->gen_cond_file_include (
           idl_global->array_seen_,
-          "tao/Any_Array_Impl_T.h",
+          "tao/AnyTypeCode/Any_Array_Impl_T.h",
           stream
         );
 
       this->gen_cond_file_include (
           idl_global->enum_seen_,
-          "tao/Any_Basic_Impl_T.h",
+          "tao/AnyTypeCode/Any_Basic_Impl_T.h",
           stream
         );
     }
@@ -1831,6 +1972,14 @@ TAO_CodeGen::gen_stub_arg_file_includes (TAO_OutStream * stream)
       stream
     );
 
+  // If we have a bound string and we have any generation enabled we must
+  // include Any.h to get the <<= operator for BD_String
+  this->gen_cond_file_include (
+      idl_global->bd_string_arg_seen_ && be_global->any_support (),
+      "tao/AnyTypeCode/Any.h",
+      stream
+    );
+
   this->gen_cond_file_include (
       idl_global->fixed_array_arg_seen_,
       "tao/Fixed_Array_Argument_T.h",
@@ -1875,7 +2024,7 @@ TAO_CodeGen::gen_stub_arg_file_includes (TAO_OutStream * stream)
 
   this->gen_cond_file_include (
       idl_global->any_arg_seen_,
-      "tao/Any_Arg_Traits.h",
+      "tao/AnyTypeCode/Any_Arg_Traits.h",
       stream
     );
 }
@@ -1896,6 +2045,14 @@ TAO_CodeGen::gen_skel_arg_file_includes (TAO_OutStream * stream)
       stream
     );
 
+  // If we have a bound string and we have any generation enabled we must
+  // include Any.h to get the <<= operator for BD_String
+  this->gen_cond_file_include (
+      idl_global->bd_string_arg_seen_ && be_global->any_support (),
+      "tao/AnyTypeCode/Any.h",
+      stream
+    );
+
   this->gen_cond_file_include (
       idl_global->fixed_array_arg_seen_,
       "tao/PortableServer/Fixed_Array_SArgument_T.h",
@@ -1999,62 +2156,62 @@ void
 TAO_CodeGen::gen_typecode_includes (TAO_OutStream * stream)
 {
   this->gen_standard_include (stream,
-                              "tao/Null_RefCount_Policy.h");
+                              "tao/AnyTypeCode/Null_RefCount_Policy.h");
 
   this->gen_standard_include (stream,
-                              "tao/TypeCode_Constants.h");
+                              "tao/AnyTypeCode/TypeCode_Constants.h");
 
   // Just assume we're going to need alias TypeCodes since there is
   // currently no alias_seen_ or typedef_seen_ flag in idl_global.
   this->gen_standard_include (stream,
-                              "tao/Alias_TypeCode_Static.h");
+                              "tao/AnyTypeCode/Alias_TypeCode_Static.h");
 
   this->gen_cond_file_include (idl_global->enum_seen_,
-                               "tao/Enum_TypeCode_Static.h",
+                               "tao/AnyTypeCode/Enum_TypeCode_Static.h",
                                stream);
 
   this->gen_cond_file_include (idl_global->interface_seen_,
-                               "tao/Objref_TypeCode_Static.h",
+                               "tao/AnyTypeCode/Objref_TypeCode_Static.h",
                                stream);
 
   this->gen_cond_file_include (idl_global->seq_seen_
                                | idl_global->array_seen_,
-                               "tao/Sequence_TypeCode_Static.h",
+                               "tao/AnyTypeCode/Sequence_TypeCode_Static.h",
                                stream);
 
   this->gen_cond_file_include (idl_global->string_seen_,
-                               "tao/String_TypeCode_Static.h",
+                               "tao/AnyTypeCode/String_TypeCode_Static.h",
                                stream);
 
   this->gen_cond_file_include (
       idl_global->exception_seen_
       | idl_global->aggregate_seen_,
-      "tao/Struct_TypeCode_Static.h",
+      "tao/AnyTypeCode/Struct_TypeCode_Static.h",
       stream);
 
   this->gen_cond_file_include (
       idl_global->exception_seen_
       | idl_global->aggregate_seen_,
-      "tao/TypeCode_Struct_Field.h",
+      "tao/AnyTypeCode/TypeCode_Struct_Field.h",
       stream);
 
   this->gen_cond_file_include (idl_global->union_seen_,
-                               "tao/TypeCode_Case_T.h",
+                               "tao/AnyTypeCode/TypeCode_Case_T.h",
                                stream);
 
   this->gen_cond_file_include (idl_global->union_seen_,
-                               "tao/Union_TypeCode_Static.h",
+                               "tao/AnyTypeCode/Union_TypeCode_Static.h",
                                stream);
 
   this->gen_cond_file_include (idl_global->valuetype_seen_,
-                               "tao/Value_TypeCode_Static.h",
+                               "tao/AnyTypeCode/Value_TypeCode_Static.h",
                                stream);
 
   this->gen_cond_file_include (idl_global->valuetype_seen_,
-                               "tao/TypeCode_Value_Field.h",
+                               "tao/AnyTypeCode/TypeCode_Value_Field.h",
                                stream);
 
   this->gen_cond_file_include (idl_global->recursive_type_seen_,
-                               "tao/Recursive_Type_TypeCode.h",
+                               "tao/AnyTypeCode/Recursive_Type_TypeCode.h",
                                stream);
 }
diff --git a/TAO/TAO_IDL/be/be_global.cpp b/TAO/TAO_IDL/be/be_global.cpp
index c0fe4a1c770..79b1e9c1979 100644
--- a/TAO/TAO_IDL/be/be_global.cpp
+++ b/TAO/TAO_IDL/be/be_global.cpp
@@ -40,6 +40,8 @@ BE_GlobalData::BE_GlobalData (void)
     skel_export_include_ (0),
     stub_export_macro_ (0),
     stub_export_include_ (0),
+    anyop_export_macro_ (0),
+    anyop_export_include_ (0),
     pch_include_ (0),
     pre_include_ (0),
     post_include_ (0),
@@ -59,6 +61,7 @@ BE_GlobalData::BE_GlobalData (void)
     anyop_hdr_ending_ (ACE::strnew ("A.h")),
     anyop_src_ending_ (ACE::strnew ("A.cpp")),
     output_dir_ (0),
+    anyop_output_dir_ (0),
     any_support_ (I_TRUE),
     tc_support_ (I_TRUE),
     obv_opt_accessor_ (0),
@@ -81,7 +84,6 @@ BE_GlobalData::BE_GlobalData (void)
     gen_smart_proxies_ (I_FALSE),
     gen_inline_constants_ (I_TRUE),
     gen_dcps_type_support_ (I_FALSE),
-    gen_tmplinst_ (I_FALSE),
     lookup_strategy_ (TAO_PERFECT_HASH),
     void_type_ (0),
     ccmobject_ (0),
@@ -116,7 +118,8 @@ BE_GlobalData::changing_standard_include_files (void)
 static const char*
 be_change_idl_file_extension (UTL_String* idl_file,
                               const char *new_extension,
-                              int base_name_only = 0)
+                              int base_name_only = 0,
+                              bool for_anyop = false)
 {
   // @@ This shouldn't happen anyway; but a better error handling
   // mechanism is needed.
@@ -158,13 +161,20 @@ be_change_idl_file_extension (UTL_String* idl_file,
     {
       return 0;
     }
-
-  if ((!base_name_only) && (be_global->output_dir () != 0))
+    
+  // Anyop file output defaults to general output dir if not set.  
+  const char *output_path = (for_anyop 
+                             ? (be_global->anyop_output_dir () == 0
+                                ? be_global->output_dir ()
+                                : be_global->anyop_output_dir ())
+                             : be_global->output_dir ());
+
+  if (!base_name_only && output_path != 0)
     {
       // Path info should also be added to fname.
 
       // Add path and "/".
-      ACE_OS::sprintf (fname, "%s/", be_global->output_dir ());
+      ACE_OS::sprintf (fname, "%s/", output_path);
 
       // Append the base part to fname.
       ACE_OS::strncpy (fname + strlen (fname), string, base - string);
@@ -305,7 +315,8 @@ BE_GlobalData::be_get_anyop_header (UTL_String *idl_file_name,
 {
   return be_change_idl_file_extension (idl_file_name,
                                        be_global->anyop_header_ending (),
-                                       base_name_only);
+                                       base_name_only,
+                                       true);
 }
 
 const char *
@@ -314,7 +325,8 @@ BE_GlobalData::be_get_anyop_source (UTL_String *idl_file_name,
 {
   return be_change_idl_file_extension (idl_file_name,
                                        be_global->anyop_source_ending (),
-                                       base_name_only);
+                                       base_name_only,
+                                       true);
 }
 
 const char *
@@ -405,11 +417,21 @@ BE_GlobalData::be_get_anyop_source_fname (int base_name_only)
                               base_name_only);
 }
 
+const char *
+BE_GlobalData::be_get_anyop_header_fname (int base_name_only)
+{
+  return be_get_anyop_header (idl_global->stripped_filename (),
+                              base_name_only);
+}
+
 const char*
 BE_GlobalData::skel_export_macro (void) const
 {
   if (this->skel_export_macro_ == 0)
-    return "";
+    {
+      return "";
+    }
+    
   return this->skel_export_macro_;
 }
 
@@ -435,7 +457,10 @@ const char*
 BE_GlobalData::stub_export_macro (void) const
 {
   if (this->stub_export_macro_ == 0)
-    return "";
+    {
+      return "";
+    }
+    
   return this->stub_export_macro_;
 }
 
@@ -458,6 +483,35 @@ BE_GlobalData::stub_export_include (const char *s)
 }
 
 const char*
+BE_GlobalData::anyop_export_macro (void) const
+{
+  if (this->anyop_export_macro_ == 0)
+    {
+      return "";
+    }
+    
+  return this->anyop_export_macro_;
+}
+
+void
+BE_GlobalData::anyop_export_macro (const char *s)
+{
+  this->anyop_export_macro_ = ACE_OS::strdup (s);
+}
+
+const char*
+BE_GlobalData::anyop_export_include (void) const
+{
+  return this->anyop_export_include_;
+}
+
+void
+BE_GlobalData::anyop_export_include (const char *s)
+{
+  this->anyop_export_include_ = ACE_OS::strdup (s);
+}
+
+const char*
 BE_GlobalData::pch_include (void) const
 {
   return this->pch_include_;
@@ -665,12 +719,26 @@ BE_GlobalData::server_template_inline_ending (void) const
   return this->server_template_inline_ending_;
 }
 
+void
+BE_GlobalData::anyop_header_ending (const char* s)
+{
+  delete [] this->anyop_hdr_ending_;
+  this->anyop_hdr_ending_ = ACE::strnew (s);
+}
+
 const char*
 BE_GlobalData::anyop_header_ending (void) const
 {
   return this->anyop_hdr_ending_;
 }
 
+void
+BE_GlobalData::anyop_source_ending (const char* s)
+{
+  delete [] this->anyop_src_ending_;
+  this->anyop_src_ending_ = ACE::strnew (s);
+}
+
 const char*
 BE_GlobalData::anyop_source_ending (void) const
 {
@@ -691,6 +759,19 @@ BE_GlobalData::output_dir (void) const
 }
 
 void
+BE_GlobalData::anyop_output_dir (const char* s)
+{
+  delete [] this->anyop_output_dir_;
+  this->anyop_output_dir_ = ACE::strnew (s);
+}
+
+const char*
+BE_GlobalData::anyop_output_dir (void) const
+{
+  return this->anyop_output_dir_;
+}
+
+void
 BE_GlobalData::any_support (idl_bool val)
 {
   this->any_support_ = val;
@@ -906,18 +987,6 @@ BE_GlobalData::gen_dcps_type_support (void) const
 }
 
 void
-BE_GlobalData::gen_tmplinst (idl_bool val)
-{
-  this->gen_tmplinst_ = val;
-}
-
-idl_bool
-BE_GlobalData::gen_tmplinst (void) const
-{
-  return this->gen_tmplinst_;
-}
-
-void
 BE_GlobalData::lookup_strategy (LOOKUP_STRATEGY s)
 {
   this->lookup_strategy_ = s;
@@ -988,6 +1057,9 @@ BE_GlobalData::destroy (void)
 
   delete [] this->output_dir_;
   this->output_dir_ = 0;
+
+  delete [] this->anyop_output_dir_;
+  this->anyop_output_dir_ = 0;
 }
 
 AST_PredefinedType *
@@ -1346,6 +1418,47 @@ BE_GlobalData::parse_args (long &i, char **av)
             be_global->output_dir (av [i + 1]);
             i++;
           }
+        else if (av[i][2] == 'A')
+          {
+            if (av[i][3] == '\0')
+              {
+                idl_global->append_idl_flag (av[i + 1]);
+
+                int result = ACE_OS::mkdir (av[i + 1]);
+
+                #if !defined (__BORLANDC__)
+                  if (result != 0 && errno != EEXIST)
+                #else
+                  // The Borland RTL doesn't give EEXIST back, only EACCES in case
+                  // the directory exists, reported to Borland as QC 9495
+                  if (result != 0 && errno != EEXIST && errno != EACCES)
+                #endif
+                  {
+                    ACE_ERROR ((
+                        LM_ERROR,
+                        ACE_TEXT ("IDL: unable to create directory %s")
+                        ACE_TEXT (" specified by -oA option\n"),
+                        av[i + 1]
+                      ));
+
+                    ACE_OS::exit (99);
+                  }
+
+                be_global->anyop_output_dir (av [i + 1]);
+                i++;
+              }
+            else
+              {
+                ACE_ERROR ((
+                    LM_ERROR,
+                    ACE_TEXT ("IDL: I don't understand")
+                    ACE_TEXT (" the '%s' option\n"),
+                    av[i]
+                  ));
+
+                ACE_OS::exit (99);
+              }
+          }
         else
           {
             ACE_ERROR ((
@@ -1542,10 +1655,6 @@ BE_GlobalData::parse_args (long &i, char **av)
                   }
               }
           }
-        else if (av[i][2] == 'T')
-          {
-            be_global->gen_tmplinst (I_TRUE);
-          }
         else
           {
             ACE_ERROR ((
@@ -1654,6 +1763,8 @@ BE_GlobalData::prep_be_arg (char *s)
   const char skel_arg_include[] = "skel_export_include=";
   const char stub_arg_macro[] = "stub_export_macro=";
   const char stub_arg_include[] = "stub_export_include=";
+  const char anyop_arg_macro[] = "anyop_export_macro=";
+  const char anyop_arg_include[] = "anyop_export_include=";
   const char arg_pch_include[] = "pch_include=";
   const char arg_pre_include[] = "pre_include=";
   const char arg_post_include[] = "post_include=";
@@ -1670,6 +1781,7 @@ BE_GlobalData::prep_be_arg (char *s)
           char* val = arg + sizeof (arg_macro) - 1;
           be_global->skel_export_macro (val);
           be_global->stub_export_macro (val);
+          be_global->anyop_export_macro (val);
         }
       else if (ACE_OS::strstr (arg, arg_include) == arg)
         {
@@ -1696,6 +1808,16 @@ BE_GlobalData::prep_be_arg (char *s)
           char* val = arg + sizeof (stub_arg_include) - 1;
           be_global->stub_export_include (val);
         }
+      else if (ACE_OS::strstr (arg, anyop_arg_macro) == arg)
+        {
+          char* val = arg + sizeof (anyop_arg_macro) - 1;
+          be_global->anyop_export_macro (val);
+        }
+      else if (ACE_OS::strstr (arg, anyop_arg_include) == arg)
+        {
+          char* val = arg + sizeof (anyop_arg_include) - 1;
+          be_global->anyop_export_include (val);
+        }
       else if (ACE_OS::strstr (arg, arg_pch_include) == arg)
         {
           char* val = arg + sizeof (arg_pch_include) - 1;
@@ -1822,7 +1944,7 @@ BE_GlobalData::usage (void) const
   ACE_DEBUG ((
       LM_DEBUG,
       ACE_TEXT (" -Ge 2\t\t\tUse raw throw instead of ACE_THROW macro")
-      ACE_TEXT (" (disabled by default\n")
+      ACE_TEXT (" (disabled by default)\n")
     ));
   ACE_DEBUG ((
       LM_DEBUG,
@@ -1883,11 +2005,6 @@ BE_GlobalData::usage (void) const
     ));
   ACE_DEBUG ((
       LM_DEBUG,
-      ACE_TEXT (" -GT\t\t\tgenerate explicit template instantiations")
-      ACE_TEXT (" (off by default)\n")
-    ));
-  ACE_DEBUG ((
-      LM_DEBUG,
       ACE_TEXT (" -GA\t\t\tgenerate Any operator and type code bodies in *A.cpp")
       ACE_TEXT (" (generated in *C.cpp by default)\n")
     ));
@@ -1949,6 +2066,11 @@ BE_GlobalData::usage (void) const
     ));
   ACE_DEBUG ((
       LM_DEBUG,
+      ACE_TEXT (" -oA <output_dir>\tOutput directory for the generated anyop")
+      ACE_TEXT ("files. Default is current directory\n")
+    ));
+  ACE_DEBUG ((
+      LM_DEBUG,
       ACE_TEXT (" -si\t\t\tServer's inline file name ending.")
       ACE_TEXT (" Default is S.inl\n")
     ));
diff --git a/TAO/TAO_IDL/be/be_produce.cpp b/TAO/TAO_IDL/be/be_produce.cpp
index 3f282aa1389..2e7c41fe210 100644
--- a/TAO/TAO_IDL/be/be_produce.cpp
+++ b/TAO/TAO_IDL/be/be_produce.cpp
@@ -173,6 +173,25 @@ BE_produce (void)
   // Get a root visitor.
   be_visitor_root_ch root_ch_visitor (&ctx);
 
+  // Initialize the anyop header stream, if the option is set.
+  if (be_global->gen_anyop_files ())
+    {
+      int status = 0;
+
+      status =
+        tao_cg->start_anyop_header (
+                  be_global->be_get_anyop_header_fname ()
+                );
+
+      if (status == -1)
+        {
+          ACE_ERROR ((LM_ERROR,
+                            "(%N:%l) TAO_CodeGen::"
+                            "TAO_CodeGen - "
+                            "Error opening anyop header file\n"));
+        }
+    }
+        
   // Generate code for the client header
   if (root->accept (&root_ch_visitor) == -1)
     {
@@ -182,7 +201,7 @@ BE_produce (void)
       BE_abort ();
     }
 
-  // (2) Initialize the anyop streams, if the option is set.
+  // Initialize the anyop source stream, if the option is set.
   // It has to be done after the stub header file generation,
   // where checks for recursive types are done,
   // and before stub source file generation,
diff --git a/TAO/TAO_IDL/be/be_visitor_arg_traits.cpp b/TAO/TAO_IDL/be/be_visitor_arg_traits.cpp
index 947c2fc84d6..f7a77246c3f 100644
--- a/TAO/TAO_IDL/be/be_visitor_arg_traits.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_arg_traits.cpp
@@ -114,6 +114,9 @@ be_visitor_arg_traits::visit_interface (be_interface *node)
     {
       TAO_OutStream *os = this->ctx_->stream ();
 
+      *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
+          << "// " << __FILE__ << ":" << __LINE__;
+
       std::string guard_suffix =
         std::string (this->S_) + std::string ("arg_traits");
 
@@ -138,7 +141,8 @@ be_visitor_arg_traits::visit_interface (be_interface *node)
             << "TAO::Objref_Traits<" << node->name () << ">";
         }
 
-      *os << be_uidt_nl
+      *os << "," << be_nl << this->insert_policy() << " <"
+          << node->name () << "_ptr>" << be_uidt_nl
           << ">" << be_uidt << be_uidt << be_uidt << be_uidt_nl
           << "{" << be_nl
           << "};";
@@ -220,7 +224,8 @@ be_visitor_arg_traits::visit_valuebox (be_valuebox *node)
              << "TAO::Value_Traits<" << node->name () << ">";
         }
 
-      os << be_uidt_nl
+      os << "," << be_nl << this->insert_policy() << " <"
+         << node->name () << "*>" << be_uidt_nl
          << ">" << be_uidt << be_uidt << be_uidt << be_uidt_nl
          << "{" << be_nl
          << "};";
@@ -269,7 +274,8 @@ be_visitor_arg_traits::visit_valuetype (be_valuetype *node)
              << "TAO::Value_Traits<" << node->name () << ">";
         }
 
-      os << be_uidt_nl
+      os << "," << be_nl << this->insert_policy() << " <"
+         << node->name () << "*>" << be_uidt_nl
          << ">" << be_uidt << be_uidt << be_uidt << be_uidt_nl
          << "{" << be_nl
          << "};";
@@ -354,6 +360,10 @@ be_visitor_arg_traits::visit_operation (be_operation *node)
       if (bound > 0)
         {
           TAO_OutStream *os = this->ctx_->stream ();
+
+          *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
+              << "// " << __FILE__ << ":" << __LINE__;
+
           idl_bool wide = (str->width () != 1);
 
           *os << be_nl << be_nl;
@@ -373,11 +383,22 @@ be_visitor_arg_traits::visit_operation (be_operation *node)
 
           *os << "template<>" << be_nl
               << "class "
-              << this->S_ << "Arg_Traits<" << node->flat_name ()
+              << this->S_ << "Arg_Traits<"
+              << node->flat_name ()
               << ">" << be_idt_nl
               << ": public" << be_idt << be_idt_nl
-              << "BD_" << (wide ? "W" : "")
-              << "String_" << this->S_ << "Arg_Traits<" << bound << ">"
+              << "BD_String_" << this->S_ << "Arg_Traits_T<" << be_nl
+              << "CORBA::" << (wide ? "W" : "") << "Char," << be_nl
+              << "CORBA::" << (wide ? "W" : "") << "String_var," << be_nl
+              << "CORBA::" << (wide ? "W" : "") << "String_out," << be_nl
+              << "ACE_InputCDR::to_" << (wide ? "w" : "") << "string," << be_nl
+              << "ACE_OutputCDR::from_" << (wide ? "w" : "") << "string," << be_nl
+              << bound << "," << be_nl
+              << this->insert_policy() << " <" << be_idt_nl
+              << "ACE_OutputCDR::from_" << (wide ? "w" : "") << "string" << be_uidt_nl
+              << ">"
+              << be_uidt_nl
+              << ">"
               << be_uidt << be_uidt << be_uidt_nl
               << "{" << be_nl
               << "};";
@@ -421,6 +442,10 @@ be_visitor_arg_traits::visit_attribute (be_attribute *node)
     }
 
   TAO_OutStream *os = this->ctx_->stream ();
+
+  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__;
+
   idl_bool wide = (st->width () != 1);
 
   // It is legal IDL to declare a bounded (w)string as an operation
@@ -446,11 +471,22 @@ be_visitor_arg_traits::visit_attribute (be_attribute *node)
 
   *os << "template<>" << be_nl
       << "class "
-      << this->S_ << "Arg_Traits<" << node->flat_name ()
+      << this->S_ << "Arg_Traits<"
+      << node->flat_name ()
       << ">" << be_idt_nl
       << ": public" << be_idt << be_idt_nl
-      << "BD_" << (wide ? "W" : "")
-      << "String_" << this->S_ << "Arg_Traits<" << bound << ">"
+      << "BD_String_" << this->S_ << "Arg_Traits_T<" << be_nl
+      << "CORBA::" << (wide ? "W" : "") << "Char," << be_nl
+      << "CORBA::" << (wide ? "W" : "") << "String_var," << be_nl
+      << "CORBA::" << (wide ? "W" : "") << "String_out," << be_nl
+      << "ACE_InputCDR::to_" << (wide ? "w" : "") << "string," << be_nl
+      << "ACE_OutputCDR::from_" << (wide ? "w" : "") << "string," << be_nl
+      << bound << "," << be_nl
+      << this->insert_policy() << " <" << be_idt_nl
+      << "ACE_OutputCDR::from_" << (wide ? "w" : "") << "string" << be_uidt_nl
+      << ">"
+      << be_uidt_nl
+      << ">"
       << be_uidt << be_uidt << be_uidt_nl
       << "{" << be_nl
       << "};";
@@ -487,6 +523,10 @@ be_visitor_arg_traits::visit_argument (be_argument *node)
     }
 
   TAO_OutStream *os = this->ctx_->stream ();
+
+  *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
+      << "// " << __FILE__ << ":" << __LINE__;
+
   idl_bool wide = (st->width () != 1);
 
   // It is legal IDL to declare a bounded (w)string as an operation
@@ -511,11 +551,22 @@ be_visitor_arg_traits::visit_argument (be_argument *node)
 
   *os << "template<>" << be_nl
       << "class "
-      << this->S_ << "Arg_Traits<" << node->flat_name ()
+      << this->S_ << "Arg_Traits<"
+      << node->flat_name ()
       << ">" << be_idt_nl
       << ": public" << be_idt << be_idt_nl
-      << "BD_" << (wide ? "W" : "")
-      << "String_" << this->S_ << "Arg_Traits<" << bound << ">"
+      << "BD_String_" << this->S_ << "Arg_Traits_T<" << be_nl
+      << "CORBA::" << (wide ? "W" : "") << "Char," << be_nl
+      << "CORBA::" << (wide ? "W" : "") << "String_var," << be_nl
+      << "CORBA::" << (wide ? "W" : "") << "String_out," << be_nl
+      << "ACE_InputCDR::to_" << (wide ? "w" : "") << "string," << be_nl
+      << "ACE_OutputCDR::from_" << (wide ? "w" : "") << "string," << be_nl
+      << bound << "," << be_nl
+      << this->insert_policy() << " <" << be_idt_nl
+      << "ACE_OutputCDR::from_" << (wide ? "w" : "") << "string" << be_uidt_nl
+      << ">"
+      << be_uidt_nl
+      << ">"
       << be_uidt << be_uidt << be_uidt_nl
       << "{" << be_nl
       << "};";
@@ -554,7 +605,8 @@ be_visitor_arg_traits::visit_sequence (be_sequence *node)
       << "Var_Size_" << this->S_ << "Arg_Traits_T<" << be_idt << be_idt_nl
       << alias->name () << "," << be_nl
       << alias->name () << "_var," << be_nl
-      << alias->name () << "_out" << be_uidt_nl
+      << alias->name () << "_out," << be_nl
+      << this->insert_policy() << " <" << alias->name () << ">" << be_uidt_nl
       << ">" << be_uidt << be_uidt << be_uidt << be_uidt_nl
       << "{" << be_nl
       << "};";
@@ -594,14 +646,14 @@ be_visitor_arg_traits::visit_string (be_string *node)
 
   // This should be generated even for imported nodes. The ifdef
   // guard prevents multiple declarations.
-    
+
   if (alias == 0)
     {
       os->gen_ifdef_macro (node->flat_name(), guard_suffix.c_str (), false);
     }
   else
     {
-      // Form a unique macro name using the local name and the bound.     
+      // Form a unique macro name using the local name and the bound.
       unsigned long l = bound;
       int num_digits = 0;
       while (l > 0)
@@ -613,17 +665,17 @@ be_visitor_arg_traits::visit_string (be_string *node)
       char* bound_string = 0;
       ACE_NEW_RETURN (bound_string, char[bound_length], -1) ;
       ACE_OS::sprintf (bound_string, "%lu", bound);
-    
+
       size_t cat_length = ACE_OS::strlen (alias->local_name ()->get_string ()) +
                           ACE_OS::strlen (bound_string) +
                           1;
       char* cat_string = 0;
-      ACE_NEW_RETURN (cat_string, char[cat_length], -1) ; 
+      ACE_NEW_RETURN (cat_string, char[cat_length], -1) ;
       ACE_OS::strcpy (cat_string, alias->local_name ()->get_string ()) ;
       ACE_OS::strcat (cat_string, bound_string);
 
       os->gen_ifdef_macro (cat_string, guard_suffix.c_str (), false);
-       
+
       delete [] cat_string;
       delete [] bound_string;
     }
@@ -669,8 +721,18 @@ be_visitor_arg_traits::visit_string (be_string *node)
 
   *os << ">" << be_idt_nl
       << ": public" << be_idt << be_idt_nl
-      << "BD_" << (wide ? "W" : "")
-      << "String_" << this->S_ << "Arg_Traits<" << bound << ">"
+      << "BD_String_" << this->S_ << "Arg_Traits_T<" << be_nl
+      << "CORBA::" << (wide ? "W" : "") << "Char," << be_nl
+      << "CORBA::" << (wide ? "W" : "") << "String_var," << be_nl
+      << "CORBA::" << (wide ? "W" : "") << "String_out," << be_nl
+      << "ACE_InputCDR::to_" << (wide ? "w" : "") << "string," << be_nl
+      << "ACE_OutputCDR::from_" << (wide ? "w" : "") << "string," << be_nl
+      << bound << "," << be_nl
+      << this->insert_policy() << " <" << be_idt_nl
+      << "ACE_OutputCDR::from_" << (wide ? "w" : "") << "string" << be_uidt_nl
+      << ">"
+      << be_uidt_nl
+      << ">"
       << be_uidt << be_uidt << be_uidt_nl
       << "{" << be_nl
       << "};";
@@ -756,6 +818,9 @@ be_visitor_arg_traits::visit_array (be_array *node)
           << node->name () << "_tag";
     }
 
+  *os << "," << be_nl << this->insert_policy() << " <" << node->name ()
+      << "_forany" << ">";
+
   *os << be_uidt_nl
       << ">" << be_uidt << be_uidt << be_uidt << be_uidt_nl
       << "{" << be_nl
@@ -795,7 +860,8 @@ be_visitor_arg_traits::visit_enum (be_enum *node)
       << ": public" << be_idt << be_idt_nl;
 
   *os << "Basic_" << this->S_ << "Arg_Traits_T<" << be_idt << be_idt_nl
-      << node->name () << be_uidt_nl
+      << node->name () << "," << be_nl
+      << this->insert_policy() << " <" << node->name () << ">" << be_uidt_nl
       << ">" << be_uidt << be_uidt << be_uidt << be_uidt_nl
       << "{" << be_nl
       << "};";
@@ -846,7 +912,8 @@ be_visitor_arg_traits::visit_structure (be_structure *node)
           << node->name () << "_out";
     }
 
-  *os << be_uidt_nl
+  *os << "," << be_nl << this->insert_policy() << " <"
+      << node->name () << ">" << be_uidt_nl
       << ">" << be_uidt << be_uidt << be_uidt << be_uidt_nl
       << "{" << be_nl
       << "};";
@@ -960,6 +1027,9 @@ be_visitor_arg_traits::visit_union (be_union *node)
           << node->name () << "_out";
     }
 
+  *os << "," << be_nl << this->insert_policy() << " <"
+      << node->name () << ">";
+
   *os << be_uidt_nl
       << ">" << be_uidt << be_uidt << be_uidt << be_uidt_nl
       << "{" << be_nl
@@ -1105,3 +1175,16 @@ be_visitor_arg_traits::visit_home (be_home *node)
 {
   return this->visit_interface (node);
 }
+
+const char *
+be_visitor_arg_traits::insert_policy (void)
+{
+  if (be_global->any_support ())
+    {
+      return "TAO::Any_Insert_Policy_Stream";
+    }
+  else
+    {
+      return "TAO::Any_Insert_Policy_Noop";
+    }
+}
diff --git a/TAO/TAO_IDL/be/be_visitor_argument/invoke_cs.cpp b/TAO/TAO_IDL/be/be_visitor_argument/invoke_cs.cpp
index b9a474a744b..4001e6417e9 100644
--- a/TAO/TAO_IDL/be/be_visitor_argument/invoke_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_argument/invoke_cs.cpp
@@ -18,8 +18,8 @@
 //
 // ============================================================================
 
-ACE_RCSID (be_visitor_argument, 
-           invoke_cs, 
+ACE_RCSID (be_visitor_argument,
+           invoke_cs,
            "$Id$")
 
 
@@ -276,16 +276,16 @@ int be_visitor_args_invoke_cs::visit_predefined_type (be_predefined_type *node)
               *os << arg->local_name ();
               break;
             case AST_PredefinedType::PT_char:
-              *os << "::CORBA::Any::from_char (" << arg->local_name () << ")";
+              *os << "::ACE_OutputCDR::from_char (" << arg->local_name () << ")";
               break;
             case AST_PredefinedType::PT_wchar:
-              *os << "::CORBA::Any::from_wchar (" << arg->local_name () << ")";
+              *os << "::ACE_OutputCDR::from_wchar (" << arg->local_name () << ")";
               break;
             case AST_PredefinedType::PT_boolean:
-              *os << "::CORBA::Any::from_boolean (" << arg->local_name () << ")";
+              *os << "::ACE_OutputCDR::from_boolean (" << arg->local_name () << ")";
               break;
             case AST_PredefinedType::PT_octet:
-              *os << "::CORBA::Any::from_octet (" << arg->local_name () << ")";
+              *os << "::ACE_OutputCDR::from_octet (" << arg->local_name () << ")";
               break;
             default:
               ACE_ERROR_RETURN ((LM_ERROR,
@@ -323,16 +323,16 @@ int be_visitor_args_invoke_cs::visit_predefined_type (be_predefined_type *node)
               *os << arg->local_name ();
               break;
             case AST_PredefinedType::PT_char:
-              *os << "::CORBA::Any::to_char (" << arg->local_name () << ")";
+              *os << "::ACE_InputCDR::to_char (" << arg->local_name () << ")";
               break;
             case AST_PredefinedType::PT_wchar:
-              *os << "::CORBA::Any::to_wchar (" << arg->local_name () << ")";
+              *os << "::ACE_InputCDR::to_wchar (" << arg->local_name () << ")";
               break;
             case AST_PredefinedType::PT_boolean:
-              *os << "::CORBA::Any::to_boolean (" << arg->local_name () << ")";
+              *os << "::ACE_InputCDR::to_boolean (" << arg->local_name () << ")";
               break;
             case AST_PredefinedType::PT_octet:
-              *os << "::CORBA::Any::to_octet (" << arg->local_name () << ")";
+              *os << "::ACE_InputCDR::to_octet (" << arg->local_name () << ")";
               break;
             default:
               ACE_ERROR_RETURN ((LM_ERROR,
@@ -364,16 +364,16 @@ int be_visitor_args_invoke_cs::visit_predefined_type (be_predefined_type *node)
               *os << arg->local_name ();
               break;
             case AST_PredefinedType::PT_char:
-              *os << "::CORBA::Any::to_char (" << arg->local_name () << ")";
+              *os << "::ACE_InputCDR::to_char (" << arg->local_name () << ")";
               break;
             case AST_PredefinedType::PT_wchar:
-              *os << "::CORBA::Any::to_wchar (" << arg->local_name () << ")";
+              *os << "::ACE_InputCDR::to_wchar (" << arg->local_name () << ")";
               break;
             case AST_PredefinedType::PT_boolean:
-              *os << "::CORBA::Any::to_boolean (" << arg->local_name () << ")";
+              *os << "::ACE_InputCDR::to_boolean (" << arg->local_name () << ")";
               break;
             case AST_PredefinedType::PT_octet:
-              *os << "::CORBA::Any::to_octet (" << arg->local_name () << ")";
+              *os << "::ACE_InputCDR::to_octet (" << arg->local_name () << ")";
               break;
             default:
               ACE_ERROR_RETURN ((LM_ERROR,
@@ -485,11 +485,11 @@ int be_visitor_args_invoke_cs::visit_string (be_string *node)
             case AST_Argument::dir_INOUT:
               if (node->width () == (long) sizeof (char))
                 {
-                  *os << "::CORBA::Any::to_string (";
+                  *os << "::ACE_InputCDR::to_string (";
                 }
               else
                 {
-                  *os << "::CORBA::Any::to_wstring (";
+                  *os << "::ACE_InputCDR::to_wstring (";
                 }
 
               *os << arg->local_name () << ", "
@@ -498,11 +498,11 @@ int be_visitor_args_invoke_cs::visit_string (be_string *node)
             case AST_Argument::dir_OUT:
               if (node->width () == (long) sizeof (char))
                 {
-                  *os << "::CORBA::Any::to_string (";
+                  *os << "::ACE_InputCDR::to_string (";
                 }
               else
                 {
-                  *os << "::CORBA::Any::to_wstring (";
+                  *os << "::ACE_InputCDR::to_wstring (";
                 }
 
               *os << arg->local_name () << ".ptr (), "
diff --git a/TAO/TAO_IDL/be/be_visitor_argument/marshal_ss.cpp b/TAO/TAO_IDL/be/be_visitor_argument/marshal_ss.cpp
index 46b141d852b..39ea6f27f8c 100644
--- a/TAO/TAO_IDL/be/be_visitor_argument/marshal_ss.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_argument/marshal_ss.cpp
@@ -280,16 +280,16 @@ int be_visitor_args_marshal_ss::visit_predefined_type (
               *os << arg->local_name ();
               break;
             case AST_PredefinedType::PT_char:
-              *os << "::CORBA::Any::to_char (" << arg->local_name () << ")";
+              *os << "::ACE_InputCDR::to_char (" << arg->local_name () << ")";
               break;
             case AST_PredefinedType::PT_wchar:
-              *os << "::CORBA::Any::to_wchar (" << arg->local_name () << ")";
+              *os << "::ACE_InputCDR::to_wchar (" << arg->local_name () << ")";
               break;
             case AST_PredefinedType::PT_boolean:
-              *os << "::CORBA::Any::to_boolean (" << arg->local_name () << ")";
+              *os << "::ACE_InputCDR::to_boolean (" << arg->local_name () << ")";
               break;
             case AST_PredefinedType::PT_octet:
-              *os << "::CORBA::Any::to_octet (" << arg->local_name () << ")";
+              *os << "::ACE_InputCDR::to_octet (" << arg->local_name () << ")";
               break;
             default:
               ACE_ERROR_RETURN ((LM_ERROR,
@@ -331,16 +331,16 @@ int be_visitor_args_marshal_ss::visit_predefined_type (
               *os << arg->local_name ();
               break;
             case AST_PredefinedType::PT_char:
-              *os << "::CORBA::Any::from_char (" << arg->local_name () << ")";
+              *os << "::ACE_OutputCDR::from_char (" << arg->local_name () << ")";
               break;
             case AST_PredefinedType::PT_wchar:
-              *os << "::CORBA::Any::from_wchar (" << arg->local_name () << ")";
+              *os << "::ACE_OutputCDR::from_wchar (" << arg->local_name () << ")";
               break;
             case AST_PredefinedType::PT_boolean:
-              *os << "::CORBA::Any::from_boolean (" << arg->local_name () << ")";
+              *os << "::ACE_OutputCDR::from_boolean (" << arg->local_name () << ")";
               break;
             case AST_PredefinedType::PT_octet:
-              *os << "::CORBA::Any::from_octet (" << arg->local_name () << ")";
+              *os << "::ACE_OutputCDR::from_octet (" << arg->local_name () << ")";
               break;
             default:
               ACE_ERROR_RETURN ((LM_ERROR,
@@ -372,16 +372,16 @@ int be_visitor_args_marshal_ss::visit_predefined_type (
               *os << arg->local_name ();
               break;
             case AST_PredefinedType::PT_char:
-              *os << "::CORBA::Any::from_char (" << arg->local_name () << ")";
+              *os << "::ACE_OutputCDR::from_char (" << arg->local_name () << ")";
               break;
             case AST_PredefinedType::PT_wchar:
-              *os << "::CORBA::Any::from_wchar (" << arg->local_name () << ")";
+              *os << "::ACE_OutputCDR::from_wchar (" << arg->local_name () << ")";
               break;
             case AST_PredefinedType::PT_boolean:
-              *os << "::CORBA::Any::from_boolean (" << arg->local_name () << ")";
+              *os << "::ACE_OutputCDR::from_boolean (" << arg->local_name () << ")";
               break;
             case AST_PredefinedType::PT_octet:
-              *os << "::CORBA::Any::from_octet (" << arg->local_name () << ")";
+              *os << "::ACE_OutputCDR::from_octet (" << arg->local_name () << ")";
               break;
             default:
               ACE_ERROR_RETURN ((
@@ -471,11 +471,11 @@ int be_visitor_args_marshal_ss::visit_string (be_string *node)
             {
               if (node->width () == (long) sizeof (char))
                 {
-                  *os << "::CORBA::Any::to_string (";
+                  *os << "::ACE_InputCDR::to_string (";
                 }
               else
                 {
-                  *os << "::CORBA::Any::to_wstring (";
+                  *os << "::ACE_InputCDR::to_wstring (";
                 }
 
               *os << arg->local_name () << ".out (), "
@@ -514,11 +514,11 @@ int be_visitor_args_marshal_ss::visit_string (be_string *node)
             case AST_Argument::dir_OUT:
               if (node->width () == (long) sizeof (char))
                 {
-                  *os << "::CORBA::Any::from_string ((char *)";
+                  *os << "::ACE_OutputCDR::from_string ((char *)";
                 }
               else
                 {
-                  *os << "::CORBA::Any::from_wstring ((CORBA::WChar *)";
+                  *os << "::ACE_OutputCDR::from_wstring ((CORBA::WChar *)";
                 }
 
               *os << arg->local_name () << ".in (), "
diff --git a/TAO/TAO_IDL/be/be_visitor_argument/paramlist.cpp b/TAO/TAO_IDL/be/be_visitor_argument/paramlist.cpp
index e6fbca5ca9e..e8f10292638 100644
--- a/TAO/TAO_IDL/be/be_visitor_argument/paramlist.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_argument/paramlist.cpp
@@ -101,12 +101,12 @@ int be_visitor_args_paramlist::visit_argument (be_argument *node)
       *os << " _tao_forany_" << node->local_name () << " (";
       *os << this->type_name (bt, "_dup");
       *os << " (";
-      
+
       if (this->direction () != AST_Argument::dir_IN)
         {
           *os << "(const ::" << bt->name () << "_slice *) ";
         }
-        
+
       *os << "this->";
       *os << node->local_name () << "_));" << be_nl;
       *os << "(*parameter_list)[len].argument <<= _tao_forany_" ;
@@ -182,11 +182,11 @@ be_visitor_args_paramlist::visit_string (be_string *node)
       // Bounded strings.
       if (node->width () == (long) sizeof (char))
         {
-          *os << "::CORBA::Any::from_string ((char *)";
+          *os << "::ACE_OutputCDR::from_string ((char *)";
         }
       else
         {
-          *os << "::CORBA::Any::from_wstring ((CORBA::WChar *)";
+          *os << "::ACE_OutputCDR::from_wstring ((CORBA::WChar *)";
         }
 
       *os << arg->local_name () << "_, "
@@ -213,19 +213,19 @@ be_visitor_args_paramlist::visit_predefined_type (be_predefined_type *node)
   switch (node->pt ())
     {
     case AST_PredefinedType::PT_boolean:
-      *os << "::CORBA::Any::from_boolean (this->";
+      *os << "::ACE_OutputCDR::from_boolean (this->";
       *os << arg->local_name () << "_);";
       break;
     case AST_PredefinedType::PT_char:
-      *os << "::CORBA::Any::from_char (this->";
+      *os << "::ACE_OutputCDR::from_char (this->";
       *os << arg->local_name () << "_);";
       break;
     case AST_PredefinedType::PT_wchar:
-      *os << "::CORBA::Any::from_wchar (this->";
+      *os << "::ACE_OutputCDR::from_wchar (this->";
       *os << arg->local_name () << "_);";
       break;
     case AST_PredefinedType::PT_octet:
-      *os << "::CORBA::Any::from_octet (this->";
+      *os << "::ACE_OutputCDR::from_octet (this->";
       *os << arg->local_name () << "_);";
       break;
     default:
diff --git a/TAO/TAO_IDL/be/be_visitor_array/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_array/any_op_ch.cpp
index 1dc5255322d..950690a142f 100644
--- a/TAO/TAO_IDL/be/be_visitor_array/any_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_array/any_op_ch.cpp
@@ -19,8 +19,8 @@
 //
 // ============================================================================
 
-ACE_RCSID (be_visitor_array, 
-           any_op_ch, 
+ACE_RCSID (be_visitor_array,
+           any_op_ch,
            "$Id$")
 
 // ***************************************************************************
@@ -47,15 +47,14 @@ be_visitor_array_any_op_ch::visit_array (be_array *node)
     }
 
   TAO_OutStream *os = this->ctx_->stream ();
+  const char *macro = this->ctx_->export_macro ();
 
   *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
 
-  *os << be_global->stub_export_macro () << " void"
-      << " operator<<= ( ::CORBA::Any &, const " << node->name ()
+  *os << macro << " void operator<<= (::CORBA::Any &, const " << node->name ()
       << "_forany &);" << be_nl;
-  *os << be_global->stub_export_macro () << " ::CORBA::Boolean"
-      << " operator>>= (const ::CORBA::Any &, "
+  *os << macro << " ::CORBA::Boolean operator>>= (const ::CORBA::Any &, "
       << node->name () << "_forany &);";
 
   node->cli_hdr_any_op_gen (1);
diff --git a/TAO/TAO_IDL/be/be_visitor_context.cpp b/TAO/TAO_IDL/be/be_visitor_context.cpp
index 14ff798d34c..ce5bc752dbe 100644
--- a/TAO/TAO_IDL/be/be_visitor_context.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_context.cpp
@@ -25,6 +25,7 @@
 #include "be_enum.h"
 #include "be_enum_val.h"
 #include "be_exception.h"
+#include "be_extern.h"
 #include "be_field.h"
 #include "be_interface.h"
 #include "be_interface_fwd.h"
@@ -615,3 +616,40 @@ be_visitor_context::be_scope_as_union (void)
       return 0;
     }
 }
+
+const char *
+be_visitor_context::export_macro (void) const
+{
+  switch (this->state_)
+    {
+      // If -GA is used, but the anyop macro hasn't been set,
+      // default to the stub macro.
+      case TAO_CodeGen::TAO_ROOT_ANY_OP_CH:
+        return (be_global->gen_anyop_files ()
+                ? this->non_null_export_macro ()
+                : be_global->stub_export_macro ());
+      case TAO_CodeGen::TAO_ARRAY_CH:
+      case TAO_CodeGen::TAO_INTERFACE_CH:
+      case TAO_CodeGen::TAO_INTERFACE_SMART_PROXY_CH:
+      case TAO_CodeGen::TAO_AMI_INTERFACE_CH:
+      case TAO_CodeGen::TAO_AMI_EXCEPTION_HOLDER_VALUETYPE_CH:
+      case TAO_CodeGen::TAO_ROOT_CH:
+        return be_global->stub_export_macro ();
+      case TAO_CodeGen::TAO_INTERFACE_DIRECT_PROXY_IMPL_SH:
+      case TAO_CodeGen::TAO_INTERFACE_AMH_RH_SH:
+      case TAO_CodeGen::TAO_ROOT_SH:
+        return be_global->skel_export_macro ();
+      default:
+        return "";
+    }
+}
+
+const char *
+be_visitor_context::non_null_export_macro (void) const
+{
+  const char *anyop_export = be_global->anyop_export_macro ();
+  
+  return (ACE_OS::strcmp (anyop_export, "") == 0
+          ? be_global->stub_export_macro ()
+          : anyop_export);
+}
diff --git a/TAO/TAO_IDL/be/be_visitor_enum/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_enum/any_op_ch.cpp
index e507c1ecbc0..91c1fde0c47 100644
--- a/TAO/TAO_IDL/be/be_visitor_enum/any_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_enum/any_op_ch.cpp
@@ -18,8 +18,8 @@
 //
 // ============================================================================
 
-ACE_RCSID (be_visitor_enum, 
-           any_op_ch, 
+ACE_RCSID (be_visitor_enum,
+           any_op_ch,
            "$Id$")
 
 // ***************************************************************************
@@ -46,17 +46,16 @@ be_visitor_enum_any_op_ch::visit_enum (be_enum *node)
     }
 
   TAO_OutStream *os = this->ctx_->stream ();
+  const char *macro = this->ctx_->export_macro ();
 
   *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__;
 
   // Generate the Any <<= and >>= operators.
-  *os << be_nl << be_nl 
-      << be_global->stub_export_macro () << " void"
-      << " operator<<= ( ::CORBA::Any &, " << node->name ()
+  *os << be_nl << be_nl
+      << macro << " void operator<<= (::CORBA::Any &, " << node->name ()
       << ");" << be_nl;
-  *os << be_global->stub_export_macro () << " ::CORBA::Boolean"
-      << " operator>>= (const ::CORBA::Any &, "
+  *os << macro << " ::CORBA::Boolean operator>>= (const ::CORBA::Any &, "
       << node->name () << " &);";
 
   node->cli_hdr_any_op_gen (1);
diff --git a/TAO/TAO_IDL/be/be_visitor_exception/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_exception/any_op_ch.cpp
index 6b3127aa13d..4be883ec90b 100644
--- a/TAO/TAO_IDL/be/be_visitor_exception/any_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_exception/any_op_ch.cpp
@@ -18,8 +18,8 @@
 //
 // ============================================================================
 
-ACE_RCSID (be_visitor_exception, 
-           any_op_ch, 
+ACE_RCSID (be_visitor_exception,
+           any_op_ch,
            "$Id$")
 
 // ***************************************************************************
@@ -47,22 +47,19 @@ be_visitor_exception_any_op_ch::visit_exception (be_exception *node)
     }
 
   TAO_OutStream *os = this->ctx_->stream ();
+  const char *macro = this->ctx_->export_macro ();
 
   *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__;
 
   *os << be_nl << be_nl
-      << be_global->stub_export_macro () << " void"
-      << " operator<<= ( ::CORBA::Any &, const " << node->name ()
+      << macro << " void operator<<= (::CORBA::Any &, const " << node->name ()
       << " &); // copying version" << be_nl;
-  *os << be_global->stub_export_macro () << " void"
-      << " operator<<= ( ::CORBA::Any &, " << node->name ()
+  *os << macro << " void operator<<= (::CORBA::Any &, " << node->name ()
       << "*); // noncopying version" << be_nl;
-  *os << be_global->stub_export_macro () << " ::CORBA::Boolean"
-      << " operator>>= (const ::CORBA::Any &, "
+  *os << macro << " ::CORBA::Boolean operator>>= (const ::CORBA::Any &, "
       << node->name () << " *&); // deprecated\n";
-  *os << be_global->stub_export_macro () << " ::CORBA::Boolean"
-      << " operator>>= (const ::CORBA::Any &, const "
+  *os << macro << " ::CORBA::Boolean operator>>= (const ::CORBA::Any &, const "
       << node->name () << " *&);";
 
 
@@ -71,7 +68,7 @@ be_visitor_exception_any_op_ch::visit_exception (be_exception *node)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_exception::visit_exception - "
-                         "codegen for scope failed\n"), 
+                         "codegen for scope failed\n"),
                         -1);
     }
 
@@ -90,7 +87,7 @@ be_visitor_exception_any_op_ch::visit_field (be_field *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_exception_any_op_ch::"
                          "visit_field - "
-                         "Bad field type\n"), 
+                         "Bad field type\n"),
                         -1);
     }
 
@@ -99,7 +96,7 @@ be_visitor_exception_any_op_ch::visit_field (be_field *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_exception_any_op_ch::"
                          "visit_field - "
-                         "codegen for field type failed\n"), 
+                         "codegen for field type failed\n"),
                         -1);
     }
 
@@ -122,7 +119,7 @@ be_visitor_exception_any_op_ch::visit_enum (be_enum *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_exception_any_op_ch::"
                          "visit_enum - "
-                         "codegen for field type failed\n"), 
+                         "codegen for field type failed\n"),
                         -1);
     }
 
@@ -145,7 +142,7 @@ be_visitor_exception_any_op_ch::visit_structure (be_structure *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_exception_any_op_ch::"
                          "visit_structure - "
-                         "codegen for field type failed\n"), 
+                         "codegen for field type failed\n"),
                         -1);
     }
 
@@ -168,7 +165,7 @@ be_visitor_exception_any_op_ch::visit_union (be_union *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_exception_any_op_ch::"
                          "visit_union - "
-                         "codegen for field type failed\n"), 
+                         "codegen for field type failed\n"),
                         -1);
     }
 
diff --git a/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp b/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp
index 78350dc88ce..ad504834d94 100644
--- a/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp
@@ -325,6 +325,13 @@ int be_visitor_exception_cs::visit_exception (be_exception *node)
       *os << be_uidt_nl << "}" << be_nl << be_nl;
     }
 
+  // Switch streams to the *A.cpp file if we are using this option.
+  if (be_global->gen_anyop_files ())
+    {
+      os = tao_cg->anyop_source ();
+      *os << be_nl << be_nl;
+    }
+
   // No check for typecode suppression here, since the typecode is
   // required in generated code for an operation that raises the
   // exception. We have already output a warning message when
@@ -334,8 +341,11 @@ int be_visitor_exception_cs::visit_exception (be_exception *node)
       << "::_tao_type (void) const" << be_nl;
   *os << "{" << be_idt_nl;
   *os << "return ::" << node->tc_name () << ";" << be_uidt_nl;
-      *os << "}";
-      
+  *os << "}";
+
+  // Make sure we are generating to *C.cpp regardless of the above.
+  os = tao_cg->client_stubs ();
+
   // No check for typecode suppression here, since the typecode is
   // required in generated code for an operation that raises the
   // exception. We have already output a warning message when
diff --git a/TAO/TAO_IDL/be/be_visitor_field/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_field/cdr_op_cs.cpp
index 38871eeb801..80e7dbe755f 100644
--- a/TAO/TAO_IDL/be/be_visitor_field/cdr_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_field/cdr_op_cs.cpp
@@ -500,22 +500,22 @@ be_visitor_field_cdr_op_cs::visit_predefined_type (be_predefined_type *node)
         }
       else if (pt == AST_PredefinedType::PT_char)
         {
-          *os << "(strm >> ::CORBA::Any::to_char (_tao_aggregate."
+          *os << "(strm >> ::ACE_InputCDR::to_char (_tao_aggregate."
               << f->local_name () << "))";
         }
       else if (pt == AST_PredefinedType::PT_wchar)
         {
-          *os << "(strm >> ::CORBA::Any::to_wchar (_tao_aggregate."
+          *os << "(strm >> ::ACE_InputCDR::to_wchar (_tao_aggregate."
               << f->local_name () << "))";
         }
       else if (pt == AST_PredefinedType::PT_octet)
         {
-          *os << "(strm >> ::CORBA::Any::to_octet (_tao_aggregate."
+          *os << "(strm >> ::ACE_InputCDR::to_octet (_tao_aggregate."
               << f->local_name () << "))";
         }
       else if (pt == AST_PredefinedType::PT_boolean)
         {
-          *os << "(strm >> ::CORBA::Any::to_boolean (_tao_aggregate."
+          *os << "(strm >> ::ACE_InputCDR::to_boolean (_tao_aggregate."
               << f->local_name () << "))";
         }
       else
@@ -531,22 +531,22 @@ be_visitor_field_cdr_op_cs::visit_predefined_type (be_predefined_type *node)
         }
       else if (pt == AST_PredefinedType::PT_char)
         {
-          *os << "(strm << ::CORBA::Any::from_char (_tao_aggregate."
+          *os << "(strm << ::ACE_OutputCDR::from_char (_tao_aggregate."
               << f->local_name () << "))";
         }
       else if (pt == AST_PredefinedType::PT_wchar)
         {
-          *os << "(strm << ::CORBA::Any::from_wchar (_tao_aggregate."
+          *os << "(strm << ::ACE_OutputCDR::from_wchar (_tao_aggregate."
               << f->local_name () << "))";
         }
       else if (pt == AST_PredefinedType::PT_octet)
         {
-          *os << "(strm << ::CORBA::Any::from_octet (_tao_aggregate."
+          *os << "(strm << ::ACE_OutputCDR::from_octet (_tao_aggregate."
               << f->local_name () << "))";
         }
       else if (pt == AST_PredefinedType::PT_boolean)
         {
-          *os << "(strm << ::CORBA::Any::from_boolean (_tao_aggregate."
+          *os << "(strm << ::ACE_OutputCDR::from_boolean (_tao_aggregate."
               << f->local_name () << "))";
         }
       else
diff --git a/TAO/TAO_IDL/be/be_visitor_field/serializer_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_field/serializer_op_cs.cpp
index c55f26aa604..e599cc1c088 100644
--- a/TAO/TAO_IDL/be/be_visitor_field/serializer_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_field/serializer_op_cs.cpp
@@ -11,7 +11,7 @@
 //    field_serializer_op_cs.cpp
 //
 // = DESCRIPTION
-//    Visitor generating TAO::DCPS::Serializer operators code for Field in 
+//    Visitor generating TAO::DCPS::Serializer operators code for Field in
 //    the client stubs file.
 //
 // = AUTHOR
@@ -163,7 +163,7 @@ be_visitor_field_serializer_op_cs::visit_array (be_array *node)
       *os << "_dcps_max_marshaled_size (_tao_aggregate_" << f->local_name ()
           << ")";
       break;
-    case TAO_CodeGen::TAO_FIND_SIZE: 
+    case TAO_CodeGen::TAO_FIND_SIZE:
       // get the size of an array typedef
       *os << "_dcps_find_size (_tao_aggregate_" << f->local_name ()
           << ")";
@@ -236,7 +236,7 @@ be_visitor_field_serializer_op_cs::visit_enum (be_enum *node)
     case TAO_CodeGen::TAO_IS_BOUNDED_SIZE:
       *os << " true /* enum */";
       break;
-    case TAO_CodeGen::TAO_FIND_SIZE: 
+    case TAO_CodeGen::TAO_FIND_SIZE:
     case TAO_CodeGen::TAO_MAX_MARSHALED_SIZE:
       // enums are serialized as CORBA::ULong
       *os << "_dcps_max_marshaled_size_ulong () /* enum */";
@@ -569,22 +569,22 @@ be_visitor_field_serializer_op_cs::visit_predefined_type (be_predefined_type *no
         }
       else if (pt == AST_PredefinedType::PT_char)
         {
-          *os << "_dcps_max_marshaled_size ( ::CORBA::Any::from_char (_tao_aggregate."
+          *os << "_dcps_max_marshaled_size (::ACE_OutputCDR::from_char (_tao_aggregate."
               << f->local_name () << "))";
         }
       else if (pt == AST_PredefinedType::PT_wchar)
         {
-          *os << "_dcps_max_marshaled_size ( ::CORBA::Any::from_wchar (_tao_aggregate."
+          *os << "_dcps_max_marshaled_size (::ACE_OutputCDR::from_wchar (_tao_aggregate."
               << f->local_name () << "))";
         }
       else if (pt == AST_PredefinedType::PT_octet)
         {
-          *os << "_dcps_max_marshaled_size ( ::CORBA::Any::from_octet (_tao_aggregate."
+          *os << "_dcps_max_marshaled_size (::ACE_OutputCDR::from_octet (_tao_aggregate."
               << f->local_name () << "))";
         }
       else if (pt == AST_PredefinedType::PT_boolean)
         {
-          *os << "_dcps_max_marshaled_size ( ::CORBA::Any::from_boolean (_tao_aggregate."
+          *os << "_dcps_max_marshaled_size (::ACE_OutputCDR::from_boolean (_tao_aggregate."
               << f->local_name () << "))";
         }
       else
@@ -601,22 +601,22 @@ be_visitor_field_serializer_op_cs::visit_predefined_type (be_predefined_type *no
         }
       else if (pt == AST_PredefinedType::PT_char)
         {
-          *os << "(strm >> ::CORBA::Any::to_char (_tao_aggregate."
+          *os << "(strm >> ::ACE_InputCDR::to_char (_tao_aggregate."
               << f->local_name () << "))";
         }
       else if (pt == AST_PredefinedType::PT_wchar)
         {
-          *os << "(strm >> ::CORBA::Any::to_wchar (_tao_aggregate."
+          *os << "(strm >> ::ACE_InputCDR::to_wchar (_tao_aggregate."
               << f->local_name () << "))";
         }
       else if (pt == AST_PredefinedType::PT_octet)
         {
-          *os << "(strm >> ::CORBA::Any::to_octet (_tao_aggregate."
+          *os << "(strm >> ::ACE_InputCDR::to_octet (_tao_aggregate."
               << f->local_name () << "))";
         }
       else if (pt == AST_PredefinedType::PT_boolean)
         {
-          *os << "(strm >> ::CORBA::Any::to_boolean (_tao_aggregate."
+          *os << "(strm >> ::ACE_InputCDR::to_boolean (_tao_aggregate."
               << f->local_name () << "))";
         }
       else
@@ -632,22 +632,22 @@ be_visitor_field_serializer_op_cs::visit_predefined_type (be_predefined_type *no
         }
       else if (pt == AST_PredefinedType::PT_char)
         {
-          *os << "(strm << ::CORBA::Any::from_char (_tao_aggregate."
+          *os << "(strm << ::ACE_OutputCDR::from_char (_tao_aggregate."
               << f->local_name () << "))";
         }
       else if (pt == AST_PredefinedType::PT_wchar)
         {
-          *os << "(strm << ::CORBA::Any::from_wchar (_tao_aggregate."
+          *os << "(strm << ::ACE_OutputCDR::from_wchar (_tao_aggregate."
               << f->local_name () << "))";
         }
       else if (pt == AST_PredefinedType::PT_octet)
         {
-          *os << "(strm << ::CORBA::Any::from_octet (_tao_aggregate."
+          *os << "(strm << ::ACE_OutputCDR::from_octet (_tao_aggregate."
               << f->local_name () << "))";
         }
       else if (pt == AST_PredefinedType::PT_boolean)
         {
-          *os << "(strm << ::CORBA::Any::from_boolean (_tao_aggregate."
+          *os << "(strm << ::ACE_OutputCDR::from_boolean (_tao_aggregate."
               << f->local_name () << "))";
         }
       else
@@ -720,7 +720,7 @@ be_visitor_field_serializer_op_cs::visit_sequence (be_sequence *node)
       *os << "_dcps_max_marshaled_size (_tao_aggregate." << f->local_name ()
           << ")";
       break;
-    case TAO_CodeGen::TAO_FIND_SIZE: 
+    case TAO_CodeGen::TAO_FIND_SIZE:
       *os << "_dcps_find_size (_tao_aggregate." << f->local_name ()
           << ")";
       break;
@@ -779,7 +779,7 @@ be_visitor_field_serializer_op_cs::visit_string (be_string *node)
       ACE_OS::sprintf(buff, "%ld", node->max_size ()->ev ()->u.ulval);
       *os << "_dcps_max_marshaled_size_ulong () + " << buff;
       break;
-    case TAO_CodeGen::TAO_FIND_SIZE: 
+    case TAO_CodeGen::TAO_FIND_SIZE:
       *os << "_dcps_max_marshaled_size_ulong() + "
           << "ACE_OS::strlen(_tao_aggregate."
           << f->local_name () << ".in ())";
@@ -857,7 +857,7 @@ be_visitor_field_serializer_op_cs::visit_structure (be_structure *node)
       *os << "_dcps_max_marshaled_size (_tao_aggregate." << f->local_name ()
           << ")";
       break;
-    case TAO_CodeGen::TAO_FIND_SIZE: 
+    case TAO_CodeGen::TAO_FIND_SIZE:
       *os << "_dcps_find_size (_tao_aggregate." << f->local_name ()
           << ")";
       break;
@@ -953,7 +953,7 @@ be_visitor_field_serializer_op_cs::visit_union (be_union *node)
       *os << "_dcps_max_marshaled_size (_tao_aggregate." << f->local_name ()
           << ")";
       break;
-    case TAO_CodeGen::TAO_FIND_SIZE: 
+    case TAO_CodeGen::TAO_FIND_SIZE:
       *os << "_dcps_find_size (_tao_aggregate." << f->local_name ()
           << ")";
       break;
@@ -1088,7 +1088,7 @@ be_visitor_serializer_op_field_decl::visit_array (be_array *node)
     {
     case TAO_CodeGen::TAO_IS_BOUNDED_SIZE:
     case TAO_CodeGen::TAO_MAX_MARSHALED_SIZE:
-    case TAO_CodeGen::TAO_FIND_SIZE: 
+    case TAO_CodeGen::TAO_FIND_SIZE:
     case TAO_CodeGen::TAO_CDR_INPUT:
     case TAO_CodeGen::TAO_CDR_OUTPUT:
       *os << fname << "_forany "
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/any_op_ch.cpp
index 04ba19f3ee5..21681f94492 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/any_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/any_op_ch.cpp
@@ -19,8 +19,8 @@
 //
 // ============================================================================
 
-ACE_RCSID (be_visitor_interface, 
-           any_op_ch, 
+ACE_RCSID (be_visitor_interface,
+           any_op_ch,
            "$Id$")
 
 // ***************************************************************************
@@ -41,18 +41,20 @@ int
 be_visitor_interface_any_op_ch::visit_interface (be_interface *node)
 {
   if (node->cli_hdr_any_op_gen ()
-      || node->imported ())
+      || node->imported ()
+      || node->is_local ())
     {
       return 0;
     }
 
   TAO_OutStream *os = this->ctx_->stream ();
+  const char *macro = this->ctx_->export_macro ();
 
   *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
 
   be_module *module = 0;
- 
+
   if (node->is_nested () &&
       node->defined_in ()->scope_node_type () == AST_Decl::NT_module)
     {
@@ -74,13 +76,13 @@ be_visitor_interface_any_op_ch::visit_interface (be_interface *node)
       be_util::gen_nested_namespace_begin (os, module);
 
       // emit  nested variation of any operators
-      *os << be_global->stub_export_macro () << " void"
+      *os << macro << " void"
           << " operator<<= ( ::CORBA::Any &, " << node->local_name ()
           << "_ptr); // copying" << be_nl;
-      *os << be_global->stub_export_macro () << " void"
+      *os << macro << " void"
           << " operator<<= ( ::CORBA::Any &, " << node->local_name ()
           << "_ptr *); // non-copying" << be_nl;
-      *os << be_global->stub_export_macro () << " ::CORBA::Boolean"
+      *os << macro << " ::CORBA::Boolean"
           << " operator>>= (const ::CORBA::Any &, "
           << node->local_name () << "_ptr &);";
 
@@ -90,14 +92,11 @@ be_visitor_interface_any_op_ch::visit_interface (be_interface *node)
       *os << "#else\n\n";
     }
 
-  *os << be_global->stub_export_macro () << " void"
-      << " operator<<= ( ::CORBA::Any &, " << node->name ()
+  *os << macro << " void operator<<= (::CORBA::Any &, " << node->name ()
       << "_ptr); // copying" << be_nl;
-  *os << be_global->stub_export_macro () << " void"
-      << " operator<<= ( ::CORBA::Any &, " << node->name ()
+  *os << macro << " void operator<<= (::CORBA::Any &, " << node->name ()
       << "_ptr *); // non-copying" << be_nl;
-  *os << be_global->stub_export_macro () << " ::CORBA::Boolean"
-      << " operator>>= (const ::CORBA::Any &, "
+  *os << macro << " ::CORBA::Boolean operator>>= (const ::CORBA::Any &, "
       << node->name () << "_ptr &);";
 
   if (module != 0)
@@ -111,7 +110,7 @@ be_visitor_interface_any_op_ch::visit_interface (be_interface *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_interface_any_op_ch::"
                          "visit_interface - "
-                         "codegen for scope failed\n"), 
+                         "codegen for scope failed\n"),
                         -1);
     }
 
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_interface/any_op_cs.cpp
index 0dc68a07648..9bcbcba0496 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/any_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/any_op_cs.cpp
@@ -39,7 +39,8 @@ int
 be_visitor_interface_any_op_cs::visit_interface (be_interface *node)
 {
   if (node->cli_stub_any_op_gen ()
-      || node->imported ())
+      || node->imported ()
+      || node->is_local ())
     {
       return 0;
     }
@@ -122,7 +123,7 @@ be_visitor_interface_any_op_cs::visit_interface (be_interface *node)
 
 
   be_module *module = 0;
- 
+
   if (node->is_nested () &&
       node->defined_in ()->scope_node_type () == AST_Decl::NT_module)
     {
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp
index bdfc0b4129f..8d7287da9a7 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp
@@ -176,7 +176,7 @@ be_visitor_interface_ch::visit_interface (be_interface *node)
       << "_ptr> (0);" << be_uidt_nl
       << "}" << be_nl << be_nl;
 
-  if (be_global->any_support ())
+  if (be_global->any_support () && !node->is_local ())
     {
       *os << "static void _tao_any_destructor (void *);";
     }
@@ -211,7 +211,7 @@ be_visitor_interface_ch::visit_interface (be_interface *node)
 
   if (node->session_component_child () == 1)
     {
-      *os << "// These two are inherited from SessionComponent." 
+      *os << "// These two are inherited from SessionComponent."
           << be_nl << be_nl
           << "virtual void ciao_preactivate (" << be_idt << be_idt_nl
           << "ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS" << be_uidt_nl
@@ -233,7 +233,7 @@ be_visitor_interface_ch::visit_interface (be_interface *node)
     {
       node->analyze_parentage ();
     }
-    
+
   // If we inherit from both CORBA::Object and CORBA::AbstractBase,
   // we have to override _add_ref() to avoid ambiguity.
   if (node->has_mixed_parentage ())
diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp
index 32e22901508..1609e409b05 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp
@@ -262,7 +262,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node)
       << " (void)" << be_nl;
   *os << "{}" << be_nl << be_nl;
 
-  if (be_global->any_support ())
+  if (be_global->any_support () && !node->is_local ())
     {
       *os << "void " << be_nl
           << node->name ()
@@ -539,7 +539,7 @@ be_visitor_interface_cs::gen_xxx_narrow (const char *pre,
           << be_uidt_nl
           << ");" << be_uidt << be_uidt_nl
           << "}" << be_nl << be_nl;
-          
+
       return true;
     }
   else if (be_global->gen_smart_proxies () &&
diff --git a/TAO/TAO_IDL/be/be_visitor_interface_fwd/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface_fwd/any_op_ch.cpp
index 24e9f7ca3fa..471b498584b 100644
--- a/TAO/TAO_IDL/be/be_visitor_interface_fwd/any_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_interface_fwd/any_op_ch.cpp
@@ -19,8 +19,8 @@
 //
 // ============================================================================
 
-ACE_RCSID (be_visitor_interface_fwd, 
-           any_op_ch, 
+ACE_RCSID (be_visitor_interface_fwd,
+           any_op_ch,
            "$Id$")
 
 // ***************************************************************************
@@ -58,14 +58,13 @@ be_visitor_interface_fwd_any_op_ch::visit_interface_fwd (be_interface_fwd *node)
     }
 
   TAO_OutStream *os = this->ctx_->stream ();
+  const char *macro = this->ctx_->export_macro ();
 
   *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
 
-
-
   be_module *module = 0;
- 
+
   if (node->is_nested () &&
       node->defined_in ()->scope_node_type () == AST_Decl::NT_module)
     {
@@ -86,13 +85,13 @@ be_visitor_interface_fwd_any_op_ch::visit_interface_fwd (be_interface_fwd *node)
 
       be_util::gen_nested_namespace_begin (os, module);
 
-      *os << be_global->stub_export_macro () << " void"
+      *os << macro << " void"
           << " operator<<= ( ::CORBA::Any &, " << node->local_name ()
           << "_ptr); // copying" << be_nl;
-      *os << be_global->stub_export_macro () << " void"
+      *os << macro << " void"
           << " operator<<= ( ::CORBA::Any &, " << node->local_name ()
           << "_ptr *); // non-copying" << be_nl;
-      *os << be_global->stub_export_macro () << " ::CORBA::Boolean"
+      *os << macro << " ::CORBA::Boolean"
           << " operator>>= (const ::CORBA::Any &, "
           << node->local_name () << " *&);";
 
@@ -102,13 +101,13 @@ be_visitor_interface_fwd_any_op_ch::visit_interface_fwd (be_interface_fwd *node)
       *os << "#else\n\n";
     }
 
-  *os << be_global->stub_export_macro () << " void"
-      << " operator<<= ( ::CORBA::Any &, " << node->name ()
+  *os << macro << " void"
+      << " operator<<= (::CORBA::Any &, " << node->name ()
       << "_ptr); // copying" << be_nl;
-  *os << be_global->stub_export_macro () << " void"
-      << " operator<<= ( ::CORBA::Any &, " << node->name ()
+  *os << macro << " void"
+      << " operator<<= (::CORBA::Any &, " << node->name ()
       << "_ptr *); // non-copying" << be_nl;
-  *os << be_global->stub_export_macro () << " ::CORBA::Boolean"
+  *os << macro << " ::CORBA::Boolean"
       << " operator>>= (const ::CORBA::Any &, "
       << node->name () << " *&);";
 
diff --git a/TAO/TAO_IDL/be/be_visitor_module/module_ch.cpp b/TAO/TAO_IDL/be/be_visitor_module/module_ch.cpp
index a830c622330..a205afadb11 100644
--- a/TAO/TAO_IDL/be/be_visitor_module/module_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_module/module_ch.cpp
@@ -43,12 +43,24 @@ be_visitor_module_ch::visit_module (be_module *node)
     }
 
   TAO_OutStream *os = this->ctx_->stream ();
+  TAO_OutStream *aos = 0;
 
   *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
 
   *os << "namespace " << node->local_name () << be_nl
       << "{" << be_idt;
+      
+  if (be_global->gen_anyop_files ())
+    {
+      aos = tao_cg->anyop_header ();
+
+      *aos << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
+           << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+
+      *aos << "namespace " << node->local_name () << be_nl
+           << "{" << be_idt;
+    }
 
   // Generate code for the module definition by traversing thru the
   // elements of its scope. We depend on the front-end to have made sure
@@ -68,5 +80,14 @@ be_visitor_module_ch::visit_module (be_module *node)
   *os << be_nl
       << "} // module " << node->name ();
 
+  if (be_global->gen_anyop_files ())
+    {
+      *aos << be_uidt_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
+           << "// " << __FILE__ << ":" << __LINE__ << be_nl;
+
+      *aos << be_nl
+           << "} // module " << node->name ();
+    }
+
   return 0;
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_cs.cpp
index 6fe9ba3a563..be325370a40 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_cs.cpp
@@ -245,9 +245,9 @@ be_visitor_operation_ami_handler_reply_stub_operation_cs::visit_operation (
 
   *os << "::CORBA::OctetSeq "
       << "_tao_marshaled_exception (" << be_idt << be_idt_nl
-      << "cdr->length ()," << be_nl
-      << "cdr->length ()," << be_nl
-      << "(unsigned char*) cdr->rd_ptr ()," << be_nl
+      << "static_cast <CORBA::ULong> (cdr->length ())," << be_nl
+      << "static_cast <CORBA::ULong> (cdr->length ())," << be_nl
+      << "reinterpret_cast <unsigned char*> (cdr->rd_ptr ())," << be_nl
       << "0" << be_uidt_nl
       << ");" << be_uidt_nl
       << "exception_holder_var->marshaled_exception (_tao_marshaled_exception);"
diff --git a/TAO/TAO_IDL/be/be_visitor_root.cpp b/TAO/TAO_IDL/be/be_visitor_root.cpp
index b3a51b5fbb3..3cee0de1265 100644
--- a/TAO/TAO_IDL/be/be_visitor_root.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_root.cpp
@@ -59,7 +59,6 @@
 #include "be_visitor_home.h"
 #include "be_visitor_traits.h"
 #include "be_visitor_arg_traits.h"
-#include "be_visitor_tmplinst.h"
 #include "be_visitor_context.h"
 
 #include "be_visitor_root/root.cpp"
diff --git a/TAO/TAO_IDL/be/be_visitor_root/any_op.cpp b/TAO/TAO_IDL/be/be_visitor_root/any_op.cpp
index b53fdee616e..9455e261b8a 100644
--- a/TAO/TAO_IDL/be/be_visitor_root/any_op.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_root/any_op.cpp
@@ -40,12 +40,21 @@ be_visitor_root_any_op::~be_visitor_root_any_op (void)
 int
 be_visitor_root_any_op::visit_root (be_root *node)
 {
-  if (be_global->gen_anyop_files () 
-      && this->ctx_->state () == TAO_CodeGen::TAO_ROOT_ANY_OP_CS)
-    {
+  if (be_global->gen_anyop_files ())
+    { 
       // Switch streams, ctx will be reassigned when this
       // pass is done.
-      this->ctx_->stream (tao_cg->anyop_source ());
+      switch (this->ctx_->state ())
+        {
+          case TAO_CodeGen::TAO_ROOT_ANY_OP_CH:
+            this->ctx_->stream (tao_cg->anyop_header ());
+            break;         
+          case TAO_CodeGen::TAO_ROOT_ANY_OP_CS:
+            this->ctx_->stream (tao_cg->anyop_source ());
+            break;         
+          default:
+            break;
+        }
     }
 
   if (this->visit_scope (node) == -1)
diff --git a/TAO/TAO_IDL/be/be_visitor_root/root.cpp b/TAO/TAO_IDL/be/be_visitor_root/root.cpp
index e6c2ebce2be..dffe0c0f3e5 100644
--- a/TAO/TAO_IDL/be/be_visitor_root/root.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_root/root.cpp
@@ -303,7 +303,14 @@ int be_visitor_root::visit_root (be_root *node)
             {
               be_visitor_root_any_op visitor (&ctx);
               status = node->accept (&visitor);
-           }
+
+              // Conditional switch to the *A.h stream is done
+              // in the visitor constructor.
+              if (be_global->gen_anyop_files ())
+                {
+                  (void) tao_cg->end_anyop_header ();
+                }
+            }
 
           break;
         }
@@ -393,7 +400,7 @@ int be_visitor_root::visit_root (be_root *node)
 
   if (be_global->gen_dcps_type_support ())
     {
-  // Make another pass over the entire tree and generate the 
+  // Make another pass over the entire tree and generate the
   // Serializer operators.
   ctx = *this->ctx_;
   status = 0;
@@ -442,19 +449,6 @@ int be_visitor_root::visit_root (be_root *node)
                         -1);
     }
 
-  if (be_global->gen_tmplinst ())
-    {
-      if (this->gen_explicit_tmplinst (node, os) != 0)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_root::"
-                             "visit_root - "
-                             "explicit template instantiation "
-                             "generation failed\n"),
-                            -1);
-        }
-    }
-
   // Generate any final code such as #endifs and/or EOF newlines.
   switch (this->ctx_->state ())
     {
@@ -1731,101 +1725,3 @@ be_visitor_root::visit_typedef (be_typedef *node)
   return 0;
 }
 
-int
-be_visitor_root::gen_explicit_tmplinst (be_root *node,
-                                        TAO_OutStream *os)
-{
-  if (this->ctx_->state () == TAO_CodeGen::TAO_ROOT_CS)
-    {
-      // Make two more passes over the AST to generate the explicit
-      // template instantiations, one for 'template class ...' and
-      // one for '#pragma instantiate ...' for the client side.
-
-      *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-          << "// " << __FILE__ << ":" << __LINE__;
-
-      os->gen_ifdef_AHETI ();
-
-      if (be_global->gen_anyop_files ())
-        {
-          tao_cg->anyop_source ()->gen_ifdef_AHETI ();
-        }
-
-      be_visitor_tmplinst_cs visitor (this->ctx_);
-
-      if (node->accept (&visitor) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_root::"
-                             "visit_root - "
-                             "stub explicit template instantiation failed\n"),
-                            -1);
-        }
-
-      os->gen_elif_AHETI ();
-
-      if (be_global->gen_anyop_files ())
-        {
-          tao_cg->anyop_source ()->gen_elif_AHETI ();
-        }
-
-      visitor.switch_mode ();
-
-      if (node->accept (&visitor) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_root::"
-                             "visit_root - "
-                             "stub explicit template instantiation failed\n"),
-                            -1);
-        }
-
-      os->gen_endif_AHETI ();
-
-      if (be_global->gen_anyop_files ())
-        {
-          tao_cg->anyop_source ()->gen_endif_AHETI ();
-
-          *tao_cg->anyop_source () << "\n";
-        }
-    }
-  else if (this->ctx_->state () == TAO_CodeGen::TAO_ROOT_SS)
-    {
-      // Make two more passes over the AST to generate the explicit
-      // template instantiations, one for 'template class ...' and
-      // one for '#pragma instantiate ...' for the client side.
-
-      *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-          << "// " << __FILE__ << ":" << __LINE__;
-
-      os->gen_ifdef_AHETI ();
-
-      be_visitor_tmplinst_ss visitor (this->ctx_);
-
-      if (node->accept (&visitor) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_root::"
-                             "visit_root - "
-                             "skel explicit template instantiation failed\n"),
-                            -1);
-        }
-
-      os->gen_elif_AHETI ();
-
-      visitor.switch_mode ();
-
-      if (node->accept (&visitor) == -1)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_root::"
-                             "visit_root - "
-                             "skel explicit template instantiation failed\n"),
-                            -1);
-        }
-
-      os->gen_endif_AHETI ();
-    }
-
-  return 0;
-}
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/any_op_ch.cpp
index e3ce91e1e40..772e2435db0 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/any_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/any_op_ch.cpp
@@ -18,8 +18,8 @@
 //
 // ============================================================================
 
-ACE_RCSID (be_visitor_sequence, 
-           any_op_ch, 
+ACE_RCSID (be_visitor_sequence,
+           any_op_ch,
            "$Id$")
 
 // ***************************************************************************
@@ -47,27 +47,28 @@ be_visitor_sequence_any_op_ch::visit_sequence (be_sequence *node)
     }
 
   TAO_OutStream *os = this->ctx_->stream ();
+  const char *macro = this->ctx_->export_macro ();
 
   *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
 
   // Generate the Any <<= and >>= operators.
-  *os << be_global->stub_export_macro ();
+  *os << macro;
   *os << " void"
       << " operator<<= ( ::CORBA::Any &, const ";
   *os << node->name ();
   *os << " &); // copying version" << be_nl;
-  *os << be_global->stub_export_macro ();
+  *os << macro;
   *os << " void"
       << " operator<<= ( ::CORBA::Any &, ";
   *os << node->name ();
   *os << "*); // noncopying version" << be_nl;
-  *os << be_global->stub_export_macro ();
+  *os << macro;
   *os << " ::CORBA::Boolean"
       << " operator>>= (const ::CORBA::Any &, ";
   *os << node->name ();
   *os << " *&); // deprecated" << be_nl;
-  *os << be_global->stub_export_macro ();
+  *os << macro;
   *os << " ::CORBA::Boolean"
       << " operator>>= (const ::CORBA::Any &, const ";
   *os << node->name ();
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp
index c39a071c650..fdb63147f1b 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp
@@ -719,12 +719,12 @@ be_visitor_sequence_cdr_op_cs::visit_node (be_type *bt)
                 if (str->width () == (long) sizeof (char))
                   {
                     *os << "_tao_marshal_flag = (strm >> "
-                        << "::CORBA::Any::to_string (_tao_sequence[i].out (), ";
+                        << "::ACE_InputCDR::to_string (_tao_sequence[i].out (), ";
                   }
                 else
                   {
                     *os << "_tao_marshal_flag = (strm >> "
-                        << "::CORBA::Any::to_wstring (_tao_sequence[i].out (), ";
+                        << "::ACE_InputCDR::to_wstring (_tao_sequence[i].out (), ";
                   }
 
                 *os << str->max_size ()->ev ()->u.ulval << "));"
@@ -767,22 +767,22 @@ be_visitor_sequence_cdr_op_cs::visit_node (be_type *bt)
                   break;
                 case AST_PredefinedType::PT_char:
                   *os << "_tao_marshal_flag =" << be_idt_nl
-                      << "(strm >> ::CORBA::Any::to_char (_tao_sequence[i]));"
+                      << "(strm >> ::ACE_InputCDR::to_char (_tao_sequence[i]));"
                       << be_uidt;
                   break;
                 case AST_PredefinedType::PT_wchar:
                   *os << "_tao_marshal_flag =" << be_idt_nl
-                      << "(strm >> ::CORBA::Any::to_wchar (_tao_sequence[i]));"
+                      << "(strm >> ::ACE_InputCDR::to_wchar (_tao_sequence[i]));"
                       << be_uidt;
                   break;
                 case AST_PredefinedType::PT_boolean:
                   *os << "_tao_marshal_flag =" << be_idt_nl
-                      << "(strm >> ::CORBA::Any::to_boolean (_tao_sequence[i]));"
+                      << "(strm >> ::ACE_InputCDR::to_boolean (_tao_sequence[i]));"
                       << be_uidt;
                   break;
                 case AST_PredefinedType::PT_octet:
                   *os << "_tao_marshal_flag =" << be_idt_nl
-                      << "(strm >> ::CORBA::Any::to_octet (_tao_sequence[i]));"
+                      << "(strm >> ::ACE_InputCDR::to_octet (_tao_sequence[i]));"
                       << be_uidt;
                   break;
                 default:
@@ -884,22 +884,22 @@ be_visitor_sequence_cdr_op_cs::visit_node (be_type *bt)
                   break;
                 case AST_PredefinedType::PT_char:
                   *os << "_tao_marshal_flag =" << be_idt_nl
-                      << "(strm << ::CORBA::Any::from_char (_tao_sequence[i]));"
+                      << "(strm << ::ACE_OutputCDR::from_char (_tao_sequence[i]));"
                       << be_uidt;
                   break;
                 case AST_PredefinedType::PT_wchar:
                   *os << "_tao_marshal_flag =" << be_idt_nl
-                      << "(strm << ::CORBA::Any::from_wchar (_tao_sequence[i]));"
+                      << "(strm << ::ACE_OutputCDR::from_wchar (_tao_sequence[i]));"
                       << be_uidt;
                   break;
                 case AST_PredefinedType::PT_boolean:
                   *os << "_tao_marshal_flag =" << be_idt_nl
-                      << "(strm << ::CORBA::Any::from_boolean (_tao_sequence[i]));"
+                      << "(strm << ::ACE_OutputCDR::from_boolean (_tao_sequence[i]));"
                       << be_uidt;
                   break;
                 case AST_PredefinedType::PT_octet:
                   *os << "_tao_marshal_flag =" << be_idt_nl
-                      << "(strm << ::CORBA::Any::from_octet (_tao_sequence[i]));"
+                      << "(strm << ::ACE_OutputCDR::from_octet (_tao_sequence[i]));"
                       << be_uidt;
                   break;
                 default:
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/serializer_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/serializer_op_cs.cpp
index 9315abf7321..1736ea2ea14 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/serializer_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/serializer_op_cs.cpp
@@ -7,7 +7,7 @@
 //    serializer_op_cs.cpp
 //
 // = DESCRIPTION
-//    Visitor for code generation of Sequences for the 
+//    Visitor for code generation of Sequences for the
 //    TAO::DCPS::Serializer operators in the client stubs.
 //
 // = AUTHOR
@@ -125,7 +125,7 @@ be_visitor_sequence_serializer_op_cs::visit_sequence (be_sequence *node)
         }
     }
 
-  *os << be_uidt_nl 
+  *os << be_uidt_nl
       << "}" << be_nl << be_nl;
 
   // --- _dcps_max_marshaled_size ---
@@ -378,7 +378,7 @@ be_visitor_sequence_serializer_op_cs::visit_enum (be_enum *node)
         else
           *os << "return true; /* bounded enum sequence */";
         break;
-    case TAO_CodeGen::TAO_FIND_SIZE: 
+    case TAO_CodeGen::TAO_FIND_SIZE:
       *os << "//enum types are fixed size so OK to call max_marshaled_size"
           << be_nl;
     case TAO_CodeGen::TAO_MAX_MARSHALED_SIZE:
@@ -389,7 +389,7 @@ be_visitor_sequence_serializer_op_cs::visit_enum (be_enum *node)
           << be_idt << be_idt_nl;
       switch (this->ctx_->sub_state ())
         {
-        case TAO_CodeGen::TAO_FIND_SIZE: 
+        case TAO_CodeGen::TAO_FIND_SIZE:
           *os << "_tao_sequence.length();" << be_uidt << be_uidt;
           break;
         case TAO_CodeGen::TAO_MAX_MARSHALED_SIZE:
@@ -513,7 +513,7 @@ be_visitor_sequence_serializer_op_cs::visit_predefined_type (
         else
           *os << "return true; /* seq<predef'd,N> */";
         break;
-    case TAO_CodeGen::TAO_FIND_SIZE: 
+    case TAO_CodeGen::TAO_FIND_SIZE:
       *os << "//primitive types are fixed size so OK to call max_marshaled_size"
           << be_nl;
     case TAO_CodeGen::TAO_MAX_MARSHALED_SIZE:
@@ -521,12 +521,12 @@ be_visitor_sequence_serializer_op_cs::visit_predefined_type (
         {
         case AST_PredefinedType::PT_octet:
           *os << "return _dcps_max_marshaled_size_ulong () + "
-              << "_dcps_max_marshaled_size_octet ()" 
+              << "_dcps_max_marshaled_size_octet ()"
               << be_idt << be_idt_nl;
           break;
         case AST_PredefinedType::PT_char:
           *os << "return _dcps_max_marshaled_size_ulong () + "
-              << "_dcps_max_marshaled_size_char ()" 
+              << "_dcps_max_marshaled_size_char ()"
               << be_idt << be_idt_nl;
           break;
         case AST_PredefinedType::PT_wchar:
@@ -543,11 +543,11 @@ be_visitor_sequence_serializer_op_cs::visit_predefined_type (
         case AST_PredefinedType::PT_longlong:
         case AST_PredefinedType::PT_ulonglong:
         case AST_PredefinedType::PT_longdouble:
-          *os << "//sequence is of a fixed sized predefined type = " 
+          *os << "//sequence is of a fixed sized predefined type = "
               << "sizeof(ULong) + type size * length" << be_nl;
           *os << node->name () << " a_base_value;" << be_nl;
           *os << "return _dcps_max_marshaled_size_ulong () + "
-              << "_dcps_max_marshaled_size (a_base_value)" 
+              << "_dcps_max_marshaled_size (a_base_value)"
               << be_idt << be_idt_nl;
           break;
           break;
@@ -566,7 +566,7 @@ be_visitor_sequence_serializer_op_cs::visit_predefined_type (
 
       switch (this->ctx_->sub_state ())
         {
-        case TAO_CodeGen::TAO_FIND_SIZE: 
+        case TAO_CodeGen::TAO_FIND_SIZE:
           *os << " * _tao_sequence.length();" << be_uidt << be_uidt;
           break;
         case TAO_CodeGen::TAO_MAX_MARSHALED_SIZE:
@@ -584,7 +584,7 @@ be_visitor_sequence_serializer_op_cs::visit_predefined_type (
       case TAO_CodeGen::TAO_CDR_OUTPUT:
         {
   /*
-   * Avoiding the work to make TAO::DCPS::Serializer handle the 
+   * Avoiding the work to make TAO::DCPS::Serializer handle the
    * TAO_NO_COPY_OCTET_SEQUENCES optimization.
    * TBD - support this optimization -- see corresponding CDR code.
    */
@@ -861,7 +861,7 @@ switch (this->ctx_->sub_state ())
           *os << "// sequence of enums" << be_nl
               << "return _dcps_max_marshaled_size_ulong () + " << be_idt_nl
               << "_tao_sequence.maximum() * " << be_nl
-              << "_dcps_max_marshaled_size_ulong ();" << be_uidt; 
+              << "_dcps_max_marshaled_size_ulong ();" << be_uidt;
           break;
         case AST_Decl::NT_union:
           *os << "ACE_UNUSED_ARG(_tao_sequence);" << be_nl;
@@ -875,7 +875,7 @@ switch (this->ctx_->sub_state ())
           *os << bt->name () << " a_base_value;" << be_nl
               << "return _dcps_max_marshaled_size_ulong () + " << be_idt_nl
               << "_tao_sequence.maximum() * " << be_nl
-              << "_dcps_max_marshaled_size (a_base_value);" << be_uidt; 
+              << "_dcps_max_marshaled_size (a_base_value);" << be_uidt;
           break;
         case AST_Decl::NT_array:
           *os << bt->name () << " a_base_value;" << be_nl;
@@ -919,7 +919,7 @@ switch (this->ctx_->sub_state ())
         case AST_Decl::NT_interface:
           *os << "//DCPS - Sequence of interfaces is not supported" << be_nl;
           *os << "return 77777;" << be_nl;
-          break; 
+          break;
         default:
           ACE_ERROR_RETURN ((LM_ERROR,
                               "(%N:%l) be_visitor_sequence_serializer_op_cs::"
@@ -929,7 +929,7 @@ switch (this->ctx_->sub_state ())
           break;
         }
       break;
-    case TAO_CodeGen::TAO_FIND_SIZE: 
+    case TAO_CodeGen::TAO_FIND_SIZE:
       {
         *os << "//iterate over the sequence to find the current size" << be_nl
             << "size_t the_length = _dcps_max_marshaled_size_ulong ();" << be_nl
@@ -987,12 +987,12 @@ switch (this->ctx_->sub_state ())
           break;
         case AST_Decl::NT_string:
         case AST_Decl::NT_wstring:
-          *os << "the_length += _dcps_max_marshaled_size_ulong () + " 
+          *os << "the_length += _dcps_max_marshaled_size_ulong () + "
               << "ACE_OS::strlen (_tao_sequence[i]);" << be_uidt_nl;
           break;
         case AST_Decl::NT_interface:
           *os << "//DCPS - Sequence of interfaces is not supported" << be_nl;
-          break; 
+          break;
         default:
           ACE_ERROR_RETURN ((LM_ERROR,
                               "(%N:%l) be_visitor_sequence_serializer_op_cs::"
@@ -1110,12 +1110,12 @@ switch (this->ctx_->sub_state ())
                 if (str->width () == (long) sizeof (char))
                   {
                     *os << "_tao_marshal_flag = (strm >> "
-                        << "::CORBA::Any::to_string (_tao_sequence[i].out (), ";
+                        << "::ACE_InputCDR::to_string (_tao_sequence[i].out (), ";
                   }
                 else
                   {
                     *os << "_tao_marshal_flag = (strm >> "
-                        << "::CORBA::Any::to_wstring (_tao_sequence[i].out (), ";
+                        << "::ACE_InputCDR::to_wstring (_tao_sequence[i].out (), ";
                   }
 
                 *os << str->max_size ()->ev ()->u.ulval << "));"
@@ -1157,22 +1157,22 @@ switch (this->ctx_->sub_state ())
                   break;
                 case AST_PredefinedType::PT_char:
                   *os << "_tao_marshal_flag =" << be_idt_nl
-                      << "(strm >> ::CORBA::Any::to_char (_tao_sequence[i]));"
+                      << "(strm >> ::ACE_InputCDR::to_char (_tao_sequence[i]));"
                       << be_uidt;
                   break;
                 case AST_PredefinedType::PT_wchar:
                   *os << "_tao_marshal_flag =" << be_idt_nl
-                      << "(strm >> ::CORBA::Any::to_wchar (_tao_sequence[i]));"
+                      << "(strm >> ::ACE_InputCDR::to_wchar (_tao_sequence[i]));"
                       << be_uidt;
                   break;
                 case AST_PredefinedType::PT_boolean:
                   *os << "_tao_marshal_flag =" << be_idt_nl
-                      << "(strm >> ::CORBA::Any::to_boolean (_tao_sequence[i]));"
+                      << "(strm >> ::ACE_InputCDR::to_boolean (_tao_sequence[i]));"
                       << be_uidt;
                   break;
                 case AST_PredefinedType::PT_octet:
                   *os << "_tao_marshal_flag =" << be_idt_nl
-                      << "(strm >> ::CORBA::Any::to_octet (_tao_sequence[i]));"
+                      << "(strm >> ::ACE_InputCDR::to_octet (_tao_sequence[i]));"
                       << be_uidt;
                   break;
                 default:
@@ -1271,22 +1271,22 @@ switch (this->ctx_->sub_state ())
                   break;
                 case AST_PredefinedType::PT_char:
                   *os << "_tao_marshal_flag =" << be_idt_nl
-                      << "(strm << ::CORBA::Any::from_char (_tao_sequence[i]));"
+                      << "(strm << ::ACE_OutputCDR::from_char (_tao_sequence[i]));"
                       << be_uidt;
                   break;
                 case AST_PredefinedType::PT_wchar:
                   *os << "_tao_marshal_flag =" << be_idt_nl
-                      << "(strm << ::CORBA::Any::from_wchar (_tao_sequence[i]));"
+                      << "(strm << ::ACE_OutputCDR::from_wchar (_tao_sequence[i]));"
                       << be_uidt;
                   break;
                 case AST_PredefinedType::PT_boolean:
                   *os << "_tao_marshal_flag =" << be_idt_nl
-                      << "(strm << ::CORBA::Any::from_boolean (_tao_sequence[i]));"
+                      << "(strm << ::ACE_OutputCDR::from_boolean (_tao_sequence[i]));"
                       << be_uidt;
                   break;
                 case AST_PredefinedType::PT_octet:
                   *os << "_tao_marshal_flag =" << be_idt_nl
-                      << "(strm << ::CORBA::Any::from_octet (_tao_sequence[i]));"
+                      << "(strm << ::ACE_OutputCDR::from_octet (_tao_sequence[i]));"
                       << be_uidt;
                   break;
                 default:
diff --git a/TAO/TAO_IDL/be/be_visitor_structure/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_structure/any_op_ch.cpp
index 8d1e3462785..c1a351406d4 100644
--- a/TAO/TAO_IDL/be/be_visitor_structure/any_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_structure/any_op_ch.cpp
@@ -18,8 +18,8 @@
 //
 // ============================================================================
 
-ACE_RCSID (be_visitor_structure, 
-           any_op_ch, 
+ACE_RCSID (be_visitor_structure,
+           any_op_ch,
            "$Id$")
 
 // ***************************************************************************
@@ -47,21 +47,18 @@ be_visitor_structure_any_op_ch::visit_structure (be_structure *node)
     }
 
   TAO_OutStream *os = this->ctx_->stream ();
+  const char *macro = this->ctx_->export_macro ();
 
   *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
 
-  *os << be_global->stub_export_macro () << " void"
-      << " operator<<= ( ::CORBA::Any &, const " << node->name ()
+  *os << macro << " void operator<<= (::CORBA::Any &, const " << node->name ()
       << " &); // copying version" << be_nl;
-  *os << be_global->stub_export_macro () << " void"
-      << " operator<<= ( ::CORBA::Any &, " << node->name ()
+  *os << macro << " void operator<<= (::CORBA::Any &, " << node->name ()
       << "*); // noncopying version" << be_nl;
-  *os << be_global->stub_export_macro () << " ::CORBA::Boolean"
-      << " operator>>= (const ::CORBA::Any &, "
+  *os << macro << " ::CORBA::Boolean operator>>= (const ::CORBA::Any &, "
       << node->name () << " *&); // deprecated\n";
-  *os << be_global->stub_export_macro () << " ::CORBA::Boolean"
-      << " operator>>= (const ::CORBA::Any &, const "
+  *os << macro << " ::CORBA::Boolean operator>>= (const ::CORBA::Any &, const "
       << node->name () << " *&);";
 
 
@@ -70,7 +67,7 @@ be_visitor_structure_any_op_ch::visit_structure (be_structure *node)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_structure::visit_structure - "
-                         "codegen for scope failed\n"), 
+                         "codegen for scope failed\n"),
                         -1);
     }
 
@@ -91,7 +88,7 @@ be_visitor_structure_any_op_ch::visit_field (be_field *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_structure_any_op_ch::"
                          "visit_field - "
-                         "Bad field type\n"), 
+                         "Bad field type\n"),
                         -1);
     }
 
@@ -100,7 +97,7 @@ be_visitor_structure_any_op_ch::visit_field (be_field *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_structure_any_op_ch::"
                          "visit_field - "
-                         "codegen for field type failed\n"), 
+                         "codegen for field type failed\n"),
                         -1);
     }
 
@@ -123,7 +120,7 @@ be_visitor_structure_any_op_ch::visit_union (be_union *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_structure_any_op_ch::"
                          "visit_union - "
-                         "codegen for field type failed\n"), 
+                         "codegen for field type failed\n"),
                         -1);
     }
 
@@ -146,7 +143,7 @@ be_visitor_structure_any_op_ch::visit_enum (be_enum *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_structure_any_op_ch::"
                          "visit_enum - "
-                         "codegen for field type failed\n"), 
+                         "codegen for field type failed\n"),
                         -1);
     }
 
diff --git a/TAO/TAO_IDL/be/be_visitor_tmplinst.cpp b/TAO/TAO_IDL/be/be_visitor_tmplinst.cpp
deleted file mode 100644
index d03fa66ad8d..00000000000
--- a/TAO/TAO_IDL/be/be_visitor_tmplinst.cpp
+++ /dev/null
@@ -1,64 +0,0 @@
-//
-// $Id$
-//
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_visitor_tmplinst.cpp
-//
-// = DESCRIPTION
-//    Visitors for generation of explicit template instantiations.
-//
-// = AUTHOR
-//    Jeff Parsons
-//
-// ============================================================================
-
-#include "be_root.h"
-#include "be_module.h"
-#include "be_interface.h"
-#include "be_interface_fwd.h"
-#include "be_component.h"
-#include "be_component_fwd.h"
-#include "be_home.h"
-#include "be_valuebox.h"
-#include "be_valuetype.h"
-#include "be_array.h"
-#include "be_attribute.h"
-#include "be_enum.h"
-#include "be_exception.h"
-#include "be_sequence.h"
-#include "be_string.h"
-#include "be_structure.h"
-#include "be_union.h"
-#include "be_operation.h"
-#include "be_argument.h"
-#include "be_valuetype_fwd.h"
-#include "be_eventtype.h"
-#include "be_eventtype_fwd.h"
-#include "be_structure_fwd.h"
-#include "be_field.h"
-#include "be_union_fwd.h"
-#include "be_union_branch.h"
-#include "be_typedef.h"
-#include "be_helper.h"
-#include "be_extern.h"
-#include "utl_identifier.h"
-#include "global_extern.h"
-
-#include "be_visitor_tmplinst.h"
-#include "be_visitor_context.h"
-
-#include "be_visitor_tmplinst/tmplinst.cpp"
-#include "be_visitor_tmplinst/arg_tmplinst.cpp"
-#include "be_visitor_tmplinst/tmplinst_cs.cpp"
-#include "be_visitor_tmplinst/tmplinst_ss.cpp"
-
-ACE_RCSID (be, 
-           be_visitor_tmplinst, 
-           "$Id$")
-
diff --git a/TAO/TAO_IDL/be/be_visitor_tmplinst/arg_tmplinst.cpp b/TAO/TAO_IDL/be/be_visitor_tmplinst/arg_tmplinst.cpp
deleted file mode 100644
index d68c7d6f6f6..00000000000
--- a/TAO/TAO_IDL/be/be_visitor_tmplinst/arg_tmplinst.cpp
+++ /dev/null
@@ -1,781 +0,0 @@
-//=============================================================================
-/**
-*  @file   arg_tmplinst.cpp
-*
-*  $Id$
-*
-*  This visitor generates explicit template instantiations, guarded so they
-*  are seen only by compilers whose platforms require explicit template
-*  instantiation, for the individual argument template helper classes.
-*
-*  @author Jeff Parsons <j.parsons@vanderbilt.edu>
-*/
-//=============================================================================
-
-be_visitor_arg_tmplinst::be_visitor_arg_tmplinst (
-    be_visitor_context *ctx,
-    be_visitor_tmplinst_cs::Mode mode,
-    char * prefix,
-    char * suffix,
-    char * linebreak,
-    const char * S
-  )
-  : be_visitor_decl (ctx),
-    mode_ (mode),
-    prefix_ (prefix),
-    suffix_ (suffix),
-    linebreak_ (linebreak),
-    S_ (S)
-{
-}
-
-be_visitor_arg_tmplinst::~be_visitor_arg_tmplinst (void)
-{
-}
-
-int
-be_visitor_arg_tmplinst::visit_interface (be_interface *node)
-{
-  if (this->this_mode_and_dir_generated (node))
-    {
-      return 0;
-    }
-
-  TAO_OutStream *os = this->ctx_->stream ();
-
-  *os << be_nl << be_nl
-      << this->prefix_ << this->linebreak_ << be_idt << be_idt_nl
-      << "TAO::";
-
-  this->gen_direction (os);
-
-  *os << "_Object_" << this->S_ << "Argument_T<" << this->linebreak_
-      << be_idt << be_idt_nl
-      << node->name () << "_ptr";
-
-  switch (this->dir_)
-    {
-      case _tao_INOUT:
-        *os << "," << this->linebreak_ << be_nl
-            << "TAO::Objref_Traits<"  << node->name () << ">";
-        break;
-
-      case _tao_OUT:
-        *os << "," << this->linebreak_ << be_nl
-            << node->name () << "_out";
-        break;
-      case _tao_RET:
-        *os << "," << this->linebreak_ << be_nl
-            << node->name () << "_var";
-        break;
-      default:
-        break;
-    }
-
-  *os << this->linebreak_ << be_uidt_nl
-      << ">" << this->suffix_ << be_uidt << be_uidt << be_uidt;
-
-  this->this_mode_and_dir_generated (node, I_TRUE);
-  return 0;
-}
-
-int
-be_visitor_arg_tmplinst::visit_interface_fwd (be_interface_fwd *node)
-{
-  if (this->this_mode_and_dir_generated (node))
-    {
-      return 0;
-    }
-
-  be_interface *fd =
-    be_interface::narrow_from_decl (node->full_definition ());
-
-  if (this->visit_interface (fd) != 0)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_arg_tmplinst::"
-                         "visit_interface_fwd - code generation failed\n"),
-                        -1);
-    }
-
-  this->this_mode_and_dir_generated (node, I_TRUE);
-  return 0;
-}
-
-int
-be_visitor_arg_tmplinst::visit_component (be_component *node)
-{
-  return this->visit_interface (node);
-}
-
-int
-be_visitor_arg_tmplinst::visit_component_fwd (be_component_fwd *node)
-{
-  return this->visit_interface_fwd (node);
-}
-
-int
-be_visitor_arg_tmplinst::visit_home (be_home *node)
-{
-  return this->visit_interface (node);
-}
-
-int
-be_visitor_arg_tmplinst::visit_valuebox (be_valuebox *node)
-{
-  if (this->this_mode_and_dir_generated (node))
-    {
-      return 0;
-    }
-
-  TAO_OutStream *os = this->ctx_->stream ();
-
-  *os << be_nl << be_nl
-      << this->prefix_ << this->linebreak_ << be_idt << be_idt_nl
-      << "TAO::";
-
-  this->gen_direction (os);
-
-  *os << "_Object_" << this->S_ << "Argument_T<" << this->linebreak_
-      << be_idt << be_idt_nl
-      << node->name () << " *";
-
-  switch (this->dir_)
-    {
-      case _tao_OUT:
-        *os << "," << this->linebreak_ << be_nl
-            << node->name () << "_out";
-        break;
-      case _tao_RET:
-        *os << "," << this->linebreak_ << be_nl
-            << node->name () << "_var";
-        break;
-      default:
-        break;
-    }
-
-  *os << this->linebreak_ << be_uidt_nl
-      << ">" << this->suffix_ << be_uidt << be_uidt << be_uidt;
-
-  this->this_mode_and_dir_generated (node, I_TRUE);
-  return 0;
-}
-
-int
-be_visitor_arg_tmplinst::visit_valuetype (be_valuetype *node)
-{
-  if (this->this_mode_and_dir_generated (node))
-    {
-      return 0;
-    }
-
-  TAO_OutStream *os = this->ctx_->stream ();
-
-  *os << be_nl << be_nl
-      << this->prefix_ << this->linebreak_ << be_idt << be_idt_nl
-      << "TAO::";
-
-  this->gen_direction (os);
-
-  *os << "_Object_" << this->S_ << "Argument_T<" << this->linebreak_
-      << be_idt << be_idt_nl
-      << node->name () << " *";
-
-  switch (this->dir_)
-    {
-      case _tao_OUT:
-        *os << "," << this->linebreak_ << be_nl
-            << node->name () << "_out";
-        break;
-      case _tao_RET:
-        *os << "," << this->linebreak_ << be_nl
-            << node->name () << "_var";
-        break;
-      default:
-        break;
-    }
-
-  *os << this->linebreak_ << be_uidt_nl
-      << ">" << this->suffix_ << be_uidt << be_uidt << be_uidt;
-
-  this->this_mode_and_dir_generated (node, I_TRUE);
-  return 0;
-}
-
-int
-be_visitor_arg_tmplinst::visit_valuetype_fwd (be_valuetype_fwd *node)
-{
-  if (this->this_mode_and_dir_generated (node))
-    {
-      return 0;
-    }
-
-  be_valuetype *fd =
-    be_valuetype::narrow_from_decl (node->full_definition ());
-
-  if (this->visit_valuetype (fd) != 0)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_arg_tmplinst::"
-                         "visit_valuetype_fwd - code generation failed\n"),
-                        -1);
-    }
-
-  this->this_mode_and_dir_generated (node, I_TRUE);
-  return 0;
-}
-
-int
-be_visitor_arg_tmplinst::visit_eventtype (be_eventtype *node)
-{
-  return this->visit_valuetype (node);
-}
-
-int
-be_visitor_arg_tmplinst::visit_eventtype_fwd (be_eventtype_fwd *node)
-{
-  return this->visit_valuetype_fwd (node);
-}
-
-int
-be_visitor_arg_tmplinst::visit_sequence (be_sequence *node)
-{
-  if (this->this_mode_and_dir_generated (node))
-    {
-      return 0;
-    }
-
-  TAO_OutStream *os = this->ctx_->stream ();
-  be_typedef *alias = this->ctx_->alias ();
-
-  *os << be_nl << be_nl
-      << this->prefix_ << this->linebreak_ << be_idt << be_idt_nl
-      << "TAO::";
-
-  this->gen_direction (os);
-
-  *os << "_Var_Size_" << this->S_ << "Argument_T<" << this->linebreak_
-      << be_idt << be_idt_nl
-      << alias->name ();
-
-  switch (this->dir_)
-    {
-      case _tao_OUT:
-        *os << "," << this->linebreak_ << be_nl
-            << alias->name () << "_out";
-        break;
-      case _tao_RET:
-        *os << "," << this->linebreak_ << be_nl
-            << alias->name () << "_var";
-        break;
-      default:
-        break;
-    }
-
-  *os << this->linebreak_ << be_uidt_nl
-      << ">" << this->suffix_ << be_uidt << be_uidt << be_uidt;
-
-  this->this_mode_and_dir_generated (node, I_TRUE);
-  return 0;
-}
-
-int
-be_visitor_arg_tmplinst::visit_string (be_string *node)
-{
-  if (this->this_mode_and_dir_generated (node))
-    {
-      return 0;
-    }
-
-  unsigned long bound = node->max_size ()->ev ()->u.ulval;
-  be_typedef *alias = this->ctx_->alias ();
-
-  // Unbounded (w)string args are handled as a predefined type.
-  // Bounded (w)strings must come in as a typedef - they can't
-  // be used directly as arguments or return types.
-  if (bound == 0 || alias == 0)
-    {
-      this->this_mode_and_dir_generated (node, I_TRUE);
-      return 0;
-    }
-
-  idl_bool wide = (node->width () != 1);
-
-  TAO_OutStream *os = this->ctx_->stream ();
-
-  *os << be_nl << be_nl
-      << this->prefix_ << this->linebreak_ << be_idt << be_idt_nl
-      << "TAO::";
-
-  this->gen_direction (os);
-
-  *os << "_BD_String_" << this->S_ << "Argument_T<" << this->linebreak_
-      << be_idt << be_idt_nl
-      << "CORBA::" << (wide ? "W" : "") << "Char";
-
-  switch (this->dir_)
-    {
-      case _tao_OUT:
-        *os << "," << this->linebreak_ << be_nl
-            << "CORBA::" << (wide ? "W" : "") << "String_out";
-        break;
-      case _tao_RET:
-        *os << "," << this->linebreak_ << be_nl
-            << "CORBA::" << (wide ? "W" : "") << "String_var";
-        break;
-      default:
-        break;
-    }
-
-  *os << "," << this->linebreak_ << be_nl
-      << "ACE_InputCDR::to_" << (wide ? "w" : "") << "string,"
-      << this->linebreak_ << be_nl
-      << "ACE_OutputCDR::from_" << (wide ? "w" : "") << "string,"
-      << this->linebreak_ << be_nl
-      << bound << this->linebreak_ << be_uidt_nl
-      << ">" << this->suffix_ << be_uidt << be_uidt << be_uidt;
-
-  this->this_mode_and_dir_generated (node, I_TRUE);
-  return 0;
-}
-
-int
-be_visitor_arg_tmplinst::visit_array (be_array *node)
-{
-  if (this->this_mode_and_dir_generated (node))
-    {
-      return 0;
-    }
-
-  TAO_OutStream *os = this->ctx_->stream ();
-  idl_bool fixed = (node->size_type () == AST_Type::FIXED);
-
-  *os << be_nl << be_nl
-      << this->prefix_ << this->linebreak_ << be_idt << be_idt_nl
-      << "TAO::";
-
-  this->gen_direction (os);
-
-  *os << "_" << (fixed ? "Fixed" : "Var") << "_Array_"
-      << this->S_ << "Argument_T<" << this->linebreak_
-      << be_idt << be_idt_nl
-      << node->name () << "," << this->linebreak_ << be_nl;
-
-  switch (this->dir_)
-    {
-    case _tao_IN:
-    case _tao_INOUT:
-        *os << node->name () << "_slice," << this->linebreak_ << be_nl;
-        break;
-      case _tao_OUT:
-        *os << node->name () << "_slice," << this->linebreak_ << be_nl;
-        if (!fixed)
-          {
-            *os << node->name () << "_var," << this->linebreak_ << be_nl
-                << node->name () << "_out," << this->linebreak_ << be_nl;
-          }
-        break;
-      case _tao_RET:
-        *os << node->name () << "_slice," << this->linebreak_ << be_nl
-            << node->name () << "_var," << this->linebreak_ << be_nl;
-        break;
-      default:
-        break;
-    }
-
-  *os << node->name () << "_forany" << this->linebreak_ << be_uidt_nl
-      << ">" << this->suffix_ << be_uidt << be_uidt
-      << be_uidt << be_uidt;
-
-  this->this_mode_and_dir_generated (node, I_TRUE);
-
-  return 0;
-}
-
-int
-be_visitor_arg_tmplinst::visit_enum (be_enum *node)
-{
-  if (this->this_mode_and_dir_generated (node))
-    {
-      return 0;
-    }
-
-  TAO_OutStream *os = this->ctx_->stream ();
-
-  *os << be_nl << be_nl
-      << this->prefix_ << this->linebreak_ << be_idt << be_idt_nl
-      << "TAO::";
-
-  this->gen_direction (os);
-
-  *os << "_Basic_" << this->S_ << "Argument_T<" << this->linebreak_
-      << be_idt << be_idt_nl
-      << node->name () << this->linebreak_ << be_uidt_nl
-      << ">" << this->suffix_ << be_uidt << be_uidt << be_uidt;
-
-  this->this_mode_and_dir_generated (node, I_TRUE);
-  return 0;
-}
-
-int
-be_visitor_arg_tmplinst::visit_structure (be_structure *node)
-{
-  if (this->this_mode_and_dir_generated (node))
-    {
-      return 0;
-    }
-
-  TAO_OutStream *os = this->ctx_->stream ();
-  idl_bool fixed = (node->size_type () == AST_Type::FIXED);
-
-  *os << be_nl << be_nl
-      << this->prefix_ << this->linebreak_ << be_idt << be_idt_nl
-      << "TAO::";
-
-  this->gen_direction (os);
-
-  *os << "_" << (fixed ? "Fixed" : "Var") << "_Size_"
-      << this->S_ << "Argument_T<" << this->linebreak_
-      << be_idt << be_idt_nl
-      << node->name ();
-
-  if (!fixed)
-    {
-      switch (this->dir_)
-        {
-          case _tao_OUT:
-            *os << "," << this->linebreak_ << be_nl
-                << node->name () << "_out";
-            break;
-          case _tao_RET:
-            *os << "," << this->linebreak_ << be_nl
-                << node->name () << "_var";
-            break;
-          default:
-            break;
-        }
-    }
-
-  *os << this->linebreak_ << be_uidt_nl
-      << ">" << this->suffix_ << be_uidt << be_uidt << be_uidt;
-
-  this->this_mode_and_dir_generated (node, I_TRUE);
-  return 0;
-}
-
-int
-be_visitor_arg_tmplinst::visit_structure_fwd (be_structure_fwd *node)
-{
-  if (this->this_mode_and_dir_generated (node))
-    {
-      return 0;
-    }
-
-  be_structure *fd = be_structure::narrow_from_decl (node->full_definition ());
-
-  if (this->visit_structure (fd) != 0)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_arg_tmplinst::"
-                         "visit_structure_fwd - code generation failed\n"),
-                        -1);
-    }
-
-  this->this_mode_and_dir_generated (node, I_TRUE);
-  return 0;
-}
-
-int
-be_visitor_arg_tmplinst::visit_field (be_field *node)
-{
-  be_type *bt = be_type::narrow_from_decl (node->field_type ());
-
-  if (!bt)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_arg_tmplinst::"
-                         "visit_field - "
-                         "Bad field type\n"),
-                        -1);
-    }
-
-  if (bt->accept (this) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_arg_tmplinst::"
-                         "visit_field - "
-                         "codegen for field type failed\n"),
-                        -1);
-    }
-
-  return 0;
-}
-
-int
-be_visitor_arg_tmplinst::visit_union (be_union *node)
-{
-  if (this->this_mode_and_dir_generated (node))
-    {
-      return 0;
-    }
-
-  TAO_OutStream *os = this->ctx_->stream ();
-  idl_bool fixed = (node->size_type () == AST_Type::FIXED);
-
-  *os << be_nl << be_nl
-      << this->prefix_ << this->linebreak_ << be_idt << be_idt_nl
-      << "TAO::";
-
-  this->gen_direction (os);
-
-  *os << "_" << (fixed ? "Fixed" : "Var") << "_Size_"
-      << this->S_ << "Argument_T<" << this->linebreak_
-      << be_idt << be_idt_nl
-      << node->name ();
-
-  if (!fixed)
-    {
-      switch (this->dir_)
-        {
-          case _tao_OUT:
-            *os << "," << this->linebreak_ << be_nl
-                << node->name () << "_out";
-            break;
-          case _tao_RET:
-            *os << "," << this->linebreak_ << be_nl
-                << node->name () << "_var";
-            break;
-          default:
-            break;
-        }
-    }
-
-  *os << this->linebreak_ << be_uidt_nl
-      << ">" << this->suffix_ << be_uidt << be_uidt << be_uidt;
-
-  this->this_mode_and_dir_generated (node, I_TRUE);
-  return 0;
-}
-
-int
-be_visitor_arg_tmplinst::visit_union_fwd (be_union_fwd *node)
-{
-  if (this->this_mode_and_dir_generated (node))
-    {
-      return 0;
-    }
-
-  be_union *fd = be_union::narrow_from_decl (node->full_definition ());
-
-  if (this->visit_union (fd) != 0)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_arg_tmplinst::"
-                         "visit_union_fwd - code generation failed\n"),
-                        -1);
-    }
-
-  this->this_mode_and_dir_generated (node, I_TRUE);
-  return 0;
-}
-
-int
-be_visitor_arg_tmplinst::visit_union_branch (be_union_branch *node)
-{
-  be_type *bt = be_type::narrow_from_decl (node->field_type ());
-
-  if (!bt)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_arg_tmplinst::"
-                         "visit_union_branch - "
-                         "Bad union_branch type\n"),
-                        -1);
-    }
-
-  if (bt->accept (this) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_arg_tmplinst::"
-                         "visit_union_branch - "
-                         "codegen for union_branch type failed\n"),
-                        -1);
-    }
-
-  return 0;
-}
-
-int
-be_visitor_arg_tmplinst::visit_typedef (be_typedef *node)
-{
-  this->ctx_->alias (node);
-
-  // Make a decision based on the primitive base type.
-  be_type *bt = node->primitive_base_type ();
-
-  if (!bt || (bt->accept (this) == -1))
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_arg_tmplinst::"
-                         "visit_typedef - "
-                         "Bad primitive type\n"),
-                        -1);
-    }
-
-  this->ctx_->alias (0);
-  return 0;
-}
-
-void
-be_visitor_arg_tmplinst::direction (void)
-{
-  this->dir_ = _tao_RET;
-}
-
-void
-be_visitor_arg_tmplinst::direction (AST_Argument::Direction dir)
-{
-  switch (dir)
-    {
-      case AST_Argument::dir_IN:
-        this->dir_ = _tao_IN;
-        break;
-      case AST_Argument::dir_INOUT:
-        this->dir_ = _tao_INOUT;
-        break;
-      case AST_Argument::dir_OUT:
-        this->dir_ = _tao_OUT;
-        break;
-      default:
-        break;
-    }
-}
-
-idl_bool
-be_visitor_arg_tmplinst::this_mode_and_dir_generated (be_decl *node) const
-{
-  idl_bool cli = (ACE_OS::strlen (this->S_) == 0);
-
-  switch (this->mode_)
-    {
-      case be_visitor_tmplinst_cs::TMPL_CLASS:
-        switch (this->dir_)
-          {
-            case _tao_IN:
-              return (cli ? node->cli_inarg_tmpl_class_gen ()
-                          : node->srv_inarg_tmpl_class_gen ());
-            case _tao_INOUT:
-              return (cli ? node->cli_inoutarg_tmpl_class_gen ()
-                          : node->srv_inoutarg_tmpl_class_gen ());
-            case _tao_OUT:
-              return (cli ? node->cli_outarg_tmpl_class_gen ()
-                          : node->srv_outarg_tmpl_class_gen ());
-            case _tao_RET:
-              return (cli ? node->cli_retarg_tmpl_class_gen ()
-                          : node->srv_retarg_tmpl_class_gen ());
-            default:
-              return I_FALSE;
-          }
-      case be_visitor_tmplinst_cs::PRAGMA_INST:
-        switch (this->dir_)
-          {
-            case _tao_IN:
-              return (cli ? node->cli_inarg_pragma_inst_gen ()
-                          : node->srv_inarg_pragma_inst_gen ());
-            case _tao_INOUT:
-              return (cli ? node->cli_inoutarg_pragma_inst_gen ()
-                          : node->srv_inoutarg_pragma_inst_gen ());
-            case _tao_OUT:
-              return (cli ? node->cli_outarg_pragma_inst_gen ()
-                          : node->srv_outarg_pragma_inst_gen ());
-            case _tao_RET:
-              return (cli ? node->cli_retarg_pragma_inst_gen ()
-                          : node->srv_retarg_pragma_inst_gen ());
-            default:
-              return I_FALSE;
-          }
-      default:
-        return I_FALSE;
-    }
-}
-
-void
-be_visitor_arg_tmplinst::this_mode_and_dir_generated (be_decl *node,
-                                                      idl_bool val)
-{
-  idl_bool cli = (ACE_OS::strlen (this->S_) == 0);
-
-  switch (this->mode_)
-    {
-      case be_visitor_tmplinst_cs::TMPL_CLASS:
-        switch (this->dir_)
-          {
-            case _tao_IN:
-              cli ? node->cli_inarg_tmpl_class_gen (val)
-                  : node->srv_inarg_tmpl_class_gen (val);
-              break;
-            case _tao_INOUT:
-              cli ? node->cli_inoutarg_tmpl_class_gen (val)
-                  : node->srv_inoutarg_tmpl_class_gen (val);
-              break;
-            case _tao_OUT:
-              cli ? node->cli_outarg_tmpl_class_gen (val)
-                  : node->srv_outarg_tmpl_class_gen (val);
-              break;
-            case _tao_RET:
-              cli ? node->cli_retarg_tmpl_class_gen (val)
-                  : node->srv_retarg_tmpl_class_gen (val);
-              break;
-            default:
-              break;
-          }
-        break;
-      case be_visitor_tmplinst_cs::PRAGMA_INST:
-        switch (this->dir_)
-          {
-            case _tao_IN:
-              cli ? node->cli_inarg_pragma_inst_gen (val)
-                  : node->srv_inarg_pragma_inst_gen (val);
-              break;
-            case _tao_INOUT:
-              cli ? node->cli_inoutarg_pragma_inst_gen (val)
-                  : node->srv_inoutarg_pragma_inst_gen (val);
-              break;
-            case _tao_OUT:
-              cli ? node->cli_outarg_pragma_inst_gen (val)
-                  : node->srv_outarg_pragma_inst_gen (val);
-              break;
-            case _tao_RET:
-              cli ? node->cli_retarg_pragma_inst_gen (val)
-                  : node->srv_retarg_pragma_inst_gen (val);
-              break;
-            default:
-              break;
-          }
-        break;
-      default:
-        break;
-    }
-}
-
-void
-be_visitor_arg_tmplinst::gen_direction (TAO_OutStream *os)
-{
-  switch (this->dir_)
-    {
-      case _tao_IN:
-        *os << "In";
-        break;
-      case _tao_INOUT:
-        *os << "Inout";
-        break;
-      case _tao_OUT:
-        *os << "Out";
-        break;
-      case _tao_RET:
-        *os << "Ret";
-        break;
-      default:
-        break;
-    }
-}
diff --git a/TAO/TAO_IDL/be/be_visitor_tmplinst/tmplinst.cpp b/TAO/TAO_IDL/be/be_visitor_tmplinst/tmplinst.cpp
deleted file mode 100644
index 9e46eca7bf7..00000000000
--- a/TAO/TAO_IDL/be/be_visitor_tmplinst/tmplinst.cpp
+++ /dev/null
@@ -1,262 +0,0 @@
-//=============================================================================
-/**
-*  @file   tmplinst.cpp
-*
-*  $Id$
-*
-*  Base class for the concrete visitors that generate explicit template
-*  instantiations for the stub side and skeleton side.
-*
-*  @author Jeff Parsons <j.parsons@vanderbilt.edu>
-*/
-//=============================================================================
-
-be_visitor_tmplinst::be_visitor_tmplinst (be_visitor_context *ctx)
-  : be_visitor_scope (ctx),
-    mode_ (TMPL_CLASS),
-    prefix_ (ACE::strnew ("  template class")),
-    suffix_ (ACE::strnew (";")),
-    linebreak_ (ACE::strnew (""))
-{
-}
-
-be_visitor_tmplinst::~be_visitor_tmplinst (void)
-{
-  delete [] this->prefix_;
-  this->prefix_ = 0;
-  delete [] this->suffix_;
-  this->suffix_ = 0;
-  delete [] this->linebreak_;
-  this->linebreak_ = 0;
-}
-
-int
-be_visitor_tmplinst::visit_root (be_root *node)
-{
-  if (this->visit_scope (node) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_tmplinst::"
-                         "visit_root - visit scope failed\n"),
-                        -1);
-    }
-
-  return 0;
-}
-
-int
-be_visitor_tmplinst::visit_module (be_module *node)
-{
-  if (this->visit_scope (node) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_tmplinst::"
-                         "visit_module - visit scope failed\n"),
-                        -1);
-    }
-
-  return 0;
-}
-
-int 
-be_visitor_tmplinst::visit_interface_fwd (be_interface_fwd *node)
-{
-  if (this->this_mode_generated (node))
-    {
-      return 0;
-    }
-
-  be_interface *fd = 
-    be_interface::narrow_from_decl (node->full_definition ());
-
-  // The logic in visit_interface() should handle what gets generated
-  // and what doesn't.
-  if (this->visit_interface (fd) != 0)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_tmplinst::"
-                         "visit_interface_fwd - code generation failed\n"),
-                        -1);
-    }
-
-  this->this_mode_generated (node, I_TRUE);
-  return 0;
-}
-
-int 
-be_visitor_tmplinst::visit_valuetype_fwd (be_valuetype_fwd *node)
-{
-  if (this->this_mode_generated (node))
-    {
-      return 0;
-    }
-
-  be_valuetype *fd = 
-    be_valuetype::narrow_from_decl (node->full_definition ());
-
-  // The logic in visit_valuetype() should handle what gets generated
-  // and what doesn't.
-  int status = this->visit_valuetype (fd);
-
-  if (status != 0)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_tmplinst::"
-                         "visit_valuetype_fwd - code generation failed\n"),
-                        -1);
-    }
-
-  this->this_mode_generated (node, I_TRUE);
-  return 0;
-}
-
-int 
-be_visitor_tmplinst::visit_eventtype (be_eventtype *node)
-{
-  return this->visit_valuetype (node);
-}
-
-int 
-be_visitor_tmplinst::visit_eventtype_fwd (be_eventtype_fwd *node)
-{
-  return this->visit_valuetype_fwd (node);
-}
-
-int 
-be_visitor_tmplinst::visit_structure_fwd (be_structure_fwd *node)
-{
-  if (this->this_mode_generated (node))
-    {
-      return 0;
-    }
-
-  be_structure *fd = be_structure::narrow_from_decl (node->full_definition ());
-
-  if (this->visit_structure (fd) != 0)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_tmplinst::"
-                         "visit_structure_fwd - code generation failed\n"),
-                        -1);
-    }
-
-  this->this_mode_generated (node, I_TRUE);
-  return 0;
-}
-
-int
-be_visitor_tmplinst::visit_field (be_field *node)
-{
-  be_type *bt = be_type::narrow_from_decl (node->field_type ());
-
-  if (!bt)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_tmplinst::"
-                         "visit_field - "
-                         "Bad field type\n"), 
-                        -1);
-    }
-
-  // Valuetypes may not be *declared* in a field, so this will
-  // get handled elsewhere, and will also avoid nested valuetype
-  // recursion. So we set the field node as processed (the
-  // field *type* may not have been reached yet) and return.
-  if (bt->base_node_type () == AST_Decl::NT_valuetype)
-    {
-      return 0;
-    }
-
-  if (bt->accept (this) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_tmplinst::"
-                         "visit_field - "
-                         "codegen for field type failed\n"), 
-                        -1);
-    }
-
-  return 0;
-}
-
-int 
-be_visitor_tmplinst::visit_union_fwd (be_union_fwd *node)
-{
-  if (this->this_mode_generated (node))
-    {
-      return 0;
-    }
-
-  be_union *fd = be_union::narrow_from_decl (node->full_definition ());
-
-  if (this->visit_union (fd) != 0)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_tmplinst::"
-                         "visit_union_fwd - code generation failed\n"),
-                        -1);
-    }
-
-  this->this_mode_generated (node, I_TRUE);
-  return 0;
-}
-
-int
-be_visitor_tmplinst::visit_union_branch (be_union_branch *node)
-{
-  be_type *bt = be_type::narrow_from_decl (node->field_type ());
-
-  if (!bt)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_tmplinst::"
-                         "visit_union_branch - "
-                         "Bad union_branch type\n"), 
-                        -1);
-    }
-
-  if (bt->accept (this) == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_tmplinst::"
-                         "visit_union_branch - "
-                         "codegen for union_branch type failed\n"), 
-                        -1);
-    }
-
-  return 0;
-}
-
-int 
-be_visitor_tmplinst::visit_typedef (be_typedef *node)
-{
-  this->ctx_->alias (node);
-
-  // Make a decision based on the primitive base type.
-  be_type *bt = node->primitive_base_type ();
-
-  if (!bt || (bt->accept (this) == -1))
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_tmplinst::"
-                         "visit_typedef - "
-                         "Bad primitive type\n"),
-                        -1);
-    }
-
-  this->ctx_->alias (0);
-  return 0;
-}
-
-void
-be_visitor_tmplinst::switch_mode (void)
-{
-  this->mode_ = PRAGMA_INST;
-  delete [] this->prefix_;
-  this->prefix_ = ACE::strnew ("# pragma instantiate");
-  delete [] this->suffix_;
-  this->suffix_ = ACE::strnew ("");
-  delete [] this->linebreak_;
-  this->linebreak_ = ACE::strnew (" \\");
-}
-
diff --git a/TAO/TAO_IDL/be/be_visitor_tmplinst/tmplinst_cs.cpp b/TAO/TAO_IDL/be/be_visitor_tmplinst/tmplinst_cs.cpp
deleted file mode 100644
index 6cb6477f295..00000000000
--- a/TAO/TAO_IDL/be/be_visitor_tmplinst/tmplinst_cs.cpp
+++ /dev/null
@@ -1,1377 +0,0 @@
-//=============================================================================
-/**
-*  @file   tmplinst_cs.cpp
-*
-*  $Id$
-*
-*  This visitor generates explicit template instantiations, guarded so they
-*  are seen only by compilers whose platforms require explicit template
-*  instantiation.
-*
-*  @author Jeff Parsons <j.parsons@vanderbilt.edu>
-*/
-//=============================================================================
-
-be_visitor_tmplinst_cs::be_visitor_tmplinst_cs (be_visitor_context *ctx)
-  : be_visitor_tmplinst (ctx)
-{
-}
-
-be_visitor_tmplinst_cs::~be_visitor_tmplinst_cs (void)
-{
-}
-
-int
-be_visitor_tmplinst_cs::visit_interface (be_interface *node)
-{
-  if (this->this_mode_generated (node))
-    {
-      return 0;
-    }
-
-  TAO_OutStream *os = this->ctx_->stream ();
-
-  // For arg/return type helper template classes. This must come before
-  // the check for an imported or undefined node because such a node
-  // could still be used in an operation and thus cause the use of
-  // an arg helper template class.
-  if (node->seen_in_operation ())
-    {
-      os->gen_ifdef_macro (node->flat_name (), "arg_traits_tmplinst");
-
-      *os << be_nl << be_nl
-          << this->prefix_ << this->linebreak_ << be_idt << be_idt_nl
-          << "TAO::Arg_Traits<" << this->linebreak_ << be_idt << be_idt_nl
-          << "::" << node->name () << this->linebreak_ << be_uidt_nl
-          << ">" << this->suffix_ << be_uidt << be_uidt << be_uidt;
-
-      *os << be_nl << be_nl
-          << this->prefix_ << this->linebreak_ << be_idt << be_idt_nl
-          << "TAO::Object_Arg_Traits_T<" << this->linebreak_
-          << be_idt << be_idt_nl
-          << "::" << node->name () << "_ptr," << this->linebreak_ << be_nl
-          << "::" << node->name () << "_var," << this->linebreak_ << be_nl
-          << "::" << node->name () << "_out," << this->linebreak_ << be_nl
-          << "TAO::Objref_Traits<" << node->name ()
-          << ">" << this->linebreak_ << be_uidt_nl
-          << ">" << this->suffix_ << be_uidt << be_uidt << be_uidt;
-
-      os->gen_endif ();
-    }
-
-  // If one of these is true we can skip the rest.
-  if (node->imported () || !node->is_defined ())
-    {
-      this->this_mode_generated (node, I_TRUE);
-      return 0;
-    }
-
-  // Interfaces can contain declarations of structs, unions, sequences
-  // or arrays.
-  if (this->visit_scope (node) != 0)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_tmplinst_cs::"
-                         "visit_interface - visit scope failed\n"),
-                        -1);
-    }
-
-  // For the traits template class.
-  *os << be_nl << be_nl
-      << this->prefix_ << this->linebreak_ << be_idt << be_idt_nl
-      << "TAO::Objref_Traits<" << this->linebreak_ << be_idt << be_idt_nl
-      << node->name () << this->linebreak_ << be_uidt_nl
-      << ">" << this->suffix_ << be_uidt << be_uidt << be_uidt;
-
-  // For the _var and _out typedefs.
-  *os << be_nl << be_nl
-      << this->prefix_ << this->linebreak_ << be_idt << be_idt_nl
-      << "TAO_Objref_Var_T<" << this->linebreak_ << be_idt << be_idt_nl
-      << node->name () << be_uidt_nl
-      << ">" << this->suffix_ << be_uidt << be_uidt_nl << be_uidt_nl
-      << this->prefix_<< this->linebreak_ << be_idt << be_idt_nl
-      << "TAO_Objref_Out_T<" << this->linebreak_ << be_idt << be_idt_nl
-      << node->name () << be_uidt_nl
-      << ">" << this->suffix_ << be_uidt << be_uidt << be_uidt;
-
-  // Called by _narrow() for non-local interfaces.
-  if (!node->is_local ())
-    {
-      *os << be_nl << be_nl
-          << this->prefix_ << this->linebreak_ << be_idt << be_idt_nl;
-
-      if (!node->is_abstract ())
-        {
-          *os << "TAO::Narrow_Utils<" << this->linebreak_
-              << be_idt << be_idt_nl;
-        }
-      else
-        {
-          *os << "TAO::AbstractBase_Narrow_Utils<" << this->linebreak_
-              << be_idt << be_idt_nl;
-        }
-
-      *os << node->name () << this->linebreak_ << be_uidt_nl
-          << ">" << this->suffix_ << be_uidt << be_uidt << be_uidt;
-    }
-
-  if (be_global->gen_smart_proxies ())
-    {
-      // Its necessary to take care of the nested case.
-      // The smart proxy classes are in the same scope as the proxy.
-      be_decl* scope =
-        be_scope::narrow_from_scope (node->defined_in ())->decl ();
-
-      *os << be_nl << be_nl
-          << this->prefix_ << this->linebreak_ << be_idt << be_idt_nl
-          << "TAO_Singleton<" << this->linebreak_ << be_idt << be_idt_nl
-          << scope->full_name ();
-
-      // Only if there exists any nesting "::" is needed!
-      if (node->is_nested ())
-        {
-          *os << "::";
-        }
-
-      *os <<"TAO_" << node->flat_name ()
-          << "_Proxy_Factory_Adapter," << this->linebreak_ << be_nl
-          << "TAO_SYNCH_RECURSIVE_MUTEX" << this->linebreak_ << be_uidt_nl
-          << ">" << this->suffix_ << be_uidt << be_uidt << be_uidt;
-    }
-
-  // For Any impl template class.
-  if (be_global->any_support ())
-    {
-      TAO_OutStream *tmp = os;
-
-      if (be_global->gen_anyop_files ())
-        {
-          os = tao_cg->anyop_source ();
-        }
-
-      *os << be_nl << be_nl
-          << this->prefix_ << this->linebreak_ << be_idt << be_idt_nl
-          << "TAO::Any_Impl_T<" << this->linebreak_ << be_idt << be_idt_nl
-          << node->name () << this->linebreak_ << be_uidt_nl
-          << ">" << this->suffix_ << be_uidt << be_uidt << be_uidt;
-
-      os = tmp;
-    }
-
-  this->this_mode_generated (node, I_TRUE);
-  return 0;
-}
-
-int
-be_visitor_tmplinst_cs::visit_valuebox (be_valuebox *node)
-{
-  if (this->this_mode_generated (node))
-    {
-      return 0;
-    }
-
-  TAO_OutStream *os = this->ctx_->stream ();
-
-  // For arg/return type helper template classes.
-  if (node->seen_in_operation ())
-    {
-      os->gen_ifdef_macro (node->flat_name (), "arg_traits_tmplinst");
-
-      *os << be_nl << be_nl
-          << this->prefix_ << this->linebreak_ << be_idt << be_idt_nl
-          << " TAO::Arg_Traits<" << this->linebreak_ << be_idt << be_idt_nl
-          << "::" << node->name () << this->linebreak_ << be_uidt_nl
-          << ">" << this->suffix_ << be_uidt << be_uidt << be_uidt;
-
-      *os << be_nl << be_nl
-          << this->prefix_ << this->linebreak_ << be_idt << be_idt_nl
-          << "TAO::Object_Arg_Traits_T<" << this->linebreak_
-          << be_idt << be_idt_nl
-          << "::" << node->name () << " *," << this->linebreak_ << be_nl
-          << "::" << node->name () << "_var," << this->linebreak_ << be_nl
-          << "::" << node->name () << "_out," << this->linebreak_ << be_nl
-          << "TAO::Objref_Traits<" << node->name () << "> "
-          << this->linebreak_ << be_uidt_nl
-          << ">" << this->suffix_ << be_uidt << be_uidt << be_uidt;
-
-      os->gen_endif ();
-    }
-
-  if (node->imported () || !node->is_defined ())
-    {
-      this->this_mode_generated (node, I_TRUE);
-      return 0;
-    }
-
-  // For _var and _out template classes.
-  *os << be_nl << be_nl
-      << this->prefix_ << this->linebreak_ << be_idt << be_idt_nl
-      << "TAO::Value_Traits<" << this->linebreak_ << be_idt << be_idt_nl
-      << node->name () << this->linebreak_ << be_uidt_nl
-      << ">" << this->suffix_ << be_uidt << be_uidt << be_uidt;
-
-  *os << be_nl << be_nl
-      << this->prefix_ << this->linebreak_ << be_idt << be_idt_nl
-      << "TAO_Value_Var_T<" << this->linebreak_ << be_idt << be_idt_nl
-      << node->name () << this->linebreak_ << be_nl
-      << be_uidt_nl
-      << ">" << this->suffix_ << be_uidt << be_uidt_nl << be_uidt_nl
-      << this->prefix_ << this->linebreak_ << be_idt << be_idt_nl
-      << "TAO_Value_Out_T<" << this->linebreak_ << be_idt << be_idt_nl
-      << node->name () << this->linebreak_ << be_nl
-      << be_uidt_nl
-      << ">" << this->suffix_ << be_uidt << be_uidt << be_uidt;
-
-  // For Any impl template class.
-  if (be_global->any_support ())
-    {
-      TAO_OutStream *tmp = os;
-
-      if (be_global->gen_anyop_files ())
-        {
-          os = tao_cg->anyop_source ();
-        }
-
-      *os << be_nl << be_nl
-          << this->prefix_ << this->linebreak_ << be_idt << be_idt_nl
-          << "TAO::Any_Impl_T<" << this->linebreak_ << be_idt << be_idt_nl
-          << node->name () << this->linebreak_ << be_uidt_nl
-          << ">" << this->suffix_ << be_uidt << be_uidt << be_uidt;
-
-      os = tmp;
-    }
-
-  this->this_mode_generated (node, I_TRUE);
-  return 0;
-}
-
-int
-be_visitor_tmplinst_cs::visit_valuetype (be_valuetype *node)
-{
-  if (this->this_mode_generated (node))
-    {
-      return 0;
-    }
-
-  TAO_OutStream *os = this->ctx_->stream ();
-
-  // For arg/return type helper template classes.
-  if (node->seen_in_operation ())
-    {
-      os->gen_ifdef_macro (node->flat_name (), "arg_traits_tmplinst");
-
-      *os << be_nl << be_nl
-          << this->prefix_ << this->linebreak_ << be_idt << be_idt_nl
-          << " TAO::Arg_Traits<" << this->linebreak_ << be_idt << be_idt_nl
-          << "::" << node->name () << this->linebreak_ << be_uidt_nl
-          << ">" << this->suffix_ << be_uidt << be_uidt << be_uidt;
-
-      *os << be_nl << be_nl
-          << this->prefix_ << this->linebreak_ << be_idt << be_idt_nl
-          << "TAO::Object_Arg_Traits_T<" << this->linebreak_
-          << be_idt << be_idt_nl
-          << "::" << node->name () << " *," << this->linebreak_ << be_nl
-          << "::" << node->name () << "_var," << this->linebreak_ << be_nl
-          << "::" << node->name () << "_out," << this->linebreak_ << be_nl
-          << "TAO::Objref_Traits<" << node->name () << "> "
-          << this->linebreak_ << be_uidt_nl
-          << ">" << this->suffix_ << be_uidt << be_uidt << be_uidt;
-
-      os->gen_endif ();
-    }
-
-  if (node->imported () || !node->is_defined ())
-    {
-      this->this_mode_generated (node, I_TRUE);
-      return 0;
-    }
-
-  if (this->visit_scope (node) != 0)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_tmplinst_cs::"
-                         "visit_valuetype - visit scope failed\n"),
-                        -1);
-    }
-
-  // For _var and _out template classes.
-  *os << be_nl << be_nl
-      << this->prefix_ << this->linebreak_ << be_idt << be_idt_nl
-      << "TAO::Value_Traits<" << this->linebreak_ << be_idt << be_idt_nl
-      << node->name () << this->linebreak_ << be_uidt_nl
-      << ">" << this->suffix_ << be_uidt << be_uidt << be_uidt;
-
-  *os << be_nl << be_nl
-      << this->prefix_ << this->linebreak_ << be_idt << be_idt_nl
-      << "TAO_Value_Var_T<" << this->linebreak_ << be_idt << be_idt_nl
-      << node->name () << this->linebreak_ << be_nl
-      << be_uidt_nl
-      << ">" << this->suffix_ << be_uidt << be_uidt_nl << be_uidt_nl
-      << this->prefix_ << this->linebreak_ << be_idt << be_idt_nl
-      << "TAO_Value_Out_T<" << this->linebreak_ << be_idt << be_idt_nl
-      << node->name () << this->linebreak_ << be_nl
-      << be_uidt_nl
-      << ">" << this->suffix_ << be_uidt << be_uidt << be_uidt;
-
-  // For Any impl template class.
-  if (be_global->any_support ())
-    {
-      TAO_OutStream *tmp = os;
-
-      if (be_global->gen_anyop_files ())
-        {
-          os = tao_cg->anyop_source ();
-        }
-
-      *os << be_nl << be_nl
-          << this->prefix_ << this->linebreak_ << be_idt << be_idt_nl
-          << "TAO::Any_Impl_T<" << this->linebreak_ << be_idt << be_idt_nl
-          << node->name () << this->linebreak_ << be_uidt_nl
-          << ">" << this->suffix_ << be_uidt << be_uidt << be_uidt;
-
-      os = tmp;
-    }
-
-  this->this_mode_generated (node, I_TRUE);
-  return 0;
-}
-
-int
-be_visitor_tmplinst_cs::visit_operation (be_operation *node)
-{
-  if (this->this_mode_generated (node)
-      || node->imported ()
-      || node->is_local ())
-    {
-      return 0;
-    }
-
-  const char * S = "";
-
-  be_visitor_arg_tmplinst visitor (this->ctx_,
-                                   this->mode_,
-                                   this->prefix_,
-                                   this->suffix_,
-                                   this->linebreak_,
-                                   S);
-  be_type *bt = be_type::narrow_from_decl (node->return_type ());
-  visitor.direction ();
-
-  if (bt->accept (&visitor) != 0)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_tmplinst_cs::"
-                         "visit_operation - "
-                         "codegen for return type failed\n"),
-                        -1);
-    }
-
-  be_argument *arg = 0;
-
-  for (UTL_ScopeActiveIterator si (node, UTL_Scope::IK_decls);
-       !si.is_done ();
-       si.next ())
-    {
-      arg = be_argument::narrow_from_decl (si.item ());
-      visitor.direction (arg->direction ());
-      bt = be_type::narrow_from_decl (arg->field_type ());
-
-      if (bt->accept (&visitor) != 0)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_tmplinst_cs::"
-                             "visit_operation - "
-                             "codegen for argument failed\n"),
-                            -1);
-        }
-    }
-
-  this->this_mode_generated (node, I_TRUE);
-  return 0;
-}
-
-int
-be_visitor_tmplinst_cs::visit_sequence (be_sequence *node)
-{
-  if (this->this_mode_generated (node))
-    {
-      return 0;
-    }
-
-  TAO_OutStream *os = this->ctx_->stream ();
-  be_typedef *alias = this->ctx_->alias ();
-
-  // For arg/return type helper template classes.
-  // If the node is anonymous, it can't have been seen in an operation,
-  // so no check is necessary for alias == 0.
-  if (node->seen_in_operation ())
-    {
-      os->gen_ifdef_macro (node->flat_name (), "arg_traits_tmplinst");
-
-      *os << be_nl << be_nl
-          << this->prefix_ << " TAO::Arg_Traits< ::" << alias->name ()
-          << ">" << this->suffix_;
-
-      *os << be_nl << be_nl
-          << this->prefix_ << this->linebreak_ << be_idt << be_idt_nl
-          << "TAO::Var_Size_Arg_Traits_T<" << this->linebreak_
-          << be_idt << be_idt_nl
-          << "::" << alias->name () << "," << this->linebreak_ << be_nl
-          << "::" << alias->name () << "_var," << this->linebreak_ << be_nl
-          << "::" << alias->name () << "_out" << this->linebreak_ << be_uidt_nl
-          << ">" << this->suffix_ << be_uidt << be_uidt << be_uidt;
-
-        os->gen_endif ();
-    }
-
-  if (node->imported ())
-    {
-      this->this_mode_generated (node, I_TRUE);
-      return 0;
-    }
-
-  // For _var and _out template classes.
-
-  be_type *bt = be_type::narrow_from_decl (node->base_type ());
-  AST_Decl::NodeType nt = bt->node_type ();
-
-  if (!bt->seq_elem_tmplinst ())
-    {
-      // This is a no-op unless our element is a managed type.
-      this->gen_managed_type_tmplinst (node, bt);
-      bt->seq_elem_tmplinst (I_TRUE);
-    }
-
-  if (this->ctx_->alias () != 0)
-    {
-      this->gen_varout_tmplinst (node,
-                                 bt);
-    }
-
-  be_typedef *td = 0;
-
-  while (nt == AST_Decl::NT_typedef)
-    {
-      td = be_typedef::narrow_from_decl (bt);
-      nt = td->base_node_type ();
-    }
-
-  // basic IDL types are in TAO. Sequences of (w)strings in TAO are
-  // specializations and so are not template classes.
-  if ((nt != AST_Decl::NT_pre_defined
-       && nt != AST_Decl::NT_string
-       && nt != AST_Decl::NT_wstring)
-      || ! node->unbounded ())
-    {
-      if (this->gen_base_class_tmplinst (node) == -1)
-        {
-          return -1;
-        }
-    }
-
-  // For Any impl template class.
-  if (be_global->any_support () && !node->anonymous ())
-    {
-      TAO_OutStream *tmp = os;
-
-      if (be_global->gen_anyop_files ())
-        {
-          os = tao_cg->anyop_source ();
-        }
-
-      *os << be_nl << be_nl
-          << this->prefix_ << this->linebreak_ << be_idt << be_idt_nl
-          << "TAO::Any_Dual_Impl_T<" << this->linebreak_
-          << be_idt << be_idt_nl
-          << node->name () << this->linebreak_ << be_uidt_nl
-          << ">" << this->suffix_ << be_uidt << be_uidt << be_uidt;
-
-      os = tmp;
-    }
-
-  this->this_mode_generated (node, I_TRUE);
-  return 0;
-}
-
-int
-be_visitor_tmplinst_cs::visit_string (be_string *node)
-{
-  if (this->this_mode_generated (node) || !node->seen_in_operation ())
-    {
-      return 0;
-    }
-
-  unsigned long bound = node->max_size ()->ev ()->u.ulval;
-  be_typedef *alias = this->ctx_->alias ();
-
-  // Unbounded (w)string args are handled as a predefined type.
-  // Bounded (w)strings must come in as a typedef - they can't
-  // be used directly as arguments or return types.
-  if (bound == 0 || alias == 0)
-    {
-      this->this_mode_generated (node, I_TRUE);
-      return 0;
-    }
-
-  // For arg/return type helper template classes.
-
-  idl_bool wide = (node->width () != 1);
-
-  TAO_OutStream *os = this->ctx_->stream ();
-
-  os->gen_ifdef_macro (node->flat_name (), "arg_traits_tmplinst");
-
-  *os << be_nl << be_nl
-      << this->prefix_ << " TAO::Arg_Traits<TAO::" << alias->local_name ()
-      << "_" << bound << ">" << this->suffix_;
-
-  *os << be_nl << be_nl
-      << this->prefix_ << " TAO::BD_" << (wide ? "W" : "")
-      << "String_Arg_Traits<" << bound << ">" << this->suffix_;
-
-  os->gen_endif ();
-
-  this->this_mode_generated (node, I_TRUE);
-  return 0;
-}
-
-int
-be_visitor_tmplinst_cs::visit_array (be_array *node)
-{
-  if (this->this_mode_generated (node))
-    {
-      return 0;
-    }
-
-  TAO_OutStream *os = this->ctx_->stream ();
-
-  // For arg/return type helper template classes.
-  if (node->seen_in_operation ())
-    {
-      idl_bool variable = (node->size_type () == AST_Type::VARIABLE);
-
-      os->gen_ifdef_macro (node->flat_name (), "arg_traits_tmplinst");
-
-      *os << be_nl << be_nl << this->prefix_ << " TAO::Arg_Traits< ::"
-          << node->name () << ">" << this->suffix_;
-
-      *os << be_nl << be_nl
-          << this->prefix_ << this->linebreak_ << be_idt << be_idt_nl
-          << "TAO::" << (variable ? "Var" : "Fixed") << "_Array_Arg_Traits_T<"
-          << this->linebreak_ << be_idt << be_idt_nl
-          << "::" << node->name () << "," << this->linebreak_ << be_nl
-          << "::" << node->name () << "_slice," << this->linebreak_ << be_nl
-          << "::" << node->name () << "_var," << this->linebreak_ << be_nl;
-
-      if (variable)
-        {
-          *os << node->name () << "_out," << this->linebreak_ << be_nl;
-        }
-
-      *os << node->name () << "_forany" << this->linebreak_ << be_uidt_nl
-          << ">" << this->suffix_ << be_uidt << be_uidt << be_uidt;
-
-      os->gen_endif ();
-    }
-
-  if (node->imported ())
-    {
-      this->this_mode_generated (node, I_TRUE);
-      return 0;
-    }
-
-  // To hold the full name, whether anonymous or not.
-  char fname [NAMEBUFSIZE];
-  ACE_OS::memset (fname,
-                  '\0',
-                  NAMEBUFSIZE);
-
-  if (this->ctx_->alias ())
-    {
-      // Typedefed node.
-      ACE_OS::sprintf (fname, "%s",
-                       node->full_name ());
-    }
-  else
-    {
-      // For anonymous arrays ...
-      // we have to generate a name for us that has an underscope prepended to
-      // our local name. This needs to be inserted after the parents's name.
-      if (node->is_nested ())
-        {
-          be_decl *parent =
-            be_scope::narrow_from_scope (node->defined_in ())->decl ();
-          ACE_OS::sprintf (fname,
-                           "%s::_%s",
-                           parent->full_name (),
-                           node->local_name ()->get_string ());
-        }
-      else
-        {
-          ACE_OS::sprintf (fname,
-                           "_%s",
-                           node->full_name ());
-        }
-    }
-
-  // For array traits template class.
-
-  *os << be_nl << be_nl
-      << this->prefix_ << this->linebreak_ << be_idt << be_idt_nl
-      << "TAO::Array_Traits<" << this->linebreak_ << be_idt << be_idt_nl
-      << fname << "," << this->linebreak_ << be_nl
-      << fname << "_slice," << this->linebreak_ << be_nl
-      << fname << "_tag" << this->linebreak_ << be_uidt_nl
-      << ">" << this->suffix_ << be_uidt << be_uidt << be_uidt;
-
-  // For _var, _out and _forany template classes.
-
-  idl_bool fixed = (node->size_type () == AST_Type::FIXED);
-
-  if (this->ctx_->alias () != 0)
-    {
-      *os << be_nl << be_nl
-          << this->prefix_ << this->linebreak_ << be_idt << be_idt_nl
-          << "TAO_" << (fixed ? "Fixed" : "Var") << "Array_Var_T<"
-          << this->linebreak_ << be_idt << be_idt_nl
-          << fname << "," << this->linebreak_ << be_nl
-          << fname << "_slice," << this->linebreak_ << be_nl
-          << fname << "_tag" << this->linebreak_ << be_uidt_nl
-          << ">" << this->suffix_ << be_uidt << be_uidt << be_uidt;
-
-      *os << be_nl << be_nl
-          << this->prefix_ << this->linebreak_ << be_idt << be_idt_nl
-          << "TAO_Array_Out_T<" << this->linebreak_ << be_idt << be_idt_nl
-          << fname << "," << this->linebreak_ << be_nl
-          << fname << "_var," << this->linebreak_ << be_nl
-          << fname << "_slice," << this->linebreak_ << be_nl
-          << fname << "_tag" << this->linebreak_ << be_uidt_nl
-          << ">" << this->suffix_ << be_uidt << be_uidt << be_uidt;
-
-      *os << be_nl << be_nl
-          << this->prefix_ << this->linebreak_ << be_idt << be_idt_nl
-          << "TAO_Array_Var_Base_T<" << this->linebreak_ << be_idt
-          << be_idt_nl
-          << fname << "," << this->linebreak_ << be_nl
-          << fname << "_slice," << this->linebreak_ << be_nl
-          << fname << "_tag" << this->linebreak_ << be_uidt_nl
-          << ">" << this->suffix_ << be_uidt << be_uidt << be_uidt;
-    }
-
-  *os << be_nl << be_nl
-      << this->prefix_ << this->linebreak_ << be_idt << be_idt_nl
-      << "TAO_Array_Forany_T<" << this->linebreak_ << be_idt << be_idt_nl
-      << fname << "," << this->linebreak_ << be_nl
-      << fname << "_slice," << this->linebreak_ << be_nl
-      << fname << "_tag" << this->linebreak_ << be_uidt_nl
-      << ">" << this->suffix_ << be_uidt << be_uidt << be_uidt;
-
-  // For Any impl template class.
-  if (be_global->any_support ())
-    {
-      TAO_OutStream *tmp = os;
-
-      if (be_global->gen_anyop_files ())
-        {
-          os = tao_cg->anyop_source ();
-        }
-
-      *os << be_nl << be_nl
-          << this->prefix_ << this->linebreak_ << be_idt << be_idt_nl
-          << "TAO::Any_Array_Impl_T<" << this->linebreak_
-          << be_idt << be_idt_nl
-          << fname << "_slice," << this->linebreak_ << be_nl
-          << fname << "_forany" << this->linebreak_ << be_uidt_nl
-          << ">" << this->suffix_ << be_uidt << be_uidt << be_uidt;
-
-      os = tmp;
-    }
-
-  this->this_mode_generated (node, I_TRUE);
-  return 0;
-}
-
-int
-be_visitor_tmplinst_cs::visit_attribute (be_attribute *node)
-{
-  if (this->this_mode_generated (node)
-      || node->imported ()
-      || node->is_local ())
-    {
-      return 0;
-    }
-
-  const char * S = "";
-
-  be_visitor_arg_tmplinst visitor (this->ctx_,
-                                   this->mode_,
-                                   this->prefix_,
-                                   this->suffix_,
-                                   this->linebreak_,
-                                   S);
-  be_type *bt = be_type::narrow_from_decl (node->field_type ());
-  visitor.direction ();
-
-  if (bt->accept (&visitor) != 0)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_tmplinst_cs::"
-                         "visit_attribute - "
-                         "codegen for return type failed\n"),
-                        -1);
-    }
-
-  if (!node->readonly ())
-    {
-      visitor.direction (AST_Argument::dir_IN);
-
-      if (bt->accept (&visitor) != 0)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_tmplinst_cs::"
-                             "visit_attribute - "
-                             "codegen for IN parameter failed\n"),
-                            -1);
-        }
-    }
-
-  this->this_mode_generated (node, I_TRUE);
-  return 0;
-}
-
-int
-be_visitor_tmplinst_cs::visit_enum (be_enum *node)
-{
-  if (this->this_mode_generated (node))
-    {
-      return 0;
-    }
-
-  TAO_OutStream *os = this->ctx_->stream ();
-
-  // For arg/return type helper template classes.
-
-  if (node->seen_in_operation ())
-    {
-      os->gen_ifdef_macro (node->flat_name (), "arg_traits_tmplinst");
-
-      *os << be_nl << be_nl
-          << this->prefix_ << " TAO::Arg_Traits< ::" << node->name ()
-          << ">" << this->suffix_;
-
-      *os << be_nl << be_nl
-          << this->prefix_ << " TAO::Basic_Arg_Traits_T< ::" << node->name ()
-          << ">" << this->suffix_;
-
-      os->gen_endif ();
-    }
-
-  if (node->imported ())
-    {
-      this->this_mode_generated (node, I_TRUE);
-      return 0;
-    }
-
-  if (be_global->any_support ())
-    {
-      TAO_OutStream *tmp = os;
-
-      if (be_global->gen_anyop_files ())
-        {
-          os = tao_cg->anyop_source ();
-        }
-
-      *os << be_nl << be_nl
-          << this->prefix_ << this->linebreak_ << be_idt << be_idt_nl
-          << "TAO::Any_Basic_Impl_T<" << this->linebreak_
-          << be_idt << be_idt_nl
-          << node->name () << this->linebreak_ << be_uidt_nl
-          << ">" << this->suffix_ << be_uidt << be_uidt << be_uidt;
-
-      os = tmp;
-    }
-
-  this->this_mode_generated (node, I_TRUE);
-  return 0;
-}
-
-int
-be_visitor_tmplinst_cs::visit_exception (be_exception *node)
-{
-  if (this->this_mode_generated (node) || node->imported ())
-    {
-      return 0;
-    }
-
-  TAO_OutStream *os = this->ctx_->stream ();
-
-  if (be_global->any_support ())
-    {
-      TAO_OutStream *tmp = os;
-
-      if (be_global->gen_anyop_files ())
-        {
-          os = tao_cg->anyop_source ();
-        }
-
-      *os << be_nl << be_nl
-          << this->prefix_ << this->linebreak_ << be_idt << be_idt_nl
-          << "TAO::Any_Dual_Impl_T<" << this->linebreak_
-          << be_idt << be_idt_nl
-          << node->name () << this->linebreak_ << be_uidt_nl
-          << ">" << this->suffix_ << be_uidt << be_uidt << be_uidt;
-
-      os = tmp;
-    }
-
-  this->this_mode_generated (node, I_TRUE);
-  return 0;
-}
-
-int
-be_visitor_tmplinst_cs::visit_structure (be_structure *node)
-{
-  if (this->this_mode_generated (node))
-    {
-      return 0;
-    }
-
-  TAO_OutStream *os = this->ctx_->stream ();
-
-  // For arg/return type helper template classes.
-  if (node->seen_in_operation ())
-    {
-      idl_bool variable = (node->size_type () == AST_Type::VARIABLE);
-
-      os->gen_ifdef_macro (node->flat_name (), "arg_traits_tmplinst");
-
-      *os << be_nl << be_nl
-          << this->prefix_ << " TAO::Arg_Traits< ::" << node->name ()
-          << ">" << this->suffix_;
-
-      *os << be_nl << be_nl
-          << this->prefix_ << this->linebreak_ << be_idt << be_idt_nl
-          << "TAO::" << (variable ? "Var" : "Fixed") << "_Size_Arg_Traits_T<"
-          << this->linebreak_ << be_idt << be_idt_nl
-          << "::" << node->name ();
-
-      if (variable)
-        {
-          *os << "," << this->linebreak_ << be_nl
-              << "::" << node->name () << "_var," << this->linebreak_ << be_nl
-              << "::" << node->name () << "_out";
-        }
-
-      *os << this->linebreak_ << be_uidt_nl
-          << ">" << this->suffix_ << be_uidt << be_uidt << be_uidt;
-
-      os->gen_endif ();
-    }
-
-  if (this->visit_scope (node) != 0)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_tmplinst_cs::"
-                         "visit_structure - visit scope failed\n"),
-                        -1);
-    }
-
-  if (node->imported ())
-    {
-      this->this_mode_generated (node, I_TRUE);
-      return 0;
-    }
-
-  // For _var and/or _out tmp]ate clases.
-  this->gen_common_tmplinst (node, os);
-
-  if (be_global->any_support ())
-    {
-      TAO_OutStream *tmp = os;
-
-      if (be_global->gen_anyop_files ())
-        {
-          os = tao_cg->anyop_source ();
-        }
-
-      *os << be_nl << be_nl
-          << this->prefix_ << this->linebreak_ << be_idt << be_idt_nl
-          << "TAO::Any_Dual_Impl_T<" << this->linebreak_
-          << be_idt << be_idt_nl
-          << node->name () << this->linebreak_ << be_uidt_nl
-          << ">" << this->suffix_ << be_uidt << be_uidt << be_uidt;
-
-      os = tmp;
-    }
-
-  this->this_mode_generated (node, I_TRUE);
-  return 0;
-}
-
-int
-be_visitor_tmplinst_cs::visit_union (be_union *node)
-{
-  if (this->this_mode_generated (node))
-    {
-      return 0;
-    }
-
-  TAO_OutStream *os = this->ctx_->stream ();
-
-  if (node->seen_in_operation ())
-    {
-      idl_bool variable = (node->size_type () == AST_Type::VARIABLE);
-
-      os->gen_ifdef_macro (node->flat_name (), "arg_traits_tmplinst");
-
-      *os << be_nl << be_nl
-          << this->prefix_ << " TAO::Arg_Traits< ::" << node->name ()
-          << ">" << this->suffix_;
-
-      *os << be_nl << be_nl
-          << this->prefix_ << this->linebreak_ << be_idt << be_idt_nl
-          << "TAO::" << (variable ? "Var" : "Fixed") << "_Size_Arg_Traits_T<"
-          << this->linebreak_ << be_idt << be_idt_nl
-          << "::" << node->name ();
-
-      if (variable)
-        {
-          *os << "," << this->linebreak_ << be_nl
-              << "::" << node->name () << "_var," << this->linebreak_ << be_nl
-              << "::" << node->name () << "_out";
-        }
-
-      *os << this->linebreak_ << be_uidt_nl
-          << ">" << this->suffix_ << be_uidt << be_uidt << be_uidt;
-
-      os->gen_endif ();
-    }
-
-  if (this->visit_scope (node) != 0)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_tmplinst_cs::"
-                         "visit_structure - visit scope failed\n"),
-                        -1);
-    }
-
-  if (node->imported ())
-    {
-      this->this_mode_generated (node, I_TRUE);
-      return 0;
-    }
-
-  // For _var and/or _out tmp]ate clases.
-  this->gen_common_tmplinst (node, os);
-
-  if (be_global->any_support ())
-    {
-      TAO_OutStream *tmp = os;
-
-      if (be_global->gen_anyop_files ())
-        {
-          os = tao_cg->anyop_source ();
-        }
-
-      *os << be_nl << be_nl
-          << this->prefix_ << this->linebreak_ << be_idt << be_idt_nl
-          << "TAO::Any_Dual_Impl_T<" << this->linebreak_
-          << be_idt << be_idt_nl
-          << node->name () << this->linebreak_ << be_uidt_nl
-          << ">" << this->suffix_ << be_uidt << be_uidt << be_uidt;
-
-      os = tmp;
-    }
-
-  this->this_mode_generated (node, I_TRUE);
-  return 0;
-}
-
-idl_bool
-be_visitor_tmplinst_cs::this_mode_generated (be_decl *node) const
-{
-  switch (this->mode_)
-    {
-      case TMPL_CLASS:
-        return node->cli_tmpl_class_gen ();
-      case PRAGMA_INST:
-        return node->cli_pragma_inst_gen ();
-      default:
-        return I_FALSE;
-    }
-}
-
-void
-be_visitor_tmplinst_cs::this_mode_generated (be_decl *node,
-                                             idl_bool val)
-{
-  switch (this->mode_)
-    {
-      case TMPL_CLASS:
-        node->cli_tmpl_class_gen (val);
-        break;
-      case PRAGMA_INST:
-        node->cli_pragma_inst_gen (val);
-        break;
-      default:
-        break;
-    }
-}
-
-void
-be_visitor_tmplinst_cs::gen_managed_type_tmplinst (be_sequence *node,
-                                                   be_type *bt)
-{
-  TAO_OutStream *os = this->ctx_->stream ();
-
-  switch (node->managed_type ())
-    {
-      case be_sequence::MNG_OBJREF:
-        *os << be_nl << be_nl
-            << this->prefix_ << this->linebreak_ << be_idt << be_idt_nl
-            << "TAO_Object_Manager<" << this->linebreak_ << be_idt << be_idt_nl
-            << bt->name () << "," << this->linebreak_ << be_nl
-            << bt->name () << "_var" << this->linebreak_ << be_uidt_nl
-            << ">" << this->suffix_ << be_uidt << be_uidt << be_uidt;
-
-        break;
-      case be_sequence::MNG_VALUE:
-        *os << be_nl << be_nl
-            << this->prefix_ << this->linebreak_ << be_idt << be_idt_nl
-            << "TAO_Valuetype_Manager<" << this->linebreak_
-            << be_idt << be_idt_nl
-            << bt->name () << "," << this->linebreak_ << be_nl
-            << bt->name () << "_var" << this->linebreak_ << be_uidt_nl
-            << ">" << this->suffix_ << be_uidt << be_uidt << be_uidt;
-
-        break;
-      case be_sequence::MNG_PSEUDO:
-        *os << be_nl << be_nl
-            << this->prefix_ << this->linebreak_ << be_idt << be_idt_nl
-            << "TAO_Pseudo_Object_Manager<" << this->linebreak_
-            << be_idt << be_idt_nl
-            << bt->name () << this->linebreak_ << be_uidt_nl
-            << ">" << this->suffix_ << be_uidt << be_uidt << be_uidt;
-
-        break;
-      default:
-        //  String and Wstring managed types are not template classes.
-        break;
-    }
-}
-
-int
-be_visitor_tmplinst_cs::gen_varout_tmplinst (be_sequence *node,
-                                             be_type *bt)
-{
-  TAO_OutStream *os = this->ctx_->stream ();
-
-  switch (node->managed_type ())
-    {
-      case be_sequence::MNG_OBJREF:
-        *os << be_nl << be_nl
-            << this->prefix_ << this->linebreak_ << be_idt << be_idt_nl
-            << "TAO_MngSeq_Var_T<" << this->linebreak_ << be_idt << be_idt_nl
-            << node->name () << "," << this->linebreak_ << be_nl
-            << "TAO_Object_Manager<" << this->linebreak_
-            << be_idt << be_idt_nl
-            << bt->name () << "," << this->linebreak_ << be_nl
-            << bt->name () << "_var" << this->linebreak_
-            << be_uidt_nl
-            << ">" << this->linebreak_ << be_uidt << be_uidt_nl
-            << ">" << this->suffix_
-            << be_uidt << be_uidt << be_uidt;
-
-        *os << be_nl << be_nl
-            << this->prefix_ << this->linebreak_ << be_idt << be_idt_nl
-            << "TAO_Seq_Var_Base_T<" << this->linebreak_ << be_idt << be_idt_nl
-            << node->name () << "," << this->linebreak_ << be_nl
-            << "TAO_Object_Manager<" << this->linebreak_
-            << be_idt << be_idt_nl
-            << bt->name () << "," << this->linebreak_ << be_nl
-            << bt->name () << "_var" << this->linebreak_ << be_uidt_nl
-            << ">" << this->linebreak_ << be_uidt << be_uidt_nl
-            << ">" << this->suffix_
-            << be_uidt << be_uidt << be_uidt;
-
-        *os << be_nl << be_nl
-            << this->prefix_ << this->linebreak_ << be_idt << be_idt_nl
-            << "TAO_MngSeq_Out_T<" << this->linebreak_ << be_idt << be_idt_nl
-            << node->name () << "," << this->linebreak_ << be_nl
-            << node->name () << "_var," << this->linebreak_ << be_nl
-            << "TAO_Object_Manager<" << this->linebreak_
-            << be_idt << be_idt_nl
-            << bt->name () << "," << this->linebreak_ << be_nl
-            << bt->name () << "_var" << this->linebreak_ << be_uidt_nl
-            << ">" << this->linebreak_ << be_uidt << be_uidt_nl
-            << ">" << this->suffix_
-            << be_uidt << be_uidt << be_uidt;
-
-        break;
-      case be_sequence::MNG_PSEUDO:
-        *os << be_nl << be_nl
-            << this->prefix_ << this->linebreak_ << be_idt << be_idt_nl
-            << "TAO_MngSeq_Var_T<" << this->linebreak_ << be_idt << be_idt_nl
-            << node->name () << "," << this->linebreak_ << be_nl
-            << "TAO_Pseudo_Object_Manager<" << this->linebreak_
-            << be_idt << be_idt_nl
-            << bt->name () << this->linebreak_ << be_uidt_nl
-            << ">" << this->linebreak_ << be_uidt << be_uidt_nl
-            << ">" << this->suffix_
-            << be_uidt << be_uidt << be_uidt;
-
-        *os << be_nl << be_nl
-            << this->prefix_ << this->linebreak_ << be_idt << be_idt_nl
-            << "TAO_Seq_Var_Base_T<" << this->linebreak_
-            << be_idt << be_idt_nl
-            << node->name () << "," << this->linebreak_ << be_nl
-            << "TAO_Pseudo_Object_Manager<" << this->linebreak_
-            << be_idt << be_idt_nl
-            << bt->name () << this->linebreak_ << be_uidt_nl
-            << ">" << this->linebreak_ << be_uidt << be_uidt_nl
-            << ">" << this->suffix_
-            << be_uidt << be_uidt << be_uidt;
-
-        *os << be_nl << be_nl
-            << this->prefix_ << this->linebreak_ << be_idt << be_idt_nl
-            << "TAO_MngSeq_Out_T<" << this->linebreak_ << be_idt << be_idt_nl
-            << node->name () << "," << this->linebreak_ << be_nl
-            << node->name () << "_var," << this->linebreak_ << be_nl
-            << "TAO_Pseudo_Object_Manager<" << this->linebreak_
-            << be_idt << be_idt_nl
-            << bt->name () << this->linebreak_ << be_uidt_nl
-            << ">" << this->linebreak_ << be_uidt << be_uidt_nl
-            << ">" << this->suffix_
-            << be_uidt << be_uidt << be_uidt;
-
-        break;
-      case be_sequence::MNG_VALUE:
-        *os << be_nl << be_nl
-            << this->prefix_ << this->linebreak_ << be_idt << be_idt_nl
-            << "TAO_MngSeq_Var_T<" << this->linebreak_ << be_idt << be_idt_nl
-            << node->name () << "," << this->linebreak_ << be_nl
-            << "TAO_Valuetype_Manager<" << this->linebreak_
-            << be_idt << be_idt_nl
-            << bt->name () << "," << this->linebreak_ << be_nl
-            << bt->name () << "_var" << this->linebreak_ << be_uidt_nl
-            << ">" << this->linebreak_ << be_uidt << be_uidt_nl
-            << ">" << this->suffix_
-            << be_uidt << be_uidt << be_uidt;
-
-        *os << be_nl << be_nl
-            << this->prefix_ << this->linebreak_ << be_idt << be_idt_nl
-            << "TAO_Seq_Var_Base_T<" << this->linebreak_ << be_idt << be_idt_nl
-            << node->name () << "," << this->linebreak_ << be_nl
-            << "TAO_Valuetype_Manager<" << this->linebreak_
-            << be_idt << be_idt_nl
-            << bt->name () << "," << this->linebreak_ << be_nl
-            << bt->name () << "_var" << this->linebreak_ << be_uidt_nl
-            << ">" << this->linebreak_ << be_uidt << be_uidt_nl
-            << ">" << this->suffix_
-            << be_uidt << be_uidt << be_uidt;
-
-        *os << be_nl << be_nl
-            << this->prefix_ << this->linebreak_ << be_idt << be_idt_nl
-            << "TAO_MngSeq_Out_T<" << this->linebreak_ << be_idt << be_idt_nl
-            << node->name () << "," << this->linebreak_ << be_nl
-            << node->name () << "_var," << this->linebreak_ << be_nl
-            << "TAO_Valuetype_Manager<" << this->linebreak_
-            << be_idt << be_idt_nl
-            << bt->name () << "," << this->linebreak_ << be_nl
-            << bt->name () << "_var" << this->linebreak_ << be_uidt_nl
-            << ">" << this->linebreak_ << be_uidt << be_uidt_nl
-            << ">" << this->suffix_
-            << be_uidt << be_uidt << be_uidt;
-
-        break;
-      case be_sequence::MNG_STRING:
-        *os << be_nl << be_nl
-            << this->prefix_ << this->linebreak_ << be_idt << be_idt_nl
-            << "TAO_MngSeq_Var_T<" << this->linebreak_ << be_idt << be_idt_nl
-            << node->name () << "," << this->linebreak_ << be_nl
-            <<"TAO_SeqElem_String_Manager" << this->linebreak_ << be_uidt_nl
-            << ">" << this->suffix_
-            << be_uidt << be_uidt << be_uidt;
-
-        *os << be_nl << be_nl
-            << this->prefix_ << this->linebreak_ << be_idt << be_idt_nl
-            << "TAO_Seq_Var_Base_T<" << this->linebreak_
-            << be_idt << be_idt_nl
-            << node->name () << "," << this->linebreak_ << be_nl
-            <<"TAO_SeqElem_String_Manager" << this->linebreak_ << be_uidt_nl
-            << ">" << this->suffix_
-            << be_uidt << be_uidt << be_uidt;
-
-        *os << be_nl << be_nl
-            << this->prefix_ << this->linebreak_ << be_idt << be_idt_nl
-            << "TAO_MngSeq_Out_T<" << this->linebreak_ << be_idt << be_idt_nl
-            << node->name () << "," << this->linebreak_ << be_nl
-            << node->name () << "_var," << this->linebreak_ << be_nl
-            <<"TAO_SeqElem_String_Manager" << this->linebreak_ << be_uidt_nl
-            << ">" << this->suffix_
-            << be_uidt << be_uidt << be_uidt;
-
-        break;
-      case be_sequence::MNG_WSTRING:
-        *os << be_nl << be_nl
-            << this->prefix_ << this->linebreak_ << be_idt << be_idt_nl
-            << "TAO_MngSeq_Var_T<" << this->linebreak_ << be_idt << be_idt_nl
-            << node->name () << "," << this->linebreak_ << be_nl
-            <<"TAO_SeqElem_WString_Manager" << this->linebreak_ << be_uidt_nl
-            << ">" << this->suffix_
-            << be_uidt << be_uidt << be_uidt;
-
-        *os << be_nl << be_nl
-            << this->prefix_ << this->linebreak_ << be_idt << be_idt_nl
-            << "TAO_Seq_Var_Base_T<" << this->linebreak_
-            << be_idt << be_idt_nl
-            << node->name () << "," << this->linebreak_ << be_nl
-            <<"TAO_SeqElem_WString_Manager" << this->linebreak_ << be_uidt_nl
-            << ">" << this->suffix_
-            << be_uidt << be_uidt << be_uidt;
-
-        *os << be_nl << be_nl
-            << this->prefix_ << this->linebreak_ << be_idt << be_idt_nl
-            << "TAO_MngSeq_Out_T<" << this->linebreak_ << be_idt << be_idt_nl
-            << node->name () << "," << this->linebreak_ << be_nl
-            << node->name () << "_var," << this->linebreak_ << be_nl
-            <<"TAO_SeqElem_WString_Manager" << this->linebreak_ << be_uidt_nl
-            << ">" << this->suffix_
-            << be_uidt << be_uidt << be_uidt;
-
-        break;
-      default: // not a managed type
-        {
-          AST_Type::SIZE_TYPE st = bt->size_type ();
-
-          *os << be_nl << be_nl
-              << this->prefix_ << this->linebreak_ << be_idt << be_idt_nl
-              << (st == AST_Type::FIXED ? "TAO_FixedSeq_Var_T<"
-                                        : "TAO_VarSeq_Var_T<")
-              << this->linebreak_ << be_idt << be_idt_nl
-              << node->name () << "," << this->linebreak_ << be_nl
-              << bt->name () << this->linebreak_ << be_uidt_nl
-              << ">" << this->suffix_
-              << be_uidt << be_uidt << be_uidt;
-
-          *os << be_nl << be_nl
-              << this->prefix_ << this->linebreak_ << be_idt << be_idt_nl
-              << "TAO_Seq_Var_Base_T<" << this->linebreak_
-              << be_idt << be_idt_nl
-              << node->name () << "," << this->linebreak_ << be_nl
-              << bt->name () << this->linebreak_ << be_uidt_nl
-              << ">" << this->suffix_
-              << be_uidt << be_uidt << be_uidt;
-
-          *os << be_nl << be_nl
-              << this->prefix_ << this->linebreak_ << be_idt << be_idt_nl
-              << "TAO_Seq_Out_T<" << this->linebreak_
-              << be_idt << be_idt_nl
-              << node->name () << "," << this->linebreak_ << be_nl
-              << node->name () << "_var," << this->linebreak_ << be_nl
-              << bt->name () << this->linebreak_ << be_uidt_nl
-              << ">" << this->suffix_
-              << be_uidt << be_uidt << be_uidt;
-        }
-
-        break;
-    }
-
-  return 0;
-}
-
-int
-be_visitor_tmplinst_cs::gen_base_class_tmplinst (be_sequence *node)
-{
-  TAO_OutStream *os = this->ctx_->stream ();
-
-  // A generated sequence is a unique class type for each IDL typedef,
-  // but the base template class may not be. So, when generating the
-  // explicit template instantiation of the base class, we use the
-  // unaliased element type and the bound (if any) in the #ifdef guard to
-  // prevent duplicates.
-
-  be_type *bt = be_type::narrow_from_decl (node->base_type ());
-  AST_Decl::NodeType nt = bt->node_type ();
-
-  if (nt == AST_Decl::NT_typedef)
-    {
-      be_typedef *td = be_typedef::narrow_from_decl (bt);
-      bt = td->primitive_base_type ();
-    }
-
-  static char ifdef_suffix [NAMEBUFSIZE];
-
-  ACE_OS::memset (ifdef_suffix,
-                  '\0',
-                  NAMEBUFSIZE);
-
-  if (node->unbounded ())
-    {
-      ACE_OS::sprintf (ifdef_suffix,
-                       "%s",
-                       "explicit");
-    }
-  else
-    {
-      ACE_OS::sprintf (ifdef_suffix,
-                       "%ld_%s",
-                       node->max_size ()->ev ()->u.ulval,
-                       "explicit");
-    }
-
-  os->gen_ifdef_macro (bt->flat_name (), ifdef_suffix);
-
-  *os << be_nl << be_nl
-      << this->prefix_ << this->linebreak_ << be_idt << be_idt_nl;
-
-  int status = node->gen_base_class_name (os,
-                                          this->linebreak_,
-                                          idl_global->root ());
-
-  // Pass it to the base constructor.
-  if (status == -1)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_tmplinst_cs::"
-                         "gen_base_class_tmplinst - "
-                         "codegen for base sequence class failed\n"),
-                        -1);
-    }
-
-  *os << this->suffix_ << be_uidt << be_uidt;
-
-  os->gen_endif ();
-
-  return 0;
-}
-
-void
-be_visitor_tmplinst_cs::gen_common_tmplinst (be_type *node,
-                                             TAO_OutStream *os)
-{
-  idl_bool fixed = (node->size_type () == AST_Type::FIXED);
-
-  *os << be_nl << be_nl
-      << this->prefix_ << this->linebreak_ << be_idt << be_idt_nl
-      << "TAO_" << (fixed ? "Fixed" : "Var") << "_Var_T<"
-      << this->linebreak_ << be_idt << be_idt_nl
-      << node->name () << this->linebreak_ << be_uidt_nl
-      << ">" << this->suffix_ << be_uidt << be_uidt << be_uidt;
-
-  *os << be_nl << be_nl
-      << this->prefix_ << this->linebreak_ << be_idt << be_idt_nl
-      << "TAO_Var_Base_T<" << this->linebreak_ << be_idt << be_idt_nl
-      << node->name () << this->linebreak_ << be_uidt_nl
-      << ">" << this->suffix_ << be_uidt << be_uidt << be_uidt;
-
-  if (!fixed)
-    {
-      *os << be_nl<< be_nl
-          << this->prefix_ << this->linebreak_ << be_idt << be_idt_nl
-          << "TAO_Out_T<" << this->linebreak_ << be_idt << be_idt_nl
-          << node->name () << "," << this->linebreak_ << be_nl
-          << node->name () << "_var" << this->linebreak_ << be_uidt_nl
-          << ">" << this->suffix_ << be_uidt << be_uidt << be_uidt;
-    }
-}
diff --git a/TAO/TAO_IDL/be/be_visitor_tmplinst/tmplinst_ss.cpp b/TAO/TAO_IDL/be/be_visitor_tmplinst/tmplinst_ss.cpp
deleted file mode 100644
index 0c9eadb8ac9..00000000000
--- a/TAO/TAO_IDL/be/be_visitor_tmplinst/tmplinst_ss.cpp
+++ /dev/null
@@ -1,576 +0,0 @@
-//=============================================================================
-/**
-*  @file   tmplinst_ss.cpp
-*
-*  $Id$
-*
-*  This visitor generates explicit template instantiations, guarded so they
-*  are seen only by compilers whose platforms require explicit template
-*  instantiation.
-*
-*  @author Jeff Parsons <j.parsons@vanderbilt.edu>
-*/
-//=============================================================================
-
-be_visitor_tmplinst_ss::be_visitor_tmplinst_ss (be_visitor_context *ctx)
-  : be_visitor_tmplinst (ctx)
-{
-}
-
-be_visitor_tmplinst_ss::~be_visitor_tmplinst_ss (void)
-{
-}
-
-int
-be_visitor_tmplinst_ss::visit_interface (be_interface *node)
-{
-  if (this->this_mode_generated (node))
-    {
-      return 0;
-    }
-
-  TAO_OutStream *os = this->ctx_->stream ();
-
-  // For arg/return type helper template classes. This must come before
-  // the check for an imported or undefined node because such a node
-  // could still be used in an operation and thus cause the use of
-  // an arg helper template class.
-  if (node->seen_in_operation ())
-    {
-      os->gen_ifdef_macro (node->flat_name (), "sarg_traits_tmplinst");
-
-      *os << be_nl << be_nl
-          << this->prefix_ << " TAO::SArg_Traits<" << node->name ()
-          << ">" << this->suffix_;
-
-      *os << be_nl << be_nl
-          << this->prefix_ << this->linebreak_ << be_idt << be_idt_nl
-          << "TAO::Object_SArg_Traits_T<" << this->linebreak_
-          << be_idt << be_idt_nl
-          << node->name () << "_ptr," << this->linebreak_ << be_nl
-          << node->name () << "_var," << this->linebreak_ << be_nl
-          << node->name () << "_out," << this->linebreak_ << be_uidt_nl
-          << ">" << this->suffix_ << be_uidt << be_uidt << be_uidt << be_uidt;
-
-      os->gen_endif ();
-    }
-
-  if (node->original_interface () != 0 &&
-     (ACE_OS::strncmp (node->local_name (), "AMH", 3) == 0))
-    {
-      // Serialize explicit template instantiation for AMH RH allocator
-      char *buf;
-      node->compute_full_name ("TAO_", "", buf);
-      ACE_CString response_handler_implementation_name ("POA_");
-      response_handler_implementation_name += buf;
-      delete [] buf;
-      buf = 0;
-
-      *os << be_nl << be_nl
-          << this->prefix_ << this->linebreak_ << be_idt << be_idt_nl
-          << "TAO::TAO_Buffer_Allocator<" << be_idt_nl
-          << response_handler_implementation_name.c_str () << ","
-          << this->linebreak_ << be_nl
-          << "TAO_AMH_BUFFER_ALLOCATOR>"
-          << this->suffix_ << be_uidt << be_uidt << be_uidt ;
-
-      *os << be_nl << be_nl
-          << this->prefix_ << this->linebreak_ << be_idt << be_idt_nl
-          << "TAO::TAO_Allocator<" << be_idt_nl
-          << response_handler_implementation_name.c_str ()
-          << ">"
-          << this->suffix_ << be_uidt << be_uidt << be_uidt ;
-    }
-
-  // If one of these is true we can skip the rest.
-  if (node->imported () || !node->is_defined ())
-    {
-      this->this_mode_generated (node, I_TRUE);
-      return 0;
-    }
-
-  if (this->visit_scope (node) != 0)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_tmplinst_ss::"
-                         "visit_interface - visit scope failed\n"),
-                        -1);
-    }
-
-  this->this_mode_generated (node, I_TRUE);
-  return 0;
-}
-
-int 
-be_visitor_tmplinst_ss::visit_valuebox (be_valuebox *node)
-{
-  if (this->this_mode_generated (node))
-    {
-      return 0;
-    }
-
-  TAO_OutStream *os = this->ctx_->stream ();
-
-  // For arg/return type helper template classes.
-  if (node->seen_in_operation ())
-    {
-      os->gen_ifdef_macro (node->flat_name (), "sarg_traits_tmplinst");
-
-      *os << be_nl << be_nl
-          << this->prefix_ << " TAO::Arg_Traits< ::" << node->name ()
-          << ">" << this->suffix_;
-
-      *os << be_nl << be_nl
-          << this->prefix_ << this->linebreak_ << be_idt << be_idt_nl
-          << "TAO::Object_SArg_Traits_T<" << this->linebreak_
-          << be_idt << be_idt_nl
-          << "::" << node->name () << " *," << this->linebreak_ << be_nl
-          << "::" << node->name () << "_var," << this->linebreak_ << be_nl
-          << "::" << node->name () << "_out," << this->linebreak_ << be_uidt_nl
-          << ">" << this->suffix_ << be_uidt << be_uidt << be_uidt << be_uidt;
-
-      os->gen_endif ();
-    }
-
-  if (node->imported () || !node->is_defined ())
-    {
-      this->this_mode_generated (node, I_TRUE);
-      return 0;
-    }
-
-  this->this_mode_generated (node, I_TRUE);
-  return 0;
-}
-
-int
-be_visitor_tmplinst_ss::visit_valuetype (be_valuetype *node)
-{
-  if (this->this_mode_generated (node))
-    {
-      return 0;
-    }
-
-  TAO_OutStream *os = this->ctx_->stream ();
-
-  // For arg/return type helper template classes.
-  if (node->seen_in_operation ())
-    {
-      os->gen_ifdef_macro (node->flat_name (), "sarg_traits_tmplinst");
-
-      *os << be_nl << be_nl
-          << this->prefix_ << " TAO::Arg_Traits< ::" << node->name ()
-          << ">" << this->suffix_;
-
-      *os << be_nl << be_nl
-          << this->prefix_ << this->linebreak_ << be_idt << be_idt_nl
-          << "TAO::Object_SArg_Traits_T<" << this->linebreak_
-          << be_idt << be_idt_nl
-          << "::" << node->name () << " *," << this->linebreak_ << be_nl
-          << "::" << node->name () << "_var," << this->linebreak_ << be_nl
-          << "::" << node->name () << "_out," << this->linebreak_ << be_uidt_nl
-          << ">" << this->suffix_ << be_uidt << be_uidt << be_uidt << be_uidt;
-
-      os->gen_endif ();
-    }
-
-  if (node->imported () || !node->is_defined ())
-    {
-      this->this_mode_generated (node, I_TRUE);
-      return 0;
-    }
-
-  if (this->visit_scope (node) != 0)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_tmplinst_ss::"
-                         "visit_valuetype - visit scope failed\n"),
-                        -1);
-    }
-
-  this->this_mode_generated (node, I_TRUE);
-  return 0;
-}
-
-int
-be_visitor_tmplinst_ss::visit_operation (be_operation *node)
-{
-  if (this->this_mode_generated (node)
-      || node->imported ()
-      || node->is_local ())
-    {
-      return 0;
-    }
-
-  const char * S = "S";
-
-  be_visitor_arg_tmplinst visitor (this->ctx_,
-                                   this->mode_,
-                                   this->prefix_,
-                                   this->suffix_,
-                                   this->linebreak_,
-                                   S);
-  be_type *bt = be_type::narrow_from_decl (node->return_type ());
-  visitor.direction ();
-
-  if (bt->accept (&visitor) != 0)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_tmplinst_ss::"
-                         "visit_operation - "
-                         "codegen for return type failed\n"),
-                        -1);
-    }
-
-  be_argument *arg = 0;
-
-  for (UTL_ScopeActiveIterator si (node, UTL_Scope::IK_decls);
-       !si.is_done ();
-       si.next ())
-    {
-      arg = be_argument::narrow_from_decl (si.item ());
-      visitor.direction (arg->direction ());
-      bt = be_type::narrow_from_decl (arg->field_type ());
-
-      if (bt->accept (&visitor) != 0)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_tmplinst_ss::"
-                             "visit_operation - "
-                             "codegen for argument failed\n"),
-                            -1);
-        }
-    }
-
-  this->this_mode_generated (node, I_TRUE);
-  return 0;
-}
-
-int
-be_visitor_tmplinst_ss::visit_sequence (be_sequence *node)
-{
-  if (this->this_mode_generated (node))
-    {
-      return 0;
-    }
-
-  TAO_OutStream *os = this->ctx_->stream ();
-  be_typedef *alias = this->ctx_->alias ();
-
-  // For arg/return type helper template classes.
-  // If the node is anonymous, it can't have been seen in an operation,
-  // so no check is necessary for alias == 0.
-  if (node->seen_in_operation ())
-    {
-      os->gen_ifdef_macro (node->flat_name (), "sarg_traits_tmplinst");
-
-      *os << be_nl << be_nl
-          << this->prefix_ << " TAO::SArg_Traits<" << alias->name ()
-          << ">" << this->suffix_;
-
-      *os << be_nl << be_nl
-          << this->prefix_ << this->linebreak_ << be_idt << be_idt_nl
-          << "TAO::Var_Size_SArg_Traits_T<" << this->linebreak_
-          << be_idt << be_idt_nl
-          << alias->name () << "," << this->linebreak_ << be_nl
-          << alias->name () << "_var," << this->linebreak_ << be_nl
-          << alias->name () << "_out" << this->linebreak_ << be_uidt_nl
-          << ">" << this->suffix_ << be_uidt << be_uidt << be_uidt;
-
-        os->gen_endif ();
-    }
-
-  this->this_mode_generated (node, I_TRUE);
-  return 0;
-}
-
-int
-be_visitor_tmplinst_ss::visit_string (be_string *node)
-{
-  if (this->this_mode_generated (node) || !node->seen_in_operation ())
-    {
-      return 0;
-    }
-
-  unsigned long bound = node->max_size ()->ev ()->u.ulval;
-  be_typedef *alias = this->ctx_->alias ();
-
-  // Unbounded (w)string args are handled as a predefined type.
-  // Bounded (w)strings must come in as a typedef - they can't
-  // be used directly as arguments or return types.
-  if (bound == 0 || alias == 0)
-    {
-      this->this_mode_generated (node, I_TRUE);
-      return 0;
-    }
-
-  // For arg/return type helper template classes.
-
-  idl_bool wide = (node->width () != 1);
-
-  TAO_OutStream *os = this->ctx_->stream ();
-
-  os->gen_ifdef_macro (node->flat_name (), "sarg_traits_tmplinst");
-
-  *os << be_nl << be_nl
-      << this->prefix_ << " TAO::SArg_Traits<TAO::" << alias->local_name ()
-      << "_" << bound << ">" << this->suffix_;
-
-  *os << be_nl << be_nl
-      << this->prefix_ << " TAO::BD_" << (wide ? "W" : "")
-      << "String_SArg_Traits<" << bound << ">" << this->suffix_;
-
-  os->gen_endif ();
-
-  this->this_mode_generated (node, I_TRUE);
-  return 0;
-}
-
-int
-be_visitor_tmplinst_ss::visit_array (be_array *node)
-{
-  if (this->this_mode_generated (node) || !node->seen_in_operation ())
-    {
-      return 0;
-    }
-
-  TAO_OutStream *os = this->ctx_->stream ();
-
-  // For arg/return type helper template classes.
-  idl_bool variable = (node->size_type () == AST_Type::VARIABLE);
-
-  os->gen_ifdef_macro (node->flat_name (), "sarg_traits_tmplinst");
-
-  *os << be_nl << be_nl << this->prefix_ << " TAO::SArg_Traits<"
-      << node->name () << ">" << this->suffix_;
-
-  *os << be_nl << be_nl
-      << this->prefix_ << this->linebreak_ << be_idt << be_idt_nl
-      << "TAO::" << (variable ? "Var" : "Fixed") << "_Array_SArg_Traits_T<"
-      << this->linebreak_ << be_idt << be_idt_nl
-      << node->name () << "," << this->linebreak_ << be_nl
-      << node->name () << "_slice," << this->linebreak_ << be_nl
-      << node->name () << "_var," << this->linebreak_ << be_nl;
-
-  if (variable)
-    {
-      *os << node->name () << "_out," << this->linebreak_ << be_nl;
-    }
-
-  *os << node->name () << "_forany" << this->linebreak_ << be_uidt_nl
-      << ">" << this->suffix_ << be_uidt << be_uidt << be_uidt;
-
-  os->gen_endif ();
-
-  this->this_mode_generated (node, I_TRUE);
-  return 0;
-}
-
-int
-be_visitor_tmplinst_ss::visit_attribute (be_attribute *node)
-{
-  if (this->this_mode_generated (node)
-      || node->imported ()
-      || node->is_local ())
-    {
-      return 0;
-    }
-
-  const char * S = "S";
-
-  be_visitor_arg_tmplinst visitor (this->ctx_,
-                                   this->mode_,
-                                   this->prefix_,
-                                   this->suffix_,
-                                   this->linebreak_,
-                                   S);
-  be_type *bt = be_type::narrow_from_decl (node->field_type ());
-  visitor.direction ();
-
-  if (bt->accept (&visitor) != 0)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_tmplinst_ss::"
-                         "visit_attribute - "
-                         "codegen for return type failed\n"),
-                        -1);
-    }
-
-  if (!node->readonly ())
-    {
-      visitor.direction (AST_Argument::dir_IN);
-
-      if (bt->accept (&visitor) != 0)
-        {
-          ACE_ERROR_RETURN ((LM_ERROR,
-                             "(%N:%l) be_visitor_tmplinst_ss::"
-                             "visit_attribute - "
-                             "codegen for IN parameter failed\n"),
-                            -1);
-        }
-    }
-
-  this->this_mode_generated (node, I_TRUE);
-  return 0;
-}
-
-int
-be_visitor_tmplinst_ss::visit_enum (be_enum *node)
-{
-  if (this->this_mode_generated (node) || !node->seen_in_operation ())
-    {
-      return 0;
-    }
-
-  TAO_OutStream *os = this->ctx_->stream ();
-
-  // For arg/return type helper template classes.
-  os->gen_ifdef_macro (node->flat_name (), "sarg_traits_tmplinst");
-
-  *os << be_nl << be_nl
-      << this->prefix_ << " TAO::SArg_Traits<" << node->name ()
-      << ">" << this->suffix_;
-
-  *os << be_nl << be_nl
-      << this->prefix_ << " TAO::Basic_SArg_Traits_T<" << node->name ()
-      << ">" << this->suffix_;
-
-  os->gen_endif ();
-
-  this->this_mode_generated (node, I_TRUE);
-  return 0;
-}
-
-int
-be_visitor_tmplinst_ss::visit_structure (be_structure *node)
-{
-  if (this->this_mode_generated (node))
-    {
-      return 0;
-    }
-
-  TAO_OutStream *os = this->ctx_->stream ();
-
-  // For arg/return type helper template classes.
-  if (node->seen_in_operation ())
-    {
-      idl_bool variable = (node->size_type () == AST_Type::VARIABLE);
-
-      os->gen_ifdef_macro (node->flat_name (), "sarg_traits_tmplinst");
-
-      *os << be_nl << be_nl
-          << this->prefix_ << " TAO::SArg_Traits<" << node->name ()
-          << ">" << this->suffix_;
-
-      *os << be_nl << be_nl
-          << this->prefix_ << this->linebreak_ << be_idt << be_idt_nl
-          << "TAO::" << (variable ? "Var" : "Fixed") << "_Size_SArg_Traits_T<"
-          << this->linebreak_ << be_idt << be_idt_nl
-          << node->name ();
-
-      if (variable)
-        {
-          *os << "," << this->linebreak_ << be_nl
-              << node->name () << "_var," << this->linebreak_ << be_nl
-              << node->name () << "_out";
-        }
-
-      *os << this->linebreak_ << be_uidt_nl
-          << ">" << this->suffix_ << be_uidt << be_uidt << be_uidt;
-
-      os->gen_endif ();
-    }
-
-  if (this->visit_scope (node) != 0)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_tmplinst_ss::"
-                         "visit_structure - visit scope failed\n"),
-                        -1);
-    }
-
-  this->this_mode_generated (node, I_TRUE);
-  return 0;
-}
-
-int
-be_visitor_tmplinst_ss::visit_union (be_union *node)
-{
-  if (this->this_mode_generated (node))
-    {
-      return 0;
-    }
-
-  TAO_OutStream *os = this->ctx_->stream ();
-
-  if (node->seen_in_operation ())
-    {
-      idl_bool variable = (node->size_type () == AST_Type::VARIABLE);
-
-      os->gen_ifdef_macro (node->flat_name (), "sarg_traits_tmplinst");
-
-      *os << be_nl << be_nl
-          << this->prefix_ << " TAO::SArg_Traits<" << node->name ()
-          << ">" << this->suffix_;
-
-      *os << be_nl << be_nl
-          << this->prefix_ << this->linebreak_ << be_idt << be_idt_nl
-          << "TAO::" << (variable ? "Var" : "Fixed") << "_Size_SArg_Traits_T<"
-          << this->linebreak_ << be_idt << be_idt_nl
-          << node->name ();
-
-      if (variable)
-        {
-          *os << "," << this->linebreak_ << be_nl
-              << node->name () << "_var," << this->linebreak_ << be_nl
-              << node->name () << "_out";
-        }
-
-      *os << this->linebreak_ << be_uidt_nl
-          << ">" << this->suffix_ << be_uidt << be_uidt << be_uidt;
-
-      os->gen_endif ();
-    }
-
-  if (this->visit_scope (node) != 0)
-    {
-      ACE_ERROR_RETURN ((LM_ERROR,
-                         "(%N:%l) be_visitor_tmplinst_ss::"
-                         "visit_structure - visit scope failed\n"),
-                        -1);
-    }
-
-  this->this_mode_generated (node, I_TRUE);
-  return 0;
-}
-
-idl_bool
-be_visitor_tmplinst_ss::this_mode_generated (be_decl *node) const
-{
-  switch (this->mode_)
-    {
-      case TMPL_CLASS:
-        return node->srv_tmpl_class_gen ();
-      case PRAGMA_INST:
-        return node->srv_pragma_inst_gen ();
-      default:
-        return I_FALSE;
-    }
-}
-
-void
-be_visitor_tmplinst_ss::this_mode_generated (be_decl *node,
-                                             idl_bool val)
-{
-  switch (this->mode_)
-    {
-      case TMPL_CLASS:
-        node->srv_tmpl_class_gen (val);
-        break;
-      case PRAGMA_INST:
-        node->srv_pragma_inst_gen (val);
-        break;
-      default:
-        break;
-    }
-}
-
diff --git a/TAO/TAO_IDL/be/be_visitor_typecode/typecode_decl.cpp b/TAO/TAO_IDL/be/be_visitor_typecode/typecode_decl.cpp
index 0379aa94344..e29c13dc981 100644
--- a/TAO/TAO_IDL/be/be_visitor_typecode/typecode_decl.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_typecode/typecode_decl.cpp
@@ -29,6 +29,11 @@ ACE_RCSID (be_visitor_typecode,
 be_visitor_typecode_decl::be_visitor_typecode_decl (be_visitor_context *ctx)
   : be_visitor_decl (ctx)
 {
+  if (be_global->gen_anyop_files ())
+    {
+      // The context is always a copy, so this is ok.
+      this->ctx_->stream (tao_cg->anyop_header ());
+    }
 }
 
 be_visitor_typecode_decl::~be_visitor_typecode_decl (void)
@@ -42,6 +47,11 @@ be_visitor_typecode_decl::visit_type (be_type *node)
 
   *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
+  
+  // If -GA is used but anyop macro isn't set, defaults to stub macro.    
+  const char *export_macro = (be_global->gen_anyop_files ()
+                              ? this->ctx_->non_null_export_macro ()
+                              : be_global->stub_export_macro ());
 
   if (node->is_nested ())
     {
@@ -51,7 +61,7 @@ be_visitor_typecode_decl::visit_type (be_type *node)
       // declared extern.
       if (node->defined_in ()->scope_node_type () == AST_Decl::NT_module)
         {
-          *os << "extern " << be_global->stub_export_macro () << " ";
+          *os << "extern " << export_macro << " ";
         }
       else
         {
@@ -65,7 +75,7 @@ be_visitor_typecode_decl::visit_type (be_type *node)
   else
     {
       // We are in the ROOT scope.
-      *os << "extern " << be_global->stub_export_macro ()
+      *os << "extern " << export_macro
           << " ::CORBA::TypeCode_ptr const "
           << node->tc_name ()->last_component ()
           << ";";
diff --git a/TAO/TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp b/TAO/TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp
index ca73351bdf9..9a5328f90a7 100644
--- a/TAO/TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp
@@ -75,7 +75,7 @@ be_visitor_typecode_defn::be_visitor_typecode_defn (be_visitor_context * ctx)
 {
   if (be_global->gen_anyop_files ())
     {
-      // Switch streams.  (ctx better be a copy!)
+      // The context is always a copy, so this is ok.
       this->ctx_->stream (tao_cg->anyop_source ());
     }
 }
diff --git a/TAO/TAO_IDL/be/be_visitor_union/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_union/any_op_ch.cpp
index 8031b017d40..fe951a47060 100644
--- a/TAO/TAO_IDL/be/be_visitor_union/any_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union/any_op_ch.cpp
@@ -18,8 +18,8 @@
 //
 // ============================================================================
 
-ACE_RCSID (be_visitor_union, 
-           any_op_ch, 
+ACE_RCSID (be_visitor_union,
+           any_op_ch,
            "$Id$")
 
 // ***************************************************************************
@@ -47,28 +47,25 @@ be_visitor_union_any_op_ch::visit_union (be_union *node)
     }
 
   TAO_OutStream *os = this->ctx_->stream ();
+  const char *macro = this->ctx_->export_macro ();
 
   *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
 
-  *os << be_global->stub_export_macro () << " void"
-      << " operator<<= ( ::CORBA::Any &, const " << node->name ()
+  *os << macro << " void operator<<= (::CORBA::Any &, const " << node->name ()
       << " &); // copying version" << be_nl;
-  *os << be_global->stub_export_macro () << " void"
-      << " operator<<= ( ::CORBA::Any &, " << node->name ()
+  *os << macro << " void operator<<= (::CORBA::Any &, " << node->name ()
       << "*); // noncopying version" << be_nl;
-  *os << be_global->stub_export_macro () << " ::CORBA::Boolean"
-      << " operator>>= (const ::CORBA::Any &, "
+  *os << macro << " ::CORBA::Boolean operator>>= (const ::CORBA::Any &, "
       << node->name () << " *&); // deprecated\n";
-  *os << be_global->stub_export_macro () << " ::CORBA::Boolean"
-      << " operator>>= (const ::CORBA::Any &, const "
+  *os << macro << " ::CORBA::Boolean operator>>= (const ::CORBA::Any &, const "
       << node->name () << " *&);";
 
   if (this->visit_scope (node) == -1)
     {
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_union::visit_union - "
-                         "codegen for scope failed\n"), 
+                         "codegen for scope failed\n"),
                         -1);
     }
 
@@ -87,7 +84,7 @@ be_visitor_union_any_op_ch::visit_union_branch (be_union_branch *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_union_any_op_ch::"
                          "visit_union_branch - "
-                         "Bad field type\n"), 
+                         "Bad field type\n"),
                         -1);
     }
 
@@ -96,7 +93,7 @@ be_visitor_union_any_op_ch::visit_union_branch (be_union_branch *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_union_any_op_ch::"
                          "visit_field - "
-                         "codegen for field type failed\n"), 
+                         "codegen for field type failed\n"),
                         -1);
     }
 
@@ -119,7 +116,7 @@ be_visitor_union_any_op_ch::visit_enum (be_enum *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_union_any_op_ch::"
                          "visit_enum - "
-                         "codegen for field type failed\n"), 
+                         "codegen for field type failed\n"),
                         -1);
     }
 
@@ -142,7 +139,7 @@ be_visitor_union_any_op_ch::visit_structure (be_structure *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_union_any_op_ch::"
                          "visit_structure - "
-                         "codegen for field type failed\n"), 
+                         "codegen for field type failed\n"),
                         -1);
     }
 
diff --git a/TAO/TAO_IDL/be/be_visitor_union/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union/cdr_op_cs.cpp
index d7eddab04c5..6c12a1dd7b1 100644
--- a/TAO/TAO_IDL/be/be_visitor_union/cdr_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union/cdr_op_cs.cpp
@@ -18,8 +18,8 @@
 //
 // ============================================================================
 
-ACE_RCSID (be_visitor_union, 
-           cdr_op_cs, 
+ACE_RCSID (be_visitor_union,
+           cdr_op_cs,
            "$Id$")
 
 // ***************************************************************************
@@ -42,8 +42,8 @@ int
 be_visitor_union_cdr_op_cs::visit_union (be_union *node)
 {
   // already generated and/or we are imported. Don't do anything.
-  if (node->cli_stub_cdr_op_gen () 
-      || node->imported () 
+  if (node->cli_stub_cdr_op_gen ()
+      || node->imported ()
       || node->is_local ())
     {
       return 0;
@@ -57,7 +57,7 @@ be_visitor_union_cdr_op_cs::visit_union (be_union *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_union_cdr_op_cs"
                          "::visit_union - "
-                         "codegen for scope failed\n"), 
+                         "codegen for scope failed\n"),
                         -1);
     }
 
@@ -78,17 +78,17 @@ be_visitor_union_cdr_op_cs::visit_union (be_union *node)
   switch (node->udisc_type ())
     {
       case AST_Expression::EV_bool:
-        *os << "::CORBA::Any::from_boolean tmp (_tao_union._d ());" << be_nl
+        *os << "::ACE_OutputCDR::from_boolean tmp (_tao_union._d ());" << be_nl
             << "if ( !(strm << tmp) )" << be_idt_nl;
 
         break;
       case AST_Expression::EV_char:
-        *os << "::CORBA::Any::from_char tmp (_tao_union._d ());" << be_nl
+        *os << "::ACE_OutputCDR::from_char tmp (_tao_union._d ());" << be_nl
             << "if ( !(strm << tmp) )" << be_idt_nl;
 
         break;
       case AST_Expression::EV_wchar:
-        *os << "::CORBA::Any::from_wchar tmp (_tao_union._d ());" << be_nl
+        *os << "::ACE_OutputCDR::from_wchar tmp (_tao_union._d ());" << be_nl
             << "if ( !(strm << tmp) )" << be_idt_nl;
 
         break;
@@ -148,17 +148,17 @@ be_visitor_union_cdr_op_cs::visit_union (be_union *node)
   switch (node->udisc_type ())
     {
       case AST_Expression::EV_bool:
-        *os << "::CORBA::Any::to_boolean tmp (_tao_discriminant);" << be_nl
+        *os << "::ACE_InputCDR::to_boolean tmp (_tao_discriminant);" << be_nl
             << "if ( !(strm >> tmp) )" << be_idt_nl;
 
         break;
       case AST_Expression::EV_char:
-        *os << "::CORBA::Any::to_char tmp (_tao_discriminant);" << be_nl
+        *os << "::ACE_InputCDR::to_char tmp (_tao_discriminant);" << be_nl
             << "if ( !(strm >> tmp) )" << be_idt_nl;
 
         break;
       case AST_Expression::EV_wchar:
-        *os << "::CORBA::Any::to_wchar tmp (_tao_discriminant);" << be_nl
+        *os << "::ACE_InputCDR::to_wchar tmp (_tao_discriminant);" << be_nl
             << "if ( !(strm >> tmp) )" << be_idt_nl;
 
         break;
diff --git a/TAO/TAO_IDL/be/be_visitor_union/serializer_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union/serializer_op_cs.cpp
index 6d619d9e9d0..9befe5a698c 100644
--- a/TAO/TAO_IDL/be/be_visitor_union/serializer_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union/serializer_op_cs.cpp
@@ -18,8 +18,8 @@
 //
 // ============================================================================
 
-ACE_RCSID (be_visitor_union, 
-           serializer_op_cs, 
+ACE_RCSID (be_visitor_union,
+           serializer_op_cs,
            "$Id$")
 
 // ***************************************************************************
@@ -42,8 +42,8 @@ int
 be_visitor_union_serializer_op_cs::visit_union (be_union *node)
 {
   // already generated and/or we are imported. Don't do anything.
-  if (node->cli_stub_serializer_op_gen () 
-      || node->imported () 
+  if (node->cli_stub_serializer_op_gen ()
+      || node->imported ()
       || node->is_local ())
     {
       return 0;
@@ -57,7 +57,7 @@ be_visitor_union_serializer_op_cs::visit_union (be_union *node)
       ACE_ERROR_RETURN ((LM_ERROR,
                          "(%N:%l) be_visitor_union_serializer_op_cs"
                          "::visit_union - "
-                         "codegen for scope failed\n"), 
+                         "codegen for scope failed\n"),
                         -1);
     }
 
@@ -98,16 +98,16 @@ be_visitor_union_serializer_op_cs::visit_union (be_union *node)
     {
       case AST_Expression::EV_bool:
         *os << "max_size += _dcps_max_marshaled_size ("
-            << "CORBA::Any::from_boolean (_tao_union._d ()));" << be_nl;
+            << "ACE_OutputCDR::from_boolean (_tao_union._d ()));" << be_nl;
         break;
       case AST_Expression::EV_char:
         *os << "max_size += _dcps_max_marshaled_size ("
-            << "CORBA::Any::from_char (_tao_union._d ()));" << be_nl;
+            << "ACE_OutputCDR::from_char (_tao_union._d ()));" << be_nl;
 
         break;
       case AST_Expression::EV_wchar:
         *os << "max_size += _dcps_max_marshaled_size ("
-            << "CORBA::Any::from_wchar (_tao_union._d ()));" << be_nl;
+            << "ACE_OutputCDR::from_wchar (_tao_union._d ()));" << be_nl;
 
         break;
       default:
@@ -137,7 +137,7 @@ be_visitor_union_serializer_op_cs::visit_union (be_union *node)
       << "return false;" << be_uidt_nl
       << "}" << be_nl << be_nl;
 /*
-      << "CORBA::Boolean is_bounded = true;" 
+      << "CORBA::Boolean is_bounded = true;"
       << " // all discrimenent types are bounded" << be_nl << be_nl;
 
   *os << "// bounded if all branches are bounded." << be_nl;
@@ -158,28 +158,28 @@ be_visitor_union_serializer_op_cs::visit_union (be_union *node)
   //---------------------------------------------------------------
   //  Set the sub state as generating code for _dcps_find_size.
   this->ctx_->sub_state(TAO_CodeGen::TAO_FIND_SIZE);
-  *os << be_global->stub_export_macro () 
-      << " size_t _dcps_find_size (const " 
+  *os << be_global->stub_export_macro ()
+      << " size_t _dcps_find_size (const "
       << node->name() << "& _tao_union);" << be_nl;
 
   *os << "size_t _dcps_find_size (" << be_idt << be_idt_nl
       << "const " << node->name () << " &_tao_union" << be_uidt_nl
       << ")" << be_uidt_nl
       << "{" << be_idt_nl
-      << "// all union discriminents are fixed size" 
+      << "// all union discriminents are fixed size"
       <<     "so OK to use _dcps_max_marshaled_size" << be_nl
       << "size_t result = ";
 
   switch (node->udisc_type ())
     {
       case AST_Expression::EV_bool:
-        *os << "_dcps_max_marshaled_size  ( ::CORBA::Any::from_boolean (_tao_union._d ()));" << be_nl;
+        *os << "_dcps_max_marshaled_size (::ACE_OutputCDR::from_boolean (_tao_union._d ()));" << be_nl;
         break;
       case AST_Expression::EV_char:
-        *os << "_dcps_max_marshaled_size  ( ::CORBA::Any::from_char (_tao_union._d ()));" << be_nl;
+        *os << "_dcps_max_marshaled_size (::ACE_OutputCDR::from_char (_tao_union._d ()));" << be_nl;
         break;
       case AST_Expression::EV_wchar:
-        *os << "_dcps_max_marshaled_size  ( ::CORBA::Any::from_wchar (_tao_union._d ()));" << be_nl;
+        *os << "_dcps_max_marshaled_size (::ACE_OutputCDR::from_wchar (_tao_union._d ()));" << be_nl;
         break;
       default:
         *os << "_dcps_max_marshaled_size (_tao_union._d ());" << be_nl;
@@ -228,17 +228,17 @@ be_visitor_union_serializer_op_cs::visit_union (be_union *node)
   switch (node->udisc_type ())
     {
       case AST_Expression::EV_bool:
-        *os << "::CORBA::Any::from_boolean tmp (_tao_union._d ());" << be_nl
+        *os << "::ACE_OutputCDR::from_boolean tmp (_tao_union._d ());" << be_nl
             << "if ( !(strm << tmp) )" << be_idt_nl;
 
         break;
       case AST_Expression::EV_char:
-        *os << "::CORBA::Any::from_char tmp (_tao_union._d ());" << be_nl
+        *os << "::ACE_OutputCDR::from_char tmp (_tao_union._d ());" << be_nl
             << "if ( !(strm << tmp) )" << be_idt_nl;
 
         break;
       case AST_Expression::EV_wchar:
-        *os << "::CORBA::Any::from_wchar tmp (_tao_union._d ());" << be_nl
+        *os << "::ACE_OutputCDR::from_wchar tmp (_tao_union._d ());" << be_nl
             << "if ( !(strm << tmp) )" << be_idt_nl;
 
         break;
@@ -299,17 +299,17 @@ be_visitor_union_serializer_op_cs::visit_union (be_union *node)
   switch (node->udisc_type ())
     {
       case AST_Expression::EV_bool:
-        *os << "::CORBA::Any::to_boolean tmp (_tao_discriminant);" << be_nl
+        *os << "::ACE_InputCDR::to_boolean tmp (_tao_discriminant);" << be_nl
             << "if ( !(strm >> tmp) )" << be_idt_nl;
 
         break;
       case AST_Expression::EV_char:
-        *os << "::CORBA::Any::to_char tmp (_tao_discriminant);" << be_nl
+        *os << "::ACE_InputCDR::to_char tmp (_tao_discriminant);" << be_nl
             << "if ( !(strm >> tmp) )" << be_idt_nl;
 
         break;
       case AST_Expression::EV_wchar:
-        *os << "::CORBA::Any::to_wchar tmp (_tao_discriminant);" << be_nl
+        *os << "::ACE_InputCDR::to_wchar tmp (_tao_discriminant);" << be_nl
             << "if ( !(strm >> tmp) )" << be_idt_nl;
 
         break;
diff --git a/TAO/TAO_IDL/be/be_visitor_union_branch/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch/cdr_op_cs.cpp
index 86f9110fadc..f7e9c4511f8 100644
--- a/TAO/TAO_IDL/be/be_visitor_union_branch/cdr_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union_branch/cdr_op_cs.cpp
@@ -297,9 +297,9 @@ be_visitor_union_branch_cdr_op_cs::visit_interface (be_interface *node)
       break;
 
     case TAO_CodeGen::TAO_CDR_OUTPUT:
-    
+
       *os << "result =" << be_idt_nl;
-      
+
       if (f->is_abstract ())
         {
           *os << "(strm << _tao_union."
@@ -313,7 +313,7 @@ be_visitor_union_branch_cdr_op_cs::visit_interface (be_interface *node)
               << "strm" << be_uidt_nl
               << ");" << be_uidt;
         }
-        
+
       *os << be_uidt;
 
       break;
@@ -531,7 +531,7 @@ be_visitor_union_branch_cdr_op_cs::visit_predefined_type (
       else if (pt == AST_PredefinedType::PT_char)
         {
           *os << "::CORBA::Char _tao_union_tmp;" << be_nl
-              << "::CORBA::Any::to_char _tao_union_helper "
+              << "::ACE_InputCDR::to_char _tao_union_helper "
               << "(_tao_union_tmp);" << be_nl
               << "result = strm >> _tao_union_helper;" << be_nl << be_nl
               << "if (result)" << be_idt_nl
@@ -542,7 +542,7 @@ be_visitor_union_branch_cdr_op_cs::visit_predefined_type (
       else if (pt == AST_PredefinedType::PT_wchar)
         {
           *os << "::CORBA::WChar _tao_union_tmp;" << be_nl
-              << "::CORBA::Any::to_wchar _tao_union_helper "
+              << "::ACE_InputCDR::to_wchar _tao_union_helper "
               << "(_tao_union_tmp);" << be_nl
               << "result = strm >> _tao_union_helper;" << be_nl << be_nl
               << "if (result)" << be_idt_nl
@@ -553,7 +553,7 @@ be_visitor_union_branch_cdr_op_cs::visit_predefined_type (
       else if (pt == AST_PredefinedType::PT_octet)
         {
           *os << "::CORBA::Octet _tao_union_tmp;" << be_nl
-              << "::CORBA::Any::to_octet _tao_union_helper "
+              << "::ACE_InputCDR::to_octet _tao_union_helper "
               << "(_tao_union_tmp);" << be_nl
               << "result = strm >> _tao_union_helper;" << be_nl << be_nl
               << "if (result)" << be_idt_nl
@@ -564,7 +564,7 @@ be_visitor_union_branch_cdr_op_cs::visit_predefined_type (
       else if (pt == AST_PredefinedType::PT_boolean)
         {
           *os << "::CORBA::Boolean _tao_union_tmp;" << be_nl
-              << "::CORBA::Any::to_boolean _tao_union_helper "
+              << "::ACE_InputCDR::to_boolean _tao_union_helper "
               << "(_tao_union_tmp);" << be_nl
               << "result = strm >> _tao_union_helper;" << be_nl << be_nl
               << "if (result)" << be_idt_nl
@@ -599,22 +599,22 @@ be_visitor_union_branch_cdr_op_cs::visit_predefined_type (
         }
       else if (pt == AST_PredefinedType::PT_char)
         {
-          *os << "strm << ::CORBA::Any::from_char (_tao_union."
+          *os << "strm << ::ACE_OutputCDR::from_char (_tao_union."
               << f->local_name () << " ());";
         }
       else if (pt == AST_PredefinedType::PT_wchar)
         {
-          *os << "strm << ::CORBA::Any::from_wchar (_tao_union."
+          *os << "strm << ::ACE_OutputCDR::from_wchar (_tao_union."
               << f->local_name () << " ());";
         }
       else if (pt == AST_PredefinedType::PT_octet)
         {
-          *os << "strm << ::CORBA::Any::from_octet (_tao_union."
+          *os << "strm << ::ACE_OutputCDR::from_octet (_tao_union."
               << f->local_name () << " ());";
         }
       else if (pt == AST_PredefinedType::PT_boolean)
         {
-          *os << "strm << ::CORBA::Any::from_boolean (_tao_union."
+          *os << "strm << ::ACE_OutputCDR::from_boolean (_tao_union."
               << f->local_name () << " ());";
         }
       else
diff --git a/TAO/TAO_IDL/be/be_visitor_union_branch/serializer_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch/serializer_op_cs.cpp
index 6ef307b8783..41c4c88334e 100644
--- a/TAO/TAO_IDL/be/be_visitor_union_branch/serializer_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union_branch/serializer_op_cs.cpp
@@ -169,15 +169,15 @@ be_visitor_union_branch_serializer_op_cs::visit_array (be_array *node)
         char tmp_val_name[30];
         ACE_OS::sprintf(tmp_size_name, "tmp_array_size%d", tmp_counter);
         ACE_OS::sprintf(tmp_val_name, "tmp_array_val%d", tmp_counter++);
-        *os << f->field_type ()->name() << "_forany " << tmp_val_name 
+        *os << f->field_type ()->name() << "_forany " << tmp_val_name
             << "; // is type of " << f->local_name () << be_nl;
-        *os << "size_t " << tmp_size_name 
+        *os << "size_t " << tmp_size_name
             << " = _dcps_max_marshaled_size (" << tmp_val_name << ");" << be_nl
             << "if (" << tmp_size_name << " > max_size) " << be_idt_nl
             << "max_size = " << tmp_size_name << ";" << be_uidt_nl << be_nl;
       }
       break;
-    case TAO_CodeGen::TAO_FIND_SIZE: 
+    case TAO_CodeGen::TAO_FIND_SIZE:
       *os << fname << "_forany _tao_union_tmp (" << be_idt << be_idt_nl
           << "_tao_union."
           << f->local_name () << " ()" << be_uidt_nl
@@ -243,11 +243,11 @@ be_visitor_union_branch_serializer_op_cs::visit_enum (be_enum *node)
   switch (this->ctx_->sub_state ())
     {
     case TAO_CodeGen::TAO_IS_BOUNDED_SIZE:
-      *os << "// " << f->local_name () 
+      *os << "// " << f->local_name ()
           << " is of an enum type; hence is bounded" << be_nl;
       return 0; // all done
       break;
-    case TAO_CodeGen::TAO_FIND_SIZE: 
+    case TAO_CodeGen::TAO_FIND_SIZE:
       // enums are serialized as CORBA::ULong
       *os << "result +=  _dcps_max_marshaled_size_ulong (); /* enum */"
           << be_nl;
@@ -298,7 +298,7 @@ be_visitor_union_branch_serializer_op_cs::visit_enum (be_enum *node)
                         -1);
     }
 
-  // Not a typedef and node is defined inside the union. Otherwise the 
+  // Not a typedef and node is defined inside the union. Otherwise the
   // Serializer operator is generated elsewhere.
   if (node->node_type () != AST_Decl::NT_typedef
       && node->is_child (this->ctx_->scope ()))
@@ -618,39 +618,39 @@ be_visitor_union_branch_serializer_op_cs::visit_predefined_type (be_predefined_t
       else if (pt == AST_PredefinedType::PT_char)
         {
           *os << "size_t " << tmp_name << " = _dcps_max_marshaled_size ("
-              << "::CORBA::Any::from_char (_tao_union."
+              << "::ACE_OutputCDR::from_char (_tao_union."
               << f->local_name () << " ()));" << be_nl
-              << "if (" << tmp_name << " > max_size) max_size = " 
+              << "if (" << tmp_name << " > max_size) max_size = "
               << tmp_name << ";" << be_nl;
         }
       else if (pt == AST_PredefinedType::PT_wchar)
         {
           *os << "size_t " << tmp_name << " = _dcps_max_marshaled_size ("
-              << "::CORBA::Any::from_wchar (_tao_union."
+              << "::ACE_OutputCDR::from_wchar (_tao_union."
               << f->local_name () << " ()));" << be_nl
-              << "if (" << tmp_name << " > max_size) max_size = " 
+              << "if (" << tmp_name << " > max_size) max_size = "
               << tmp_name << ";" << be_nl;
         }
       else if (pt == AST_PredefinedType::PT_octet)
         {
           *os << "size_t " << tmp_name << " = _dcps_max_marshaled_size ("
-              << "::CORBA::Any::from_octet (_tao_union."
+              << "::ACE_OutputCDR::from_octet (_tao_union."
               << f->local_name () << " ()));" << be_nl
-              << "if (" << tmp_name << " > max_size) max_size = " 
+              << "if (" << tmp_name << " > max_size) max_size = "
               << tmp_name << ";" << be_nl;
         }
       else if (pt == AST_PredefinedType::PT_boolean)
         {
           *os << "size_t " << tmp_name << " = _dcps_max_marshaled_size ("
-              << "::CORBA::Any::from_boolean (_tao_union."
+              << "::ACE_OutputCDR::from_boolean (_tao_union."
               << f->local_name () << " ()));" << be_nl
-              << "if (" << tmp_name << " > max_size) max_size = " 
+              << "if (" << tmp_name << " > max_size) max_size = "
               << tmp_name << ";" << be_nl;
         }
       else
         {
-          *os << "size_t " << tmp_name 
-              << " = _dcps_max_marshaled_size (_tao_union." 
+          *os << "size_t " << tmp_name
+              << " = _dcps_max_marshaled_size (_tao_union."
               << f->local_name () << " ());" << be_nl
               << "if (" << tmp_name << " > max_size)" << be_idt_nl
               << "max_size = "<< tmp_name << ";" << be_uidt_nl << be_nl;
@@ -668,7 +668,7 @@ be_visitor_union_branch_serializer_op_cs::visit_predefined_type (be_predefined_t
         }
       else
         {
-          *os << "// " << f->local_name () 
+          *os << "// " << f->local_name ()
               << " is of a predefined type; hence is bounded" << be_nl;
         }
       break;
@@ -686,22 +686,22 @@ be_visitor_union_branch_serializer_op_cs::visit_predefined_type (be_predefined_t
         }
       else if (pt == AST_PredefinedType::PT_char)
         {
-          *os << "_dcps_max_marshaled_size ( ::CORBA::Any::from_char (_tao_union."
+          *os << "_dcps_max_marshaled_size (::ACE_OutputCDR::from_char (_tao_union."
               << f->local_name () << " ()));";
         }
       else if (pt == AST_PredefinedType::PT_wchar)
         {
-          *os << "_dcps_max_marshaled_size ( ::CORBA::Any::from_wchar (_tao_union."
+          *os << "_dcps_max_marshaled_size (::ACE_OutputCDR::from_wchar (_tao_union."
               << f->local_name () << " ()));";
         }
       else if (pt == AST_PredefinedType::PT_octet)
         {
-          *os << "_dcps_max_marshaled_size ( ::CORBA::Any::from_octet (_tao_union."
+          *os << "_dcps_max_marshaled_size (::ACE_OutputCDR::from_octet (_tao_union."
               << f->local_name () << " ()));";
         }
       else if (pt == AST_PredefinedType::PT_boolean)
         {
-          *os << "_dcps_max_marshaled_size ( ::CORBA::Any::from_boolean (_tao_union."
+          *os << "_dcps_max_marshaled_size (::ACE_OutputCDR::from_boolean (_tao_union."
               << f->local_name () << " ()));";
         }
       else
@@ -744,7 +744,7 @@ be_visitor_union_branch_serializer_op_cs::visit_predefined_type (be_predefined_t
       else if (pt == AST_PredefinedType::PT_char)
         {
           *os << "::CORBA::Char _tao_union_tmp;" << be_nl
-              << "::CORBA::Any::to_char _tao_union_helper "
+              << "::ACE_InputCDR::to_char _tao_union_helper "
               << "(_tao_union_tmp);" << be_nl
               << "result = strm >> _tao_union_helper;" << be_nl << be_nl
               << "if (result)" << be_idt_nl
@@ -755,7 +755,7 @@ be_visitor_union_branch_serializer_op_cs::visit_predefined_type (be_predefined_t
       else if (pt == AST_PredefinedType::PT_wchar)
         {
           *os << "::CORBA::WChar _tao_union_tmp;" << be_nl
-              << "::CORBA::Any::to_wchar _tao_union_helper "
+              << "::ACE_InputCDR::to_wchar _tao_union_helper "
               << "(_tao_union_tmp);" << be_nl
               << "result = strm >> _tao_union_helper;" << be_nl << be_nl
               << "if (result)" << be_idt_nl
@@ -766,7 +766,7 @@ be_visitor_union_branch_serializer_op_cs::visit_predefined_type (be_predefined_t
       else if (pt == AST_PredefinedType::PT_octet)
         {
           *os << "::CORBA::Octet _tao_union_tmp;" << be_nl
-              << "::CORBA::Any::to_octet _tao_union_helper "
+              << "::ACE_InputCDR::to_octet _tao_union_helper "
               << "(_tao_union_tmp);" << be_nl
               << "result = strm >> _tao_union_helper;" << be_nl << be_nl
               << "if (result)" << be_idt_nl
@@ -777,7 +777,7 @@ be_visitor_union_branch_serializer_op_cs::visit_predefined_type (be_predefined_t
       else if (pt == AST_PredefinedType::PT_boolean)
         {
           *os << "::CORBA::Boolean _tao_union_tmp;" << be_nl
-              << "::CORBA::Any::to_boolean _tao_union_helper "
+              << "::ACE_InputCDR::to_boolean _tao_union_helper "
               << "(_tao_union_tmp);" << be_nl
               << "result = strm >> _tao_union_helper;" << be_nl << be_nl
               << "if (result)" << be_idt_nl
@@ -812,22 +812,22 @@ be_visitor_union_branch_serializer_op_cs::visit_predefined_type (be_predefined_t
         }
       else if (pt == AST_PredefinedType::PT_char)
         {
-          *os << "strm << ::CORBA::Any::from_char (_tao_union."
+          *os << "strm << ::ACE_OutputCDR::from_char (_tao_union."
               << f->local_name () << " ());";
         }
       else if (pt == AST_PredefinedType::PT_wchar)
         {
-          *os << "strm << ::CORBA::Any::from_wchar (_tao_union."
+          *os << "strm << ::ACE_OutputCDR::from_wchar (_tao_union."
               << f->local_name () << " ());";
         }
       else if (pt == AST_PredefinedType::PT_octet)
         {
-          *os << "strm << ::CORBA::Any::from_octet (_tao_union."
+          *os << "strm << ::ACE_OutputCDR::from_octet (_tao_union."
               << f->local_name () << " ());";
         }
       else if (pt == AST_PredefinedType::PT_boolean)
         {
-          *os << "strm << ::CORBA::Any::from_boolean (_tao_union."
+          *os << "strm << ::ACE_OutputCDR::from_boolean (_tao_union."
               << f->local_name () << " ());";
         }
       else
@@ -900,7 +900,7 @@ be_visitor_union_branch_serializer_op_cs::visit_sequence (be_sequence *node)
         static int tmp_counter = 0;
         char tmp_val_name[30];
         ACE_OS::sprintf(tmp_val_name, "tmp_seq_val%d", tmp_counter++);
-        *os << f->field_type ()->name() << " " << tmp_val_name 
+        *os << f->field_type ()->name() << " " << tmp_val_name
             << "; // is type of " << f->local_name () << be_nl;
         *os << "is_bounded = is_bounded && "
             << "_tao_is_bounded_size (" << tmp_val_name << ");"
@@ -914,21 +914,21 @@ be_visitor_union_branch_serializer_op_cs::visit_sequence (be_sequence *node)
         char tmp_val_name[30];
         ACE_OS::sprintf(tmp_size_name, "tmp_seq_size%d", tmp_counter);
         ACE_OS::sprintf(tmp_val_name,  "tmp_seq_val%d", tmp_counter++);
-        *os << f->field_type ()->name() << " " << tmp_val_name 
+        *os << f->field_type ()->name() << " " << tmp_val_name
             << "; // is type of " << f->local_name () << be_nl;
-        *os << "size_t " << tmp_size_name 
+        *os << "size_t " << tmp_size_name
             << " = _dcps_max_marshaled_size (" << tmp_val_name << ");" << be_nl
             << "if (" << tmp_size_name << " > max_size) " << be_idt_nl
             << "max_size = " << tmp_size_name << ";" << be_uidt_nl << be_nl;
       }
       break;
-    case TAO_CodeGen::TAO_FIND_SIZE: 
+    case TAO_CodeGen::TAO_FIND_SIZE:
       //SHH - TBD - make sure this is a shallow copy.
       //     But this code is currently dead anyway because
       //     unions always return false for _dcps_is_bounded and a large
       //     number for _dcsp_max_marshaled_size.
       //     This note applies to multiple locations in this file.
-      *os << f->field_type ()->name() << " tmp (_tao_union." 
+      *os << f->field_type ()->name() << " tmp (_tao_union."
           << f->local_name () << " ());" << be_nl;
       *os << "result += _dcps_find_size (tmp);" << be_nl;
       break;
@@ -1003,7 +1003,7 @@ be_visitor_union_branch_serializer_op_cs::visit_string (be_string *node)
     {
     case TAO_CodeGen::TAO_IS_BOUNDED_SIZE:
        if (0 == node->max_size ()->ev ()->u.ulval)
-         *os << "is_bounded = is_bounded && false; /* unbounded string */" 
+         *os << "is_bounded = is_bounded && false; /* unbounded string */"
              << be_nl;
        else
          *os << "// bounded string " << f->local_name ()
@@ -1017,13 +1017,13 @@ be_visitor_union_branch_serializer_op_cs::visit_string (be_string *node)
 
         char buff[15];
         ACE_OS::sprintf(buff, "%ld", node->max_size ()->ev ()->u.ulval);
-        *os << "size_t " << tmp_size_name 
+        *os << "size_t " << tmp_size_name
             << " = _dcps_max_marshaled_size_ulong () + " << buff << ";" << be_nl
             << "if (" << tmp_size_name << ")" << be_idt_nl
             << "max_size = " << tmp_size_name << ";" << be_uidt_nl;
       }
       break;
-    case TAO_CodeGen::TAO_FIND_SIZE: 
+    case TAO_CodeGen::TAO_FIND_SIZE:
       *os << "result += _dcps_max_marshaled_size_ulong() + " << be_idt_nl
           << "ACE_OS::strlen(_tao_union."
           << f->local_name () << " ());" << be_uidt_nl;
@@ -1119,9 +1119,9 @@ be_visitor_union_branch_serializer_op_cs::visit_structure (be_structure *node)
         ACE_OS::sprintf(tmp_size_name, "tmp_struct_size%d", tmp_counter);
         ACE_OS::sprintf(tmp_val_name, "tmp_struct_val%d", tmp_counter++);
 
-        *os << f->field_type ()->name() << " " << tmp_val_name 
+        *os << f->field_type ()->name() << " " << tmp_val_name
             << "; // is type of " << f->local_name () << be_nl;
-        *os << "size_t " << tmp_size_name 
+        *os << "size_t " << tmp_size_name
             << " = _dcps_max_marshaled_size (" << tmp_val_name << ");" << be_nl
             << "if (" << tmp_size_name << " > max_size) " << be_idt_nl
             << "max_size = " << tmp_size_name << ";" << be_uidt_nl << be_nl;
@@ -1136,7 +1136,7 @@ be_visitor_union_branch_serializer_op_cs::visit_structure (be_structure *node)
         ACE_OS::sprintf(tmp_size_name, "tmp_struct_size%d", tmp_counter);
         ACE_OS::sprintf(tmp_val_name, "tmp_struct_val%d", tmp_counter++);
 
-        *os << f->field_type ()->name() << " " << tmp_val_name 
+        *os << f->field_type ()->name() << " " << tmp_val_name
             << "; // is type of " << f->local_name () << be_nl;
         *os << "is_bounded = is_bounded && _tao_is_bounded_size ("
             << tmp_val_name << ");" << be_nl;
@@ -1144,7 +1144,7 @@ be_visitor_union_branch_serializer_op_cs::visit_structure (be_structure *node)
       break;
 
     case TAO_CodeGen::TAO_FIND_SIZE:
-      *os << "result += _dcps_find_size (_tao_union." 
+      *os << "result += _dcps_find_size (_tao_union."
           << f->local_name () << " ());" << be_nl;
       break;
 
diff --git a/TAO/TAO_IDL/be/be_visitor_valuebox/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuebox/any_op_ch.cpp
index 7b2c09eeb99..91ab4bab216 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuebox/any_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuebox/any_op_ch.cpp
@@ -19,8 +19,8 @@
 //
 // ============================================================================
 
-ACE_RCSID (be_visitor_valuebox, 
-           any_op_ch, 
+ACE_RCSID (be_visitor_valuebox,
+           any_op_ch,
            "$Id$")
 
 // ***************************************************************************
@@ -48,13 +48,13 @@ be_visitor_valuebox_any_op_ch::visit_valuebox (be_valuebox *node)
     }
 
   TAO_OutStream *os = this->ctx_->stream ();
+  const char *macro = this->ctx_->export_macro ();
 
   *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
 
-
   be_module *module = 0;
- 
+
   if (node->is_nested () &&
       node->defined_in ()->scope_node_type () == AST_Decl::NT_module)
     {
@@ -76,15 +76,15 @@ be_visitor_valuebox_any_op_ch::visit_valuebox (be_valuebox *node)
       be_util::gen_nested_namespace_begin (os, module);
 
       // emit  nested variation of any operators
-      *os << be_global->stub_export_macro () << " void"
+      *os << macro << " void"
           << " operator<<= ( ::CORBA::Any &, " << node->local_name ()
           << " *); // copying" << be_nl;
 
-      *os << be_global->stub_export_macro () << " void"
+      *os << macro << " void"
           << " operator<<= ( ::CORBA::Any &, " << node->local_name ()
           << " **); // non-copying" << be_nl;
 
-      *os << be_global->stub_export_macro () << " ::CORBA::Boolean"
+      *os << macro << " ::CORBA::Boolean"
           << " operator>>= (const ::CORBA::Any &, "
           << node->local_name () << " *&);";
 
@@ -94,16 +94,13 @@ be_visitor_valuebox_any_op_ch::visit_valuebox (be_valuebox *node)
       *os << "#else\n\n";
     }
 
-  *os << be_global->stub_export_macro () << " void"
-      << " operator<<= ( ::CORBA::Any &, " << node->name ()
+  *os << macro << " void operator<<= (::CORBA::Any &, " << node->name ()
       << " *); // copying" << be_nl;
 
-  *os << be_global->stub_export_macro () << " void"
-      << " operator<<= ( ::CORBA::Any &, " << node->name ()
+  *os << macro << " void operator<<= (::CORBA::Any &, " << node->name ()
       << " **); // non-copying" << be_nl;
 
-  *os << be_global->stub_export_macro () << " ::CORBA::Boolean"
-      << " operator>>= (const ::CORBA::Any &, "
+  *os << macro << " ::CORBA::Boolean operator>>= (const ::CORBA::Any &, "
       << node->name () << " *&);";
 
   if (module != 0)
diff --git a/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ci.cpp b/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ci.cpp
index 651ea9ab656..6dd4b94aa4d 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ci.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ci.cpp
@@ -18,8 +18,8 @@
 //
 // ============================================================================
 
-ACE_RCSID (be_visitor_valuebox, 
-           valuebox_ci, 
+ACE_RCSID (be_visitor_valuebox,
+           valuebox_ci,
            "$Id: valuebox_ci.cpp Exp")
 
 be_visitor_valuebox_ci::be_visitor_valuebox_ci (be_visitor_context *ctx)
@@ -44,7 +44,7 @@ be_visitor_valuebox_ci::visit_valuebox (be_valuebox *node)
 
   this->ctx_->node (node); // save the node
 
-  be_type *bt = be_type::narrow_from_decl (node->boxed_type ()); 
+  be_type *bt = be_type::narrow_from_decl (node->boxed_type ());
 
   // Emit the type specific elements.  The visit_* methods in this
   // module do that work.
@@ -71,8 +71,8 @@ be_visitor_valuebox_ci::visit_valuebox (be_valuebox *node)
   *os << "ACE_INLINE ::CORBA::Boolean " << be_nl
       << node->name ()
       << "::_tao_unmarshal_v (TAO_InputCDR &)" << be_nl
-      << "{" << be_idt_nl  
-      << "return true;" << be_uidt_nl 
+      << "{" << be_idt_nl
+      << "return true;" << be_uidt_nl
       << "}" << be_nl << be_nl;
 
   // Indicate that code is already generated for this node.
@@ -84,9 +84,9 @@ be_visitor_valuebox_ci::visit_valuebox (be_valuebox *node)
 int
 be_visitor_valuebox_ci::visit_array (be_array *node)
 {
-		
+
   TAO_OutStream *os = this->ctx_->stream ();
-  
+
   // Retrieve the node being visited by this be_visitor_valuebox_ch.
   be_decl * vb_node = this->ctx_->node ();
 
@@ -99,7 +99,7 @@ be_visitor_valuebox_ci::visit_array (be_array *node)
       << be_nl << "{" << be_idt_nl
       << "this->_pd_value = " << node->full_name () << "_alloc ();"
       << be_uidt_nl << "}" << be_nl << be_nl;
-  
+
   // Protected destructor
   *os << "ACE_INLINE" << be_nl
       << vb_node->name () << "::~" << vb_node->local_name () << " (void)"
@@ -137,20 +137,20 @@ be_visitor_valuebox_ci::visit_array (be_array *node)
       << "return *this;" << be_uidt_nl
       << "}" << be_nl << be_nl;
 
-  // Public accessor and modifier methods        
-  *os << "ACE_INLINE const " << node->full_name () << "_slice*" << be_nl 
+  // Public accessor and modifier methods
+  *os << "ACE_INLINE const " << node->full_name () << "_slice*" << be_nl
       << vb_node->name () << "::_value (void) const" << be_nl
       << "{" << be_idt_nl
       << "return this->_pd_value.in ();" << be_uidt_nl
       << "}" << be_nl << be_nl;
- 
-  *os << "ACE_INLINE " << node->full_name () << "_slice*" << be_nl 
+
+  *os << "ACE_INLINE " << node->full_name () << "_slice*" << be_nl
       << vb_node->name () << "::_value (void)" << be_nl
       << "{" << be_idt_nl
       << "return this->_pd_value.inout ();" << be_uidt_nl
       << "}" << be_nl << be_nl;
 
-  *os << "ACE_INLINE void" << be_nl 
+  *os << "ACE_INLINE void" << be_nl
       << vb_node->name () << "::_value (const " << node->full_name ()
       << " val)" << be_nl
       << "{" << be_idt_nl
@@ -173,19 +173,19 @@ be_visitor_valuebox_ci::visit_array (be_array *node)
       << "}" << be_nl << be_nl;
 
   // Explicit conversion functions
-  *os << "ACE_INLINE const " << node->full_name () << "_slice *" << be_nl 
+  *os << "ACE_INLINE const " << node->full_name () << "_slice *" << be_nl
       << vb_node->name () << "::_boxed_in (void) const" << be_nl
       << "{" << be_idt_nl
       << "return this->_pd_value.in ();" << be_uidt_nl
       << "}" << be_nl << be_nl;
 
-  *os << "ACE_INLINE " << node->full_name () << "_slice *" << be_nl 
+  *os << "ACE_INLINE " << node->full_name () << "_slice *" << be_nl
       << vb_node->name () << "::_boxed_inout (void)" << be_nl
       << "{" << be_idt_nl
       << "return this->_pd_value.inout ();" << be_uidt_nl
       << "}" << be_nl << be_nl;
 
-  *os << "ACE_INLINE " << node->full_name () << "_slice *" << be_nl 
+  *os << "ACE_INLINE " << node->full_name () << "_slice *" << be_nl
       << vb_node->name () << "::_boxed_out (void)" << be_nl
       << "{" << be_idt_nl
       << "return this->_pd_value.out ();" << be_uidt_nl
@@ -197,7 +197,7 @@ be_visitor_valuebox_ci::visit_array (be_array *node)
       << "::_tao_marshal_v (TAO_OutputCDR & strm) const" << be_nl
       << "{" << be_idt_nl
       << node->name () << "_forany temp (this->_pd_value.ptr ());" << be_nl
-      << "return (strm << temp);" << be_uidt_nl 
+      << "return (strm << temp);" << be_uidt_nl
       << "}" << be_nl << be_nl;
 
   return 0;
@@ -226,19 +226,19 @@ be_visitor_valuebox_ci::visit_predefined_type (be_predefined_type *node)
   switch (node->pt())
     {
     case AST_PredefinedType::PT_boolean:
-      marshal_arg = "::CORBA::Any::from_boolean (this->_pd_value)";
+      marshal_arg = "::ACE_OutputCDR::from_boolean (this->_pd_value)";
       break;
 
     case AST_PredefinedType::PT_char:
-      marshal_arg = "::CORBA::Any::from_char (this->_pd_value)";
+      marshal_arg = "::ACE_OutputCDR::from_char (this->_pd_value)";
       break;
 
     case AST_PredefinedType::PT_wchar:
-      marshal_arg = "::CORBA::Any::from_wchar (this->_pd_value)";
+      marshal_arg = "::ACE_OutputCDR::from_wchar (this->_pd_value)";
       break;
 
     case AST_PredefinedType::PT_octet:
-      marshal_arg = "::CORBA::Any::from_octet (this->_pd_value)";
+      marshal_arg = "::ACE_OutputCDR::from_octet (this->_pd_value)";
       break;
 
     case AST_PredefinedType::PT_any:
@@ -256,10 +256,10 @@ int
 be_visitor_valuebox_ci::visit_sequence (be_sequence *node)
 {
   TAO_OutStream *os = this->ctx_->stream ();
-  
+
   // Retrieve the node being visited by this be_visitor_valuebox_ch.
   be_decl * vb_node = this->ctx_->node ();
- 
+
   *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
 
@@ -296,10 +296,10 @@ be_visitor_valuebox_ci::visit_sequence (be_sequence *node)
   *os << "ACE_INLINE ::CORBA::Boolean " << be_nl
       << vb_node->name ()
       << "::_tao_marshal_v (TAO_OutputCDR & strm) const" << be_nl
-      << "{" << be_idt_nl  
-      << "return (strm << this->_pd_value.in ());" << be_uidt_nl 
+      << "{" << be_idt_nl
+      << "return (strm << this->_pd_value.in ());" << be_uidt_nl
       << "}" << be_nl << be_nl;
-   
+
   return 0;
 }
 
@@ -307,7 +307,7 @@ int
 be_visitor_valuebox_ci::visit_string (be_string *node)
 {
   TAO_OutStream *os = this->ctx_->stream ();
-  
+
   const char *string_type;
   const char *char_type;
   if (node->node_type () == AST_Decl::NT_string)
@@ -330,7 +330,7 @@ be_visitor_valuebox_ci::visit_string (be_string *node)
 
   // Retrieve the node being visited by this be_visitor_valuebox_ch.
   be_decl * vb_node = this->ctx_->node ();
-  
+
   *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
 
@@ -378,30 +378,30 @@ be_visitor_valuebox_ci::visit_string (be_string *node)
       << "}" << be_nl << be_nl;
 
   // Accessor function takes no arguments and returns a const char *
-  *os << "ACE_INLINE const " << node->full_name () << be_nl 
+  *os << "ACE_INLINE const " << node->full_name () << be_nl
       << vb_node->name () << "::_value (void) const" << be_nl
       << "{" << be_idt_nl
       << "return this->_pd_value.in ();" << be_uidt_nl
       << "}" << be_nl << be_nl;
 
   // Modifier function with one argument of type char *
-  *os << "ACE_INLINE void" << be_nl 
-      << vb_node->name () << "::_value (" 
+  *os << "ACE_INLINE void" << be_nl
+      << vb_node->name () << "::_value ("
       << node->full_name () << " val)" << be_nl
       << "{" << be_idt_nl
       << "this->_pd_value = val;" << be_uidt_nl
       << "}" << be_nl << be_nl;
 
   // Modifier function with one argument of type const char *
-  *os << "ACE_INLINE void" << be_nl 
-      << vb_node->name () << "::_value (const " 
+  *os << "ACE_INLINE void" << be_nl
+      << vb_node->name () << "::_value (const "
       << node->full_name () << " val)" << be_nl
       << "{" << be_idt_nl
       << "this->_pd_value = val;" << be_uidt_nl
       << "}" << be_nl << be_nl;
 
   // Modifier function with one argument of type const CORBA::String_var&
-  *os << "ACE_INLINE void" << be_nl 
+  *os << "ACE_INLINE void" << be_nl
       << vb_node->name () << "::_value (const ::CORBA::" << string_type
       << "_var& var)" << be_nl
       << "{" << be_idt_nl
@@ -409,19 +409,19 @@ be_visitor_valuebox_ci::visit_string (be_string *node)
       << "}" << be_nl << be_nl;
 
   // Access to the boxed value for method signatures
-  *os << "ACE_INLINE const " << node->full_name () << be_nl 
+  *os << "ACE_INLINE const " << node->full_name () << be_nl
       << vb_node->name () << "::_boxed_in (void) const" << be_nl
       << "{" << be_idt_nl
       << "return this->_pd_value.in ();" << be_uidt_nl
       << "}" << be_nl << be_nl;
 
-  *os << "ACE_INLINE " << node->full_name () << "&" << be_nl 
+  *os << "ACE_INLINE " << node->full_name () << "&" << be_nl
       << vb_node->name () << "::_boxed_inout (void)" << be_nl
       << "{" << be_idt_nl
       << "return this->_pd_value.inout ();" << be_uidt_nl
       << "}" << be_nl << be_nl;
 
-  *os << "ACE_INLINE " << node->full_name () << "&" << be_nl 
+  *os << "ACE_INLINE " << node->full_name () << "&" << be_nl
       << vb_node->name () << "::_boxed_out (void)" << be_nl
       << "{" << be_idt_nl
       << "return this->_pd_value.out ();" << be_uidt_nl
@@ -445,8 +445,8 @@ be_visitor_valuebox_ci::visit_string (be_string *node)
   *os << "ACE_INLINE ::CORBA::Boolean " << be_nl
       << vb_node->name ()
       << "::_tao_marshal_v (TAO_OutputCDR & strm) const" << be_nl
-      << "{" << be_idt_nl  
-      << "return (strm << this->_pd_value);" << be_uidt_nl 
+      << "{" << be_idt_nl
+      << "return (strm << this->_pd_value);" << be_uidt_nl
       << "}" << be_nl << be_nl;
 
   return 0;
@@ -456,10 +456,10 @@ int
 be_visitor_valuebox_ci::visit_structure (be_structure *node)
 {
   TAO_OutStream *os = this->ctx_->stream ();
-  
+
   // Retrieve the node being visited by this be_visitor_valuebox_ch.
   be_decl * vb_node = this->ctx_->node ();
-  
+
   *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
 
@@ -517,8 +517,8 @@ be_visitor_valuebox_ci::visit_structure (be_structure *node)
   *os << "ACE_INLINE ::CORBA::Boolean " << be_nl
       << vb_node->name ()
       << "::_tao_marshal_v (TAO_OutputCDR & strm) const" << be_nl
-      << "{" << be_idt_nl  
-      << "return (strm << this->_pd_value.in ());" << be_uidt_nl 
+      << "{" << be_idt_nl
+      << "return (strm << this->_pd_value.in ());" << be_uidt_nl
       << "}" << be_nl << be_nl;
 
   return 0;
@@ -549,7 +549,7 @@ be_visitor_valuebox_ci::visit_union (be_union *node)
 
   // Retrieve the node being visited by this be_visitor_valuebox_ci.
   be_decl * vb_node = this->ctx_->node ();
- 
+
   *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
 
@@ -634,8 +634,8 @@ be_visitor_valuebox_ci::visit_union (be_union *node)
   *os << "ACE_INLINE ::CORBA::Boolean " << be_nl
       << vb_node->name ()
       << "::_tao_marshal_v (TAO_OutputCDR & strm) const" << be_nl
-      << "{" << be_idt_nl  
-      << "return (strm << this->_pd_value.in ());" << be_uidt_nl 
+      << "{" << be_idt_nl
+      << "return (strm << this->_pd_value.in ());" << be_uidt_nl
       << "}" << be_nl << be_nl;
 
   return 0;
@@ -653,7 +653,7 @@ be_visitor_valuebox_ci::emit_for_predef_enum (be_type *node,
 
   // Retrieve the node being visited by this be_visitor_valuebox_ci.
   be_decl * vb_node = this->ctx_->node ();
-  
+
   *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
 
@@ -676,15 +676,15 @@ be_visitor_valuebox_ci::emit_for_predef_enum (be_type *node,
       this->emit_assignment (node, type_suffix);
 
       // Public accessor method
-      *os << "ACE_INLINE " << node->full_name () << type_suffix << be_nl 
+      *os << "ACE_INLINE " << node->full_name () << type_suffix << be_nl
           << vb_node->name () << "::_value (void) const" << be_nl
           << "{" << be_idt_nl
           << "return this->_pd_value;" << be_uidt_nl
           << "}" << be_nl << be_nl;
 
       // Public modifier method
-      *os << "ACE_INLINE void" << be_nl 
-          << vb_node->name () << "::_value (" 
+      *os << "ACE_INLINE void" << be_nl
+          << vb_node->name () << "::_value ("
           << node->full_name ()
           << type_suffix << " val)" << be_nl
           << "{" << be_idt_nl
@@ -692,19 +692,19 @@ be_visitor_valuebox_ci::emit_for_predef_enum (be_type *node,
           << "}" << be_nl << be_nl;
 
       // Explicit conversion functions
-      *os << "ACE_INLINE " << node->full_name () << type_suffix << be_nl 
+      *os << "ACE_INLINE " << node->full_name () << type_suffix << be_nl
           << vb_node->name () << "::_boxed_in (void) const" << be_nl
           << "{" << be_idt_nl
           << "return this->_pd_value;" << be_uidt_nl
           << "}" << be_nl << be_nl;
 
-      *os << "ACE_INLINE " << node->full_name () << type_suffix << "&" << be_nl 
+      *os << "ACE_INLINE " << node->full_name () << type_suffix << "&" << be_nl
           << vb_node->name () << "::_boxed_inout (void)" << be_nl
           << "{" << be_idt_nl
           << "return this->_pd_value;" << be_uidt_nl
           << "}" << be_nl << be_nl;
 
-      *os << "ACE_INLINE " << node->full_name () << type_suffix << "&" << be_nl 
+      *os << "ACE_INLINE " << node->full_name () << type_suffix << "&" << be_nl
           << vb_node->name () << "::_boxed_out (void)" << be_nl
           << "{" << be_idt_nl
           << "return this->_pd_value;" << be_uidt_nl
@@ -716,8 +716,8 @@ be_visitor_valuebox_ci::emit_for_predef_enum (be_type *node,
   *os << "ACE_INLINE ::CORBA::Boolean " << be_nl
       << vb_node->name ()
       << "::_tao_marshal_v (TAO_OutputCDR & strm) const" << be_nl
-      << "{" << be_idt_nl  
-      << "return (strm << " << marshal_arg << ");" << be_uidt_nl 
+      << "{" << be_idt_nl
+      << "return (strm << " << marshal_arg << ");" << be_uidt_nl
       << "}" << be_nl << be_nl;
 
   return 0;
@@ -747,7 +747,7 @@ be_visitor_valuebox_ci::emit_default_constructor_alloc (be_decl *node)
   be_decl * vb_node = this->ctx_->node ();
 
   // Public default constructor
-  *os << "ACE_INLINE " << be_nl 
+  *os << "ACE_INLINE " << be_nl
       << vb_node->name () << "::" << vb_node->local_name () << " (void)"
       << be_nl << "{" << be_idt_nl
       << node->full_name () << "* p;" << be_nl
@@ -910,22 +910,22 @@ be_visitor_valuebox_ci::emit_accessor_modifier (be_decl *node)
   be_decl * vb_node = this->ctx_->node ();
 
   // Public accessor method (const)
-  *os << "ACE_INLINE const " << node->full_name () << " &" << be_nl 
+  *os << "ACE_INLINE const " << node->full_name () << " &" << be_nl
       << vb_node->name () << "::_value (void) const" << be_nl
       << "{" << be_idt_nl
       << "return this->_pd_value.in ();" << be_uidt_nl
       << "}" << be_nl << be_nl;
 
   // Public accessor method
-  *os << "ACE_INLINE " << node->full_name () << " &" << be_nl 
+  *os << "ACE_INLINE " << node->full_name () << " &" << be_nl
       << vb_node->name () << "::_value (void)" << be_nl
       << "{" << be_idt_nl
       << "return this->_pd_value.inout ();" << be_uidt_nl
       << "}" << be_nl << be_nl;
 
   // Public modifier method
-  *os << "ACE_INLINE void" << be_nl 
-      << vb_node->name () << "::_value (const " 
+  *os << "ACE_INLINE void" << be_nl
+      << vb_node->name () << "::_value (const "
       << node->full_name () << "& value)" << be_nl
       << "{" << be_idt_nl
       << node->full_name () << "* p;" << be_nl
@@ -946,20 +946,20 @@ be_visitor_valuebox_ci::emit_boxed_access (be_decl *node,
   be_decl * vb_node = this->ctx_->node ();
 
   // Access to the boxed value for method signatures
-  *os << "ACE_INLINE const " << node->full_name () << " &" << be_nl 
+  *os << "ACE_INLINE const " << node->full_name () << " &" << be_nl
       << vb_node->name () << "::_boxed_in (void) const" << be_nl
       << "{" << be_idt_nl
       << "return this->_pd_value.in ();" << be_uidt_nl
       << "}" << be_nl << be_nl;
 
-  *os << "ACE_INLINE " << node->full_name () << "&" << be_nl 
+  *os << "ACE_INLINE " << node->full_name () << "&" << be_nl
       << vb_node->name () << "::_boxed_inout (void)" << be_nl
       << "{" << be_idt_nl
       << "return this->_pd_value.inout ();" << be_uidt_nl
       << "}" << be_nl << be_nl;
 
   *os << "ACE_INLINE " << node->full_name ()
-      << out_ref_modifier << "&" << be_nl 
+      << out_ref_modifier << "&" << be_nl
       << vb_node->name () << "::_boxed_out (void)" << be_nl
       << "{" << be_idt_nl
       << "return this->_pd_value.out ();" << be_uidt_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_cs.cpp
index 5f7adb89581..4c04dd07508 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_cs.cpp
@@ -99,19 +99,19 @@ be_visitor_valuebox_cs::visit_valuebox (be_valuebox *node)
       switch (bpt->pt())
         {
         case AST_PredefinedType::PT_boolean:
-          unmarshal_arg = "::CORBA::Any::to_boolean (vb_object->_pd_value)";
+          unmarshal_arg = "::ACE_InputCDR::to_boolean (vb_object->_pd_value)";
           break;
 
         case AST_PredefinedType::PT_char:
-          unmarshal_arg = "::CORBA::Any::to_char (vb_object->_pd_value)";
+          unmarshal_arg = "::ACE_InputCDR::to_char (vb_object->_pd_value)";
           break;
 
         case AST_PredefinedType::PT_wchar:
-          unmarshal_arg = "::CORBA::Any::to_wchar (vb_object->_pd_value)";
+          unmarshal_arg = "::ACE_InputCDR::to_wchar (vb_object->_pd_value)";
           break;
 
         case AST_PredefinedType::PT_octet:
-          unmarshal_arg = "::CORBA::Any::to_octet (vb_object->_pd_value)";
+          unmarshal_arg = "::ACE_InputCDR::to_octet (vb_object->_pd_value)";
           break;
 
         case AST_PredefinedType::PT_any:
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/any_op_ch.cpp
index 2ebf715c7a2..85a3231b538 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/any_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/any_op_ch.cpp
@@ -20,8 +20,8 @@
 //
 // ============================================================================
 
-ACE_RCSID (be_visitor_valuetype, 
-           any_op_ch, 
+ACE_RCSID (be_visitor_valuetype,
+           any_op_ch,
            "$Id$")
 
 // ***************************************************************************
@@ -49,13 +49,13 @@ be_visitor_valuetype_any_op_ch::visit_valuetype (be_valuetype *node)
     }
 
   TAO_OutStream *os = this->ctx_->stream ();
+  const char *macro = this->ctx_->export_macro ();
 
   *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
 
-
   be_module *module = 0;
- 
+
   if (node->is_nested () &&
       node->defined_in ()->scope_node_type () == AST_Decl::NT_module)
     {
@@ -77,15 +77,15 @@ be_visitor_valuetype_any_op_ch::visit_valuetype (be_valuetype *node)
       be_util::gen_nested_namespace_begin (os, module);
 
       // emit  nested variation of any operators
-      *os << be_global->stub_export_macro () << " void"
+      *os << macro << " void"
           << " operator<<= ( ::CORBA::Any &, " << node->local_name ()
           << " *); // copying" << be_nl;
 
-      *os << be_global->stub_export_macro () << " void"
+      *os << macro << " void"
           << " operator<<= ( ::CORBA::Any &, " << node->local_name ()
           << " **); // non-copying" << be_nl;
 
-      *os << be_global->stub_export_macro () << " ::CORBA::Boolean"
+      *os << macro << " ::CORBA::Boolean"
           << " operator>>= (const ::CORBA::Any &, "
           << node->local_name () << " *&);";
 
@@ -95,16 +95,13 @@ be_visitor_valuetype_any_op_ch::visit_valuetype (be_valuetype *node)
       *os << "#else\n\n";
     }
 
-  *os << be_global->stub_export_macro () << " void"
-      << " operator<<= ( ::CORBA::Any &, " << node->name ()
+  *os << macro << " void operator<<= (::CORBA::Any &, " << node->name ()
       << " *); // copying" << be_nl;
 
-  *os << be_global->stub_export_macro () << " void"
-      << " operator<<= ( ::CORBA::Any &, " << node->name ()
+  *os << macro << " void operator<<= (::CORBA::Any &, " << node->name ()
       << " **); // non-copying" << be_nl;
 
-  *os << be_global->stub_export_macro () << " ::CORBA::Boolean"
-      << " operator>>= (const ::CORBA::Any &, "
+  *os << macro << " ::CORBA::Boolean operator>>= (const ::CORBA::Any &, "
       << node->name () << " *&);";
 
   if (module != 0)
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/field_cdr_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/field_cdr_cs.cpp
index 1cf4f9b6c3e..60a7ea8026c 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/field_cdr_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/field_cdr_cs.cpp
@@ -259,7 +259,7 @@ be_visitor_valuetype_field_cdr_cs::visit_interface (be_interface *node)
           << this->post_ << ".out ())";
       break;
     case TAO_CodeGen::TAO_CDR_OUTPUT:
-      *os << "TAO::Objref_Traits< ::" << node->name () 
+      *os << "TAO::Objref_Traits< ::" << node->name ()
           << ">::marshal (" << be_idt << be_idt_nl
           << this->pre_ << f->local_name ()
           << this->post_ << ".in (), " << be_nl
@@ -308,7 +308,7 @@ be_visitor_valuetype_field_cdr_cs::visit_interface_fwd (be_interface_fwd *node)
           << this->post_ << ").out ()";
       break;
     case TAO_CodeGen::TAO_CDR_OUTPUT:
-      *os << "TAO::Objref_Traits< ::" << node->name () 
+      *os << "TAO::Objref_Traits< ::" << node->name ()
           << ">::marshal (" << be_idt << be_idt_nl
           << this->pre_ << f->local_name ()
           << this->post_ << ".in (), " << be_nl
@@ -489,22 +489,22 @@ be_visitor_valuetype_field_cdr_cs::visit_predefined_type (be_predefined_type *no
         }
       else if (pt == AST_PredefinedType::PT_char)
         {
-          *os << "(strm >> ::CORBA::Any::to_char ("
+          *os << "(strm >> ::ACE_InputCDR::to_char ("
               << this->pre_ << f->local_name () << this->post_ << "))";
         }
       else if (pt == AST_PredefinedType::PT_wchar)
         {
-          *os << "(strm >> ::CORBA::Any::to_wchar ("
+          *os << "(strm >> ::ACE_InputCDR::to_wchar ("
               << this->pre_ << f->local_name () << this->post_ << "))";
             }
       else if (pt == AST_PredefinedType::PT_octet)
         {
-          *os << "(strm >> ::CORBA::Any::to_octet ("
+          *os << "(strm >> ::ACE_InputCDR::to_octet ("
               << this->pre_ << f->local_name () << this->post_ << "))";
         }
       else if (pt == AST_PredefinedType::PT_boolean)
         {
-          *os << "(strm >> ::CORBA::Any::to_boolean ("
+          *os << "(strm >> ::ACE_InputCDR::to_boolean ("
               << this->pre_ << f->local_name () << this->post_ << "))";
         }
       else
@@ -522,22 +522,22 @@ be_visitor_valuetype_field_cdr_cs::visit_predefined_type (be_predefined_type *no
         }
       else if (pt == AST_PredefinedType::PT_char)
         {
-          *os << "(strm << ::CORBA::Any::from_char ("
+          *os << "(strm << ::ACE_OutputCDR::from_char ("
               << this->pre_ << f->local_name () << this->post_ << "))";
         }
       else if (pt == AST_PredefinedType::PT_wchar)
         {
-          *os << "(strm << ::CORBA::Any::from_wchar ("
+          *os << "(strm << ::ACE_OutputCDR::from_wchar ("
               << this->pre_ << f->local_name () << this->post_ << "))";
         }
       else if (pt == AST_PredefinedType::PT_octet)
         {
-          *os << "(strm << ::CORBA::Any::from_octet ("
+          *os << "(strm << ::ACE_OutputCDR::from_octet ("
               << this->pre_ << f->local_name () << this->post_ << "))";
         }
       else if (pt == AST_PredefinedType::PT_boolean)
         {
-          *os << "(strm << ::CORBA::Any::from_boolean ("
+          *os << "(strm << ::ACE_OutputCDR::from_boolean ("
               << this->pre_ << f->local_name () << this->post_ << "))";
         }
       else
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/any_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/any_op_ch.cpp
index c0a87d4aed2..899854c0915 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/any_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype_fwd/any_op_ch.cpp
@@ -19,8 +19,8 @@
 //
 // ============================================================================
 
-ACE_RCSID (be_visitor_valuetype_fwd, 
-           any_op_ch, 
+ACE_RCSID (be_visitor_valuetype_fwd,
+           any_op_ch,
            "$Id$")
 
 // ***************************************************************************
@@ -60,14 +60,13 @@ be_visitor_valuetype_fwd_any_op_ch::visit_valuetype_fwd (
     }
 
   TAO_OutStream *os = this->ctx_->stream ();
+  const char *macro = this->ctx_->export_macro ();
 
   *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
       << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
 
-
-
   be_module *module = 0;
- 
+
   if (node->is_nested () &&
       node->defined_in ()->scope_node_type () == AST_Decl::NT_module)
     {
@@ -89,13 +88,13 @@ be_visitor_valuetype_fwd_any_op_ch::visit_valuetype_fwd (
       be_util::gen_nested_namespace_begin (os, module);
 
       // emit  nested variation of any operators
-      *os << be_global->stub_export_macro () << " void"
+      *os << macro << " void"
           << " operator<<= ( ::CORBA::Any &, " << node->local_name ()
           << " *); // copying" << be_nl;
-      *os << be_global->stub_export_macro () << " void"
+      *os << macro << " void"
           << " operator<<= ( ::CORBA::Any &, " << node->local_name ()
           << " **); // non-copying" << be_nl;
-      *os << be_global->stub_export_macro () << " ::CORBA::Boolean"
+      *os << macro << " ::CORBA::Boolean"
           << " operator>>= (const ::CORBA::Any &, "
           << node->local_name () << " *&);";
 
@@ -105,13 +104,13 @@ be_visitor_valuetype_fwd_any_op_ch::visit_valuetype_fwd (
       *os << "#else\n\n";
     }
 
-  *os << be_global->stub_export_macro () << " void"
+  *os << macro << " void"
       << " operator<<= ( ::CORBA::Any &, " << node->name ()
       << " *); // copying" << be_nl;
-  *os << be_global->stub_export_macro () << " void"
+  *os << macro << " void"
       << " operator<<= ( ::CORBA::Any &, " << node->name ()
       << " **); // non-copying" << be_nl;
-  *os << be_global->stub_export_macro () << " ::CORBA::Boolean"
+  *os << macro << " ::CORBA::Boolean"
       << " operator>>= (const ::CORBA::Any &, "
       << node->name () << " *&);";
 
diff --git a/TAO/TAO_IDL/be_include/be_codegen.h b/TAO/TAO_IDL/be_include/be_codegen.h
index f00f7772db1..20836ad4468 100644
--- a/TAO/TAO_IDL/be_include/be_codegen.h
+++ b/TAO/TAO_IDL/be_include/be_codegen.h
@@ -264,9 +264,12 @@ public:
 
   int start_server_template_skeletons (const char *fname);
   // Set the server template skeletons stream.
+  
+  int start_anyop_header (const char *fname);
+  // Set the anyop header stream.
 
   int start_anyop_source (const char *fname);
-  // TAO developers only.
+  // Set the anyop source stream.
 
   int end_client_header (void);
   // Generate code at the end such as the <<= and >>= operators alongwith the
@@ -292,9 +295,12 @@ public:
 
   int end_server_skeletons (void);
   // Put a last #endif in the server skeletons.
+  
+  int end_anyop_header (void);
+  // Put a last #endif in the anyop header.
 
   int end_anyop_source (void);
-  // TAO developers only.
+  // Make sure we end with a newline.
 
   TAO_OutStream *client_header (void);
   // Get the client header stream.
@@ -330,8 +336,10 @@ public:
   // Get the server template inline stream.
 
   TAO_OutStream *anyop_header (void);
+  // Get the anyop header stream.
+  
   TAO_OutStream *anyop_source (void);
-  // TAO developers only. Accessors to the streams.
+  // Get the anyop source stream.
 
   void gperf_input_stream (TAO_OutStream *gperf_input);
   // Set the gperf input file stream.
@@ -427,9 +435,12 @@ private:
 
   TAO_OutStream *server_template_inline_;
   // Server side template inline file.
+  
+  TAO_OutStream *anyop_header_;
+  // Anyop header file.
 
   TAO_OutStream *anyop_source_;
-  // For use by TAO developers only.
+  // Anyop source file.
 
   TAO_OutStream *gperf_input_stream_;
   // TAO_OutStream to collect the input for gperf program.
diff --git a/TAO/TAO_IDL/be_include/be_global.h b/TAO/TAO_IDL/be_include/be_global.h
index 270945e6d1e..21c5e016cf7 100644
--- a/TAO/TAO_IDL/be_include/be_global.h
+++ b/TAO/TAO_IDL/be_include/be_global.h
@@ -100,6 +100,9 @@ public:
   static const char *be_get_anyop_source_fname (
       int base_name_only = 0
     );
+  static const char *be_get_anyop_header_fname (
+      int base_name_only = 0
+    );
 
   // Helper functions: obtain the names of each generated file given
   // the IDL file name.
@@ -163,6 +166,21 @@ public:
   // set the name of the include file that contains the client side
   // export macro definition.
 
+  const char* anyop_export_macro (void) const;
+  // returns the macro name for exporting client side classes in Win32
+  // DLL.
+
+  void anyop_export_macro (const char* s);
+  // set the macro name for export client side classes in Win32 DLL.
+
+  const char* anyop_export_include (void) const;
+  // returns the name of the include file that contains the client
+  // side export macro definition.
+
+  void anyop_export_include (const char* s);
+  // set the name of the include file that contains the client side
+  // export macro definition.
+
   const char* pch_include (void) const;
   // returns the name of the include file to be used for precompiled
   // header support.
@@ -267,9 +285,17 @@ public:
   const char* server_template_inline_ending (void) const;
   // Get the server_template_inline_ending.
 
+  void anyop_header_ending (const char* s);
+  // Set the anyop_header_ending.
+  
   const char* anyop_header_ending (void) const;
+  // Get the anyop_header_ending.
+  
+  void anyop_source_ending (const char* s);
+  // Set the anyop_source_ending.
+    
   const char* anyop_source_ending (void) const;
-  // TAO developers only.
+  // Get the anyop_source_ending.
 
   void output_dir (const char* s);
   // Set the directory where all the IDL-Compiler-Generated files are
@@ -281,6 +307,16 @@ public:
   // to be kept. Default  is current directory from which the
   // <tao_idl> is called.
 
+  void anyop_output_dir (const char* s);
+  // Set the directory where all the *A.* files are
+  // to be kept. Default  is current directory from which the
+  // <tao_idl> is called.
+
+  const char* anyop_output_dir (void) const;
+  // Get the directory where all the *A.* files are
+  // to be kept. Default  is current directory from which the
+  // <tao_idl> is called.
+
   void any_support (idl_bool);
   // Set any support.
 
@@ -391,9 +427,6 @@ public:
   idl_bool gen_dcps_type_support (void) const;
   // Return the flag.
 
-  void gen_tmplinst (idl_bool value);
-  // Set the flag.
-
   idl_bool gen_tmplinst (void) const;
   // Return the flag.
 
@@ -474,6 +507,11 @@ private:
   char* skel_export_include_;
   char* stub_export_macro_;
   char* stub_export_include_;
+  
+  // Macro and include used on ORB .pidl files generating to the
+  // AnyTypeCode library.
+  char* anyop_export_macro_;
+  char* anyop_export_include_;
 
   char* pch_include_;
   char* pre_include_;
@@ -519,8 +557,10 @@ private:
   // Server's template inline file name ending. Default is "S_T.i".
   char* server_template_inline_ending_;
 
-  // Any operator file name endings.
+  // Anyop header file name ending. Default is "A.h".
   char* anyop_hdr_ending_;
+  
+  // Anyop source file name ending. Default is "A.cpp".
   char* anyop_src_ending_;
 
   char* output_dir_;
@@ -528,6 +568,11 @@ private:
   // kept. Default value is 0 for this string which means the current
   // directory from which the <tao_idl> is called.
 
+  char* anyop_output_dir_;
+  // Directory where all the *A.* files are to be
+  // kept. Default value is 0 for this string which means the current
+  // directory from which the <tao_idl> is called.
+
   idl_bool any_support_;
   // do we support Any operators?
 
@@ -588,11 +633,6 @@ private:
   // Flag to indicate whether we are supporting DDS DCPS type definitions.
   // Includes Serializer operators (like TAO_Input/OutuptCDR).
 
-
-  idl_bool gen_tmplinst_;
-  // Flag to indicate if we are generating explicit template instantiations
-  // or not.
-
   LOOKUP_STRATEGY lookup_strategy_;
   // The enumerated value indicating the lookup strategy.
 
diff --git a/TAO/TAO_IDL/be_include/be_visitor_arg_traits.h b/TAO/TAO_IDL/be_include/be_visitor_arg_traits.h
index ed2320152ac..9a5ef1055fc 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_arg_traits.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_arg_traits.h
@@ -46,11 +46,11 @@ public:
   virtual int visit_eventtype (be_eventtype *node);
 
   virtual int visit_eventtype_fwd (be_eventtype_fwd *node);
-  
+
   virtual int visit_operation (be_operation *node);
-  
+
   virtual int visit_attribute (be_attribute *node);
-  
+
   virtual int visit_argument (be_argument *node);
 
   virtual int visit_sequence (be_sequence *node);
@@ -81,6 +81,8 @@ private:
   void generated (be_decl *node,
                   idl_bool val);
 
+  const char *insert_policy (void);
+
 private:
   char *S_;
 };
diff --git a/TAO/TAO_IDL/be_include/be_visitor_context.h b/TAO/TAO_IDL/be_include/be_visitor_context.h
index fa53e612f9a..292f18a3bbc 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_context.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_context.h
@@ -243,6 +243,12 @@ public:
 
   be_union *be_scope_as_union (void);
   // return the scope as union if possible
+  
+  const char *export_macro (void) const;
+  // return the export macro currently in force
+  
+  const char *non_null_export_macro (void) const;
+  // if anyop export macro is empty, check stub.
 
 private:
   TAO_CodeGen::CG_STATE state_;
diff --git a/TAO/TAO_IDL/be_include/be_visitor_root/root.h b/TAO/TAO_IDL/be_include/be_visitor_root/root.h
index 7bda884bc43..2347c2f7af2 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_root/root.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_root/root.h
@@ -106,12 +106,6 @@ public:
 
   virtual int init (void);
   // will be overridden by derived classes that set the appropriate context
-
-private:
-  int gen_explicit_tmplinst (be_root *,
-                             TAO_OutStream *);
-  // Generate guarded explicit template instantiations, for those platforms
-  // that require them.
 };
 
 #endif /* _BE_VISITOR_ROOT_ROOT_H_ */
diff --git a/TAO/TAO_IDL/be_include/be_visitor_tmplinst.h b/TAO/TAO_IDL/be_include/be_visitor_tmplinst.h
deleted file mode 100644
index 3bb34e26849..00000000000
--- a/TAO/TAO_IDL/be_include/be_visitor_tmplinst.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* -*- c++ -*- */
-//
-// $Id$
-//
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO IDL
-//
-// = FILENAME
-//    be_visitor_tmplinst.h
-//
-// = DESCRIPTION
-//    Visitors that generate explicit template instantiations.
-//
-// = AUTHOR
-//    Jeff Parsons
-//
-// ============================================================================
-
-#ifndef TAO_BE_VISITOR_TMPLINST_H
-#define TAO_BE_VISITOR_TMPLINST_H
-
-#include "ast_argument.h"
-#include "idl_defines.h"
-
-#include "be_visitor_scope.h"
-#include "be_visitor_tmplinst/tmplinst.h"
-#include "be_visitor_tmplinst/arg_tmplinst.h"
-#include "be_visitor_tmplinst/tmplinst_cs.h"
-#include "be_visitor_tmplinst/tmplinst_ss.h"
-
-#endif // TAO_BE_VISITOR_TMPLINST_H
diff --git a/TAO/TAO_IDL/be_include/be_visitor_tmplinst/arg_tmplinst.h b/TAO/TAO_IDL/be_include/be_visitor_tmplinst/arg_tmplinst.h
deleted file mode 100644
index e83942673e9..00000000000
--- a/TAO/TAO_IDL/be_include/be_visitor_tmplinst/arg_tmplinst.h
+++ /dev/null
@@ -1,119 +0,0 @@
-//=============================================================================
-/**
-*  @file   arg_tmplinst.h
-*
-*  $Id$
-*arg_tmplinst
-*  This visitor generates explicit template instantiations, guarded so they
-*  are seen only by compilers whose platforms require explicit template
-*  instantiation, for the individual argument template helper classes.
-*
-*  @author Jeff Parsons <j.parsons@vanderbilt.edu>
-*/
-//=============================================================================
-#ifndef TAO_BE_VISITOR_TMPLINST_ARG_TMPLINST_H
-#define TAO_BE_VISITOR_TMPLINST_ARG_TMPLINST_H
-
-/**
- * @class be_visitor_arg_tmplinst
- *
- * @brief Generates explicit template instantiations for arg helper classes.
- */
-class be_visitor_arg_tmplinst : public be_visitor_decl
-{
-public:
-  be_visitor_arg_tmplinst (be_visitor_context *ctx,
-                           be_visitor_tmplinst::Mode mode,
-                           char * prefix,
-                           char * suffix,
-                           char * linebreak,
-                           const char * S);
-
-  virtual ~be_visitor_arg_tmplinst (void);
-
-  virtual int visit_array (be_array *node);
-
-  virtual int visit_enum (be_enum *node);
-
-  virtual int visit_interface (be_interface *node);
-
-  virtual int visit_interface_fwd (be_interface_fwd *node);
-
-  virtual int visit_valuebox (be_valuebox *node);
-
-  virtual int visit_valuetype (be_valuetype *node);
-
-  virtual int visit_component (be_component *node);
-
-  virtual int visit_component_fwd (be_component_fwd *node);
-
-  virtual int visit_home (be_home *node);
-
-  virtual int visit_valuetype_fwd (be_valuetype_fwd *node);
-
-  virtual int visit_eventtype (be_eventtype *node);
-
-  virtual int visit_eventtype_fwd (be_eventtype_fwd *node);
-
-  virtual int visit_sequence (be_sequence *node);
-
-  virtual int visit_string (be_string *node);
-
-  virtual int visit_structure (be_structure *node);
-
-  virtual int visit_structure_fwd (be_structure_fwd *node);
-
-  virtual int visit_field (be_field *node);
-
-  virtual int visit_union (be_union *node);
-
-  virtual int visit_union_fwd (be_union_fwd *node);
-
-  virtual int visit_union_branch (be_union_branch *node);
-
-  virtual int visit_typedef (be_typedef *node);
-
-  // Accdessors for the member.
-  void direction (void);
-  void direction (AST_Argument::Direction dir);
-
-private:
-  // Set/get the appropriate flag on the node we are traversing,
-  // to make sure we don't generate something twice.
-  idl_bool this_mode_and_dir_generated (be_decl *node) const;
-  void this_mode_and_dir_generated (be_decl *node, 
-                                    idl_bool val);
-
-  // Generate the direction prefix to the arg class name.
-  void gen_direction (TAO_OutStream *os);
-
-private:
-  enum Direction
-    {
-      _tao_IN,
-      _tao_INOUT,
-      _tao_OUT,
-      _tao_RET
-    };
-
-  // Generating 'template class' or '#pragma instantiate'.
-  be_visitor_tmplinst::Mode mode_;
-
-  // Contains the prefix string itself.
-  char * prefix_;
-
-  // ';' or empty string
-  char * suffix_;
-
-  // backslash for '#pragma instantiate' mode, empty otherwise.
-  char * linebreak_;
-
-  // Value of the above enum we are holding.
-  Direction dir_;
-
-  // Contains 'S' to insert in skel side arg class name, or empty.
-  const char * S_;
-};
-
-
-#endif // TAO_BE_VISITOR_TMPLINST_ARG_TMPLINST_H
diff --git a/TAO/TAO_IDL/be_include/be_visitor_tmplinst/tmplinst.h b/TAO/TAO_IDL/be_include/be_visitor_tmplinst/tmplinst.h
deleted file mode 100644
index dfbc74a72a7..00000000000
--- a/TAO/TAO_IDL/be_include/be_visitor_tmplinst/tmplinst.h
+++ /dev/null
@@ -1,71 +0,0 @@
-//=============================================================================
-/**
-*  @file   tmplinst.h
-*
-*  $Id$
-*
-*  Base class for the concrete visitors that generate explicit template
-*  instantiations for the stub side and skeleton side.
-*
-*  @author Jeff Parsons <j.parsons@vanderbilt.edu>
-*/
-//=============================================================================
-#ifndef TAO_BE_VISITOR_TMPLINST_TMPLINST_H
-#define TAO_BE_VISITOR_TMPLINST_TMPLINST_H
-
-/**
- * @class be_visitor_tmplinst
- *
- * @brief Base class for stub generation and skeleton generation visitors.
- */
-class be_visitor_tmplinst : public be_visitor_scope
-{
-public:
-  enum Mode
-    {
-      TMPL_CLASS,
-      PRAGMA_INST
-    };
-
-  be_visitor_tmplinst (be_visitor_context *ctx);
-
-  virtual ~be_visitor_tmplinst (void);
-
-  virtual int visit_root (be_root *node);
-
-  virtual int visit_module (be_module *node);
-
-  virtual int visit_interface_fwd (be_interface_fwd *node);
-
-  virtual int visit_valuetype_fwd (be_valuetype_fwd *node);
-
-  virtual int visit_eventtype (be_eventtype *node);
-
-  virtual int visit_eventtype_fwd (be_eventtype_fwd *node);
-
-  virtual int visit_structure_fwd (be_structure_fwd *node);
-
-  virtual int visit_field (be_field *node);
-
-  virtual int visit_union_fwd (be_union_fwd *node);
-
-  virtual int visit_union_branch (be_union_branch *node);
-
-  virtual int visit_typedef (be_typedef *node);
-
-  void switch_mode (void);
-
-protected:
-  virtual idl_bool this_mode_generated (be_decl *node) const = 0;
-  virtual void this_mode_generated (be_decl *node, 
-                                    idl_bool val) = 0;
-
-protected:
-  Mode mode_;
-  char * prefix_;
-  char * suffix_;
-  char * linebreak_;
-};
-
-
-#endif // TAO_BE_VISITOR_TMPLINST_TMPLINST_H
diff --git a/TAO/TAO_IDL/be_include/be_visitor_tmplinst/tmplinst_cs.h b/TAO/TAO_IDL/be_include/be_visitor_tmplinst/tmplinst_cs.h
deleted file mode 100644
index 220dc86bb20..00000000000
--- a/TAO/TAO_IDL/be_include/be_visitor_tmplinst/tmplinst_cs.h
+++ /dev/null
@@ -1,79 +0,0 @@
-//=============================================================================
-/**
-*  @file   tmplinst_cs.h
-*
-*  $Id$
-*
-*  This visitor generates explicit template instantiations, guarded so they
-*  are seen only by compilers whose platforms require explicit template
-*  instantiation.
-*
-*  @author Jeff Parsons <j.parsons@vanderbilt.edu>
-*/
-//=============================================================================
-#ifndef TAO_BE_VISITOR_TMPLINST_CS_H
-#define TAO_BE_VISITOR_TMPLINST_CS_H
-
-#include "tmplinst.h"
-
-/**
- * @class be_visitor_tmplinst_cs
- *
- * @brief Generates explicit template instantiations for the stub.
- */
-class be_visitor_tmplinst_cs : public be_visitor_tmplinst
-{
-public:
-  be_visitor_tmplinst_cs (be_visitor_context *ctx);
-
-  virtual ~be_visitor_tmplinst_cs (void);
-
-  virtual int visit_array (be_array *node);
-
-  virtual int visit_attribute (be_attribute *node);
-
-  virtual int visit_enum (be_enum *node);
-
-  virtual int visit_exception (be_exception *node);
-
-  virtual int visit_interface (be_interface *node);
-
-  virtual int visit_valuebox (be_valuebox *node);
-
-  virtual int visit_valuetype (be_valuetype *node);
-
-  virtual int visit_operation (be_operation *node);
-
-  virtual int visit_sequence (be_sequence *node);
-
-  virtual int visit_string (be_string *node);
-
-  virtual int visit_structure (be_structure *node);
-
-  virtual int visit_union (be_union *node);
-
-protected:
-  virtual idl_bool this_mode_generated (be_decl *node) const;
-  virtual void this_mode_generated (be_decl *node, 
-                                    idl_bool val);
-
-  // Generate explicit template instantiations for our _var
-  // and _out classes.
-  int gen_varout_tmplinst (be_sequence *node,
-                           be_type *bt);
-
-  // Generate explicit instantiation for our element type, if
-  // it is a managed type.
-  void gen_managed_type_tmplinst (be_sequence *node,
-                                  be_type *bt);
-
-  // Generate explicit instantiation for the base class type.
-  int gen_base_class_tmplinst (be_sequence *node);
-
-  void gen_common_tmplinst (be_type *node,
-                            TAO_OutStream *os);
-  // Generate explicit template instantiations for structs and unions.
-};
-
-
-#endif // TAO_BE_VISITOR_TMPLINST_CS_H
diff --git a/TAO/TAO_IDL/be_include/be_visitor_tmplinst/tmplinst_ss.h b/TAO/TAO_IDL/be_include/be_visitor_tmplinst/tmplinst_ss.h
deleted file mode 100644
index 2954005783d..00000000000
--- a/TAO/TAO_IDL/be_include/be_visitor_tmplinst/tmplinst_ss.h
+++ /dev/null
@@ -1,60 +0,0 @@
-//=============================================================================
-/**
-*  @file   tmplinst_ss.h
-*
-*  $Id$
-*
-*  This visitor generates explicit template instantiations, guarded so they
-*  are seen only by compilers whose platforms require explicit template
-*  instantiation.
-*
-*  @author Jeff Parsons <j.parsons@vanderbilt.edu>
-*/
-//=============================================================================
-#ifndef TAO_BE_VISITOR_TMPLINST_SS_H
-#define TAO_BE_VISITOR_TMPLINST_SS_H
-
-#include "tmplinst.h"
-
-/**
- * @class be_visitor_tmplinst_ss
- *
- * @brief Generates explicit template instantiations for the skelton.
- */
-class be_visitor_tmplinst_ss : public be_visitor_tmplinst
-{
-public:
-  be_visitor_tmplinst_ss (be_visitor_context *ctx);
-
-  virtual ~be_visitor_tmplinst_ss (void);
-
-  virtual int visit_array (be_array *node);
-
-  virtual int visit_attribute (be_attribute *node);
-
-  virtual int visit_enum (be_enum *node);
-
-  virtual int visit_interface (be_interface *node);
-
-  virtual int visit_valuebox (be_valuebox *node);
-
-  virtual int visit_valuetype (be_valuetype *node);
-
-  virtual int visit_operation (be_operation *node);
-
-  virtual int visit_sequence (be_sequence *node);
-
-  virtual int visit_string (be_string *node);
-
-  virtual int visit_structure (be_structure *node);
-
-  virtual int visit_union (be_union *node);
-
-protected:
-  virtual idl_bool this_mode_generated (be_decl *node) const;
-  virtual void this_mode_generated (be_decl *node, 
-                                    idl_bool val);
-};
-
-
-#endif // TAO_BE_VISITOR_TMPLINST_SS_H
diff --git a/TAO/TAO_IDL/driver/drv_args.cpp b/TAO/TAO_IDL/driver/drv_args.cpp
index f7b1970f69f..e33dfc47118 100644
--- a/TAO/TAO_IDL/driver/drv_args.cpp
+++ b/TAO/TAO_IDL/driver/drv_args.cpp
@@ -186,7 +186,69 @@ DRV_usage (void)
     ));
   ACE_DEBUG ((
       LM_DEBUG,
-      ACE_TEXT (" -W[p|b],arg1,argn\tpasses args to preprocessor or BE\n")
+      ACE_TEXT (" -Wp,<arg1,...,argn>\t\t\t\tpasses args to preprocessor\n")
+    ));
+  ACE_DEBUG ((
+      LM_DEBUG,
+      ACE_TEXT (" -Wb,export_macro=<macro name>\t\t\tsets export macro ")
+      ACE_TEXT ("for all files\n")
+    ));
+  ACE_DEBUG ((
+      LM_DEBUG,
+      ACE_TEXT (" -Wb,export_include=<include path>\t\tsets export include ")
+      ACE_TEXT ("file for all files\n")
+    ));
+  ACE_DEBUG ((
+      LM_DEBUG,
+      ACE_TEXT (" -Wb,stub_export_macro=<macro name>\t\tsets export ")
+      ACE_TEXT ("macro for client files only\n")
+    ));
+  ACE_DEBUG ((
+      LM_DEBUG,
+      ACE_TEXT (" -Wb,stub_export_include=<include path>\t\tsets export ")
+      ACE_TEXT ("include file for client only\n")
+    ));
+  ACE_DEBUG ((
+      LM_DEBUG,
+      ACE_TEXT (" -Wb,skel_export_macro=<macro name>\t\tsets export ")
+      ACE_TEXT ("macro for server files only\n")
+    ));
+  ACE_DEBUG ((
+      LM_DEBUG,
+      ACE_TEXT (" -Wb,skel_export_include=<include path>\t\tsets export ")
+      ACE_TEXT ("include file for server only\n")
+    ));
+  ACE_DEBUG ((
+      LM_DEBUG,
+      ACE_TEXT (" -Wb,anyop_export_macro=<macro name>\t\tsets export macro ")
+      ACE_TEXT ("for typecode/Any operator files only, when -GA option ")
+      ACE_TEXT ("is used\n")
+    ));
+  ACE_DEBUG ((
+      LM_DEBUG,
+      ACE_TEXT (" -Wb,anyop_export_include=<include path>\tsets export ")
+      ACE_TEXT ("include file typecode/Any operator files only, when -GA ")
+      ACE_TEXT ("option is used\n")
+    ));
+  ACE_DEBUG ((
+      LM_DEBUG,
+      ACE_TEXT (" -Wb,pch_include=<include path>\t\t\tsets include ")
+      ACE_TEXT ("file for precompiled header mechanism\n")
+    ));
+  ACE_DEBUG ((
+      LM_DEBUG,
+      ACE_TEXT (" -Wb,pre_include=<include path>\t\t\tsets include ")
+      ACE_TEXT ("file generate before any other includes\n")
+    ));
+  ACE_DEBUG ((
+      LM_DEBUG,
+      ACE_TEXT (" -Wb,post_include=<include path>\t\tsets include ")
+      ACE_TEXT ("file generated at the end of the file\n")
+    ));
+  ACE_DEBUG ((
+      LM_DEBUG,
+      ACE_TEXT (" -Wb,obv_opt_accessor\t\t\t\toptimizes access to base class ")
+      ACE_TEXT ("data in valuetypes\n")
     ));
   ACE_DEBUG ((
       LM_DEBUG,
diff --git a/TAO/docs/compiler.html b/TAO/docs/compiler.html
index b89b41b9ae3..1e15a72a18e 100644
--- a/TAO/docs/compiler.html
+++ b/TAO/docs/compiler.html
@@ -192,7 +192,7 @@ TAO.<p>
 TAO's IDL compiler invokes your <tt>C</tt> (or <tt>C++</tt>)
 preprocessor to resolve included IDL files.  It receives the common
 options for preprocessors (such as <tt>-D</tt> or <tt>-I</tt>).  It
-also receives other options that are specific to it. <p>
+also receives other options that are specific to it.<p>
 
 <table BORDER=2 CELLSPACING=2 CELLPADDING=0>
   <tr>
@@ -229,7 +229,7 @@ also receives other options that are specific to it. <p>
 
     <td>The compiler will emit <i>macro_name</i> right after each <tt>class</tt>
         or <tt>extern</tt> keyword in the generated skeleton code (S
-        files,) this is needed for Windows/NT that requires
+        files,) this is needed for Windows, which requires
         special directives to export symbols from DLLs, usually the definition
         is just a space on unix platforms.&nbsp;</td>
   </tr>
@@ -251,7 +251,7 @@ also receives other options that are specific to it. <p>
 
     <td>The compiler will emit <i>macro_name</i> right after each <tt>class</tt>
         or <tt>extern</tt> keyword in the generated stub code, this is
-        needed for Windows/NT that requires special directives to
+        needed for Windows, which requires special directives to
         export symbols from DLLs, usually the definition is just a
         space on unix platforms.&nbsp;</td>
   </tr>
@@ -266,15 +266,41 @@ also receives other options that are specific to it. <p>
         macro.</td>
   </tr>
 
+  <tr><a name="anyop_export_macro">
+    <td></td>
+
+    <td><tt>anyop_export_macro=</tt><i>macro_name</i></td>
+
+    <td>The compiler will emit <i>macro_name</i> before each Any operator
+        or <tt>extern</tt> typecode declaration in the generated stub code, 
+        this is needed for Windows, which requires special directives to
+        export symbols from DLLs, usually the definition is just a
+        space on unix platforms. This option works only in conjuction with
+        the -GA option, which generates Any operators and typecodes into a
+        separate set of files.&nbsp;</td>
+  </tr>
+
+  <tr><a name="anyop_export_include">
+    <td></td>
+
+    <td><tt>anyop_export_include=</tt><i>include_path</i></td>
+
+    <td>The compiler will generate code to include <i>include_path</i> at the
+        top of the anyop file header, this is usually a good place to define the export
+        macro. This option works in conjuction with the -GA option, which generates Any 
+        operators and typecodes into a separate set of files.</td>
+  </tr>
+
   <tr><a name="export_macro">
     <td></td>
 
     <td><tt>export_macro=</tt><i>macro_name</i></td>
 
-    <td>This option has the same effect as issuing
-        <tt>-Wb,skel_export_macro=</tt><i>macro_name</i>
-        <tt>-Wb,stub_export_macro=</tt><i>macro_name</i>.  This option
-        is useful when building a DLL containing both stubs and
+    <td>This option has the same effect as issuing<br>
+        <tt>-Wb,skel_export_macro=</tt><i>macro_name</i><br>
+        <tt>-Wb,stub_export_macro=</tt><i>macro_name</i><br>
+        <tt>-Wb,anyop_export_macro=</tt><i>macro_name</i>.<br>
+        This option is useful when building a DLL containing both stubs and
         skeletons.</td>
   </tr>
 
@@ -283,9 +309,11 @@ also receives other options that are specific to it. <p>
 
     <td><tt>export_include=</tt><i>include_path</i></td>
 
-    <td>This option has the same effect as specifying
-        <tt>-Wb,stub_export_include=</tt><i>include_path</i>.  This
-        option goes with the previous option to build DLL containing
+    <td>This option has the same effect as specifying<br>
+        <tt>-Wb,stub_export_include=</tt><i>include_path</i><br>
+        <tt>-Wb,skel_export_include=</tt><i>include_path</i><br>
+        <tt>-Wb,anyop_export_include=</tt><i>include_path</i>.<br> 
+        This option goes with the previous option to build DLL containing
         both stubs and skeletons.</td>
   </tr>
 
@@ -461,6 +489,13 @@ also receives other options that are specific to it. <p>
         itself already exists, no action is taken.&nbsp;</td>
   </tr>
 
+  <tr><a name="oA">
+    <td><tt>-oA</tt></td>
+
+    <td>Same as -o option but applies only to generated *A.* files&nbsp;</td>
+    <td>&nbsp;</td>
+  </tr>
+
   <tr><a name="hc">
     <td><tt>-hc</tt></td>
 
@@ -615,20 +650,13 @@ also receives other options that are specific to it. <p>
     <td>&nbsp;</td>
   </tr>
 
-  <tr><a name="GT">
-    <td><tt>-GT</tt></td>
-
-    <td>Generate explicit template instantiations</td>
-    <td>&nbsp;</td>
-  </tr>
-
   <tr><a name="GA">
     <td><tt>-GA</tt></td>
 
-    <td>Generate type code and Any operator bodies in *A.cpp</td>
+    <td>Generate type codes and Any operators in *A.h and *A.cpp</td>
     <td>Decouples client and server decisions to compile and link
         TypeCode- and Any-related code, which is generated in
-        *C.cpp by default.</td>
+        *C.h and *C.cpp by default.</td>
   </tr>
 
   <tr><a name="Guc">
diff --git a/TAO/docs/releasenotes/index.html b/TAO/docs/releasenotes/index.html
index a6fd3d6d222..2d16285fc0b 100644
--- a/TAO/docs/releasenotes/index.html
+++ b/TAO/docs/releasenotes/index.html
@@ -279,7 +279,7 @@ WFMO_Reactor_Test, Timer_Cancellation_Test</ul>
 <h3>
 <a NAME="idl"></a>IDL Compiler</h3>
 Point of contact: <a href="mailto:j.parsons@vanderbilt.edu">Jeff Parsons</a>
-<p>Current status: (As of October 25, 2004.)
+<p>Current status: (As of August 10, 2005.)
 <ul>
 <li>
 Generated code closely follows the C++ Mapping specified in the latest
@@ -643,6 +643,19 @@ if it does not already exist. Only one level of directory can be created
 with this option (any path prefix included must already exist).
 If the specified directory already exists, no action is taken.
 </li>
+
+<li>
+As part of the subsetting in TAO of Anys and TypeCodes, the generation of
+these things in the IDL compiler has been further decoupled from other
+code generation. Now the -GA option generates not only a *A.cpp file but
+also a *A.h file, and in addition, the -oA option will create these files
+in a directory different from that where the other generated files are
+created.</li>
+
+<li>
+Generation of explicit template instantiations has been completely 
+removed, it is no longer available via the command line option -GT.</li>
+
 </ul>
 
 <h4>
diff --git a/TAO/examples/Buffered_AMI/client.cpp b/TAO/examples/Buffered_AMI/client.cpp
index d28b3a8b7e5..9a7a9729136 100644
--- a/TAO/examples/Buffered_AMI/client.cpp
+++ b/TAO/examples/Buffered_AMI/client.cpp
@@ -15,7 +15,8 @@
 
 #include "testS.h"
 #include "tao/Messaging/Messaging.h"
-#include "tao/TAOC.h"
+#include "tao/AnyTypeCode/Any.h"
+#include "tao/AnyTypeCode/TAOA.h"
 #include "ace/Get_Opt.h"
 #include "ace/Read_Buffer.h"
 
diff --git a/TAO/examples/Buffered_Oneways/client.cpp b/TAO/examples/Buffered_Oneways/client.cpp
index dbf4cf89c7f..7851ec8638e 100644
--- a/TAO/examples/Buffered_Oneways/client.cpp
+++ b/TAO/examples/Buffered_Oneways/client.cpp
@@ -15,7 +15,8 @@
 
 #include "testC.h"
 #include "tao/Messaging/Messaging.h"
-#include "tao/TAOC.h"
+#include "tao/AnyTypeCode/Any.h"
+#include "tao/AnyTypeCode/TAOA.h"
 #include "ace/Get_Opt.h"
 #include "ace/Read_Buffer.h"
 
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduling.idl b/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduling.idl
new file mode 100644
index 00000000000..a4f15a0da55
--- /dev/null
+++ b/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduling.idl
@@ -0,0 +1,35 @@
+// $Id$
+
+/**
+ * @file EDF_Scheduling.pidl
+ *
+ * EDF_Scheduling.pidl,v 1.2 2003/10/08 13:26:32 venkita Exp
+ *
+ */
+
+#include "tao/RTScheduling/RTScheduler_include.pidl"
+#include "tao/RTCORBA/RTCORBA_include.pidl"
+
+module EDF_Scheduling
+{
+  struct SchedulingParameter
+  {
+    TimeBase::TimeT deadline;
+    long importance;
+    TimeBase::TimeT period;
+    long task_id;
+  };
+
+  local interface SchedulingParameterPolicy
+  : CORBA::Policy
+  {
+    attribute SchedulingParameter value;
+  };
+
+  local interface Scheduler : RTScheduling::Scheduler
+  {
+    SchedulingParameterPolicy
+      create_scheduling_parameter
+        (in SchedulingParameter value);
+  };
+};
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduling.pidl b/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduling.pidl
deleted file mode 100644
index 4a21e9eaefb..00000000000
--- a/TAO/examples/Kokyu_dsrt_schedulers/EDF_Scheduling.pidl
+++ /dev/null
@@ -1,64 +0,0 @@
-// $Id$
-
-/**
- * @file EDF_Scheduling.pidl
- *
- * EDF_Scheduling.pidl,v 1.2 2003/10/08 13:26:32 venkita Exp
- *
- * @brief Pre-compiled IDL source to help with the service context
- *        propagation of dynamic scheduling parameters using Kokyu
- *
- *   This file was used to generate the code in EDF_SchedulingC.{h,i,cpp}.
- *   The steps to regenerate the code are as follows:
- *
- *   1. Run the tao_idl compiler on the pidl file.  The command used for
- *   this is:
- *
- *     tao_idl -I $TAO_ROOT -Ge 1 
- *             -Wb,export_macro=Kokyu_DSRT_Schedulers_Export 
- *             -Wb,export_include=Kokyu_dsrt_schedulers_export.h
- *
- *
- *   2. Then apply the patches in EDF_SchedulingC.h.diff to the generated code.
- *   The patch will replace the inclusion of RTCORBAC.h and RTSchedulerC.h 
- *   with RTCORBA.h and RTScheduler.h respectively.
- *
- * Apply patches using the following command:
- *
- *   patch < EDF_SchedulingC.h.diff
- *
- * Note: The diff was generated in the following way:
- *
- *   Run the idl compiler as in step 1.
- *   cp EDF_SchedulingC.h EDF_SchedulingC.h.orig
- *   Modify EDF_SchedulingC.h with changes described in step 2.
- *   diff -wBbu EDF_SchedulingC.h.orig EDF_SchedulingC.h > EDF_SchedulingC.h.diff
- *
- */
-
-#include "tao/RTScheduling/RTScheduler.pidl"
-#include "tao/RTCORBA/RTCORBA.pidl"
-
-module EDF_Scheduling
-{
-  struct SchedulingParameter
-  {
-    TimeBase::TimeT deadline;
-    long importance;
-    TimeBase::TimeT period;
-    long task_id;
-  };
-
-  local interface SchedulingParameterPolicy
-  : CORBA::Policy
-  {
-    attribute SchedulingParameter value;
-  };
-
-  local interface Scheduler : RTScheduling::Scheduler
-  {
-    SchedulingParameterPolicy
-      create_scheduling_parameter
-        (in SchedulingParameter value);
-  };
-};
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/EDF_SchedulingC.cpp b/TAO/examples/Kokyu_dsrt_schedulers/EDF_SchedulingC.cpp
deleted file mode 100644
index 2cd35ecae10..00000000000
--- a/TAO/examples/Kokyu_dsrt_schedulers/EDF_SchedulingC.cpp
+++ /dev/null
@@ -1,699 +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:302
-
-
-#include "EDF_SchedulingC.h"
-#include "tao/TypeCode.h"
-#include "tao/Any_Impl_T.h"
-#include "tao/Any_Dual_Impl_T.h"
-#include "ace/OS_NS_string.h"
-
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
-#if !defined (__ACE_INLINE__)
-#include "EDF_SchedulingC.i"
-#endif /* !defined INLINE */
-
-// TAO_IDL - Generated from
-// be/be_visitor_arg_traits.cpp:60
-
-// Arg traits specializations.
-namespace TAO
-{
-};
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
-
-static const CORBA::Long _oc_EDF_Scheduling_SchedulingParameter[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  43,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x4544465f),
-  ACE_NTOHL (0x53636865),
-  ACE_NTOHL (0x64756c69),
-  ACE_NTOHL (0x6e672f53),
-  ACE_NTOHL (0x63686564),
-  ACE_NTOHL (0x756c696e),
-  ACE_NTOHL (0x67506172),
-  ACE_NTOHL (0x616d6574),
-  ACE_NTOHL (0x65723a31),
-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:EDF_Scheduling/SchedulingParameter:1.0
-    20,
-  ACE_NTOHL (0x53636865),
-  ACE_NTOHL (0x64756c69),
-  ACE_NTOHL (0x6e675061),
-  ACE_NTOHL (0x72616d65),
-  ACE_NTOHL (0x74657200),  // name = SchedulingParameter
-  4, // member count
-    9,
-  ACE_NTOHL (0x64656164),
-  ACE_NTOHL (0x6c696e65),
-  ACE_NTOHL (0x0),  // name = deadline
-    CORBA::tk_alias, // typecode kind for typedefs
-  56, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    31,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x54696d65),
-    ACE_NTOHL (0x42617365),
-    ACE_NTOHL (0x2f54696d),
-    ACE_NTOHL (0x65543a31),
-    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/TimeBase/TimeT:1.0
-        6,
-    ACE_NTOHL (0x54696d65),
-    ACE_NTOHL (0x54000000),  // name = TimeT
-        CORBA::tk_ulonglong,
-
-
-  11,
-  ACE_NTOHL (0x696d706f),
-  ACE_NTOHL (0x7274616e),
-  ACE_NTOHL (0x63650000),  // name = importance
-    CORBA::tk_long,
-
-  7,
-  ACE_NTOHL (0x70657269),
-  ACE_NTOHL (0x6f640000),  // name = period
-    CORBA::tk_alias, // typecode kind for typedefs
-  56, // encapsulation length
-    TAO_ENCAP_BYTE_ORDER, // byte order
-    31,
-    ACE_NTOHL (0x49444c3a),
-    ACE_NTOHL (0x6f6d672e),
-    ACE_NTOHL (0x6f72672f),
-    ACE_NTOHL (0x54696d65),
-    ACE_NTOHL (0x42617365),
-    ACE_NTOHL (0x2f54696d),
-    ACE_NTOHL (0x65543a31),
-    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/TimeBase/TimeT:1.0
-        6,
-    ACE_NTOHL (0x54696d65),
-    ACE_NTOHL (0x54000000),  // name = TimeT
-        CORBA::tk_ulonglong,
-
-
-  8,
-  ACE_NTOHL (0x7461736b),
-  ACE_NTOHL (0x5f696400),  // name = task_id
-    CORBA::tk_long,
-
-};
-
-static CORBA::TypeCode _tc_TAO_tc_EDF_Scheduling_SchedulingParameter (
-    CORBA::tk_struct,
-    sizeof (_oc_EDF_Scheduling_SchedulingParameter),
-    (char *) &_oc_EDF_Scheduling_SchedulingParameter,
-    0,
-    sizeof (EDF_Scheduling::SchedulingParameter)
-  );
-
-namespace EDF_Scheduling
-{
-  ::CORBA::TypeCode_ptr _tc_SchedulingParameter =
-    &_tc_TAO_tc_EDF_Scheduling_SchedulingParameter;
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_structure/structure_cs.cpp:66
-
-void
-EDF_Scheduling::SchedulingParameter::_tao_any_destructor (
-    void *_tao_void_pointer
-  )
-{
-  SchedulingParameter *_tao_tmp_pointer =
-    static_cast<SchedulingParameter *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for EDF_Scheduling::SchedulingParameterPolicy.
-
-ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
-EDF_Scheduling::SchedulingParameterPolicy_ptr
-TAO::Objref_Traits<EDF_Scheduling::SchedulingParameterPolicy>::tao_duplicate (
-    EDF_Scheduling::SchedulingParameterPolicy_ptr p
-  )
-{
-  return EDF_Scheduling::SchedulingParameterPolicy::_duplicate (p);
-}
-
-ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
-void
-TAO::Objref_Traits<EDF_Scheduling::SchedulingParameterPolicy>::tao_release (
-    EDF_Scheduling::SchedulingParameterPolicy_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
-EDF_Scheduling::SchedulingParameterPolicy_ptr
-TAO::Objref_Traits<EDF_Scheduling::SchedulingParameterPolicy>::tao_nil (void)
-{
-  return EDF_Scheduling::SchedulingParameterPolicy::_nil ();
-}
-
-ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
-CORBA::Boolean
-TAO::Objref_Traits<EDF_Scheduling::SchedulingParameterPolicy>::tao_marshal (
-    EDF_Scheduling::SchedulingParameterPolicy_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return p->marshal (cdr);
-}
-
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker *
-(*EDF_Scheduling__TAO_SchedulingParameterPolicy_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
-EDF_Scheduling::SchedulingParameterPolicy::SchedulingParameterPolicy (void)
-{}
-
-EDF_Scheduling::SchedulingParameterPolicy::~SchedulingParameterPolicy (void)
-{}
-
-void
-EDF_Scheduling::SchedulingParameterPolicy::_tao_any_destructor (void *_tao_void_pointer)
-{
-  SchedulingParameterPolicy *_tao_tmp_pointer =
-    static_cast<SchedulingParameterPolicy *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-EDF_Scheduling::SchedulingParameterPolicy_ptr
-EDF_Scheduling::SchedulingParameterPolicy::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return SchedulingParameterPolicy::_nil ();
-    }
- 
-  SchedulingParameterPolicy_ptr proxy =
-    dynamic_cast<SchedulingParameterPolicy_ptr> (_tao_objref);
- 
-  return SchedulingParameterPolicy::_duplicate (proxy);
-}
-
-EDF_Scheduling::SchedulingParameterPolicy_ptr
-EDF_Scheduling::SchedulingParameterPolicy::_duplicate (SchedulingParameterPolicy_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
- 
-  return obj;
-}
-
-CORBA::Boolean
-EDF_Scheduling::SchedulingParameterPolicy::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          (char *)value,
-          "IDL:omg.org/CORBA/Policy:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          (char *)value,
-          "IDL:EDF_Scheduling/SchedulingParameterPolicy:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          (char *)value,
-          "IDL:omg.org/CORBA/LocalObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          (char *)value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-     )
-    {
-      return 1; // success using local knowledge
-    }
-  else
-    {
-      return 0;
-    }
-}
-
-const char* EDF_Scheduling::SchedulingParameterPolicy::_interface_repository_id (void) const
-{
-  return "IDL:EDF_Scheduling/SchedulingParameterPolicy:1.0";
-}
-
-CORBA::Boolean
-EDF_Scheduling::SchedulingParameterPolicy::marshal (TAO_OutputCDR &)
-{
-  return 0;
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
-
-static const CORBA::Long _oc_EDF_Scheduling_SchedulingParameterPolicy[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  49,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x4544465f),
-  ACE_NTOHL (0x53636865),
-  ACE_NTOHL (0x64756c69),
-  ACE_NTOHL (0x6e672f53),
-  ACE_NTOHL (0x63686564),
-  ACE_NTOHL (0x756c696e),
-  ACE_NTOHL (0x67506172),
-  ACE_NTOHL (0x616d6574),
-  ACE_NTOHL (0x6572506f),
-  ACE_NTOHL (0x6c696379),
-  ACE_NTOHL (0x3a312e30),
-  ACE_NTOHL (0x0),  // repository ID = IDL:EDF_Scheduling/SchedulingParameterPolicy:1.0
-    26,
-  ACE_NTOHL (0x53636865),
-  ACE_NTOHL (0x64756c69),
-  ACE_NTOHL (0x6e675061),
-  ACE_NTOHL (0x72616d65),
-  ACE_NTOHL (0x74657250),
-  ACE_NTOHL (0x6f6c6963),
-  ACE_NTOHL (0x79000000),  // name = SchedulingParameterPolicy
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_EDF_Scheduling_SchedulingParameterPolicy (
-    CORBA::tk_objref,
-    sizeof (_oc_EDF_Scheduling_SchedulingParameterPolicy),
-    (char *) &_oc_EDF_Scheduling_SchedulingParameterPolicy,
-    0,
-    sizeof (EDF_Scheduling::SchedulingParameterPolicy)
-  );
-
-namespace EDF_Scheduling
-{
-  ::CORBA::TypeCode_ptr _tc_SchedulingParameterPolicy =
-    &_tc_TAO_tc_EDF_Scheduling_SchedulingParameterPolicy;
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/interface_cs.cpp:60
-
-// Traits specializations for EDF_Scheduling::Scheduler.
-
-ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
-EDF_Scheduling::Scheduler_ptr
-TAO::Objref_Traits<EDF_Scheduling::Scheduler>::tao_duplicate (
-    EDF_Scheduling::Scheduler_ptr p
-  )
-{
-  return EDF_Scheduling::Scheduler::_duplicate (p);
-}
-
-ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
-void
-TAO::Objref_Traits<EDF_Scheduling::Scheduler>::tao_release (
-    EDF_Scheduling::Scheduler_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
-EDF_Scheduling::Scheduler_ptr
-TAO::Objref_Traits<EDF_Scheduling::Scheduler>::tao_nil (void)
-{
-  return EDF_Scheduling::Scheduler::_nil ();
-}
-
-ACE_TEMPLATE_CLASS_MEMBER_SPECIALIZATION
-CORBA::Boolean
-TAO::Objref_Traits<EDF_Scheduling::Scheduler>::tao_marshal (
-    EDF_Scheduling::Scheduler_ptr p,
-    TAO_OutputCDR & cdr
-  )
-{
-  return p->marshal (cdr);
-}
-
-// Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker *
-(*EDF_Scheduling__TAO_Scheduler_Proxy_Broker_Factory_function_pointer) (
-    CORBA::Object_ptr obj
-  ) = 0;
-
-EDF_Scheduling::Scheduler::Scheduler (void)
-{}
-
-EDF_Scheduling::Scheduler::~Scheduler (void)
-{}
-
-void
-EDF_Scheduling::Scheduler::_tao_any_destructor (void *_tao_void_pointer)
-{
-  Scheduler *_tao_tmp_pointer =
-    static_cast<Scheduler *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
-EDF_Scheduling::Scheduler_ptr
-EDF_Scheduling::Scheduler::_narrow (
-    CORBA::Object_ptr _tao_objref
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (CORBA::is_nil (_tao_objref))
-    {
-      return Scheduler::_nil ();
-    }
- 
-  Scheduler_ptr proxy =
-    dynamic_cast<Scheduler_ptr> (_tao_objref);
- 
-  return Scheduler::_duplicate (proxy);
-}
-
-EDF_Scheduling::Scheduler_ptr
-EDF_Scheduling::Scheduler::_duplicate (Scheduler_ptr obj)
-{
-  if (! CORBA::is_nil (obj))
-    {
-      obj->_add_ref ();
-    }
- 
-  return obj;
-}
-
-CORBA::Boolean
-EDF_Scheduling::Scheduler::_is_a (
-    const char *value
-    ACE_ENV_ARG_DECL_NOT_USED
-  )
-{
-  if (
-      !ACE_OS::strcmp (
-          (char *)value,
-          "IDL:RTScheduling/Scheduler:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          (char *)value,
-          "IDL:EDF_Scheduling/Scheduler:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          (char *)value,
-          "IDL:omg.org/CORBA/LocalObject:1.0"
-        ) ||
-      !ACE_OS::strcmp (
-          (char *)value,
-          "IDL:omg.org/CORBA/Object:1.0"
-        )
-     )
-    {
-      return 1; // success using local knowledge
-    }
-  else
-    {
-      return 0;
-    }
-}
-
-const char* EDF_Scheduling::Scheduler::_interface_repository_id (void) const
-{
-  return "IDL:EDF_Scheduling/Scheduler:1.0";
-}
-
-CORBA::Boolean
-EDF_Scheduling::Scheduler::marshal (TAO_OutputCDR &)
-{
-  return 0;
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:284
-
-static const CORBA::Long _oc_EDF_Scheduling_Scheduler[] =
-{
-    TAO_ENCAP_BYTE_ORDER, // byte order
-  33,
-  ACE_NTOHL (0x49444c3a),
-  ACE_NTOHL (0x4544465f),
-  ACE_NTOHL (0x53636865),
-  ACE_NTOHL (0x64756c69),
-  ACE_NTOHL (0x6e672f53),
-  ACE_NTOHL (0x63686564),
-  ACE_NTOHL (0x756c6572),
-  ACE_NTOHL (0x3a312e30),
-  ACE_NTOHL (0x0),  // repository ID = IDL:EDF_Scheduling/Scheduler:1.0
-    10,
-  ACE_NTOHL (0x53636865),
-  ACE_NTOHL (0x64756c65),
-  ACE_NTOHL (0x72000000),  // name = Scheduler
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_EDF_Scheduling_Scheduler (
-    CORBA::tk_objref,
-    sizeof (_oc_EDF_Scheduling_Scheduler),
-    (char *) &_oc_EDF_Scheduling_Scheduler,
-    0,
-    sizeof (EDF_Scheduling::Scheduler)
-  );
-
-namespace EDF_Scheduling
-{
-  ::CORBA::TypeCode_ptr _tc_Scheduler =
-    &_tc_TAO_tc_EDF_Scheduling_Scheduler;
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const EDF_Scheduling::SchedulingParameter &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<EDF_Scheduling::SchedulingParameter>::insert_copy (
-      _tao_any,
-      EDF_Scheduling::SchedulingParameter::_tao_any_destructor,
-      EDF_Scheduling::_tc_SchedulingParameter,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    EDF_Scheduling::SchedulingParameter *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<EDF_Scheduling::SchedulingParameter>::insert (
-      _tao_any,
-      EDF_Scheduling::SchedulingParameter::_tao_any_destructor,
-      EDF_Scheduling::_tc_SchedulingParameter,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    EDF_Scheduling::SchedulingParameter *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<const EDF_Scheduling::SchedulingParameter *&> (_tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const EDF_Scheduling::SchedulingParameter *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<EDF_Scheduling::SchedulingParameter>::extract (
-        _tao_any,
-        EDF_Scheduling::SchedulingParameter::_tao_any_destructor,
-        EDF_Scheduling::_tc_SchedulingParameter,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Impl_T<EDF_Scheduling::SchedulingParameterPolicy>::to_object (
-    CORBA::Object_ptr &_tao_elem
-  ) const
-{
-  _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
-}
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Impl_T<EDF_Scheduling::SchedulingParameterPolicy>::marshal_value (TAO_OutputCDR &)
-{
-  return 0;
-}
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Impl_T<EDF_Scheduling::SchedulingParameterPolicy>::demarshal_value (TAO_InputCDR &)
-{
-  return 0;
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    EDF_Scheduling::SchedulingParameterPolicy_ptr _tao_elem
-  )
-{
-  EDF_Scheduling::SchedulingParameterPolicy_ptr _tao_objptr =
-    EDF_Scheduling::SchedulingParameterPolicy::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    EDF_Scheduling::SchedulingParameterPolicy_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<EDF_Scheduling::SchedulingParameterPolicy>::insert (
-      _tao_any,
-      EDF_Scheduling::SchedulingParameterPolicy::_tao_any_destructor,
-      EDF_Scheduling::_tc_SchedulingParameterPolicy,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    EDF_Scheduling::SchedulingParameterPolicy_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<EDF_Scheduling::SchedulingParameterPolicy>::extract (
-        _tao_any,
-        EDF_Scheduling::SchedulingParameterPolicy::_tao_any_destructor,
-        EDF_Scheduling::_tc_SchedulingParameterPolicy,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Impl_T<EDF_Scheduling::Scheduler>::to_object (
-    CORBA::Object_ptr &_tao_elem
-  ) const
-{
-  _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
-}
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Impl_T<EDF_Scheduling::Scheduler>::marshal_value (TAO_OutputCDR &)
-{
-  return 0;
-}
-
-ACE_TEMPLATE_SPECIALIZATION
-CORBA::Boolean
-TAO::Any_Impl_T<EDF_Scheduling::Scheduler>::demarshal_value (TAO_InputCDR &)
-{
-  return 0;
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    EDF_Scheduling::Scheduler_ptr _tao_elem
-  )
-{
-  EDF_Scheduling::Scheduler_ptr _tao_objptr =
-    EDF_Scheduling::Scheduler::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    EDF_Scheduling::Scheduler_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<EDF_Scheduling::Scheduler>::insert (
-      _tao_any,
-      EDF_Scheduling::Scheduler::_tao_any_destructor,
-      EDF_Scheduling::_tc_Scheduler,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    EDF_Scheduling::Scheduler_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<EDF_Scheduling::Scheduler>::extract (
-        _tao_any,
-        EDF_Scheduling::Scheduler::_tao_any_destructor,
-        EDF_Scheduling::_tc_Scheduler,
-        _tao_elem
-      );
-}
-
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/EDF_SchedulingC.h b/TAO/examples/Kokyu_dsrt_schedulers/EDF_SchedulingC.h
deleted file mode 100644
index 22aa36f8af1..00000000000
--- a/TAO/examples/Kokyu_dsrt_schedulers/EDF_SchedulingC.h
+++ /dev/null
@@ -1,427 +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:150
-
-#ifndef _TAO_IDL_EDF_SCHEDULINGC_H_
-#define _TAO_IDL_EDF_SCHEDULINGC_H_
-
-#include "tao/ORB.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "Kokyu_dsrt_schedulers_export.h"
-#include "tao/CDR.h"
-#include "tao/Environment.h"
-#include "tao/Object.h"
-#include "tao/Objref_VarOut_T.h"
-#include "tao/VarOut_T.h"
-
-#include "tao/RTScheduling/RTScheduler.h"
-#include "tao/RTCORBA/RTCORBA.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO Kokyu_DSRT_Schedulers_Export
-
-#if defined (TAO_EXPORT_NESTED_CLASSES)
-#  if defined (TAO_EXPORT_NESTED_MACRO)
-#    undef TAO_EXPORT_NESTED_MACRO
-#  endif /* defined (TAO_EXPORT_NESTED_MACRO) */
-#  define TAO_EXPORT_NESTED_MACRO Kokyu_DSRT_Schedulers_Export
-#endif /* TAO_EXPORT_NESTED_CLASSES */
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be/be_visitor_root/root_ch.cpp:63
-
-namespace TAO
-{
-  class Collocation_Proxy_Broker;
-
-  template<typename T> class Narrow_Utils;
-  template<typename T> class AbstractBase_Narrow_Utils;
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_module/module_ch.cpp:48
-
-namespace EDF_Scheduling
-{
-
-  // TAO_IDL - Generated from
-  // be/be_type.cpp:258
-
-  struct SchedulingParameter;
-
-  typedef
-    TAO_Fixed_Var_T<
-        SchedulingParameter
-      >
-    SchedulingParameter_var;
-
-  typedef
-    SchedulingParameter &
-    SchedulingParameter_out;
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_structure/structure_ch.cpp:52
-
-  struct Kokyu_DSRT_Schedulers_Export SchedulingParameter
-  {
-    typedef SchedulingParameter_var _var_type;
-
-    static void _tao_any_destructor (void *);
-    TimeBase::TimeT deadline;
-    CORBA::Long importance;
-    TimeBase::TimeT period;
-    CORBA::Long task_id;
-  };
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_SchedulingParameter;
-
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:612
-
-#if !defined (_EDF_SCHEDULING_SCHEDULINGPARAMETERPOLICY__VAR_OUT_CH_)
-#define _EDF_SCHEDULING_SCHEDULINGPARAMETERPOLICY__VAR_OUT_CH_
-
-  class SchedulingParameterPolicy;
-  typedef SchedulingParameterPolicy *SchedulingParameterPolicy_ptr;
-
-  typedef
-    TAO_Objref_Var_T<
-        SchedulingParameterPolicy
-      >
-    SchedulingParameterPolicy_var;
-
-  typedef
-    TAO_Objref_Out_T<
-        SchedulingParameterPolicy
-      >
-    SchedulingParameterPolicy_out;
-
-#endif /* end #if !defined */
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_EDF_SCHEDULING_SCHEDULINGPARAMETERPOLICY_CH_)
-#define _EDF_SCHEDULING_SCHEDULINGPARAMETERPOLICY_CH_
-
-  class Kokyu_DSRT_Schedulers_Export SchedulingParameterPolicy
-    : public virtual CORBA::Policy
-  {
-  public:
-    typedef SchedulingParameterPolicy_ptr _ptr_type;
-    typedef SchedulingParameterPolicy_var _var_type;
-
-    // The static operations.
-    static SchedulingParameterPolicy_ptr _duplicate (SchedulingParameterPolicy_ptr obj);
-
-    static SchedulingParameterPolicy_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
-    static SchedulingParameterPolicy_ptr _nil (void)
-    {
-      return (SchedulingParameterPolicy_ptr)0;
-    }
-
-    static void _tao_any_destructor (void *);
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
-    virtual ::EDF_Scheduling::SchedulingParameter 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 void value (
-        const EDF_Scheduling::SchedulingParameter & value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_ch.cpp:192
-
-    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.
-    SchedulingParameterPolicy (void);
-
-    virtual ~SchedulingParameterPolicy (void);
-
-  private:
-    // Private and unimplemented for concrete interfaces.
-    SchedulingParameterPolicy (const SchedulingParameterPolicy &);
-
-    void operator= (const SchedulingParameterPolicy &);
-  };
-
-#endif /* end #if !defined */
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_SchedulingParameterPolicy;
-
-  // TAO_IDL - Generated from
-  // be/be_interface.cpp:612
-
-#if !defined (_EDF_SCHEDULING_SCHEDULER__VAR_OUT_CH_)
-#define _EDF_SCHEDULING_SCHEDULER__VAR_OUT_CH_
-
-  class Scheduler;
-  typedef Scheduler *Scheduler_ptr;
-
-  typedef
-    TAO_Objref_Var_T<
-        Scheduler
-      >
-    Scheduler_var;
-
-  typedef
-    TAO_Objref_Out_T<
-        Scheduler
-      >
-    Scheduler_out;
-
-#endif /* end #if !defined */
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_ch.cpp:54
-
-#if !defined (_EDF_SCHEDULING_SCHEDULER_CH_)
-#define _EDF_SCHEDULING_SCHEDULER_CH_
-
-  class Kokyu_DSRT_Schedulers_Export Scheduler
-    : public virtual RTScheduling::Scheduler
-  {
-  public:
-    typedef Scheduler_ptr _ptr_type;
-    typedef Scheduler_var _var_type;
-
-    // The static operations.
-    static Scheduler_ptr _duplicate (Scheduler_ptr obj);
-
-    static Scheduler_ptr _narrow (
-        CORBA::Object_ptr obj
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      );
-
-    static Scheduler_ptr _nil (void)
-    {
-      return (Scheduler_ptr)0;
-    }
-
-    static void _tao_any_destructor (void *);
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_ch.cpp:46
-
-    virtual ::EDF_Scheduling::SchedulingParameterPolicy_ptr create_scheduling_parameter (
-        const EDF_Scheduling::SchedulingParameter & value
-        ACE_ENV_ARG_DECL_WITH_DEFAULTS
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    // TAO_IDL - Generated from
-    // be/be_visitor_interface/interface_ch.cpp:192
-
-    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.
-    Scheduler (void);
-
-    virtual ~Scheduler (void);
-
-  private:
-    // Private and unimplemented for concrete interfaces.
-    Scheduler (const Scheduler &);
-
-    void operator= (const Scheduler &);
-  };
-
-#endif /* end #if !defined */
-
-  // TAO_IDL - Generated from
-  // be/be_visitor_typecode/typecode_decl.cpp:44
-
-  TAO_NAMESPACE_STORAGE_CLASS ::CORBA::TypeCode_ptr _tc_Scheduler;
-
-// TAO_IDL - Generated from
-// be/be_visitor_module/module_ch.cpp:66
-
-} // module EDF_Scheduling
-
-// TAO_IDL - Generated from
-// be/be_visitor_traits.cpp:50
-
-// Traits specializations.
-namespace TAO
-{
-
-#if !defined (_EDF_SCHEDULING_SCHEDULINGPARAMETERPOLICY__TRAITS_CH_)
-#define _EDF_SCHEDULING_SCHEDULINGPARAMETERPOLICY__TRAITS_CH_
-
-  ACE_TEMPLATE_SPECIALIZATION
-  struct Kokyu_DSRT_Schedulers_Export Objref_Traits<EDF_Scheduling::SchedulingParameterPolicy>
-  {
-    static EDF_Scheduling::SchedulingParameterPolicy_ptr tao_duplicate (
-        EDF_Scheduling::SchedulingParameterPolicy_ptr
-      );
-    static void tao_release (
-        EDF_Scheduling::SchedulingParameterPolicy_ptr
-      );
-    static EDF_Scheduling::SchedulingParameterPolicy_ptr tao_nil (void);
-    static CORBA::Boolean tao_marshal (
-        EDF_Scheduling::SchedulingParameterPolicy_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_EDF_SCHEDULING_SCHEDULER__TRAITS_CH_)
-#define _EDF_SCHEDULING_SCHEDULER__TRAITS_CH_
-
-  ACE_TEMPLATE_SPECIALIZATION
-  struct Kokyu_DSRT_Schedulers_Export Objref_Traits<EDF_Scheduling::Scheduler>
-  {
-    static EDF_Scheduling::Scheduler_ptr tao_duplicate (
-        EDF_Scheduling::Scheduler_ptr
-      );
-    static void tao_release (
-        EDF_Scheduling::Scheduler_ptr
-      );
-    static EDF_Scheduling::Scheduler_ptr tao_nil (void);
-    static CORBA::Boolean tao_marshal (
-        EDF_Scheduling::Scheduler_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-};
-
-// TAO_IDL - Generated from
-// be/be_visitor_structure/any_op_ch.cpp:52
-
-Kokyu_DSRT_Schedulers_Export void operator<<= (CORBA::Any &, const EDF_Scheduling::SchedulingParameter &); // copying version
-Kokyu_DSRT_Schedulers_Export void operator<<= (CORBA::Any &, EDF_Scheduling::SchedulingParameter*); // noncopying version
-Kokyu_DSRT_Schedulers_Export CORBA::Boolean operator>>= (const CORBA::Any &, EDF_Scheduling::SchedulingParameter *&); // deprecated
-Kokyu_DSRT_Schedulers_Export CORBA::Boolean operator>>= (const CORBA::Any &, const EDF_Scheduling::SchedulingParameter *&);
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_ch.cpp:52
-
-Kokyu_DSRT_Schedulers_Export void operator<<= (CORBA::Any &, EDF_Scheduling::SchedulingParameterPolicy_ptr); // copying
-Kokyu_DSRT_Schedulers_Export void operator<<= (CORBA::Any &, EDF_Scheduling::SchedulingParameterPolicy_ptr *); // non-copying
-Kokyu_DSRT_Schedulers_Export CORBA::Boolean operator>>= (const CORBA::Any &, EDF_Scheduling::SchedulingParameterPolicy_ptr &);
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_ch.cpp:52
-
-Kokyu_DSRT_Schedulers_Export void operator<<= (CORBA::Any &, EDF_Scheduling::Scheduler_ptr); // copying
-Kokyu_DSRT_Schedulers_Export void operator<<= (CORBA::Any &, EDF_Scheduling::Scheduler_ptr *); // non-copying
-Kokyu_DSRT_Schedulers_Export CORBA::Boolean operator>>= (const CORBA::Any &, EDF_Scheduling::Scheduler_ptr &);
-
-// TAO_IDL - Generated from
-// be/be_visitor_root/cdr_op.cpp:48
-
-#ifndef __ACE_INLINE__
-
-// TAO_IDL - Generated from
-// be/be_visitor_structure/cdr_op_ch.cpp:53
-
-Kokyu_DSRT_Schedulers_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const EDF_Scheduling::SchedulingParameter &);
-Kokyu_DSRT_Schedulers_Export CORBA::Boolean operator>> (TAO_InputCDR &, EDF_Scheduling::SchedulingParameter &);
-
-// TAO_IDL - Generated from
-// be/be_visitor_root/cdr_op.cpp:64
-
-#endif /* __ACE_INLINE__ */
-
-// TAO_IDL - Generated from
-// be/be_codegen.cpp:911
-
-#if defined (__ACE_INLINE__)
-#include "EDF_SchedulingC.i"
-#endif /* defined INLINE */
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#endif /* ifndef */
-
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/EDF_SchedulingC.h.diff b/TAO/examples/Kokyu_dsrt_schedulers/EDF_SchedulingC.h.diff
deleted file mode 100644
index d1505d6d604..00000000000
--- a/TAO/examples/Kokyu_dsrt_schedulers/EDF_SchedulingC.h.diff
+++ /dev/null
@@ -1,13 +0,0 @@
---- EDF_SchedulingC.h.orig	2003-12-04 00:55:30.000000000 -0600
-+++ EDF_SchedulingC.h	2003-12-04 00:55:53.000000000 -0600
-@@ -44,8 +44,8 @@
- #include "tao/Objref_VarOut_T.h"
- #include "tao/VarOut_T.h"
- 
--#include "tao/RTScheduling/RTSchedulerC.h"
--#include "tao/RTCORBA/RTCORBAC.h"
-+#include "tao/RTScheduling/RTScheduler.h"
-+#include "tao/RTCORBA/RTCORBA.h"
- 
- #if defined (TAO_EXPORT_MACRO)
- #undef TAO_EXPORT_MACRO
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduling.idl b/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduling.idl
index 61e89c4898f..63c8b9df08d 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduling.idl
+++ b/TAO/examples/Kokyu_dsrt_schedulers/FP_Scheduling.idl
@@ -5,35 +5,6 @@
  *
  * $Id$
  *
- * @brief Pre-compiled IDL source to help with the service context
- *        propagation of dynamic scheduling parameters using Kokyu
- *
- *   This file was used to generate the code in FP_SchedulingC.{h,i,cpp}.
- *   The steps to regenerate the code are as follows:
- *
- *   1. Run the tao_idl compiler on the pidl file.  The command used for
- *   this is:
- *
- *     tao_idl -I $TAO_ROOT -Ge 1
- *             -Wb,export_macro=Kokyu_DSRT_Schedulers_Export
- *             -Wb,export_include=Kokyu_dsrt_schedulers_export.h
- *
- *
- *   2. Then apply the patches in FP_SchedulingC.h.diff to the generated code.
- *   The patch will replace the inclusion of RTCORBAC.h and RTSchedulerC.h
- *   with RTCORBA.h and RTScheduler.h respectively.
- *
- * Apply patches using the following command:
- *
- *   patch < FP_SchedulingC.h.diff
- *
- * Note: The diff was generated in the following way:
- *
- *   Run the idl compiler as in step 1.
- *   cp FP_SchedulingC.h FP_SchedulingC.h.orig
- *   Modify FP_SchedulingC.h with changes described in step 2.
- *   diff -wBbu FP_SchedulingC.h.orig FP_SchedulingC.h > FP_SchedulingC.h.diff
- *
  */
 
 #include "tao/RTScheduling/RTScheduler_include.pidl"
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/Kokyu_qos.idl b/TAO/examples/Kokyu_dsrt_schedulers/Kokyu_qos.idl
index 4001a937823..5fd02be2704 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/Kokyu_qos.idl
+++ b/TAO/examples/Kokyu_dsrt_schedulers/Kokyu_qos.idl
@@ -4,32 +4,6 @@
  *
  * $Id$
  *
- * @brief Pre-compiled IDL source to help with the service context
- *        propagation of dynamic scheduling parameters using Kokyu
- *
- *   This file was used to generate the code in Kokyu_qosC.{h,i,cpp}.
- *   The steps to regenerate the code are as follows:
- *
- *   1. Run the tao_idl compiler on the pidl file.  The command used for
- *   this is:
- *
- *     tao_idl -I $TAO_ROOT -Ge 1 Kokyu_qos.pidl
- *
- *   2. Then apply the patches in Kokyu_qosC.h.diff to the generated code.
- *   The patch will replace the inclusion of RTCORBAC.h and RTSchedulerC.h
- *   with RTCORBA.h and RTScheduler.h respectively.
- *
- * Apply patches using the following command:
- *
- *   patch < Kokyu_qosC.h.diff
- *
- * Note: The diff was generated in the following way:
- *
- *   Run the idl compiler as in step 1.
- *   cp Kokyu_qosC.h Kokyu_qosC.h.orig
- *   Modify Kokyu_qosC.h with changes described in step 2.
- *   diff -wBbu Kokyu_qosC.h.orig Kokyu_qosC.h > Kokyu_qosC.h.diff
- *
  */
 
 #ifndef _KOKYU_DSRT_QOS_PIDL_
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduling.idl b/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduling.idl
index f0bd37090b7..8bfae990b26 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduling.idl
+++ b/TAO/examples/Kokyu_dsrt_schedulers/MIF_Scheduling.idl
@@ -5,35 +5,6 @@
  *
  * $Id$
  *
- * @brief Pre-compiled IDL source to help with the service context
- *        propagation of dynamic scheduling parameters using Kokyu
- *
- *   This file was used to generate the code in MIF_SchedulingC.{h,i,cpp}.
- *   The steps to regenerate the code are as follows:
- *
- *   1. Run the tao_idl compiler on the pidl file.  The command used for
- *   this is:
- *
- *     tao_idl -I $TAO_ROOT -Ge 1
- *             -Wb,export_macro=Kokyu_DSRT_Schedulers_Export
- *             -Wb,export_include=Kokyu_dsrt_schedulers_export.h
- *
- *
- *   2. Then apply the patches in MIF_SchedulingC.h.diff to the generated code.
- *   The patch will replace the inclusion of RTCORBAC.h and RTSchedulerC.h
- *   with RTCORBA.h and RTScheduler.h respectively.
- *
- * Apply patches using the following command:
- *
- *   patch < MIF_SchedulingC.h.diff
- *
- * Note: The diff was generated in the following way:
- *
- *   Run the idl compiler as in step 1.
- *   cp MIF_SchedulingC.h MIF_SchedulingC.h.orig
- *   Modify MIF_SchedulingC.h with changes described in step 2.
- *   diff -wBbu MIF_SchedulingC.h.orig MIF_SchedulingC.h > MIF_SchedulingC.h.diff
- *
  */
 
 #include "tao/RTScheduling/RTScheduler_include.pidl"
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduling.idl b/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduling.idl
index 98924357866..fd261a40782 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduling.idl
+++ b/TAO/examples/Kokyu_dsrt_schedulers/MUF_Scheduling.idl
@@ -5,39 +5,11 @@
  *
  * $Id$
  *
- * @brief Pre-compiled IDL source to help with the service context
- *        propagation of dynamic scheduling parameters using Kokyu
- *
- *   This file was used to generate the code in MUF_SchedulingC.{h,i,cpp}.
- *   The steps to regenerate the code are as follows:
- *
- *   1. Run the tao_idl compiler on the pidl file.  The command used for
- *   this is:
- *
- *     tao_idl -I $TAO_ROOT -Ge 1
- *             -Wb,export_macro=Kokyu_DSRT_Schedulers_Export
- *             -Wb,export_include=Kokyu_dsrt_schedulers_export.h
- *
- *
- *   2. Then apply the patches in MUF_SchedulingC.h.diff to the generated code.
- *   The patch will replace the inclusion of RTCORBAC.h and RTSchedulerC.h
- *   with RTCORBA.h and RTScheduler.h respectively.
- *
- * Apply patches using the following command:
- *
- *   patch < MUF_SchedulingC.h.diff
- *
- * Note: The diff was generated in the following way:
- *
- *   Run the idl compiler as in step 1.
- *   cp MUF_SchedulingC.h MUF_SchedulingC.h.orig
- *   Modify MUF_SchedulingC.h with changes described in step 2.
- *   diff -wBbu MUF_SchedulingC.h.orig MUF_SchedulingC.h > MUF_SchedulingC.h.diff
- *
  */
 
 #include "tao/RTScheduling/RTScheduler_include.pidl"
 #include "tao/RTCORBA/RTCORBA_include.pidl"
+#include "tao/TimeBase.pidl"
 
 module MUF_Scheduling
 {
diff --git a/TAO/examples/POA/DSI/Database_i.cpp b/TAO/examples/POA/DSI/Database_i.cpp
index 8f6f2add564..6a9550a6a0a 100644
--- a/TAO/examples/POA/DSI/Database_i.cpp
+++ b/TAO/examples/POA/DSI/Database_i.cpp
@@ -4,8 +4,8 @@
 
 #include "tao/DynamicInterface/Server_Request.h"
 
-#include "tao/NVList.h"
-#include "tao/TypeCode.h"
+#include "tao/AnyTypeCode/NVList.h"
+#include "tao/AnyTypeCode/TypeCode.h"
 #include "ace/Null_Mutex.h"
 
 ACE_RCSID (DSI,
diff --git a/TAO/examples/POA/Default_Servant/POA_Default_Servant.mpc b/TAO/examples/POA/Default_Servant/POA_Default_Servant.mpc
index 49da2f6992a..b088140490b 100644
--- a/TAO/examples/POA/Default_Servant/POA_Default_Servant.mpc
+++ b/TAO/examples/POA/Default_Servant/POA_Default_Servant.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Client) : taoclient, minimum_corba {
+project(*Client) : taoclient, anytypecode, minimum_corba {
   source_files {
     FileC.cpp
     client.cpp
diff --git a/TAO/examples/POA/Forwarding/POA_Forwarding.mpc b/TAO/examples/POA/Forwarding/POA_Forwarding.mpc
index 4abc43c5e51..8f35adb7f26 100644
--- a/TAO/examples/POA/Forwarding/POA_Forwarding.mpc
+++ b/TAO/examples/POA/Forwarding/POA_Forwarding.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Client) : taoclient, minimum_corba {
+project(*Client) : taoclient, anytypecode, minimum_corba {
   source_files {
     client.cpp
     testC.cpp
diff --git a/TAO/examples/POA/POA_BiDir/POA_BiDir.cpp b/TAO/examples/POA/POA_BiDir/POA_BiDir.cpp
index 933fcc1ccc4..7deb1f68cbe 100644
--- a/TAO/examples/POA/POA_BiDir/POA_BiDir.cpp
+++ b/TAO/examples/POA/POA_BiDir/POA_BiDir.cpp
@@ -20,7 +20,7 @@
 
 #include "tao/BiDir_GIOP/BiDirGIOP.h"
 
-#include "tao/Any.h"
+#include "tao/AnyTypeCode/Any.h"
 #include "tao/ORB.h"
 
 #include "ace/SString.h"
diff --git a/TAO/examples/POA/TIE/POA_TIE.mpc b/TAO/examples/POA/TIE/POA_TIE.mpc
index 44173cfafa5..585af3c0dfc 100644
--- a/TAO/examples/POA/TIE/POA_TIE.mpc
+++ b/TAO/examples/POA/TIE/POA_TIE.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Client) : taoclient, minimum_corba {
+project(*Client) : taoclient, anytypecode, minimum_corba {
   source_files {
     client.cpp
     testC.cpp
diff --git a/TAO/examples/POA/TIE/client.cpp b/TAO/examples/POA/TIE/client.cpp
index 5a3fbf6af51..9f29271ff6d 100644
--- a/TAO/examples/POA/TIE/client.cpp
+++ b/TAO/examples/POA/TIE/client.cpp
@@ -228,16 +228,3 @@ main (int argc, char **argv)
   return 0;
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class Test<A, A_var>;
-template class Test<Outer::B, Outer::B_var>;
-template class Test<Outer::Inner::C, Outer::Inner::C_var>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate Test<A, A_var>
-#pragma instantiate Test<Outer::B, Outer::B_var>
-#pragma instantiate Test<Outer::Inner::C, Outer::Inner::C_var>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/examples/POA/TIE/server.cpp b/TAO/examples/POA/TIE/server.cpp
index a0962ce6d95..1c53b7ebb97 100644
--- a/TAO/examples/POA/TIE/server.cpp
+++ b/TAO/examples/POA/TIE/server.cpp
@@ -248,16 +248,3 @@ main (int argc, char **argv)
   return 0;
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-#if defined (ACE_HAS_USING_KEYWORD)
-template class POA_A_tie<Tie_i>;
-template class POA_Outer::B_tie <Tie_i>;
-template class POA_Outer::Inner::C_tie <Tie_i>;
-#endif /* ACE_HAS_USING_KEYWORD */
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate POA_A_tie<Tie_i>
-#if defined (ACE_HAS_USING_KEYWORD)
-#pragma instantiate POA_Outer::B_tie <Tie_i>
-#pragma instantiate POA_Outer::Inner::C_tie <Tie_i>
-#endif /* ACE_HAS_USING_KEYWORD */
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/examples/Simulator/Event_Supplier/Event_Con.cpp b/TAO/examples/Simulator/Event_Supplier/Event_Con.cpp
index 860ce49c2ab..dafdaefc101 100644
--- a/TAO/examples/Simulator/Event_Supplier/Event_Con.cpp
+++ b/TAO/examples/Simulator/Event_Supplier/Event_Con.cpp
@@ -29,7 +29,7 @@
 #include "orbsvcs/Scheduler_Factory.h"
 
 #include "tao/ORB_Core.h"
-#include "tao/TypeCode.h"
+#include "tao/AnyTypeCode/TypeCode.h"
 
 #include "ace/Get_Opt.h"
 #include "ace/Sched_Params.h"
@@ -191,21 +191,28 @@ Demo_Consumer::push (const RtecEventComm::EventSet &events
               ACE_TRY_CHECK;
               ACE_DEBUG ((LM_DEBUG, "TCKind: %d\n", kind));
 
-              int ret = _tc_Navigation->equal (events[i].data.any_value.type() ACE_ENV_ARG_PARAMETER);
+              CORBA::Boolean ret =
+                _tc_Navigation->equal (events[i].data.any_value.type() ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
+
               if (ret)
                 {
-                  Navigation *navigation_ = (Navigation*) events[i].data.any_value.value ();
+                  const Navigation *navigation_ = 0;
+                  events[i].data.any_value >>= navigation_;
                   ACE_DEBUG ((LM_DEBUG, "Found a Navigation struct in the any: pos_lat = %d\n", navigation_->position_latitude));
                 }
-              else {
-                ret = (_tc_Weapons->equal (events[i].data.any_value.type() ACE_ENV_ARG_PARAMETER));
-                ACE_TRY_CHECK;
-                if (ret) {
-                  Weapons *weapons_ = (Weapons*) events[i].data.any_value.value ();
-                  ACE_DEBUG ((LM_DEBUG, "Found a Weapons struct in the any: nr_of_weapons = %u\n", weapons_->number_of_weapons));
+              else
+                {
+                  ret = _tc_Weapons->equal (events[i].data.any_value.type() ACE_ENV_ARG_PARAMETER);
+                  ACE_TRY_CHECK;
+
+                  if (ret)
+                    {
+                      const Weapons *weapons_ = 0;
+                      events[i].data.any_value >>= weapons_;
+                      ACE_DEBUG ((LM_DEBUG, "Found a Weapons struct in the any: nr_of_weapons = %u\n", weapons_->number_of_weapons));
+                    }
                 }
-              }
             }
           ACE_CATCHANY
             {
diff --git a/TAO/examples/Simulator/NavWeap.idl b/TAO/examples/Simulator/NavWeap.idl
index ded20426e61..a67d9c02fd1 100644
--- a/TAO/examples/Simulator/NavWeap.idl
+++ b/TAO/examples/Simulator/NavWeap.idl
@@ -2,7 +2,7 @@
 
 // =========================================================================================================
 //
-// = FILE  
+// = FILE
 //     NavWeap.idl
 //
 // = DESCRIPTION
@@ -12,9 +12,9 @@
 //     Michael Kircher <mk1@cec.wustl.edu>
 //     Modified by
 //     Chris Gill <cdgill@cs.wustl.edu>
-// ========================================================================================================= 
+// =========================================================================================================
 
-#include "TimeBase.idl"
+#include "tao/TimeBase.pidl"
 
 struct Navigation {
 	long position_latitude;
@@ -28,7 +28,7 @@ struct Navigation {
 	double overhead;
 	TimeBase::TimeT arrival_time;
 	TimeBase::TimeT deadline_time;
-	TimeBase::TimeT completion_time;	
+	TimeBase::TimeT completion_time;
 	TimeBase::TimeT computation_time;
         unsigned long criticality;
         unsigned long update_data;
@@ -54,17 +54,17 @@ struct Weapons {
 	double overhead;
 	TimeBase::TimeT arrival_time;
 	TimeBase::TimeT deadline_time;
-	TimeBase::TimeT completion_time;	
+	TimeBase::TimeT completion_time;
 	TimeBase::TimeT computation_time;
         unsigned long criticality;
         unsigned long update_data;
-}; 
+};
 
 interface NavWeapTerminator
     // = DESCRIPTION
     // This interface specifies a single operation, used
     // to shut down the orb.  This allows the orb to
-    // be shut down cleanly, from within a synchronously 
+    // be shut down cleanly, from within a synchronously
     // servant dispatched servant, but with the request
     // originating from another thread.
 {
diff --git a/TAO/interop-tests/wchar/interop_wchar.mpc b/TAO/interop-tests/wchar/interop_wchar.mpc
index 1ab33650887..a6175869bf6 100644
--- a/TAO/interop-tests/wchar/interop_wchar.mpc
+++ b/TAO/interop-tests/wchar/interop_wchar.mpc
@@ -1,8 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): taoexe, portableserver {
-  exename = server
+project(*Server): taoserver {
   Source_Files {
     interop_wchar_i.cpp
     wchar_reference.cpp
@@ -10,8 +9,7 @@ project(*Server): taoexe, portableserver {
   }
 }
 
-project(*Client): taoexe {
-  exename = client
+project(*Client): taoclient, anytypecode {
   Source_Files {
     interop_wcharC.cpp
     wchar_reference.cpp
diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_union.cpp b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_union.cpp
index a93742537ab..6052f26afff 100644
--- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_union.cpp
+++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_union.cpp
@@ -11,7 +11,7 @@
 #include "ifr_adding_visitor_union.h"
 #include "ifr_adding_visitor_structure.h"
 
-#include "tao/Any_Unknown_IDL_Type.h"
+#include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h"
 #include "tao/CDR.h"
 
 ACE_RCSID (IFR_Service,
diff --git a/TAO/orbsvcs/PSS/PSDL_Code_Gen.cpp b/TAO/orbsvcs/PSS/PSDL_Code_Gen.cpp
index 3daefe6e4f9..fe23670c74e 100644
--- a/TAO/orbsvcs/PSS/PSDL_Code_Gen.cpp
+++ b/TAO/orbsvcs/PSS/PSDL_Code_Gen.cpp
@@ -4,7 +4,7 @@
 #include "PSDL_Code_Gen.h"
 #include "PSDL_Datastore.h"
 #include "tao/OctetSeqC.h"
-#include "tao/Any.h"
+#include "tao/AnyTypeCode/Any.h"
 #include "tao/CodecFactory/CodecFactory.h"
 
 ACE_RCSID (PSS, PSDL_Code_Gen, "$Id$")
diff --git a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.cpp b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.cpp
index bdd9174ad5c..a86e8671fd1 100644
--- a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.cpp
+++ b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/ReplicaController.cpp
@@ -7,8 +7,9 @@
 #include "ace/TMCast/Group.hpp"
 
 #include "tao/PortableServer/Servant_Base.h"
-#include "tao/Any_Impl.h"
-#include "tao/DynamicC.h"
+#include "tao/AnyTypeCode/Any_Impl.h"
+#include "tao/AnyTypeCode/DynamicC.h"
+#include "tao/PI/PI.h"
 
 #include "orbsvcs/FT_CORBA_ORBC.h"
 
diff --git a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly.mpc b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly.mpc
index d1cf05d0d2c..04dfb4fc843 100644
--- a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly.mpc
+++ b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly.mpc
@@ -9,7 +9,7 @@ project(*Server): orbsvcsexe, fault_tolerance, tmcast, pi_server, interceptors {
   }
 }
 
-project(*Client): taoexe, fault_tolerance, exceptions {
+project(*Client): taoclient, fault_tolerance, exceptions {
   Source_Files {
     RolyPolyC.cpp
     client.cpp
diff --git a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly_i.cpp b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly_i.cpp
index cf1c40d004f..82f7c9d16ed 100644
--- a/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly_i.cpp
+++ b/TAO/orbsvcs/examples/FaultTolerance/RolyPoly/RolyPoly_i.cpp
@@ -4,6 +4,7 @@
 
 #include "RolyPoly_i.h"
 #include "StateUpdate.h"
+#include "tao/AnyTypeCode/Any.h"
 
 RolyPoly_i::RolyPoly_i (CORBA::ORB_ptr orb)
   : number_ (0)
diff --git a/TAO/orbsvcs/examples/ORT/Gateway_i.cpp b/TAO/orbsvcs/examples/ORT/Gateway_i.cpp
index c4340886db3..29f250cb1ac 100644
--- a/TAO/orbsvcs/examples/ORT/Gateway_i.cpp
+++ b/TAO/orbsvcs/examples/ORT/Gateway_i.cpp
@@ -9,9 +9,9 @@
 
 #include "tao/ORB.h"
 #include "tao/LocalObject.h"
-#include "tao/Any.h"
-#include "tao/NVList.h"
-
+#include "tao/AnyTypeCode/Any.h"
+#include "tao/AnyTypeCode/NVList.h"
+#include "tao/AnyTypeCode/ExceptionA.h"
 
 ACE_RCSID (ORT,
            Gateway_i,
diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp
index a9845410bd8..372be078a81 100644
--- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp
@@ -21,7 +21,7 @@
 
 #include "tao/debug.h"
 #include "tao/ORB_Core.h"
-#include "tao/Any.h"
+#include "tao/AnyTypeCode/Any.h"
 #include "ace/OS_NS_arpa_inet.h"
 
 #if !defined (__ACE_INLINE__)
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.h
index d0ee1cfa917..8a7157b0e0a 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEvent.h
@@ -18,7 +18,7 @@
 #pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/NVList.h"
+#include "tao/AnyTypeCode/NVList.h"
 #include "tao/CORBA_String.h"
 #include "tao/CORBA_methods.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h
index 1119ef34170..23f302d15b1 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_TypedEventChannel.h
@@ -28,7 +28,7 @@
 #include "orbsvcs/CosTypedEventChannelAdminS.h"
 
 #include "tao/IFR_Client/IFR_BasicC.h"
-#include "tao/NVList.h"
+#include "tao/AnyTypeCode/NVList.h"
 
 #include "ace/Hash_Map_Manager.h"
 #include "ace/Null_Mutex.h"
diff --git a/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.cpp b/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.cpp
index 7c2b01ba585..45848cb389d 100644
--- a/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.cpp
+++ b/TAO/orbsvcs/orbsvcs/ETCL/ETCL_Constraint.cpp
@@ -5,11 +5,11 @@
 #include "ETCL_Constraint_Visitor.h"
 #include "ETCL_y.h"
 
-#include "tao/Any_Unknown_IDL_Type.h"
 #include "tao/Managed_Types.h"
 #include "tao/Environment.h"
 #include "tao/CDR.h"
-#include "tao/TypeCode.h"
+#include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h"
+#include "tao/AnyTypeCode/TypeCode.h"
 
 #if ! defined (__ACE_INLINE__)
 #include "ETCL_Constraint.inl"
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp
index 23d4f0e163b..2acb4be7939 100755
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientPolicy_i.cpp
@@ -4,6 +4,7 @@
 #include "tao/debug.h"
 #include "ace/Log_Msg.h"
 #include "tao/ORB_Constants.h"
+#include "tao/AnyTypeCode/Any.h"
 
 #if !defined (__ACE_INLINE__)
 #include "FT_ClientPolicy_i.inl"
@@ -34,7 +35,7 @@ TAO_FT_Request_Duration_Policy::create (const CORBA::Any& val
     ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_VALUE),
                       CORBA::Policy::_nil ());
 
-  TAO_FT_Request_Duration_Policy *tmp;
+  TAO_FT_Request_Duration_Policy *tmp = 0;
   ACE_NEW_THROW_EX (tmp,
                     TAO_FT_Request_Duration_Policy (value),
                     CORBA::NO_MEMORY (TAO::VMCID,
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.cpp
index 4c4608608c9..9a12142d0e0 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerPolicy_i.cpp
@@ -3,6 +3,7 @@
 
 #include "tao/debug.h"
 #include "tao/ORB_Constants.h"
+#include "tao/AnyTypeCode/Any.h"
 
 #if !defined (__ACE_INLINE__)
 #include "FT_ServerPolicy_i.inl"
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp
index 3fe3040dddc..f082c613dd9 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ServerRequest_Interceptor.cpp
@@ -3,8 +3,8 @@
 #include "FT_ServerRequest_Interceptor.h"
 #include "tao/IOP_IORC.h"
 #include "tao/ORB_Constants.h"
-#include "tao/DynamicC.h"
-#include "tao/TypeCode.h"
+#include "tao/AnyTypeCode/DynamicC.h"
+#include "tao/AnyTypeCode/TypeCode.h"
 #include "tao/CDR.h"
 #include "orbsvcs/FT_CORBA_ORBC.h"
 #include "ace/Log_Msg.h"
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.h
index 7ac78c1369b..eb0e60fa1ea 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.h
@@ -19,6 +19,7 @@
 #include "tao/ORB.h"
 #include "orbsvcs/FtRtecEventChannelAdminC.h"
 #include "tao/PI_Server/PI_Server.h"
+#include "tao/PI/PI.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp
index a6914212327..e9c77862e25 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Request_Context_Repository.cpp
@@ -4,7 +4,7 @@
 #include "../Utils/resolve_init.h"
 #include "../Utils/UUID.h"
 
-#include "tao/TypeCode.h"
+#include "tao/AnyTypeCode/TypeCode.h"
 #include "tao/PI/PI.h"
 #include "tao/PI_Server/PI_Server.h"
 #include "tao/IOP_IORC.h"
diff --git a/TAO/orbsvcs/orbsvcs/HTIOP/htiop_endpointsC.cpp b/TAO/orbsvcs/orbsvcs/HTIOP/htiop_endpointsC.cpp
index 1675a740989..437b4187df2 100644
--- a/TAO/orbsvcs/orbsvcs/HTIOP/htiop_endpointsC.cpp
+++ b/TAO/orbsvcs/orbsvcs/HTIOP/htiop_endpointsC.cpp
@@ -31,13 +31,13 @@
 
 #include "htiop_endpointsC.h"
 #include "tao/CDR.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Sequence_TypeCode_Static.h"
-#include "tao/String_TypeCode_Static.h"
-#include "tao/Struct_TypeCode_Static.h"
-#include "tao/TypeCode_Struct_Field.h"
+#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Sequence_TypeCode_Static.h"
+#include "tao/AnyTypeCode/String_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Struct_TypeCode_Static.h"
+#include "tao/AnyTypeCode/TypeCode_Struct_Field.h"
 
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
@@ -60,7 +60,7 @@ static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> co
     { "host", &CORBA::_tc_string },
     { "port", &CORBA::_tc_short },
     { "htid", &CORBA::_tc_string }
-    
+
   };
 static TAO::TypeCode::Struct<char const *,
                              CORBA::TypeCode_ptr const *,
@@ -73,16 +73,16 @@ static TAO::TypeCode::Struct<char const *,
     "HTIOP_Endpoint_Info",
     _tao_fields_HTIOP_Endpoint_Info,
     3);
-  
+
 ::CORBA::TypeCode_ptr const _tc_HTIOP_Endpoint_Info =
   &_tao_tc_HTIOP_Endpoint_Info;
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_structure/structure_cs.cpp:66
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_HTIOPENDPOINTSEQUENCE_CS_)
@@ -147,10 +147,10 @@ namespace TAO
         CORBA::tk_sequence,
         &_tc_HTIOP_Endpoint_Info,
         0U);
-      
+
     ::CORBA::TypeCode_ptr const tc_HTIOPEndpointSequence_0 =
       &HTIOPEndpointSequence_0;
-    
+
   }
 }
 
@@ -164,7 +164,7 @@ static TAO::TypeCode::Alias<char const *,
     "IDL:HTIOPEndpointSequence:1.0",
     "HTIOPEndpointSequence",
     &TAO::TypeCode::tc_HTIOPEndpointSequence_0);
-  
+
 ::CORBA::TypeCode_ptr const _tc_HTIOPEndpointSequence =
   &_tao_tc_HTIOPEndpointSequence;
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.cpp
index 28bad0823e9..4ef6a3dd900 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.cpp
@@ -5,7 +5,7 @@
 #include "IFR_Service_Utils.h"
 #include "IDLType_i.h"
 
-#include "tao/Any_Unknown_IDL_Type.h"
+#include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h"
 
 #include "ace/Auto_Ptr.h"
 #include "ace/SString.h"
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Container_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/Container_i.cpp
index 13e5c81a3ab..6c9c5cb3498 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/Container_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/Container_i.cpp
@@ -9,7 +9,7 @@
 
 #include "tao/IFR_Client/IFR_ComponentsC.h"
 
-#include "tao/Any_Unknown_IDL_Type.h"
+#include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h"
 
 #include "ace/Auto_Ptr.h"
 #include "ace/SString.h"
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.cpp
index fd7c95d6294..23e20b3e011 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.cpp
@@ -27,7 +27,7 @@
 
 
 // TAO_IDL - Generated from 
-// be\be_codegen.cpp:617
+// be\be_codegen.cpp:601
 
 #ifndef _TAO_IDL_ORIG_IFR_BASES_CPP_
 #define _TAO_IDL_ORIG_IFR_BASES_CPP_
@@ -54,8 +54,8 @@
 #include "tao/Stub.h"
 #include "tao/IFR_Client_Adapter.h"
 #include "tao/Object_T.h"
-#include "tao/TypeCode.h"
-#include "tao/DynamicC.h"
+#include "tao/AnyTypeCode/TypeCode.h"
+#include "tao/AnyTypeCode/DynamicC.h"
 #include "tao/CDR.h"
 #include "tao/operation_details.h"
 #include "tao/PortableInterceptor.h"
@@ -64,7 +64,7 @@
 #include "tao/Special_Basic_Arguments.h"
 #include "tao/UB_String_Arguments.h"
 #include "tao/Var_Size_Argument_T.h"
-#include "tao/Any_Arg_Traits.h"
+#include "tao/AnyTypeCode/Any_Arg_Traits.h"
 #include "ace/Dynamic_Service.h"
 #include "ace/Malloc_Allocator.h"
 
@@ -77,31 +77,35 @@
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
+// be\be_visitor_arg_traits.cpp:70
 
 // Arg traits specializations.
 namespace TAO
 {
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:702
+  // be\be_visitor_arg_traits.cpp:793
 
-#if !defined (_CORBA_DEFINITIONKIND__SARG_TRAITS_SS_)
-#define _CORBA_DEFINITIONKIND__SARG_TRAITS_SS_
+#if !defined (_CORBA_DEFINITIONKIND__SARG_TRAITS_)
+#define _CORBA_DEFINITIONKIND__SARG_TRAITS_
   
   template<>
-  class TAO_IFR_Client_Export SArg_Traits<CORBA::DefinitionKind>
+  class SArg_Traits<CORBA::DefinitionKind>
     : public
         Basic_SArg_Traits_T<
-            CORBA::DefinitionKind
+            CORBA::DefinitionKind,
+            TAO::Any_Insert_Policy_Stream <CORBA::DefinitionKind>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_CONTAINED__SARG_TRAITS_SS_)
-#define _CORBA_CONTAINED__SARG_TRAITS_SS_
+#if !defined (_CORBA_CONTAINED__SARG_TRAITS_)
+#define _CORBA_CONTAINED__SARG_TRAITS_
   
   template<>
   class  SArg_Traits<CORBA::Contained>
@@ -109,7 +113,8 @@ namespace TAO
         Object_SArg_Traits_T<
             CORBA::Contained_ptr,
             CORBA::Contained_var,
-            CORBA::Contained_out
+            CORBA::Contained_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::Contained_ptr>
           >
   {
   };
@@ -117,26 +122,30 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:743
+  // be\be_visitor_arg_traits.cpp:835
 
-#if !defined (_CORBA_CONTAINED_DESCRIPTION__SARG_TRAITS_SS_)
-#define _CORBA_CONTAINED_DESCRIPTION__SARG_TRAITS_SS_
+#if !defined (_CORBA_CONTAINED_DESCRIPTION__SARG_TRAITS_)
+#define _CORBA_CONTAINED_DESCRIPTION__SARG_TRAITS_
   
   template<>
-  class TAO_IFR_Client_Export SArg_Traits<CORBA::Contained::Description>
+  class SArg_Traits<CORBA::Contained::Description>
     : public
         Var_Size_SArg_Traits_T<
             CORBA::Contained::Description,
             CORBA::Contained::Description_var,
-            CORBA::Contained::Description_out
+            CORBA::Contained::Description_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::Contained::Description>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_REPOSITORY__SARG_TRAITS_SS_)
-#define _CORBA_REPOSITORY__SARG_TRAITS_SS_
+#if !defined (_CORBA_REPOSITORY__SARG_TRAITS_)
+#define _CORBA_REPOSITORY__SARG_TRAITS_
   
   template<>
   class  SArg_Traits<CORBA::Repository>
@@ -144,15 +153,19 @@ namespace TAO
         Object_SArg_Traits_T<
             CORBA::Repository_ptr,
             CORBA::Repository_var,
-            CORBA::Repository_out
+            CORBA::Repository_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::Repository_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_CONTAINER__SARG_TRAITS_SS_)
-#define _CORBA_CONTAINER__SARG_TRAITS_SS_
+#if !defined (_CORBA_CONTAINER__SARG_TRAITS_)
+#define _CORBA_CONTAINER__SARG_TRAITS_
   
   template<>
   class  SArg_Traits<CORBA::Container>
@@ -160,7 +173,8 @@ namespace TAO
         Object_SArg_Traits_T<
             CORBA::Container_ptr,
             CORBA::Container_var,
-            CORBA::Container_out
+            CORBA::Container_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::Container_ptr>
           >
   {
   };
@@ -168,26 +182,30 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:492
+  // be\be_visitor_arg_traits.cpp:547
 
-#if !defined (_CORBA_CONTAINER_DESCRIPTIONSEQ__SARG_TRAITS_SS_)
-#define _CORBA_CONTAINER_DESCRIPTIONSEQ__SARG_TRAITS_SS_
+#if !defined (_CORBA_CONTAINER_DESCRIPTIONSEQ__SARG_TRAITS_)
+#define _CORBA_CONTAINER_DESCRIPTIONSEQ__SARG_TRAITS_
   
   template<>
-  class TAO_IFR_Client_Export SArg_Traits<CORBA::Container::DescriptionSeq>
+  class SArg_Traits<CORBA::Container::DescriptionSeq>
     : public
         Var_Size_SArg_Traits_T<
             CORBA::Container::DescriptionSeq,
             CORBA::Container::DescriptionSeq_var,
-            CORBA::Container::DescriptionSeq_out
+            CORBA::Container::DescriptionSeq_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::Container::DescriptionSeq>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_MODULEDEF__SARG_TRAITS_SS_)
-#define _CORBA_MODULEDEF__SARG_TRAITS_SS_
+#if !defined (_CORBA_MODULEDEF__SARG_TRAITS_)
+#define _CORBA_MODULEDEF__SARG_TRAITS_
   
   template<>
   class  SArg_Traits<CORBA::ModuleDef>
@@ -195,15 +213,19 @@ namespace TAO
         Object_SArg_Traits_T<
             CORBA::ModuleDef_ptr,
             CORBA::ModuleDef_var,
-            CORBA::ModuleDef_out
+            CORBA::ModuleDef_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::ModuleDef_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_CONSTANTDEF__SARG_TRAITS_SS_)
-#define _CORBA_CONSTANTDEF__SARG_TRAITS_SS_
+#if !defined (_CORBA_CONSTANTDEF__SARG_TRAITS_)
+#define _CORBA_CONSTANTDEF__SARG_TRAITS_
   
   template<>
   class  SArg_Traits<CORBA::ConstantDef>
@@ -211,15 +233,19 @@ namespace TAO
         Object_SArg_Traits_T<
             CORBA::ConstantDef_ptr,
             CORBA::ConstantDef_var,
-            CORBA::ConstantDef_out
+            CORBA::ConstantDef_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::ConstantDef_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_IDLTYPE__SARG_TRAITS_SS_)
-#define _CORBA_IDLTYPE__SARG_TRAITS_SS_
+#if !defined (_CORBA_IDLTYPE__SARG_TRAITS_)
+#define _CORBA_IDLTYPE__SARG_TRAITS_
   
   template<>
   class  SArg_Traits<CORBA::IDLType>
@@ -227,15 +253,19 @@ namespace TAO
         Object_SArg_Traits_T<
             CORBA::IDLType_ptr,
             CORBA::IDLType_var,
-            CORBA::IDLType_out
+            CORBA::IDLType_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::IDLType_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_STRUCTDEF__SARG_TRAITS_SS_)
-#define _CORBA_STRUCTDEF__SARG_TRAITS_SS_
+#if !defined (_CORBA_STRUCTDEF__SARG_TRAITS_)
+#define _CORBA_STRUCTDEF__SARG_TRAITS_
   
   template<>
   class  SArg_Traits<CORBA::StructDef>
@@ -243,15 +273,19 @@ namespace TAO
         Object_SArg_Traits_T<
             CORBA::StructDef_ptr,
             CORBA::StructDef_var,
-            CORBA::StructDef_out
+            CORBA::StructDef_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::StructDef_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_UNIONDEF__SARG_TRAITS_SS_)
-#define _CORBA_UNIONDEF__SARG_TRAITS_SS_
+#if !defined (_CORBA_UNIONDEF__SARG_TRAITS_)
+#define _CORBA_UNIONDEF__SARG_TRAITS_
   
   template<>
   class  SArg_Traits<CORBA::UnionDef>
@@ -259,15 +293,19 @@ namespace TAO
         Object_SArg_Traits_T<
             CORBA::UnionDef_ptr,
             CORBA::UnionDef_var,
-            CORBA::UnionDef_out
+            CORBA::UnionDef_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::UnionDef_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_ENUMDEF__SARG_TRAITS_SS_)
-#define _CORBA_ENUMDEF__SARG_TRAITS_SS_
+#if !defined (_CORBA_ENUMDEF__SARG_TRAITS_)
+#define _CORBA_ENUMDEF__SARG_TRAITS_
   
   template<>
   class  SArg_Traits<CORBA::EnumDef>
@@ -275,15 +313,19 @@ namespace TAO
         Object_SArg_Traits_T<
             CORBA::EnumDef_ptr,
             CORBA::EnumDef_var,
-            CORBA::EnumDef_out
+            CORBA::EnumDef_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::EnumDef_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_ALIASDEF__SARG_TRAITS_SS_)
-#define _CORBA_ALIASDEF__SARG_TRAITS_SS_
+#if !defined (_CORBA_ALIASDEF__SARG_TRAITS_)
+#define _CORBA_ALIASDEF__SARG_TRAITS_
   
   template<>
   class  SArg_Traits<CORBA::AliasDef>
@@ -291,15 +333,19 @@ namespace TAO
         Object_SArg_Traits_T<
             CORBA::AliasDef_ptr,
             CORBA::AliasDef_var,
-            CORBA::AliasDef_out
+            CORBA::AliasDef_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::AliasDef_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_INTERFACEDEF__SARG_TRAITS_SS_)
-#define _CORBA_INTERFACEDEF__SARG_TRAITS_SS_
+#if !defined (_CORBA_INTERFACEDEF__SARG_TRAITS_)
+#define _CORBA_INTERFACEDEF__SARG_TRAITS_
   
   template<>
   class  SArg_Traits<CORBA::InterfaceDef>
@@ -307,7 +353,8 @@ namespace TAO
         Object_SArg_Traits_T<
             CORBA::InterfaceDef_ptr,
             CORBA::InterfaceDef_var,
-            CORBA::InterfaceDef_out
+            CORBA::InterfaceDef_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::InterfaceDef_ptr>
           >
   {
   };
@@ -315,26 +362,30 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:492
+  // be\be_visitor_arg_traits.cpp:547
 
-#if !defined (_CORBA_INTERFACEDEFSEQ__SARG_TRAITS_SS_)
-#define _CORBA_INTERFACEDEFSEQ__SARG_TRAITS_SS_
+#if !defined (_CORBA_INTERFACEDEFSEQ__SARG_TRAITS_)
+#define _CORBA_INTERFACEDEFSEQ__SARG_TRAITS_
   
   template<>
-  class TAO_IFR_Client_Export SArg_Traits<CORBA::InterfaceDefSeq>
+  class SArg_Traits<CORBA::InterfaceDefSeq>
     : public
         Var_Size_SArg_Traits_T<
             CORBA::InterfaceDefSeq,
             CORBA::InterfaceDefSeq_var,
-            CORBA::InterfaceDefSeq_out
+            CORBA::InterfaceDefSeq_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::InterfaceDefSeq>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_EXCEPTIONDEF__SARG_TRAITS_SS_)
-#define _CORBA_EXCEPTIONDEF__SARG_TRAITS_SS_
+#if !defined (_CORBA_EXCEPTIONDEF__SARG_TRAITS_)
+#define _CORBA_EXCEPTIONDEF__SARG_TRAITS_
   
   template<>
   class  SArg_Traits<CORBA::ExceptionDef>
@@ -342,15 +393,19 @@ namespace TAO
         Object_SArg_Traits_T<
             CORBA::ExceptionDef_ptr,
             CORBA::ExceptionDef_var,
-            CORBA::ExceptionDef_out
+            CORBA::ExceptionDef_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::ExceptionDef_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_NATIVEDEF__SARG_TRAITS_SS_)
-#define _CORBA_NATIVEDEF__SARG_TRAITS_SS_
+#if !defined (_CORBA_NATIVEDEF__SARG_TRAITS_)
+#define _CORBA_NATIVEDEF__SARG_TRAITS_
   
   template<>
   class  SArg_Traits<CORBA::NativeDef>
@@ -358,15 +413,19 @@ namespace TAO
         Object_SArg_Traits_T<
             CORBA::NativeDef_ptr,
             CORBA::NativeDef_var,
-            CORBA::NativeDef_out
+            CORBA::NativeDef_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::NativeDef_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_VALUEDEF__SARG_TRAITS_SS_)
-#define _CORBA_VALUEDEF__SARG_TRAITS_SS_
+#if !defined (_CORBA_VALUEDEF__SARG_TRAITS_)
+#define _CORBA_VALUEDEF__SARG_TRAITS_
   
   template<>
   class  SArg_Traits<CORBA::ValueDef>
@@ -374,7 +433,8 @@ namespace TAO
         Object_SArg_Traits_T<
             CORBA::ValueDef_ptr,
             CORBA::ValueDef_var,
-            CORBA::ValueDef_out
+            CORBA::ValueDef_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::ValueDef_ptr>
           >
   {
   };
@@ -382,26 +442,30 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:492
+  // be\be_visitor_arg_traits.cpp:547
 
-#if !defined (_CORBA_VALUEDEFSEQ__SARG_TRAITS_SS_)
-#define _CORBA_VALUEDEFSEQ__SARG_TRAITS_SS_
+#if !defined (_CORBA_VALUEDEFSEQ__SARG_TRAITS_)
+#define _CORBA_VALUEDEFSEQ__SARG_TRAITS_
   
   template<>
-  class TAO_IFR_Client_Export SArg_Traits<CORBA::ValueDefSeq>
+  class SArg_Traits<CORBA::ValueDefSeq>
     : public
         Var_Size_SArg_Traits_T<
             CORBA::ValueDefSeq,
             CORBA::ValueDefSeq_var,
-            CORBA::ValueDefSeq_out
+            CORBA::ValueDefSeq_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::ValueDefSeq>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_VALUEBOXDEF__SARG_TRAITS_SS_)
-#define _CORBA_VALUEBOXDEF__SARG_TRAITS_SS_
+#if !defined (_CORBA_VALUEBOXDEF__SARG_TRAITS_)
+#define _CORBA_VALUEBOXDEF__SARG_TRAITS_
   
   template<>
   class  SArg_Traits<CORBA::ValueBoxDef>
@@ -409,15 +473,19 @@ namespace TAO
         Object_SArg_Traits_T<
             CORBA::ValueBoxDef_ptr,
             CORBA::ValueBoxDef_var,
-            CORBA::ValueBoxDef_out
+            CORBA::ValueBoxDef_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::ValueBoxDef_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_ABSTRACTINTERFACEDEF__SARG_TRAITS_SS_)
-#define _CORBA_ABSTRACTINTERFACEDEF__SARG_TRAITS_SS_
+#if !defined (_CORBA_ABSTRACTINTERFACEDEF__SARG_TRAITS_)
+#define _CORBA_ABSTRACTINTERFACEDEF__SARG_TRAITS_
   
   template<>
   class  SArg_Traits<CORBA::AbstractInterfaceDef>
@@ -425,7 +493,8 @@ namespace TAO
         Object_SArg_Traits_T<
             CORBA::AbstractInterfaceDef_ptr,
             CORBA::AbstractInterfaceDef_var,
-            CORBA::AbstractInterfaceDef_out
+            CORBA::AbstractInterfaceDef_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::AbstractInterfaceDef_ptr>
           >
   {
   };
@@ -433,26 +502,30 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:492
+  // be\be_visitor_arg_traits.cpp:547
 
-#if !defined (_CORBA_ABSTRACTINTERFACEDEFSEQ__SARG_TRAITS_SS_)
-#define _CORBA_ABSTRACTINTERFACEDEFSEQ__SARG_TRAITS_SS_
+#if !defined (_CORBA_ABSTRACTINTERFACEDEFSEQ__SARG_TRAITS_)
+#define _CORBA_ABSTRACTINTERFACEDEFSEQ__SARG_TRAITS_
   
   template<>
-  class TAO_IFR_Client_Export SArg_Traits<CORBA::AbstractInterfaceDefSeq>
+  class SArg_Traits<CORBA::AbstractInterfaceDefSeq>
     : public
         Var_Size_SArg_Traits_T<
             CORBA::AbstractInterfaceDefSeq,
             CORBA::AbstractInterfaceDefSeq_var,
-            CORBA::AbstractInterfaceDefSeq_out
+            CORBA::AbstractInterfaceDefSeq_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::AbstractInterfaceDefSeq>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_LOCALINTERFACEDEF__SARG_TRAITS_SS_)
-#define _CORBA_LOCALINTERFACEDEF__SARG_TRAITS_SS_
+#if !defined (_CORBA_LOCALINTERFACEDEF__SARG_TRAITS_)
+#define _CORBA_LOCALINTERFACEDEF__SARG_TRAITS_
   
   template<>
   class  SArg_Traits<CORBA::LocalInterfaceDef>
@@ -460,15 +533,19 @@ namespace TAO
         Object_SArg_Traits_T<
             CORBA::LocalInterfaceDef_ptr,
             CORBA::LocalInterfaceDef_var,
-            CORBA::LocalInterfaceDef_out
+            CORBA::LocalInterfaceDef_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::LocalInterfaceDef_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_EXTVALUEDEF__SARG_TRAITS_SS_)
-#define _CORBA_EXTVALUEDEF__SARG_TRAITS_SS_
+#if !defined (_CORBA_EXTVALUEDEF__SARG_TRAITS_)
+#define _CORBA_EXTVALUEDEF__SARG_TRAITS_
   
   template<>
   class  SArg_Traits<CORBA::ExtValueDef>
@@ -476,7 +553,8 @@ namespace TAO
         Object_SArg_Traits_T<
             CORBA::ExtValueDef_ptr,
             CORBA::ExtValueDef_var,
-            CORBA::ExtValueDef_out
+            CORBA::ExtValueDef_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::ExtValueDef_ptr>
           >
   {
   };
@@ -484,18 +562,19 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:492
+  // be\be_visitor_arg_traits.cpp:547
 
-#if !defined (_CORBA_CONTAINEDSEQ__SARG_TRAITS_SS_)
-#define _CORBA_CONTAINEDSEQ__SARG_TRAITS_SS_
+#if !defined (_CORBA_CONTAINEDSEQ__SARG_TRAITS_)
+#define _CORBA_CONTAINEDSEQ__SARG_TRAITS_
   
   template<>
-  class TAO_IFR_Client_Export SArg_Traits<CORBA::ContainedSeq>
+  class SArg_Traits<CORBA::ContainedSeq>
     : public
         Var_Size_SArg_Traits_T<
             CORBA::ContainedSeq,
             CORBA::ContainedSeq_var,
-            CORBA::ContainedSeq_out
+            CORBA::ContainedSeq_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::ContainedSeq>
           >
   {
   };
@@ -503,18 +582,19 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:492
+  // be\be_visitor_arg_traits.cpp:547
 
-#if !defined (_CORBA_STRUCTMEMBERSEQ__SARG_TRAITS_SS_)
-#define _CORBA_STRUCTMEMBERSEQ__SARG_TRAITS_SS_
+#if !defined (_CORBA_STRUCTMEMBERSEQ__SARG_TRAITS_)
+#define _CORBA_STRUCTMEMBERSEQ__SARG_TRAITS_
   
   template<>
-  class TAO_IFR_Client_Export SArg_Traits<CORBA::StructMemberSeq>
+  class SArg_Traits<CORBA::StructMemberSeq>
     : public
         Var_Size_SArg_Traits_T<
             CORBA::StructMemberSeq,
             CORBA::StructMemberSeq_var,
-            CORBA::StructMemberSeq_out
+            CORBA::StructMemberSeq_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::StructMemberSeq>
           >
   {
   };
@@ -522,18 +602,19 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:492
+  // be\be_visitor_arg_traits.cpp:547
 
-#if !defined (_CORBA_INITIALIZERSEQ__SARG_TRAITS_SS_)
-#define _CORBA_INITIALIZERSEQ__SARG_TRAITS_SS_
+#if !defined (_CORBA_INITIALIZERSEQ__SARG_TRAITS_)
+#define _CORBA_INITIALIZERSEQ__SARG_TRAITS_
   
   template<>
-  class TAO_IFR_Client_Export SArg_Traits<CORBA::InitializerSeq>
+  class SArg_Traits<CORBA::InitializerSeq>
     : public
         Var_Size_SArg_Traits_T<
             CORBA::InitializerSeq,
             CORBA::InitializerSeq_var,
-            CORBA::InitializerSeq_out
+            CORBA::InitializerSeq_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::InitializerSeq>
           >
   {
   };
@@ -541,18 +622,19 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:492
+  // be\be_visitor_arg_traits.cpp:547
 
-#if !defined (_CORBA_EXTINITIALIZERSEQ__SARG_TRAITS_SS_)
-#define _CORBA_EXTINITIALIZERSEQ__SARG_TRAITS_SS_
+#if !defined (_CORBA_EXTINITIALIZERSEQ__SARG_TRAITS_)
+#define _CORBA_EXTINITIALIZERSEQ__SARG_TRAITS_
   
   template<>
-  class TAO_IFR_Client_Export SArg_Traits<CORBA::ExtInitializerSeq>
+  class SArg_Traits<CORBA::ExtInitializerSeq>
     : public
         Var_Size_SArg_Traits_T<
             CORBA::ExtInitializerSeq,
             CORBA::ExtInitializerSeq_var,
-            CORBA::ExtInitializerSeq_out
+            CORBA::ExtInitializerSeq_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::ExtInitializerSeq>
           >
   {
   };
@@ -560,18 +642,19 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:492
+  // be\be_visitor_arg_traits.cpp:547
 
-#if !defined (_CORBA_UNIONMEMBERSEQ__SARG_TRAITS_SS_)
-#define _CORBA_UNIONMEMBERSEQ__SARG_TRAITS_SS_
+#if !defined (_CORBA_UNIONMEMBERSEQ__SARG_TRAITS_)
+#define _CORBA_UNIONMEMBERSEQ__SARG_TRAITS_
   
   template<>
-  class TAO_IFR_Client_Export SArg_Traits<CORBA::UnionMemberSeq>
+  class SArg_Traits<CORBA::UnionMemberSeq>
     : public
         Var_Size_SArg_Traits_T<
             CORBA::UnionMemberSeq,
             CORBA::UnionMemberSeq_var,
-            CORBA::UnionMemberSeq_out
+            CORBA::UnionMemberSeq_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::UnionMemberSeq>
           >
   {
   };
@@ -579,18 +662,19 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:492
+  // be\be_visitor_arg_traits.cpp:547
 
-#if !defined (_CORBA_ENUMMEMBERSEQ__SARG_TRAITS_SS_)
-#define _CORBA_ENUMMEMBERSEQ__SARG_TRAITS_SS_
+#if !defined (_CORBA_ENUMMEMBERSEQ__SARG_TRAITS_)
+#define _CORBA_ENUMMEMBERSEQ__SARG_TRAITS_
   
   template<>
-  class TAO_IFR_Client_Export SArg_Traits<CORBA::EnumMemberSeq>
+  class SArg_Traits<CORBA::EnumMemberSeq>
     : public
         Var_Size_SArg_Traits_T<
             CORBA::EnumMemberSeq,
             CORBA::EnumMemberSeq_var,
-            CORBA::EnumMemberSeq_out
+            CORBA::EnumMemberSeq_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::EnumMemberSeq>
           >
   {
   };
@@ -600,31 +684,35 @@ namespace TAO
 
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
+// be\be_visitor_arg_traits.cpp:70
 
 // Arg traits specializations.
 namespace TAO
 {
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:702
+  // be\be_visitor_arg_traits.cpp:793
 
-#if !defined (_CORBA_DEFINITIONKIND__ARG_TRAITS_SS_)
-#define _CORBA_DEFINITIONKIND__ARG_TRAITS_SS_
+#if !defined (_CORBA_DEFINITIONKIND__ARG_TRAITS_)
+#define _CORBA_DEFINITIONKIND__ARG_TRAITS_
   
   template<>
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::DefinitionKind>
+  class Arg_Traits<CORBA::DefinitionKind>
     : public
         Basic_Arg_Traits_T<
-            CORBA::DefinitionKind
+            CORBA::DefinitionKind,
+            TAO::Any_Insert_Policy_Stream <CORBA::DefinitionKind>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_CONTAINED__ARG_TRAITS_SS_)
-#define _CORBA_CONTAINED__ARG_TRAITS_SS_
+#if !defined (_CORBA_CONTAINED__ARG_TRAITS_)
+#define _CORBA_CONTAINED__ARG_TRAITS_
   
   template<>
   class  Arg_Traits<CORBA::Contained>
@@ -633,7 +721,8 @@ namespace TAO
             CORBA::Contained_ptr,
             CORBA::Contained_var,
             CORBA::Contained_out,
-            TAO::Objref_Traits<CORBA::Contained>
+            TAO::Objref_Traits<CORBA::Contained>,
+            TAO::Any_Insert_Policy_Stream <CORBA::Contained_ptr>
           >
   {
   };
@@ -641,26 +730,30 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:743
+  // be\be_visitor_arg_traits.cpp:835
 
-#if !defined (_CORBA_CONTAINED_DESCRIPTION__ARG_TRAITS_SS_)
-#define _CORBA_CONTAINED_DESCRIPTION__ARG_TRAITS_SS_
+#if !defined (_CORBA_CONTAINED_DESCRIPTION__ARG_TRAITS_)
+#define _CORBA_CONTAINED_DESCRIPTION__ARG_TRAITS_
   
   template<>
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::Contained::Description>
+  class Arg_Traits<CORBA::Contained::Description>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::Contained::Description,
             CORBA::Contained::Description_var,
-            CORBA::Contained::Description_out
+            CORBA::Contained::Description_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::Contained::Description>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_REPOSITORY__ARG_TRAITS_SS_)
-#define _CORBA_REPOSITORY__ARG_TRAITS_SS_
+#if !defined (_CORBA_REPOSITORY__ARG_TRAITS_)
+#define _CORBA_REPOSITORY__ARG_TRAITS_
   
   template<>
   class  Arg_Traits<CORBA::Repository>
@@ -669,15 +762,19 @@ namespace TAO
             CORBA::Repository_ptr,
             CORBA::Repository_var,
             CORBA::Repository_out,
-            TAO::Objref_Traits<CORBA::Repository>
+            TAO::Objref_Traits<CORBA::Repository>,
+            TAO::Any_Insert_Policy_Stream <CORBA::Repository_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_CONTAINER__ARG_TRAITS_SS_)
-#define _CORBA_CONTAINER__ARG_TRAITS_SS_
+#if !defined (_CORBA_CONTAINER__ARG_TRAITS_)
+#define _CORBA_CONTAINER__ARG_TRAITS_
   
   template<>
   class  Arg_Traits<CORBA::Container>
@@ -686,7 +783,8 @@ namespace TAO
             CORBA::Container_ptr,
             CORBA::Container_var,
             CORBA::Container_out,
-            TAO::Objref_Traits<CORBA::Container>
+            TAO::Objref_Traits<CORBA::Container>,
+            TAO::Any_Insert_Policy_Stream <CORBA::Container_ptr>
           >
   {
   };
@@ -694,26 +792,30 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:492
+  // be\be_visitor_arg_traits.cpp:547
 
-#if !defined (_CORBA_CONTAINER_DESCRIPTIONSEQ__ARG_TRAITS_SS_)
-#define _CORBA_CONTAINER_DESCRIPTIONSEQ__ARG_TRAITS_SS_
+#if !defined (_CORBA_CONTAINER_DESCRIPTIONSEQ__ARG_TRAITS_)
+#define _CORBA_CONTAINER_DESCRIPTIONSEQ__ARG_TRAITS_
   
   template<>
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::Container::DescriptionSeq>
+  class Arg_Traits<CORBA::Container::DescriptionSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::Container::DescriptionSeq,
             CORBA::Container::DescriptionSeq_var,
-            CORBA::Container::DescriptionSeq_out
+            CORBA::Container::DescriptionSeq_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::Container::DescriptionSeq>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_MODULEDEF__ARG_TRAITS_SS_)
-#define _CORBA_MODULEDEF__ARG_TRAITS_SS_
+#if !defined (_CORBA_MODULEDEF__ARG_TRAITS_)
+#define _CORBA_MODULEDEF__ARG_TRAITS_
   
   template<>
   class  Arg_Traits<CORBA::ModuleDef>
@@ -722,15 +824,19 @@ namespace TAO
             CORBA::ModuleDef_ptr,
             CORBA::ModuleDef_var,
             CORBA::ModuleDef_out,
-            TAO::Objref_Traits<CORBA::ModuleDef>
+            TAO::Objref_Traits<CORBA::ModuleDef>,
+            TAO::Any_Insert_Policy_Stream <CORBA::ModuleDef_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_CONSTANTDEF__ARG_TRAITS_SS_)
-#define _CORBA_CONSTANTDEF__ARG_TRAITS_SS_
+#if !defined (_CORBA_CONSTANTDEF__ARG_TRAITS_)
+#define _CORBA_CONSTANTDEF__ARG_TRAITS_
   
   template<>
   class  Arg_Traits<CORBA::ConstantDef>
@@ -739,15 +845,19 @@ namespace TAO
             CORBA::ConstantDef_ptr,
             CORBA::ConstantDef_var,
             CORBA::ConstantDef_out,
-            TAO::Objref_Traits<CORBA::ConstantDef>
+            TAO::Objref_Traits<CORBA::ConstantDef>,
+            TAO::Any_Insert_Policy_Stream <CORBA::ConstantDef_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_IDLTYPE__ARG_TRAITS_SS_)
-#define _CORBA_IDLTYPE__ARG_TRAITS_SS_
+#if !defined (_CORBA_IDLTYPE__ARG_TRAITS_)
+#define _CORBA_IDLTYPE__ARG_TRAITS_
   
   template<>
   class  Arg_Traits<CORBA::IDLType>
@@ -756,15 +866,19 @@ namespace TAO
             CORBA::IDLType_ptr,
             CORBA::IDLType_var,
             CORBA::IDLType_out,
-            TAO::Objref_Traits<CORBA::IDLType>
+            TAO::Objref_Traits<CORBA::IDLType>,
+            TAO::Any_Insert_Policy_Stream <CORBA::IDLType_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_STRUCTDEF__ARG_TRAITS_SS_)
-#define _CORBA_STRUCTDEF__ARG_TRAITS_SS_
+#if !defined (_CORBA_STRUCTDEF__ARG_TRAITS_)
+#define _CORBA_STRUCTDEF__ARG_TRAITS_
   
   template<>
   class  Arg_Traits<CORBA::StructDef>
@@ -773,15 +887,19 @@ namespace TAO
             CORBA::StructDef_ptr,
             CORBA::StructDef_var,
             CORBA::StructDef_out,
-            TAO::Objref_Traits<CORBA::StructDef>
+            TAO::Objref_Traits<CORBA::StructDef>,
+            TAO::Any_Insert_Policy_Stream <CORBA::StructDef_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_UNIONDEF__ARG_TRAITS_SS_)
-#define _CORBA_UNIONDEF__ARG_TRAITS_SS_
+#if !defined (_CORBA_UNIONDEF__ARG_TRAITS_)
+#define _CORBA_UNIONDEF__ARG_TRAITS_
   
   template<>
   class  Arg_Traits<CORBA::UnionDef>
@@ -790,15 +908,19 @@ namespace TAO
             CORBA::UnionDef_ptr,
             CORBA::UnionDef_var,
             CORBA::UnionDef_out,
-            TAO::Objref_Traits<CORBA::UnionDef>
+            TAO::Objref_Traits<CORBA::UnionDef>,
+            TAO::Any_Insert_Policy_Stream <CORBA::UnionDef_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_ENUMDEF__ARG_TRAITS_SS_)
-#define _CORBA_ENUMDEF__ARG_TRAITS_SS_
+#if !defined (_CORBA_ENUMDEF__ARG_TRAITS_)
+#define _CORBA_ENUMDEF__ARG_TRAITS_
   
   template<>
   class  Arg_Traits<CORBA::EnumDef>
@@ -807,15 +929,19 @@ namespace TAO
             CORBA::EnumDef_ptr,
             CORBA::EnumDef_var,
             CORBA::EnumDef_out,
-            TAO::Objref_Traits<CORBA::EnumDef>
+            TAO::Objref_Traits<CORBA::EnumDef>,
+            TAO::Any_Insert_Policy_Stream <CORBA::EnumDef_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_ALIASDEF__ARG_TRAITS_SS_)
-#define _CORBA_ALIASDEF__ARG_TRAITS_SS_
+#if !defined (_CORBA_ALIASDEF__ARG_TRAITS_)
+#define _CORBA_ALIASDEF__ARG_TRAITS_
   
   template<>
   class  Arg_Traits<CORBA::AliasDef>
@@ -824,15 +950,19 @@ namespace TAO
             CORBA::AliasDef_ptr,
             CORBA::AliasDef_var,
             CORBA::AliasDef_out,
-            TAO::Objref_Traits<CORBA::AliasDef>
+            TAO::Objref_Traits<CORBA::AliasDef>,
+            TAO::Any_Insert_Policy_Stream <CORBA::AliasDef_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_INTERFACEDEF__ARG_TRAITS_SS_)
-#define _CORBA_INTERFACEDEF__ARG_TRAITS_SS_
+#if !defined (_CORBA_INTERFACEDEF__ARG_TRAITS_)
+#define _CORBA_INTERFACEDEF__ARG_TRAITS_
   
   template<>
   class  Arg_Traits<CORBA::InterfaceDef>
@@ -841,7 +971,8 @@ namespace TAO
             CORBA::InterfaceDef_ptr,
             CORBA::InterfaceDef_var,
             CORBA::InterfaceDef_out,
-            TAO::Objref_Traits<CORBA::InterfaceDef>
+            TAO::Objref_Traits<CORBA::InterfaceDef>,
+            TAO::Any_Insert_Policy_Stream <CORBA::InterfaceDef_ptr>
           >
   {
   };
@@ -849,26 +980,30 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:492
+  // be\be_visitor_arg_traits.cpp:547
 
-#if !defined (_CORBA_INTERFACEDEFSEQ__ARG_TRAITS_SS_)
-#define _CORBA_INTERFACEDEFSEQ__ARG_TRAITS_SS_
+#if !defined (_CORBA_INTERFACEDEFSEQ__ARG_TRAITS_)
+#define _CORBA_INTERFACEDEFSEQ__ARG_TRAITS_
   
   template<>
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::InterfaceDefSeq>
+  class Arg_Traits<CORBA::InterfaceDefSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::InterfaceDefSeq,
             CORBA::InterfaceDefSeq_var,
-            CORBA::InterfaceDefSeq_out
+            CORBA::InterfaceDefSeq_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::InterfaceDefSeq>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_EXCEPTIONDEF__ARG_TRAITS_SS_)
-#define _CORBA_EXCEPTIONDEF__ARG_TRAITS_SS_
+#if !defined (_CORBA_EXCEPTIONDEF__ARG_TRAITS_)
+#define _CORBA_EXCEPTIONDEF__ARG_TRAITS_
   
   template<>
   class  Arg_Traits<CORBA::ExceptionDef>
@@ -877,15 +1012,19 @@ namespace TAO
             CORBA::ExceptionDef_ptr,
             CORBA::ExceptionDef_var,
             CORBA::ExceptionDef_out,
-            TAO::Objref_Traits<CORBA::ExceptionDef>
+            TAO::Objref_Traits<CORBA::ExceptionDef>,
+            TAO::Any_Insert_Policy_Stream <CORBA::ExceptionDef_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_NATIVEDEF__ARG_TRAITS_SS_)
-#define _CORBA_NATIVEDEF__ARG_TRAITS_SS_
+#if !defined (_CORBA_NATIVEDEF__ARG_TRAITS_)
+#define _CORBA_NATIVEDEF__ARG_TRAITS_
   
   template<>
   class  Arg_Traits<CORBA::NativeDef>
@@ -894,15 +1033,19 @@ namespace TAO
             CORBA::NativeDef_ptr,
             CORBA::NativeDef_var,
             CORBA::NativeDef_out,
-            TAO::Objref_Traits<CORBA::NativeDef>
+            TAO::Objref_Traits<CORBA::NativeDef>,
+            TAO::Any_Insert_Policy_Stream <CORBA::NativeDef_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_VALUEDEF__ARG_TRAITS_SS_)
-#define _CORBA_VALUEDEF__ARG_TRAITS_SS_
+#if !defined (_CORBA_VALUEDEF__ARG_TRAITS_)
+#define _CORBA_VALUEDEF__ARG_TRAITS_
   
   template<>
   class  Arg_Traits<CORBA::ValueDef>
@@ -911,7 +1054,8 @@ namespace TAO
             CORBA::ValueDef_ptr,
             CORBA::ValueDef_var,
             CORBA::ValueDef_out,
-            TAO::Objref_Traits<CORBA::ValueDef>
+            TAO::Objref_Traits<CORBA::ValueDef>,
+            TAO::Any_Insert_Policy_Stream <CORBA::ValueDef_ptr>
           >
   {
   };
@@ -919,26 +1063,30 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:492
+  // be\be_visitor_arg_traits.cpp:547
 
-#if !defined (_CORBA_VALUEDEFSEQ__ARG_TRAITS_SS_)
-#define _CORBA_VALUEDEFSEQ__ARG_TRAITS_SS_
+#if !defined (_CORBA_VALUEDEFSEQ__ARG_TRAITS_)
+#define _CORBA_VALUEDEFSEQ__ARG_TRAITS_
   
   template<>
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::ValueDefSeq>
+  class Arg_Traits<CORBA::ValueDefSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::ValueDefSeq,
             CORBA::ValueDefSeq_var,
-            CORBA::ValueDefSeq_out
+            CORBA::ValueDefSeq_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::ValueDefSeq>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_VALUEBOXDEF__ARG_TRAITS_SS_)
-#define _CORBA_VALUEBOXDEF__ARG_TRAITS_SS_
+#if !defined (_CORBA_VALUEBOXDEF__ARG_TRAITS_)
+#define _CORBA_VALUEBOXDEF__ARG_TRAITS_
   
   template<>
   class  Arg_Traits<CORBA::ValueBoxDef>
@@ -947,15 +1095,19 @@ namespace TAO
             CORBA::ValueBoxDef_ptr,
             CORBA::ValueBoxDef_var,
             CORBA::ValueBoxDef_out,
-            TAO::Objref_Traits<CORBA::ValueBoxDef>
+            TAO::Objref_Traits<CORBA::ValueBoxDef>,
+            TAO::Any_Insert_Policy_Stream <CORBA::ValueBoxDef_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_ABSTRACTINTERFACEDEF__ARG_TRAITS_SS_)
-#define _CORBA_ABSTRACTINTERFACEDEF__ARG_TRAITS_SS_
+#if !defined (_CORBA_ABSTRACTINTERFACEDEF__ARG_TRAITS_)
+#define _CORBA_ABSTRACTINTERFACEDEF__ARG_TRAITS_
   
   template<>
   class  Arg_Traits<CORBA::AbstractInterfaceDef>
@@ -964,7 +1116,8 @@ namespace TAO
             CORBA::AbstractInterfaceDef_ptr,
             CORBA::AbstractInterfaceDef_var,
             CORBA::AbstractInterfaceDef_out,
-            TAO::Objref_Traits<CORBA::AbstractInterfaceDef>
+            TAO::Objref_Traits<CORBA::AbstractInterfaceDef>,
+            TAO::Any_Insert_Policy_Stream <CORBA::AbstractInterfaceDef_ptr>
           >
   {
   };
@@ -972,26 +1125,30 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:492
+  // be\be_visitor_arg_traits.cpp:547
 
-#if !defined (_CORBA_ABSTRACTINTERFACEDEFSEQ__ARG_TRAITS_SS_)
-#define _CORBA_ABSTRACTINTERFACEDEFSEQ__ARG_TRAITS_SS_
+#if !defined (_CORBA_ABSTRACTINTERFACEDEFSEQ__ARG_TRAITS_)
+#define _CORBA_ABSTRACTINTERFACEDEFSEQ__ARG_TRAITS_
   
   template<>
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::AbstractInterfaceDefSeq>
+  class Arg_Traits<CORBA::AbstractInterfaceDefSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::AbstractInterfaceDefSeq,
             CORBA::AbstractInterfaceDefSeq_var,
-            CORBA::AbstractInterfaceDefSeq_out
+            CORBA::AbstractInterfaceDefSeq_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::AbstractInterfaceDefSeq>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_LOCALINTERFACEDEF__ARG_TRAITS_SS_)
-#define _CORBA_LOCALINTERFACEDEF__ARG_TRAITS_SS_
+#if !defined (_CORBA_LOCALINTERFACEDEF__ARG_TRAITS_)
+#define _CORBA_LOCALINTERFACEDEF__ARG_TRAITS_
   
   template<>
   class  Arg_Traits<CORBA::LocalInterfaceDef>
@@ -1000,15 +1157,19 @@ namespace TAO
             CORBA::LocalInterfaceDef_ptr,
             CORBA::LocalInterfaceDef_var,
             CORBA::LocalInterfaceDef_out,
-            TAO::Objref_Traits<CORBA::LocalInterfaceDef>
+            TAO::Objref_Traits<CORBA::LocalInterfaceDef>,
+            TAO::Any_Insert_Policy_Stream <CORBA::LocalInterfaceDef_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_EXTVALUEDEF__ARG_TRAITS_SS_)
-#define _CORBA_EXTVALUEDEF__ARG_TRAITS_SS_
+#if !defined (_CORBA_EXTVALUEDEF__ARG_TRAITS_)
+#define _CORBA_EXTVALUEDEF__ARG_TRAITS_
   
   template<>
   class  Arg_Traits<CORBA::ExtValueDef>
@@ -1017,7 +1178,8 @@ namespace TAO
             CORBA::ExtValueDef_ptr,
             CORBA::ExtValueDef_var,
             CORBA::ExtValueDef_out,
-            TAO::Objref_Traits<CORBA::ExtValueDef>
+            TAO::Objref_Traits<CORBA::ExtValueDef>,
+            TAO::Any_Insert_Policy_Stream <CORBA::ExtValueDef_ptr>
           >
   {
   };
@@ -1025,18 +1187,19 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:492
+  // be\be_visitor_arg_traits.cpp:547
 
-#if !defined (_CORBA_CONTAINEDSEQ__ARG_TRAITS_SS_)
-#define _CORBA_CONTAINEDSEQ__ARG_TRAITS_SS_
+#if !defined (_CORBA_CONTAINEDSEQ__ARG_TRAITS_)
+#define _CORBA_CONTAINEDSEQ__ARG_TRAITS_
   
   template<>
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::ContainedSeq>
+  class Arg_Traits<CORBA::ContainedSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::ContainedSeq,
             CORBA::ContainedSeq_var,
-            CORBA::ContainedSeq_out
+            CORBA::ContainedSeq_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::ContainedSeq>
           >
   {
   };
@@ -1044,18 +1207,19 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:492
+  // be\be_visitor_arg_traits.cpp:547
 
-#if !defined (_CORBA_STRUCTMEMBERSEQ__ARG_TRAITS_SS_)
-#define _CORBA_STRUCTMEMBERSEQ__ARG_TRAITS_SS_
+#if !defined (_CORBA_STRUCTMEMBERSEQ__ARG_TRAITS_)
+#define _CORBA_STRUCTMEMBERSEQ__ARG_TRAITS_
   
   template<>
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::StructMemberSeq>
+  class Arg_Traits<CORBA::StructMemberSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::StructMemberSeq,
             CORBA::StructMemberSeq_var,
-            CORBA::StructMemberSeq_out
+            CORBA::StructMemberSeq_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::StructMemberSeq>
           >
   {
   };
@@ -1063,18 +1227,19 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:492
+  // be\be_visitor_arg_traits.cpp:547
 
-#if !defined (_CORBA_INITIALIZERSEQ__ARG_TRAITS_SS_)
-#define _CORBA_INITIALIZERSEQ__ARG_TRAITS_SS_
+#if !defined (_CORBA_INITIALIZERSEQ__ARG_TRAITS_)
+#define _CORBA_INITIALIZERSEQ__ARG_TRAITS_
   
   template<>
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::InitializerSeq>
+  class Arg_Traits<CORBA::InitializerSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::InitializerSeq,
             CORBA::InitializerSeq_var,
-            CORBA::InitializerSeq_out
+            CORBA::InitializerSeq_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::InitializerSeq>
           >
   {
   };
@@ -1082,18 +1247,19 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:492
+  // be\be_visitor_arg_traits.cpp:547
 
-#if !defined (_CORBA_EXTINITIALIZERSEQ__ARG_TRAITS_SS_)
-#define _CORBA_EXTINITIALIZERSEQ__ARG_TRAITS_SS_
+#if !defined (_CORBA_EXTINITIALIZERSEQ__ARG_TRAITS_)
+#define _CORBA_EXTINITIALIZERSEQ__ARG_TRAITS_
   
   template<>
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::ExtInitializerSeq>
+  class Arg_Traits<CORBA::ExtInitializerSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::ExtInitializerSeq,
             CORBA::ExtInitializerSeq_var,
-            CORBA::ExtInitializerSeq_out
+            CORBA::ExtInitializerSeq_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::ExtInitializerSeq>
           >
   {
   };
@@ -1101,18 +1267,19 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:492
+  // be\be_visitor_arg_traits.cpp:547
 
-#if !defined (_CORBA_UNIONMEMBERSEQ__ARG_TRAITS_SS_)
-#define _CORBA_UNIONMEMBERSEQ__ARG_TRAITS_SS_
+#if !defined (_CORBA_UNIONMEMBERSEQ__ARG_TRAITS_)
+#define _CORBA_UNIONMEMBERSEQ__ARG_TRAITS_
   
   template<>
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::UnionMemberSeq>
+  class Arg_Traits<CORBA::UnionMemberSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::UnionMemberSeq,
             CORBA::UnionMemberSeq_var,
-            CORBA::UnionMemberSeq_out
+            CORBA::UnionMemberSeq_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::UnionMemberSeq>
           >
   {
   };
@@ -1120,18 +1287,19 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:492
+  // be\be_visitor_arg_traits.cpp:547
 
-#if !defined (_CORBA_ENUMMEMBERSEQ__ARG_TRAITS_SS_)
-#define _CORBA_ENUMMEMBERSEQ__ARG_TRAITS_SS_
+#if !defined (_CORBA_ENUMMEMBERSEQ__ARG_TRAITS_)
+#define _CORBA_ENUMMEMBERSEQ__ARG_TRAITS_
   
   template<>
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::EnumMemberSeq>
+  class Arg_Traits<CORBA::EnumMemberSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::EnumMemberSeq,
             CORBA::EnumMemberSeq_var,
-            CORBA::EnumMemberSeq_out
+            CORBA::EnumMemberSeq_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::EnumMemberSeq>
           >
   {
   };
@@ -1141,7 +1309,7 @@ namespace TAO
 
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1455
+// be\be_interface.cpp:1465
 
 class TAO_CORBA_IRObject_Perfect_Hash_OpTable
   : public TAO_Perfect_Hash_OpTable
@@ -1154,7 +1322,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: c:\ace\latest\ACE_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0 -a -o -t -p -K opname -L C++ -Z TAO_CORBA_IRObject_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ACE\Any\ACE_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0 -a -o -t -p -K opname -L C++ -Z TAO_CORBA_IRObject_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_IRObject_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -1174,10 +1342,10 @@ TAO_CORBA_IRObject_Perfect_Hash_OpTable::hash (const char *str, unsigned int len
      19, 19, 19, 19, 19, 19, 19, 19, 19,  0,
      19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
      19, 19, 19, 19, 19, 19, 19, 19, 19,  0,
-     19, 19,  5,  5, 19, 19, 19, 19, 19, 19,
+     19, 19,  0,  0, 19, 19, 19, 19, 19, 19,
      19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
      19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-     19, 19, 19,  0, 19, 19, 19, 19,  0, 19,
+     19, 19, 19,  5, 19, 19, 19, 19,  0, 19,
      19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
      19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
      19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
@@ -1198,8 +1366,8 @@ TAO_CORBA_IRObject_Perfect_Hash_OpTable::hash (const char *str, unsigned int len
      19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
      19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
      19, 19, 19, 19, 19,  0, 19,  0, 19, 19,
-      5,  5, 19, 19, 19, 19, 19, 19, 19, 19,
-     19, 19, 19, 19, 19, 19,  0, 19, 19, 19,
+      0,  0, 19, 19, 19, 19, 19, 19, 19, 19,
+     19, 19, 19, 19, 19, 19,  5, 19, 19, 19,
      19,  0, 19, 19, 19, 19, 19, 19,
 #endif /* ACE_MVS */
     };
@@ -1211,29 +1379,30 @@ TAO_CORBA_IRObject_Perfect_Hash_OpTable::lookup (const char *str, unsigned int l
 {
   enum
     {
-      TOTAL_KEYWORDS = 6,
+      TOTAL_KEYWORDS = 7,
       MIN_WORD_LENGTH = 5,
-      MAX_WORD_LENGTH = 13,
+      MAX_WORD_LENGTH = 14,
       MIN_HASH_VALUE = 5,
       MAX_HASH_VALUE = 18,
       HASH_VALUE_RANGE = 14,
       DUPLICATES = 0,
-      WORDLIST_SIZE = 11
+      WORDLIST_SIZE = 12
     };
 
   static const TAO_operation_db_entry  wordlist[] =
     {
       {"",0,0},{"",0,0},{"",0,0},{"",0,0},{"",0,0},
       {"_is_a", &POA_CORBA::IRObject::_is_a_skel, 0},
-      {"",0,0},{"",0,0},{"",0,0},{"",0,0},
-      {"_component", &POA_CORBA::IRObject::_component_skel, 0},
       {"",0,0},
       {"destroy", &POA_CORBA::IRObject::destroy_skel, 0},
-      {"_non_existent", &POA_CORBA::IRObject::_non_existent_skel, 0},
-      {"",0,0},
+      {"",0,0},{"",0,0},
       {"_interface", &POA_CORBA::IRObject::_interface_skel, 0},
       {"",0,0},{"",0,0},
       {"_get_def_kind", &POA_CORBA::IRObject::_get_def_kind_skel, 0},
+      {"_repository_id", &POA_CORBA::IRObject::_repository_id_skel, 0},
+      {"_component", &POA_CORBA::IRObject::_component_skel, 0},
+      {"",0,0},{"",0,0},
+      {"_non_existent", &POA_CORBA::IRObject::_non_existent_skel, 0},
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -1254,7 +1423,7 @@ TAO_CORBA_IRObject_Perfect_Hash_OpTable::lookup (const char *str, unsigned int l
 static TAO_CORBA_IRObject_Perfect_Hash_OpTable tao_CORBA_IRObject_optable;
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:999
+// be\be_visitor_interface/interface_ss.cpp:921
 
 TAO::Collocation_Proxy_Broker *
 CORBA__TAO_IRObject_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -1274,10 +1443,7 @@ CORBA__TAO_IRObject_Proxy_Broker_Factory_Initializer (size_t)
 static int
 CORBA__TAO_IRObject_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
   CORBA__TAO_IRObject_Proxy_Broker_Factory_Initializer (
-      reinterpret_cast<
-          size_t> (
-          CORBA__TAO_IRObject_Proxy_Broker_Factory_Initializer
-        )
+      reinterpret_cast<size_t> (CORBA__TAO_IRObject_Proxy_Broker_Factory_Initializer)
     );
 
 
@@ -1323,8 +1489,8 @@ namespace POA_CORBA
     
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
-      TAO::SArg_Traits< CORBA::DefinitionKind>::ret_arg_type retval =
-        TAO::Portable_Server::get_ret_arg< CORBA::DefinitionKind, TAO::SArg_Traits< CORBA::DefinitionKind>::ret_arg_type> (
+      TAO::SArg_Traits< ::CORBA::DefinitionKind>::ret_arg_type retval =
+        TAO::Portable_Server::get_ret_arg< ::CORBA::DefinitionKind, TAO::SArg_Traits< ::CORBA::DefinitionKind>::ret_arg_type> (
           this->operation_details_,
           this->args_);
       
@@ -1361,7 +1527,7 @@ void POA_CORBA::IRObject::_get_def_kind_skel (
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
   
-  TAO::SArg_Traits< CORBA::DefinitionKind>::ret_val retval;
+  TAO::SArg_Traits< ::CORBA::DefinitionKind>::ret_val retval;
   
   TAO::Argument * const args[] =
     {
@@ -1501,8 +1667,8 @@ namespace POA_CORBA
           this->operation_details_,
           this->args_);
       
-      TAO::SArg_Traits< CORBA::Char *>::in_arg_type arg_1 =
-        TAO::Portable_Server::get_in_arg< CORBA::Char *, TAO::SArg_Traits< CORBA::Char *>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
@@ -1537,7 +1703,7 @@ void POA_CORBA::IRObject::_is_a_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  TAO::SArg_Traits< CORBA::Char *>::in_arg_val _tao_repository_id;
+  TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
   
   TAO::Argument * const args[] =
     {
@@ -1658,10 +1824,98 @@ void POA_CORBA::IRObject::_non_existent_skel (
   
 }
 
+namespace POA_CORBA
+{
+  
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_operation/upcall_command_ss.cpp:127
+  
+  class _repository_id_IRObject_Upcall_Command
+    : public TAO::Upcall_Command
+  {
+  public:
+    inline _repository_id_IRObject_Upcall_Command (
+      POA_CORBA::IRObject * servant,
+      TAO_Operation_Details const * operation_details,
+      TAO::Argument * const args[])
+      : servant_ (servant)
+      , operation_details_ (operation_details)
+      , args_ (args)
+    {
+    }
+    
+    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+    {
+      TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
+        TAO::Portable_Server::get_ret_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type> (
+          this->operation_details_,
+          this->args_);
+      
+      
+      retval =
+        this->servant_-> _repository_id (
+          ACE_ENV_SINGLE_ARG_PARAMETER);
+        
+    }
+  
+  private:
+    POA_CORBA::IRObject * const servant_;
+    TAO_Operation_Details const * const operation_details_;
+    TAO::Argument * const * const args_;
+  };
+  
+}
+void POA_CORBA::IRObject::_repository_id_skel (
+    TAO_ServerRequest & server_request, 
+    void * TAO_INTERCEPTOR (servant_upcall),
+    void * servant
+    ACE_ENV_ARG_DECL
+  )
+{
+  
+  
+#if TAO_HAS_INTERCEPTORS == 1
+  static CORBA::TypeCode_ptr const * const exceptions = 0;
+  static size_t const nexceptions = 0;
+#endif /* TAO_HAS_INTERCEPTORS */
+  
+  TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
+  
+  TAO::Argument * const args[] =
+    {
+      &retval
+    };
+  
+  static size_t const nargs = 1;
+  
+  POA_CORBA::IRObject * const impl =
+    static_cast<POA_CORBA::IRObject *> (servant);
+  
+  _repository_id_IRObject_Upcall_Command command (
+    impl,
+    server_request.operation_details (),
+    args);
+  
+  TAO::Upcall_Wrapper upcall_wrapper;
+  upcall_wrapper.upcall (server_request
+                         , args
+                         , nargs
+                         , command
+#if TAO_HAS_INTERCEPTORS == 1
+                         , servant_upcall
+                         , exceptions
+                         , nexceptions
+#endif  /* TAO_HAS_INTERCEPTORS == 1 */
+                         ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+  
+}
+
 
 
 // TAO_IDL - Generated from 
-// be\be_visitor_interface/interface_ss.cpp:393
+// be\be_visitor_interface/interface_ss.cpp:501
 
 
 
@@ -1818,7 +2072,7 @@ const char* POA_CORBA::IRObject::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:940
+// be\be_visitor_interface/interface_ss.cpp:862
 
 void POA_CORBA::IRObject::_dispatch (
     TAO_ServerRequest & req,
@@ -1833,7 +2087,7 @@ void POA_CORBA::IRObject::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:891
+// be\be_visitor_interface/interface_ss.cpp:813
 
 CORBA::IRObject *
 POA_CORBA::IRObject::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -1865,7 +2119,7 @@ POA_CORBA::IRObject::_this (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1455
+// be\be_interface.cpp:1465
 
 class TAO_CORBA_Contained_Perfect_Hash_OpTable
   : public TAO_Perfect_Hash_OpTable
@@ -1878,7 +2132,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: c:\ace\latest\ACE_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0 -a -o -t -p -K opname -L C++ -Z TAO_CORBA_Contained_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ACE\Any\ACE_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0 -a -o -t -p -K opname -L C++ -Z TAO_CORBA_Contained_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_Contained_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -1935,14 +2189,14 @@ TAO_CORBA_Contained_Perfect_Hash_OpTable::lookup (const char *str, unsigned int
 {
   enum
     {
-      TOTAL_KEYWORDS = 17,
+      TOTAL_KEYWORDS = 18,
       MIN_WORD_LENGTH = 4,
       MAX_WORD_LENGTH = 26,
       MIN_HASH_VALUE = 4,
       MAX_HASH_VALUE = 36,
       HASH_VALUE_RANGE = 33,
       DUPLICATES = 4,
-      WORDLIST_SIZE = 21
+      WORDLIST_SIZE = 22
     };
 
   static const TAO_operation_db_entry  wordlist[] =
@@ -1959,6 +2213,7 @@ TAO_CORBA_Contained_Perfect_Hash_OpTable::lookup (const char *str, unsigned int
       {"_get_version", &POA_CORBA::Contained::_get_version_skel, 0},
       {"_set_version", &POA_CORBA::Contained::_set_version_skel, 0},
       {"_get_def_kind", &POA_CORBA::Contained::_get_def_kind_skel, 0},
+      {"_repository_id", &POA_CORBA::Contained::_repository_id_skel, 0},
       {"_get_defined_in", &POA_CORBA::Contained::_get_defined_in_skel, 0},
       {"destroy", &POA_CORBA::Contained::destroy_skel, 0},
       {"_get_absolute_name", &POA_CORBA::Contained::_get_absolute_name_skel, 0},
@@ -1970,8 +2225,8 @@ TAO_CORBA_Contained_Perfect_Hash_OpTable::lookup (const char *str, unsigned int
   static const signed char lookup[] =
     {
        -9,  -2, -12,  -2,   4,   5,  -1,  50,   8, -45,  11,  -1, -46,  14, 
-       -1,  15,  -1,  16,  17,  -1,  18,  -6,  -2,  19,  -1,  -1,  -1,  -1, 
-       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  20, 
+       15,  16,  -1,  17,  18,  -1,  19,  -6,  -2,  20,  -1,  -1,  -1,  -1, 
+       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  21, 
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -2009,7 +2264,7 @@ TAO_CORBA_Contained_Perfect_Hash_OpTable::lookup (const char *str, unsigned int
 static TAO_CORBA_Contained_Perfect_Hash_OpTable tao_CORBA_Contained_optable;
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:999
+// be\be_visitor_interface/interface_ss.cpp:921
 
 TAO::Collocation_Proxy_Broker *
 CORBA__TAO_Contained_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -2029,10 +2284,7 @@ CORBA__TAO_Contained_Proxy_Broker_Factory_Initializer (size_t)
 static int
 CORBA__TAO_Contained_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
   CORBA__TAO_Contained_Proxy_Broker_Factory_Initializer (
-      reinterpret_cast<
-          size_t> (
-          CORBA__TAO_Contained_Proxy_Broker_Factory_Initializer
-        )
+      reinterpret_cast<size_t> (CORBA__TAO_Contained_Proxy_Broker_Factory_Initializer)
     );
 
 
@@ -2079,8 +2331,8 @@ namespace POA_CORBA
     
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
-      TAO::SArg_Traits< CORBA::RepositoryId>::ret_arg_type retval =
-        TAO::Portable_Server::get_ret_arg< CORBA::RepositoryId, TAO::SArg_Traits< CORBA::RepositoryId>::ret_arg_type> (
+      TAO::SArg_Traits< ::CORBA::RepositoryId>::ret_arg_type retval =
+        TAO::Portable_Server::get_ret_arg< ::CORBA::RepositoryId, TAO::SArg_Traits< ::CORBA::RepositoryId>::ret_arg_type> (
           this->operation_details_,
           this->args_);
       
@@ -2117,7 +2369,7 @@ void POA_CORBA::Contained::_get_id_skel (
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
   
-  TAO::SArg_Traits< CORBA::RepositoryId>::ret_val retval;
+  TAO::SArg_Traits< ::CORBA::RepositoryId>::ret_val retval;
   
   TAO::Argument * const args[] =
     {
@@ -2171,8 +2423,8 @@ namespace POA_CORBA
     
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
-      TAO::SArg_Traits< CORBA::RepositoryId>::in_arg_type arg_1 =
-        TAO::Portable_Server::get_in_arg< CORBA::RepositoryId, TAO::SArg_Traits< CORBA::RepositoryId>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId, TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
@@ -2210,7 +2462,7 @@ void POA_CORBA::Contained::_set_id_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   TAO::SArg_Traits< void>::ret_val retval;
-  TAO::SArg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id;
+  TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
   
   TAO::Argument * const args[] =
     {
@@ -2265,8 +2517,8 @@ namespace POA_CORBA
     
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
-      TAO::SArg_Traits< CORBA::Identifier>::ret_arg_type retval =
-        TAO::Portable_Server::get_ret_arg< CORBA::Identifier, TAO::SArg_Traits< CORBA::Identifier>::ret_arg_type> (
+      TAO::SArg_Traits< ::CORBA::Identifier>::ret_arg_type retval =
+        TAO::Portable_Server::get_ret_arg< ::CORBA::Identifier, TAO::SArg_Traits< ::CORBA::Identifier>::ret_arg_type> (
           this->operation_details_,
           this->args_);
       
@@ -2303,7 +2555,7 @@ void POA_CORBA::Contained::_get_name_skel (
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
   
-  TAO::SArg_Traits< CORBA::Identifier>::ret_val retval;
+  TAO::SArg_Traits< ::CORBA::Identifier>::ret_val retval;
   
   TAO::Argument * const args[] =
     {
@@ -2357,8 +2609,8 @@ namespace POA_CORBA
     
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
-      TAO::SArg_Traits< CORBA::Identifier>::in_arg_type arg_1 =
-        TAO::Portable_Server::get_in_arg< CORBA::Identifier, TAO::SArg_Traits< CORBA::Identifier>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_1 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::Identifier, TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
@@ -2396,7 +2648,7 @@ void POA_CORBA::Contained::_set_name_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   TAO::SArg_Traits< void>::ret_val retval;
-  TAO::SArg_Traits< CORBA::Identifier>::in_arg_val _tao_name;
+  TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
   
   TAO::Argument * const args[] =
     {
@@ -2451,8 +2703,8 @@ namespace POA_CORBA
     
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
-      TAO::SArg_Traits< CORBA::VersionSpec>::ret_arg_type retval =
-        TAO::Portable_Server::get_ret_arg< CORBA::VersionSpec, TAO::SArg_Traits< CORBA::VersionSpec>::ret_arg_type> (
+      TAO::SArg_Traits< ::CORBA::VersionSpec>::ret_arg_type retval =
+        TAO::Portable_Server::get_ret_arg< ::CORBA::VersionSpec, TAO::SArg_Traits< ::CORBA::VersionSpec>::ret_arg_type> (
           this->operation_details_,
           this->args_);
       
@@ -2489,7 +2741,7 @@ void POA_CORBA::Contained::_get_version_skel (
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
   
-  TAO::SArg_Traits< CORBA::VersionSpec>::ret_val retval;
+  TAO::SArg_Traits< ::CORBA::VersionSpec>::ret_val retval;
   
   TAO::Argument * const args[] =
     {
@@ -2543,8 +2795,8 @@ namespace POA_CORBA
     
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
-      TAO::SArg_Traits< CORBA::VersionSpec>::in_arg_type arg_1 =
-        TAO::Portable_Server::get_in_arg< CORBA::VersionSpec, TAO::SArg_Traits< CORBA::VersionSpec>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_1 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec, TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
@@ -2582,7 +2834,7 @@ void POA_CORBA::Contained::_set_version_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   TAO::SArg_Traits< void>::ret_val retval;
-  TAO::SArg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version;
+  TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version;
   
   TAO::Argument * const args[] =
     {
@@ -2637,8 +2889,8 @@ namespace POA_CORBA
     
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
-      TAO::SArg_Traits< CORBA::Container>::ret_arg_type retval =
-        TAO::Portable_Server::get_ret_arg< CORBA::Container, TAO::SArg_Traits< CORBA::Container>::ret_arg_type> (
+      TAO::SArg_Traits< ::CORBA::Container>::ret_arg_type retval =
+        TAO::Portable_Server::get_ret_arg< ::CORBA::Container, TAO::SArg_Traits< ::CORBA::Container>::ret_arg_type> (
           this->operation_details_,
           this->args_);
       
@@ -2675,7 +2927,7 @@ void POA_CORBA::Contained::_get_defined_in_skel (
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
   
-  TAO::SArg_Traits< CORBA::Container>::ret_val retval;
+  TAO::SArg_Traits< ::CORBA::Container>::ret_val retval;
   
   TAO::Argument * const args[] =
     {
@@ -2729,8 +2981,8 @@ namespace POA_CORBA
     
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
-      TAO::SArg_Traits< CORBA::ScopedName>::ret_arg_type retval =
-        TAO::Portable_Server::get_ret_arg< CORBA::ScopedName, TAO::SArg_Traits< CORBA::ScopedName>::ret_arg_type> (
+      TAO::SArg_Traits< ::CORBA::ScopedName>::ret_arg_type retval =
+        TAO::Portable_Server::get_ret_arg< ::CORBA::ScopedName, TAO::SArg_Traits< ::CORBA::ScopedName>::ret_arg_type> (
           this->operation_details_,
           this->args_);
       
@@ -2767,7 +3019,7 @@ void POA_CORBA::Contained::_get_absolute_name_skel (
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
   
-  TAO::SArg_Traits< CORBA::ScopedName>::ret_val retval;
+  TAO::SArg_Traits< ::CORBA::ScopedName>::ret_val retval;
   
   TAO::Argument * const args[] =
     {
@@ -2821,8 +3073,8 @@ namespace POA_CORBA
     
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
-      TAO::SArg_Traits< CORBA::Repository>::ret_arg_type retval =
-        TAO::Portable_Server::get_ret_arg< CORBA::Repository, TAO::SArg_Traits< CORBA::Repository>::ret_arg_type> (
+      TAO::SArg_Traits< ::CORBA::Repository>::ret_arg_type retval =
+        TAO::Portable_Server::get_ret_arg< ::CORBA::Repository, TAO::SArg_Traits< ::CORBA::Repository>::ret_arg_type> (
           this->operation_details_,
           this->args_);
       
@@ -2859,7 +3111,7 @@ void POA_CORBA::Contained::_get_containing_repository_skel (
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
   
-  TAO::SArg_Traits< CORBA::Repository>::ret_val retval;
+  TAO::SArg_Traits< ::CORBA::Repository>::ret_val retval;
   
   TAO::Argument * const args[] =
     {
@@ -2913,8 +3165,8 @@ namespace POA_CORBA
     
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
-      TAO::SArg_Traits< CORBA::Contained::Description>::ret_arg_type retval =
-        TAO::Portable_Server::get_ret_arg< CORBA::Contained::Description, TAO::SArg_Traits< CORBA::Contained::Description>::ret_arg_type> (
+      TAO::SArg_Traits< ::CORBA::Contained::Description>::ret_arg_type retval =
+        TAO::Portable_Server::get_ret_arg< ::CORBA::Contained::Description, TAO::SArg_Traits< ::CORBA::Contained::Description>::ret_arg_type> (
           this->operation_details_,
           this->args_);
       
@@ -2951,7 +3203,7 @@ void POA_CORBA::Contained::describe_skel (
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
   
-  TAO::SArg_Traits< CORBA::Contained::Description>::ret_val retval;
+  TAO::SArg_Traits< ::CORBA::Contained::Description>::ret_val retval;
   
   TAO::Argument * const args[] =
     {
@@ -3005,20 +3257,20 @@ namespace POA_CORBA
     
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
-      TAO::SArg_Traits< CORBA::Container>::in_arg_type arg_1 =
-        TAO::Portable_Server::get_in_arg< CORBA::Container, TAO::SArg_Traits< CORBA::Container>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::Container>::in_arg_type arg_1 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::Container, TAO::SArg_Traits< ::CORBA::Container>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
         
-      TAO::SArg_Traits< CORBA::Identifier>::in_arg_type arg_2 =
-        TAO::Portable_Server::get_in_arg< CORBA::Identifier, TAO::SArg_Traits< CORBA::Identifier>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::Identifier, TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type> (
           this->operation_details_,
           this->args_,
           2);
         
-      TAO::SArg_Traits< CORBA::VersionSpec>::in_arg_type arg_3 =
-        TAO::Portable_Server::get_in_arg< CORBA::VersionSpec, TAO::SArg_Traits< CORBA::VersionSpec>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec, TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type> (
           this->operation_details_,
           this->args_,
           3);
@@ -3058,9 +3310,9 @@ void POA_CORBA::Contained::move_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   TAO::SArg_Traits< void>::ret_val retval;
-  TAO::SArg_Traits< CORBA::Container>::in_arg_val _tao_new_container;
-  TAO::SArg_Traits< CORBA::Identifier>::in_arg_val _tao_new_name;
-  TAO::SArg_Traits< CORBA::VersionSpec>::in_arg_val _tao_new_version;
+  TAO::SArg_Traits< ::CORBA::Container>::in_arg_val _tao_new_container;
+  TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_new_name;
+  TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_new_version;
   
   TAO::Argument * const args[] =
     {
@@ -3126,8 +3378,8 @@ namespace POA_CORBA
           this->operation_details_,
           this->args_);
       
-      TAO::SArg_Traits< CORBA::Char *>::in_arg_type arg_1 =
-        TAO::Portable_Server::get_in_arg< CORBA::Char *, TAO::SArg_Traits< CORBA::Char *>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
@@ -3162,7 +3414,7 @@ void POA_CORBA::Contained::_is_a_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  TAO::SArg_Traits< CORBA::Char *>::in_arg_val _tao_repository_id;
+  TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
   
   TAO::Argument * const args[] =
     {
@@ -3283,10 +3535,98 @@ void POA_CORBA::Contained::_non_existent_skel (
   
 }
 
+namespace POA_CORBA
+{
+  
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_operation/upcall_command_ss.cpp:127
+  
+  class _repository_id_Contained_Upcall_Command
+    : public TAO::Upcall_Command
+  {
+  public:
+    inline _repository_id_Contained_Upcall_Command (
+      POA_CORBA::Contained * servant,
+      TAO_Operation_Details const * operation_details,
+      TAO::Argument * const args[])
+      : servant_ (servant)
+      , operation_details_ (operation_details)
+      , args_ (args)
+    {
+    }
+    
+    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+    {
+      TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
+        TAO::Portable_Server::get_ret_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type> (
+          this->operation_details_,
+          this->args_);
+      
+      
+      retval =
+        this->servant_-> _repository_id (
+          ACE_ENV_SINGLE_ARG_PARAMETER);
+        
+    }
+  
+  private:
+    POA_CORBA::Contained * const servant_;
+    TAO_Operation_Details const * const operation_details_;
+    TAO::Argument * const * const args_;
+  };
+  
+}
+void POA_CORBA::Contained::_repository_id_skel (
+    TAO_ServerRequest & server_request, 
+    void * TAO_INTERCEPTOR (servant_upcall),
+    void * servant
+    ACE_ENV_ARG_DECL
+  )
+{
+  
+  
+#if TAO_HAS_INTERCEPTORS == 1
+  static CORBA::TypeCode_ptr const * const exceptions = 0;
+  static size_t const nexceptions = 0;
+#endif /* TAO_HAS_INTERCEPTORS */
+  
+  TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
+  
+  TAO::Argument * const args[] =
+    {
+      &retval
+    };
+  
+  static size_t const nargs = 1;
+  
+  POA_CORBA::Contained * const impl =
+    static_cast<POA_CORBA::Contained *> (servant);
+  
+  _repository_id_Contained_Upcall_Command command (
+    impl,
+    server_request.operation_details (),
+    args);
+  
+  TAO::Upcall_Wrapper upcall_wrapper;
+  upcall_wrapper.upcall (server_request
+                         , args
+                         , nargs
+                         , command
+#if TAO_HAS_INTERCEPTORS == 1
+                         , servant_upcall
+                         , exceptions
+                         , nexceptions
+#endif  /* TAO_HAS_INTERCEPTORS == 1 */
+                         ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+  
+}
+
 
 
 // TAO_IDL - Generated from 
-// be\be_visitor_interface/interface_ss.cpp:393
+// be\be_visitor_interface/interface_ss.cpp:501
 
 
 
@@ -3447,7 +3787,7 @@ const char* POA_CORBA::Contained::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:940
+// be\be_visitor_interface/interface_ss.cpp:862
 
 void POA_CORBA::Contained::_dispatch (
     TAO_ServerRequest & req,
@@ -3462,7 +3802,7 @@ void POA_CORBA::Contained::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:891
+// be\be_visitor_interface/interface_ss.cpp:813
 
 CORBA::Contained *
 POA_CORBA::Contained::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -3494,7 +3834,7 @@ POA_CORBA::Contained::_this (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1455
+// be\be_interface.cpp:1465
 
 class TAO_CORBA_Container_Perfect_Hash_OpTable
   : public TAO_Perfect_Hash_OpTable
@@ -3507,7 +3847,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: c:\ace\latest\ACE_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0 -a -o -t -p -K opname -L C++ -Z TAO_CORBA_Container_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ACE\Any\ACE_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0 -a -o -t -p -K opname -L C++ -Z TAO_CORBA_Container_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_Container_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -3564,14 +3904,14 @@ TAO_CORBA_Container_Perfect_Hash_OpTable::lookup (const char *str, unsigned int
 {
   enum
     {
-      TOTAL_KEYWORDS = 24,
+      TOTAL_KEYWORDS = 25,
       MIN_WORD_LENGTH = 5,
       MAX_WORD_LENGTH = 25,
       MIN_HASH_VALUE = 6,
       MAX_HASH_VALUE = 40,
       HASH_VALUE_RANGE = 35,
       DUPLICATES = 3,
-      WORDLIST_SIZE = 30
+      WORDLIST_SIZE = 31
     };
 
   static const TAO_operation_db_entry  wordlist[] =
@@ -3598,6 +3938,7 @@ TAO_CORBA_Container_Perfect_Hash_OpTable::lookup (const char *str, unsigned int
       {"create_enum", &POA_CORBA::Container::create_enum_skel, 0},
       {"describe_contents", &POA_CORBA::Container::describe_contents_skel, 0},
       {"_get_def_kind", &POA_CORBA::Container::_get_def_kind_skel, 0},
+      {"_repository_id", &POA_CORBA::Container::_repository_id_skel, 0},
       {"_component", &POA_CORBA::Container::_component_skel, 0},
       {"_non_existent", &POA_CORBA::Container::_non_existent_skel, 0},
       {"_is_a", &POA_CORBA::Container::_is_a_skel, 0},
@@ -3607,7 +3948,7 @@ TAO_CORBA_Container_Perfect_Hash_OpTable::lookup (const char *str, unsigned int
     {
        -1,  -1,  -1,  -1,  -1,  -1,   6,   7,  -1, -10,  -2,   8,   9, -44, 
       -12,  -2, -42,  14,  15,  -1,  16,  17,  18,  19,  -1,  20,  21,  22, 
-       -1,  -1,  23,  24,  25,  26,  -1,  27,  -1,  -1,  28,  -1,  29, 
+       -1,  -1,  23,  24,  25,  26,  27,  28,  -1,  -1,  29,  -1,  30, 
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -3645,7 +3986,7 @@ TAO_CORBA_Container_Perfect_Hash_OpTable::lookup (const char *str, unsigned int
 static TAO_CORBA_Container_Perfect_Hash_OpTable tao_CORBA_Container_optable;
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:999
+// be\be_visitor_interface/interface_ss.cpp:921
 
 TAO::Collocation_Proxy_Broker *
 CORBA__TAO_Container_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -3665,10 +4006,7 @@ CORBA__TAO_Container_Proxy_Broker_Factory_Initializer (size_t)
 static int
 CORBA__TAO_Container_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
   CORBA__TAO_Container_Proxy_Broker_Factory_Initializer (
-      reinterpret_cast<
-          size_t> (
-          CORBA__TAO_Container_Proxy_Broker_Factory_Initializer
-        )
+      reinterpret_cast<size_t> (CORBA__TAO_Container_Proxy_Broker_Factory_Initializer)
     );
 
 
@@ -3715,13 +4053,13 @@ namespace POA_CORBA
     
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
-      TAO::SArg_Traits< CORBA::Contained>::ret_arg_type retval =
-        TAO::Portable_Server::get_ret_arg< CORBA::Contained, TAO::SArg_Traits< CORBA::Contained>::ret_arg_type> (
+      TAO::SArg_Traits< ::CORBA::Contained>::ret_arg_type retval =
+        TAO::Portable_Server::get_ret_arg< ::CORBA::Contained, TAO::SArg_Traits< ::CORBA::Contained>::ret_arg_type> (
           this->operation_details_,
           this->args_);
       
-      TAO::SArg_Traits< CORBA::ScopedName>::in_arg_type arg_1 =
-        TAO::Portable_Server::get_in_arg< CORBA::ScopedName, TAO::SArg_Traits< CORBA::ScopedName>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::ScopedName>::in_arg_type arg_1 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::ScopedName, TAO::SArg_Traits< ::CORBA::ScopedName>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
@@ -3760,8 +4098,8 @@ void POA_CORBA::Container::lookup_skel (
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
   
-  TAO::SArg_Traits< CORBA::Contained>::ret_val retval;
-  TAO::SArg_Traits< CORBA::ScopedName>::in_arg_val _tao_search_name;
+  TAO::SArg_Traits< ::CORBA::Contained>::ret_val retval;
+  TAO::SArg_Traits< ::CORBA::ScopedName>::in_arg_val _tao_search_name;
   
   TAO::Argument * const args[] =
     {
@@ -3816,13 +4154,13 @@ namespace POA_CORBA
     
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
-      TAO::SArg_Traits< CORBA::ContainedSeq>::ret_arg_type retval =
-        TAO::Portable_Server::get_ret_arg< CORBA::ContainedSeq, TAO::SArg_Traits< CORBA::ContainedSeq>::ret_arg_type> (
+      TAO::SArg_Traits< ::CORBA::ContainedSeq>::ret_arg_type retval =
+        TAO::Portable_Server::get_ret_arg< ::CORBA::ContainedSeq, TAO::SArg_Traits< ::CORBA::ContainedSeq>::ret_arg_type> (
           this->operation_details_,
           this->args_);
       
-      TAO::SArg_Traits< CORBA::DefinitionKind>::in_arg_type arg_1 =
-        TAO::Portable_Server::get_in_arg< CORBA::DefinitionKind, TAO::SArg_Traits< CORBA::DefinitionKind>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::DefinitionKind>::in_arg_type arg_1 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::DefinitionKind, TAO::SArg_Traits< ::CORBA::DefinitionKind>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
@@ -3868,8 +4206,8 @@ void POA_CORBA::Container::contents_skel (
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
   
-  TAO::SArg_Traits< CORBA::ContainedSeq>::ret_val retval;
-  TAO::SArg_Traits< CORBA::DefinitionKind>::in_arg_val _tao_limit_type;
+  TAO::SArg_Traits< ::CORBA::ContainedSeq>::ret_val retval;
+  TAO::SArg_Traits< ::CORBA::DefinitionKind>::in_arg_val _tao_limit_type;
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_exclude_inherited;
   
   TAO::Argument * const args[] =
@@ -3926,13 +4264,13 @@ namespace POA_CORBA
     
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
-      TAO::SArg_Traits< CORBA::ContainedSeq>::ret_arg_type retval =
-        TAO::Portable_Server::get_ret_arg< CORBA::ContainedSeq, TAO::SArg_Traits< CORBA::ContainedSeq>::ret_arg_type> (
+      TAO::SArg_Traits< ::CORBA::ContainedSeq>::ret_arg_type retval =
+        TAO::Portable_Server::get_ret_arg< ::CORBA::ContainedSeq, TAO::SArg_Traits< ::CORBA::ContainedSeq>::ret_arg_type> (
           this->operation_details_,
           this->args_);
       
-      TAO::SArg_Traits< CORBA::Identifier>::in_arg_type arg_1 =
-        TAO::Portable_Server::get_in_arg< CORBA::Identifier, TAO::SArg_Traits< CORBA::Identifier>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_1 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::Identifier, TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
@@ -3943,8 +4281,8 @@ namespace POA_CORBA
           this->args_,
           2);
         
-      TAO::SArg_Traits< CORBA::DefinitionKind>::in_arg_type arg_3 =
-        TAO::Portable_Server::get_in_arg< CORBA::DefinitionKind, TAO::SArg_Traits< CORBA::DefinitionKind>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::DefinitionKind>::in_arg_type arg_3 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::DefinitionKind, TAO::SArg_Traits< ::CORBA::DefinitionKind>::in_arg_type> (
           this->operation_details_,
           this->args_,
           3);
@@ -3992,10 +4330,10 @@ void POA_CORBA::Container::lookup_name_skel (
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
   
-  TAO::SArg_Traits< CORBA::ContainedSeq>::ret_val retval;
-  TAO::SArg_Traits< CORBA::Identifier>::in_arg_val _tao_search_name;
+  TAO::SArg_Traits< ::CORBA::ContainedSeq>::ret_val retval;
+  TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_search_name;
   TAO::SArg_Traits< ::CORBA::Long>::in_arg_val _tao_levels_to_search;
-  TAO::SArg_Traits< CORBA::DefinitionKind>::in_arg_val _tao_limit_type;
+  TAO::SArg_Traits< ::CORBA::DefinitionKind>::in_arg_val _tao_limit_type;
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_exclude_inherited;
   
   TAO::Argument * const args[] =
@@ -4054,13 +4392,13 @@ namespace POA_CORBA
     
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
-      TAO::SArg_Traits< CORBA::Container::DescriptionSeq>::ret_arg_type retval =
-        TAO::Portable_Server::get_ret_arg< CORBA::Container::DescriptionSeq, TAO::SArg_Traits< CORBA::Container::DescriptionSeq>::ret_arg_type> (
+      TAO::SArg_Traits< ::CORBA::Container::DescriptionSeq>::ret_arg_type retval =
+        TAO::Portable_Server::get_ret_arg< ::CORBA::Container::DescriptionSeq, TAO::SArg_Traits< ::CORBA::Container::DescriptionSeq>::ret_arg_type> (
           this->operation_details_,
           this->args_);
       
-      TAO::SArg_Traits< CORBA::DefinitionKind>::in_arg_type arg_1 =
-        TAO::Portable_Server::get_in_arg< CORBA::DefinitionKind, TAO::SArg_Traits< CORBA::DefinitionKind>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::DefinitionKind>::in_arg_type arg_1 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::DefinitionKind, TAO::SArg_Traits< ::CORBA::DefinitionKind>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
@@ -4113,8 +4451,8 @@ void POA_CORBA::Container::describe_contents_skel (
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
   
-  TAO::SArg_Traits< CORBA::Container::DescriptionSeq>::ret_val retval;
-  TAO::SArg_Traits< CORBA::DefinitionKind>::in_arg_val _tao_limit_type;
+  TAO::SArg_Traits< ::CORBA::Container::DescriptionSeq>::ret_val retval;
+  TAO::SArg_Traits< ::CORBA::DefinitionKind>::in_arg_val _tao_limit_type;
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_exclude_inherited;
   TAO::SArg_Traits< ::CORBA::Long>::in_arg_val _tao_max_returned_objs;
   
@@ -4173,25 +4511,25 @@ namespace POA_CORBA
     
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
-      TAO::SArg_Traits< CORBA::ModuleDef>::ret_arg_type retval =
-        TAO::Portable_Server::get_ret_arg< CORBA::ModuleDef, TAO::SArg_Traits< CORBA::ModuleDef>::ret_arg_type> (
+      TAO::SArg_Traits< ::CORBA::ModuleDef>::ret_arg_type retval =
+        TAO::Portable_Server::get_ret_arg< ::CORBA::ModuleDef, TAO::SArg_Traits< ::CORBA::ModuleDef>::ret_arg_type> (
           this->operation_details_,
           this->args_);
       
-      TAO::SArg_Traits< CORBA::RepositoryId>::in_arg_type arg_1 =
-        TAO::Portable_Server::get_in_arg< CORBA::RepositoryId, TAO::SArg_Traits< CORBA::RepositoryId>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId, TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
         
-      TAO::SArg_Traits< CORBA::Identifier>::in_arg_type arg_2 =
-        TAO::Portable_Server::get_in_arg< CORBA::Identifier, TAO::SArg_Traits< CORBA::Identifier>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::Identifier, TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type> (
           this->operation_details_,
           this->args_,
           2);
         
-      TAO::SArg_Traits< CORBA::VersionSpec>::in_arg_type arg_3 =
-        TAO::Portable_Server::get_in_arg< CORBA::VersionSpec, TAO::SArg_Traits< CORBA::VersionSpec>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec, TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type> (
           this->operation_details_,
           this->args_,
           3);
@@ -4232,10 +4570,10 @@ void POA_CORBA::Container::create_module_skel (
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
   
-  TAO::SArg_Traits< CORBA::ModuleDef>::ret_val retval;
-  TAO::SArg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id;
-  TAO::SArg_Traits< CORBA::Identifier>::in_arg_val _tao_name;
-  TAO::SArg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version;
+  TAO::SArg_Traits< ::CORBA::ModuleDef>::ret_val retval;
+  TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
+  TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
+  TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version;
   
   TAO::Argument * const args[] =
     {
@@ -4292,31 +4630,31 @@ namespace POA_CORBA
     
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
-      TAO::SArg_Traits< CORBA::ConstantDef>::ret_arg_type retval =
-        TAO::Portable_Server::get_ret_arg< CORBA::ConstantDef, TAO::SArg_Traits< CORBA::ConstantDef>::ret_arg_type> (
+      TAO::SArg_Traits< ::CORBA::ConstantDef>::ret_arg_type retval =
+        TAO::Portable_Server::get_ret_arg< ::CORBA::ConstantDef, TAO::SArg_Traits< ::CORBA::ConstantDef>::ret_arg_type> (
           this->operation_details_,
           this->args_);
       
-      TAO::SArg_Traits< CORBA::RepositoryId>::in_arg_type arg_1 =
-        TAO::Portable_Server::get_in_arg< CORBA::RepositoryId, TAO::SArg_Traits< CORBA::RepositoryId>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId, TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
         
-      TAO::SArg_Traits< CORBA::Identifier>::in_arg_type arg_2 =
-        TAO::Portable_Server::get_in_arg< CORBA::Identifier, TAO::SArg_Traits< CORBA::Identifier>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::Identifier, TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type> (
           this->operation_details_,
           this->args_,
           2);
         
-      TAO::SArg_Traits< CORBA::VersionSpec>::in_arg_type arg_3 =
-        TAO::Portable_Server::get_in_arg< CORBA::VersionSpec, TAO::SArg_Traits< CORBA::VersionSpec>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec, TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type> (
           this->operation_details_,
           this->args_,
           3);
         
-      TAO::SArg_Traits< CORBA::IDLType>::in_arg_type arg_4 =
-        TAO::Portable_Server::get_in_arg< CORBA::IDLType, TAO::SArg_Traits< CORBA::IDLType>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_type arg_4 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::IDLType, TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_type> (
           this->operation_details_,
           this->args_,
           4);
@@ -4365,11 +4703,11 @@ void POA_CORBA::Container::create_constant_skel (
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
   
-  TAO::SArg_Traits< CORBA::ConstantDef>::ret_val retval;
-  TAO::SArg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id;
-  TAO::SArg_Traits< CORBA::Identifier>::in_arg_val _tao_name;
-  TAO::SArg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version;
-  TAO::SArg_Traits< CORBA::IDLType>::in_arg_val _tao_type;
+  TAO::SArg_Traits< ::CORBA::ConstantDef>::ret_val retval;
+  TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
+  TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
+  TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version;
+  TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_val _tao_type;
   TAO::SArg_Traits< ::CORBA::Any>::in_arg_val _tao_value;
   
   TAO::Argument * const args[] =
@@ -4429,31 +4767,31 @@ namespace POA_CORBA
     
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
-      TAO::SArg_Traits< CORBA::StructDef>::ret_arg_type retval =
-        TAO::Portable_Server::get_ret_arg< CORBA::StructDef, TAO::SArg_Traits< CORBA::StructDef>::ret_arg_type> (
+      TAO::SArg_Traits< ::CORBA::StructDef>::ret_arg_type retval =
+        TAO::Portable_Server::get_ret_arg< ::CORBA::StructDef, TAO::SArg_Traits< ::CORBA::StructDef>::ret_arg_type> (
           this->operation_details_,
           this->args_);
       
-      TAO::SArg_Traits< CORBA::RepositoryId>::in_arg_type arg_1 =
-        TAO::Portable_Server::get_in_arg< CORBA::RepositoryId, TAO::SArg_Traits< CORBA::RepositoryId>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId, TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
         
-      TAO::SArg_Traits< CORBA::Identifier>::in_arg_type arg_2 =
-        TAO::Portable_Server::get_in_arg< CORBA::Identifier, TAO::SArg_Traits< CORBA::Identifier>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::Identifier, TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type> (
           this->operation_details_,
           this->args_,
           2);
         
-      TAO::SArg_Traits< CORBA::VersionSpec>::in_arg_type arg_3 =
-        TAO::Portable_Server::get_in_arg< CORBA::VersionSpec, TAO::SArg_Traits< CORBA::VersionSpec>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec, TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type> (
           this->operation_details_,
           this->args_,
           3);
         
-      TAO::SArg_Traits< CORBA::StructMemberSeq>::in_arg_type arg_4 =
-        TAO::Portable_Server::get_in_arg< CORBA::StructMemberSeq, TAO::SArg_Traits< CORBA::StructMemberSeq>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::StructMemberSeq>::in_arg_type arg_4 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::StructMemberSeq, TAO::SArg_Traits< ::CORBA::StructMemberSeq>::in_arg_type> (
           this->operation_details_,
           this->args_,
           4);
@@ -4495,11 +4833,11 @@ void POA_CORBA::Container::create_struct_skel (
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
   
-  TAO::SArg_Traits< CORBA::StructDef>::ret_val retval;
-  TAO::SArg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id;
-  TAO::SArg_Traits< CORBA::Identifier>::in_arg_val _tao_name;
-  TAO::SArg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version;
-  TAO::SArg_Traits< CORBA::StructMemberSeq>::in_arg_val _tao_members;
+  TAO::SArg_Traits< ::CORBA::StructDef>::ret_val retval;
+  TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
+  TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
+  TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version;
+  TAO::SArg_Traits< ::CORBA::StructMemberSeq>::in_arg_val _tao_members;
   
   TAO::Argument * const args[] =
     {
@@ -4557,37 +4895,37 @@ namespace POA_CORBA
     
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
-      TAO::SArg_Traits< CORBA::UnionDef>::ret_arg_type retval =
-        TAO::Portable_Server::get_ret_arg< CORBA::UnionDef, TAO::SArg_Traits< CORBA::UnionDef>::ret_arg_type> (
+      TAO::SArg_Traits< ::CORBA::UnionDef>::ret_arg_type retval =
+        TAO::Portable_Server::get_ret_arg< ::CORBA::UnionDef, TAO::SArg_Traits< ::CORBA::UnionDef>::ret_arg_type> (
           this->operation_details_,
           this->args_);
       
-      TAO::SArg_Traits< CORBA::RepositoryId>::in_arg_type arg_1 =
-        TAO::Portable_Server::get_in_arg< CORBA::RepositoryId, TAO::SArg_Traits< CORBA::RepositoryId>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId, TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
         
-      TAO::SArg_Traits< CORBA::Identifier>::in_arg_type arg_2 =
-        TAO::Portable_Server::get_in_arg< CORBA::Identifier, TAO::SArg_Traits< CORBA::Identifier>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::Identifier, TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type> (
           this->operation_details_,
           this->args_,
           2);
         
-      TAO::SArg_Traits< CORBA::VersionSpec>::in_arg_type arg_3 =
-        TAO::Portable_Server::get_in_arg< CORBA::VersionSpec, TAO::SArg_Traits< CORBA::VersionSpec>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec, TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type> (
           this->operation_details_,
           this->args_,
           3);
         
-      TAO::SArg_Traits< CORBA::IDLType>::in_arg_type arg_4 =
-        TAO::Portable_Server::get_in_arg< CORBA::IDLType, TAO::SArg_Traits< CORBA::IDLType>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_type arg_4 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::IDLType, TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_type> (
           this->operation_details_,
           this->args_,
           4);
         
-      TAO::SArg_Traits< CORBA::UnionMemberSeq>::in_arg_type arg_5 =
-        TAO::Portable_Server::get_in_arg< CORBA::UnionMemberSeq, TAO::SArg_Traits< CORBA::UnionMemberSeq>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::UnionMemberSeq>::in_arg_type arg_5 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::UnionMemberSeq, TAO::SArg_Traits< ::CORBA::UnionMemberSeq>::in_arg_type> (
           this->operation_details_,
           this->args_,
           5);
@@ -4630,12 +4968,12 @@ void POA_CORBA::Container::create_union_skel (
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
   
-  TAO::SArg_Traits< CORBA::UnionDef>::ret_val retval;
-  TAO::SArg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id;
-  TAO::SArg_Traits< CORBA::Identifier>::in_arg_val _tao_name;
-  TAO::SArg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version;
-  TAO::SArg_Traits< CORBA::IDLType>::in_arg_val _tao_discriminator_type;
-  TAO::SArg_Traits< CORBA::UnionMemberSeq>::in_arg_val _tao_members;
+  TAO::SArg_Traits< ::CORBA::UnionDef>::ret_val retval;
+  TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
+  TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
+  TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version;
+  TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_val _tao_discriminator_type;
+  TAO::SArg_Traits< ::CORBA::UnionMemberSeq>::in_arg_val _tao_members;
   
   TAO::Argument * const args[] =
     {
@@ -4694,31 +5032,31 @@ namespace POA_CORBA
     
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
-      TAO::SArg_Traits< CORBA::EnumDef>::ret_arg_type retval =
-        TAO::Portable_Server::get_ret_arg< CORBA::EnumDef, TAO::SArg_Traits< CORBA::EnumDef>::ret_arg_type> (
+      TAO::SArg_Traits< ::CORBA::EnumDef>::ret_arg_type retval =
+        TAO::Portable_Server::get_ret_arg< ::CORBA::EnumDef, TAO::SArg_Traits< ::CORBA::EnumDef>::ret_arg_type> (
           this->operation_details_,
           this->args_);
       
-      TAO::SArg_Traits< CORBA::RepositoryId>::in_arg_type arg_1 =
-        TAO::Portable_Server::get_in_arg< CORBA::RepositoryId, TAO::SArg_Traits< CORBA::RepositoryId>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId, TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
         
-      TAO::SArg_Traits< CORBA::Identifier>::in_arg_type arg_2 =
-        TAO::Portable_Server::get_in_arg< CORBA::Identifier, TAO::SArg_Traits< CORBA::Identifier>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::Identifier, TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type> (
           this->operation_details_,
           this->args_,
           2);
         
-      TAO::SArg_Traits< CORBA::VersionSpec>::in_arg_type arg_3 =
-        TAO::Portable_Server::get_in_arg< CORBA::VersionSpec, TAO::SArg_Traits< CORBA::VersionSpec>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec, TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type> (
           this->operation_details_,
           this->args_,
           3);
         
-      TAO::SArg_Traits< CORBA::EnumMemberSeq>::in_arg_type arg_4 =
-        TAO::Portable_Server::get_in_arg< CORBA::EnumMemberSeq, TAO::SArg_Traits< CORBA::EnumMemberSeq>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::EnumMemberSeq>::in_arg_type arg_4 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::EnumMemberSeq, TAO::SArg_Traits< ::CORBA::EnumMemberSeq>::in_arg_type> (
           this->operation_details_,
           this->args_,
           4);
@@ -4760,11 +5098,11 @@ void POA_CORBA::Container::create_enum_skel (
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
   
-  TAO::SArg_Traits< CORBA::EnumDef>::ret_val retval;
-  TAO::SArg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id;
-  TAO::SArg_Traits< CORBA::Identifier>::in_arg_val _tao_name;
-  TAO::SArg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version;
-  TAO::SArg_Traits< CORBA::EnumMemberSeq>::in_arg_val _tao_members;
+  TAO::SArg_Traits< ::CORBA::EnumDef>::ret_val retval;
+  TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
+  TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
+  TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version;
+  TAO::SArg_Traits< ::CORBA::EnumMemberSeq>::in_arg_val _tao_members;
   
   TAO::Argument * const args[] =
     {
@@ -4822,31 +5160,31 @@ namespace POA_CORBA
     
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
-      TAO::SArg_Traits< CORBA::AliasDef>::ret_arg_type retval =
-        TAO::Portable_Server::get_ret_arg< CORBA::AliasDef, TAO::SArg_Traits< CORBA::AliasDef>::ret_arg_type> (
+      TAO::SArg_Traits< ::CORBA::AliasDef>::ret_arg_type retval =
+        TAO::Portable_Server::get_ret_arg< ::CORBA::AliasDef, TAO::SArg_Traits< ::CORBA::AliasDef>::ret_arg_type> (
           this->operation_details_,
           this->args_);
       
-      TAO::SArg_Traits< CORBA::RepositoryId>::in_arg_type arg_1 =
-        TAO::Portable_Server::get_in_arg< CORBA::RepositoryId, TAO::SArg_Traits< CORBA::RepositoryId>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId, TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
         
-      TAO::SArg_Traits< CORBA::Identifier>::in_arg_type arg_2 =
-        TAO::Portable_Server::get_in_arg< CORBA::Identifier, TAO::SArg_Traits< CORBA::Identifier>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::Identifier, TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type> (
           this->operation_details_,
           this->args_,
           2);
         
-      TAO::SArg_Traits< CORBA::VersionSpec>::in_arg_type arg_3 =
-        TAO::Portable_Server::get_in_arg< CORBA::VersionSpec, TAO::SArg_Traits< CORBA::VersionSpec>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec, TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type> (
           this->operation_details_,
           this->args_,
           3);
         
-      TAO::SArg_Traits< CORBA::IDLType>::in_arg_type arg_4 =
-        TAO::Portable_Server::get_in_arg< CORBA::IDLType, TAO::SArg_Traits< CORBA::IDLType>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_type arg_4 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::IDLType, TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_type> (
           this->operation_details_,
           this->args_,
           4);
@@ -4888,11 +5226,11 @@ void POA_CORBA::Container::create_alias_skel (
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
   
-  TAO::SArg_Traits< CORBA::AliasDef>::ret_val retval;
-  TAO::SArg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id;
-  TAO::SArg_Traits< CORBA::Identifier>::in_arg_val _tao_name;
-  TAO::SArg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version;
-  TAO::SArg_Traits< CORBA::IDLType>::in_arg_val _tao_original_type;
+  TAO::SArg_Traits< ::CORBA::AliasDef>::ret_val retval;
+  TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
+  TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
+  TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version;
+  TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_val _tao_original_type;
   
   TAO::Argument * const args[] =
     {
@@ -4950,31 +5288,31 @@ namespace POA_CORBA
     
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
-      TAO::SArg_Traits< CORBA::InterfaceDef>::ret_arg_type retval =
-        TAO::Portable_Server::get_ret_arg< CORBA::InterfaceDef, TAO::SArg_Traits< CORBA::InterfaceDef>::ret_arg_type> (
+      TAO::SArg_Traits< ::CORBA::InterfaceDef>::ret_arg_type retval =
+        TAO::Portable_Server::get_ret_arg< ::CORBA::InterfaceDef, TAO::SArg_Traits< ::CORBA::InterfaceDef>::ret_arg_type> (
           this->operation_details_,
           this->args_);
       
-      TAO::SArg_Traits< CORBA::RepositoryId>::in_arg_type arg_1 =
-        TAO::Portable_Server::get_in_arg< CORBA::RepositoryId, TAO::SArg_Traits< CORBA::RepositoryId>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId, TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
         
-      TAO::SArg_Traits< CORBA::Identifier>::in_arg_type arg_2 =
-        TAO::Portable_Server::get_in_arg< CORBA::Identifier, TAO::SArg_Traits< CORBA::Identifier>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::Identifier, TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type> (
           this->operation_details_,
           this->args_,
           2);
         
-      TAO::SArg_Traits< CORBA::VersionSpec>::in_arg_type arg_3 =
-        TAO::Portable_Server::get_in_arg< CORBA::VersionSpec, TAO::SArg_Traits< CORBA::VersionSpec>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec, TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type> (
           this->operation_details_,
           this->args_,
           3);
         
-      TAO::SArg_Traits< CORBA::InterfaceDefSeq>::in_arg_type arg_4 =
-        TAO::Portable_Server::get_in_arg< CORBA::InterfaceDefSeq, TAO::SArg_Traits< CORBA::InterfaceDefSeq>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_type arg_4 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::InterfaceDefSeq, TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_type> (
           this->operation_details_,
           this->args_,
           4);
@@ -5016,11 +5354,11 @@ void POA_CORBA::Container::create_interface_skel (
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
   
-  TAO::SArg_Traits< CORBA::InterfaceDef>::ret_val retval;
-  TAO::SArg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id;
-  TAO::SArg_Traits< CORBA::Identifier>::in_arg_val _tao_name;
-  TAO::SArg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version;
-  TAO::SArg_Traits< CORBA::InterfaceDefSeq>::in_arg_val _tao_base_interfaces;
+  TAO::SArg_Traits< ::CORBA::InterfaceDef>::ret_val retval;
+  TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
+  TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
+  TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version;
+  TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_val _tao_base_interfaces;
   
   TAO::Argument * const args[] =
     {
@@ -5078,25 +5416,25 @@ namespace POA_CORBA
     
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
-      TAO::SArg_Traits< CORBA::ValueDef>::ret_arg_type retval =
-        TAO::Portable_Server::get_ret_arg< CORBA::ValueDef, TAO::SArg_Traits< CORBA::ValueDef>::ret_arg_type> (
+      TAO::SArg_Traits< ::CORBA::ValueDef>::ret_arg_type retval =
+        TAO::Portable_Server::get_ret_arg< ::CORBA::ValueDef, TAO::SArg_Traits< ::CORBA::ValueDef>::ret_arg_type> (
           this->operation_details_,
           this->args_);
       
-      TAO::SArg_Traits< CORBA::RepositoryId>::in_arg_type arg_1 =
-        TAO::Portable_Server::get_in_arg< CORBA::RepositoryId, TAO::SArg_Traits< CORBA::RepositoryId>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId, TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
         
-      TAO::SArg_Traits< CORBA::Identifier>::in_arg_type arg_2 =
-        TAO::Portable_Server::get_in_arg< CORBA::Identifier, TAO::SArg_Traits< CORBA::Identifier>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::Identifier, TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type> (
           this->operation_details_,
           this->args_,
           2);
         
-      TAO::SArg_Traits< CORBA::VersionSpec>::in_arg_type arg_3 =
-        TAO::Portable_Server::get_in_arg< CORBA::VersionSpec, TAO::SArg_Traits< CORBA::VersionSpec>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec, TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type> (
           this->operation_details_,
           this->args_,
           3);
@@ -5113,8 +5451,8 @@ namespace POA_CORBA
           this->args_,
           5);
         
-      TAO::SArg_Traits< CORBA::ValueDef>::in_arg_type arg_6 =
-        TAO::Portable_Server::get_in_arg< CORBA::ValueDef, TAO::SArg_Traits< CORBA::ValueDef>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::ValueDef>::in_arg_type arg_6 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::ValueDef, TAO::SArg_Traits< ::CORBA::ValueDef>::in_arg_type> (
           this->operation_details_,
           this->args_,
           6);
@@ -5125,20 +5463,20 @@ namespace POA_CORBA
           this->args_,
           7);
         
-      TAO::SArg_Traits< CORBA::ValueDefSeq>::in_arg_type arg_8 =
-        TAO::Portable_Server::get_in_arg< CORBA::ValueDefSeq, TAO::SArg_Traits< CORBA::ValueDefSeq>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::ValueDefSeq>::in_arg_type arg_8 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::ValueDefSeq, TAO::SArg_Traits< ::CORBA::ValueDefSeq>::in_arg_type> (
           this->operation_details_,
           this->args_,
           8);
         
-      TAO::SArg_Traits< CORBA::InterfaceDefSeq>::in_arg_type arg_9 =
-        TAO::Portable_Server::get_in_arg< CORBA::InterfaceDefSeq, TAO::SArg_Traits< CORBA::InterfaceDefSeq>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_type arg_9 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::InterfaceDefSeq, TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_type> (
           this->operation_details_,
           this->args_,
           9);
         
-      TAO::SArg_Traits< CORBA::InitializerSeq>::in_arg_type arg_10 =
-        TAO::Portable_Server::get_in_arg< CORBA::InitializerSeq, TAO::SArg_Traits< CORBA::InitializerSeq>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::InitializerSeq>::in_arg_type arg_10 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::InitializerSeq, TAO::SArg_Traits< ::CORBA::InitializerSeq>::in_arg_type> (
           this->operation_details_,
           this->args_,
           10);
@@ -5186,17 +5524,17 @@ void POA_CORBA::Container::create_value_skel (
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
   
-  TAO::SArg_Traits< CORBA::ValueDef>::ret_val retval;
-  TAO::SArg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id;
-  TAO::SArg_Traits< CORBA::Identifier>::in_arg_val _tao_name;
-  TAO::SArg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version;
+  TAO::SArg_Traits< ::CORBA::ValueDef>::ret_val retval;
+  TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
+  TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
+  TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version;
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_is_custom;
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_is_abstract;
-  TAO::SArg_Traits< CORBA::ValueDef>::in_arg_val _tao_base_value;
+  TAO::SArg_Traits< ::CORBA::ValueDef>::in_arg_val _tao_base_value;
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_is_truncatable;
-  TAO::SArg_Traits< CORBA::ValueDefSeq>::in_arg_val _tao_abstract_base_values;
-  TAO::SArg_Traits< CORBA::InterfaceDefSeq>::in_arg_val _tao_supported_interfaces;
-  TAO::SArg_Traits< CORBA::InitializerSeq>::in_arg_val _tao_initializers;
+  TAO::SArg_Traits< ::CORBA::ValueDefSeq>::in_arg_val _tao_abstract_base_values;
+  TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_val _tao_supported_interfaces;
+  TAO::SArg_Traits< ::CORBA::InitializerSeq>::in_arg_val _tao_initializers;
   
   TAO::Argument * const args[] =
     {
@@ -5260,31 +5598,31 @@ namespace POA_CORBA
     
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
-      TAO::SArg_Traits< CORBA::ValueBoxDef>::ret_arg_type retval =
-        TAO::Portable_Server::get_ret_arg< CORBA::ValueBoxDef, TAO::SArg_Traits< CORBA::ValueBoxDef>::ret_arg_type> (
+      TAO::SArg_Traits< ::CORBA::ValueBoxDef>::ret_arg_type retval =
+        TAO::Portable_Server::get_ret_arg< ::CORBA::ValueBoxDef, TAO::SArg_Traits< ::CORBA::ValueBoxDef>::ret_arg_type> (
           this->operation_details_,
           this->args_);
       
-      TAO::SArg_Traits< CORBA::RepositoryId>::in_arg_type arg_1 =
-        TAO::Portable_Server::get_in_arg< CORBA::RepositoryId, TAO::SArg_Traits< CORBA::RepositoryId>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId, TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
         
-      TAO::SArg_Traits< CORBA::Identifier>::in_arg_type arg_2 =
-        TAO::Portable_Server::get_in_arg< CORBA::Identifier, TAO::SArg_Traits< CORBA::Identifier>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::Identifier, TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type> (
           this->operation_details_,
           this->args_,
           2);
         
-      TAO::SArg_Traits< CORBA::VersionSpec>::in_arg_type arg_3 =
-        TAO::Portable_Server::get_in_arg< CORBA::VersionSpec, TAO::SArg_Traits< CORBA::VersionSpec>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec, TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type> (
           this->operation_details_,
           this->args_,
           3);
         
-      TAO::SArg_Traits< CORBA::IDLType>::in_arg_type arg_4 =
-        TAO::Portable_Server::get_in_arg< CORBA::IDLType, TAO::SArg_Traits< CORBA::IDLType>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_type arg_4 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::IDLType, TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_type> (
           this->operation_details_,
           this->args_,
           4);
@@ -5326,11 +5664,11 @@ void POA_CORBA::Container::create_value_box_skel (
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
   
-  TAO::SArg_Traits< CORBA::ValueBoxDef>::ret_val retval;
-  TAO::SArg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id;
-  TAO::SArg_Traits< CORBA::Identifier>::in_arg_val _tao_name;
-  TAO::SArg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version;
-  TAO::SArg_Traits< CORBA::IDLType>::in_arg_val _tao_original_type_def;
+  TAO::SArg_Traits< ::CORBA::ValueBoxDef>::ret_val retval;
+  TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
+  TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
+  TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version;
+  TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_val _tao_original_type_def;
   
   TAO::Argument * const args[] =
     {
@@ -5388,31 +5726,31 @@ namespace POA_CORBA
     
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
-      TAO::SArg_Traits< CORBA::ExceptionDef>::ret_arg_type retval =
-        TAO::Portable_Server::get_ret_arg< CORBA::ExceptionDef, TAO::SArg_Traits< CORBA::ExceptionDef>::ret_arg_type> (
+      TAO::SArg_Traits< ::CORBA::ExceptionDef>::ret_arg_type retval =
+        TAO::Portable_Server::get_ret_arg< ::CORBA::ExceptionDef, TAO::SArg_Traits< ::CORBA::ExceptionDef>::ret_arg_type> (
           this->operation_details_,
           this->args_);
       
-      TAO::SArg_Traits< CORBA::RepositoryId>::in_arg_type arg_1 =
-        TAO::Portable_Server::get_in_arg< CORBA::RepositoryId, TAO::SArg_Traits< CORBA::RepositoryId>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId, TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
         
-      TAO::SArg_Traits< CORBA::Identifier>::in_arg_type arg_2 =
-        TAO::Portable_Server::get_in_arg< CORBA::Identifier, TAO::SArg_Traits< CORBA::Identifier>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::Identifier, TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type> (
           this->operation_details_,
           this->args_,
           2);
         
-      TAO::SArg_Traits< CORBA::VersionSpec>::in_arg_type arg_3 =
-        TAO::Portable_Server::get_in_arg< CORBA::VersionSpec, TAO::SArg_Traits< CORBA::VersionSpec>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec, TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type> (
           this->operation_details_,
           this->args_,
           3);
         
-      TAO::SArg_Traits< CORBA::StructMemberSeq>::in_arg_type arg_4 =
-        TAO::Portable_Server::get_in_arg< CORBA::StructMemberSeq, TAO::SArg_Traits< CORBA::StructMemberSeq>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::StructMemberSeq>::in_arg_type arg_4 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::StructMemberSeq, TAO::SArg_Traits< ::CORBA::StructMemberSeq>::in_arg_type> (
           this->operation_details_,
           this->args_,
           4);
@@ -5454,11 +5792,11 @@ void POA_CORBA::Container::create_exception_skel (
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
   
-  TAO::SArg_Traits< CORBA::ExceptionDef>::ret_val retval;
-  TAO::SArg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id;
-  TAO::SArg_Traits< CORBA::Identifier>::in_arg_val _tao_name;
-  TAO::SArg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version;
-  TAO::SArg_Traits< CORBA::StructMemberSeq>::in_arg_val _tao_members;
+  TAO::SArg_Traits< ::CORBA::ExceptionDef>::ret_val retval;
+  TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
+  TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
+  TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version;
+  TAO::SArg_Traits< ::CORBA::StructMemberSeq>::in_arg_val _tao_members;
   
   TAO::Argument * const args[] =
     {
@@ -5516,25 +5854,25 @@ namespace POA_CORBA
     
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
-      TAO::SArg_Traits< CORBA::NativeDef>::ret_arg_type retval =
-        TAO::Portable_Server::get_ret_arg< CORBA::NativeDef, TAO::SArg_Traits< CORBA::NativeDef>::ret_arg_type> (
+      TAO::SArg_Traits< ::CORBA::NativeDef>::ret_arg_type retval =
+        TAO::Portable_Server::get_ret_arg< ::CORBA::NativeDef, TAO::SArg_Traits< ::CORBA::NativeDef>::ret_arg_type> (
           this->operation_details_,
           this->args_);
       
-      TAO::SArg_Traits< CORBA::RepositoryId>::in_arg_type arg_1 =
-        TAO::Portable_Server::get_in_arg< CORBA::RepositoryId, TAO::SArg_Traits< CORBA::RepositoryId>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId, TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
         
-      TAO::SArg_Traits< CORBA::Identifier>::in_arg_type arg_2 =
-        TAO::Portable_Server::get_in_arg< CORBA::Identifier, TAO::SArg_Traits< CORBA::Identifier>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::Identifier, TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type> (
           this->operation_details_,
           this->args_,
           2);
         
-      TAO::SArg_Traits< CORBA::VersionSpec>::in_arg_type arg_3 =
-        TAO::Portable_Server::get_in_arg< CORBA::VersionSpec, TAO::SArg_Traits< CORBA::VersionSpec>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec, TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type> (
           this->operation_details_,
           this->args_,
           3);
@@ -5575,10 +5913,10 @@ void POA_CORBA::Container::create_native_skel (
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
   
-  TAO::SArg_Traits< CORBA::NativeDef>::ret_val retval;
-  TAO::SArg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id;
-  TAO::SArg_Traits< CORBA::Identifier>::in_arg_val _tao_name;
-  TAO::SArg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version;
+  TAO::SArg_Traits< ::CORBA::NativeDef>::ret_val retval;
+  TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
+  TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
+  TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version;
   
   TAO::Argument * const args[] =
     {
@@ -5635,31 +5973,31 @@ namespace POA_CORBA
     
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
-      TAO::SArg_Traits< CORBA::AbstractInterfaceDef>::ret_arg_type retval =
-        TAO::Portable_Server::get_ret_arg< CORBA::AbstractInterfaceDef, TAO::SArg_Traits< CORBA::AbstractInterfaceDef>::ret_arg_type> (
+      TAO::SArg_Traits< ::CORBA::AbstractInterfaceDef>::ret_arg_type retval =
+        TAO::Portable_Server::get_ret_arg< ::CORBA::AbstractInterfaceDef, TAO::SArg_Traits< ::CORBA::AbstractInterfaceDef>::ret_arg_type> (
           this->operation_details_,
           this->args_);
       
-      TAO::SArg_Traits< CORBA::RepositoryId>::in_arg_type arg_1 =
-        TAO::Portable_Server::get_in_arg< CORBA::RepositoryId, TAO::SArg_Traits< CORBA::RepositoryId>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId, TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
         
-      TAO::SArg_Traits< CORBA::Identifier>::in_arg_type arg_2 =
-        TAO::Portable_Server::get_in_arg< CORBA::Identifier, TAO::SArg_Traits< CORBA::Identifier>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::Identifier, TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type> (
           this->operation_details_,
           this->args_,
           2);
         
-      TAO::SArg_Traits< CORBA::VersionSpec>::in_arg_type arg_3 =
-        TAO::Portable_Server::get_in_arg< CORBA::VersionSpec, TAO::SArg_Traits< CORBA::VersionSpec>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec, TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type> (
           this->operation_details_,
           this->args_,
           3);
         
-      TAO::SArg_Traits< CORBA::AbstractInterfaceDefSeq>::in_arg_type arg_4 =
-        TAO::Portable_Server::get_in_arg< CORBA::AbstractInterfaceDefSeq, TAO::SArg_Traits< CORBA::AbstractInterfaceDefSeq>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::AbstractInterfaceDefSeq>::in_arg_type arg_4 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::AbstractInterfaceDefSeq, TAO::SArg_Traits< ::CORBA::AbstractInterfaceDefSeq>::in_arg_type> (
           this->operation_details_,
           this->args_,
           4);
@@ -5701,11 +6039,11 @@ void POA_CORBA::Container::create_abstract_interface_skel (
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
   
-  TAO::SArg_Traits< CORBA::AbstractInterfaceDef>::ret_val retval;
-  TAO::SArg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id;
-  TAO::SArg_Traits< CORBA::Identifier>::in_arg_val _tao_name;
-  TAO::SArg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version;
-  TAO::SArg_Traits< CORBA::AbstractInterfaceDefSeq>::in_arg_val _tao_base_interfaces;
+  TAO::SArg_Traits< ::CORBA::AbstractInterfaceDef>::ret_val retval;
+  TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
+  TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
+  TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version;
+  TAO::SArg_Traits< ::CORBA::AbstractInterfaceDefSeq>::in_arg_val _tao_base_interfaces;
   
   TAO::Argument * const args[] =
     {
@@ -5763,31 +6101,31 @@ namespace POA_CORBA
     
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
-      TAO::SArg_Traits< CORBA::LocalInterfaceDef>::ret_arg_type retval =
-        TAO::Portable_Server::get_ret_arg< CORBA::LocalInterfaceDef, TAO::SArg_Traits< CORBA::LocalInterfaceDef>::ret_arg_type> (
+      TAO::SArg_Traits< ::CORBA::LocalInterfaceDef>::ret_arg_type retval =
+        TAO::Portable_Server::get_ret_arg< ::CORBA::LocalInterfaceDef, TAO::SArg_Traits< ::CORBA::LocalInterfaceDef>::ret_arg_type> (
           this->operation_details_,
           this->args_);
       
-      TAO::SArg_Traits< CORBA::RepositoryId>::in_arg_type arg_1 =
-        TAO::Portable_Server::get_in_arg< CORBA::RepositoryId, TAO::SArg_Traits< CORBA::RepositoryId>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId, TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
         
-      TAO::SArg_Traits< CORBA::Identifier>::in_arg_type arg_2 =
-        TAO::Portable_Server::get_in_arg< CORBA::Identifier, TAO::SArg_Traits< CORBA::Identifier>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::Identifier, TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type> (
           this->operation_details_,
           this->args_,
           2);
         
-      TAO::SArg_Traits< CORBA::VersionSpec>::in_arg_type arg_3 =
-        TAO::Portable_Server::get_in_arg< CORBA::VersionSpec, TAO::SArg_Traits< CORBA::VersionSpec>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec, TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type> (
           this->operation_details_,
           this->args_,
           3);
         
-      TAO::SArg_Traits< CORBA::InterfaceDefSeq>::in_arg_type arg_4 =
-        TAO::Portable_Server::get_in_arg< CORBA::InterfaceDefSeq, TAO::SArg_Traits< CORBA::InterfaceDefSeq>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_type arg_4 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::InterfaceDefSeq, TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_type> (
           this->operation_details_,
           this->args_,
           4);
@@ -5829,11 +6167,11 @@ void POA_CORBA::Container::create_local_interface_skel (
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
   
-  TAO::SArg_Traits< CORBA::LocalInterfaceDef>::ret_val retval;
-  TAO::SArg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id;
-  TAO::SArg_Traits< CORBA::Identifier>::in_arg_val _tao_name;
-  TAO::SArg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version;
-  TAO::SArg_Traits< CORBA::InterfaceDefSeq>::in_arg_val _tao_base_interfaces;
+  TAO::SArg_Traits< ::CORBA::LocalInterfaceDef>::ret_val retval;
+  TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
+  TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
+  TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version;
+  TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_val _tao_base_interfaces;
   
   TAO::Argument * const args[] =
     {
@@ -5891,25 +6229,25 @@ namespace POA_CORBA
     
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
-      TAO::SArg_Traits< CORBA::ExtValueDef>::ret_arg_type retval =
-        TAO::Portable_Server::get_ret_arg< CORBA::ExtValueDef, TAO::SArg_Traits< CORBA::ExtValueDef>::ret_arg_type> (
+      TAO::SArg_Traits< ::CORBA::ExtValueDef>::ret_arg_type retval =
+        TAO::Portable_Server::get_ret_arg< ::CORBA::ExtValueDef, TAO::SArg_Traits< ::CORBA::ExtValueDef>::ret_arg_type> (
           this->operation_details_,
           this->args_);
       
-      TAO::SArg_Traits< CORBA::RepositoryId>::in_arg_type arg_1 =
-        TAO::Portable_Server::get_in_arg< CORBA::RepositoryId, TAO::SArg_Traits< CORBA::RepositoryId>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId, TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
         
-      TAO::SArg_Traits< CORBA::Identifier>::in_arg_type arg_2 =
-        TAO::Portable_Server::get_in_arg< CORBA::Identifier, TAO::SArg_Traits< CORBA::Identifier>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::Identifier, TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type> (
           this->operation_details_,
           this->args_,
           2);
         
-      TAO::SArg_Traits< CORBA::VersionSpec>::in_arg_type arg_3 =
-        TAO::Portable_Server::get_in_arg< CORBA::VersionSpec, TAO::SArg_Traits< CORBA::VersionSpec>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec, TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type> (
           this->operation_details_,
           this->args_,
           3);
@@ -5926,8 +6264,8 @@ namespace POA_CORBA
           this->args_,
           5);
         
-      TAO::SArg_Traits< CORBA::ValueDef>::in_arg_type arg_6 =
-        TAO::Portable_Server::get_in_arg< CORBA::ValueDef, TAO::SArg_Traits< CORBA::ValueDef>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::ValueDef>::in_arg_type arg_6 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::ValueDef, TAO::SArg_Traits< ::CORBA::ValueDef>::in_arg_type> (
           this->operation_details_,
           this->args_,
           6);
@@ -5938,20 +6276,20 @@ namespace POA_CORBA
           this->args_,
           7);
         
-      TAO::SArg_Traits< CORBA::ValueDefSeq>::in_arg_type arg_8 =
-        TAO::Portable_Server::get_in_arg< CORBA::ValueDefSeq, TAO::SArg_Traits< CORBA::ValueDefSeq>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::ValueDefSeq>::in_arg_type arg_8 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::ValueDefSeq, TAO::SArg_Traits< ::CORBA::ValueDefSeq>::in_arg_type> (
           this->operation_details_,
           this->args_,
           8);
         
-      TAO::SArg_Traits< CORBA::InterfaceDefSeq>::in_arg_type arg_9 =
-        TAO::Portable_Server::get_in_arg< CORBA::InterfaceDefSeq, TAO::SArg_Traits< CORBA::InterfaceDefSeq>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_type arg_9 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::InterfaceDefSeq, TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_type> (
           this->operation_details_,
           this->args_,
           9);
         
-      TAO::SArg_Traits< CORBA::ExtInitializerSeq>::in_arg_type arg_10 =
-        TAO::Portable_Server::get_in_arg< CORBA::ExtInitializerSeq, TAO::SArg_Traits< CORBA::ExtInitializerSeq>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::ExtInitializerSeq>::in_arg_type arg_10 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::ExtInitializerSeq, TAO::SArg_Traits< ::CORBA::ExtInitializerSeq>::in_arg_type> (
           this->operation_details_,
           this->args_,
           10);
@@ -5999,17 +6337,17 @@ void POA_CORBA::Container::create_ext_value_skel (
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
   
-  TAO::SArg_Traits< CORBA::ExtValueDef>::ret_val retval;
-  TAO::SArg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id;
-  TAO::SArg_Traits< CORBA::Identifier>::in_arg_val _tao_name;
-  TAO::SArg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version;
+  TAO::SArg_Traits< ::CORBA::ExtValueDef>::ret_val retval;
+  TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
+  TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
+  TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version;
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_is_custom;
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_is_abstract;
-  TAO::SArg_Traits< CORBA::ValueDef>::in_arg_val _tao_base_value;
+  TAO::SArg_Traits< ::CORBA::ValueDef>::in_arg_val _tao_base_value;
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_is_truncatable;
-  TAO::SArg_Traits< CORBA::ValueDefSeq>::in_arg_val _tao_abstract_base_values;
-  TAO::SArg_Traits< CORBA::InterfaceDefSeq>::in_arg_val _tao_supported_interfaces;
-  TAO::SArg_Traits< CORBA::ExtInitializerSeq>::in_arg_val _tao_initializers;
+  TAO::SArg_Traits< ::CORBA::ValueDefSeq>::in_arg_val _tao_abstract_base_values;
+  TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_val _tao_supported_interfaces;
+  TAO::SArg_Traits< ::CORBA::ExtInitializerSeq>::in_arg_val _tao_initializers;
   
   TAO::Argument * const args[] =
     {
@@ -6082,8 +6420,8 @@ namespace POA_CORBA
           this->operation_details_,
           this->args_);
       
-      TAO::SArg_Traits< CORBA::Char *>::in_arg_type arg_1 =
-        TAO::Portable_Server::get_in_arg< CORBA::Char *, TAO::SArg_Traits< CORBA::Char *>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
@@ -6118,7 +6456,7 @@ void POA_CORBA::Container::_is_a_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  TAO::SArg_Traits< CORBA::Char *>::in_arg_val _tao_repository_id;
+  TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
   
   TAO::Argument * const args[] =
     {
@@ -6239,10 +6577,98 @@ void POA_CORBA::Container::_non_existent_skel (
   
 }
 
+namespace POA_CORBA
+{
+  
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_operation/upcall_command_ss.cpp:127
+  
+  class _repository_id_Container_Upcall_Command
+    : public TAO::Upcall_Command
+  {
+  public:
+    inline _repository_id_Container_Upcall_Command (
+      POA_CORBA::Container * servant,
+      TAO_Operation_Details const * operation_details,
+      TAO::Argument * const args[])
+      : servant_ (servant)
+      , operation_details_ (operation_details)
+      , args_ (args)
+    {
+    }
+    
+    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+    {
+      TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
+        TAO::Portable_Server::get_ret_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type> (
+          this->operation_details_,
+          this->args_);
+      
+      
+      retval =
+        this->servant_-> _repository_id (
+          ACE_ENV_SINGLE_ARG_PARAMETER);
+        
+    }
+  
+  private:
+    POA_CORBA::Container * const servant_;
+    TAO_Operation_Details const * const operation_details_;
+    TAO::Argument * const * const args_;
+  };
+  
+}
+void POA_CORBA::Container::_repository_id_skel (
+    TAO_ServerRequest & server_request, 
+    void * TAO_INTERCEPTOR (servant_upcall),
+    void * servant
+    ACE_ENV_ARG_DECL
+  )
+{
+  
+  
+#if TAO_HAS_INTERCEPTORS == 1
+  static CORBA::TypeCode_ptr const * const exceptions = 0;
+  static size_t const nexceptions = 0;
+#endif /* TAO_HAS_INTERCEPTORS */
+  
+  TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
+  
+  TAO::Argument * const args[] =
+    {
+      &retval
+    };
+  
+  static size_t const nargs = 1;
+  
+  POA_CORBA::Container * const impl =
+    static_cast<POA_CORBA::Container *> (servant);
+  
+  _repository_id_Container_Upcall_Command command (
+    impl,
+    server_request.operation_details (),
+    args);
+  
+  TAO::Upcall_Wrapper upcall_wrapper;
+  upcall_wrapper.upcall (server_request
+                         , args
+                         , nargs
+                         , command
+#if TAO_HAS_INTERCEPTORS == 1
+                         , servant_upcall
+                         , exceptions
+                         , nexceptions
+#endif  /* TAO_HAS_INTERCEPTORS == 1 */
+                         ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+  
+}
+
 
 
 // TAO_IDL - Generated from 
-// be\be_visitor_interface/interface_ss.cpp:393
+// be\be_visitor_interface/interface_ss.cpp:501
 
 
 
@@ -6403,7 +6829,7 @@ const char* POA_CORBA::Container::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:940
+// be\be_visitor_interface/interface_ss.cpp:862
 
 void POA_CORBA::Container::_dispatch (
     TAO_ServerRequest & req,
@@ -6418,7 +6844,7 @@ void POA_CORBA::Container::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:891
+// be\be_visitor_interface/interface_ss.cpp:813
 
 CORBA::Container *
 POA_CORBA::Container::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -6450,7 +6876,7 @@ POA_CORBA::Container::_this (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1455
+// be\be_interface.cpp:1465
 
 class TAO_CORBA_IDLType_Perfect_Hash_OpTable
   : public TAO_Perfect_Hash_OpTable
@@ -6463,7 +6889,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: c:\ace\latest\ACE_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0 -a -o -t -p -K opname -L C++ -Z TAO_CORBA_IDLType_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ACE\Any\ACE_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0 -a -o -t -p -K opname -L C++ -Z TAO_CORBA_IDLType_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_IDLType_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -6483,10 +6909,10 @@ TAO_CORBA_IDLType_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
      19, 19, 19, 19, 19, 19, 19, 19, 19,  0,
      19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
      19, 19, 19, 19, 19, 19, 19, 19, 19,  0,
-     19, 19,  5,  5, 19, 19, 19, 19, 19, 19,
+     19, 19,  0,  0, 19, 19, 19, 19, 19, 19,
      19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
      19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-     19, 19, 19,  0, 19, 19, 19, 19,  0, 19,
+     19, 19, 19,  5, 19, 19, 19, 19,  0, 19,
      19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
      19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
      19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
@@ -6507,8 +6933,8 @@ TAO_CORBA_IDLType_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
      19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
      19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
      19, 19, 19, 19, 19,  0, 19,  0, 19, 19,
-      5,  5, 19, 19, 19, 19, 19, 19, 19, 19,
-     19, 19, 19, 19, 19, 19,  0, 19, 19, 19,
+      0,  0, 19, 19, 19, 19, 19, 19, 19, 19,
+     19, 19, 19, 19, 19, 19,  5, 19, 19, 19,
      19,  0, 19, 19, 19, 19, 19, 19,
 #endif /* ACE_MVS */
     };
@@ -6520,29 +6946,31 @@ TAO_CORBA_IDLType_Perfect_Hash_OpTable::lookup (const char *str, unsigned int le
 {
   enum
     {
-      TOTAL_KEYWORDS = 7,
+      TOTAL_KEYWORDS = 8,
       MIN_WORD_LENGTH = 5,
-      MAX_WORD_LENGTH = 13,
+      MAX_WORD_LENGTH = 14,
       MIN_HASH_VALUE = 5,
       MAX_HASH_VALUE = 18,
       HASH_VALUE_RANGE = 14,
       DUPLICATES = 0,
-      WORDLIST_SIZE = 12
+      WORDLIST_SIZE = 13
     };
 
   static const TAO_operation_db_entry  wordlist[] =
     {
       {"",0,0},{"",0,0},{"",0,0},{"",0,0},{"",0,0},
       {"_is_a", &POA_CORBA::IDLType::_is_a_skel, 0},
-      {"",0,0},{"",0,0},{"",0,0},{"",0,0},
-      {"_component", &POA_CORBA::IDLType::_component_skel, 0},
       {"",0,0},
       {"destroy", &POA_CORBA::IDLType::destroy_skel, 0},
-      {"_non_existent", &POA_CORBA::IDLType::_non_existent_skel, 0},
+      {"",0,0},
       {"_get_type", &POA_CORBA::IDLType::_get_type_skel, 0},
       {"_interface", &POA_CORBA::IDLType::_interface_skel, 0},
       {"",0,0},{"",0,0},
       {"_get_def_kind", &POA_CORBA::IDLType::_get_def_kind_skel, 0},
+      {"_repository_id", &POA_CORBA::IDLType::_repository_id_skel, 0},
+      {"_component", &POA_CORBA::IDLType::_component_skel, 0},
+      {"",0,0},{"",0,0},
+      {"_non_existent", &POA_CORBA::IDLType::_non_existent_skel, 0},
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -6563,7 +6991,7 @@ TAO_CORBA_IDLType_Perfect_Hash_OpTable::lookup (const char *str, unsigned int le
 static TAO_CORBA_IDLType_Perfect_Hash_OpTable tao_CORBA_IDLType_optable;
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:999
+// be\be_visitor_interface/interface_ss.cpp:921
 
 TAO::Collocation_Proxy_Broker *
 CORBA__TAO_IDLType_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -6583,10 +7011,7 @@ CORBA__TAO_IDLType_Proxy_Broker_Factory_Initializer (size_t)
 static int
 CORBA__TAO_IDLType_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
   CORBA__TAO_IDLType_Proxy_Broker_Factory_Initializer (
-      reinterpret_cast<
-          size_t> (
-          CORBA__TAO_IDLType_Proxy_Broker_Factory_Initializer
-        )
+      reinterpret_cast<size_t> (CORBA__TAO_IDLType_Proxy_Broker_Factory_Initializer)
     );
 
 
@@ -6734,8 +7159,8 @@ namespace POA_CORBA
           this->operation_details_,
           this->args_);
       
-      TAO::SArg_Traits< CORBA::Char *>::in_arg_type arg_1 =
-        TAO::Portable_Server::get_in_arg< CORBA::Char *, TAO::SArg_Traits< CORBA::Char *>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
@@ -6770,7 +7195,7 @@ void POA_CORBA::IDLType::_is_a_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  TAO::SArg_Traits< CORBA::Char *>::in_arg_val _tao_repository_id;
+  TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
   
   TAO::Argument * const args[] =
     {
@@ -6891,10 +7316,98 @@ void POA_CORBA::IDLType::_non_existent_skel (
   
 }
 
+namespace POA_CORBA
+{
+  
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_operation/upcall_command_ss.cpp:127
+  
+  class _repository_id_IDLType_Upcall_Command
+    : public TAO::Upcall_Command
+  {
+  public:
+    inline _repository_id_IDLType_Upcall_Command (
+      POA_CORBA::IDLType * servant,
+      TAO_Operation_Details const * operation_details,
+      TAO::Argument * const args[])
+      : servant_ (servant)
+      , operation_details_ (operation_details)
+      , args_ (args)
+    {
+    }
+    
+    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+    {
+      TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
+        TAO::Portable_Server::get_ret_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type> (
+          this->operation_details_,
+          this->args_);
+      
+      
+      retval =
+        this->servant_-> _repository_id (
+          ACE_ENV_SINGLE_ARG_PARAMETER);
+        
+    }
+  
+  private:
+    POA_CORBA::IDLType * const servant_;
+    TAO_Operation_Details const * const operation_details_;
+    TAO::Argument * const * const args_;
+  };
+  
+}
+void POA_CORBA::IDLType::_repository_id_skel (
+    TAO_ServerRequest & server_request, 
+    void * TAO_INTERCEPTOR (servant_upcall),
+    void * servant
+    ACE_ENV_ARG_DECL
+  )
+{
+  
+  
+#if TAO_HAS_INTERCEPTORS == 1
+  static CORBA::TypeCode_ptr const * const exceptions = 0;
+  static size_t const nexceptions = 0;
+#endif /* TAO_HAS_INTERCEPTORS */
+  
+  TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
+  
+  TAO::Argument * const args[] =
+    {
+      &retval
+    };
+  
+  static size_t const nargs = 1;
+  
+  POA_CORBA::IDLType * const impl =
+    static_cast<POA_CORBA::IDLType *> (servant);
+  
+  _repository_id_IDLType_Upcall_Command command (
+    impl,
+    server_request.operation_details (),
+    args);
+  
+  TAO::Upcall_Wrapper upcall_wrapper;
+  upcall_wrapper.upcall (server_request
+                         , args
+                         , nargs
+                         , command
+#if TAO_HAS_INTERCEPTORS == 1
+                         , servant_upcall
+                         , exceptions
+                         , nexceptions
+#endif  /* TAO_HAS_INTERCEPTORS == 1 */
+                         ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+  
+}
+
 
 
 // TAO_IDL - Generated from 
-// be\be_visitor_interface/interface_ss.cpp:393
+// be\be_visitor_interface/interface_ss.cpp:501
 
 
 
@@ -7055,7 +7568,7 @@ const char* POA_CORBA::IDLType::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:940
+// be\be_visitor_interface/interface_ss.cpp:862
 
 void POA_CORBA::IDLType::_dispatch (
     TAO_ServerRequest & req,
@@ -7070,7 +7583,7 @@ void POA_CORBA::IDLType::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:891
+// be\be_visitor_interface/interface_ss.cpp:813
 
 CORBA::IDLType *
 POA_CORBA::IDLType::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -7102,7 +7615,7 @@ POA_CORBA::IDLType::_this (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1455
+// be\be_interface.cpp:1465
 
 class TAO_CORBA_TypedefDef_Perfect_Hash_OpTable
   : public TAO_Perfect_Hash_OpTable
@@ -7115,7 +7628,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: c:\ace\latest\ACE_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0 -a -o -t -p -K opname -L C++ -Z TAO_CORBA_TypedefDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ACE\Any\ACE_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0 -a -o -t -p -K opname -L C++ -Z TAO_CORBA_TypedefDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_TypedefDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -7172,14 +7685,14 @@ TAO_CORBA_TypedefDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int
 {
   enum
     {
-      TOTAL_KEYWORDS = 18,
+      TOTAL_KEYWORDS = 19,
       MIN_WORD_LENGTH = 4,
       MAX_WORD_LENGTH = 26,
       MIN_HASH_VALUE = 4,
       MAX_HASH_VALUE = 36,
       HASH_VALUE_RANGE = 33,
       DUPLICATES = 5,
-      WORDLIST_SIZE = 22
+      WORDLIST_SIZE = 23
     };
 
   static const TAO_operation_db_entry  wordlist[] =
@@ -7197,6 +7710,7 @@ TAO_CORBA_TypedefDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int
       {"_get_version", &POA_CORBA::TypedefDef::_get_version_skel, 0},
       {"_set_version", &POA_CORBA::TypedefDef::_set_version_skel, 0},
       {"_get_def_kind", &POA_CORBA::TypedefDef::_get_def_kind_skel, 0},
+      {"_repository_id", &POA_CORBA::TypedefDef::_repository_id_skel, 0},
       {"_get_defined_in", &POA_CORBA::TypedefDef::_get_defined_in_skel, 0},
       {"destroy", &POA_CORBA::TypedefDef::destroy_skel, 0},
       {"_get_absolute_name", &POA_CORBA::TypedefDef::_get_absolute_name_skel, 0},
@@ -7208,8 +7722,8 @@ TAO_CORBA_TypedefDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int
   static const signed char lookup[] =
     {
        -9,  -3, -13,  -2,   4,   5,  -1,  50,   8, -45,  12,  -1, -46,  15, 
-       -1,  16,  -1,  17,  18,  -1,  19,  -6,  -2,  20,  -1,  -1,  -1,  -1, 
-       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  21, 
+       16,  17,  -1,  18,  19,  -1,  20,  -6,  -2,  21,  -1,  -1,  -1,  -1, 
+       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  22, 
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -7247,7 +7761,7 @@ TAO_CORBA_TypedefDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int
 static TAO_CORBA_TypedefDef_Perfect_Hash_OpTable tao_CORBA_TypedefDef_optable;
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:999
+// be\be_visitor_interface/interface_ss.cpp:921
 
 TAO::Collocation_Proxy_Broker *
 CORBA__TAO_TypedefDef_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -7267,10 +7781,7 @@ CORBA__TAO_TypedefDef_Proxy_Broker_Factory_Initializer (size_t)
 static int
 CORBA__TAO_TypedefDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
   CORBA__TAO_TypedefDef_Proxy_Broker_Factory_Initializer (
-      reinterpret_cast<
-          size_t> (
-          CORBA__TAO_TypedefDef_Proxy_Broker_Factory_Initializer
-        )
+      reinterpret_cast<size_t> (CORBA__TAO_TypedefDef_Proxy_Broker_Factory_Initializer)
     );
 
 
@@ -7328,8 +7839,8 @@ namespace POA_CORBA
           this->operation_details_,
           this->args_);
       
-      TAO::SArg_Traits< CORBA::Char *>::in_arg_type arg_1 =
-        TAO::Portable_Server::get_in_arg< CORBA::Char *, TAO::SArg_Traits< CORBA::Char *>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
@@ -7364,7 +7875,7 @@ void POA_CORBA::TypedefDef::_is_a_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  TAO::SArg_Traits< CORBA::Char *>::in_arg_val _tao_repository_id;
+  TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
   
   TAO::Argument * const args[] =
     {
@@ -7485,10 +7996,98 @@ void POA_CORBA::TypedefDef::_non_existent_skel (
   
 }
 
+namespace POA_CORBA
+{
+  
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_operation/upcall_command_ss.cpp:127
+  
+  class _repository_id_TypedefDef_Upcall_Command
+    : public TAO::Upcall_Command
+  {
+  public:
+    inline _repository_id_TypedefDef_Upcall_Command (
+      POA_CORBA::TypedefDef * servant,
+      TAO_Operation_Details const * operation_details,
+      TAO::Argument * const args[])
+      : servant_ (servant)
+      , operation_details_ (operation_details)
+      , args_ (args)
+    {
+    }
+    
+    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+    {
+      TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
+        TAO::Portable_Server::get_ret_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type> (
+          this->operation_details_,
+          this->args_);
+      
+      
+      retval =
+        this->servant_-> _repository_id (
+          ACE_ENV_SINGLE_ARG_PARAMETER);
+        
+    }
+  
+  private:
+    POA_CORBA::TypedefDef * const servant_;
+    TAO_Operation_Details const * const operation_details_;
+    TAO::Argument * const * const args_;
+  };
+  
+}
+void POA_CORBA::TypedefDef::_repository_id_skel (
+    TAO_ServerRequest & server_request, 
+    void * TAO_INTERCEPTOR (servant_upcall),
+    void * servant
+    ACE_ENV_ARG_DECL
+  )
+{
+  
+  
+#if TAO_HAS_INTERCEPTORS == 1
+  static CORBA::TypeCode_ptr const * const exceptions = 0;
+  static size_t const nexceptions = 0;
+#endif /* TAO_HAS_INTERCEPTORS */
+  
+  TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
+  
+  TAO::Argument * const args[] =
+    {
+      &retval
+    };
+  
+  static size_t const nargs = 1;
+  
+  POA_CORBA::TypedefDef * const impl =
+    static_cast<POA_CORBA::TypedefDef *> (servant);
+  
+  _repository_id_TypedefDef_Upcall_Command command (
+    impl,
+    server_request.operation_details (),
+    args);
+  
+  TAO::Upcall_Wrapper upcall_wrapper;
+  upcall_wrapper.upcall (server_request
+                         , args
+                         , nargs
+                         , command
+#if TAO_HAS_INTERCEPTORS == 1
+                         , servant_upcall
+                         , exceptions
+                         , nexceptions
+#endif  /* TAO_HAS_INTERCEPTORS == 1 */
+                         ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+  
+}
+
 
 
 // TAO_IDL - Generated from 
-// be\be_visitor_interface/interface_ss.cpp:393
+// be\be_visitor_interface/interface_ss.cpp:501
 
 
 
@@ -7657,7 +8256,7 @@ const char* POA_CORBA::TypedefDef::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:940
+// be\be_visitor_interface/interface_ss.cpp:862
 
 void POA_CORBA::TypedefDef::_dispatch (
     TAO_ServerRequest & req,
@@ -7672,7 +8271,7 @@ void POA_CORBA::TypedefDef::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:891
+// be\be_visitor_interface/interface_ss.cpp:813
 
 CORBA::TypedefDef *
 POA_CORBA::TypedefDef::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -7703,1089 +8302,5 @@ POA_CORBA::TypedefDef::_this (ACE_ENV_SINGLE_ARG_DECL)
       );
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_root/root.cpp:1582
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-#if !defined (_CORBA_DEFINITIONKIND__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_DEFINITIONKIND__SARG_TRAITS_TMPLINST_SS_
-
-  template class TAO::SArg_Traits<CORBA::DefinitionKind>;
-
-  template class TAO::Basic_SArg_Traits_T<CORBA::DefinitionKind>;
-
-#endif /* end #if !defined */
-
-  template class
-    TAO::Ret_Basic_SArgument_T<
-        CORBA::DefinitionKind
-      >;
-
-#if !defined (_CORBA_CONTAINED__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_CONTAINED__SARG_TRAITS_TMPLINST_SS_
-
-  template class TAO::SArg_Traits<CORBA::Contained>;
-
-  template class
-    TAO::Object_SArg_Traits_T<
-        CORBA::Contained_ptr,
-        CORBA::Contained_var,
-        CORBA::Contained_out,
-      >;
-
-#endif /* end #if !defined */
-
-  template class
-    TAO::Ret_Object_SArgument_T<
-        CORBA::Container_ptr,
-        CORBA::Container_var
-      >;
-
-  template class
-    TAO::Ret_Object_SArgument_T<
-        CORBA::Repository_ptr,
-        CORBA::Repository_var
-      >;
-
-#if !defined (_CORBA_CONTAINED_DESCRIPTION__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_CONTAINED_DESCRIPTION__SARG_TRAITS_TMPLINST_SS_
-
-  template class TAO::SArg_Traits<CORBA::Contained::Description>;
-
-  template class
-    TAO::Var_Size_SArg_Traits_T<
-        CORBA::Contained::Description,
-        CORBA::Contained::Description_var,
-        CORBA::Contained::Description_out
-      >;
-
-#endif /* end #if !defined */
-
-  template class
-    TAO::Ret_Var_Size_SArgument_T<
-        CORBA::Contained::Description,
-        CORBA::Contained::Description_var
-      >;
-
-  template class
-    TAO::In_Object_SArgument_T<
-        CORBA::Container_ptr
-      >;
-
-#if !defined (_CORBA_REPOSITORY__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_REPOSITORY__SARG_TRAITS_TMPLINST_SS_
-
-  template class TAO::SArg_Traits<CORBA::Repository>;
-
-  template class
-    TAO::Object_SArg_Traits_T<
-        CORBA::Repository_ptr,
-        CORBA::Repository_var,
-        CORBA::Repository_out,
-      >;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_CONTAINER__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_CONTAINER__SARG_TRAITS_TMPLINST_SS_
-
-  template class TAO::SArg_Traits<CORBA::Container>;
-
-  template class
-    TAO::Object_SArg_Traits_T<
-        CORBA::Container_ptr,
-        CORBA::Container_var,
-        CORBA::Container_out,
-      >;
-
-#endif /* end #if !defined */
-
-  template class
-    TAO::Ret_Object_SArgument_T<
-        CORBA::Contained_ptr,
-        CORBA::Contained_var
-      >;
-
-  template class
-    TAO::Ret_Var_Size_SArgument_T<
-        CORBA::ContainedSeq,
-        CORBA::ContainedSeq_var
-      >;
-
-  template class
-    TAO::In_Basic_SArgument_T<
-        CORBA::DefinitionKind
-      >;
-
-#if !defined (_CORBA_CONTAINER_DESCRIPTIONSEQ__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_CONTAINER_DESCRIPTIONSEQ__SARG_TRAITS_TMPLINST_SS_
-
-  template class TAO::SArg_Traits<CORBA::Container::DescriptionSeq>;
-
-  template class
-    TAO::Var_Size_SArg_Traits_T<
-        CORBA::Container::DescriptionSeq,
-        CORBA::Container::DescriptionSeq_var,
-        CORBA::Container::DescriptionSeq_out
-      >;
-
-#endif /* end #if !defined */
-
-  template class
-    TAO::Ret_Var_Size_SArgument_T<
-        CORBA::Container::DescriptionSeq,
-        CORBA::Container::DescriptionSeq_var
-      >;
-
-  template class
-    TAO::Ret_Object_SArgument_T<
-        CORBA::ModuleDef_ptr,
-        CORBA::ModuleDef_var
-      >;
-
-  template class
-    TAO::Ret_Object_SArgument_T<
-        CORBA::ConstantDef_ptr,
-        CORBA::ConstantDef_var
-      >;
-
-  template class
-    TAO::In_Object_SArgument_T<
-        CORBA::IDLType_ptr
-      >;
-
-  template class
-    TAO::Ret_Object_SArgument_T<
-        CORBA::StructDef_ptr,
-        CORBA::StructDef_var
-      >;
-
-  template class
-    TAO::In_Var_Size_SArgument_T<
-        CORBA::StructMemberSeq
-      >;
-
-  template class
-    TAO::Ret_Object_SArgument_T<
-        CORBA::UnionDef_ptr,
-        CORBA::UnionDef_var
-      >;
-
-  template class
-    TAO::In_Var_Size_SArgument_T<
-        CORBA::UnionMemberSeq
-      >;
-
-  template class
-    TAO::Ret_Object_SArgument_T<
-        CORBA::EnumDef_ptr,
-        CORBA::EnumDef_var
-      >;
-
-  template class
-    TAO::In_Var_Size_SArgument_T<
-        CORBA::EnumMemberSeq
-      >;
-
-  template class
-    TAO::Ret_Object_SArgument_T<
-        CORBA::AliasDef_ptr,
-        CORBA::AliasDef_var
-      >;
-
-  template class
-    TAO::Ret_Object_SArgument_T<
-        CORBA::InterfaceDef_ptr,
-        CORBA::InterfaceDef_var
-      >;
-
-  template class
-    TAO::In_Var_Size_SArgument_T<
-        CORBA::InterfaceDefSeq
-      >;
-
-  template class
-    TAO::Ret_Object_SArgument_T<
-        CORBA::ValueDef_ptr,
-        CORBA::ValueDef_var
-      >;
-
-  template class
-    TAO::In_Object_SArgument_T<
-        CORBA::ValueDef_ptr
-      >;
-
-  template class
-    TAO::In_Var_Size_SArgument_T<
-        CORBA::ValueDefSeq
-      >;
-
-  template class
-    TAO::In_Var_Size_SArgument_T<
-        CORBA::InitializerSeq
-      >;
-
-  template class
-    TAO::Ret_Object_SArgument_T<
-        CORBA::ValueBoxDef_ptr,
-        CORBA::ValueBoxDef_var
-      >;
-
-  template class
-    TAO::Ret_Object_SArgument_T<
-        CORBA::ExceptionDef_ptr,
-        CORBA::ExceptionDef_var
-      >;
-
-  template class
-    TAO::Ret_Object_SArgument_T<
-        CORBA::NativeDef_ptr,
-        CORBA::NativeDef_var
-      >;
-
-  template class
-    TAO::Ret_Object_SArgument_T<
-        CORBA::AbstractInterfaceDef_ptr,
-        CORBA::AbstractInterfaceDef_var
-      >;
-
-  template class
-    TAO::In_Var_Size_SArgument_T<
-        CORBA::AbstractInterfaceDefSeq
-      >;
-
-  template class
-    TAO::Ret_Object_SArgument_T<
-        CORBA::LocalInterfaceDef_ptr,
-        CORBA::LocalInterfaceDef_var
-      >;
-
-  template class
-    TAO::Ret_Object_SArgument_T<
-        CORBA::ExtValueDef_ptr,
-        CORBA::ExtValueDef_var
-      >;
-
-  template class
-    TAO::In_Var_Size_SArgument_T<
-        CORBA::ExtInitializerSeq
-      >;
-
-#if !defined (_CORBA_MODULEDEF__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_MODULEDEF__SARG_TRAITS_TMPLINST_SS_
-
-  template class TAO::SArg_Traits<CORBA::ModuleDef>;
-
-  template class
-    TAO::Object_SArg_Traits_T<
-        CORBA::ModuleDef_ptr,
-        CORBA::ModuleDef_var,
-        CORBA::ModuleDef_out,
-      >;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_CONSTANTDEF__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_CONSTANTDEF__SARG_TRAITS_TMPLINST_SS_
-
-  template class TAO::SArg_Traits<CORBA::ConstantDef>;
-
-  template class
-    TAO::Object_SArg_Traits_T<
-        CORBA::ConstantDef_ptr,
-        CORBA::ConstantDef_var,
-        CORBA::ConstantDef_out,
-      >;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_IDLTYPE__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_IDLTYPE__SARG_TRAITS_TMPLINST_SS_
-
-  template class TAO::SArg_Traits<CORBA::IDLType>;
-
-  template class
-    TAO::Object_SArg_Traits_T<
-        CORBA::IDLType_ptr,
-        CORBA::IDLType_var,
-        CORBA::IDLType_out,
-      >;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_STRUCTDEF__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_STRUCTDEF__SARG_TRAITS_TMPLINST_SS_
-
-  template class TAO::SArg_Traits<CORBA::StructDef>;
-
-  template class
-    TAO::Object_SArg_Traits_T<
-        CORBA::StructDef_ptr,
-        CORBA::StructDef_var,
-        CORBA::StructDef_out,
-      >;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_UNIONDEF__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_UNIONDEF__SARG_TRAITS_TMPLINST_SS_
-
-  template class TAO::SArg_Traits<CORBA::UnionDef>;
-
-  template class
-    TAO::Object_SArg_Traits_T<
-        CORBA::UnionDef_ptr,
-        CORBA::UnionDef_var,
-        CORBA::UnionDef_out,
-      >;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_ENUMDEF__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_ENUMDEF__SARG_TRAITS_TMPLINST_SS_
-
-  template class TAO::SArg_Traits<CORBA::EnumDef>;
-
-  template class
-    TAO::Object_SArg_Traits_T<
-        CORBA::EnumDef_ptr,
-        CORBA::EnumDef_var,
-        CORBA::EnumDef_out,
-      >;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_ALIASDEF__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_ALIASDEF__SARG_TRAITS_TMPLINST_SS_
-
-  template class TAO::SArg_Traits<CORBA::AliasDef>;
-
-  template class
-    TAO::Object_SArg_Traits_T<
-        CORBA::AliasDef_ptr,
-        CORBA::AliasDef_var,
-        CORBA::AliasDef_out,
-      >;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_INTERFACEDEF__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_INTERFACEDEF__SARG_TRAITS_TMPLINST_SS_
-
-  template class TAO::SArg_Traits<CORBA::InterfaceDef>;
-
-  template class
-    TAO::Object_SArg_Traits_T<
-        CORBA::InterfaceDef_ptr,
-        CORBA::InterfaceDef_var,
-        CORBA::InterfaceDef_out,
-      >;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_INTERFACEDEFSEQ__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_INTERFACEDEFSEQ__SARG_TRAITS_TMPLINST_SS_
-
-  template class TAO::SArg_Traits<CORBA::InterfaceDefSeq>;
-
-  template class
-    TAO::Var_Size_SArg_Traits_T<
-        CORBA::InterfaceDefSeq,
-        CORBA::InterfaceDefSeq_var,
-        CORBA::InterfaceDefSeq_out
-      >;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_EXCEPTIONDEF__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_EXCEPTIONDEF__SARG_TRAITS_TMPLINST_SS_
-
-  template class TAO::SArg_Traits<CORBA::ExceptionDef>;
-
-  template class
-    TAO::Object_SArg_Traits_T<
-        CORBA::ExceptionDef_ptr,
-        CORBA::ExceptionDef_var,
-        CORBA::ExceptionDef_out,
-      >;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_NATIVEDEF__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_NATIVEDEF__SARG_TRAITS_TMPLINST_SS_
-
-  template class TAO::SArg_Traits<CORBA::NativeDef>;
-
-  template class
-    TAO::Object_SArg_Traits_T<
-        CORBA::NativeDef_ptr,
-        CORBA::NativeDef_var,
-        CORBA::NativeDef_out,
-      >;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_VALUEDEF__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_VALUEDEF__SARG_TRAITS_TMPLINST_SS_
-
-  template class TAO::SArg_Traits<CORBA::ValueDef>;
-
-  template class
-    TAO::Object_SArg_Traits_T<
-        CORBA::ValueDef_ptr,
-        CORBA::ValueDef_var,
-        CORBA::ValueDef_out,
-      >;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_VALUEDEFSEQ__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_VALUEDEFSEQ__SARG_TRAITS_TMPLINST_SS_
-
-  template class TAO::SArg_Traits<CORBA::ValueDefSeq>;
-
-  template class
-    TAO::Var_Size_SArg_Traits_T<
-        CORBA::ValueDefSeq,
-        CORBA::ValueDefSeq_var,
-        CORBA::ValueDefSeq_out
-      >;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_VALUEBOXDEF__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_VALUEBOXDEF__SARG_TRAITS_TMPLINST_SS_
-
-  template class TAO::SArg_Traits<CORBA::ValueBoxDef>;
-
-  template class
-    TAO::Object_SArg_Traits_T<
-        CORBA::ValueBoxDef_ptr,
-        CORBA::ValueBoxDef_var,
-        CORBA::ValueBoxDef_out,
-      >;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_ABSTRACTINTERFACEDEF__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_ABSTRACTINTERFACEDEF__SARG_TRAITS_TMPLINST_SS_
-
-  template class TAO::SArg_Traits<CORBA::AbstractInterfaceDef>;
-
-  template class
-    TAO::Object_SArg_Traits_T<
-        CORBA::AbstractInterfaceDef_ptr,
-        CORBA::AbstractInterfaceDef_var,
-        CORBA::AbstractInterfaceDef_out,
-      >;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_ABSTRACTINTERFACEDEFSEQ__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_ABSTRACTINTERFACEDEFSEQ__SARG_TRAITS_TMPLINST_SS_
-
-  template class TAO::SArg_Traits<CORBA::AbstractInterfaceDefSeq>;
-
-  template class
-    TAO::Var_Size_SArg_Traits_T<
-        CORBA::AbstractInterfaceDefSeq,
-        CORBA::AbstractInterfaceDefSeq_var,
-        CORBA::AbstractInterfaceDefSeq_out
-      >;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_LOCALINTERFACEDEF__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_LOCALINTERFACEDEF__SARG_TRAITS_TMPLINST_SS_
-
-  template class TAO::SArg_Traits<CORBA::LocalInterfaceDef>;
-
-  template class
-    TAO::Object_SArg_Traits_T<
-        CORBA::LocalInterfaceDef_ptr,
-        CORBA::LocalInterfaceDef_var,
-        CORBA::LocalInterfaceDef_out,
-      >;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_EXTVALUEDEF__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_EXTVALUEDEF__SARG_TRAITS_TMPLINST_SS_
-
-  template class TAO::SArg_Traits<CORBA::ExtValueDef>;
-
-  template class
-    TAO::Object_SArg_Traits_T<
-        CORBA::ExtValueDef_ptr,
-        CORBA::ExtValueDef_var,
-        CORBA::ExtValueDef_out,
-      >;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_CONTAINEDSEQ__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_CONTAINEDSEQ__SARG_TRAITS_TMPLINST_SS_
-
-  template class TAO::SArg_Traits<CORBA::ContainedSeq>;
-
-  template class
-    TAO::Var_Size_SArg_Traits_T<
-        CORBA::ContainedSeq,
-        CORBA::ContainedSeq_var,
-        CORBA::ContainedSeq_out
-      >;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_STRUCTMEMBERSEQ__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_STRUCTMEMBERSEQ__SARG_TRAITS_TMPLINST_SS_
-
-  template class TAO::SArg_Traits<CORBA::StructMemberSeq>;
-
-  template class
-    TAO::Var_Size_SArg_Traits_T<
-        CORBA::StructMemberSeq,
-        CORBA::StructMemberSeq_var,
-        CORBA::StructMemberSeq_out
-      >;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_INITIALIZERSEQ__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_INITIALIZERSEQ__SARG_TRAITS_TMPLINST_SS_
-
-  template class TAO::SArg_Traits<CORBA::InitializerSeq>;
-
-  template class
-    TAO::Var_Size_SArg_Traits_T<
-        CORBA::InitializerSeq,
-        CORBA::InitializerSeq_var,
-        CORBA::InitializerSeq_out
-      >;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_EXTINITIALIZERSEQ__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_EXTINITIALIZERSEQ__SARG_TRAITS_TMPLINST_SS_
-
-  template class TAO::SArg_Traits<CORBA::ExtInitializerSeq>;
-
-  template class
-    TAO::Var_Size_SArg_Traits_T<
-        CORBA::ExtInitializerSeq,
-        CORBA::ExtInitializerSeq_var,
-        CORBA::ExtInitializerSeq_out
-      >;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_UNIONMEMBERSEQ__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_UNIONMEMBERSEQ__SARG_TRAITS_TMPLINST_SS_
-
-  template class TAO::SArg_Traits<CORBA::UnionMemberSeq>;
-
-  template class
-    TAO::Var_Size_SArg_Traits_T<
-        CORBA::UnionMemberSeq,
-        CORBA::UnionMemberSeq_var,
-        CORBA::UnionMemberSeq_out
-      >;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_ENUMMEMBERSEQ__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_ENUMMEMBERSEQ__SARG_TRAITS_TMPLINST_SS_
-
-  template class TAO::SArg_Traits<CORBA::EnumMemberSeq>;
-
-  template class
-    TAO::Var_Size_SArg_Traits_T<
-        CORBA::EnumMemberSeq,
-        CORBA::EnumMemberSeq_var,
-        CORBA::EnumMemberSeq_out
-      >;
-
-#endif /* end #if !defined */
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#if !defined (_CORBA_DEFINITIONKIND__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_DEFINITIONKIND__SARG_TRAITS_TMPLINST_SS_
-
-# pragma instantiate TAO::SArg_Traits<CORBA::DefinitionKind>
-
-# pragma instantiate TAO::Basic_SArg_Traits_T<CORBA::DefinitionKind>
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_CONTAINED__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_CONTAINED__SARG_TRAITS_TMPLINST_SS_
-
-# pragma instantiate TAO::SArg_Traits<CORBA::Contained>
-
-# pragma instantiate \
-    TAO::Object_SArg_Traits_T< \
-        CORBA::Contained_ptr, \
-        CORBA::Contained_var, \
-        CORBA::Contained_out, \
-      >
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_CONTAINED_DESCRIPTION__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_CONTAINED_DESCRIPTION__SARG_TRAITS_TMPLINST_SS_
-
-# pragma instantiate TAO::SArg_Traits<CORBA::Contained::Description>
-
-# pragma instantiate \
-    TAO::Var_Size_SArg_Traits_T< \
-        CORBA::Contained::Description, \
-        CORBA::Contained::Description_var, \
-        CORBA::Contained::Description_out \
-      >
-
-#endif /* end #if !defined */
-
-# pragma instantiate \
-    TAO::In_Object_SArgument_T< \
-        CORBA::Container_ptr \
-      >
-
-#if !defined (_CORBA_REPOSITORY__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_REPOSITORY__SARG_TRAITS_TMPLINST_SS_
-
-# pragma instantiate TAO::SArg_Traits<CORBA::Repository>
-
-# pragma instantiate \
-    TAO::Object_SArg_Traits_T< \
-        CORBA::Repository_ptr, \
-        CORBA::Repository_var, \
-        CORBA::Repository_out, \
-      >
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_CONTAINER__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_CONTAINER__SARG_TRAITS_TMPLINST_SS_
-
-# pragma instantiate TAO::SArg_Traits<CORBA::Container>
-
-# pragma instantiate \
-    TAO::Object_SArg_Traits_T< \
-        CORBA::Container_ptr, \
-        CORBA::Container_var, \
-        CORBA::Container_out, \
-      >
-
-#endif /* end #if !defined */
-
-# pragma instantiate \
-    TAO::In_Basic_SArgument_T< \
-        CORBA::DefinitionKind \
-      >
-
-#if !defined (_CORBA_CONTAINER_DESCRIPTIONSEQ__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_CONTAINER_DESCRIPTIONSEQ__SARG_TRAITS_TMPLINST_SS_
-
-# pragma instantiate TAO::SArg_Traits<CORBA::Container::DescriptionSeq>
-
-# pragma instantiate \
-    TAO::Var_Size_SArg_Traits_T< \
-        CORBA::Container::DescriptionSeq, \
-        CORBA::Container::DescriptionSeq_var, \
-        CORBA::Container::DescriptionSeq_out \
-      >
-
-#endif /* end #if !defined */
-
-# pragma instantiate \
-    TAO::In_Object_SArgument_T< \
-        CORBA::IDLType_ptr \
-      >
-
-# pragma instantiate \
-    TAO::In_Var_Size_SArgument_T< \
-        CORBA::StructMemberSeq \
-      >
-
-# pragma instantiate \
-    TAO::In_Var_Size_SArgument_T< \
-        CORBA::UnionMemberSeq \
-      >
-
-# pragma instantiate \
-    TAO::In_Var_Size_SArgument_T< \
-        CORBA::EnumMemberSeq \
-      >
-
-# pragma instantiate \
-    TAO::In_Var_Size_SArgument_T< \
-        CORBA::InterfaceDefSeq \
-      >
-
-# pragma instantiate \
-    TAO::In_Object_SArgument_T< \
-        CORBA::ValueDef_ptr \
-      >
-
-# pragma instantiate \
-    TAO::In_Var_Size_SArgument_T< \
-        CORBA::ValueDefSeq \
-      >
-
-# pragma instantiate \
-    TAO::In_Var_Size_SArgument_T< \
-        CORBA::InitializerSeq \
-      >
-
-# pragma instantiate \
-    TAO::In_Var_Size_SArgument_T< \
-        CORBA::AbstractInterfaceDefSeq \
-      >
-
-# pragma instantiate \
-    TAO::In_Var_Size_SArgument_T< \
-        CORBA::ExtInitializerSeq \
-      >
-
-#if !defined (_CORBA_MODULEDEF__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_MODULEDEF__SARG_TRAITS_TMPLINST_SS_
-
-# pragma instantiate TAO::SArg_Traits<CORBA::ModuleDef>
-
-# pragma instantiate \
-    TAO::Object_SArg_Traits_T< \
-        CORBA::ModuleDef_ptr, \
-        CORBA::ModuleDef_var, \
-        CORBA::ModuleDef_out, \
-      >
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_CONSTANTDEF__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_CONSTANTDEF__SARG_TRAITS_TMPLINST_SS_
-
-# pragma instantiate TAO::SArg_Traits<CORBA::ConstantDef>
-
-# pragma instantiate \
-    TAO::Object_SArg_Traits_T< \
-        CORBA::ConstantDef_ptr, \
-        CORBA::ConstantDef_var, \
-        CORBA::ConstantDef_out, \
-      >
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_IDLTYPE__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_IDLTYPE__SARG_TRAITS_TMPLINST_SS_
-
-# pragma instantiate TAO::SArg_Traits<CORBA::IDLType>
-
-# pragma instantiate \
-    TAO::Object_SArg_Traits_T< \
-        CORBA::IDLType_ptr, \
-        CORBA::IDLType_var, \
-        CORBA::IDLType_out, \
-      >
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_STRUCTDEF__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_STRUCTDEF__SARG_TRAITS_TMPLINST_SS_
-
-# pragma instantiate TAO::SArg_Traits<CORBA::StructDef>
-
-# pragma instantiate \
-    TAO::Object_SArg_Traits_T< \
-        CORBA::StructDef_ptr, \
-        CORBA::StructDef_var, \
-        CORBA::StructDef_out, \
-      >
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_UNIONDEF__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_UNIONDEF__SARG_TRAITS_TMPLINST_SS_
-
-# pragma instantiate TAO::SArg_Traits<CORBA::UnionDef>
-
-# pragma instantiate \
-    TAO::Object_SArg_Traits_T< \
-        CORBA::UnionDef_ptr, \
-        CORBA::UnionDef_var, \
-        CORBA::UnionDef_out, \
-      >
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_ENUMDEF__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_ENUMDEF__SARG_TRAITS_TMPLINST_SS_
-
-# pragma instantiate TAO::SArg_Traits<CORBA::EnumDef>
-
-# pragma instantiate \
-    TAO::Object_SArg_Traits_T< \
-        CORBA::EnumDef_ptr, \
-        CORBA::EnumDef_var, \
-        CORBA::EnumDef_out, \
-      >
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_ALIASDEF__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_ALIASDEF__SARG_TRAITS_TMPLINST_SS_
-
-# pragma instantiate TAO::SArg_Traits<CORBA::AliasDef>
-
-# pragma instantiate \
-    TAO::Object_SArg_Traits_T< \
-        CORBA::AliasDef_ptr, \
-        CORBA::AliasDef_var, \
-        CORBA::AliasDef_out, \
-      >
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_INTERFACEDEF__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_INTERFACEDEF__SARG_TRAITS_TMPLINST_SS_
-
-# pragma instantiate TAO::SArg_Traits<CORBA::InterfaceDef>
-
-# pragma instantiate \
-    TAO::Object_SArg_Traits_T< \
-        CORBA::InterfaceDef_ptr, \
-        CORBA::InterfaceDef_var, \
-        CORBA::InterfaceDef_out, \
-      >
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_INTERFACEDEFSEQ__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_INTERFACEDEFSEQ__SARG_TRAITS_TMPLINST_SS_
-
-# pragma instantiate TAO::SArg_Traits<CORBA::InterfaceDefSeq>
-
-# pragma instantiate \
-    TAO::Var_Size_SArg_Traits_T< \
-        CORBA::InterfaceDefSeq, \
-        CORBA::InterfaceDefSeq_var, \
-        CORBA::InterfaceDefSeq_out \
-      >
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_EXCEPTIONDEF__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_EXCEPTIONDEF__SARG_TRAITS_TMPLINST_SS_
-
-# pragma instantiate TAO::SArg_Traits<CORBA::ExceptionDef>
-
-# pragma instantiate \
-    TAO::Object_SArg_Traits_T< \
-        CORBA::ExceptionDef_ptr, \
-        CORBA::ExceptionDef_var, \
-        CORBA::ExceptionDef_out, \
-      >
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_NATIVEDEF__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_NATIVEDEF__SARG_TRAITS_TMPLINST_SS_
-
-# pragma instantiate TAO::SArg_Traits<CORBA::NativeDef>
-
-# pragma instantiate \
-    TAO::Object_SArg_Traits_T< \
-        CORBA::NativeDef_ptr, \
-        CORBA::NativeDef_var, \
-        CORBA::NativeDef_out, \
-      >
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_VALUEDEF__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_VALUEDEF__SARG_TRAITS_TMPLINST_SS_
-
-# pragma instantiate TAO::SArg_Traits<CORBA::ValueDef>
-
-# pragma instantiate \
-    TAO::Object_SArg_Traits_T< \
-        CORBA::ValueDef_ptr, \
-        CORBA::ValueDef_var, \
-        CORBA::ValueDef_out, \
-      >
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_VALUEDEFSEQ__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_VALUEDEFSEQ__SARG_TRAITS_TMPLINST_SS_
-
-# pragma instantiate TAO::SArg_Traits<CORBA::ValueDefSeq>
-
-# pragma instantiate \
-    TAO::Var_Size_SArg_Traits_T< \
-        CORBA::ValueDefSeq, \
-        CORBA::ValueDefSeq_var, \
-        CORBA::ValueDefSeq_out \
-      >
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_VALUEBOXDEF__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_VALUEBOXDEF__SARG_TRAITS_TMPLINST_SS_
-
-# pragma instantiate TAO::SArg_Traits<CORBA::ValueBoxDef>
-
-# pragma instantiate \
-    TAO::Object_SArg_Traits_T< \
-        CORBA::ValueBoxDef_ptr, \
-        CORBA::ValueBoxDef_var, \
-        CORBA::ValueBoxDef_out, \
-      >
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_ABSTRACTINTERFACEDEF__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_ABSTRACTINTERFACEDEF__SARG_TRAITS_TMPLINST_SS_
-
-# pragma instantiate TAO::SArg_Traits<CORBA::AbstractInterfaceDef>
-
-# pragma instantiate \
-    TAO::Object_SArg_Traits_T< \
-        CORBA::AbstractInterfaceDef_ptr, \
-        CORBA::AbstractInterfaceDef_var, \
-        CORBA::AbstractInterfaceDef_out, \
-      >
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_ABSTRACTINTERFACEDEFSEQ__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_ABSTRACTINTERFACEDEFSEQ__SARG_TRAITS_TMPLINST_SS_
-
-# pragma instantiate TAO::SArg_Traits<CORBA::AbstractInterfaceDefSeq>
-
-# pragma instantiate \
-    TAO::Var_Size_SArg_Traits_T< \
-        CORBA::AbstractInterfaceDefSeq, \
-        CORBA::AbstractInterfaceDefSeq_var, \
-        CORBA::AbstractInterfaceDefSeq_out \
-      >
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_LOCALINTERFACEDEF__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_LOCALINTERFACEDEF__SARG_TRAITS_TMPLINST_SS_
-
-# pragma instantiate TAO::SArg_Traits<CORBA::LocalInterfaceDef>
-
-# pragma instantiate \
-    TAO::Object_SArg_Traits_T< \
-        CORBA::LocalInterfaceDef_ptr, \
-        CORBA::LocalInterfaceDef_var, \
-        CORBA::LocalInterfaceDef_out, \
-      >
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_EXTVALUEDEF__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_EXTVALUEDEF__SARG_TRAITS_TMPLINST_SS_
-
-# pragma instantiate TAO::SArg_Traits<CORBA::ExtValueDef>
-
-# pragma instantiate \
-    TAO::Object_SArg_Traits_T< \
-        CORBA::ExtValueDef_ptr, \
-        CORBA::ExtValueDef_var, \
-        CORBA::ExtValueDef_out, \
-      >
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_CONTAINEDSEQ__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_CONTAINEDSEQ__SARG_TRAITS_TMPLINST_SS_
-
-# pragma instantiate TAO::SArg_Traits<CORBA::ContainedSeq>
-
-# pragma instantiate \
-    TAO::Var_Size_SArg_Traits_T< \
-        CORBA::ContainedSeq, \
-        CORBA::ContainedSeq_var, \
-        CORBA::ContainedSeq_out \
-      >
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_STRUCTMEMBERSEQ__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_STRUCTMEMBERSEQ__SARG_TRAITS_TMPLINST_SS_
-
-# pragma instantiate TAO::SArg_Traits<CORBA::StructMemberSeq>
-
-# pragma instantiate \
-    TAO::Var_Size_SArg_Traits_T< \
-        CORBA::StructMemberSeq, \
-        CORBA::StructMemberSeq_var, \
-        CORBA::StructMemberSeq_out \
-      >
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_INITIALIZERSEQ__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_INITIALIZERSEQ__SARG_TRAITS_TMPLINST_SS_
-
-# pragma instantiate TAO::SArg_Traits<CORBA::InitializerSeq>
-
-# pragma instantiate \
-    TAO::Var_Size_SArg_Traits_T< \
-        CORBA::InitializerSeq, \
-        CORBA::InitializerSeq_var, \
-        CORBA::InitializerSeq_out \
-      >
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_EXTINITIALIZERSEQ__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_EXTINITIALIZERSEQ__SARG_TRAITS_TMPLINST_SS_
-
-# pragma instantiate TAO::SArg_Traits<CORBA::ExtInitializerSeq>
-
-# pragma instantiate \
-    TAO::Var_Size_SArg_Traits_T< \
-        CORBA::ExtInitializerSeq, \
-        CORBA::ExtInitializerSeq_var, \
-        CORBA::ExtInitializerSeq_out \
-      >
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_UNIONMEMBERSEQ__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_UNIONMEMBERSEQ__SARG_TRAITS_TMPLINST_SS_
-
-# pragma instantiate TAO::SArg_Traits<CORBA::UnionMemberSeq>
-
-# pragma instantiate \
-    TAO::Var_Size_SArg_Traits_T< \
-        CORBA::UnionMemberSeq, \
-        CORBA::UnionMemberSeq_var, \
-        CORBA::UnionMemberSeq_out \
-      >
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_ENUMMEMBERSEQ__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_ENUMMEMBERSEQ__SARG_TRAITS_TMPLINST_SS_
-
-# pragma instantiate TAO::SArg_Traits<CORBA::EnumMemberSeq>
-
-# pragma instantiate \
-    TAO::Var_Size_SArg_Traits_T< \
-        CORBA::EnumMemberSeq, \
-        CORBA::EnumMemberSeq_var, \
-        CORBA::EnumMemberSeq_out \
-      >
-
-#endif /* end #if !defined */
-
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
-
 #endif /* ifndef */
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.h
index eafc52f23ff..68af050acad 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.h
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:390
+// be\be_codegen.cpp:393
 
 #ifndef _TAO_IDL_ORIG_IFR_BASES_H_
 #define _TAO_IDL_ORIG_IFR_BASES_H_
@@ -59,102 +59,109 @@
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_sh.cpp:87
-  
+
   class IRObject;
   typedef IRObject *IRObject_ptr;
-  
-  
+
+
   class  IRObject
     : public virtual PortableServer::ServantBase
   {
   protected:
     IRObject (void);
-  
+
   public:
     // Useful for template programming.
     typedef ::CORBA::IRObject _stub_type;
     typedef ::CORBA::IRObject_ptr _stub_ptr_type;
     typedef ::CORBA::IRObject_var _stub_var_type;
-    
+
     IRObject (const IRObject& rhs);
     virtual ~IRObject (void);
-    
+
     virtual CORBA::Boolean _is_a (
         const char* logical_type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static void _is_a_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
         ACE_ENV_ARG_DECL
       );
-    
+
     static void _non_existent_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
         ACE_ENV_ARG_DECL
       );
-    
+
     static void _interface_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
         ACE_ENV_ARG_DECL
       );
-    
+
     static void _component_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
         ACE_ENV_ARG_DECL
       );
-    
+
+    static void _repository_id_skel (
+        TAO_ServerRequest & req,
+        void * servant_upcall,
+        void * servant
+        ACE_ENV_ARG_DECL
+      );
+
     virtual void _dispatch (
         TAO_ServerRequest & req,
         void * servant_upcall
         ACE_ENV_ARG_DECL
       );
-    
+
     ::CORBA::IRObject *_this (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
-    
+
     virtual ::CORBA::DefinitionKind def_kind (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     static void _get_def_kind_skel (
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
         ACE_ENV_ARG_DECL
       );
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
-    
+
     virtual void destroy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     static void destroy_skel (
         TAO_ServerRequest & server_request,
         void * servant_upcall,
@@ -162,94 +169,101 @@ namespace POA_CORBA
         ACE_ENV_ARG_DECL
       );
   };
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_sh.cpp:87
-  
+
   class Contained;
   typedef Contained *Contained_ptr;
-  
-  
+
+
   class  Contained
     : public virtual POA_CORBA::IRObject
   {
   protected:
     Contained (void);
-  
+
   public:
     // Useful for template programming.
     typedef ::CORBA::Contained _stub_type;
     typedef ::CORBA::Contained_ptr _stub_ptr_type;
     typedef ::CORBA::Contained_var _stub_var_type;
-    
+
     Contained (const Contained& rhs);
     virtual ~Contained (void);
-    
+
     virtual CORBA::Boolean _is_a (
         const char* logical_type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static void _is_a_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
         ACE_ENV_ARG_DECL
       );
-    
+
     static void _non_existent_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
         ACE_ENV_ARG_DECL
       );
-    
+
     static void _interface_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
         ACE_ENV_ARG_DECL
       );
-    
+
     static void _component_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
         ACE_ENV_ARG_DECL
       );
-    
+
+    static void _repository_id_skel (
+        TAO_ServerRequest & req,
+        void * servant_upcall,
+        void * servant
+        ACE_ENV_ARG_DECL
+      );
+
     virtual void _dispatch (
         TAO_ServerRequest & req,
         void * servant_upcall
         ACE_ENV_ARG_DECL
       );
-    
+
     ::CORBA::Contained *_this (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
-    
+
     virtual char * id (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     static void _get_id_skel (
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
         ACE_ENV_ARG_DECL
       );
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
-    
+
     virtual void id (
         const char * id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -257,34 +271,34 @@ namespace POA_CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     static void _set_id_skel (
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
         ACE_ENV_ARG_DECL
       );
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
-    
+
     virtual char * name (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     static void _get_name_skel (
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
         ACE_ENV_ARG_DECL
       );
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
-    
+
     virtual void name (
         const char * name
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -292,34 +306,34 @@ namespace POA_CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     static void _set_name_skel (
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
         ACE_ENV_ARG_DECL
       );
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
-    
+
     virtual char * version (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     static void _get_version_skel (
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
         ACE_ENV_ARG_DECL
       );
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
-    
+
     virtual void version (
         const char * version
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -327,85 +341,85 @@ namespace POA_CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     static void _set_version_skel (
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
         ACE_ENV_ARG_DECL
       );
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
-    
+
     virtual ::CORBA::Container_ptr defined_in (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     static void _get_defined_in_skel (
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
         ACE_ENV_ARG_DECL
       );
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
-    
+
     virtual char * absolute_name (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     static void _get_absolute_name_skel (
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
         ACE_ENV_ARG_DECL
       );
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
-    
+
     virtual ::CORBA::Repository_ptr containing_repository (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     static void _get_containing_repository_skel (
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
         ACE_ENV_ARG_DECL
       );
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
-    
+
     virtual ::CORBA::Contained::Description * describe (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     static void describe_skel (
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
         ACE_ENV_ARG_DECL
       );
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
-    
+
     virtual void move (
         ::CORBA::Container_ptr new_container,
         const char * new_name,
@@ -415,14 +429,14 @@ namespace POA_CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     static void move_skel (
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
         ACE_ENV_ARG_DECL
       );
-    
+
     static void
     _get_def_kind_skel (
         TAO_ServerRequest & server_request,
@@ -430,84 +444,91 @@ namespace POA_CORBA
         void * servant
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
-    
+    // be\be_interface.cpp:1869
+
     static void
     destroy_skel (
-        TAO_ServerRequest & server_request, 
+        TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
   };
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_sh.cpp:87
-  
+
   class Container;
   typedef Container *Container_ptr;
-  
-  
+
+
   class  Container
     : public virtual POA_CORBA::IRObject
   {
   protected:
     Container (void);
-  
+
   public:
     // Useful for template programming.
     typedef ::CORBA::Container _stub_type;
     typedef ::CORBA::Container_ptr _stub_ptr_type;
     typedef ::CORBA::Container_var _stub_var_type;
-    
+
     Container (const Container& rhs);
     virtual ~Container (void);
-    
+
     virtual CORBA::Boolean _is_a (
         const char* logical_type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static void _is_a_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
         ACE_ENV_ARG_DECL
       );
-    
+
     static void _non_existent_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
         ACE_ENV_ARG_DECL
       );
-    
+
     static void _interface_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
         ACE_ENV_ARG_DECL
       );
-    
+
     static void _component_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
         ACE_ENV_ARG_DECL
       );
-    
+
+    static void _repository_id_skel (
+        TAO_ServerRequest & req,
+        void * servant_upcall,
+        void * servant
+        ACE_ENV_ARG_DECL
+      );
+
     virtual void _dispatch (
         TAO_ServerRequest & req,
         void * servant_upcall
         ACE_ENV_ARG_DECL
       );
-    
+
     ::CORBA::Container *_this (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     
     // TAO_IDL - Generated from
@@ -903,7 +924,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     destroy_skel (
@@ -969,6 +990,13 @@ namespace POA_CORBA
         ACE_ENV_ARG_DECL
       );
     
+    static void _repository_id_skel (
+        TAO_ServerRequest & req,
+        void * servant_upcall,
+        void * servant
+        ACE_ENV_ARG_DECL
+      );
+    
     virtual void _dispatch (
         TAO_ServerRequest & req,
         void * servant_upcall
@@ -1007,7 +1035,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     destroy_skel (
@@ -1074,6 +1102,13 @@ namespace POA_CORBA
         ACE_ENV_ARG_DECL
       );
     
+    static void _repository_id_skel (
+        TAO_ServerRequest & req,
+        void * servant_upcall,
+        void * servant
+        ACE_ENV_ARG_DECL
+      );
+    
     virtual void _dispatch (
         TAO_ServerRequest & req,
         void * servant_upcall
@@ -1095,7 +1130,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     destroy_skel (
@@ -1178,7 +1213,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     describe_skel (
@@ -1189,7 +1224,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     move_skel (
@@ -1214,7 +1249,7 @@ namespace POA_CORBA
 } // module CORBA
 
 // TAO_IDL - Generated from 
-// be\be_codegen.cpp:997
+// be\be_codegen.cpp:1120
 
 #include "IFR_BaseS_T.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.inl b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.inl
index 58e6301a7c2..4587bf46b70 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.inl
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS.inl
@@ -45,7 +45,7 @@ POA_CORBA::Contained::_get_def_kind_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -84,7 +84,7 @@ POA_CORBA::Container::_get_def_kind_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -123,7 +123,7 @@ POA_CORBA::IDLType::_get_def_kind_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -162,7 +162,7 @@ POA_CORBA::TypedefDef::_get_def_kind_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -345,7 +345,7 @@ POA_CORBA::TypedefDef::_get_containing_repository_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -366,7 +366,7 @@ POA_CORBA::TypedefDef::describe_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.cpp
index 1a5fed2264d..0f80c13c246 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.cpp
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from 
-// be\be_codegen.cpp:683
+// be\be_codegen.cpp:679
 
 #ifndef _TAO_IDL_ORIG_IFR_BASES_T_CPP_
 #define _TAO_IDL_ORIG_IFR_BASES_T_CPP_
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.h
index c4b36f6d65a..319a899e0cc 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BaseS_T.h
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:546
+// be\be_codegen.cpp:538
 
 #ifndef _TAO_IDL_ORIG_IFR_BASES_T_H_
 #define _TAO_IDL_ORIG_IFR_BASES_T_H_
@@ -907,7 +907,7 @@ namespace POA_CORBA
 } // module CORBA
 
 // TAO_IDL - Generated from 
-// be\be_codegen.cpp:1094
+// be\be_codegen.cpp:1221
 
 #if defined (__ACE_INLINE__)
 #include "IFR_BaseS_T.inl"
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.cpp
index b8866335f32..455ac5534f1 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.cpp
@@ -27,7 +27,7 @@
 
 
 // TAO_IDL - Generated from 
-// be\be_codegen.cpp:617
+// be\be_codegen.cpp:601
 
 #ifndef _TAO_IDL_ORIG_IFR_BASICS_CPP_
 #define _TAO_IDL_ORIG_IFR_BASICS_CPP_
@@ -54,8 +54,8 @@
 #include "tao/Stub.h"
 #include "tao/IFR_Client_Adapter.h"
 #include "tao/Object_T.h"
-#include "tao/TypeCode.h"
-#include "tao/DynamicC.h"
+#include "tao/AnyTypeCode/TypeCode.h"
+#include "tao/AnyTypeCode/DynamicC.h"
 #include "tao/CDR.h"
 #include "tao/operation_details.h"
 #include "tao/PortableInterceptor.h"
@@ -64,7 +64,7 @@
 #include "tao/Special_Basic_Arguments.h"
 #include "tao/UB_String_Arguments.h"
 #include "tao/Var_Size_Argument_T.h"
-#include "tao/Any_Arg_Traits.h"
+#include "tao/AnyTypeCode/Any_Arg_Traits.h"
 #include "ace/Dynamic_Service.h"
 #include "ace/Malloc_Allocator.h"
 
@@ -77,31 +77,35 @@
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
+// be\be_visitor_arg_traits.cpp:70
 
 // Arg traits specializations.
 namespace TAO
 {
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:702
+  // be\be_visitor_arg_traits.cpp:793
 
-#if !defined (_CORBA_DEFINITIONKIND__SARG_TRAITS_SS_)
-#define _CORBA_DEFINITIONKIND__SARG_TRAITS_SS_
+#if !defined (_CORBA_DEFINITIONKIND__SARG_TRAITS_)
+#define _CORBA_DEFINITIONKIND__SARG_TRAITS_
   
   template<>
-  class TAO_IFR_Client_Export SArg_Traits<CORBA::DefinitionKind>
+  class SArg_Traits<CORBA::DefinitionKind>
     : public
         Basic_SArg_Traits_T<
-            CORBA::DefinitionKind
+            CORBA::DefinitionKind,
+            TAO::Any_Insert_Policy_Stream <CORBA::DefinitionKind>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_CONTAINED__SARG_TRAITS_SS_)
-#define _CORBA_CONTAINED__SARG_TRAITS_SS_
+#if !defined (_CORBA_CONTAINED__SARG_TRAITS_)
+#define _CORBA_CONTAINED__SARG_TRAITS_
   
   template<>
   class  SArg_Traits<CORBA::Contained>
@@ -109,15 +113,19 @@ namespace TAO
         Object_SArg_Traits_T<
             CORBA::Contained_ptr,
             CORBA::Contained_var,
-            CORBA::Contained_out
+            CORBA::Contained_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::Contained_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_REPOSITORY__SARG_TRAITS_SS_)
-#define _CORBA_REPOSITORY__SARG_TRAITS_SS_
+#if !defined (_CORBA_REPOSITORY__SARG_TRAITS_)
+#define _CORBA_REPOSITORY__SARG_TRAITS_
   
   template<>
   class  SArg_Traits<CORBA::Repository>
@@ -125,15 +133,19 @@ namespace TAO
         Object_SArg_Traits_T<
             CORBA::Repository_ptr,
             CORBA::Repository_var,
-            CORBA::Repository_out
+            CORBA::Repository_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::Repository_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_CONTAINER__SARG_TRAITS_SS_)
-#define _CORBA_CONTAINER__SARG_TRAITS_SS_
+#if !defined (_CORBA_CONTAINER__SARG_TRAITS_)
+#define _CORBA_CONTAINER__SARG_TRAITS_
   
   template<>
   class  SArg_Traits<CORBA::Container>
@@ -141,15 +153,19 @@ namespace TAO
         Object_SArg_Traits_T<
             CORBA::Container_ptr,
             CORBA::Container_var,
-            CORBA::Container_out
+            CORBA::Container_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::Container_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_IDLTYPE__SARG_TRAITS_SS_)
-#define _CORBA_IDLTYPE__SARG_TRAITS_SS_
+#if !defined (_CORBA_IDLTYPE__SARG_TRAITS_)
+#define _CORBA_IDLTYPE__SARG_TRAITS_
   
   template<>
   class  SArg_Traits<CORBA::IDLType>
@@ -157,7 +173,8 @@ namespace TAO
         Object_SArg_Traits_T<
             CORBA::IDLType_ptr,
             CORBA::IDLType_var,
-            CORBA::IDLType_out
+            CORBA::IDLType_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::IDLType_ptr>
           >
   {
   };
@@ -165,18 +182,19 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:743
+  // be\be_visitor_arg_traits.cpp:835
 
-#if !defined (_CORBA_INTERFACEDEF_FULLINTERFACEDESCRIPTION__SARG_TRAITS_SS_)
-#define _CORBA_INTERFACEDEF_FULLINTERFACEDESCRIPTION__SARG_TRAITS_SS_
+#if !defined (_CORBA_INTERFACEDEF_FULLINTERFACEDESCRIPTION__SARG_TRAITS_)
+#define _CORBA_INTERFACEDEF_FULLINTERFACEDESCRIPTION__SARG_TRAITS_
   
   template<>
-  class TAO_IFR_Client_Export SArg_Traits<CORBA::InterfaceDef::FullInterfaceDescription>
+  class SArg_Traits<CORBA::InterfaceDef::FullInterfaceDescription>
     : public
         Var_Size_SArg_Traits_T<
             CORBA::InterfaceDef::FullInterfaceDescription,
             CORBA::InterfaceDef::FullInterfaceDescription_var,
-            CORBA::InterfaceDef::FullInterfaceDescription_out
+            CORBA::InterfaceDef::FullInterfaceDescription_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::InterfaceDef::FullInterfaceDescription>
           >
   {
   };
@@ -184,18 +202,19 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:492
+  // be\be_visitor_arg_traits.cpp:547
 
-#if !defined (_CORBA_INTERFACEDEFSEQ__SARG_TRAITS_SS_)
-#define _CORBA_INTERFACEDEFSEQ__SARG_TRAITS_SS_
+#if !defined (_CORBA_INTERFACEDEFSEQ__SARG_TRAITS_)
+#define _CORBA_INTERFACEDEFSEQ__SARG_TRAITS_
   
   template<>
-  class TAO_IFR_Client_Export SArg_Traits<CORBA::InterfaceDefSeq>
+  class SArg_Traits<CORBA::InterfaceDefSeq>
     : public
         Var_Size_SArg_Traits_T<
             CORBA::InterfaceDefSeq,
             CORBA::InterfaceDefSeq_var,
-            CORBA::InterfaceDefSeq_out
+            CORBA::InterfaceDefSeq_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::InterfaceDefSeq>
           >
   {
   };
@@ -203,18 +222,19 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:492
+  // be\be_visitor_arg_traits.cpp:547
 
-#if !defined (_CORBA_STRUCTMEMBERSEQ__SARG_TRAITS_SS_)
-#define _CORBA_STRUCTMEMBERSEQ__SARG_TRAITS_SS_
+#if !defined (_CORBA_STRUCTMEMBERSEQ__SARG_TRAITS_)
+#define _CORBA_STRUCTMEMBERSEQ__SARG_TRAITS_
   
   template<>
-  class TAO_IFR_Client_Export SArg_Traits<CORBA::StructMemberSeq>
+  class SArg_Traits<CORBA::StructMemberSeq>
     : public
         Var_Size_SArg_Traits_T<
             CORBA::StructMemberSeq,
             CORBA::StructMemberSeq_var,
-            CORBA::StructMemberSeq_out
+            CORBA::StructMemberSeq_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::StructMemberSeq>
           >
   {
   };
@@ -222,18 +242,19 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:492
+  // be\be_visitor_arg_traits.cpp:547
 
-#if !defined (_CORBA_EXCDESCRIPTIONSEQ__SARG_TRAITS_SS_)
-#define _CORBA_EXCDESCRIPTIONSEQ__SARG_TRAITS_SS_
+#if !defined (_CORBA_EXCDESCRIPTIONSEQ__SARG_TRAITS_)
+#define _CORBA_EXCDESCRIPTIONSEQ__SARG_TRAITS_
   
   template<>
-  class TAO_IFR_Client_Export SArg_Traits<CORBA::ExcDescriptionSeq>
+  class SArg_Traits<CORBA::ExcDescriptionSeq>
     : public
         Var_Size_SArg_Traits_T<
             CORBA::ExcDescriptionSeq,
             CORBA::ExcDescriptionSeq_var,
-            CORBA::ExcDescriptionSeq_out
+            CORBA::ExcDescriptionSeq_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::ExcDescriptionSeq>
           >
   {
   };
@@ -241,18 +262,19 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:492
+  // be\be_visitor_arg_traits.cpp:547
 
-#if !defined (_CORBA_UNIONMEMBERSEQ__SARG_TRAITS_SS_)
-#define _CORBA_UNIONMEMBERSEQ__SARG_TRAITS_SS_
+#if !defined (_CORBA_UNIONMEMBERSEQ__SARG_TRAITS_)
+#define _CORBA_UNIONMEMBERSEQ__SARG_TRAITS_
   
   template<>
-  class TAO_IFR_Client_Export SArg_Traits<CORBA::UnionMemberSeq>
+  class SArg_Traits<CORBA::UnionMemberSeq>
     : public
         Var_Size_SArg_Traits_T<
             CORBA::UnionMemberSeq,
             CORBA::UnionMemberSeq_var,
-            CORBA::UnionMemberSeq_out
+            CORBA::UnionMemberSeq_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::UnionMemberSeq>
           >
   {
   };
@@ -260,26 +282,30 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:492
+  // be\be_visitor_arg_traits.cpp:547
 
-#if !defined (_CORBA_ENUMMEMBERSEQ__SARG_TRAITS_SS_)
-#define _CORBA_ENUMMEMBERSEQ__SARG_TRAITS_SS_
+#if !defined (_CORBA_ENUMMEMBERSEQ__SARG_TRAITS_)
+#define _CORBA_ENUMMEMBERSEQ__SARG_TRAITS_
   
   template<>
-  class TAO_IFR_Client_Export SArg_Traits<CORBA::EnumMemberSeq>
+  class SArg_Traits<CORBA::EnumMemberSeq>
     : public
         Var_Size_SArg_Traits_T<
             CORBA::EnumMemberSeq,
             CORBA::EnumMemberSeq_var,
-            CORBA::EnumMemberSeq_out
+            CORBA::EnumMemberSeq_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::EnumMemberSeq>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_PRIMITIVEDEF__SARG_TRAITS_SS_)
-#define _CORBA_PRIMITIVEDEF__SARG_TRAITS_SS_
+#if !defined (_CORBA_PRIMITIVEDEF__SARG_TRAITS_)
+#define _CORBA_PRIMITIVEDEF__SARG_TRAITS_
   
   template<>
   class  SArg_Traits<CORBA::PrimitiveDef>
@@ -287,15 +313,19 @@ namespace TAO
         Object_SArg_Traits_T<
             CORBA::PrimitiveDef_ptr,
             CORBA::PrimitiveDef_var,
-            CORBA::PrimitiveDef_out
+            CORBA::PrimitiveDef_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::PrimitiveDef_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_STRINGDEF__SARG_TRAITS_SS_)
-#define _CORBA_STRINGDEF__SARG_TRAITS_SS_
+#if !defined (_CORBA_STRINGDEF__SARG_TRAITS_)
+#define _CORBA_STRINGDEF__SARG_TRAITS_
   
   template<>
   class  SArg_Traits<CORBA::StringDef>
@@ -303,15 +333,19 @@ namespace TAO
         Object_SArg_Traits_T<
             CORBA::StringDef_ptr,
             CORBA::StringDef_var,
-            CORBA::StringDef_out
+            CORBA::StringDef_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::StringDef_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_SEQUENCEDEF__SARG_TRAITS_SS_)
-#define _CORBA_SEQUENCEDEF__SARG_TRAITS_SS_
+#if !defined (_CORBA_SEQUENCEDEF__SARG_TRAITS_)
+#define _CORBA_SEQUENCEDEF__SARG_TRAITS_
   
   template<>
   class  SArg_Traits<CORBA::SequenceDef>
@@ -319,15 +353,19 @@ namespace TAO
         Object_SArg_Traits_T<
             CORBA::SequenceDef_ptr,
             CORBA::SequenceDef_var,
-            CORBA::SequenceDef_out
+            CORBA::SequenceDef_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::SequenceDef_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_ARRAYDEF__SARG_TRAITS_SS_)
-#define _CORBA_ARRAYDEF__SARG_TRAITS_SS_
+#if !defined (_CORBA_ARRAYDEF__SARG_TRAITS_)
+#define _CORBA_ARRAYDEF__SARG_TRAITS_
   
   template<>
   class  SArg_Traits<CORBA::ArrayDef>
@@ -335,15 +373,19 @@ namespace TAO
         Object_SArg_Traits_T<
             CORBA::ArrayDef_ptr,
             CORBA::ArrayDef_var,
-            CORBA::ArrayDef_out
+            CORBA::ArrayDef_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::ArrayDef_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_WSTRINGDEF__SARG_TRAITS_SS_)
-#define _CORBA_WSTRINGDEF__SARG_TRAITS_SS_
+#if !defined (_CORBA_WSTRINGDEF__SARG_TRAITS_)
+#define _CORBA_WSTRINGDEF__SARG_TRAITS_
   
   template<>
   class  SArg_Traits<CORBA::WstringDef>
@@ -351,15 +393,19 @@ namespace TAO
         Object_SArg_Traits_T<
             CORBA::WstringDef_ptr,
             CORBA::WstringDef_var,
-            CORBA::WstringDef_out
+            CORBA::WstringDef_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::WstringDef_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_FIXEDDEF__SARG_TRAITS_SS_)
-#define _CORBA_FIXEDDEF__SARG_TRAITS_SS_
+#if !defined (_CORBA_FIXEDDEF__SARG_TRAITS_)
+#define _CORBA_FIXEDDEF__SARG_TRAITS_
   
   template<>
   class  SArg_Traits<CORBA::FixedDef>
@@ -367,7 +413,8 @@ namespace TAO
         Object_SArg_Traits_T<
             CORBA::FixedDef_ptr,
             CORBA::FixedDef_var,
-            CORBA::FixedDef_out
+            CORBA::FixedDef_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::FixedDef_ptr>
           >
   {
   };
@@ -375,16 +422,17 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:702
+  // be\be_visitor_arg_traits.cpp:793
 
-#if !defined (_CORBA_PRIMITIVEKIND__SARG_TRAITS_SS_)
-#define _CORBA_PRIMITIVEKIND__SARG_TRAITS_SS_
+#if !defined (_CORBA_PRIMITIVEKIND__SARG_TRAITS_)
+#define _CORBA_PRIMITIVEKIND__SARG_TRAITS_
   
   template<>
-  class TAO_IFR_Client_Export SArg_Traits<CORBA::PrimitiveKind>
+  class SArg_Traits<CORBA::PrimitiveKind>
     : public
         Basic_SArg_Traits_T<
-            CORBA::PrimitiveKind
+            CORBA::PrimitiveKind,
+            TAO::Any_Insert_Policy_Stream <CORBA::PrimitiveKind>
           >
   {
   };
@@ -392,18 +440,19 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:492
+  // be\be_visitor_arg_traits.cpp:547
 
-#if !defined (_CORBA_EXCEPTIONDEFSEQ__SARG_TRAITS_SS_)
-#define _CORBA_EXCEPTIONDEFSEQ__SARG_TRAITS_SS_
+#if !defined (_CORBA_EXCEPTIONDEFSEQ__SARG_TRAITS_)
+#define _CORBA_EXCEPTIONDEFSEQ__SARG_TRAITS_
   
   template<>
-  class TAO_IFR_Client_Export SArg_Traits<CORBA::ExceptionDefSeq>
+  class SArg_Traits<CORBA::ExceptionDefSeq>
     : public
         Var_Size_SArg_Traits_T<
             CORBA::ExceptionDefSeq,
             CORBA::ExceptionDefSeq_var,
-            CORBA::ExceptionDefSeq_out
+            CORBA::ExceptionDefSeq_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::ExceptionDefSeq>
           >
   {
   };
@@ -411,24 +460,28 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:702
+  // be\be_visitor_arg_traits.cpp:793
 
-#if !defined (_CORBA_ATTRIBUTEMODE__SARG_TRAITS_SS_)
-#define _CORBA_ATTRIBUTEMODE__SARG_TRAITS_SS_
+#if !defined (_CORBA_ATTRIBUTEMODE__SARG_TRAITS_)
+#define _CORBA_ATTRIBUTEMODE__SARG_TRAITS_
   
   template<>
-  class TAO_IFR_Client_Export SArg_Traits<CORBA::AttributeMode>
+  class SArg_Traits<CORBA::AttributeMode>
     : public
         Basic_SArg_Traits_T<
-            CORBA::AttributeMode
+            CORBA::AttributeMode,
+            TAO::Any_Insert_Policy_Stream <CORBA::AttributeMode>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_ATTRIBUTEDEF__SARG_TRAITS_SS_)
-#define _CORBA_ATTRIBUTEDEF__SARG_TRAITS_SS_
+#if !defined (_CORBA_ATTRIBUTEDEF__SARG_TRAITS_)
+#define _CORBA_ATTRIBUTEDEF__SARG_TRAITS_
   
   template<>
   class  SArg_Traits<CORBA::AttributeDef>
@@ -436,7 +489,8 @@ namespace TAO
         Object_SArg_Traits_T<
             CORBA::AttributeDef_ptr,
             CORBA::AttributeDef_var,
-            CORBA::AttributeDef_out
+            CORBA::AttributeDef_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::AttributeDef_ptr>
           >
   {
   };
@@ -444,26 +498,30 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:743
+  // be\be_visitor_arg_traits.cpp:835
 
-#if !defined (_CORBA_EXTATTRIBUTEDESCRIPTION__SARG_TRAITS_SS_)
-#define _CORBA_EXTATTRIBUTEDESCRIPTION__SARG_TRAITS_SS_
+#if !defined (_CORBA_EXTATTRIBUTEDESCRIPTION__SARG_TRAITS_)
+#define _CORBA_EXTATTRIBUTEDESCRIPTION__SARG_TRAITS_
   
   template<>
-  class TAO_IFR_Client_Export SArg_Traits<CORBA::ExtAttributeDescription>
+  class SArg_Traits<CORBA::ExtAttributeDescription>
     : public
         Var_Size_SArg_Traits_T<
             CORBA::ExtAttributeDescription,
             CORBA::ExtAttributeDescription_var,
-            CORBA::ExtAttributeDescription_out
+            CORBA::ExtAttributeDescription_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::ExtAttributeDescription>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_EXTATTRIBUTEDEF__SARG_TRAITS_SS_)
-#define _CORBA_EXTATTRIBUTEDEF__SARG_TRAITS_SS_
+#if !defined (_CORBA_EXTATTRIBUTEDEF__SARG_TRAITS_)
+#define _CORBA_EXTATTRIBUTEDEF__SARG_TRAITS_
   
   template<>
   class  SArg_Traits<CORBA::ExtAttributeDef>
@@ -471,7 +529,8 @@ namespace TAO
         Object_SArg_Traits_T<
             CORBA::ExtAttributeDef_ptr,
             CORBA::ExtAttributeDef_var,
-            CORBA::ExtAttributeDef_out
+            CORBA::ExtAttributeDef_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::ExtAttributeDef_ptr>
           >
   {
   };
@@ -479,16 +538,17 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:702
+  // be\be_visitor_arg_traits.cpp:793
 
-#if !defined (_CORBA_OPERATIONMODE__SARG_TRAITS_SS_)
-#define _CORBA_OPERATIONMODE__SARG_TRAITS_SS_
+#if !defined (_CORBA_OPERATIONMODE__SARG_TRAITS_)
+#define _CORBA_OPERATIONMODE__SARG_TRAITS_
   
   template<>
-  class TAO_IFR_Client_Export SArg_Traits<CORBA::OperationMode>
+  class SArg_Traits<CORBA::OperationMode>
     : public
         Basic_SArg_Traits_T<
-            CORBA::OperationMode
+            CORBA::OperationMode,
+            TAO::Any_Insert_Policy_Stream <CORBA::OperationMode>
           >
   {
   };
@@ -496,18 +556,19 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:492
+  // be\be_visitor_arg_traits.cpp:547
 
-#if !defined (_CORBA_PARDESCRIPTIONSEQ__SARG_TRAITS_SS_)
-#define _CORBA_PARDESCRIPTIONSEQ__SARG_TRAITS_SS_
+#if !defined (_CORBA_PARDESCRIPTIONSEQ__SARG_TRAITS_)
+#define _CORBA_PARDESCRIPTIONSEQ__SARG_TRAITS_
   
   template<>
-  class TAO_IFR_Client_Export SArg_Traits<CORBA::ParDescriptionSeq>
+  class SArg_Traits<CORBA::ParDescriptionSeq>
     : public
         Var_Size_SArg_Traits_T<
             CORBA::ParDescriptionSeq,
             CORBA::ParDescriptionSeq_var,
-            CORBA::ParDescriptionSeq_out
+            CORBA::ParDescriptionSeq_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::ParDescriptionSeq>
           >
   {
   };
@@ -515,26 +576,30 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:492
+  // be\be_visitor_arg_traits.cpp:547
 
-#if !defined (_CORBA_CONTEXTIDSEQ__SARG_TRAITS_SS_)
-#define _CORBA_CONTEXTIDSEQ__SARG_TRAITS_SS_
+#if !defined (_CORBA_CONTEXTIDSEQ__SARG_TRAITS_)
+#define _CORBA_CONTEXTIDSEQ__SARG_TRAITS_
   
   template<>
-  class TAO_IFR_Client_Export SArg_Traits<CORBA::ContextIdSeq>
+  class SArg_Traits<CORBA::ContextIdSeq>
     : public
         Var_Size_SArg_Traits_T<
             CORBA::ContextIdSeq,
             CORBA::ContextIdSeq_var,
-            CORBA::ContextIdSeq_out
+            CORBA::ContextIdSeq_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::ContextIdSeq>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_OPERATIONDEF__SARG_TRAITS_SS_)
-#define _CORBA_OPERATIONDEF__SARG_TRAITS_SS_
+#if !defined (_CORBA_OPERATIONDEF__SARG_TRAITS_)
+#define _CORBA_OPERATIONDEF__SARG_TRAITS_
   
   template<>
   class  SArg_Traits<CORBA::OperationDef>
@@ -542,7 +607,8 @@ namespace TAO
         Object_SArg_Traits_T<
             CORBA::OperationDef_ptr,
             CORBA::OperationDef_var,
-            CORBA::OperationDef_out
+            CORBA::OperationDef_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::OperationDef_ptr>
           >
   {
   };
@@ -550,18 +616,19 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:743
+  // be\be_visitor_arg_traits.cpp:835
 
-#if !defined (_CORBA_INTERFACEATTREXTENSION_EXTFULLINTERFACEDESCRIPTION__SARG_TRAITS_SS_)
-#define _CORBA_INTERFACEATTREXTENSION_EXTFULLINTERFACEDESCRIPTION__SARG_TRAITS_SS_
+#if !defined (_CORBA_INTERFACEATTREXTENSION_EXTFULLINTERFACEDESCRIPTION__SARG_TRAITS_)
+#define _CORBA_INTERFACEATTREXTENSION_EXTFULLINTERFACEDESCRIPTION__SARG_TRAITS_
   
   template<>
-  class TAO_IFR_Client_Export SArg_Traits<CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription>
+  class SArg_Traits<CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription>
     : public
         Var_Size_SArg_Traits_T<
             CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription,
             CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription_var,
-            CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription_out
+            CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription>
           >
   {
   };
@@ -571,31 +638,35 @@ namespace TAO
 
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
+// be\be_visitor_arg_traits.cpp:70
 
 // Arg traits specializations.
 namespace TAO
 {
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:702
+  // be\be_visitor_arg_traits.cpp:793
 
-#if !defined (_CORBA_DEFINITIONKIND__ARG_TRAITS_SS_)
-#define _CORBA_DEFINITIONKIND__ARG_TRAITS_SS_
+#if !defined (_CORBA_DEFINITIONKIND__ARG_TRAITS_)
+#define _CORBA_DEFINITIONKIND__ARG_TRAITS_
   
   template<>
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::DefinitionKind>
+  class Arg_Traits<CORBA::DefinitionKind>
     : public
         Basic_Arg_Traits_T<
-            CORBA::DefinitionKind
+            CORBA::DefinitionKind,
+            TAO::Any_Insert_Policy_Stream <CORBA::DefinitionKind>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_CONTAINED__ARG_TRAITS_SS_)
-#define _CORBA_CONTAINED__ARG_TRAITS_SS_
+#if !defined (_CORBA_CONTAINED__ARG_TRAITS_)
+#define _CORBA_CONTAINED__ARG_TRAITS_
   
   template<>
   class  Arg_Traits<CORBA::Contained>
@@ -604,15 +675,19 @@ namespace TAO
             CORBA::Contained_ptr,
             CORBA::Contained_var,
             CORBA::Contained_out,
-            TAO::Objref_Traits<CORBA::Contained>
+            TAO::Objref_Traits<CORBA::Contained>,
+            TAO::Any_Insert_Policy_Stream <CORBA::Contained_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_REPOSITORY__ARG_TRAITS_SS_)
-#define _CORBA_REPOSITORY__ARG_TRAITS_SS_
+#if !defined (_CORBA_REPOSITORY__ARG_TRAITS_)
+#define _CORBA_REPOSITORY__ARG_TRAITS_
   
   template<>
   class  Arg_Traits<CORBA::Repository>
@@ -621,15 +696,19 @@ namespace TAO
             CORBA::Repository_ptr,
             CORBA::Repository_var,
             CORBA::Repository_out,
-            TAO::Objref_Traits<CORBA::Repository>
+            TAO::Objref_Traits<CORBA::Repository>,
+            TAO::Any_Insert_Policy_Stream <CORBA::Repository_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_CONTAINER__ARG_TRAITS_SS_)
-#define _CORBA_CONTAINER__ARG_TRAITS_SS_
+#if !defined (_CORBA_CONTAINER__ARG_TRAITS_)
+#define _CORBA_CONTAINER__ARG_TRAITS_
   
   template<>
   class  Arg_Traits<CORBA::Container>
@@ -638,15 +717,19 @@ namespace TAO
             CORBA::Container_ptr,
             CORBA::Container_var,
             CORBA::Container_out,
-            TAO::Objref_Traits<CORBA::Container>
+            TAO::Objref_Traits<CORBA::Container>,
+            TAO::Any_Insert_Policy_Stream <CORBA::Container_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_IDLTYPE__ARG_TRAITS_SS_)
-#define _CORBA_IDLTYPE__ARG_TRAITS_SS_
+#if !defined (_CORBA_IDLTYPE__ARG_TRAITS_)
+#define _CORBA_IDLTYPE__ARG_TRAITS_
   
   template<>
   class  Arg_Traits<CORBA::IDLType>
@@ -655,7 +738,8 @@ namespace TAO
             CORBA::IDLType_ptr,
             CORBA::IDLType_var,
             CORBA::IDLType_out,
-            TAO::Objref_Traits<CORBA::IDLType>
+            TAO::Objref_Traits<CORBA::IDLType>,
+            TAO::Any_Insert_Policy_Stream <CORBA::IDLType_ptr>
           >
   {
   };
@@ -663,18 +747,19 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:743
+  // be\be_visitor_arg_traits.cpp:835
 
-#if !defined (_CORBA_INTERFACEDEF_FULLINTERFACEDESCRIPTION__ARG_TRAITS_SS_)
-#define _CORBA_INTERFACEDEF_FULLINTERFACEDESCRIPTION__ARG_TRAITS_SS_
+#if !defined (_CORBA_INTERFACEDEF_FULLINTERFACEDESCRIPTION__ARG_TRAITS_)
+#define _CORBA_INTERFACEDEF_FULLINTERFACEDESCRIPTION__ARG_TRAITS_
   
   template<>
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::InterfaceDef::FullInterfaceDescription>
+  class Arg_Traits<CORBA::InterfaceDef::FullInterfaceDescription>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::InterfaceDef::FullInterfaceDescription,
             CORBA::InterfaceDef::FullInterfaceDescription_var,
-            CORBA::InterfaceDef::FullInterfaceDescription_out
+            CORBA::InterfaceDef::FullInterfaceDescription_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::InterfaceDef::FullInterfaceDescription>
           >
   {
   };
@@ -682,18 +767,19 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:492
+  // be\be_visitor_arg_traits.cpp:547
 
-#if !defined (_CORBA_INTERFACEDEFSEQ__ARG_TRAITS_SS_)
-#define _CORBA_INTERFACEDEFSEQ__ARG_TRAITS_SS_
+#if !defined (_CORBA_INTERFACEDEFSEQ__ARG_TRAITS_)
+#define _CORBA_INTERFACEDEFSEQ__ARG_TRAITS_
   
   template<>
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::InterfaceDefSeq>
+  class Arg_Traits<CORBA::InterfaceDefSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::InterfaceDefSeq,
             CORBA::InterfaceDefSeq_var,
-            CORBA::InterfaceDefSeq_out
+            CORBA::InterfaceDefSeq_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::InterfaceDefSeq>
           >
   {
   };
@@ -701,18 +787,19 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:492
+  // be\be_visitor_arg_traits.cpp:547
 
-#if !defined (_CORBA_STRUCTMEMBERSEQ__ARG_TRAITS_SS_)
-#define _CORBA_STRUCTMEMBERSEQ__ARG_TRAITS_SS_
+#if !defined (_CORBA_STRUCTMEMBERSEQ__ARG_TRAITS_)
+#define _CORBA_STRUCTMEMBERSEQ__ARG_TRAITS_
   
   template<>
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::StructMemberSeq>
+  class Arg_Traits<CORBA::StructMemberSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::StructMemberSeq,
             CORBA::StructMemberSeq_var,
-            CORBA::StructMemberSeq_out
+            CORBA::StructMemberSeq_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::StructMemberSeq>
           >
   {
   };
@@ -720,18 +807,19 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:492
+  // be\be_visitor_arg_traits.cpp:547
 
-#if !defined (_CORBA_EXCDESCRIPTIONSEQ__ARG_TRAITS_SS_)
-#define _CORBA_EXCDESCRIPTIONSEQ__ARG_TRAITS_SS_
+#if !defined (_CORBA_EXCDESCRIPTIONSEQ__ARG_TRAITS_)
+#define _CORBA_EXCDESCRIPTIONSEQ__ARG_TRAITS_
   
   template<>
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::ExcDescriptionSeq>
+  class Arg_Traits<CORBA::ExcDescriptionSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::ExcDescriptionSeq,
             CORBA::ExcDescriptionSeq_var,
-            CORBA::ExcDescriptionSeq_out
+            CORBA::ExcDescriptionSeq_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::ExcDescriptionSeq>
           >
   {
   };
@@ -739,18 +827,19 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:492
+  // be\be_visitor_arg_traits.cpp:547
 
-#if !defined (_CORBA_UNIONMEMBERSEQ__ARG_TRAITS_SS_)
-#define _CORBA_UNIONMEMBERSEQ__ARG_TRAITS_SS_
+#if !defined (_CORBA_UNIONMEMBERSEQ__ARG_TRAITS_)
+#define _CORBA_UNIONMEMBERSEQ__ARG_TRAITS_
   
   template<>
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::UnionMemberSeq>
+  class Arg_Traits<CORBA::UnionMemberSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::UnionMemberSeq,
             CORBA::UnionMemberSeq_var,
-            CORBA::UnionMemberSeq_out
+            CORBA::UnionMemberSeq_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::UnionMemberSeq>
           >
   {
   };
@@ -758,26 +847,30 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:492
+  // be\be_visitor_arg_traits.cpp:547
 
-#if !defined (_CORBA_ENUMMEMBERSEQ__ARG_TRAITS_SS_)
-#define _CORBA_ENUMMEMBERSEQ__ARG_TRAITS_SS_
+#if !defined (_CORBA_ENUMMEMBERSEQ__ARG_TRAITS_)
+#define _CORBA_ENUMMEMBERSEQ__ARG_TRAITS_
   
   template<>
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::EnumMemberSeq>
+  class Arg_Traits<CORBA::EnumMemberSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::EnumMemberSeq,
             CORBA::EnumMemberSeq_var,
-            CORBA::EnumMemberSeq_out
+            CORBA::EnumMemberSeq_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::EnumMemberSeq>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_PRIMITIVEDEF__ARG_TRAITS_SS_)
-#define _CORBA_PRIMITIVEDEF__ARG_TRAITS_SS_
+#if !defined (_CORBA_PRIMITIVEDEF__ARG_TRAITS_)
+#define _CORBA_PRIMITIVEDEF__ARG_TRAITS_
   
   template<>
   class  Arg_Traits<CORBA::PrimitiveDef>
@@ -786,15 +879,19 @@ namespace TAO
             CORBA::PrimitiveDef_ptr,
             CORBA::PrimitiveDef_var,
             CORBA::PrimitiveDef_out,
-            TAO::Objref_Traits<CORBA::PrimitiveDef>
+            TAO::Objref_Traits<CORBA::PrimitiveDef>,
+            TAO::Any_Insert_Policy_Stream <CORBA::PrimitiveDef_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_STRINGDEF__ARG_TRAITS_SS_)
-#define _CORBA_STRINGDEF__ARG_TRAITS_SS_
+#if !defined (_CORBA_STRINGDEF__ARG_TRAITS_)
+#define _CORBA_STRINGDEF__ARG_TRAITS_
   
   template<>
   class  Arg_Traits<CORBA::StringDef>
@@ -803,15 +900,19 @@ namespace TAO
             CORBA::StringDef_ptr,
             CORBA::StringDef_var,
             CORBA::StringDef_out,
-            TAO::Objref_Traits<CORBA::StringDef>
+            TAO::Objref_Traits<CORBA::StringDef>,
+            TAO::Any_Insert_Policy_Stream <CORBA::StringDef_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_SEQUENCEDEF__ARG_TRAITS_SS_)
-#define _CORBA_SEQUENCEDEF__ARG_TRAITS_SS_
+#if !defined (_CORBA_SEQUENCEDEF__ARG_TRAITS_)
+#define _CORBA_SEQUENCEDEF__ARG_TRAITS_
   
   template<>
   class  Arg_Traits<CORBA::SequenceDef>
@@ -820,15 +921,19 @@ namespace TAO
             CORBA::SequenceDef_ptr,
             CORBA::SequenceDef_var,
             CORBA::SequenceDef_out,
-            TAO::Objref_Traits<CORBA::SequenceDef>
+            TAO::Objref_Traits<CORBA::SequenceDef>,
+            TAO::Any_Insert_Policy_Stream <CORBA::SequenceDef_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_ARRAYDEF__ARG_TRAITS_SS_)
-#define _CORBA_ARRAYDEF__ARG_TRAITS_SS_
+#if !defined (_CORBA_ARRAYDEF__ARG_TRAITS_)
+#define _CORBA_ARRAYDEF__ARG_TRAITS_
   
   template<>
   class  Arg_Traits<CORBA::ArrayDef>
@@ -837,15 +942,19 @@ namespace TAO
             CORBA::ArrayDef_ptr,
             CORBA::ArrayDef_var,
             CORBA::ArrayDef_out,
-            TAO::Objref_Traits<CORBA::ArrayDef>
+            TAO::Objref_Traits<CORBA::ArrayDef>,
+            TAO::Any_Insert_Policy_Stream <CORBA::ArrayDef_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_WSTRINGDEF__ARG_TRAITS_SS_)
-#define _CORBA_WSTRINGDEF__ARG_TRAITS_SS_
+#if !defined (_CORBA_WSTRINGDEF__ARG_TRAITS_)
+#define _CORBA_WSTRINGDEF__ARG_TRAITS_
   
   template<>
   class  Arg_Traits<CORBA::WstringDef>
@@ -854,15 +963,19 @@ namespace TAO
             CORBA::WstringDef_ptr,
             CORBA::WstringDef_var,
             CORBA::WstringDef_out,
-            TAO::Objref_Traits<CORBA::WstringDef>
+            TAO::Objref_Traits<CORBA::WstringDef>,
+            TAO::Any_Insert_Policy_Stream <CORBA::WstringDef_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_FIXEDDEF__ARG_TRAITS_SS_)
-#define _CORBA_FIXEDDEF__ARG_TRAITS_SS_
+#if !defined (_CORBA_FIXEDDEF__ARG_TRAITS_)
+#define _CORBA_FIXEDDEF__ARG_TRAITS_
   
   template<>
   class  Arg_Traits<CORBA::FixedDef>
@@ -871,7 +984,8 @@ namespace TAO
             CORBA::FixedDef_ptr,
             CORBA::FixedDef_var,
             CORBA::FixedDef_out,
-            TAO::Objref_Traits<CORBA::FixedDef>
+            TAO::Objref_Traits<CORBA::FixedDef>,
+            TAO::Any_Insert_Policy_Stream <CORBA::FixedDef_ptr>
           >
   {
   };
@@ -879,16 +993,17 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:702
+  // be\be_visitor_arg_traits.cpp:793
 
-#if !defined (_CORBA_PRIMITIVEKIND__ARG_TRAITS_SS_)
-#define _CORBA_PRIMITIVEKIND__ARG_TRAITS_SS_
+#if !defined (_CORBA_PRIMITIVEKIND__ARG_TRAITS_)
+#define _CORBA_PRIMITIVEKIND__ARG_TRAITS_
   
   template<>
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::PrimitiveKind>
+  class Arg_Traits<CORBA::PrimitiveKind>
     : public
         Basic_Arg_Traits_T<
-            CORBA::PrimitiveKind
+            CORBA::PrimitiveKind,
+            TAO::Any_Insert_Policy_Stream <CORBA::PrimitiveKind>
           >
   {
   };
@@ -896,18 +1011,19 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:492
+  // be\be_visitor_arg_traits.cpp:547
 
-#if !defined (_CORBA_EXCEPTIONDEFSEQ__ARG_TRAITS_SS_)
-#define _CORBA_EXCEPTIONDEFSEQ__ARG_TRAITS_SS_
+#if !defined (_CORBA_EXCEPTIONDEFSEQ__ARG_TRAITS_)
+#define _CORBA_EXCEPTIONDEFSEQ__ARG_TRAITS_
   
   template<>
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::ExceptionDefSeq>
+  class Arg_Traits<CORBA::ExceptionDefSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::ExceptionDefSeq,
             CORBA::ExceptionDefSeq_var,
-            CORBA::ExceptionDefSeq_out
+            CORBA::ExceptionDefSeq_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::ExceptionDefSeq>
           >
   {
   };
@@ -915,24 +1031,28 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:702
+  // be\be_visitor_arg_traits.cpp:793
 
-#if !defined (_CORBA_ATTRIBUTEMODE__ARG_TRAITS_SS_)
-#define _CORBA_ATTRIBUTEMODE__ARG_TRAITS_SS_
+#if !defined (_CORBA_ATTRIBUTEMODE__ARG_TRAITS_)
+#define _CORBA_ATTRIBUTEMODE__ARG_TRAITS_
   
   template<>
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::AttributeMode>
+  class Arg_Traits<CORBA::AttributeMode>
     : public
         Basic_Arg_Traits_T<
-            CORBA::AttributeMode
+            CORBA::AttributeMode,
+            TAO::Any_Insert_Policy_Stream <CORBA::AttributeMode>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_ATTRIBUTEDEF__ARG_TRAITS_SS_)
-#define _CORBA_ATTRIBUTEDEF__ARG_TRAITS_SS_
+#if !defined (_CORBA_ATTRIBUTEDEF__ARG_TRAITS_)
+#define _CORBA_ATTRIBUTEDEF__ARG_TRAITS_
   
   template<>
   class  Arg_Traits<CORBA::AttributeDef>
@@ -941,7 +1061,8 @@ namespace TAO
             CORBA::AttributeDef_ptr,
             CORBA::AttributeDef_var,
             CORBA::AttributeDef_out,
-            TAO::Objref_Traits<CORBA::AttributeDef>
+            TAO::Objref_Traits<CORBA::AttributeDef>,
+            TAO::Any_Insert_Policy_Stream <CORBA::AttributeDef_ptr>
           >
   {
   };
@@ -949,26 +1070,30 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:743
+  // be\be_visitor_arg_traits.cpp:835
 
-#if !defined (_CORBA_EXTATTRIBUTEDESCRIPTION__ARG_TRAITS_SS_)
-#define _CORBA_EXTATTRIBUTEDESCRIPTION__ARG_TRAITS_SS_
+#if !defined (_CORBA_EXTATTRIBUTEDESCRIPTION__ARG_TRAITS_)
+#define _CORBA_EXTATTRIBUTEDESCRIPTION__ARG_TRAITS_
   
   template<>
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::ExtAttributeDescription>
+  class Arg_Traits<CORBA::ExtAttributeDescription>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::ExtAttributeDescription,
             CORBA::ExtAttributeDescription_var,
-            CORBA::ExtAttributeDescription_out
+            CORBA::ExtAttributeDescription_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::ExtAttributeDescription>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_EXTATTRIBUTEDEF__ARG_TRAITS_SS_)
-#define _CORBA_EXTATTRIBUTEDEF__ARG_TRAITS_SS_
+#if !defined (_CORBA_EXTATTRIBUTEDEF__ARG_TRAITS_)
+#define _CORBA_EXTATTRIBUTEDEF__ARG_TRAITS_
   
   template<>
   class  Arg_Traits<CORBA::ExtAttributeDef>
@@ -977,7 +1102,8 @@ namespace TAO
             CORBA::ExtAttributeDef_ptr,
             CORBA::ExtAttributeDef_var,
             CORBA::ExtAttributeDef_out,
-            TAO::Objref_Traits<CORBA::ExtAttributeDef>
+            TAO::Objref_Traits<CORBA::ExtAttributeDef>,
+            TAO::Any_Insert_Policy_Stream <CORBA::ExtAttributeDef_ptr>
           >
   {
   };
@@ -985,16 +1111,17 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:702
+  // be\be_visitor_arg_traits.cpp:793
 
-#if !defined (_CORBA_OPERATIONMODE__ARG_TRAITS_SS_)
-#define _CORBA_OPERATIONMODE__ARG_TRAITS_SS_
+#if !defined (_CORBA_OPERATIONMODE__ARG_TRAITS_)
+#define _CORBA_OPERATIONMODE__ARG_TRAITS_
   
   template<>
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::OperationMode>
+  class Arg_Traits<CORBA::OperationMode>
     : public
         Basic_Arg_Traits_T<
-            CORBA::OperationMode
+            CORBA::OperationMode,
+            TAO::Any_Insert_Policy_Stream <CORBA::OperationMode>
           >
   {
   };
@@ -1002,18 +1129,19 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:492
+  // be\be_visitor_arg_traits.cpp:547
 
-#if !defined (_CORBA_PARDESCRIPTIONSEQ__ARG_TRAITS_SS_)
-#define _CORBA_PARDESCRIPTIONSEQ__ARG_TRAITS_SS_
+#if !defined (_CORBA_PARDESCRIPTIONSEQ__ARG_TRAITS_)
+#define _CORBA_PARDESCRIPTIONSEQ__ARG_TRAITS_
   
   template<>
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::ParDescriptionSeq>
+  class Arg_Traits<CORBA::ParDescriptionSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::ParDescriptionSeq,
             CORBA::ParDescriptionSeq_var,
-            CORBA::ParDescriptionSeq_out
+            CORBA::ParDescriptionSeq_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::ParDescriptionSeq>
           >
   {
   };
@@ -1021,26 +1149,30 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:492
+  // be\be_visitor_arg_traits.cpp:547
 
-#if !defined (_CORBA_CONTEXTIDSEQ__ARG_TRAITS_SS_)
-#define _CORBA_CONTEXTIDSEQ__ARG_TRAITS_SS_
+#if !defined (_CORBA_CONTEXTIDSEQ__ARG_TRAITS_)
+#define _CORBA_CONTEXTIDSEQ__ARG_TRAITS_
   
   template<>
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::ContextIdSeq>
+  class Arg_Traits<CORBA::ContextIdSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::ContextIdSeq,
             CORBA::ContextIdSeq_var,
-            CORBA::ContextIdSeq_out
+            CORBA::ContextIdSeq_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::ContextIdSeq>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_OPERATIONDEF__ARG_TRAITS_SS_)
-#define _CORBA_OPERATIONDEF__ARG_TRAITS_SS_
+#if !defined (_CORBA_OPERATIONDEF__ARG_TRAITS_)
+#define _CORBA_OPERATIONDEF__ARG_TRAITS_
   
   template<>
   class  Arg_Traits<CORBA::OperationDef>
@@ -1049,7 +1181,8 @@ namespace TAO
             CORBA::OperationDef_ptr,
             CORBA::OperationDef_var,
             CORBA::OperationDef_out,
-            TAO::Objref_Traits<CORBA::OperationDef>
+            TAO::Objref_Traits<CORBA::OperationDef>,
+            TAO::Any_Insert_Policy_Stream <CORBA::OperationDef_ptr>
           >
   {
   };
@@ -1057,18 +1190,19 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:743
+  // be\be_visitor_arg_traits.cpp:835
 
-#if !defined (_CORBA_INTERFACEATTREXTENSION_EXTFULLINTERFACEDESCRIPTION__ARG_TRAITS_SS_)
-#define _CORBA_INTERFACEATTREXTENSION_EXTFULLINTERFACEDESCRIPTION__ARG_TRAITS_SS_
+#if !defined (_CORBA_INTERFACEATTREXTENSION_EXTFULLINTERFACEDESCRIPTION__ARG_TRAITS_)
+#define _CORBA_INTERFACEATTREXTENSION_EXTFULLINTERFACEDESCRIPTION__ARG_TRAITS_
   
   template<>
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription>
+  class Arg_Traits<CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription,
             CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription_var,
-            CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription_out
+            CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription>
           >
   {
   };
@@ -1078,7 +1212,7 @@ namespace TAO
 
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1455
+// be\be_interface.cpp:1465
 
 class TAO_CORBA_Repository_Perfect_Hash_OpTable
   : public TAO_Perfect_Hash_OpTable
@@ -1091,53 +1225,53 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: c:\ace\latest\ACE_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0 -a -o -t -p -K opname -L C++ -Z TAO_CORBA_Repository_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ACE\Any\ACE_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0 -a -o -t -p -K opname -L C++ -Z TAO_CORBA_Repository_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_Repository_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
   static const unsigned char asso_values[] =
     {
 #if defined (ACE_MVS)
-     52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-     52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-     52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-     52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-     52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-     52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-     52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-     52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-     52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-     52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-     52, 52, 52, 52, 52, 52, 52, 52, 52, 30,
-     52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-     52, 52, 52, 52, 52, 52, 52, 52, 52, 10,
-     52,  0,  4, 10, 52,  5, 52, 52, 52, 52,
-     52, 52, 52, 52, 52, 52, 52,  8, 30, 15,
-     52,  0, 52, 52, 52, 52, 52, 52, 52, 52,
-     52, 52, 30,  0, 52, 52, 52, 20,  0, 52,
-     52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-     52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-     52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-     52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-     52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-     52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-     52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-     52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-     52, 52, 52, 52, 52, 52,
+     58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+     58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+     58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+     58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+     58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+     58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+     58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+     58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+     58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+     58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+     58, 58, 58, 58, 58, 58, 58, 58, 58, 27,
+     58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+     58, 58, 58, 58, 58, 58, 58, 58, 58, 25,
+     58,  0,  4, 10, 58, 20, 58, 58, 58, 58,
+     58, 58, 58, 58, 58, 58, 58,  8, 25, 15,
+     58,  0, 58, 58, 58, 58, 58, 58, 58, 58,
+     58, 58, 30,  0, 58, 58, 58, 25,  0, 58,
+     58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+     58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+     58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+     58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+     58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+     58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+     58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+     58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+     58, 58, 58, 58, 58, 58,
 #else
-     52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-     52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-     52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-     52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-     52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-     52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-     52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-     52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-     52, 52, 52, 52, 52, 52, 52, 52, 52, 52,
-     52, 52, 52, 52, 52, 30, 52, 10, 52,  0,
-      4, 10, 52,  5, 52, 52, 52, 52,  8, 30,
-     15, 52,  0, 52, 52, 30,  0, 52, 52, 52,
-     20,  0, 52, 52, 52, 52, 52, 52,
+     58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+     58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+     58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+     58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+     58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+     58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+     58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+     58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+     58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
+     58, 58, 58, 58, 58, 27, 58, 25, 58,  0,
+      4, 10, 58, 20, 58, 58, 58, 58,  8, 25,
+     15, 58,  0, 58, 58, 30,  0, 58, 58, 58,
+     25,  0, 58, 58, 58, 58, 58, 58,
 #endif /* ACE_MVS */
     };
   return len + asso_values[(int) str[len - 1]] + asso_values[(int) str[0]];
@@ -1148,14 +1282,14 @@ TAO_CORBA_Repository_Perfect_Hash_OpTable::lookup (const char *str, unsigned int
 {
   enum
     {
-      TOTAL_KEYWORDS = 32,
+      TOTAL_KEYWORDS = 33,
       MIN_WORD_LENGTH = 5,
       MAX_WORD_LENGTH = 25,
       MIN_HASH_VALUE = 11,
-      MAX_HASH_VALUE = 51,
-      HASH_VALUE_RANGE = 41,
+      MAX_HASH_VALUE = 57,
+      HASH_VALUE_RANGE = 47,
       DUPLICATES = 3,
-      WORDLIST_SIZE = 43
+      WORDLIST_SIZE = 44
     };
 
   static const TAO_operation_db_entry  wordlist[] =
@@ -1168,8 +1302,6 @@ TAO_CORBA_Repository_Perfect_Hash_OpTable::lookup (const char *str, unsigned int
       {"lookup", &POA_CORBA::Repository::lookup_skel, 0},
       {"create_constant", &POA_CORBA::Repository::create_constant_skel, 0},
       {"create_fixed", &POA_CORBA::Repository::create_fixed_skel, 0},
-      {"create_string", &POA_CORBA::Repository::create_string_skel, 0},
-      {"create_wstring", &POA_CORBA::Repository::create_wstring_skel, 0},
       {"lookup_id", &POA_CORBA::Repository::lookup_id_skel, 0},
       {"create_value", &POA_CORBA::Repository::create_value_skel, 0},
       {"create_module", &POA_CORBA::Repository::create_module_skel, 0},
@@ -1178,30 +1310,34 @@ TAO_CORBA_Repository_Perfect_Hash_OpTable::lookup (const char *str, unsigned int
       {"create_interface", &POA_CORBA::Repository::create_interface_skel, 0},
       {"create_ext_value", &POA_CORBA::Repository::create_ext_value_skel, 0},
       {"create_union", &POA_CORBA::Repository::create_union_skel, 0},
-      {"get_primitive", &POA_CORBA::Repository::get_primitive_skel, 0},
       {"lookup_name", &POA_CORBA::Repository::lookup_name_skel, 0},
       {"create_exception", &POA_CORBA::Repository::create_exception_skel, 0},
       {"create_local_interface", &POA_CORBA::Repository::create_local_interface_skel, 0},
+      {"create_string", &POA_CORBA::Repository::create_string_skel, 0},
+      {"create_wstring", &POA_CORBA::Repository::create_wstring_skel, 0},
       {"create_abstract_interface", &POA_CORBA::Repository::create_abstract_interface_skel, 0},
-      {"create_value_box", &POA_CORBA::Repository::create_value_box_skel, 0},
-      {"get_canonical_typecode", &POA_CORBA::Repository::get_canonical_typecode_skel, 0},
-      {"contents", &POA_CORBA::Repository::contents_skel, 0},
-      {"_component", &POA_CORBA::Repository::_component_skel, 0},
       {"create_enum", &POA_CORBA::Repository::create_enum_skel, 0},
-      {"create_alias", &POA_CORBA::Repository::create_alias_skel, 0},
+      {"_component", &POA_CORBA::Repository::_component_skel, 0},
+      {"contents", &POA_CORBA::Repository::contents_skel, 0},
       {"_non_existent", &POA_CORBA::Repository::_non_existent_skel, 0},
-      {"_is_a", &POA_CORBA::Repository::_is_a_skel, 0},
+      {"create_value_box", &POA_CORBA::Repository::create_value_box_skel, 0},
+      {"create_alias", &POA_CORBA::Repository::create_alias_skel, 0},
+      {"get_primitive", &POA_CORBA::Repository::get_primitive_skel, 0},
       {"_get_def_kind", &POA_CORBA::Repository::_get_def_kind_skel, 0},
+      {"_repository_id", &POA_CORBA::Repository::_repository_id_skel, 0},
       {"_interface", &POA_CORBA::Repository::_interface_skel, 0},
       {"describe_contents", &POA_CORBA::Repository::describe_contents_skel, 0},
+      {"get_canonical_typecode", &POA_CORBA::Repository::get_canonical_typecode_skel, 0},
+      {"_is_a", &POA_CORBA::Repository::_is_a_skel, 0},
     };
 
   static const signed char lookup[] =
     {
-       -1,  -1,  -1,  -1,  -1,  -1,  -1, -21,  -2, -24,  -2,  11,  12,  13, 
-       14,  15,  16,  -1,  17,  18,  -1,  19,  20, -67,  -1,  23, -68,  26, 
-       27,  28,  -1,  29,  30,  -1,  -1,  31,  32,  33,  34,  -1,  35,  36, 
-       37,  38,  -1,  39,  -1,  40,  -1,  -1,  41,  42, 
+       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  11,  12,  13, 
+       14,  15,  16, -19,  -2, -22,  -2,  17,  18, -63,  -1,  21, -64,  24, 
+       -1,  25,  -1,  26,  27,  28,  29,  30,  31,  32,  33,  -1,  34,  35, 
+       36,  37,  38,  39,  -1,  40,  -1,  -1,  -1,  41,  42,  -1,  -1,  -1, 
+       -1,  43, 
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -1239,7 +1375,7 @@ TAO_CORBA_Repository_Perfect_Hash_OpTable::lookup (const char *str, unsigned int
 static TAO_CORBA_Repository_Perfect_Hash_OpTable tao_CORBA_Repository_optable;
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:999
+// be\be_visitor_interface/interface_ss.cpp:921
 
 TAO::Collocation_Proxy_Broker *
 CORBA__TAO_Repository_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -1259,10 +1395,7 @@ CORBA__TAO_Repository_Proxy_Broker_Factory_Initializer (size_t)
 static int
 CORBA__TAO_Repository_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
   CORBA__TAO_Repository_Proxy_Broker_Factory_Initializer (
-      reinterpret_cast<
-          size_t> (
-          CORBA__TAO_Repository_Proxy_Broker_Factory_Initializer
-        )
+      reinterpret_cast<size_t> (CORBA__TAO_Repository_Proxy_Broker_Factory_Initializer)
     );
 
 
@@ -1310,13 +1443,13 @@ namespace POA_CORBA
     
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
-      TAO::SArg_Traits< CORBA::Contained>::ret_arg_type retval =
-        TAO::Portable_Server::get_ret_arg< CORBA::Contained, TAO::SArg_Traits< CORBA::Contained>::ret_arg_type> (
+      TAO::SArg_Traits< ::CORBA::Contained>::ret_arg_type retval =
+        TAO::Portable_Server::get_ret_arg< ::CORBA::Contained, TAO::SArg_Traits< ::CORBA::Contained>::ret_arg_type> (
           this->operation_details_,
           this->args_);
       
-      TAO::SArg_Traits< CORBA::RepositoryId>::in_arg_type arg_1 =
-        TAO::Portable_Server::get_in_arg< CORBA::RepositoryId, TAO::SArg_Traits< CORBA::RepositoryId>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId, TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
@@ -1355,8 +1488,8 @@ void POA_CORBA::Repository::lookup_id_skel (
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
   
-  TAO::SArg_Traits< CORBA::Contained>::ret_val retval;
-  TAO::SArg_Traits< CORBA::RepositoryId>::in_arg_val _tao_search_id;
+  TAO::SArg_Traits< ::CORBA::Contained>::ret_val retval;
+  TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_search_id;
   
   TAO::Argument * const args[] =
     {
@@ -1512,13 +1645,13 @@ namespace POA_CORBA
     
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
-      TAO::SArg_Traits< CORBA::PrimitiveDef>::ret_arg_type retval =
-        TAO::Portable_Server::get_ret_arg< CORBA::PrimitiveDef, TAO::SArg_Traits< CORBA::PrimitiveDef>::ret_arg_type> (
+      TAO::SArg_Traits< ::CORBA::PrimitiveDef>::ret_arg_type retval =
+        TAO::Portable_Server::get_ret_arg< ::CORBA::PrimitiveDef, TAO::SArg_Traits< ::CORBA::PrimitiveDef>::ret_arg_type> (
           this->operation_details_,
           this->args_);
       
-      TAO::SArg_Traits< CORBA::PrimitiveKind>::in_arg_type arg_1 =
-        TAO::Portable_Server::get_in_arg< CORBA::PrimitiveKind, TAO::SArg_Traits< CORBA::PrimitiveKind>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::PrimitiveKind>::in_arg_type arg_1 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::PrimitiveKind, TAO::SArg_Traits< ::CORBA::PrimitiveKind>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
@@ -1557,8 +1690,8 @@ void POA_CORBA::Repository::get_primitive_skel (
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
   
-  TAO::SArg_Traits< CORBA::PrimitiveDef>::ret_val retval;
-  TAO::SArg_Traits< CORBA::PrimitiveKind>::in_arg_val _tao_kind;
+  TAO::SArg_Traits< ::CORBA::PrimitiveDef>::ret_val retval;
+  TAO::SArg_Traits< ::CORBA::PrimitiveKind>::in_arg_val _tao_kind;
   
   TAO::Argument * const args[] =
     {
@@ -1613,8 +1746,8 @@ namespace POA_CORBA
     
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
-      TAO::SArg_Traits< CORBA::StringDef>::ret_arg_type retval =
-        TAO::Portable_Server::get_ret_arg< CORBA::StringDef, TAO::SArg_Traits< CORBA::StringDef>::ret_arg_type> (
+      TAO::SArg_Traits< ::CORBA::StringDef>::ret_arg_type retval =
+        TAO::Portable_Server::get_ret_arg< ::CORBA::StringDef, TAO::SArg_Traits< ::CORBA::StringDef>::ret_arg_type> (
           this->operation_details_,
           this->args_);
       
@@ -1658,7 +1791,7 @@ void POA_CORBA::Repository::create_string_skel (
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
   
-  TAO::SArg_Traits< CORBA::StringDef>::ret_val retval;
+  TAO::SArg_Traits< ::CORBA::StringDef>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::ULong>::in_arg_val _tao_bound;
   
   TAO::Argument * const args[] =
@@ -1714,8 +1847,8 @@ namespace POA_CORBA
     
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
-      TAO::SArg_Traits< CORBA::WstringDef>::ret_arg_type retval =
-        TAO::Portable_Server::get_ret_arg< CORBA::WstringDef, TAO::SArg_Traits< CORBA::WstringDef>::ret_arg_type> (
+      TAO::SArg_Traits< ::CORBA::WstringDef>::ret_arg_type retval =
+        TAO::Portable_Server::get_ret_arg< ::CORBA::WstringDef, TAO::SArg_Traits< ::CORBA::WstringDef>::ret_arg_type> (
           this->operation_details_,
           this->args_);
       
@@ -1759,7 +1892,7 @@ void POA_CORBA::Repository::create_wstring_skel (
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
   
-  TAO::SArg_Traits< CORBA::WstringDef>::ret_val retval;
+  TAO::SArg_Traits< ::CORBA::WstringDef>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::ULong>::in_arg_val _tao_bound;
   
   TAO::Argument * const args[] =
@@ -1815,8 +1948,8 @@ namespace POA_CORBA
     
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
-      TAO::SArg_Traits< CORBA::SequenceDef>::ret_arg_type retval =
-        TAO::Portable_Server::get_ret_arg< CORBA::SequenceDef, TAO::SArg_Traits< CORBA::SequenceDef>::ret_arg_type> (
+      TAO::SArg_Traits< ::CORBA::SequenceDef>::ret_arg_type retval =
+        TAO::Portable_Server::get_ret_arg< ::CORBA::SequenceDef, TAO::SArg_Traits< ::CORBA::SequenceDef>::ret_arg_type> (
           this->operation_details_,
           this->args_);
       
@@ -1826,8 +1959,8 @@ namespace POA_CORBA
           this->args_,
           1);
         
-      TAO::SArg_Traits< CORBA::IDLType>::in_arg_type arg_2 =
-        TAO::Portable_Server::get_in_arg< CORBA::IDLType, TAO::SArg_Traits< CORBA::IDLType>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_type arg_2 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::IDLType, TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_type> (
           this->operation_details_,
           this->args_,
           2);
@@ -1867,9 +2000,9 @@ void POA_CORBA::Repository::create_sequence_skel (
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
   
-  TAO::SArg_Traits< CORBA::SequenceDef>::ret_val retval;
+  TAO::SArg_Traits< ::CORBA::SequenceDef>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::ULong>::in_arg_val _tao_bound;
-  TAO::SArg_Traits< CORBA::IDLType>::in_arg_val _tao_element_type;
+  TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_val _tao_element_type;
   
   TAO::Argument * const args[] =
     {
@@ -1925,8 +2058,8 @@ namespace POA_CORBA
     
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
-      TAO::SArg_Traits< CORBA::ArrayDef>::ret_arg_type retval =
-        TAO::Portable_Server::get_ret_arg< CORBA::ArrayDef, TAO::SArg_Traits< CORBA::ArrayDef>::ret_arg_type> (
+      TAO::SArg_Traits< ::CORBA::ArrayDef>::ret_arg_type retval =
+        TAO::Portable_Server::get_ret_arg< ::CORBA::ArrayDef, TAO::SArg_Traits< ::CORBA::ArrayDef>::ret_arg_type> (
           this->operation_details_,
           this->args_);
       
@@ -1936,8 +2069,8 @@ namespace POA_CORBA
           this->args_,
           1);
         
-      TAO::SArg_Traits< CORBA::IDLType>::in_arg_type arg_2 =
-        TAO::Portable_Server::get_in_arg< CORBA::IDLType, TAO::SArg_Traits< CORBA::IDLType>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_type arg_2 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::IDLType, TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_type> (
           this->operation_details_,
           this->args_,
           2);
@@ -1977,9 +2110,9 @@ void POA_CORBA::Repository::create_array_skel (
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
   
-  TAO::SArg_Traits< CORBA::ArrayDef>::ret_val retval;
+  TAO::SArg_Traits< ::CORBA::ArrayDef>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::ULong>::in_arg_val _tao_length;
-  TAO::SArg_Traits< CORBA::IDLType>::in_arg_val _tao_element_type;
+  TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_val _tao_element_type;
   
   TAO::Argument * const args[] =
     {
@@ -2035,8 +2168,8 @@ namespace POA_CORBA
     
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
-      TAO::SArg_Traits< CORBA::FixedDef>::ret_arg_type retval =
-        TAO::Portable_Server::get_ret_arg< CORBA::FixedDef, TAO::SArg_Traits< CORBA::FixedDef>::ret_arg_type> (
+      TAO::SArg_Traits< ::CORBA::FixedDef>::ret_arg_type retval =
+        TAO::Portable_Server::get_ret_arg< ::CORBA::FixedDef, TAO::SArg_Traits< ::CORBA::FixedDef>::ret_arg_type> (
           this->operation_details_,
           this->args_);
       
@@ -2087,7 +2220,7 @@ void POA_CORBA::Repository::create_fixed_skel (
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
   
-  TAO::SArg_Traits< CORBA::FixedDef>::ret_val retval;
+  TAO::SArg_Traits< ::CORBA::FixedDef>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::UShort>::in_arg_val _tao_digits;
   TAO::SArg_Traits< ::CORBA::Short>::in_arg_val _tao_scale;
   
@@ -2154,8 +2287,8 @@ namespace POA_CORBA
           this->operation_details_,
           this->args_);
       
-      TAO::SArg_Traits< CORBA::Char *>::in_arg_type arg_1 =
-        TAO::Portable_Server::get_in_arg< CORBA::Char *, TAO::SArg_Traits< CORBA::Char *>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
@@ -2190,7 +2323,7 @@ void POA_CORBA::Repository::_is_a_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  TAO::SArg_Traits< CORBA::Char *>::in_arg_val _tao_repository_id;
+  TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
   
   TAO::Argument * const args[] =
     {
@@ -2311,10 +2444,98 @@ void POA_CORBA::Repository::_non_existent_skel (
   
 }
 
+namespace POA_CORBA
+{
+  
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_operation/upcall_command_ss.cpp:127
+  
+  class _repository_id_Repository_Upcall_Command
+    : public TAO::Upcall_Command
+  {
+  public:
+    inline _repository_id_Repository_Upcall_Command (
+      POA_CORBA::Repository * servant,
+      TAO_Operation_Details const * operation_details,
+      TAO::Argument * const args[])
+      : servant_ (servant)
+      , operation_details_ (operation_details)
+      , args_ (args)
+    {
+    }
+    
+    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+    {
+      TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
+        TAO::Portable_Server::get_ret_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type> (
+          this->operation_details_,
+          this->args_);
+      
+      
+      retval =
+        this->servant_-> _repository_id (
+          ACE_ENV_SINGLE_ARG_PARAMETER);
+        
+    }
+  
+  private:
+    POA_CORBA::Repository * const servant_;
+    TAO_Operation_Details const * const operation_details_;
+    TAO::Argument * const * const args_;
+  };
+  
+}
+void POA_CORBA::Repository::_repository_id_skel (
+    TAO_ServerRequest & server_request, 
+    void * TAO_INTERCEPTOR (servant_upcall),
+    void * servant
+    ACE_ENV_ARG_DECL
+  )
+{
+  
+  
+#if TAO_HAS_INTERCEPTORS == 1
+  static CORBA::TypeCode_ptr const * const exceptions = 0;
+  static size_t const nexceptions = 0;
+#endif /* TAO_HAS_INTERCEPTORS */
+  
+  TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
+  
+  TAO::Argument * const args[] =
+    {
+      &retval
+    };
+  
+  static size_t const nargs = 1;
+  
+  POA_CORBA::Repository * const impl =
+    static_cast<POA_CORBA::Repository *> (servant);
+  
+  _repository_id_Repository_Upcall_Command command (
+    impl,
+    server_request.operation_details (),
+    args);
+  
+  TAO::Upcall_Wrapper upcall_wrapper;
+  upcall_wrapper.upcall (server_request
+                         , args
+                         , nargs
+                         , command
+#if TAO_HAS_INTERCEPTORS == 1
+                         , servant_upcall
+                         , exceptions
+                         , nexceptions
+#endif  /* TAO_HAS_INTERCEPTORS == 1 */
+                         ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+  
+}
+
 
 
 // TAO_IDL - Generated from 
-// be\be_visitor_interface/interface_ss.cpp:393
+// be\be_visitor_interface/interface_ss.cpp:501
 
 
 
@@ -2479,7 +2700,7 @@ const char* POA_CORBA::Repository::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:940
+// be\be_visitor_interface/interface_ss.cpp:862
 
 void POA_CORBA::Repository::_dispatch (
     TAO_ServerRequest & req,
@@ -2494,7 +2715,7 @@ void POA_CORBA::Repository::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:891
+// be\be_visitor_interface/interface_ss.cpp:813
 
 CORBA::Repository *
 POA_CORBA::Repository::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -2526,7 +2747,7 @@ POA_CORBA::Repository::_this (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1455
+// be\be_interface.cpp:1465
 
 class TAO_CORBA_ModuleDef_Perfect_Hash_OpTable
   : public TAO_Perfect_Hash_OpTable
@@ -2539,7 +2760,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: c:\ace\latest\ACE_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0 -a -o -t -p -K opname -L C++ -Z TAO_CORBA_ModuleDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ACE\Any\ACE_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0 -a -o -t -p -K opname -L C++ -Z TAO_CORBA_ModuleDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_ModuleDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -2596,14 +2817,14 @@ TAO_CORBA_ModuleDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int
 {
   enum
     {
-      TOTAL_KEYWORDS = 35,
+      TOTAL_KEYWORDS = 36,
       MIN_WORD_LENGTH = 4,
       MAX_WORD_LENGTH = 26,
       MIN_HASH_VALUE = 4,
       MAX_HASH_VALUE = 63,
       HASH_VALUE_RANGE = 60,
       DUPLICATES = 6,
-      WORDLIST_SIZE = 39
+      WORDLIST_SIZE = 40
     };
 
   static const TAO_operation_db_entry  wordlist[] =
@@ -2642,6 +2863,7 @@ TAO_CORBA_ModuleDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int
       {"_get_containing_repository", &POA_CORBA::ModuleDef::_get_containing_repository_skel, 0},
       {"describe_contents", &POA_CORBA::ModuleDef::describe_contents_skel, 0},
       {"_get_def_kind", &POA_CORBA::ModuleDef::_get_def_kind_skel, 0},
+      {"_repository_id", &POA_CORBA::ModuleDef::_repository_id_skel, 0},
       {"_component", &POA_CORBA::ModuleDef::_component_skel, 0},
       {"_non_existent", &POA_CORBA::ModuleDef::_non_existent_skel, 0},
     };
@@ -2651,8 +2873,8 @@ TAO_CORBA_ModuleDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int
        -1,  -1,  -1,  -1,   4,  -1,  -1,  -1,  -1,  -7,  -2,   5,   6, -67, 
        -9,  -2, -65,  11,  -1, -19,  -2,  12,  13,  14,  -1,  15,  16,  17, 
        18, -73,  21,  22,  23, -26,  -2,  24,  25, -67,  28,  -1,  29, -32, 
-       -2,  30,  -1,  31,  -1, -69,  -1,  -1,  -1,  34,  35,  36,  -1,  -1, 
-       -1,  -1,  -1,  -1,  37,  -1,  -1,  38, 
+       -2,  30,  -1,  31,  -1, -69,  -1,  -1,  -1,  34,  35,  36,  37,  -1, 
+       -1,  -1,  -1,  -1,  38,  -1,  -1,  39, 
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -2690,7 +2912,7 @@ TAO_CORBA_ModuleDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int
 static TAO_CORBA_ModuleDef_Perfect_Hash_OpTable tao_CORBA_ModuleDef_optable;
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:999
+// be\be_visitor_interface/interface_ss.cpp:921
 
 TAO::Collocation_Proxy_Broker *
 CORBA__TAO_ModuleDef_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -2710,10 +2932,7 @@ CORBA__TAO_ModuleDef_Proxy_Broker_Factory_Initializer (size_t)
 static int
 CORBA__TAO_ModuleDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
   CORBA__TAO_ModuleDef_Proxy_Broker_Factory_Initializer (
-      reinterpret_cast<
-          size_t> (
-          CORBA__TAO_ModuleDef_Proxy_Broker_Factory_Initializer
-        )
+      reinterpret_cast<size_t> (CORBA__TAO_ModuleDef_Proxy_Broker_Factory_Initializer)
     );
 
 
@@ -2771,8 +2990,8 @@ namespace POA_CORBA
           this->operation_details_,
           this->args_);
       
-      TAO::SArg_Traits< CORBA::Char *>::in_arg_type arg_1 =
-        TAO::Portable_Server::get_in_arg< CORBA::Char *, TAO::SArg_Traits< CORBA::Char *>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
@@ -2807,7 +3026,7 @@ void POA_CORBA::ModuleDef::_is_a_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  TAO::SArg_Traits< CORBA::Char *>::in_arg_val _tao_repository_id;
+  TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
   
   TAO::Argument * const args[] =
     {
@@ -2928,10 +3147,98 @@ void POA_CORBA::ModuleDef::_non_existent_skel (
   
 }
 
+namespace POA_CORBA
+{
+  
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_operation/upcall_command_ss.cpp:127
+  
+  class _repository_id_ModuleDef_Upcall_Command
+    : public TAO::Upcall_Command
+  {
+  public:
+    inline _repository_id_ModuleDef_Upcall_Command (
+      POA_CORBA::ModuleDef * servant,
+      TAO_Operation_Details const * operation_details,
+      TAO::Argument * const args[])
+      : servant_ (servant)
+      , operation_details_ (operation_details)
+      , args_ (args)
+    {
+    }
+    
+    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+    {
+      TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
+        TAO::Portable_Server::get_ret_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type> (
+          this->operation_details_,
+          this->args_);
+      
+      
+      retval =
+        this->servant_-> _repository_id (
+          ACE_ENV_SINGLE_ARG_PARAMETER);
+        
+    }
+  
+  private:
+    POA_CORBA::ModuleDef * const servant_;
+    TAO_Operation_Details const * const operation_details_;
+    TAO::Argument * const * const args_;
+  };
+  
+}
+void POA_CORBA::ModuleDef::_repository_id_skel (
+    TAO_ServerRequest & server_request, 
+    void * TAO_INTERCEPTOR (servant_upcall),
+    void * servant
+    ACE_ENV_ARG_DECL
+  )
+{
+  
+  
+#if TAO_HAS_INTERCEPTORS == 1
+  static CORBA::TypeCode_ptr const * const exceptions = 0;
+  static size_t const nexceptions = 0;
+#endif /* TAO_HAS_INTERCEPTORS */
+  
+  TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
+  
+  TAO::Argument * const args[] =
+    {
+      &retval
+    };
+  
+  static size_t const nargs = 1;
+  
+  POA_CORBA::ModuleDef * const impl =
+    static_cast<POA_CORBA::ModuleDef *> (servant);
+  
+  _repository_id_ModuleDef_Upcall_Command command (
+    impl,
+    server_request.operation_details (),
+    args);
+  
+  TAO::Upcall_Wrapper upcall_wrapper;
+  upcall_wrapper.upcall (server_request
+                         , args
+                         , nargs
+                         , command
+#if TAO_HAS_INTERCEPTORS == 1
+                         , servant_upcall
+                         , exceptions
+                         , nexceptions
+#endif  /* TAO_HAS_INTERCEPTORS == 1 */
+                         ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+  
+}
+
 
 
 // TAO_IDL - Generated from 
-// be\be_visitor_interface/interface_ss.cpp:393
+// be\be_visitor_interface/interface_ss.cpp:501
 
 
 
@@ -3100,7 +3407,7 @@ const char* POA_CORBA::ModuleDef::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:940
+// be\be_visitor_interface/interface_ss.cpp:862
 
 void POA_CORBA::ModuleDef::_dispatch (
     TAO_ServerRequest & req,
@@ -3115,7 +3422,7 @@ void POA_CORBA::ModuleDef::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:891
+// be\be_visitor_interface/interface_ss.cpp:813
 
 CORBA::ModuleDef *
 POA_CORBA::ModuleDef::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -3147,7 +3454,7 @@ POA_CORBA::ModuleDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1455
+// be\be_interface.cpp:1465
 
 class TAO_CORBA_ConstantDef_Perfect_Hash_OpTable
   : public TAO_Perfect_Hash_OpTable
@@ -3160,7 +3467,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: c:\ace\latest\ACE_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0 -a -o -t -p -K opname -L C++ -Z TAO_CORBA_ConstantDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ACE\Any\ACE_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0 -a -o -t -p -K opname -L C++ -Z TAO_CORBA_ConstantDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_ConstantDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -3180,10 +3487,10 @@ TAO_CORBA_ConstantDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int
      37, 37, 37, 37, 37, 37, 37, 37, 37,  0,
      37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
      37, 37, 37, 37, 37, 37, 37, 37, 37,  0,
-     37, 37,  0,  0, 10, 37, 37, 37, 37, 37,
+     37, 37,  0,  0, 15, 37, 37, 37, 37, 37,
      37, 37, 37, 37, 37, 37, 37, 37,  0,  0,
      37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
-     37, 37, 37, 15, 37, 37, 37, 37, 10, 37,
+     37, 37, 37, 10, 37, 37, 37, 37, 10, 37,
      37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
      37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
      37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
@@ -3204,8 +3511,8 @@ TAO_CORBA_ConstantDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int
      37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
      37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
      37, 37, 37, 37, 37,  0, 37,  0, 37, 37,
-      0,  0, 10, 37, 37, 37, 37, 37, 37,  0,
-      0, 37, 37, 37, 37, 37, 15, 37, 37, 37,
+      0,  0, 15, 37, 37, 37, 37, 37, 37,  0,
+      0, 37, 37, 37, 37, 37, 10, 37, 37, 37,
      37, 10, 37, 37, 37, 37, 37, 37,
 #endif /* ACE_MVS */
     };
@@ -3217,14 +3524,14 @@ TAO_CORBA_ConstantDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned in
 {
   enum
     {
-      TOTAL_KEYWORDS = 22,
+      TOTAL_KEYWORDS = 23,
       MIN_WORD_LENGTH = 4,
       MAX_WORD_LENGTH = 26,
       MIN_HASH_VALUE = 4,
       MAX_HASH_VALUE = 36,
       HASH_VALUE_RANGE = 33,
       DUPLICATES = 8,
-      WORDLIST_SIZE = 26
+      WORDLIST_SIZE = 27
     };
 
   static const TAO_operation_db_entry  wordlist[] =
@@ -3244,21 +3551,22 @@ TAO_CORBA_ConstantDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned in
       {"_get_version", &POA_CORBA::ConstantDef::_get_version_skel, 0},
       {"_set_version", &POA_CORBA::ConstantDef::_set_version_skel, 0},
       {"_get_def_kind", &POA_CORBA::ConstantDef::_get_def_kind_skel, 0},
+      {"_repository_id", &POA_CORBA::ConstantDef::_repository_id_skel, 0},
       {"_get_defined_in", &POA_CORBA::ConstantDef::_get_defined_in_skel, 0},
       {"destroy", &POA_CORBA::ConstantDef::destroy_skel, 0},
       {"_get_absolute_name", &POA_CORBA::ConstantDef::_get_absolute_name_skel, 0},
-      {"_get_type_def", &POA_CORBA::ConstantDef::_get_type_def_skel, 0},
-      {"_set_type_def", &POA_CORBA::ConstantDef::_set_type_def_skel, 0},
       {"_component", &POA_CORBA::ConstantDef::_component_skel, 0},
       {"_non_existent", &POA_CORBA::ConstantDef::_non_existent_skel, 0},
+      {"_get_type_def", &POA_CORBA::ConstantDef::_get_type_def_skel, 0},
+      {"_set_type_def", &POA_CORBA::ConstantDef::_set_type_def_skel, 0},
       {"_get_containing_repository", &POA_CORBA::ConstantDef::_get_containing_repository_skel, 0},
     };
 
   static const signed char lookup[] =
     {
-      -12,  -3, -15,  -2,   4,   5,  -1,  55,   8,  46, -46,  -1, -46,  17, 
-       -1,  18,  -1,  19,  20,  -9,  -3, -21,  -2, -38,  -1,  23,  -6,  -2, 
-       24,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  25, 
+      -12,  -3, -15,  -2,   4,   5,  -1,  53,   8,  48, -46,  -1, -46,  17, 
+       18,  19,  -1,  20,  21,  -1,  22,  -9,  -3,  23,  -6,  -2, -24,  -2, 
+      -38,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  26, 
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -3296,7 +3604,7 @@ TAO_CORBA_ConstantDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned in
 static TAO_CORBA_ConstantDef_Perfect_Hash_OpTable tao_CORBA_ConstantDef_optable;
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:999
+// be\be_visitor_interface/interface_ss.cpp:921
 
 TAO::Collocation_Proxy_Broker *
 CORBA__TAO_ConstantDef_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -3316,10 +3624,7 @@ CORBA__TAO_ConstantDef_Proxy_Broker_Factory_Initializer (size_t)
 static int
 CORBA__TAO_ConstantDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
   CORBA__TAO_ConstantDef_Proxy_Broker_Factory_Initializer (
-      reinterpret_cast<
-          size_t> (
-          CORBA__TAO_ConstantDef_Proxy_Broker_Factory_Initializer
-        )
+      reinterpret_cast<size_t> (CORBA__TAO_ConstantDef_Proxy_Broker_Factory_Initializer)
     );
 
 
@@ -3459,8 +3764,8 @@ namespace POA_CORBA
     
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
-      TAO::SArg_Traits< CORBA::IDLType>::ret_arg_type retval =
-        TAO::Portable_Server::get_ret_arg< CORBA::IDLType, TAO::SArg_Traits< CORBA::IDLType>::ret_arg_type> (
+      TAO::SArg_Traits< ::CORBA::IDLType>::ret_arg_type retval =
+        TAO::Portable_Server::get_ret_arg< ::CORBA::IDLType, TAO::SArg_Traits< ::CORBA::IDLType>::ret_arg_type> (
           this->operation_details_,
           this->args_);
       
@@ -3497,7 +3802,7 @@ void POA_CORBA::ConstantDef::_get_type_def_skel (
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
   
-  TAO::SArg_Traits< CORBA::IDLType>::ret_val retval;
+  TAO::SArg_Traits< ::CORBA::IDLType>::ret_val retval;
   
   TAO::Argument * const args[] =
     {
@@ -3551,8 +3856,8 @@ namespace POA_CORBA
     
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
-      TAO::SArg_Traits< CORBA::IDLType>::in_arg_type arg_1 =
-        TAO::Portable_Server::get_in_arg< CORBA::IDLType, TAO::SArg_Traits< CORBA::IDLType>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_type arg_1 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::IDLType, TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
@@ -3590,7 +3895,7 @@ void POA_CORBA::ConstantDef::_set_type_def_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   TAO::SArg_Traits< void>::ret_val retval;
-  TAO::SArg_Traits< CORBA::IDLType>::in_arg_val _tao_type_def;
+  TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_val _tao_type_def;
   
   TAO::Argument * const args[] =
     {
@@ -3840,8 +4145,8 @@ namespace POA_CORBA
           this->operation_details_,
           this->args_);
       
-      TAO::SArg_Traits< CORBA::Char *>::in_arg_type arg_1 =
-        TAO::Portable_Server::get_in_arg< CORBA::Char *, TAO::SArg_Traits< CORBA::Char *>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
@@ -3876,7 +4181,7 @@ void POA_CORBA::ConstantDef::_is_a_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  TAO::SArg_Traits< CORBA::Char *>::in_arg_val _tao_repository_id;
+  TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
   
   TAO::Argument * const args[] =
     {
@@ -3997,10 +4302,98 @@ void POA_CORBA::ConstantDef::_non_existent_skel (
   
 }
 
+namespace POA_CORBA
+{
+  
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_operation/upcall_command_ss.cpp:127
+  
+  class _repository_id_ConstantDef_Upcall_Command
+    : public TAO::Upcall_Command
+  {
+  public:
+    inline _repository_id_ConstantDef_Upcall_Command (
+      POA_CORBA::ConstantDef * servant,
+      TAO_Operation_Details const * operation_details,
+      TAO::Argument * const args[])
+      : servant_ (servant)
+      , operation_details_ (operation_details)
+      , args_ (args)
+    {
+    }
+    
+    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+    {
+      TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
+        TAO::Portable_Server::get_ret_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type> (
+          this->operation_details_,
+          this->args_);
+      
+      
+      retval =
+        this->servant_-> _repository_id (
+          ACE_ENV_SINGLE_ARG_PARAMETER);
+        
+    }
+  
+  private:
+    POA_CORBA::ConstantDef * const servant_;
+    TAO_Operation_Details const * const operation_details_;
+    TAO::Argument * const * const args_;
+  };
+  
+}
+void POA_CORBA::ConstantDef::_repository_id_skel (
+    TAO_ServerRequest & server_request, 
+    void * TAO_INTERCEPTOR (servant_upcall),
+    void * servant
+    ACE_ENV_ARG_DECL
+  )
+{
+  
+  
+#if TAO_HAS_INTERCEPTORS == 1
+  static CORBA::TypeCode_ptr const * const exceptions = 0;
+  static size_t const nexceptions = 0;
+#endif /* TAO_HAS_INTERCEPTORS */
+  
+  TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
+  
+  TAO::Argument * const args[] =
+    {
+      &retval
+    };
+  
+  static size_t const nargs = 1;
+  
+  POA_CORBA::ConstantDef * const impl =
+    static_cast<POA_CORBA::ConstantDef *> (servant);
+  
+  _repository_id_ConstantDef_Upcall_Command command (
+    impl,
+    server_request.operation_details (),
+    args);
+  
+  TAO::Upcall_Wrapper upcall_wrapper;
+  upcall_wrapper.upcall (server_request
+                         , args
+                         , nargs
+                         , command
+#if TAO_HAS_INTERCEPTORS == 1
+                         , servant_upcall
+                         , exceptions
+                         , nexceptions
+#endif  /* TAO_HAS_INTERCEPTORS == 1 */
+                         ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+  
+}
+
 
 
 // TAO_IDL - Generated from 
-// be\be_visitor_interface/interface_ss.cpp:393
+// be\be_visitor_interface/interface_ss.cpp:501
 
 
 
@@ -4165,7 +4558,7 @@ const char* POA_CORBA::ConstantDef::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:940
+// be\be_visitor_interface/interface_ss.cpp:862
 
 void POA_CORBA::ConstantDef::_dispatch (
     TAO_ServerRequest & req,
@@ -4180,7 +4573,7 @@ void POA_CORBA::ConstantDef::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:891
+// be\be_visitor_interface/interface_ss.cpp:813
 
 CORBA::ConstantDef *
 POA_CORBA::ConstantDef::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -4212,7 +4605,7 @@ POA_CORBA::ConstantDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1455
+// be\be_interface.cpp:1465
 
 class TAO_CORBA_StructDef_Perfect_Hash_OpTable
   : public TAO_Perfect_Hash_OpTable
@@ -4225,7 +4618,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: c:\ace\latest\ACE_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0 -a -o -t -p -K opname -L C++ -Z TAO_CORBA_StructDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ACE\Any\ACE_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0 -a -o -t -p -K opname -L C++ -Z TAO_CORBA_StructDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_StructDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -4282,14 +4675,14 @@ TAO_CORBA_StructDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int
 {
   enum
     {
-      TOTAL_KEYWORDS = 38,
+      TOTAL_KEYWORDS = 39,
       MIN_WORD_LENGTH = 4,
       MAX_WORD_LENGTH = 26,
       MIN_HASH_VALUE = 5,
       MAX_HASH_VALUE = 60,
       HASH_VALUE_RANGE = 56,
       DUPLICATES = 8,
-      WORDLIST_SIZE = 43
+      WORDLIST_SIZE = 44
     };
 
   static const TAO_operation_db_entry  wordlist[] =
@@ -4311,6 +4704,7 @@ TAO_CORBA_StructDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int
       {"move", &POA_CORBA::StructDef::move_skel, 0},
       {"_get_defined_in", &POA_CORBA::StructDef::_get_defined_in_skel, 0},
       {"_get_def_kind", &POA_CORBA::StructDef::_get_def_kind_skel, 0},
+      {"_repository_id", &POA_CORBA::StructDef::_repository_id_skel, 0},
       {"destroy", &POA_CORBA::StructDef::destroy_skel, 0},
       {"_component", &POA_CORBA::StructDef::_component_skel, 0},
       {"_get_members", &POA_CORBA::StructDef::_get_members_skel, 0},
@@ -4338,10 +4732,10 @@ TAO_CORBA_StructDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int
   static const signed char lookup[] =
     {
        -1,  -1,  -1,  -7,  -3,   5,   6, -12,  -2, -66,  10,  11,  -1, -15, 
-       -2, -68,  14, -64,  17,  18,  19,  20,  -1,  -1,  -1,  21,  -1,  -1, 
-      -23,  -2,  22,  -1, -64,  25, -28,  -2,  26,  27, -64, -30,  -2, -62, 
-       32,  -1,  -1,  33,  34,  35,  -1,  -1,  36,  37,  -1,  38,  -1,  -1, 
-       39,  40,  41,  -1,  42, 
+       -2, -68,  14, -64,  17,  18,  19,  20,  21,  -1,  -1,  22,  -1,  -1, 
+      -24,  -2,  23,  -1, -64,  26, -29,  -2,  27,  28, -64, -31,  -2, -62, 
+       33,  -1,  -1,  34,  35,  36,  -1,  -1,  37,  38,  -1,  39,  -1,  -1, 
+       40,  41,  42,  -1,  43, 
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -4379,7 +4773,7 @@ TAO_CORBA_StructDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int
 static TAO_CORBA_StructDef_Perfect_Hash_OpTable tao_CORBA_StructDef_optable;
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:999
+// be\be_visitor_interface/interface_ss.cpp:921
 
 TAO::Collocation_Proxy_Broker *
 CORBA__TAO_StructDef_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -4399,10 +4793,7 @@ CORBA__TAO_StructDef_Proxy_Broker_Factory_Initializer (size_t)
 static int
 CORBA__TAO_StructDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
   CORBA__TAO_StructDef_Proxy_Broker_Factory_Initializer (
-      reinterpret_cast<
-          size_t> (
-          CORBA__TAO_StructDef_Proxy_Broker_Factory_Initializer
-        )
+      reinterpret_cast<size_t> (CORBA__TAO_StructDef_Proxy_Broker_Factory_Initializer)
     );
 
 
@@ -4453,8 +4844,8 @@ namespace POA_CORBA
     
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
-      TAO::SArg_Traits< CORBA::StructMemberSeq>::ret_arg_type retval =
-        TAO::Portable_Server::get_ret_arg< CORBA::StructMemberSeq, TAO::SArg_Traits< CORBA::StructMemberSeq>::ret_arg_type> (
+      TAO::SArg_Traits< ::CORBA::StructMemberSeq>::ret_arg_type retval =
+        TAO::Portable_Server::get_ret_arg< ::CORBA::StructMemberSeq, TAO::SArg_Traits< ::CORBA::StructMemberSeq>::ret_arg_type> (
           this->operation_details_,
           this->args_);
       
@@ -4491,7 +4882,7 @@ void POA_CORBA::StructDef::_get_members_skel (
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
   
-  TAO::SArg_Traits< CORBA::StructMemberSeq>::ret_val retval;
+  TAO::SArg_Traits< ::CORBA::StructMemberSeq>::ret_val retval;
   
   TAO::Argument * const args[] =
     {
@@ -4545,8 +4936,8 @@ namespace POA_CORBA
     
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
-      TAO::SArg_Traits< CORBA::StructMemberSeq>::in_arg_type arg_1 =
-        TAO::Portable_Server::get_in_arg< CORBA::StructMemberSeq, TAO::SArg_Traits< CORBA::StructMemberSeq>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::StructMemberSeq>::in_arg_type arg_1 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::StructMemberSeq, TAO::SArg_Traits< ::CORBA::StructMemberSeq>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
@@ -4584,7 +4975,7 @@ void POA_CORBA::StructDef::_set_members_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   TAO::SArg_Traits< void>::ret_val retval;
-  TAO::SArg_Traits< CORBA::StructMemberSeq>::in_arg_val _tao_members;
+  TAO::SArg_Traits< ::CORBA::StructMemberSeq>::in_arg_val _tao_members;
   
   TAO::Argument * const args[] =
     {
@@ -4648,8 +5039,8 @@ namespace POA_CORBA
           this->operation_details_,
           this->args_);
       
-      TAO::SArg_Traits< CORBA::Char *>::in_arg_type arg_1 =
-        TAO::Portable_Server::get_in_arg< CORBA::Char *, TAO::SArg_Traits< CORBA::Char *>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
@@ -4684,7 +5075,7 @@ void POA_CORBA::StructDef::_is_a_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  TAO::SArg_Traits< CORBA::Char *>::in_arg_val _tao_repository_id;
+  TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
   
   TAO::Argument * const args[] =
     {
@@ -4805,10 +5196,98 @@ void POA_CORBA::StructDef::_non_existent_skel (
   
 }
 
+namespace POA_CORBA
+{
+  
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_operation/upcall_command_ss.cpp:127
+  
+  class _repository_id_StructDef_Upcall_Command
+    : public TAO::Upcall_Command
+  {
+  public:
+    inline _repository_id_StructDef_Upcall_Command (
+      POA_CORBA::StructDef * servant,
+      TAO_Operation_Details const * operation_details,
+      TAO::Argument * const args[])
+      : servant_ (servant)
+      , operation_details_ (operation_details)
+      , args_ (args)
+    {
+    }
+    
+    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+    {
+      TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
+        TAO::Portable_Server::get_ret_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type> (
+          this->operation_details_,
+          this->args_);
+      
+      
+      retval =
+        this->servant_-> _repository_id (
+          ACE_ENV_SINGLE_ARG_PARAMETER);
+        
+    }
+  
+  private:
+    POA_CORBA::StructDef * const servant_;
+    TAO_Operation_Details const * const operation_details_;
+    TAO::Argument * const * const args_;
+  };
+  
+}
+void POA_CORBA::StructDef::_repository_id_skel (
+    TAO_ServerRequest & server_request, 
+    void * TAO_INTERCEPTOR (servant_upcall),
+    void * servant
+    ACE_ENV_ARG_DECL
+  )
+{
+  
+  
+#if TAO_HAS_INTERCEPTORS == 1
+  static CORBA::TypeCode_ptr const * const exceptions = 0;
+  static size_t const nexceptions = 0;
+#endif /* TAO_HAS_INTERCEPTORS */
+  
+  TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
+  
+  TAO::Argument * const args[] =
+    {
+      &retval
+    };
+  
+  static size_t const nargs = 1;
+  
+  POA_CORBA::StructDef * const impl =
+    static_cast<POA_CORBA::StructDef *> (servant);
+  
+  _repository_id_StructDef_Upcall_Command command (
+    impl,
+    server_request.operation_details (),
+    args);
+  
+  TAO::Upcall_Wrapper upcall_wrapper;
+  upcall_wrapper.upcall (server_request
+                         , args
+                         , nargs
+                         , command
+#if TAO_HAS_INTERCEPTORS == 1
+                         , servant_upcall
+                         , exceptions
+                         , nexceptions
+#endif  /* TAO_HAS_INTERCEPTORS == 1 */
+                         ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+  
+}
+
 
 
 // TAO_IDL - Generated from 
-// be\be_visitor_interface/interface_ss.cpp:393
+// be\be_visitor_interface/interface_ss.cpp:501
 
 
 
@@ -4985,7 +5464,7 @@ const char* POA_CORBA::StructDef::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:940
+// be\be_visitor_interface/interface_ss.cpp:862
 
 void POA_CORBA::StructDef::_dispatch (
     TAO_ServerRequest & req,
@@ -5000,7 +5479,7 @@ void POA_CORBA::StructDef::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:891
+// be\be_visitor_interface/interface_ss.cpp:813
 
 CORBA::StructDef *
 POA_CORBA::StructDef::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -5032,7 +5511,7 @@ POA_CORBA::StructDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1455
+// be\be_interface.cpp:1465
 
 class TAO_CORBA_UnionDef_Perfect_Hash_OpTable
   : public TAO_Perfect_Hash_OpTable
@@ -5045,53 +5524,53 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: c:\ace\latest\ACE_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0 -a -o -t -p -K opname -L C++ -Z TAO_CORBA_UnionDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ACE\Any\ACE_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0 -a -o -t -p -K opname -L C++ -Z TAO_CORBA_UnionDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_UnionDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
   static const unsigned char asso_values[] =
     {
 #if defined (ACE_MVS)
-     93, 93, 93, 93, 93, 93, 93, 93, 93, 93,
-     93, 93, 93, 93, 93, 93, 93, 93, 93, 93,
-     93, 93, 93, 93, 93, 93, 93, 93, 93, 93,
-     93, 93, 93, 93, 93, 93, 93, 93, 93, 93,
-     93, 93, 93, 93, 93, 93, 93, 93, 93, 93,
-     93, 93, 93, 93, 93, 93, 93, 93, 93, 93,
-     93, 93, 93, 93, 93, 93, 93, 93, 93, 93,
-     93, 93, 93, 93, 93, 93, 93, 93, 93, 93,
-     93, 93, 93, 93, 93, 93, 93, 93, 93, 93,
-     93, 93, 93, 93, 93, 93, 93, 93, 93, 93,
-     93, 93, 93, 93, 93, 93, 93, 93, 93,  0,
-     93, 93, 93, 93, 93, 93, 93, 93, 93, 93,
-     93, 93, 93, 93, 93, 93, 93, 93, 93,  0,
-     93, 25, 55,  0,  0, 93, 93, 93, 93, 93,
-     93, 93, 93, 93, 93, 93, 93,  0,  0,  5,
-     93,  0, 93, 93, 93, 93, 93, 93, 93, 93,
-     93, 93, 20, 20, 93, 93, 93, 10,  5, 93,
-     93, 93, 93, 93, 93, 93, 93, 93, 93, 93,
-     93, 93, 93, 93, 93, 93, 93, 93, 93, 93,
-     93, 93, 93, 93, 93, 93, 93, 93, 93, 93,
-     93, 93, 93, 93, 93, 93, 93, 93, 93, 93,
-     93, 93, 93, 93, 93, 93, 93, 93, 93, 93,
-     93, 93, 93, 93, 93, 93, 93, 93, 93, 93,
-     93, 93, 93, 93, 93, 93, 93, 93, 93, 93,
-     93, 93, 93, 93, 93, 93, 93, 93, 93, 93,
-     93, 93, 93, 93, 93, 93,
+     86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
+     86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
+     86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
+     86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
+     86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
+     86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
+     86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
+     86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
+     86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
+     86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
+     86, 86, 86, 86, 86, 86, 86, 86, 86,  0,
+     86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
+     86, 86, 86, 86, 86, 86, 86, 86, 86,  0,
+     86, 25, 35,  0, 35, 86, 86, 86, 86, 86,
+     86, 86, 86, 86, 86, 86, 86,  0,  0, 15,
+     86,  0, 86, 86, 86, 86, 86, 86, 86, 86,
+     86, 86, 20, 45, 86, 86, 86,  5, 25, 86,
+     86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
+     86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
+     86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
+     86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
+     86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
+     86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
+     86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
+     86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
+     86, 86, 86, 86, 86, 86,
 #else
-     93, 93, 93, 93, 93, 93, 93, 93, 93, 93,
-     93, 93, 93, 93, 93, 93, 93, 93, 93, 93,
-     93, 93, 93, 93, 93, 93, 93, 93, 93, 93,
-     93, 93, 93, 93, 93, 93, 93, 93, 93, 93,
-     93, 93, 93, 93, 93, 93, 93, 93, 93, 93,
-     93, 93, 93, 93, 93, 93, 93, 93, 93, 93,
-     93, 93, 93, 93, 93, 93, 93, 93, 93, 93,
-     93, 93, 93, 93, 93, 93, 93, 93, 93, 93,
-     93, 93, 93, 93, 93, 93, 93, 93, 93, 93,
-     93, 93, 93, 93, 93,  0, 93,  0, 93, 25,
-     55,  0,  0, 93, 93, 93, 93, 93,  0,  0,
-      5, 93,  0, 93, 93, 20, 20, 93, 93, 93,
-     10,  5, 93, 93, 93, 93, 93, 93,
+     86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
+     86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
+     86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
+     86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
+     86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
+     86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
+     86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
+     86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
+     86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
+     86, 86, 86, 86, 86,  0, 86,  0, 86, 25,
+     35,  0, 35, 86, 86, 86, 86, 86,  0,  0,
+     15, 86,  0, 86, 86, 20, 45, 86, 86, 86,
+      5, 25, 86, 86, 86, 86, 86, 86,
 #endif /* ACE_MVS */
     };
   return len + asso_values[(int) str[len - 1]] + asso_values[(int) str[0]];
@@ -5102,14 +5581,14 @@ TAO_CORBA_UnionDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int l
 {
   enum
     {
-      TOTAL_KEYWORDS = 41,
+      TOTAL_KEYWORDS = 42,
       MIN_WORD_LENGTH = 4,
       MAX_WORD_LENGTH = 27,
       MIN_HASH_VALUE = 4,
-      MAX_HASH_VALUE = 92,
-      HASH_VALUE_RANGE = 89,
+      MAX_HASH_VALUE = 85,
+      HASH_VALUE_RANGE = 82,
       DUPLICATES = 9,
-      WORDLIST_SIZE = 45
+      WORDLIST_SIZE = 46
     };
 
   static const TAO_operation_db_entry  wordlist[] =
@@ -5123,50 +5602,51 @@ TAO_CORBA_UnionDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int l
       {"_set_name", &POA_CORBA::UnionDef::_set_name_skel, 0},
       {"_interface", &POA_CORBA::UnionDef::_interface_skel, 0},
       {"lookup_name", &POA_CORBA::UnionDef::lookup_name_skel, 0},
+      {"_get_absolute_name", &POA_CORBA::UnionDef::_get_absolute_name_skel, 0},
+      {"_get_discriminator_type", &POA_CORBA::UnionDef::_get_discriminator_type_skel, 0},
       {"_get_version", &POA_CORBA::UnionDef::_get_version_skel, 0},
       {"_set_version", &POA_CORBA::UnionDef::_set_version_skel, 0},
-      {"_get_absolute_name", &POA_CORBA::UnionDef::_get_absolute_name_skel, 0},
       {"_get_defined_in", &POA_CORBA::UnionDef::_get_defined_in_skel, 0},
-      {"_get_discriminator_type", &POA_CORBA::UnionDef::_get_discriminator_type_skel, 0},
-      {"_get_discriminator_type_def", &POA_CORBA::UnionDef::_get_discriminator_type_def_skel, 0},
-      {"_set_discriminator_type_def", &POA_CORBA::UnionDef::_set_discriminator_type_def_skel, 0},
-      {"_component", &POA_CORBA::UnionDef::_component_skel, 0},
-      {"_get_containing_repository", &POA_CORBA::UnionDef::_get_containing_repository_skel, 0},
       {"_get_members", &POA_CORBA::UnionDef::_get_members_skel, 0},
       {"_set_members", &POA_CORBA::UnionDef::_set_members_skel, 0},
-      {"_non_existent", &POA_CORBA::UnionDef::_non_existent_skel, 0},
       {"create_enum", &POA_CORBA::UnionDef::create_enum_skel, 0},
       {"create_value", &POA_CORBA::UnionDef::create_value_skel, 0},
       {"create_module", &POA_CORBA::UnionDef::create_module_skel, 0},
       {"create_native", &POA_CORBA::UnionDef::create_native_skel, 0},
       {"create_interface", &POA_CORBA::UnionDef::create_interface_skel, 0},
       {"create_ext_value", &POA_CORBA::UnionDef::create_ext_value_skel, 0},
-      {"create_union", &POA_CORBA::UnionDef::create_union_skel, 0},
-      {"create_exception", &POA_CORBA::UnionDef::create_exception_skel, 0},
+      {"_get_id", &POA_CORBA::UnionDef::_get_id_skel, 0},
+      {"_set_id", &POA_CORBA::UnionDef::_set_id_skel, 0},
+      {"describe", &POA_CORBA::UnionDef::describe_skel, 0},
+      {"create_value_box", &POA_CORBA::UnionDef::create_value_box_skel, 0},
       {"create_local_interface", &POA_CORBA::UnionDef::create_local_interface_skel, 0},
+      {"_get_def_kind", &POA_CORBA::UnionDef::_get_def_kind_skel, 0},
+      {"_repository_id", &POA_CORBA::UnionDef::_repository_id_skel, 0},
       {"create_abstract_interface", &POA_CORBA::UnionDef::create_abstract_interface_skel, 0},
-      {"create_value_box", &POA_CORBA::UnionDef::create_value_box_skel, 0},
+      {"_get_containing_repository", &POA_CORBA::UnionDef::_get_containing_repository_skel, 0},
+      {"create_union", &POA_CORBA::UnionDef::create_union_skel, 0},
       {"contents", &POA_CORBA::UnionDef::contents_skel, 0},
+      {"_component", &POA_CORBA::UnionDef::_component_skel, 0},
+      {"create_exception", &POA_CORBA::UnionDef::create_exception_skel, 0},
       {"create_alias", &POA_CORBA::UnionDef::create_alias_skel, 0},
-      {"create_struct", &POA_CORBA::UnionDef::create_struct_skel, 0},
-      {"create_constant", &POA_CORBA::UnionDef::create_constant_skel, 0},
-      {"_get_id", &POA_CORBA::UnionDef::_get_id_skel, 0},
-      {"_set_id", &POA_CORBA::UnionDef::_set_id_skel, 0},
-      {"describe", &POA_CORBA::UnionDef::describe_skel, 0},
+      {"_non_existent", &POA_CORBA::UnionDef::_non_existent_skel, 0},
+      {"_get_discriminator_type_def", &POA_CORBA::UnionDef::_get_discriminator_type_def_skel, 0},
+      {"_set_discriminator_type_def", &POA_CORBA::UnionDef::_set_discriminator_type_def_skel, 0},
       {"destroy", &POA_CORBA::UnionDef::destroy_skel, 0},
-      {"_get_def_kind", &POA_CORBA::UnionDef::_get_def_kind_skel, 0},
       {"describe_contents", &POA_CORBA::UnionDef::describe_contents_skel, 0},
+      {"create_struct", &POA_CORBA::UnionDef::create_struct_skel, 0},
+      {"create_constant", &POA_CORBA::UnionDef::create_constant_skel, 0},
     };
 
   static const signed char lookup[] =
     {
-       -1,  -1,  -1,  -1,   4,   5,   6,  -7,  -3, -94,  10,  11,  -1,  -1, 
-       -1, -12,  -2, -94,  14,  -1,  15,  -1,  -1,  16,  -1, -17,  -2, -94, 
-      -21,  -2,  19,  20, -96,  23, -26,  -2,  24,  25, -96, -28,  -2, -94, 
-       30,  -1,  -1,  -1,  31,  32,  -1,  -1,  33,  34,  -1,  35,  -1, -39, 
-       -2,  36,  37,  -1,  38,  -1, -99,  41,  -1,  -1,  -1,  42,  43,  -1, 
-       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1, 
-       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  44, 
+       -1,  -1,  -1,  -1,   4,   5,   6,  -7,  -3, -87,  10,  11,  -1,  -1, 
+       -1,  -1,  -1,  -1,  12,  -1,  -1, -14,  -2,  13,  -1, -17,  -2, -91, 
+      -21,  -2,  16,  -1, -92,  -1, -23,  -2,  19,  20, -95, -25,  -2, -92, 
+      -88,  27,  -1,  -1,  28,  29,  30,  31,  32,  33,  34,  35,  -1,  36, 
+       37,  38,  39,  -1, -40,  -2, -87,  -1,  -1,  -1,  -1,  42,  -1,  -1, 
+       -1,  -1,  43,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  44, 
+       -1,  45, 
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -5204,7 +5684,7 @@ TAO_CORBA_UnionDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int l
 static TAO_CORBA_UnionDef_Perfect_Hash_OpTable tao_CORBA_UnionDef_optable;
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:999
+// be\be_visitor_interface/interface_ss.cpp:921
 
 TAO::Collocation_Proxy_Broker *
 CORBA__TAO_UnionDef_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -5224,10 +5704,7 @@ CORBA__TAO_UnionDef_Proxy_Broker_Factory_Initializer (size_t)
 static int
 CORBA__TAO_UnionDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
   CORBA__TAO_UnionDef_Proxy_Broker_Factory_Initializer (
-      reinterpret_cast<
-          size_t> (
-          CORBA__TAO_UnionDef_Proxy_Broker_Factory_Initializer
-        )
+      reinterpret_cast<size_t> (CORBA__TAO_UnionDef_Proxy_Broker_Factory_Initializer)
     );
 
 
@@ -5370,8 +5847,8 @@ namespace POA_CORBA
     
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
-      TAO::SArg_Traits< CORBA::IDLType>::ret_arg_type retval =
-        TAO::Portable_Server::get_ret_arg< CORBA::IDLType, TAO::SArg_Traits< CORBA::IDLType>::ret_arg_type> (
+      TAO::SArg_Traits< ::CORBA::IDLType>::ret_arg_type retval =
+        TAO::Portable_Server::get_ret_arg< ::CORBA::IDLType, TAO::SArg_Traits< ::CORBA::IDLType>::ret_arg_type> (
           this->operation_details_,
           this->args_);
       
@@ -5408,7 +5885,7 @@ void POA_CORBA::UnionDef::_get_discriminator_type_def_skel (
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
   
-  TAO::SArg_Traits< CORBA::IDLType>::ret_val retval;
+  TAO::SArg_Traits< ::CORBA::IDLType>::ret_val retval;
   
   TAO::Argument * const args[] =
     {
@@ -5462,8 +5939,8 @@ namespace POA_CORBA
     
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
-      TAO::SArg_Traits< CORBA::IDLType>::in_arg_type arg_1 =
-        TAO::Portable_Server::get_in_arg< CORBA::IDLType, TAO::SArg_Traits< CORBA::IDLType>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_type arg_1 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::IDLType, TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
@@ -5501,7 +5978,7 @@ void POA_CORBA::UnionDef::_set_discriminator_type_def_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   TAO::SArg_Traits< void>::ret_val retval;
-  TAO::SArg_Traits< CORBA::IDLType>::in_arg_val _tao_discriminator_type_def;
+  TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_val _tao_discriminator_type_def;
   
   TAO::Argument * const args[] =
     {
@@ -5556,8 +6033,8 @@ namespace POA_CORBA
     
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
-      TAO::SArg_Traits< CORBA::UnionMemberSeq>::ret_arg_type retval =
-        TAO::Portable_Server::get_ret_arg< CORBA::UnionMemberSeq, TAO::SArg_Traits< CORBA::UnionMemberSeq>::ret_arg_type> (
+      TAO::SArg_Traits< ::CORBA::UnionMemberSeq>::ret_arg_type retval =
+        TAO::Portable_Server::get_ret_arg< ::CORBA::UnionMemberSeq, TAO::SArg_Traits< ::CORBA::UnionMemberSeq>::ret_arg_type> (
           this->operation_details_,
           this->args_);
       
@@ -5594,7 +6071,7 @@ void POA_CORBA::UnionDef::_get_members_skel (
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
   
-  TAO::SArg_Traits< CORBA::UnionMemberSeq>::ret_val retval;
+  TAO::SArg_Traits< ::CORBA::UnionMemberSeq>::ret_val retval;
   
   TAO::Argument * const args[] =
     {
@@ -5648,8 +6125,8 @@ namespace POA_CORBA
     
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
-      TAO::SArg_Traits< CORBA::UnionMemberSeq>::in_arg_type arg_1 =
-        TAO::Portable_Server::get_in_arg< CORBA::UnionMemberSeq, TAO::SArg_Traits< CORBA::UnionMemberSeq>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::UnionMemberSeq>::in_arg_type arg_1 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::UnionMemberSeq, TAO::SArg_Traits< ::CORBA::UnionMemberSeq>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
@@ -5687,7 +6164,7 @@ void POA_CORBA::UnionDef::_set_members_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   TAO::SArg_Traits< void>::ret_val retval;
-  TAO::SArg_Traits< CORBA::UnionMemberSeq>::in_arg_val _tao_members;
+  TAO::SArg_Traits< ::CORBA::UnionMemberSeq>::in_arg_val _tao_members;
   
   TAO::Argument * const args[] =
     {
@@ -5751,8 +6228,8 @@ namespace POA_CORBA
           this->operation_details_,
           this->args_);
       
-      TAO::SArg_Traits< CORBA::Char *>::in_arg_type arg_1 =
-        TAO::Portable_Server::get_in_arg< CORBA::Char *, TAO::SArg_Traits< CORBA::Char *>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
@@ -5787,7 +6264,7 @@ void POA_CORBA::UnionDef::_is_a_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  TAO::SArg_Traits< CORBA::Char *>::in_arg_val _tao_repository_id;
+  TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
   
   TAO::Argument * const args[] =
     {
@@ -5908,10 +6385,98 @@ void POA_CORBA::UnionDef::_non_existent_skel (
   
 }
 
+namespace POA_CORBA
+{
+  
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_operation/upcall_command_ss.cpp:127
+  
+  class _repository_id_UnionDef_Upcall_Command
+    : public TAO::Upcall_Command
+  {
+  public:
+    inline _repository_id_UnionDef_Upcall_Command (
+      POA_CORBA::UnionDef * servant,
+      TAO_Operation_Details const * operation_details,
+      TAO::Argument * const args[])
+      : servant_ (servant)
+      , operation_details_ (operation_details)
+      , args_ (args)
+    {
+    }
+    
+    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+    {
+      TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
+        TAO::Portable_Server::get_ret_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type> (
+          this->operation_details_,
+          this->args_);
+      
+      
+      retval =
+        this->servant_-> _repository_id (
+          ACE_ENV_SINGLE_ARG_PARAMETER);
+        
+    }
+  
+  private:
+    POA_CORBA::UnionDef * const servant_;
+    TAO_Operation_Details const * const operation_details_;
+    TAO::Argument * const * const args_;
+  };
+  
+}
+void POA_CORBA::UnionDef::_repository_id_skel (
+    TAO_ServerRequest & server_request, 
+    void * TAO_INTERCEPTOR (servant_upcall),
+    void * servant
+    ACE_ENV_ARG_DECL
+  )
+{
+  
+  
+#if TAO_HAS_INTERCEPTORS == 1
+  static CORBA::TypeCode_ptr const * const exceptions = 0;
+  static size_t const nexceptions = 0;
+#endif /* TAO_HAS_INTERCEPTORS */
+  
+  TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
+  
+  TAO::Argument * const args[] =
+    {
+      &retval
+    };
+  
+  static size_t const nargs = 1;
+  
+  POA_CORBA::UnionDef * const impl =
+    static_cast<POA_CORBA::UnionDef *> (servant);
+  
+  _repository_id_UnionDef_Upcall_Command command (
+    impl,
+    server_request.operation_details (),
+    args);
+  
+  TAO::Upcall_Wrapper upcall_wrapper;
+  upcall_wrapper.upcall (server_request
+                         , args
+                         , nargs
+                         , command
+#if TAO_HAS_INTERCEPTORS == 1
+                         , servant_upcall
+                         , exceptions
+                         , nexceptions
+#endif  /* TAO_HAS_INTERCEPTORS == 1 */
+                         ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+  
+}
+
 
 
 // TAO_IDL - Generated from 
-// be\be_visitor_interface/interface_ss.cpp:393
+// be\be_visitor_interface/interface_ss.cpp:501
 
 
 
@@ -6088,7 +6653,7 @@ const char* POA_CORBA::UnionDef::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:940
+// be\be_visitor_interface/interface_ss.cpp:862
 
 void POA_CORBA::UnionDef::_dispatch (
     TAO_ServerRequest & req,
@@ -6103,7 +6668,7 @@ void POA_CORBA::UnionDef::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:891
+// be\be_visitor_interface/interface_ss.cpp:813
 
 CORBA::UnionDef *
 POA_CORBA::UnionDef::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -6135,7 +6700,7 @@ POA_CORBA::UnionDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1455
+// be\be_interface.cpp:1465
 
 class TAO_CORBA_EnumDef_Perfect_Hash_OpTable
   : public TAO_Perfect_Hash_OpTable
@@ -6148,7 +6713,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: c:\ace\latest\ACE_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0 -a -o -t -p -K opname -L C++ -Z TAO_CORBA_EnumDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ACE\Any\ACE_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0 -a -o -t -p -K opname -L C++ -Z TAO_CORBA_EnumDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_EnumDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -6205,14 +6770,14 @@ TAO_CORBA_EnumDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int le
 {
   enum
     {
-      TOTAL_KEYWORDS = 20,
+      TOTAL_KEYWORDS = 21,
       MIN_WORD_LENGTH = 4,
       MAX_WORD_LENGTH = 26,
       MIN_HASH_VALUE = 4,
       MAX_HASH_VALUE = 36,
       HASH_VALUE_RANGE = 33,
       DUPLICATES = 6,
-      WORDLIST_SIZE = 24
+      WORDLIST_SIZE = 25
     };
 
   static const TAO_operation_db_entry  wordlist[] =
@@ -6230,6 +6795,7 @@ TAO_CORBA_EnumDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int le
       {"_get_version", &POA_CORBA::EnumDef::_get_version_skel, 0},
       {"_set_version", &POA_CORBA::EnumDef::_set_version_skel, 0},
       {"_get_def_kind", &POA_CORBA::EnumDef::_get_def_kind_skel, 0},
+      {"_repository_id", &POA_CORBA::EnumDef::_repository_id_skel, 0},
       {"_get_defined_in", &POA_CORBA::EnumDef::_get_defined_in_skel, 0},
       {"destroy", &POA_CORBA::EnumDef::destroy_skel, 0},
       {"_get_absolute_name", &POA_CORBA::EnumDef::_get_absolute_name_skel, 0},
@@ -6242,9 +6808,9 @@ TAO_CORBA_EnumDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int le
 
   static const signed char lookup[] =
     {
-      -13,  -2, -20,  -2,   4,   5,  -1,  55,   8,  51,  12,  -1, -48,  15, 
-       -1,  16,  -1,  17,  18,  -1,  19,  -1, -56,  22,  -9,  -3,  -6,  -2, 
-       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  23, 
+      -13,  -2, -21,  -2,   4,   5,  -1,  55,   8,  51,  12,  -1, -48,  15, 
+       16,  17,  -1,  18,  19,  -1,  20,  -1, -56,  23,  -9,  -3,  -6,  -2, 
+       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  24, 
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -6282,7 +6848,7 @@ TAO_CORBA_EnumDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int le
 static TAO_CORBA_EnumDef_Perfect_Hash_OpTable tao_CORBA_EnumDef_optable;
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:999
+// be\be_visitor_interface/interface_ss.cpp:921
 
 TAO::Collocation_Proxy_Broker *
 CORBA__TAO_EnumDef_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -6302,10 +6868,7 @@ CORBA__TAO_EnumDef_Proxy_Broker_Factory_Initializer (size_t)
 static int
 CORBA__TAO_EnumDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
   CORBA__TAO_EnumDef_Proxy_Broker_Factory_Initializer (
-      reinterpret_cast<
-          size_t> (
-          CORBA__TAO_EnumDef_Proxy_Broker_Factory_Initializer
-        )
+      reinterpret_cast<size_t> (CORBA__TAO_EnumDef_Proxy_Broker_Factory_Initializer)
     );
 
 
@@ -6355,8 +6918,8 @@ namespace POA_CORBA
     
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
-      TAO::SArg_Traits< CORBA::EnumMemberSeq>::ret_arg_type retval =
-        TAO::Portable_Server::get_ret_arg< CORBA::EnumMemberSeq, TAO::SArg_Traits< CORBA::EnumMemberSeq>::ret_arg_type> (
+      TAO::SArg_Traits< ::CORBA::EnumMemberSeq>::ret_arg_type retval =
+        TAO::Portable_Server::get_ret_arg< ::CORBA::EnumMemberSeq, TAO::SArg_Traits< ::CORBA::EnumMemberSeq>::ret_arg_type> (
           this->operation_details_,
           this->args_);
       
@@ -6393,7 +6956,7 @@ void POA_CORBA::EnumDef::_get_members_skel (
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
   
-  TAO::SArg_Traits< CORBA::EnumMemberSeq>::ret_val retval;
+  TAO::SArg_Traits< ::CORBA::EnumMemberSeq>::ret_val retval;
   
   TAO::Argument * const args[] =
     {
@@ -6447,8 +7010,8 @@ namespace POA_CORBA
     
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
-      TAO::SArg_Traits< CORBA::EnumMemberSeq>::in_arg_type arg_1 =
-        TAO::Portable_Server::get_in_arg< CORBA::EnumMemberSeq, TAO::SArg_Traits< CORBA::EnumMemberSeq>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::EnumMemberSeq>::in_arg_type arg_1 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::EnumMemberSeq, TAO::SArg_Traits< ::CORBA::EnumMemberSeq>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
@@ -6486,7 +7049,7 @@ void POA_CORBA::EnumDef::_set_members_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   TAO::SArg_Traits< void>::ret_val retval;
-  TAO::SArg_Traits< CORBA::EnumMemberSeq>::in_arg_val _tao_members;
+  TAO::SArg_Traits< ::CORBA::EnumMemberSeq>::in_arg_val _tao_members;
   
   TAO::Argument * const args[] =
     {
@@ -6550,8 +7113,8 @@ namespace POA_CORBA
           this->operation_details_,
           this->args_);
       
-      TAO::SArg_Traits< CORBA::Char *>::in_arg_type arg_1 =
-        TAO::Portable_Server::get_in_arg< CORBA::Char *, TAO::SArg_Traits< CORBA::Char *>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
@@ -6586,7 +7149,7 @@ void POA_CORBA::EnumDef::_is_a_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  TAO::SArg_Traits< CORBA::Char *>::in_arg_val _tao_repository_id;
+  TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
   
   TAO::Argument * const args[] =
     {
@@ -6707,10 +7270,98 @@ void POA_CORBA::EnumDef::_non_existent_skel (
   
 }
 
+namespace POA_CORBA
+{
+  
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_operation/upcall_command_ss.cpp:127
+  
+  class _repository_id_EnumDef_Upcall_Command
+    : public TAO::Upcall_Command
+  {
+  public:
+    inline _repository_id_EnumDef_Upcall_Command (
+      POA_CORBA::EnumDef * servant,
+      TAO_Operation_Details const * operation_details,
+      TAO::Argument * const args[])
+      : servant_ (servant)
+      , operation_details_ (operation_details)
+      , args_ (args)
+    {
+    }
+    
+    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+    {
+      TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
+        TAO::Portable_Server::get_ret_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type> (
+          this->operation_details_,
+          this->args_);
+      
+      
+      retval =
+        this->servant_-> _repository_id (
+          ACE_ENV_SINGLE_ARG_PARAMETER);
+        
+    }
+  
+  private:
+    POA_CORBA::EnumDef * const servant_;
+    TAO_Operation_Details const * const operation_details_;
+    TAO::Argument * const * const args_;
+  };
+  
+}
+void POA_CORBA::EnumDef::_repository_id_skel (
+    TAO_ServerRequest & server_request, 
+    void * TAO_INTERCEPTOR (servant_upcall),
+    void * servant
+    ACE_ENV_ARG_DECL
+  )
+{
+  
+  
+#if TAO_HAS_INTERCEPTORS == 1
+  static CORBA::TypeCode_ptr const * const exceptions = 0;
+  static size_t const nexceptions = 0;
+#endif /* TAO_HAS_INTERCEPTORS */
+  
+  TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
+  
+  TAO::Argument * const args[] =
+    {
+      &retval
+    };
+  
+  static size_t const nargs = 1;
+  
+  POA_CORBA::EnumDef * const impl =
+    static_cast<POA_CORBA::EnumDef *> (servant);
+  
+  _repository_id_EnumDef_Upcall_Command command (
+    impl,
+    server_request.operation_details (),
+    args);
+  
+  TAO::Upcall_Wrapper upcall_wrapper;
+  upcall_wrapper.upcall (server_request
+                         , args
+                         , nargs
+                         , command
+#if TAO_HAS_INTERCEPTORS == 1
+                         , servant_upcall
+                         , exceptions
+                         , nexceptions
+#endif  /* TAO_HAS_INTERCEPTORS == 1 */
+                         ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+  
+}
+
 
 
 // TAO_IDL - Generated from 
-// be\be_visitor_interface/interface_ss.cpp:393
+// be\be_visitor_interface/interface_ss.cpp:501
 
 
 
@@ -6883,7 +7534,7 @@ const char* POA_CORBA::EnumDef::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:940
+// be\be_visitor_interface/interface_ss.cpp:862
 
 void POA_CORBA::EnumDef::_dispatch (
     TAO_ServerRequest & req,
@@ -6898,7 +7549,7 @@ void POA_CORBA::EnumDef::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:891
+// be\be_visitor_interface/interface_ss.cpp:813
 
 CORBA::EnumDef *
 POA_CORBA::EnumDef::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -6930,7 +7581,7 @@ POA_CORBA::EnumDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1455
+// be\be_interface.cpp:1465
 
 class TAO_CORBA_AliasDef_Perfect_Hash_OpTable
   : public TAO_Perfect_Hash_OpTable
@@ -6943,7 +7594,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: c:\ace\latest\ACE_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0 -a -o -t -p -K opname -L C++ -Z TAO_CORBA_AliasDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ACE\Any\ACE_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0 -a -o -t -p -K opname -L C++ -Z TAO_CORBA_AliasDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_AliasDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -7000,14 +7651,14 @@ TAO_CORBA_AliasDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int l
 {
   enum
     {
-      TOTAL_KEYWORDS = 20,
+      TOTAL_KEYWORDS = 21,
       MIN_WORD_LENGTH = 4,
       MAX_WORD_LENGTH = 26,
       MIN_HASH_VALUE = 4,
       MAX_HASH_VALUE = 36,
       HASH_VALUE_RANGE = 33,
       DUPLICATES = 6,
-      WORDLIST_SIZE = 24
+      WORDLIST_SIZE = 25
     };
 
   static const TAO_operation_db_entry  wordlist[] =
@@ -7025,6 +7676,7 @@ TAO_CORBA_AliasDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int l
       {"_get_version", &POA_CORBA::AliasDef::_get_version_skel, 0},
       {"_set_version", &POA_CORBA::AliasDef::_set_version_skel, 0},
       {"_get_def_kind", &POA_CORBA::AliasDef::_get_def_kind_skel, 0},
+      {"_repository_id", &POA_CORBA::AliasDef::_repository_id_skel, 0},
       {"_get_defined_in", &POA_CORBA::AliasDef::_get_defined_in_skel, 0},
       {"destroy", &POA_CORBA::AliasDef::destroy_skel, 0},
       {"_get_absolute_name", &POA_CORBA::AliasDef::_get_absolute_name_skel, 0},
@@ -7037,9 +7689,9 @@ TAO_CORBA_AliasDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int l
 
   static const signed char lookup[] =
     {
-      -13,  -2, -20,  -2,   4,   5,  -1,  55,   8,  51,  12,  -1, -48,  15, 
-       -1,  16,  -1,  17,  18,  -1,  19,  -1, -56,  22,  -9,  -3,  -6,  -2, 
-       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  23, 
+      -13,  -2, -21,  -2,   4,   5,  -1,  55,   8,  51,  12,  -1, -48,  15, 
+       16,  17,  -1,  18,  19,  -1,  20,  -1, -56,  23,  -9,  -3,  -6,  -2, 
+       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  24, 
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -7077,7 +7729,7 @@ TAO_CORBA_AliasDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int l
 static TAO_CORBA_AliasDef_Perfect_Hash_OpTable tao_CORBA_AliasDef_optable;
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:999
+// be\be_visitor_interface/interface_ss.cpp:921
 
 TAO::Collocation_Proxy_Broker *
 CORBA__TAO_AliasDef_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -7097,10 +7749,7 @@ CORBA__TAO_AliasDef_Proxy_Broker_Factory_Initializer (size_t)
 static int
 CORBA__TAO_AliasDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
   CORBA__TAO_AliasDef_Proxy_Broker_Factory_Initializer (
-      reinterpret_cast<
-          size_t> (
-          CORBA__TAO_AliasDef_Proxy_Broker_Factory_Initializer
-        )
+      reinterpret_cast<size_t> (CORBA__TAO_AliasDef_Proxy_Broker_Factory_Initializer)
     );
 
 
@@ -7150,8 +7799,8 @@ namespace POA_CORBA
     
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
-      TAO::SArg_Traits< CORBA::IDLType>::ret_arg_type retval =
-        TAO::Portable_Server::get_ret_arg< CORBA::IDLType, TAO::SArg_Traits< CORBA::IDLType>::ret_arg_type> (
+      TAO::SArg_Traits< ::CORBA::IDLType>::ret_arg_type retval =
+        TAO::Portable_Server::get_ret_arg< ::CORBA::IDLType, TAO::SArg_Traits< ::CORBA::IDLType>::ret_arg_type> (
           this->operation_details_,
           this->args_);
       
@@ -7188,7 +7837,7 @@ void POA_CORBA::AliasDef::_get_original_type_def_skel (
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
   
-  TAO::SArg_Traits< CORBA::IDLType>::ret_val retval;
+  TAO::SArg_Traits< ::CORBA::IDLType>::ret_val retval;
   
   TAO::Argument * const args[] =
     {
@@ -7242,8 +7891,8 @@ namespace POA_CORBA
     
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
-      TAO::SArg_Traits< CORBA::IDLType>::in_arg_type arg_1 =
-        TAO::Portable_Server::get_in_arg< CORBA::IDLType, TAO::SArg_Traits< CORBA::IDLType>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_type arg_1 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::IDLType, TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
@@ -7281,7 +7930,7 @@ void POA_CORBA::AliasDef::_set_original_type_def_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   TAO::SArg_Traits< void>::ret_val retval;
-  TAO::SArg_Traits< CORBA::IDLType>::in_arg_val _tao_original_type_def;
+  TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_val _tao_original_type_def;
   
   TAO::Argument * const args[] =
     {
@@ -7345,8 +7994,8 @@ namespace POA_CORBA
           this->operation_details_,
           this->args_);
       
-      TAO::SArg_Traits< CORBA::Char *>::in_arg_type arg_1 =
-        TAO::Portable_Server::get_in_arg< CORBA::Char *, TAO::SArg_Traits< CORBA::Char *>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
@@ -7381,7 +8030,7 @@ void POA_CORBA::AliasDef::_is_a_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  TAO::SArg_Traits< CORBA::Char *>::in_arg_val _tao_repository_id;
+  TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
   
   TAO::Argument * const args[] =
     {
@@ -7502,10 +8151,98 @@ void POA_CORBA::AliasDef::_non_existent_skel (
   
 }
 
+namespace POA_CORBA
+{
+  
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_operation/upcall_command_ss.cpp:127
+  
+  class _repository_id_AliasDef_Upcall_Command
+    : public TAO::Upcall_Command
+  {
+  public:
+    inline _repository_id_AliasDef_Upcall_Command (
+      POA_CORBA::AliasDef * servant,
+      TAO_Operation_Details const * operation_details,
+      TAO::Argument * const args[])
+      : servant_ (servant)
+      , operation_details_ (operation_details)
+      , args_ (args)
+    {
+    }
+    
+    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+    {
+      TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
+        TAO::Portable_Server::get_ret_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type> (
+          this->operation_details_,
+          this->args_);
+      
+      
+      retval =
+        this->servant_-> _repository_id (
+          ACE_ENV_SINGLE_ARG_PARAMETER);
+        
+    }
+  
+  private:
+    POA_CORBA::AliasDef * const servant_;
+    TAO_Operation_Details const * const operation_details_;
+    TAO::Argument * const * const args_;
+  };
+  
+}
+void POA_CORBA::AliasDef::_repository_id_skel (
+    TAO_ServerRequest & server_request, 
+    void * TAO_INTERCEPTOR (servant_upcall),
+    void * servant
+    ACE_ENV_ARG_DECL
+  )
+{
+  
+  
+#if TAO_HAS_INTERCEPTORS == 1
+  static CORBA::TypeCode_ptr const * const exceptions = 0;
+  static size_t const nexceptions = 0;
+#endif /* TAO_HAS_INTERCEPTORS */
+  
+  TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
+  
+  TAO::Argument * const args[] =
+    {
+      &retval
+    };
+  
+  static size_t const nargs = 1;
+  
+  POA_CORBA::AliasDef * const impl =
+    static_cast<POA_CORBA::AliasDef *> (servant);
+  
+  _repository_id_AliasDef_Upcall_Command command (
+    impl,
+    server_request.operation_details (),
+    args);
+  
+  TAO::Upcall_Wrapper upcall_wrapper;
+  upcall_wrapper.upcall (server_request
+                         , args
+                         , nargs
+                         , command
+#if TAO_HAS_INTERCEPTORS == 1
+                         , servant_upcall
+                         , exceptions
+                         , nexceptions
+#endif  /* TAO_HAS_INTERCEPTORS == 1 */
+                         ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+  
+}
+
 
 
 // TAO_IDL - Generated from 
-// be\be_visitor_interface/interface_ss.cpp:393
+// be\be_visitor_interface/interface_ss.cpp:501
 
 
 
@@ -7678,7 +8415,7 @@ const char* POA_CORBA::AliasDef::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:940
+// be\be_visitor_interface/interface_ss.cpp:862
 
 void POA_CORBA::AliasDef::_dispatch (
     TAO_ServerRequest & req,
@@ -7693,7 +8430,7 @@ void POA_CORBA::AliasDef::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:891
+// be\be_visitor_interface/interface_ss.cpp:813
 
 CORBA::AliasDef *
 POA_CORBA::AliasDef::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -7725,7 +8462,7 @@ POA_CORBA::AliasDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1455
+// be\be_interface.cpp:1465
 
 class TAO_CORBA_NativeDef_Perfect_Hash_OpTable
   : public TAO_Perfect_Hash_OpTable
@@ -7738,7 +8475,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: c:\ace\latest\ACE_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0 -a -o -t -p -K opname -L C++ -Z TAO_CORBA_NativeDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ACE\Any\ACE_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0 -a -o -t -p -K opname -L C++ -Z TAO_CORBA_NativeDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_NativeDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -7795,14 +8532,14 @@ TAO_CORBA_NativeDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int
 {
   enum
     {
-      TOTAL_KEYWORDS = 18,
+      TOTAL_KEYWORDS = 19,
       MIN_WORD_LENGTH = 4,
       MAX_WORD_LENGTH = 26,
       MIN_HASH_VALUE = 4,
       MAX_HASH_VALUE = 36,
       HASH_VALUE_RANGE = 33,
       DUPLICATES = 5,
-      WORDLIST_SIZE = 22
+      WORDLIST_SIZE = 23
     };
 
   static const TAO_operation_db_entry  wordlist[] =
@@ -7820,6 +8557,7 @@ TAO_CORBA_NativeDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int
       {"_get_version", &POA_CORBA::NativeDef::_get_version_skel, 0},
       {"_set_version", &POA_CORBA::NativeDef::_set_version_skel, 0},
       {"_get_def_kind", &POA_CORBA::NativeDef::_get_def_kind_skel, 0},
+      {"_repository_id", &POA_CORBA::NativeDef::_repository_id_skel, 0},
       {"_get_defined_in", &POA_CORBA::NativeDef::_get_defined_in_skel, 0},
       {"destroy", &POA_CORBA::NativeDef::destroy_skel, 0},
       {"_get_absolute_name", &POA_CORBA::NativeDef::_get_absolute_name_skel, 0},
@@ -7831,8 +8569,8 @@ TAO_CORBA_NativeDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int
   static const signed char lookup[] =
     {
        -9,  -3, -13,  -2,   4,   5,  -1,  50,   8, -45,  12,  -1, -46,  15, 
-       -1,  16,  -1,  17,  18,  -1,  19,  -6,  -2,  20,  -1,  -1,  -1,  -1, 
-       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  21, 
+       16,  17,  -1,  18,  19,  -1,  20,  -6,  -2,  21,  -1,  -1,  -1,  -1, 
+       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  22, 
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -7870,7 +8608,7 @@ TAO_CORBA_NativeDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int
 static TAO_CORBA_NativeDef_Perfect_Hash_OpTable tao_CORBA_NativeDef_optable;
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:999
+// be\be_visitor_interface/interface_ss.cpp:921
 
 TAO::Collocation_Proxy_Broker *
 CORBA__TAO_NativeDef_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -7890,10 +8628,7 @@ CORBA__TAO_NativeDef_Proxy_Broker_Factory_Initializer (size_t)
 static int
 CORBA__TAO_NativeDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
   CORBA__TAO_NativeDef_Proxy_Broker_Factory_Initializer (
-      reinterpret_cast<
-          size_t> (
-          CORBA__TAO_NativeDef_Proxy_Broker_Factory_Initializer
-        )
+      reinterpret_cast<size_t> (CORBA__TAO_NativeDef_Proxy_Broker_Factory_Initializer)
     );
 
 
@@ -7952,8 +8687,8 @@ namespace POA_CORBA
           this->operation_details_,
           this->args_);
       
-      TAO::SArg_Traits< CORBA::Char *>::in_arg_type arg_1 =
-        TAO::Portable_Server::get_in_arg< CORBA::Char *, TAO::SArg_Traits< CORBA::Char *>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
@@ -7988,7 +8723,7 @@ void POA_CORBA::NativeDef::_is_a_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  TAO::SArg_Traits< CORBA::Char *>::in_arg_val _tao_repository_id;
+  TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
   
   TAO::Argument * const args[] =
     {
@@ -8109,10 +8844,98 @@ void POA_CORBA::NativeDef::_non_existent_skel (
   
 }
 
+namespace POA_CORBA
+{
+  
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_operation/upcall_command_ss.cpp:127
+  
+  class _repository_id_NativeDef_Upcall_Command
+    : public TAO::Upcall_Command
+  {
+  public:
+    inline _repository_id_NativeDef_Upcall_Command (
+      POA_CORBA::NativeDef * servant,
+      TAO_Operation_Details const * operation_details,
+      TAO::Argument * const args[])
+      : servant_ (servant)
+      , operation_details_ (operation_details)
+      , args_ (args)
+    {
+    }
+    
+    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+    {
+      TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
+        TAO::Portable_Server::get_ret_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type> (
+          this->operation_details_,
+          this->args_);
+      
+      
+      retval =
+        this->servant_-> _repository_id (
+          ACE_ENV_SINGLE_ARG_PARAMETER);
+        
+    }
+  
+  private:
+    POA_CORBA::NativeDef * const servant_;
+    TAO_Operation_Details const * const operation_details_;
+    TAO::Argument * const * const args_;
+  };
+  
+}
+void POA_CORBA::NativeDef::_repository_id_skel (
+    TAO_ServerRequest & server_request, 
+    void * TAO_INTERCEPTOR (servant_upcall),
+    void * servant
+    ACE_ENV_ARG_DECL
+  )
+{
+  
+  
+#if TAO_HAS_INTERCEPTORS == 1
+  static CORBA::TypeCode_ptr const * const exceptions = 0;
+  static size_t const nexceptions = 0;
+#endif /* TAO_HAS_INTERCEPTORS */
+  
+  TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
+  
+  TAO::Argument * const args[] =
+    {
+      &retval
+    };
+  
+  static size_t const nargs = 1;
+  
+  POA_CORBA::NativeDef * const impl =
+    static_cast<POA_CORBA::NativeDef *> (servant);
+  
+  _repository_id_NativeDef_Upcall_Command command (
+    impl,
+    server_request.operation_details (),
+    args);
+  
+  TAO::Upcall_Wrapper upcall_wrapper;
+  upcall_wrapper.upcall (server_request
+                         , args
+                         , nargs
+                         , command
+#if TAO_HAS_INTERCEPTORS == 1
+                         , servant_upcall
+                         , exceptions
+                         , nexceptions
+#endif  /* TAO_HAS_INTERCEPTORS == 1 */
+                         ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+  
+}
+
 
 
 // TAO_IDL - Generated from 
-// be\be_visitor_interface/interface_ss.cpp:393
+// be\be_visitor_interface/interface_ss.cpp:501
 
 
 
@@ -8285,7 +9108,7 @@ const char* POA_CORBA::NativeDef::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:940
+// be\be_visitor_interface/interface_ss.cpp:862
 
 void POA_CORBA::NativeDef::_dispatch (
     TAO_ServerRequest & req,
@@ -8300,7 +9123,7 @@ void POA_CORBA::NativeDef::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:891
+// be\be_visitor_interface/interface_ss.cpp:813
 
 CORBA::NativeDef *
 POA_CORBA::NativeDef::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -8332,7 +9155,7 @@ POA_CORBA::NativeDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1455
+// be\be_interface.cpp:1465
 
 class TAO_CORBA_PrimitiveDef_Perfect_Hash_OpTable
   : public TAO_Perfect_Hash_OpTable
@@ -8345,53 +9168,53 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: c:\ace\latest\ACE_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0 -a -o -t -p -K opname -L C++ -Z TAO_CORBA_PrimitiveDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ACE\Any\ACE_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0 -a -o -t -p -K opname -L C++ -Z TAO_CORBA_PrimitiveDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_PrimitiveDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
   static const unsigned char asso_values[] =
     {
 #if defined (ACE_MVS)
-     19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-     19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-     19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-     19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-     19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-     19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-     19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-     19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-     19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-     19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-     19, 19, 19, 19, 19, 19, 19, 19, 19,  0,
-     19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-     19, 19, 19, 19, 19, 19, 19, 19, 19,  0,
-     19, 19,  0,  2, 19, 19, 19, 19, 19, 19,
-     19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-     19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-     19, 19, 19,  5, 19, 19, 19, 19,  0, 19,
-     19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-     19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-     19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-     19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-     19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-     19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-     19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-     19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-     19, 19, 19, 19, 19, 19,
+     21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+     21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+     21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+     21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+     21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+     21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+     21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+     21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+     21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+     21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+     21, 21, 21, 21, 21, 21, 21, 21, 21,  0,
+     21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+     21, 21, 21, 21, 21, 21, 21, 21, 21,  0,
+     21, 21,  0, 10, 21, 21, 21, 21, 21, 21,
+     21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+     21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+     21, 21, 21,  5, 21, 21, 21, 21,  0, 21,
+     21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+     21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+     21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+     21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+     21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+     21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+     21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+     21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+     21, 21, 21, 21, 21, 21,
 #else
-     19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-     19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-     19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-     19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-     19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-     19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-     19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-     19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-     19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-     19, 19, 19, 19, 19,  0, 19,  0, 19, 19,
-      0,  2, 19, 19, 19, 19, 19, 19, 19, 19,
-     19, 19, 19, 19, 19, 19,  5, 19, 19, 19,
-     19,  0, 19, 19, 19, 19, 19, 19,
+     21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+     21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+     21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+     21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+     21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+     21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+     21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+     21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+     21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+     21, 21, 21, 21, 21,  0, 21,  0, 21, 21,
+      0, 10, 21, 21, 21, 21, 21, 21, 21, 21,
+     21, 21, 21, 21, 21, 21,  5, 21, 21, 21,
+     21,  0, 21, 21, 21, 21, 21, 21,
 #endif /* ACE_MVS */
     };
   return len + asso_values[(int) str[len - 1]] + asso_values[(int) str[0]];
@@ -8402,14 +9225,14 @@ TAO_CORBA_PrimitiveDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned i
 {
   enum
     {
-      TOTAL_KEYWORDS = 8,
+      TOTAL_KEYWORDS = 9,
       MIN_WORD_LENGTH = 5,
-      MAX_WORD_LENGTH = 13,
+      MAX_WORD_LENGTH = 14,
       MIN_HASH_VALUE = 5,
-      MAX_HASH_VALUE = 18,
-      HASH_VALUE_RANGE = 14,
+      MAX_HASH_VALUE = 20,
+      HASH_VALUE_RANGE = 16,
       DUPLICATES = 0,
-      WORDLIST_SIZE = 13
+      WORDLIST_SIZE = 14
     };
 
   static const TAO_operation_db_entry  wordlist[] =
@@ -8420,14 +9243,14 @@ TAO_CORBA_PrimitiveDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned i
       {"destroy", &POA_CORBA::PrimitiveDef::destroy_skel, 0},
       {"",0,0},
       {"_get_kind", &POA_CORBA::PrimitiveDef::_get_kind_skel, 0},
-      {"",0,0},
-      {"_get_type", &POA_CORBA::PrimitiveDef::_get_type_skel, 0},
-      {"_interface", &POA_CORBA::PrimitiveDef::_interface_skel, 0},
+      {"",0,0},{"",0,0},{"",0,0},
       {"_get_def_kind", &POA_CORBA::PrimitiveDef::_get_def_kind_skel, 0},
-      {"",0,0},
+      {"_repository_id", &POA_CORBA::PrimitiveDef::_repository_id_skel, 0},
       {"_component", &POA_CORBA::PrimitiveDef::_component_skel, 0},
       {"",0,0},{"",0,0},
       {"_non_existent", &POA_CORBA::PrimitiveDef::_non_existent_skel, 0},
+      {"_get_type", &POA_CORBA::PrimitiveDef::_get_type_skel, 0},
+      {"_interface", &POA_CORBA::PrimitiveDef::_interface_skel, 0},
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -8448,7 +9271,7 @@ TAO_CORBA_PrimitiveDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned i
 static TAO_CORBA_PrimitiveDef_Perfect_Hash_OpTable tao_CORBA_PrimitiveDef_optable;
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:999
+// be\be_visitor_interface/interface_ss.cpp:921
 
 TAO::Collocation_Proxy_Broker *
 CORBA__TAO_PrimitiveDef_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -8468,10 +9291,7 @@ CORBA__TAO_PrimitiveDef_Proxy_Broker_Factory_Initializer (size_t)
 static int
 CORBA__TAO_PrimitiveDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
   CORBA__TAO_PrimitiveDef_Proxy_Broker_Factory_Initializer (
-      reinterpret_cast<
-          size_t> (
-          CORBA__TAO_PrimitiveDef_Proxy_Broker_Factory_Initializer
-        )
+      reinterpret_cast<size_t> (CORBA__TAO_PrimitiveDef_Proxy_Broker_Factory_Initializer)
     );
 
 
@@ -8519,8 +9339,8 @@ namespace POA_CORBA
     
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
-      TAO::SArg_Traits< CORBA::PrimitiveKind>::ret_arg_type retval =
-        TAO::Portable_Server::get_ret_arg< CORBA::PrimitiveKind, TAO::SArg_Traits< CORBA::PrimitiveKind>::ret_arg_type> (
+      TAO::SArg_Traits< ::CORBA::PrimitiveKind>::ret_arg_type retval =
+        TAO::Portable_Server::get_ret_arg< ::CORBA::PrimitiveKind, TAO::SArg_Traits< ::CORBA::PrimitiveKind>::ret_arg_type> (
           this->operation_details_,
           this->args_);
       
@@ -8557,7 +9377,7 @@ void POA_CORBA::PrimitiveDef::_get_kind_skel (
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
   
-  TAO::SArg_Traits< CORBA::PrimitiveKind>::ret_val retval;
+  TAO::SArg_Traits< ::CORBA::PrimitiveKind>::ret_val retval;
   
   TAO::Argument * const args[] =
     {
@@ -8620,8 +9440,8 @@ namespace POA_CORBA
           this->operation_details_,
           this->args_);
       
-      TAO::SArg_Traits< CORBA::Char *>::in_arg_type arg_1 =
-        TAO::Portable_Server::get_in_arg< CORBA::Char *, TAO::SArg_Traits< CORBA::Char *>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
@@ -8656,7 +9476,7 @@ void POA_CORBA::PrimitiveDef::_is_a_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  TAO::SArg_Traits< CORBA::Char *>::in_arg_val _tao_repository_id;
+  TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
   
   TAO::Argument * const args[] =
     {
@@ -8777,10 +9597,98 @@ void POA_CORBA::PrimitiveDef::_non_existent_skel (
   
 }
 
+namespace POA_CORBA
+{
+  
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_operation/upcall_command_ss.cpp:127
+  
+  class _repository_id_PrimitiveDef_Upcall_Command
+    : public TAO::Upcall_Command
+  {
+  public:
+    inline _repository_id_PrimitiveDef_Upcall_Command (
+      POA_CORBA::PrimitiveDef * servant,
+      TAO_Operation_Details const * operation_details,
+      TAO::Argument * const args[])
+      : servant_ (servant)
+      , operation_details_ (operation_details)
+      , args_ (args)
+    {
+    }
+    
+    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+    {
+      TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
+        TAO::Portable_Server::get_ret_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type> (
+          this->operation_details_,
+          this->args_);
+      
+      
+      retval =
+        this->servant_-> _repository_id (
+          ACE_ENV_SINGLE_ARG_PARAMETER);
+        
+    }
+  
+  private:
+    POA_CORBA::PrimitiveDef * const servant_;
+    TAO_Operation_Details const * const operation_details_;
+    TAO::Argument * const * const args_;
+  };
+  
+}
+void POA_CORBA::PrimitiveDef::_repository_id_skel (
+    TAO_ServerRequest & server_request, 
+    void * TAO_INTERCEPTOR (servant_upcall),
+    void * servant
+    ACE_ENV_ARG_DECL
+  )
+{
+  
+  
+#if TAO_HAS_INTERCEPTORS == 1
+  static CORBA::TypeCode_ptr const * const exceptions = 0;
+  static size_t const nexceptions = 0;
+#endif /* TAO_HAS_INTERCEPTORS */
+  
+  TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
+  
+  TAO::Argument * const args[] =
+    {
+      &retval
+    };
+  
+  static size_t const nargs = 1;
+  
+  POA_CORBA::PrimitiveDef * const impl =
+    static_cast<POA_CORBA::PrimitiveDef *> (servant);
+  
+  _repository_id_PrimitiveDef_Upcall_Command command (
+    impl,
+    server_request.operation_details (),
+    args);
+  
+  TAO::Upcall_Wrapper upcall_wrapper;
+  upcall_wrapper.upcall (server_request
+                         , args
+                         , nargs
+                         , command
+#if TAO_HAS_INTERCEPTORS == 1
+                         , servant_upcall
+                         , exceptions
+                         , nexceptions
+#endif  /* TAO_HAS_INTERCEPTORS == 1 */
+                         ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+  
+}
+
 
 
 // TAO_IDL - Generated from 
-// be\be_visitor_interface/interface_ss.cpp:393
+// be\be_visitor_interface/interface_ss.cpp:501
 
 
 
@@ -8945,7 +9853,7 @@ const char* POA_CORBA::PrimitiveDef::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:940
+// be\be_visitor_interface/interface_ss.cpp:862
 
 void POA_CORBA::PrimitiveDef::_dispatch (
     TAO_ServerRequest & req,
@@ -8960,7 +9868,7 @@ void POA_CORBA::PrimitiveDef::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:891
+// be\be_visitor_interface/interface_ss.cpp:813
 
 CORBA::PrimitiveDef *
 POA_CORBA::PrimitiveDef::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -8992,7 +9900,7 @@ POA_CORBA::PrimitiveDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1455
+// be\be_interface.cpp:1465
 
 class TAO_CORBA_StringDef_Perfect_Hash_OpTable
   : public TAO_Perfect_Hash_OpTable
@@ -9005,53 +9913,53 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: c:\ace\latest\ACE_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0 -a -o -t -p -K opname -L C++ -Z TAO_CORBA_StringDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ACE\Any\ACE_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0 -a -o -t -p -K opname -L C++ -Z TAO_CORBA_StringDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_StringDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
   static const unsigned char asso_values[] =
     {
 #if defined (ACE_MVS)
-     19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-     19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-     19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-     19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-     19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-     19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-     19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-     19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-     19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-     19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-     19, 19, 19, 19, 19, 19, 19, 19, 19,  0,
-     19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-     19, 19, 19, 19, 19, 19, 19, 19, 19,  0,
-     19, 19,  0,  2, 19, 19, 19, 19, 19, 19,
-     19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-     19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-     19, 19, 19,  5, 19, 19, 19, 19,  0, 19,
-     19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-     19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-     19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-     19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-     19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-     19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-     19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-     19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-     19, 19, 19, 19, 19, 19,
+     21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+     21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+     21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+     21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+     21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+     21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+     21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+     21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+     21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+     21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+     21, 21, 21, 21, 21, 21, 21, 21, 21,  0,
+     21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+     21, 21, 21, 21, 21, 21, 21, 21, 21,  0,
+     21, 21,  0, 10, 21, 21, 21, 21, 21, 21,
+     21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+     21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+     21, 21, 21,  5, 21, 21, 21, 21,  0, 21,
+     21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+     21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+     21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+     21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+     21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+     21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+     21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+     21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+     21, 21, 21, 21, 21, 21,
 #else
-     19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-     19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-     19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-     19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-     19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-     19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-     19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-     19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-     19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-     19, 19, 19, 19, 19,  0, 19,  0, 19, 19,
-      0,  2, 19, 19, 19, 19, 19, 19, 19, 19,
-     19, 19, 19, 19, 19, 19,  5, 19, 19, 19,
-     19,  0, 19, 19, 19, 19, 19, 19,
+     21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+     21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+     21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+     21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+     21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+     21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+     21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+     21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+     21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+     21, 21, 21, 21, 21,  0, 21,  0, 21, 21,
+      0, 10, 21, 21, 21, 21, 21, 21, 21, 21,
+     21, 21, 21, 21, 21, 21,  5, 21, 21, 21,
+     21,  0, 21, 21, 21, 21, 21, 21,
 #endif /* ACE_MVS */
     };
   return len + asso_values[(int) str[len - 1]] + asso_values[(int) str[0]];
@@ -9062,14 +9970,14 @@ TAO_CORBA_StringDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int
 {
   enum
     {
-      TOTAL_KEYWORDS = 9,
+      TOTAL_KEYWORDS = 10,
       MIN_WORD_LENGTH = 5,
-      MAX_WORD_LENGTH = 13,
+      MAX_WORD_LENGTH = 14,
       MIN_HASH_VALUE = 5,
-      MAX_HASH_VALUE = 18,
-      HASH_VALUE_RANGE = 14,
+      MAX_HASH_VALUE = 20,
+      HASH_VALUE_RANGE = 16,
       DUPLICATES = 2,
-      WORDLIST_SIZE = 14
+      WORDLIST_SIZE = 15
     };
 
   static const TAO_operation_db_entry  wordlist[] =
@@ -9079,17 +9987,18 @@ TAO_CORBA_StringDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int
       {"destroy", &POA_CORBA::StringDef::destroy_skel, 0},
       {"_get_bound", &POA_CORBA::StringDef::_get_bound_skel, 0},
       {"_set_bound", &POA_CORBA::StringDef::_set_bound_skel, 0},
-      {"_get_type", &POA_CORBA::StringDef::_get_type_skel, 0},
-      {"_interface", &POA_CORBA::StringDef::_interface_skel, 0},
       {"_get_def_kind", &POA_CORBA::StringDef::_get_def_kind_skel, 0},
+      {"_repository_id", &POA_CORBA::StringDef::_repository_id_skel, 0},
       {"_component", &POA_CORBA::StringDef::_component_skel, 0},
       {"_non_existent", &POA_CORBA::StringDef::_non_existent_skel, 0},
+      {"_get_type", &POA_CORBA::StringDef::_get_type_skel, 0},
+      {"_interface", &POA_CORBA::StringDef::_interface_skel, 0},
     };
 
   static const signed char lookup[] =
     {
-       -1,  -1,  -1,  -1,  -1,   5,  -1,   6,  -7,  -2, -20,   9,  10,  11, 
-       -1,  12,  -1,  -1,  13, 
+       -1,  -1,  -1,  -1,  -1,   5,  -1,   6,  -7,  -2, -22,  -1,  -1,   9, 
+       10,  11,  -1,  -1,  12,  13,  14, 
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -9127,7 +10036,7 @@ TAO_CORBA_StringDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int
 static TAO_CORBA_StringDef_Perfect_Hash_OpTable tao_CORBA_StringDef_optable;
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:999
+// be\be_visitor_interface/interface_ss.cpp:921
 
 TAO::Collocation_Proxy_Broker *
 CORBA__TAO_StringDef_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -9147,10 +10056,7 @@ CORBA__TAO_StringDef_Proxy_Broker_Factory_Initializer (size_t)
 static int
 CORBA__TAO_StringDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
   CORBA__TAO_StringDef_Proxy_Broker_Factory_Initializer (
-      reinterpret_cast<
-          size_t> (
-          CORBA__TAO_StringDef_Proxy_Broker_Factory_Initializer
-        )
+      reinterpret_cast<size_t> (CORBA__TAO_StringDef_Proxy_Broker_Factory_Initializer)
     );
 
 
@@ -9393,8 +10299,8 @@ namespace POA_CORBA
           this->operation_details_,
           this->args_);
       
-      TAO::SArg_Traits< CORBA::Char *>::in_arg_type arg_1 =
-        TAO::Portable_Server::get_in_arg< CORBA::Char *, TAO::SArg_Traits< CORBA::Char *>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
@@ -9429,7 +10335,7 @@ void POA_CORBA::StringDef::_is_a_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  TAO::SArg_Traits< CORBA::Char *>::in_arg_val _tao_repository_id;
+  TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
   
   TAO::Argument * const args[] =
     {
@@ -9550,10 +10456,98 @@ void POA_CORBA::StringDef::_non_existent_skel (
   
 }
 
+namespace POA_CORBA
+{
+  
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_operation/upcall_command_ss.cpp:127
+  
+  class _repository_id_StringDef_Upcall_Command
+    : public TAO::Upcall_Command
+  {
+  public:
+    inline _repository_id_StringDef_Upcall_Command (
+      POA_CORBA::StringDef * servant,
+      TAO_Operation_Details const * operation_details,
+      TAO::Argument * const args[])
+      : servant_ (servant)
+      , operation_details_ (operation_details)
+      , args_ (args)
+    {
+    }
+    
+    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+    {
+      TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
+        TAO::Portable_Server::get_ret_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type> (
+          this->operation_details_,
+          this->args_);
+      
+      
+      retval =
+        this->servant_-> _repository_id (
+          ACE_ENV_SINGLE_ARG_PARAMETER);
+        
+    }
+  
+  private:
+    POA_CORBA::StringDef * const servant_;
+    TAO_Operation_Details const * const operation_details_;
+    TAO::Argument * const * const args_;
+  };
+  
+}
+void POA_CORBA::StringDef::_repository_id_skel (
+    TAO_ServerRequest & server_request, 
+    void * TAO_INTERCEPTOR (servant_upcall),
+    void * servant
+    ACE_ENV_ARG_DECL
+  )
+{
+  
+  
+#if TAO_HAS_INTERCEPTORS == 1
+  static CORBA::TypeCode_ptr const * const exceptions = 0;
+  static size_t const nexceptions = 0;
+#endif /* TAO_HAS_INTERCEPTORS */
+  
+  TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
+  
+  TAO::Argument * const args[] =
+    {
+      &retval
+    };
+  
+  static size_t const nargs = 1;
+  
+  POA_CORBA::StringDef * const impl =
+    static_cast<POA_CORBA::StringDef *> (servant);
+  
+  _repository_id_StringDef_Upcall_Command command (
+    impl,
+    server_request.operation_details (),
+    args);
+  
+  TAO::Upcall_Wrapper upcall_wrapper;
+  upcall_wrapper.upcall (server_request
+                         , args
+                         , nargs
+                         , command
+#if TAO_HAS_INTERCEPTORS == 1
+                         , servant_upcall
+                         , exceptions
+                         , nexceptions
+#endif  /* TAO_HAS_INTERCEPTORS == 1 */
+                         ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+  
+}
+
 
 
 // TAO_IDL - Generated from 
-// be\be_visitor_interface/interface_ss.cpp:393
+// be\be_visitor_interface/interface_ss.cpp:501
 
 
 
@@ -9718,7 +10712,7 @@ const char* POA_CORBA::StringDef::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:940
+// be\be_visitor_interface/interface_ss.cpp:862
 
 void POA_CORBA::StringDef::_dispatch (
     TAO_ServerRequest & req,
@@ -9733,7 +10727,7 @@ void POA_CORBA::StringDef::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:891
+// be\be_visitor_interface/interface_ss.cpp:813
 
 CORBA::StringDef *
 POA_CORBA::StringDef::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -9765,7 +10759,7 @@ POA_CORBA::StringDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1455
+// be\be_interface.cpp:1465
 
 class TAO_CORBA_WstringDef_Perfect_Hash_OpTable
   : public TAO_Perfect_Hash_OpTable
@@ -9778,53 +10772,53 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: c:\ace\latest\ACE_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0 -a -o -t -p -K opname -L C++ -Z TAO_CORBA_WstringDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ACE\Any\ACE_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0 -a -o -t -p -K opname -L C++ -Z TAO_CORBA_WstringDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_WstringDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
   static const unsigned char asso_values[] =
     {
 #if defined (ACE_MVS)
-     19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-     19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-     19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-     19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-     19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-     19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-     19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-     19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-     19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-     19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-     19, 19, 19, 19, 19, 19, 19, 19, 19,  0,
-     19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-     19, 19, 19, 19, 19, 19, 19, 19, 19,  0,
-     19, 19,  0,  2, 19, 19, 19, 19, 19, 19,
-     19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-     19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-     19, 19, 19,  5, 19, 19, 19, 19,  0, 19,
-     19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-     19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-     19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-     19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-     19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-     19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-     19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-     19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-     19, 19, 19, 19, 19, 19,
+     21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+     21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+     21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+     21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+     21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+     21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+     21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+     21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+     21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+     21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+     21, 21, 21, 21, 21, 21, 21, 21, 21,  0,
+     21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+     21, 21, 21, 21, 21, 21, 21, 21, 21,  0,
+     21, 21,  0, 10, 21, 21, 21, 21, 21, 21,
+     21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+     21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+     21, 21, 21,  5, 21, 21, 21, 21,  0, 21,
+     21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+     21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+     21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+     21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+     21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+     21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+     21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+     21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+     21, 21, 21, 21, 21, 21,
 #else
-     19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-     19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-     19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-     19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-     19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-     19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-     19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-     19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-     19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
-     19, 19, 19, 19, 19,  0, 19,  0, 19, 19,
-      0,  2, 19, 19, 19, 19, 19, 19, 19, 19,
-     19, 19, 19, 19, 19, 19,  5, 19, 19, 19,
-     19,  0, 19, 19, 19, 19, 19, 19,
+     21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+     21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+     21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+     21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+     21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+     21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+     21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+     21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+     21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+     21, 21, 21, 21, 21,  0, 21,  0, 21, 21,
+      0, 10, 21, 21, 21, 21, 21, 21, 21, 21,
+     21, 21, 21, 21, 21, 21,  5, 21, 21, 21,
+     21,  0, 21, 21, 21, 21, 21, 21,
 #endif /* ACE_MVS */
     };
   return len + asso_values[(int) str[len - 1]] + asso_values[(int) str[0]];
@@ -9835,14 +10829,14 @@ TAO_CORBA_WstringDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int
 {
   enum
     {
-      TOTAL_KEYWORDS = 9,
+      TOTAL_KEYWORDS = 10,
       MIN_WORD_LENGTH = 5,
-      MAX_WORD_LENGTH = 13,
+      MAX_WORD_LENGTH = 14,
       MIN_HASH_VALUE = 5,
-      MAX_HASH_VALUE = 18,
-      HASH_VALUE_RANGE = 14,
+      MAX_HASH_VALUE = 20,
+      HASH_VALUE_RANGE = 16,
       DUPLICATES = 2,
-      WORDLIST_SIZE = 14
+      WORDLIST_SIZE = 15
     };
 
   static const TAO_operation_db_entry  wordlist[] =
@@ -9852,17 +10846,18 @@ TAO_CORBA_WstringDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int
       {"destroy", &POA_CORBA::WstringDef::destroy_skel, 0},
       {"_get_bound", &POA_CORBA::WstringDef::_get_bound_skel, 0},
       {"_set_bound", &POA_CORBA::WstringDef::_set_bound_skel, 0},
-      {"_get_type", &POA_CORBA::WstringDef::_get_type_skel, 0},
-      {"_interface", &POA_CORBA::WstringDef::_interface_skel, 0},
       {"_get_def_kind", &POA_CORBA::WstringDef::_get_def_kind_skel, 0},
+      {"_repository_id", &POA_CORBA::WstringDef::_repository_id_skel, 0},
       {"_component", &POA_CORBA::WstringDef::_component_skel, 0},
       {"_non_existent", &POA_CORBA::WstringDef::_non_existent_skel, 0},
+      {"_get_type", &POA_CORBA::WstringDef::_get_type_skel, 0},
+      {"_interface", &POA_CORBA::WstringDef::_interface_skel, 0},
     };
 
   static const signed char lookup[] =
     {
-       -1,  -1,  -1,  -1,  -1,   5,  -1,   6,  -7,  -2, -20,   9,  10,  11, 
-       -1,  12,  -1,  -1,  13, 
+       -1,  -1,  -1,  -1,  -1,   5,  -1,   6,  -7,  -2, -22,  -1,  -1,   9, 
+       10,  11,  -1,  -1,  12,  13,  14, 
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -9900,7 +10895,7 @@ TAO_CORBA_WstringDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int
 static TAO_CORBA_WstringDef_Perfect_Hash_OpTable tao_CORBA_WstringDef_optable;
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:999
+// be\be_visitor_interface/interface_ss.cpp:921
 
 TAO::Collocation_Proxy_Broker *
 CORBA__TAO_WstringDef_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -9920,10 +10915,7 @@ CORBA__TAO_WstringDef_Proxy_Broker_Factory_Initializer (size_t)
 static int
 CORBA__TAO_WstringDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
   CORBA__TAO_WstringDef_Proxy_Broker_Factory_Initializer (
-      reinterpret_cast<
-          size_t> (
-          CORBA__TAO_WstringDef_Proxy_Broker_Factory_Initializer
-        )
+      reinterpret_cast<size_t> (CORBA__TAO_WstringDef_Proxy_Broker_Factory_Initializer)
     );
 
 
@@ -10166,8 +11158,8 @@ namespace POA_CORBA
           this->operation_details_,
           this->args_);
       
-      TAO::SArg_Traits< CORBA::Char *>::in_arg_type arg_1 =
-        TAO::Portable_Server::get_in_arg< CORBA::Char *, TAO::SArg_Traits< CORBA::Char *>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
@@ -10202,7 +11194,7 @@ void POA_CORBA::WstringDef::_is_a_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  TAO::SArg_Traits< CORBA::Char *>::in_arg_val _tao_repository_id;
+  TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
   
   TAO::Argument * const args[] =
     {
@@ -10323,10 +11315,98 @@ void POA_CORBA::WstringDef::_non_existent_skel (
   
 }
 
+namespace POA_CORBA
+{
+  
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_operation/upcall_command_ss.cpp:127
+  
+  class _repository_id_WstringDef_Upcall_Command
+    : public TAO::Upcall_Command
+  {
+  public:
+    inline _repository_id_WstringDef_Upcall_Command (
+      POA_CORBA::WstringDef * servant,
+      TAO_Operation_Details const * operation_details,
+      TAO::Argument * const args[])
+      : servant_ (servant)
+      , operation_details_ (operation_details)
+      , args_ (args)
+    {
+    }
+    
+    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+    {
+      TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
+        TAO::Portable_Server::get_ret_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type> (
+          this->operation_details_,
+          this->args_);
+      
+      
+      retval =
+        this->servant_-> _repository_id (
+          ACE_ENV_SINGLE_ARG_PARAMETER);
+        
+    }
+  
+  private:
+    POA_CORBA::WstringDef * const servant_;
+    TAO_Operation_Details const * const operation_details_;
+    TAO::Argument * const * const args_;
+  };
+  
+}
+void POA_CORBA::WstringDef::_repository_id_skel (
+    TAO_ServerRequest & server_request, 
+    void * TAO_INTERCEPTOR (servant_upcall),
+    void * servant
+    ACE_ENV_ARG_DECL
+  )
+{
+  
+  
+#if TAO_HAS_INTERCEPTORS == 1
+  static CORBA::TypeCode_ptr const * const exceptions = 0;
+  static size_t const nexceptions = 0;
+#endif /* TAO_HAS_INTERCEPTORS */
+  
+  TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
+  
+  TAO::Argument * const args[] =
+    {
+      &retval
+    };
+  
+  static size_t const nargs = 1;
+  
+  POA_CORBA::WstringDef * const impl =
+    static_cast<POA_CORBA::WstringDef *> (servant);
+  
+  _repository_id_WstringDef_Upcall_Command command (
+    impl,
+    server_request.operation_details (),
+    args);
+  
+  TAO::Upcall_Wrapper upcall_wrapper;
+  upcall_wrapper.upcall (server_request
+                         , args
+                         , nargs
+                         , command
+#if TAO_HAS_INTERCEPTORS == 1
+                         , servant_upcall
+                         , exceptions
+                         , nexceptions
+#endif  /* TAO_HAS_INTERCEPTORS == 1 */
+                         ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+  
+}
+
 
 
 // TAO_IDL - Generated from 
-// be\be_visitor_interface/interface_ss.cpp:393
+// be\be_visitor_interface/interface_ss.cpp:501
 
 
 
@@ -10491,7 +11571,7 @@ const char* POA_CORBA::WstringDef::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:940
+// be\be_visitor_interface/interface_ss.cpp:862
 
 void POA_CORBA::WstringDef::_dispatch (
     TAO_ServerRequest & req,
@@ -10506,7 +11586,7 @@ void POA_CORBA::WstringDef::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:891
+// be\be_visitor_interface/interface_ss.cpp:813
 
 CORBA::WstringDef *
 POA_CORBA::WstringDef::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -10538,7 +11618,7 @@ POA_CORBA::WstringDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1455
+// be\be_interface.cpp:1465
 
 class TAO_CORBA_SequenceDef_Perfect_Hash_OpTable
   : public TAO_Perfect_Hash_OpTable
@@ -10551,53 +11631,53 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: c:\ace\latest\ACE_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0 -a -o -t -p -K opname -L C++ -Z TAO_CORBA_SequenceDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ACE\Any\ACE_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0 -a -o -t -p -K opname -L C++ -Z TAO_CORBA_SequenceDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_SequenceDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
   static const unsigned char asso_values[] =
     {
 #if defined (ACE_MVS)
-     24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-     24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-     24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-     24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-     24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-     24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-     24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-     24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-     24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-     24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-     24, 24, 24, 24, 24, 24, 24, 24, 24,  0,
-     24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-     24, 24, 24, 24, 24, 24, 24, 24, 24,  0,
-     24, 24,  0,  5,  0, 24, 24, 24, 24, 24,
-     24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-     24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-     24, 24, 24, 10, 24, 24, 24, 24,  0, 24,
-     24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-     24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-     24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-     24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-     24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-     24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-     24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-     24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-     24, 24, 24, 24, 24, 24,
+     28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
+     28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
+     28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
+     28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
+     28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
+     28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
+     28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
+     28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
+     28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
+     28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
+     28, 28, 28, 28, 28, 28, 28, 28, 28,  0,
+     28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
+     28, 28, 28, 28, 28, 28, 28, 28, 28,  0,
+     28, 28,  0, 10,  0, 28, 28, 28, 28, 28,
+     28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
+     28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
+     28, 28, 28,  5, 28, 28, 28, 28,  0, 28,
+     28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
+     28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
+     28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
+     28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
+     28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
+     28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
+     28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
+     28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
+     28, 28, 28, 28, 28, 28,
 #else
-     24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-     24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-     24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-     24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-     24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-     24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-     24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-     24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-     24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-     24, 24, 24, 24, 24,  0, 24,  0, 24, 24,
-      0,  5,  0, 24, 24, 24, 24, 24, 24, 24,
-     24, 24, 24, 24, 24, 24, 10, 24, 24, 24,
-     24,  0, 24, 24, 24, 24, 24, 24,
+     28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
+     28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
+     28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
+     28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
+     28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
+     28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
+     28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
+     28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
+     28, 28, 28, 28, 28, 28, 28, 28, 28, 28,
+     28, 28, 28, 28, 28,  0, 28,  0, 28, 28,
+      0, 10,  0, 28, 28, 28, 28, 28, 28, 28,
+     28, 28, 28, 28, 28, 28,  5, 28, 28, 28,
+     28,  0, 28, 28, 28, 28, 28, 28,
 #endif /* ACE_MVS */
     };
   return len + asso_values[(int) str[len - 1]] + asso_values[(int) str[0]];
@@ -10608,14 +11688,14 @@ TAO_CORBA_SequenceDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned in
 {
   enum
     {
-      TOTAL_KEYWORDS = 12,
+      TOTAL_KEYWORDS = 13,
       MIN_WORD_LENGTH = 5,
       MAX_WORD_LENGTH = 21,
       MIN_HASH_VALUE = 5,
-      MAX_HASH_VALUE = 23,
-      HASH_VALUE_RANGE = 19,
+      MAX_HASH_VALUE = 27,
+      HASH_VALUE_RANGE = 23,
       DUPLICATES = 3,
-      WORDLIST_SIZE = 17
+      WORDLIST_SIZE = 18
     };
 
   static const TAO_operation_db_entry  wordlist[] =
@@ -10626,19 +11706,21 @@ TAO_CORBA_SequenceDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned in
       {"_get_bound", &POA_CORBA::SequenceDef::_get_bound_skel, 0},
       {"_set_bound", &POA_CORBA::SequenceDef::_set_bound_skel, 0},
       {"_get_def_kind", &POA_CORBA::SequenceDef::_get_def_kind_skel, 0},
+      {"_repository_id", &POA_CORBA::SequenceDef::_repository_id_skel, 0},
+      {"_component", &POA_CORBA::SequenceDef::_component_skel, 0},
+      {"_non_existent", &POA_CORBA::SequenceDef::_non_existent_skel, 0},
       {"_get_type", &POA_CORBA::SequenceDef::_get_type_skel, 0},
       {"_interface", &POA_CORBA::SequenceDef::_interface_skel, 0},
-      {"_component", &POA_CORBA::SequenceDef::_component_skel, 0},
       {"_get_element_type_def", &POA_CORBA::SequenceDef::_get_element_type_def_skel, 0},
       {"_set_element_type_def", &POA_CORBA::SequenceDef::_set_element_type_def_skel, 0},
       {"_get_element_type", &POA_CORBA::SequenceDef::_get_element_type_skel, 0},
-      {"_non_existent", &POA_CORBA::SequenceDef::_non_existent_skel, 0},
     };
 
   static const signed char lookup[] =
     {
-       -1,  -1,  -1,  -1,  -1,   5,  -1,   6,  -7,  -2, -25,  -1,  -1,   9, 
-       10,  11,  -1,  -1, -13,  -2,  12, -26,  15,  16, 
+       -1,  -1,  -1,  -1,  -1,   5,  -1,   6,  -7,  -2, -29,  -1,  -1,   9, 
+       10,  11, -15,  -2,  12,  13,  14, -32,  -1,  -1,  -1,  -1,  -1,  17, 
+      
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -10676,7 +11758,7 @@ TAO_CORBA_SequenceDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned in
 static TAO_CORBA_SequenceDef_Perfect_Hash_OpTable tao_CORBA_SequenceDef_optable;
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:999
+// be\be_visitor_interface/interface_ss.cpp:921
 
 TAO::Collocation_Proxy_Broker *
 CORBA__TAO_SequenceDef_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -10696,10 +11778,7 @@ CORBA__TAO_SequenceDef_Proxy_Broker_Factory_Initializer (size_t)
 static int
 CORBA__TAO_SequenceDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
   CORBA__TAO_SequenceDef_Proxy_Broker_Factory_Initializer (
-      reinterpret_cast<
-          size_t> (
-          CORBA__TAO_SequenceDef_Proxy_Broker_Factory_Initializer
-        )
+      reinterpret_cast<size_t> (CORBA__TAO_SequenceDef_Proxy_Broker_Factory_Initializer)
     );
 
 
@@ -11025,8 +12104,8 @@ namespace POA_CORBA
     
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
-      TAO::SArg_Traits< CORBA::IDLType>::ret_arg_type retval =
-        TAO::Portable_Server::get_ret_arg< CORBA::IDLType, TAO::SArg_Traits< CORBA::IDLType>::ret_arg_type> (
+      TAO::SArg_Traits< ::CORBA::IDLType>::ret_arg_type retval =
+        TAO::Portable_Server::get_ret_arg< ::CORBA::IDLType, TAO::SArg_Traits< ::CORBA::IDLType>::ret_arg_type> (
           this->operation_details_,
           this->args_);
       
@@ -11063,7 +12142,7 @@ void POA_CORBA::SequenceDef::_get_element_type_def_skel (
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
   
-  TAO::SArg_Traits< CORBA::IDLType>::ret_val retval;
+  TAO::SArg_Traits< ::CORBA::IDLType>::ret_val retval;
   
   TAO::Argument * const args[] =
     {
@@ -11117,8 +12196,8 @@ namespace POA_CORBA
     
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
-      TAO::SArg_Traits< CORBA::IDLType>::in_arg_type arg_1 =
-        TAO::Portable_Server::get_in_arg< CORBA::IDLType, TAO::SArg_Traits< CORBA::IDLType>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_type arg_1 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::IDLType, TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
@@ -11156,7 +12235,7 @@ void POA_CORBA::SequenceDef::_set_element_type_def_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   TAO::SArg_Traits< void>::ret_val retval;
-  TAO::SArg_Traits< CORBA::IDLType>::in_arg_val _tao_element_type_def;
+  TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_val _tao_element_type_def;
   
   TAO::Argument * const args[] =
     {
@@ -11220,8 +12299,8 @@ namespace POA_CORBA
           this->operation_details_,
           this->args_);
       
-      TAO::SArg_Traits< CORBA::Char *>::in_arg_type arg_1 =
-        TAO::Portable_Server::get_in_arg< CORBA::Char *, TAO::SArg_Traits< CORBA::Char *>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
@@ -11256,7 +12335,7 @@ void POA_CORBA::SequenceDef::_is_a_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  TAO::SArg_Traits< CORBA::Char *>::in_arg_val _tao_repository_id;
+  TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
   
   TAO::Argument * const args[] =
     {
@@ -11377,10 +12456,98 @@ void POA_CORBA::SequenceDef::_non_existent_skel (
   
 }
 
+namespace POA_CORBA
+{
+  
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_operation/upcall_command_ss.cpp:127
+  
+  class _repository_id_SequenceDef_Upcall_Command
+    : public TAO::Upcall_Command
+  {
+  public:
+    inline _repository_id_SequenceDef_Upcall_Command (
+      POA_CORBA::SequenceDef * servant,
+      TAO_Operation_Details const * operation_details,
+      TAO::Argument * const args[])
+      : servant_ (servant)
+      , operation_details_ (operation_details)
+      , args_ (args)
+    {
+    }
+    
+    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+    {
+      TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
+        TAO::Portable_Server::get_ret_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type> (
+          this->operation_details_,
+          this->args_);
+      
+      
+      retval =
+        this->servant_-> _repository_id (
+          ACE_ENV_SINGLE_ARG_PARAMETER);
+        
+    }
+  
+  private:
+    POA_CORBA::SequenceDef * const servant_;
+    TAO_Operation_Details const * const operation_details_;
+    TAO::Argument * const * const args_;
+  };
+  
+}
+void POA_CORBA::SequenceDef::_repository_id_skel (
+    TAO_ServerRequest & server_request, 
+    void * TAO_INTERCEPTOR (servant_upcall),
+    void * servant
+    ACE_ENV_ARG_DECL
+  )
+{
+  
+  
+#if TAO_HAS_INTERCEPTORS == 1
+  static CORBA::TypeCode_ptr const * const exceptions = 0;
+  static size_t const nexceptions = 0;
+#endif /* TAO_HAS_INTERCEPTORS */
+  
+  TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
+  
+  TAO::Argument * const args[] =
+    {
+      &retval
+    };
+  
+  static size_t const nargs = 1;
+  
+  POA_CORBA::SequenceDef * const impl =
+    static_cast<POA_CORBA::SequenceDef *> (servant);
+  
+  _repository_id_SequenceDef_Upcall_Command command (
+    impl,
+    server_request.operation_details (),
+    args);
+  
+  TAO::Upcall_Wrapper upcall_wrapper;
+  upcall_wrapper.upcall (server_request
+                         , args
+                         , nargs
+                         , command
+#if TAO_HAS_INTERCEPTORS == 1
+                         , servant_upcall
+                         , exceptions
+                         , nexceptions
+#endif  /* TAO_HAS_INTERCEPTORS == 1 */
+                         ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+  
+}
+
 
 
 // TAO_IDL - Generated from 
-// be\be_visitor_interface/interface_ss.cpp:393
+// be\be_visitor_interface/interface_ss.cpp:501
 
 
 
@@ -11545,7 +12712,7 @@ const char* POA_CORBA::SequenceDef::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:940
+// be\be_visitor_interface/interface_ss.cpp:862
 
 void POA_CORBA::SequenceDef::_dispatch (
     TAO_ServerRequest & req,
@@ -11560,7 +12727,7 @@ void POA_CORBA::SequenceDef::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:891
+// be\be_visitor_interface/interface_ss.cpp:813
 
 CORBA::SequenceDef *
 POA_CORBA::SequenceDef::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -11592,7 +12759,7 @@ POA_CORBA::SequenceDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1455
+// be\be_interface.cpp:1465
 
 class TAO_CORBA_ArrayDef_Perfect_Hash_OpTable
   : public TAO_Perfect_Hash_OpTable
@@ -11605,7 +12772,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: c:\ace\latest\ACE_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0 -a -o -t -p -K opname -L C++ -Z TAO_CORBA_ArrayDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ACE\Any\ACE_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0 -a -o -t -p -K opname -L C++ -Z TAO_CORBA_ArrayDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_ArrayDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -11662,14 +12829,14 @@ TAO_CORBA_ArrayDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int l
 {
   enum
     {
-      TOTAL_KEYWORDS = 12,
+      TOTAL_KEYWORDS = 13,
       MIN_WORD_LENGTH = 5,
       MAX_WORD_LENGTH = 21,
       MIN_HASH_VALUE = 5,
       MAX_HASH_VALUE = 21,
       HASH_VALUE_RANGE = 17,
       DUPLICATES = 3,
-      WORDLIST_SIZE = 17
+      WORDLIST_SIZE = 18
     };
 
   static const TAO_operation_db_entry  wordlist[] =
@@ -11682,6 +12849,7 @@ TAO_CORBA_ArrayDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int l
       {"_get_length", &POA_CORBA::ArrayDef::_get_length_skel, 0},
       {"_set_length", &POA_CORBA::ArrayDef::_set_length_skel, 0},
       {"_get_def_kind", &POA_CORBA::ArrayDef::_get_def_kind_skel, 0},
+      {"_repository_id", &POA_CORBA::ArrayDef::_repository_id_skel, 0},
       {"_component", &POA_CORBA::ArrayDef::_component_skel, 0},
       {"_get_element_type", &POA_CORBA::ArrayDef::_get_element_type_skel, 0},
       {"_non_existent", &POA_CORBA::ArrayDef::_non_existent_skel, 0},
@@ -11692,7 +12860,7 @@ TAO_CORBA_ArrayDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int l
   static const signed char lookup[] =
     {
        -1,  -1,  -1,  -9,  -2,   5,  -1,   6,  -1,   7,   8, -29,  -1,  11, 
-       -1,  12,  -1,  13,  14, -15,  -2, -23, 
+       12,  13,  -1,  14,  15, -16,  -2, -23, 
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -11730,7 +12898,7 @@ TAO_CORBA_ArrayDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int l
 static TAO_CORBA_ArrayDef_Perfect_Hash_OpTable tao_CORBA_ArrayDef_optable;
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:999
+// be\be_visitor_interface/interface_ss.cpp:921
 
 TAO::Collocation_Proxy_Broker *
 CORBA__TAO_ArrayDef_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -11750,10 +12918,7 @@ CORBA__TAO_ArrayDef_Proxy_Broker_Factory_Initializer (size_t)
 static int
 CORBA__TAO_ArrayDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
   CORBA__TAO_ArrayDef_Proxy_Broker_Factory_Initializer (
-      reinterpret_cast<
-          size_t> (
-          CORBA__TAO_ArrayDef_Proxy_Broker_Factory_Initializer
-        )
+      reinterpret_cast<size_t> (CORBA__TAO_ArrayDef_Proxy_Broker_Factory_Initializer)
     );
 
 
@@ -12079,8 +13244,8 @@ namespace POA_CORBA
     
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
-      TAO::SArg_Traits< CORBA::IDLType>::ret_arg_type retval =
-        TAO::Portable_Server::get_ret_arg< CORBA::IDLType, TAO::SArg_Traits< CORBA::IDLType>::ret_arg_type> (
+      TAO::SArg_Traits< ::CORBA::IDLType>::ret_arg_type retval =
+        TAO::Portable_Server::get_ret_arg< ::CORBA::IDLType, TAO::SArg_Traits< ::CORBA::IDLType>::ret_arg_type> (
           this->operation_details_,
           this->args_);
       
@@ -12117,7 +13282,7 @@ void POA_CORBA::ArrayDef::_get_element_type_def_skel (
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
   
-  TAO::SArg_Traits< CORBA::IDLType>::ret_val retval;
+  TAO::SArg_Traits< ::CORBA::IDLType>::ret_val retval;
   
   TAO::Argument * const args[] =
     {
@@ -12171,8 +13336,8 @@ namespace POA_CORBA
     
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
-      TAO::SArg_Traits< CORBA::IDLType>::in_arg_type arg_1 =
-        TAO::Portable_Server::get_in_arg< CORBA::IDLType, TAO::SArg_Traits< CORBA::IDLType>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_type arg_1 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::IDLType, TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
@@ -12210,7 +13375,7 @@ void POA_CORBA::ArrayDef::_set_element_type_def_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   TAO::SArg_Traits< void>::ret_val retval;
-  TAO::SArg_Traits< CORBA::IDLType>::in_arg_val _tao_element_type_def;
+  TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_val _tao_element_type_def;
   
   TAO::Argument * const args[] =
     {
@@ -12274,8 +13439,8 @@ namespace POA_CORBA
           this->operation_details_,
           this->args_);
       
-      TAO::SArg_Traits< CORBA::Char *>::in_arg_type arg_1 =
-        TAO::Portable_Server::get_in_arg< CORBA::Char *, TAO::SArg_Traits< CORBA::Char *>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
@@ -12310,7 +13475,7 @@ void POA_CORBA::ArrayDef::_is_a_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  TAO::SArg_Traits< CORBA::Char *>::in_arg_val _tao_repository_id;
+  TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
   
   TAO::Argument * const args[] =
     {
@@ -12431,10 +13596,98 @@ void POA_CORBA::ArrayDef::_non_existent_skel (
   
 }
 
+namespace POA_CORBA
+{
+  
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_operation/upcall_command_ss.cpp:127
+  
+  class _repository_id_ArrayDef_Upcall_Command
+    : public TAO::Upcall_Command
+  {
+  public:
+    inline _repository_id_ArrayDef_Upcall_Command (
+      POA_CORBA::ArrayDef * servant,
+      TAO_Operation_Details const * operation_details,
+      TAO::Argument * const args[])
+      : servant_ (servant)
+      , operation_details_ (operation_details)
+      , args_ (args)
+    {
+    }
+    
+    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+    {
+      TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
+        TAO::Portable_Server::get_ret_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type> (
+          this->operation_details_,
+          this->args_);
+      
+      
+      retval =
+        this->servant_-> _repository_id (
+          ACE_ENV_SINGLE_ARG_PARAMETER);
+        
+    }
+  
+  private:
+    POA_CORBA::ArrayDef * const servant_;
+    TAO_Operation_Details const * const operation_details_;
+    TAO::Argument * const * const args_;
+  };
+  
+}
+void POA_CORBA::ArrayDef::_repository_id_skel (
+    TAO_ServerRequest & server_request, 
+    void * TAO_INTERCEPTOR (servant_upcall),
+    void * servant
+    ACE_ENV_ARG_DECL
+  )
+{
+  
+  
+#if TAO_HAS_INTERCEPTORS == 1
+  static CORBA::TypeCode_ptr const * const exceptions = 0;
+  static size_t const nexceptions = 0;
+#endif /* TAO_HAS_INTERCEPTORS */
+  
+  TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
+  
+  TAO::Argument * const args[] =
+    {
+      &retval
+    };
+  
+  static size_t const nargs = 1;
+  
+  POA_CORBA::ArrayDef * const impl =
+    static_cast<POA_CORBA::ArrayDef *> (servant);
+  
+  _repository_id_ArrayDef_Upcall_Command command (
+    impl,
+    server_request.operation_details (),
+    args);
+  
+  TAO::Upcall_Wrapper upcall_wrapper;
+  upcall_wrapper.upcall (server_request
+                         , args
+                         , nargs
+                         , command
+#if TAO_HAS_INTERCEPTORS == 1
+                         , servant_upcall
+                         , exceptions
+                         , nexceptions
+#endif  /* TAO_HAS_INTERCEPTORS == 1 */
+                         ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+  
+}
+
 
 
 // TAO_IDL - Generated from 
-// be\be_visitor_interface/interface_ss.cpp:393
+// be\be_visitor_interface/interface_ss.cpp:501
 
 
 
@@ -12599,7 +13852,7 @@ const char* POA_CORBA::ArrayDef::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:940
+// be\be_visitor_interface/interface_ss.cpp:862
 
 void POA_CORBA::ArrayDef::_dispatch (
     TAO_ServerRequest & req,
@@ -12614,7 +13867,7 @@ void POA_CORBA::ArrayDef::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:891
+// be\be_visitor_interface/interface_ss.cpp:813
 
 CORBA::ArrayDef *
 POA_CORBA::ArrayDef::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -12646,7 +13899,7 @@ POA_CORBA::ArrayDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1455
+// be\be_interface.cpp:1465
 
 class TAO_CORBA_ExceptionDef_Perfect_Hash_OpTable
   : public TAO_Perfect_Hash_OpTable
@@ -12659,7 +13912,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: c:\ace\latest\ACE_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0 -a -o -t -p -K opname -L C++ -Z TAO_CORBA_ExceptionDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ACE\Any\ACE_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0 -a -o -t -p -K opname -L C++ -Z TAO_CORBA_ExceptionDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_ExceptionDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -12716,14 +13969,14 @@ TAO_CORBA_ExceptionDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned i
 {
   enum
     {
-      TOTAL_KEYWORDS = 38,
+      TOTAL_KEYWORDS = 39,
       MIN_WORD_LENGTH = 4,
       MAX_WORD_LENGTH = 26,
       MIN_HASH_VALUE = 5,
       MAX_HASH_VALUE = 60,
       HASH_VALUE_RANGE = 56,
       DUPLICATES = 8,
-      WORDLIST_SIZE = 43
+      WORDLIST_SIZE = 44
     };
 
   static const TAO_operation_db_entry  wordlist[] =
@@ -12745,6 +13998,7 @@ TAO_CORBA_ExceptionDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned i
       {"move", &POA_CORBA::ExceptionDef::move_skel, 0},
       {"_get_defined_in", &POA_CORBA::ExceptionDef::_get_defined_in_skel, 0},
       {"_get_def_kind", &POA_CORBA::ExceptionDef::_get_def_kind_skel, 0},
+      {"_repository_id", &POA_CORBA::ExceptionDef::_repository_id_skel, 0},
       {"destroy", &POA_CORBA::ExceptionDef::destroy_skel, 0},
       {"_component", &POA_CORBA::ExceptionDef::_component_skel, 0},
       {"_get_members", &POA_CORBA::ExceptionDef::_get_members_skel, 0},
@@ -12772,10 +14026,10 @@ TAO_CORBA_ExceptionDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned i
   static const signed char lookup[] =
     {
        -1,  -1,  -1,  -7,  -3,   5,   6, -12,  -2, -66,  10,  11,  -1, -15, 
-       -2, -68,  14, -64,  17,  18,  19,  20,  -1,  -1,  -1,  21,  -1,  -1, 
-      -23,  -2,  22,  -1, -64,  25, -28,  -2,  26,  27, -64, -30,  -2, -62, 
-       32,  -1,  -1,  33,  34,  35,  -1,  -1,  36,  37,  -1,  38,  -1,  -1, 
-       39,  40,  41,  -1,  42, 
+       -2, -68,  14, -64,  17,  18,  19,  20,  21,  -1,  -1,  22,  -1,  -1, 
+      -24,  -2,  23,  -1, -64,  26, -29,  -2,  27,  28, -64, -31,  -2, -62, 
+       33,  -1,  -1,  34,  35,  36,  -1,  -1,  37,  38,  -1,  39,  -1,  -1, 
+       40,  41,  42,  -1,  43, 
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -12813,7 +14067,7 @@ TAO_CORBA_ExceptionDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned i
 static TAO_CORBA_ExceptionDef_Perfect_Hash_OpTable tao_CORBA_ExceptionDef_optable;
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:999
+// be\be_visitor_interface/interface_ss.cpp:921
 
 TAO::Collocation_Proxy_Broker *
 CORBA__TAO_ExceptionDef_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -12833,10 +14087,7 @@ CORBA__TAO_ExceptionDef_Proxy_Broker_Factory_Initializer (size_t)
 static int
 CORBA__TAO_ExceptionDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
   CORBA__TAO_ExceptionDef_Proxy_Broker_Factory_Initializer (
-      reinterpret_cast<
-          size_t> (
-          CORBA__TAO_ExceptionDef_Proxy_Broker_Factory_Initializer
-        )
+      reinterpret_cast<size_t> (CORBA__TAO_ExceptionDef_Proxy_Broker_Factory_Initializer)
     );
 
 
@@ -12977,8 +14228,8 @@ namespace POA_CORBA
     
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
-      TAO::SArg_Traits< CORBA::StructMemberSeq>::ret_arg_type retval =
-        TAO::Portable_Server::get_ret_arg< CORBA::StructMemberSeq, TAO::SArg_Traits< CORBA::StructMemberSeq>::ret_arg_type> (
+      TAO::SArg_Traits< ::CORBA::StructMemberSeq>::ret_arg_type retval =
+        TAO::Portable_Server::get_ret_arg< ::CORBA::StructMemberSeq, TAO::SArg_Traits< ::CORBA::StructMemberSeq>::ret_arg_type> (
           this->operation_details_,
           this->args_);
       
@@ -13015,7 +14266,7 @@ void POA_CORBA::ExceptionDef::_get_members_skel (
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
   
-  TAO::SArg_Traits< CORBA::StructMemberSeq>::ret_val retval;
+  TAO::SArg_Traits< ::CORBA::StructMemberSeq>::ret_val retval;
   
   TAO::Argument * const args[] =
     {
@@ -13069,8 +14320,8 @@ namespace POA_CORBA
     
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
-      TAO::SArg_Traits< CORBA::StructMemberSeq>::in_arg_type arg_1 =
-        TAO::Portable_Server::get_in_arg< CORBA::StructMemberSeq, TAO::SArg_Traits< CORBA::StructMemberSeq>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::StructMemberSeq>::in_arg_type arg_1 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::StructMemberSeq, TAO::SArg_Traits< ::CORBA::StructMemberSeq>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
@@ -13108,7 +14359,7 @@ void POA_CORBA::ExceptionDef::_set_members_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   TAO::SArg_Traits< void>::ret_val retval;
-  TAO::SArg_Traits< CORBA::StructMemberSeq>::in_arg_val _tao_members;
+  TAO::SArg_Traits< ::CORBA::StructMemberSeq>::in_arg_val _tao_members;
   
   TAO::Argument * const args[] =
     {
@@ -13172,8 +14423,8 @@ namespace POA_CORBA
           this->operation_details_,
           this->args_);
       
-      TAO::SArg_Traits< CORBA::Char *>::in_arg_type arg_1 =
-        TAO::Portable_Server::get_in_arg< CORBA::Char *, TAO::SArg_Traits< CORBA::Char *>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
@@ -13208,7 +14459,7 @@ void POA_CORBA::ExceptionDef::_is_a_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  TAO::SArg_Traits< CORBA::Char *>::in_arg_val _tao_repository_id;
+  TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
   
   TAO::Argument * const args[] =
     {
@@ -13329,10 +14580,98 @@ void POA_CORBA::ExceptionDef::_non_existent_skel (
   
 }
 
+namespace POA_CORBA
+{
+  
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_operation/upcall_command_ss.cpp:127
+  
+  class _repository_id_ExceptionDef_Upcall_Command
+    : public TAO::Upcall_Command
+  {
+  public:
+    inline _repository_id_ExceptionDef_Upcall_Command (
+      POA_CORBA::ExceptionDef * servant,
+      TAO_Operation_Details const * operation_details,
+      TAO::Argument * const args[])
+      : servant_ (servant)
+      , operation_details_ (operation_details)
+      , args_ (args)
+    {
+    }
+    
+    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+    {
+      TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
+        TAO::Portable_Server::get_ret_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type> (
+          this->operation_details_,
+          this->args_);
+      
+      
+      retval =
+        this->servant_-> _repository_id (
+          ACE_ENV_SINGLE_ARG_PARAMETER);
+        
+    }
+  
+  private:
+    POA_CORBA::ExceptionDef * const servant_;
+    TAO_Operation_Details const * const operation_details_;
+    TAO::Argument * const * const args_;
+  };
+  
+}
+void POA_CORBA::ExceptionDef::_repository_id_skel (
+    TAO_ServerRequest & server_request, 
+    void * TAO_INTERCEPTOR (servant_upcall),
+    void * servant
+    ACE_ENV_ARG_DECL
+  )
+{
+  
+  
+#if TAO_HAS_INTERCEPTORS == 1
+  static CORBA::TypeCode_ptr const * const exceptions = 0;
+  static size_t const nexceptions = 0;
+#endif /* TAO_HAS_INTERCEPTORS */
+  
+  TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
+  
+  TAO::Argument * const args[] =
+    {
+      &retval
+    };
+  
+  static size_t const nargs = 1;
+  
+  POA_CORBA::ExceptionDef * const impl =
+    static_cast<POA_CORBA::ExceptionDef *> (servant);
+  
+  _repository_id_ExceptionDef_Upcall_Command command (
+    impl,
+    server_request.operation_details (),
+    args);
+  
+  TAO::Upcall_Wrapper upcall_wrapper;
+  upcall_wrapper.upcall (server_request
+                         , args
+                         , nargs
+                         , command
+#if TAO_HAS_INTERCEPTORS == 1
+                         , servant_upcall
+                         , exceptions
+                         , nexceptions
+#endif  /* TAO_HAS_INTERCEPTORS == 1 */
+                         ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+  
+}
+
 
 
 // TAO_IDL - Generated from 
-// be\be_visitor_interface/interface_ss.cpp:393
+// be\be_visitor_interface/interface_ss.cpp:501
 
 
 
@@ -13501,7 +14840,7 @@ const char* POA_CORBA::ExceptionDef::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:940
+// be\be_visitor_interface/interface_ss.cpp:862
 
 void POA_CORBA::ExceptionDef::_dispatch (
     TAO_ServerRequest & req,
@@ -13516,7 +14855,7 @@ void POA_CORBA::ExceptionDef::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:891
+// be\be_visitor_interface/interface_ss.cpp:813
 
 CORBA::ExceptionDef *
 POA_CORBA::ExceptionDef::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -13548,7 +14887,7 @@ POA_CORBA::ExceptionDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1455
+// be\be_interface.cpp:1465
 
 class TAO_CORBA_AttributeDef_Perfect_Hash_OpTable
   : public TAO_Perfect_Hash_OpTable
@@ -13561,7 +14900,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: c:\ace\latest\ACE_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0 -a -o -t -p -K opname -L C++ -Z TAO_CORBA_AttributeDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ACE\Any\ACE_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0 -a -o -t -p -K opname -L C++ -Z TAO_CORBA_AttributeDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_AttributeDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -13618,14 +14957,14 @@ TAO_CORBA_AttributeDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned i
 {
   enum
     {
-      TOTAL_KEYWORDS = 22,
+      TOTAL_KEYWORDS = 23,
       MIN_WORD_LENGTH = 4,
       MAX_WORD_LENGTH = 26,
       MIN_HASH_VALUE = 4,
       MAX_HASH_VALUE = 36,
       HASH_VALUE_RANGE = 33,
       DUPLICATES = 8,
-      WORDLIST_SIZE = 26
+      WORDLIST_SIZE = 27
     };
 
   static const TAO_operation_db_entry  wordlist[] =
@@ -13645,6 +14984,7 @@ TAO_CORBA_AttributeDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned i
       {"_get_version", &POA_CORBA::AttributeDef::_get_version_skel, 0},
       {"_set_version", &POA_CORBA::AttributeDef::_set_version_skel, 0},
       {"_get_def_kind", &POA_CORBA::AttributeDef::_get_def_kind_skel, 0},
+      {"_repository_id", &POA_CORBA::AttributeDef::_repository_id_skel, 0},
       {"_get_defined_in", &POA_CORBA::AttributeDef::_get_defined_in_skel, 0},
       {"destroy", &POA_CORBA::AttributeDef::destroy_skel, 0},
       {"_get_absolute_name", &POA_CORBA::AttributeDef::_get_absolute_name_skel, 0},
@@ -13658,8 +14998,8 @@ TAO_CORBA_AttributeDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned i
   static const signed char lookup[] =
     {
        -9,  -5, -15,  -2,   4,   5,  -1,  50,   8, -45,  14,  -1, -46,  17, 
-       -1,  18,  -1,  19,  20,  -1,  21,  -6,  -2,  22,  -1,  -1, -23,  -2, 
-      -38,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  25, 
+       18,  19,  -1,  20,  21,  -1,  22,  -6,  -2,  23,  -1,  -1, -24,  -2, 
+      -38,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  26, 
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -13697,7 +15037,7 @@ TAO_CORBA_AttributeDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned i
 static TAO_CORBA_AttributeDef_Perfect_Hash_OpTable tao_CORBA_AttributeDef_optable;
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:999
+// be\be_visitor_interface/interface_ss.cpp:921
 
 TAO::Collocation_Proxy_Broker *
 CORBA__TAO_AttributeDef_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -13717,10 +15057,7 @@ CORBA__TAO_AttributeDef_Proxy_Broker_Factory_Initializer (size_t)
 static int
 CORBA__TAO_AttributeDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
   CORBA__TAO_AttributeDef_Proxy_Broker_Factory_Initializer (
-      reinterpret_cast<
-          size_t> (
-          CORBA__TAO_AttributeDef_Proxy_Broker_Factory_Initializer
-        )
+      reinterpret_cast<size_t> (CORBA__TAO_AttributeDef_Proxy_Broker_Factory_Initializer)
     );
 
 
@@ -13860,8 +15197,8 @@ namespace POA_CORBA
     
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
-      TAO::SArg_Traits< CORBA::IDLType>::ret_arg_type retval =
-        TAO::Portable_Server::get_ret_arg< CORBA::IDLType, TAO::SArg_Traits< CORBA::IDLType>::ret_arg_type> (
+      TAO::SArg_Traits< ::CORBA::IDLType>::ret_arg_type retval =
+        TAO::Portable_Server::get_ret_arg< ::CORBA::IDLType, TAO::SArg_Traits< ::CORBA::IDLType>::ret_arg_type> (
           this->operation_details_,
           this->args_);
       
@@ -13898,7 +15235,7 @@ void POA_CORBA::AttributeDef::_get_type_def_skel (
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
   
-  TAO::SArg_Traits< CORBA::IDLType>::ret_val retval;
+  TAO::SArg_Traits< ::CORBA::IDLType>::ret_val retval;
   
   TAO::Argument * const args[] =
     {
@@ -13952,8 +15289,8 @@ namespace POA_CORBA
     
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
-      TAO::SArg_Traits< CORBA::IDLType>::in_arg_type arg_1 =
-        TAO::Portable_Server::get_in_arg< CORBA::IDLType, TAO::SArg_Traits< CORBA::IDLType>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_type arg_1 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::IDLType, TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
@@ -13991,7 +15328,7 @@ void POA_CORBA::AttributeDef::_set_type_def_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   TAO::SArg_Traits< void>::ret_val retval;
-  TAO::SArg_Traits< CORBA::IDLType>::in_arg_val _tao_type_def;
+  TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_val _tao_type_def;
   
   TAO::Argument * const args[] =
     {
@@ -14046,8 +15383,8 @@ namespace POA_CORBA
     
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
-      TAO::SArg_Traits< CORBA::AttributeMode>::ret_arg_type retval =
-        TAO::Portable_Server::get_ret_arg< CORBA::AttributeMode, TAO::SArg_Traits< CORBA::AttributeMode>::ret_arg_type> (
+      TAO::SArg_Traits< ::CORBA::AttributeMode>::ret_arg_type retval =
+        TAO::Portable_Server::get_ret_arg< ::CORBA::AttributeMode, TAO::SArg_Traits< ::CORBA::AttributeMode>::ret_arg_type> (
           this->operation_details_,
           this->args_);
       
@@ -14084,7 +15421,7 @@ void POA_CORBA::AttributeDef::_get_mode_skel (
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
   
-  TAO::SArg_Traits< CORBA::AttributeMode>::ret_val retval;
+  TAO::SArg_Traits< ::CORBA::AttributeMode>::ret_val retval;
   
   TAO::Argument * const args[] =
     {
@@ -14138,8 +15475,8 @@ namespace POA_CORBA
     
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
-      TAO::SArg_Traits< CORBA::AttributeMode>::in_arg_type arg_1 =
-        TAO::Portable_Server::get_in_arg< CORBA::AttributeMode, TAO::SArg_Traits< CORBA::AttributeMode>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::AttributeMode>::in_arg_type arg_1 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::AttributeMode, TAO::SArg_Traits< ::CORBA::AttributeMode>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
@@ -14177,7 +15514,7 @@ void POA_CORBA::AttributeDef::_set_mode_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   TAO::SArg_Traits< void>::ret_val retval;
-  TAO::SArg_Traits< CORBA::AttributeMode>::in_arg_val _tao_mode;
+  TAO::SArg_Traits< ::CORBA::AttributeMode>::in_arg_val _tao_mode;
   
   TAO::Argument * const args[] =
     {
@@ -14241,8 +15578,8 @@ namespace POA_CORBA
           this->operation_details_,
           this->args_);
       
-      TAO::SArg_Traits< CORBA::Char *>::in_arg_type arg_1 =
-        TAO::Portable_Server::get_in_arg< CORBA::Char *, TAO::SArg_Traits< CORBA::Char *>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
@@ -14277,7 +15614,7 @@ void POA_CORBA::AttributeDef::_is_a_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  TAO::SArg_Traits< CORBA::Char *>::in_arg_val _tao_repository_id;
+  TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
   
   TAO::Argument * const args[] =
     {
@@ -14398,10 +15735,98 @@ void POA_CORBA::AttributeDef::_non_existent_skel (
   
 }
 
+namespace POA_CORBA
+{
+  
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_operation/upcall_command_ss.cpp:127
+  
+  class _repository_id_AttributeDef_Upcall_Command
+    : public TAO::Upcall_Command
+  {
+  public:
+    inline _repository_id_AttributeDef_Upcall_Command (
+      POA_CORBA::AttributeDef * servant,
+      TAO_Operation_Details const * operation_details,
+      TAO::Argument * const args[])
+      : servant_ (servant)
+      , operation_details_ (operation_details)
+      , args_ (args)
+    {
+    }
+    
+    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+    {
+      TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
+        TAO::Portable_Server::get_ret_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type> (
+          this->operation_details_,
+          this->args_);
+      
+      
+      retval =
+        this->servant_-> _repository_id (
+          ACE_ENV_SINGLE_ARG_PARAMETER);
+        
+    }
+  
+  private:
+    POA_CORBA::AttributeDef * const servant_;
+    TAO_Operation_Details const * const operation_details_;
+    TAO::Argument * const * const args_;
+  };
+  
+}
+void POA_CORBA::AttributeDef::_repository_id_skel (
+    TAO_ServerRequest & server_request, 
+    void * TAO_INTERCEPTOR (servant_upcall),
+    void * servant
+    ACE_ENV_ARG_DECL
+  )
+{
+  
+  
+#if TAO_HAS_INTERCEPTORS == 1
+  static CORBA::TypeCode_ptr const * const exceptions = 0;
+  static size_t const nexceptions = 0;
+#endif /* TAO_HAS_INTERCEPTORS */
+  
+  TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
+  
+  TAO::Argument * const args[] =
+    {
+      &retval
+    };
+  
+  static size_t const nargs = 1;
+  
+  POA_CORBA::AttributeDef * const impl =
+    static_cast<POA_CORBA::AttributeDef *> (servant);
+  
+  _repository_id_AttributeDef_Upcall_Command command (
+    impl,
+    server_request.operation_details (),
+    args);
+  
+  TAO::Upcall_Wrapper upcall_wrapper;
+  upcall_wrapper.upcall (server_request
+                         , args
+                         , nargs
+                         , command
+#if TAO_HAS_INTERCEPTORS == 1
+                         , servant_upcall
+                         , exceptions
+                         , nexceptions
+#endif  /* TAO_HAS_INTERCEPTORS == 1 */
+                         ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+  
+}
+
 
 
 // TAO_IDL - Generated from 
-// be\be_visitor_interface/interface_ss.cpp:393
+// be\be_visitor_interface/interface_ss.cpp:501
 
 
 
@@ -14566,7 +15991,7 @@ const char* POA_CORBA::AttributeDef::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:940
+// be\be_visitor_interface/interface_ss.cpp:862
 
 void POA_CORBA::AttributeDef::_dispatch (
     TAO_ServerRequest & req,
@@ -14581,7 +16006,7 @@ void POA_CORBA::AttributeDef::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:891
+// be\be_visitor_interface/interface_ss.cpp:813
 
 CORBA::AttributeDef *
 POA_CORBA::AttributeDef::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -14613,7 +16038,7 @@ POA_CORBA::AttributeDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1455
+// be\be_interface.cpp:1465
 
 class TAO_CORBA_ExtAttributeDef_Perfect_Hash_OpTable
   : public TAO_Perfect_Hash_OpTable
@@ -14626,53 +16051,53 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: c:\ace\latest\ACE_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0 -a -o -t -p -K opname -L C++ -Z TAO_CORBA_ExtAttributeDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ACE\Any\ACE_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0 -a -o -t -p -K opname -L C++ -Z TAO_CORBA_ExtAttributeDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_ExtAttributeDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
   static const unsigned char asso_values[] =
     {
 #if defined (ACE_MVS)
-     39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-     39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-     39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-     39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-     39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-     39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-     39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-     39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-     39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-     39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-     39, 39, 39, 39, 39, 39, 39, 39, 39,  0,
-     39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-     39, 39, 39, 39, 39, 39, 39, 39, 39,  0,
-     39, 39, 15,  0,  0, 39, 39, 39, 39, 39,
-     39, 39, 39, 39, 39, 39, 39, 39,  0,  0,
-     39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-     39, 39,  0, 25, 39, 39, 39, 39,  5, 39,
-     39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-     39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-     39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-     39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-     39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-     39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-     39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-     39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-     39, 39, 39, 39, 39, 39,
+     44, 44, 44, 44, 44, 44, 44, 44, 44, 44,
+     44, 44, 44, 44, 44, 44, 44, 44, 44, 44,
+     44, 44, 44, 44, 44, 44, 44, 44, 44, 44,
+     44, 44, 44, 44, 44, 44, 44, 44, 44, 44,
+     44, 44, 44, 44, 44, 44, 44, 44, 44, 44,
+     44, 44, 44, 44, 44, 44, 44, 44, 44, 44,
+     44, 44, 44, 44, 44, 44, 44, 44, 44, 44,
+     44, 44, 44, 44, 44, 44, 44, 44, 44, 44,
+     44, 44, 44, 44, 44, 44, 44, 44, 44, 44,
+     44, 44, 44, 44, 44, 44, 44, 44, 44, 44,
+     44, 44, 44, 44, 44, 44, 44, 44, 44,  0,
+     44, 44, 44, 44, 44, 44, 44, 44, 44, 44,
+     44, 44, 44, 44, 44, 44, 44, 44, 44,  0,
+     44, 44, 15,  0, 25, 44, 44, 44, 44, 44,
+     44, 44, 44, 44, 44, 44, 44, 44,  0,  0,
+     44, 44, 44, 44, 44, 44, 44, 44, 44, 44,
+     44, 44,  0, 30, 44, 44, 44, 44,  5, 44,
+     44, 44, 44, 44, 44, 44, 44, 44, 44, 44,
+     44, 44, 44, 44, 44, 44, 44, 44, 44, 44,
+     44, 44, 44, 44, 44, 44, 44, 44, 44, 44,
+     44, 44, 44, 44, 44, 44, 44, 44, 44, 44,
+     44, 44, 44, 44, 44, 44, 44, 44, 44, 44,
+     44, 44, 44, 44, 44, 44, 44, 44, 44, 44,
+     44, 44, 44, 44, 44, 44, 44, 44, 44, 44,
+     44, 44, 44, 44, 44, 44, 44, 44, 44, 44,
+     44, 44, 44, 44, 44, 44,
 #else
-     39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-     39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-     39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-     39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-     39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-     39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-     39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-     39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-     39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
-     39, 39, 39, 39, 39,  0, 39,  0, 39, 39,
-     15,  0,  0, 39, 39, 39, 39, 39, 39,  0,
-      0, 39, 39, 39, 39,  0, 25, 39, 39, 39,
-     39,  5, 39, 39, 39, 39, 39, 39,
+     44, 44, 44, 44, 44, 44, 44, 44, 44, 44,
+     44, 44, 44, 44, 44, 44, 44, 44, 44, 44,
+     44, 44, 44, 44, 44, 44, 44, 44, 44, 44,
+     44, 44, 44, 44, 44, 44, 44, 44, 44, 44,
+     44, 44, 44, 44, 44, 44, 44, 44, 44, 44,
+     44, 44, 44, 44, 44, 44, 44, 44, 44, 44,
+     44, 44, 44, 44, 44, 44, 44, 44, 44, 44,
+     44, 44, 44, 44, 44, 44, 44, 44, 44, 44,
+     44, 44, 44, 44, 44, 44, 44, 44, 44, 44,
+     44, 44, 44, 44, 44,  0, 44,  0, 44, 44,
+     15,  0, 25, 44, 44, 44, 44, 44, 44,  0,
+      0, 44, 44, 44, 44,  0, 30, 44, 44, 44,
+     44,  5, 44, 44, 44, 44, 44, 44,
 #endif /* ACE_MVS */
     };
   return len + asso_values[(int) str[len - 1]] + asso_values[(int) str[0]];
@@ -14683,14 +16108,14 @@ TAO_CORBA_ExtAttributeDef_Perfect_Hash_OpTable::lookup (const char *str, unsigne
 {
   enum
     {
-      TOTAL_KEYWORDS = 27,
+      TOTAL_KEYWORDS = 28,
       MIN_WORD_LENGTH = 4,
       MAX_WORD_LENGTH = 26,
       MIN_HASH_VALUE = 4,
-      MAX_HASH_VALUE = 38,
-      HASH_VALUE_RANGE = 35,
+      MAX_HASH_VALUE = 43,
+      HASH_VALUE_RANGE = 40,
       DUPLICATES = 11,
-      WORDLIST_SIZE = 31
+      WORDLIST_SIZE = 32
     };
 
   static const TAO_operation_db_entry  wordlist[] =
@@ -14706,8 +16131,6 @@ TAO_CORBA_ExtAttributeDef_Perfect_Hash_OpTable::lookup (const char *str, unsigne
       {"_interface", &POA_CORBA::ExtAttributeDef::_interface_skel, 0},
       {"_get_version", &POA_CORBA::ExtAttributeDef::_get_version_skel, 0},
       {"_set_version", &POA_CORBA::ExtAttributeDef::_set_version_skel, 0},
-      {"_get_type_def", &POA_CORBA::ExtAttributeDef::_get_type_def_skel, 0},
-      {"_set_type_def", &POA_CORBA::ExtAttributeDef::_set_type_def_skel, 0},
       {"_get_defined_in", &POA_CORBA::ExtAttributeDef::_get_defined_in_skel, 0},
       {"_get_absolute_name", &POA_CORBA::ExtAttributeDef::_get_absolute_name_skel, 0},
       {"_get_get_exceptions", &POA_CORBA::ExtAttributeDef::_get_get_exceptions_skel, 0},
@@ -14719,17 +16142,21 @@ TAO_CORBA_ExtAttributeDef_Perfect_Hash_OpTable::lookup (const char *str, unsigne
       {"describe", &POA_CORBA::ExtAttributeDef::describe_skel, 0},
       {"destroy", &POA_CORBA::ExtAttributeDef::destroy_skel, 0},
       {"_get_def_kind", &POA_CORBA::ExtAttributeDef::_get_def_kind_skel, 0},
+      {"_repository_id", &POA_CORBA::ExtAttributeDef::_repository_id_skel, 0},
       {"_get_containing_repository", &POA_CORBA::ExtAttributeDef::_get_containing_repository_skel, 0},
       {"describe_attribute", &POA_CORBA::ExtAttributeDef::describe_attribute_skel, 0},
+      {"_get_type_def", &POA_CORBA::ExtAttributeDef::_get_type_def_skel, 0},
+      {"_set_type_def", &POA_CORBA::ExtAttributeDef::_set_type_def_skel, 0},
       {"_component", &POA_CORBA::ExtAttributeDef::_component_skel, 0},
       {"_non_existent", &POA_CORBA::ExtAttributeDef::_non_existent_skel, 0},
     };
 
   static const signed char lookup[] =
     {
-       -6,  -5, -12,  -2,   4,   5,  -1, -14,  -2, -47,  11,  -1, -48, -44, 
-       -1,  16, -18,  -4,  17, -41, -22,  -2, -40,  24,  -1,  -1,  -1,  25, 
-       26,  -1,  -1,  27,  -1,  28,  -1,  29,  -1,  -1,  30, 
+       -1,  -1,  -6,  -5,   4,   5,  -1, -12,  -2, -50,  11,  -1, -48,  -1, 
+       -1,  14, -16,  -4,  15, -46, -20,  -2, -45,  22,  -1,  -1,  -1,  23, 
+       24,  25,  -1,  26,  -1,  27,  -1,  -1, -28,  -2, -45,  -1,  30,  -1, 
+       -1,  31, 
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -14767,7 +16194,7 @@ TAO_CORBA_ExtAttributeDef_Perfect_Hash_OpTable::lookup (const char *str, unsigne
 static TAO_CORBA_ExtAttributeDef_Perfect_Hash_OpTable tao_CORBA_ExtAttributeDef_optable;
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:999
+// be\be_visitor_interface/interface_ss.cpp:921
 
 TAO::Collocation_Proxy_Broker *
 CORBA__TAO_ExtAttributeDef_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -14787,10 +16214,7 @@ CORBA__TAO_ExtAttributeDef_Proxy_Broker_Factory_Initializer (size_t)
 static int
 CORBA__TAO_ExtAttributeDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
   CORBA__TAO_ExtAttributeDef_Proxy_Broker_Factory_Initializer (
-      reinterpret_cast<
-          size_t> (
-          CORBA__TAO_ExtAttributeDef_Proxy_Broker_Factory_Initializer
-        )
+      reinterpret_cast<size_t> (CORBA__TAO_ExtAttributeDef_Proxy_Broker_Factory_Initializer)
     );
 
 
@@ -14839,8 +16263,8 @@ namespace POA_CORBA
     
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
-      TAO::SArg_Traits< CORBA::ExcDescriptionSeq>::ret_arg_type retval =
-        TAO::Portable_Server::get_ret_arg< CORBA::ExcDescriptionSeq, TAO::SArg_Traits< CORBA::ExcDescriptionSeq>::ret_arg_type> (
+      TAO::SArg_Traits< ::CORBA::ExcDescriptionSeq>::ret_arg_type retval =
+        TAO::Portable_Server::get_ret_arg< ::CORBA::ExcDescriptionSeq, TAO::SArg_Traits< ::CORBA::ExcDescriptionSeq>::ret_arg_type> (
           this->operation_details_,
           this->args_);
       
@@ -14877,7 +16301,7 @@ void POA_CORBA::ExtAttributeDef::_get_get_exceptions_skel (
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
   
-  TAO::SArg_Traits< CORBA::ExcDescriptionSeq>::ret_val retval;
+  TAO::SArg_Traits< ::CORBA::ExcDescriptionSeq>::ret_val retval;
   
   TAO::Argument * const args[] =
     {
@@ -14931,8 +16355,8 @@ namespace POA_CORBA
     
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
-      TAO::SArg_Traits< CORBA::ExcDescriptionSeq>::in_arg_type arg_1 =
-        TAO::Portable_Server::get_in_arg< CORBA::ExcDescriptionSeq, TAO::SArg_Traits< CORBA::ExcDescriptionSeq>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::ExcDescriptionSeq>::in_arg_type arg_1 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::ExcDescriptionSeq, TAO::SArg_Traits< ::CORBA::ExcDescriptionSeq>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
@@ -14970,7 +16394,7 @@ void POA_CORBA::ExtAttributeDef::_set_get_exceptions_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   TAO::SArg_Traits< void>::ret_val retval;
-  TAO::SArg_Traits< CORBA::ExcDescriptionSeq>::in_arg_val _tao_get_exceptions;
+  TAO::SArg_Traits< ::CORBA::ExcDescriptionSeq>::in_arg_val _tao_get_exceptions;
   
   TAO::Argument * const args[] =
     {
@@ -15025,8 +16449,8 @@ namespace POA_CORBA
     
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
-      TAO::SArg_Traits< CORBA::ExcDescriptionSeq>::ret_arg_type retval =
-        TAO::Portable_Server::get_ret_arg< CORBA::ExcDescriptionSeq, TAO::SArg_Traits< CORBA::ExcDescriptionSeq>::ret_arg_type> (
+      TAO::SArg_Traits< ::CORBA::ExcDescriptionSeq>::ret_arg_type retval =
+        TAO::Portable_Server::get_ret_arg< ::CORBA::ExcDescriptionSeq, TAO::SArg_Traits< ::CORBA::ExcDescriptionSeq>::ret_arg_type> (
           this->operation_details_,
           this->args_);
       
@@ -15063,7 +16487,7 @@ void POA_CORBA::ExtAttributeDef::_get_set_exceptions_skel (
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
   
-  TAO::SArg_Traits< CORBA::ExcDescriptionSeq>::ret_val retval;
+  TAO::SArg_Traits< ::CORBA::ExcDescriptionSeq>::ret_val retval;
   
   TAO::Argument * const args[] =
     {
@@ -15117,8 +16541,8 @@ namespace POA_CORBA
     
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
-      TAO::SArg_Traits< CORBA::ExcDescriptionSeq>::in_arg_type arg_1 =
-        TAO::Portable_Server::get_in_arg< CORBA::ExcDescriptionSeq, TAO::SArg_Traits< CORBA::ExcDescriptionSeq>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::ExcDescriptionSeq>::in_arg_type arg_1 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::ExcDescriptionSeq, TAO::SArg_Traits< ::CORBA::ExcDescriptionSeq>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
@@ -15156,7 +16580,7 @@ void POA_CORBA::ExtAttributeDef::_set_set_exceptions_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   TAO::SArg_Traits< void>::ret_val retval;
-  TAO::SArg_Traits< CORBA::ExcDescriptionSeq>::in_arg_val _tao_set_exceptions;
+  TAO::SArg_Traits< ::CORBA::ExcDescriptionSeq>::in_arg_val _tao_set_exceptions;
   
   TAO::Argument * const args[] =
     {
@@ -15211,8 +16635,8 @@ namespace POA_CORBA
     
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
-      TAO::SArg_Traits< CORBA::ExtAttributeDescription>::ret_arg_type retval =
-        TAO::Portable_Server::get_ret_arg< CORBA::ExtAttributeDescription, TAO::SArg_Traits< CORBA::ExtAttributeDescription>::ret_arg_type> (
+      TAO::SArg_Traits< ::CORBA::ExtAttributeDescription>::ret_arg_type retval =
+        TAO::Portable_Server::get_ret_arg< ::CORBA::ExtAttributeDescription, TAO::SArg_Traits< ::CORBA::ExtAttributeDescription>::ret_arg_type> (
           this->operation_details_,
           this->args_);
       
@@ -15249,7 +16673,7 @@ void POA_CORBA::ExtAttributeDef::describe_attribute_skel (
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
   
-  TAO::SArg_Traits< CORBA::ExtAttributeDescription>::ret_val retval;
+  TAO::SArg_Traits< ::CORBA::ExtAttributeDescription>::ret_val retval;
   
   TAO::Argument * const args[] =
     {
@@ -15312,8 +16736,8 @@ namespace POA_CORBA
           this->operation_details_,
           this->args_);
       
-      TAO::SArg_Traits< CORBA::Char *>::in_arg_type arg_1 =
-        TAO::Portable_Server::get_in_arg< CORBA::Char *, TAO::SArg_Traits< CORBA::Char *>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
@@ -15348,7 +16772,7 @@ void POA_CORBA::ExtAttributeDef::_is_a_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  TAO::SArg_Traits< CORBA::Char *>::in_arg_val _tao_repository_id;
+  TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
   
   TAO::Argument * const args[] =
     {
@@ -15469,10 +16893,98 @@ void POA_CORBA::ExtAttributeDef::_non_existent_skel (
   
 }
 
+namespace POA_CORBA
+{
+  
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_operation/upcall_command_ss.cpp:127
+  
+  class _repository_id_ExtAttributeDef_Upcall_Command
+    : public TAO::Upcall_Command
+  {
+  public:
+    inline _repository_id_ExtAttributeDef_Upcall_Command (
+      POA_CORBA::ExtAttributeDef * servant,
+      TAO_Operation_Details const * operation_details,
+      TAO::Argument * const args[])
+      : servant_ (servant)
+      , operation_details_ (operation_details)
+      , args_ (args)
+    {
+    }
+    
+    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+    {
+      TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
+        TAO::Portable_Server::get_ret_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type> (
+          this->operation_details_,
+          this->args_);
+      
+      
+      retval =
+        this->servant_-> _repository_id (
+          ACE_ENV_SINGLE_ARG_PARAMETER);
+        
+    }
+  
+  private:
+    POA_CORBA::ExtAttributeDef * const servant_;
+    TAO_Operation_Details const * const operation_details_;
+    TAO::Argument * const * const args_;
+  };
+  
+}
+void POA_CORBA::ExtAttributeDef::_repository_id_skel (
+    TAO_ServerRequest & server_request, 
+    void * TAO_INTERCEPTOR (servant_upcall),
+    void * servant
+    ACE_ENV_ARG_DECL
+  )
+{
+  
+  
+#if TAO_HAS_INTERCEPTORS == 1
+  static CORBA::TypeCode_ptr const * const exceptions = 0;
+  static size_t const nexceptions = 0;
+#endif /* TAO_HAS_INTERCEPTORS */
+  
+  TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
+  
+  TAO::Argument * const args[] =
+    {
+      &retval
+    };
+  
+  static size_t const nargs = 1;
+  
+  POA_CORBA::ExtAttributeDef * const impl =
+    static_cast<POA_CORBA::ExtAttributeDef *> (servant);
+  
+  _repository_id_ExtAttributeDef_Upcall_Command command (
+    impl,
+    server_request.operation_details (),
+    args);
+  
+  TAO::Upcall_Wrapper upcall_wrapper;
+  upcall_wrapper.upcall (server_request
+                         , args
+                         , nargs
+                         , command
+#if TAO_HAS_INTERCEPTORS == 1
+                         , servant_upcall
+                         , exceptions
+                         , nexceptions
+#endif  /* TAO_HAS_INTERCEPTORS == 1 */
+                         ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+  
+}
+
 
 
 // TAO_IDL - Generated from 
-// be\be_visitor_interface/interface_ss.cpp:393
+// be\be_visitor_interface/interface_ss.cpp:501
 
 
 
@@ -15641,7 +17153,7 @@ const char* POA_CORBA::ExtAttributeDef::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:940
+// be\be_visitor_interface/interface_ss.cpp:862
 
 void POA_CORBA::ExtAttributeDef::_dispatch (
     TAO_ServerRequest & req,
@@ -15656,7 +17168,7 @@ void POA_CORBA::ExtAttributeDef::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:891
+// be\be_visitor_interface/interface_ss.cpp:813
 
 CORBA::ExtAttributeDef *
 POA_CORBA::ExtAttributeDef::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -15688,7 +17200,7 @@ POA_CORBA::ExtAttributeDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1455
+// be\be_interface.cpp:1465
 
 class TAO_CORBA_OperationDef_Perfect_Hash_OpTable
   : public TAO_Perfect_Hash_OpTable
@@ -15701,7 +17213,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: c:\ace\latest\ACE_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0 -a -o -t -p -K opname -L C++ -Z TAO_CORBA_OperationDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ACE\Any\ACE_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0 -a -o -t -p -K opname -L C++ -Z TAO_CORBA_OperationDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_OperationDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -15758,14 +17270,14 @@ TAO_CORBA_OperationDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned i
 {
   enum
     {
-      TOTAL_KEYWORDS = 28,
+      TOTAL_KEYWORDS = 29,
       MIN_WORD_LENGTH = 4,
       MAX_WORD_LENGTH = 26,
       MIN_HASH_VALUE = 4,
       MAX_HASH_VALUE = 36,
       HASH_VALUE_RANGE = 33,
       DUPLICATES = 10,
-      WORDLIST_SIZE = 32
+      WORDLIST_SIZE = 33
     };
 
   static const TAO_operation_db_entry  wordlist[] =
@@ -15794,6 +17306,7 @@ TAO_CORBA_OperationDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned i
       {"_get_result_def", &POA_CORBA::OperationDef::_get_result_def_skel, 0},
       {"_set_result_def", &POA_CORBA::OperationDef::_set_result_def_skel, 0},
       {"_get_def_kind", &POA_CORBA::OperationDef::_get_def_kind_skel, 0},
+      {"_repository_id", &POA_CORBA::OperationDef::_repository_id_skel, 0},
       {"_component", &POA_CORBA::OperationDef::_component_skel, 0},
       {"_get_result", &POA_CORBA::OperationDef::_get_result_skel, 0},
       {"destroy", &POA_CORBA::OperationDef::destroy_skel, 0},
@@ -15872,16 +17385,18 @@ TAO_CORBA_OperationDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned i
                   return 0;
                 case  28:
                   resword = &wordlist[26]; break;
-                case  30:
+                case  29:
                   resword = &wordlist[27]; break;
-                case  31:
+                case  30:
                   resword = &wordlist[28]; break;
-                case  32:
+                case  31:
                   resword = &wordlist[29]; break;
-                case  33:
+                case  32:
                   resword = &wordlist[30]; break;
-                case  36:
+                case  33:
                   resword = &wordlist[31]; break;
+                case  36:
+                  resword = &wordlist[32]; break;
                 default: return 0;
                 }
               if (*str == *resword->opname && !strncmp (str + 1, resword->opname + 1, len - 1))
@@ -15896,7 +17411,7 @@ TAO_CORBA_OperationDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned i
 static TAO_CORBA_OperationDef_Perfect_Hash_OpTable tao_CORBA_OperationDef_optable;
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:999
+// be\be_visitor_interface/interface_ss.cpp:921
 
 TAO::Collocation_Proxy_Broker *
 CORBA__TAO_OperationDef_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -15916,10 +17431,7 @@ CORBA__TAO_OperationDef_Proxy_Broker_Factory_Initializer (size_t)
 static int
 CORBA__TAO_OperationDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
   CORBA__TAO_OperationDef_Proxy_Broker_Factory_Initializer (
-      reinterpret_cast<
-          size_t> (
-          CORBA__TAO_OperationDef_Proxy_Broker_Factory_Initializer
-        )
+      reinterpret_cast<size_t> (CORBA__TAO_OperationDef_Proxy_Broker_Factory_Initializer)
     );
 
 
@@ -16059,8 +17571,8 @@ namespace POA_CORBA
     
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
-      TAO::SArg_Traits< CORBA::IDLType>::ret_arg_type retval =
-        TAO::Portable_Server::get_ret_arg< CORBA::IDLType, TAO::SArg_Traits< CORBA::IDLType>::ret_arg_type> (
+      TAO::SArg_Traits< ::CORBA::IDLType>::ret_arg_type retval =
+        TAO::Portable_Server::get_ret_arg< ::CORBA::IDLType, TAO::SArg_Traits< ::CORBA::IDLType>::ret_arg_type> (
           this->operation_details_,
           this->args_);
       
@@ -16097,7 +17609,7 @@ void POA_CORBA::OperationDef::_get_result_def_skel (
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
   
-  TAO::SArg_Traits< CORBA::IDLType>::ret_val retval;
+  TAO::SArg_Traits< ::CORBA::IDLType>::ret_val retval;
   
   TAO::Argument * const args[] =
     {
@@ -16151,8 +17663,8 @@ namespace POA_CORBA
     
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
-      TAO::SArg_Traits< CORBA::IDLType>::in_arg_type arg_1 =
-        TAO::Portable_Server::get_in_arg< CORBA::IDLType, TAO::SArg_Traits< CORBA::IDLType>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_type arg_1 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::IDLType, TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
@@ -16190,7 +17702,7 @@ void POA_CORBA::OperationDef::_set_result_def_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   TAO::SArg_Traits< void>::ret_val retval;
-  TAO::SArg_Traits< CORBA::IDLType>::in_arg_val _tao_result_def;
+  TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_val _tao_result_def;
   
   TAO::Argument * const args[] =
     {
@@ -16245,8 +17757,8 @@ namespace POA_CORBA
     
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
-      TAO::SArg_Traits< CORBA::ParDescriptionSeq>::ret_arg_type retval =
-        TAO::Portable_Server::get_ret_arg< CORBA::ParDescriptionSeq, TAO::SArg_Traits< CORBA::ParDescriptionSeq>::ret_arg_type> (
+      TAO::SArg_Traits< ::CORBA::ParDescriptionSeq>::ret_arg_type retval =
+        TAO::Portable_Server::get_ret_arg< ::CORBA::ParDescriptionSeq, TAO::SArg_Traits< ::CORBA::ParDescriptionSeq>::ret_arg_type> (
           this->operation_details_,
           this->args_);
       
@@ -16283,7 +17795,7 @@ void POA_CORBA::OperationDef::_get_params_skel (
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
   
-  TAO::SArg_Traits< CORBA::ParDescriptionSeq>::ret_val retval;
+  TAO::SArg_Traits< ::CORBA::ParDescriptionSeq>::ret_val retval;
   
   TAO::Argument * const args[] =
     {
@@ -16337,8 +17849,8 @@ namespace POA_CORBA
     
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
-      TAO::SArg_Traits< CORBA::ParDescriptionSeq>::in_arg_type arg_1 =
-        TAO::Portable_Server::get_in_arg< CORBA::ParDescriptionSeq, TAO::SArg_Traits< CORBA::ParDescriptionSeq>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::ParDescriptionSeq>::in_arg_type arg_1 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::ParDescriptionSeq, TAO::SArg_Traits< ::CORBA::ParDescriptionSeq>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
@@ -16376,7 +17888,7 @@ void POA_CORBA::OperationDef::_set_params_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   TAO::SArg_Traits< void>::ret_val retval;
-  TAO::SArg_Traits< CORBA::ParDescriptionSeq>::in_arg_val _tao_params;
+  TAO::SArg_Traits< ::CORBA::ParDescriptionSeq>::in_arg_val _tao_params;
   
   TAO::Argument * const args[] =
     {
@@ -16431,8 +17943,8 @@ namespace POA_CORBA
     
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
-      TAO::SArg_Traits< CORBA::OperationMode>::ret_arg_type retval =
-        TAO::Portable_Server::get_ret_arg< CORBA::OperationMode, TAO::SArg_Traits< CORBA::OperationMode>::ret_arg_type> (
+      TAO::SArg_Traits< ::CORBA::OperationMode>::ret_arg_type retval =
+        TAO::Portable_Server::get_ret_arg< ::CORBA::OperationMode, TAO::SArg_Traits< ::CORBA::OperationMode>::ret_arg_type> (
           this->operation_details_,
           this->args_);
       
@@ -16469,7 +17981,7 @@ void POA_CORBA::OperationDef::_get_mode_skel (
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
   
-  TAO::SArg_Traits< CORBA::OperationMode>::ret_val retval;
+  TAO::SArg_Traits< ::CORBA::OperationMode>::ret_val retval;
   
   TAO::Argument * const args[] =
     {
@@ -16523,8 +18035,8 @@ namespace POA_CORBA
     
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
-      TAO::SArg_Traits< CORBA::OperationMode>::in_arg_type arg_1 =
-        TAO::Portable_Server::get_in_arg< CORBA::OperationMode, TAO::SArg_Traits< CORBA::OperationMode>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::OperationMode>::in_arg_type arg_1 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::OperationMode, TAO::SArg_Traits< ::CORBA::OperationMode>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
@@ -16562,7 +18074,7 @@ void POA_CORBA::OperationDef::_set_mode_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   TAO::SArg_Traits< void>::ret_val retval;
-  TAO::SArg_Traits< CORBA::OperationMode>::in_arg_val _tao_mode;
+  TAO::SArg_Traits< ::CORBA::OperationMode>::in_arg_val _tao_mode;
   
   TAO::Argument * const args[] =
     {
@@ -16617,8 +18129,8 @@ namespace POA_CORBA
     
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
-      TAO::SArg_Traits< CORBA::ContextIdSeq>::ret_arg_type retval =
-        TAO::Portable_Server::get_ret_arg< CORBA::ContextIdSeq, TAO::SArg_Traits< CORBA::ContextIdSeq>::ret_arg_type> (
+      TAO::SArg_Traits< ::CORBA::ContextIdSeq>::ret_arg_type retval =
+        TAO::Portable_Server::get_ret_arg< ::CORBA::ContextIdSeq, TAO::SArg_Traits< ::CORBA::ContextIdSeq>::ret_arg_type> (
           this->operation_details_,
           this->args_);
       
@@ -16655,7 +18167,7 @@ void POA_CORBA::OperationDef::_get_contexts_skel (
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
   
-  TAO::SArg_Traits< CORBA::ContextIdSeq>::ret_val retval;
+  TAO::SArg_Traits< ::CORBA::ContextIdSeq>::ret_val retval;
   
   TAO::Argument * const args[] =
     {
@@ -16709,8 +18221,8 @@ namespace POA_CORBA
     
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
-      TAO::SArg_Traits< CORBA::ContextIdSeq>::in_arg_type arg_1 =
-        TAO::Portable_Server::get_in_arg< CORBA::ContextIdSeq, TAO::SArg_Traits< CORBA::ContextIdSeq>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::ContextIdSeq>::in_arg_type arg_1 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::ContextIdSeq, TAO::SArg_Traits< ::CORBA::ContextIdSeq>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
@@ -16748,7 +18260,7 @@ void POA_CORBA::OperationDef::_set_contexts_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   TAO::SArg_Traits< void>::ret_val retval;
-  TAO::SArg_Traits< CORBA::ContextIdSeq>::in_arg_val _tao_contexts;
+  TAO::SArg_Traits< ::CORBA::ContextIdSeq>::in_arg_val _tao_contexts;
   
   TAO::Argument * const args[] =
     {
@@ -16803,8 +18315,8 @@ namespace POA_CORBA
     
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
-      TAO::SArg_Traits< CORBA::ExceptionDefSeq>::ret_arg_type retval =
-        TAO::Portable_Server::get_ret_arg< CORBA::ExceptionDefSeq, TAO::SArg_Traits< CORBA::ExceptionDefSeq>::ret_arg_type> (
+      TAO::SArg_Traits< ::CORBA::ExceptionDefSeq>::ret_arg_type retval =
+        TAO::Portable_Server::get_ret_arg< ::CORBA::ExceptionDefSeq, TAO::SArg_Traits< ::CORBA::ExceptionDefSeq>::ret_arg_type> (
           this->operation_details_,
           this->args_);
       
@@ -16841,7 +18353,7 @@ void POA_CORBA::OperationDef::_get_exceptions_skel (
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
   
-  TAO::SArg_Traits< CORBA::ExceptionDefSeq>::ret_val retval;
+  TAO::SArg_Traits< ::CORBA::ExceptionDefSeq>::ret_val retval;
   
   TAO::Argument * const args[] =
     {
@@ -16895,8 +18407,8 @@ namespace POA_CORBA
     
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
-      TAO::SArg_Traits< CORBA::ExceptionDefSeq>::in_arg_type arg_1 =
-        TAO::Portable_Server::get_in_arg< CORBA::ExceptionDefSeq, TAO::SArg_Traits< CORBA::ExceptionDefSeq>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::ExceptionDefSeq>::in_arg_type arg_1 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::ExceptionDefSeq, TAO::SArg_Traits< ::CORBA::ExceptionDefSeq>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
@@ -16934,7 +18446,7 @@ void POA_CORBA::OperationDef::_set_exceptions_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   TAO::SArg_Traits< void>::ret_val retval;
-  TAO::SArg_Traits< CORBA::ExceptionDefSeq>::in_arg_val _tao_exceptions;
+  TAO::SArg_Traits< ::CORBA::ExceptionDefSeq>::in_arg_val _tao_exceptions;
   
   TAO::Argument * const args[] =
     {
@@ -16998,8 +18510,8 @@ namespace POA_CORBA
           this->operation_details_,
           this->args_);
       
-      TAO::SArg_Traits< CORBA::Char *>::in_arg_type arg_1 =
-        TAO::Portable_Server::get_in_arg< CORBA::Char *, TAO::SArg_Traits< CORBA::Char *>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
@@ -17034,7 +18546,7 @@ void POA_CORBA::OperationDef::_is_a_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  TAO::SArg_Traits< CORBA::Char *>::in_arg_val _tao_repository_id;
+  TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
   
   TAO::Argument * const args[] =
     {
@@ -17155,10 +18667,98 @@ void POA_CORBA::OperationDef::_non_existent_skel (
   
 }
 
+namespace POA_CORBA
+{
+  
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_operation/upcall_command_ss.cpp:127
+  
+  class _repository_id_OperationDef_Upcall_Command
+    : public TAO::Upcall_Command
+  {
+  public:
+    inline _repository_id_OperationDef_Upcall_Command (
+      POA_CORBA::OperationDef * servant,
+      TAO_Operation_Details const * operation_details,
+      TAO::Argument * const args[])
+      : servant_ (servant)
+      , operation_details_ (operation_details)
+      , args_ (args)
+    {
+    }
+    
+    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+    {
+      TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
+        TAO::Portable_Server::get_ret_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type> (
+          this->operation_details_,
+          this->args_);
+      
+      
+      retval =
+        this->servant_-> _repository_id (
+          ACE_ENV_SINGLE_ARG_PARAMETER);
+        
+    }
+  
+  private:
+    POA_CORBA::OperationDef * const servant_;
+    TAO_Operation_Details const * const operation_details_;
+    TAO::Argument * const * const args_;
+  };
+  
+}
+void POA_CORBA::OperationDef::_repository_id_skel (
+    TAO_ServerRequest & server_request, 
+    void * TAO_INTERCEPTOR (servant_upcall),
+    void * servant
+    ACE_ENV_ARG_DECL
+  )
+{
+  
+  
+#if TAO_HAS_INTERCEPTORS == 1
+  static CORBA::TypeCode_ptr const * const exceptions = 0;
+  static size_t const nexceptions = 0;
+#endif /* TAO_HAS_INTERCEPTORS */
+  
+  TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
+  
+  TAO::Argument * const args[] =
+    {
+      &retval
+    };
+  
+  static size_t const nargs = 1;
+  
+  POA_CORBA::OperationDef * const impl =
+    static_cast<POA_CORBA::OperationDef *> (servant);
+  
+  _repository_id_OperationDef_Upcall_Command command (
+    impl,
+    server_request.operation_details (),
+    args);
+  
+  TAO::Upcall_Wrapper upcall_wrapper;
+  upcall_wrapper.upcall (server_request
+                         , args
+                         , nargs
+                         , command
+#if TAO_HAS_INTERCEPTORS == 1
+                         , servant_upcall
+                         , exceptions
+                         , nexceptions
+#endif  /* TAO_HAS_INTERCEPTORS == 1 */
+                         ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+  
+}
+
 
 
 // TAO_IDL - Generated from 
-// be\be_visitor_interface/interface_ss.cpp:393
+// be\be_visitor_interface/interface_ss.cpp:501
 
 
 
@@ -17323,7 +18923,7 @@ const char* POA_CORBA::OperationDef::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:940
+// be\be_visitor_interface/interface_ss.cpp:862
 
 void POA_CORBA::OperationDef::_dispatch (
     TAO_ServerRequest & req,
@@ -17338,7 +18938,7 @@ void POA_CORBA::OperationDef::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:891
+// be\be_visitor_interface/interface_ss.cpp:813
 
 CORBA::OperationDef *
 POA_CORBA::OperationDef::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -17370,7 +18970,7 @@ POA_CORBA::OperationDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1455
+// be\be_interface.cpp:1465
 
 class TAO_CORBA_InterfaceDef_Perfect_Hash_OpTable
   : public TAO_Perfect_Hash_OpTable
@@ -17383,53 +18983,53 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: c:\ace\latest\ACE_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0 -a -o -t -p -K opname -L C++ -Z TAO_CORBA_InterfaceDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ACE\Any\ACE_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0 -a -o -t -p -K opname -L C++ -Z TAO_CORBA_InterfaceDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_InterfaceDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
   static const unsigned char asso_values[] =
     {
 #if defined (ACE_MVS)
-     79, 79, 79, 79, 79, 79, 79, 79, 79, 79,
-     79, 79, 79, 79, 79, 79, 79, 79, 79, 79,
-     79, 79, 79, 79, 79, 79, 79, 79, 79, 79,
-     79, 79, 79, 79, 79, 79, 79, 79, 79, 79,
-     79, 79, 79, 79, 79, 79, 79, 79, 79, 79,
-     79, 79, 79, 79, 79, 79, 79, 79, 79, 79,
-     79, 79, 79, 79, 79, 79, 79, 79, 79, 79,
-     79, 79, 79, 79, 79, 79, 79, 79, 79, 79,
-     79, 79, 79, 79, 79, 79, 79, 79, 79, 79,
-     79, 79, 79, 79, 79, 79, 79, 79, 79, 79,
-     79, 79, 79, 79, 79, 79, 79, 79, 79, 25,
-     79, 79, 79, 79, 79, 79, 79, 79, 79, 79,
-     79, 79, 79, 79, 79, 79, 79, 79, 79,  0,
-     79,  0, 20,  0, 79, 79, 79,  5, 79, 79,
-     79, 79, 79, 79, 79, 79, 79, 15,  0,  5,
-     79, 15, 79, 79, 79, 79, 79, 79, 79, 79,
-     79, 79, 25, 40, 79, 79, 79, 15,  0, 79,
-     79, 79, 79, 79, 79, 79, 79, 79, 79, 79,
-     79, 79, 79, 79, 79, 79, 79, 79, 79, 79,
-     79, 79, 79, 79, 79, 79, 79, 79, 79, 79,
-     79, 79, 79, 79, 79, 79, 79, 79, 79, 79,
-     79, 79, 79, 79, 79, 79, 79, 79, 79, 79,
-     79, 79, 79, 79, 79, 79, 79, 79, 79, 79,
-     79, 79, 79, 79, 79, 79, 79, 79, 79, 79,
-     79, 79, 79, 79, 79, 79, 79, 79, 79, 79,
-     79, 79, 79, 79, 79, 79,
+     81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
+     81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
+     81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
+     81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
+     81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
+     81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
+     81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
+     81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
+     81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
+     81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
+     81, 81, 81, 81, 81, 81, 81, 81, 81,  0,
+     81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
+     81, 81, 81, 81, 81, 81, 81, 81, 81,  0,
+     81, 30, 20,  0, 81, 81, 81, 10, 81, 81,
+     81, 81, 81, 81, 81, 81, 81,  0,  0,  5,
+     81,  0, 81, 81, 81, 81, 81, 81, 81, 81,
+     81, 81, 20, 35, 81, 81, 81, 10,  5, 81,
+     81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
+     81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
+     81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
+     81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
+     81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
+     81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
+     81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
+     81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
+     81, 81, 81, 81, 81, 81,
 #else
-     79, 79, 79, 79, 79, 79, 79, 79, 79, 79,
-     79, 79, 79, 79, 79, 79, 79, 79, 79, 79,
-     79, 79, 79, 79, 79, 79, 79, 79, 79, 79,
-     79, 79, 79, 79, 79, 79, 79, 79, 79, 79,
-     79, 79, 79, 79, 79, 79, 79, 79, 79, 79,
-     79, 79, 79, 79, 79, 79, 79, 79, 79, 79,
-     79, 79, 79, 79, 79, 79, 79, 79, 79, 79,
-     79, 79, 79, 79, 79, 79, 79, 79, 79, 79,
-     79, 79, 79, 79, 79, 79, 79, 79, 79, 79,
-     79, 79, 79, 79, 79, 25, 79,  0, 79,  0,
-     20,  0, 79, 79, 79,  5, 79, 79, 15,  0,
-      5, 79, 15, 79, 79, 25, 40, 79, 79, 79,
-     15,  0, 79, 79, 79, 79, 79, 79,
+     81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
+     81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
+     81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
+     81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
+     81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
+     81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
+     81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
+     81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
+     81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
+     81, 81, 81, 81, 81,  0, 81,  0, 81, 30,
+     20,  0, 81, 81, 81, 10, 81, 81,  0,  0,
+      5, 81,  0, 81, 81, 20, 35, 81, 81, 81,
+     10,  5, 81, 81, 81, 81, 81, 81,
 #endif /* ACE_MVS */
     };
   return len + asso_values[(int) str[len - 1]] + asso_values[(int) str[0]];
@@ -17440,71 +19040,72 @@ TAO_CORBA_InterfaceDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned i
 {
   enum
     {
-      TOTAL_KEYWORDS = 42,
+      TOTAL_KEYWORDS = 43,
       MIN_WORD_LENGTH = 4,
       MAX_WORD_LENGTH = 26,
       MIN_HASH_VALUE = 4,
-      MAX_HASH_VALUE = 78,
-      HASH_VALUE_RANGE = 75,
+      MAX_HASH_VALUE = 80,
+      HASH_VALUE_RANGE = 77,
       DUPLICATES = 10,
-      WORDLIST_SIZE = 46
+      WORDLIST_SIZE = 47
     };
 
   static const TAO_operation_db_entry  wordlist[] =
     {
       {"",0,0},{"",0,0},{"",0,0},{"",0,0},
       {"move", &POA_CORBA::InterfaceDef::move_skel, 0},
+      {"_is_a", &POA_CORBA::InterfaceDef::_is_a_skel, 0},
+      {"lookup", &POA_CORBA::InterfaceDef::lookup_skel, 0},
+      {"_get_name", &POA_CORBA::InterfaceDef::_get_name_skel, 0},
+      {"_get_type", &POA_CORBA::InterfaceDef::_get_type_skel, 0},
+      {"_set_name", &POA_CORBA::InterfaceDef::_set_name_skel, 0},
+      {"_interface", &POA_CORBA::InterfaceDef::_interface_skel, 0},
+      {"lookup_name", &POA_CORBA::InterfaceDef::lookup_name_skel, 0},
       {"is_a", &POA_CORBA::InterfaceDef::is_a_skel, 0},
+      {"_get_version", &POA_CORBA::InterfaceDef::_get_version_skel, 0},
+      {"_set_version", &POA_CORBA::InterfaceDef::_set_version_skel, 0},
+      {"_get_absolute_name", &POA_CORBA::InterfaceDef::_get_absolute_name_skel, 0},
+      {"_get_defined_in", &POA_CORBA::InterfaceDef::_get_defined_in_skel, 0},
+      {"_get_id", &POA_CORBA::InterfaceDef::_get_id_skel, 0},
+      {"_set_id", &POA_CORBA::InterfaceDef::_set_id_skel, 0},
+      {"describe", &POA_CORBA::InterfaceDef::describe_skel, 0},
+      {"_get_containing_repository", &POA_CORBA::InterfaceDef::_get_containing_repository_skel, 0},
+      {"destroy", &POA_CORBA::InterfaceDef::destroy_skel, 0},
+      {"_get_def_kind", &POA_CORBA::InterfaceDef::_get_def_kind_skel, 0},
+      {"_repository_id", &POA_CORBA::InterfaceDef::_repository_id_skel, 0},
+      {"describe_interface", &POA_CORBA::InterfaceDef::describe_interface_skel, 0},
+      {"_get_base_interfaces", &POA_CORBA::InterfaceDef::_get_base_interfaces_skel, 0},
+      {"_set_base_interfaces", &POA_CORBA::InterfaceDef::_set_base_interfaces_skel, 0},
       {"create_enum", &POA_CORBA::InterfaceDef::create_enum_skel, 0},
       {"create_value", &POA_CORBA::InterfaceDef::create_value_skel, 0},
       {"create_module", &POA_CORBA::InterfaceDef::create_module_skel, 0},
       {"create_native", &POA_CORBA::InterfaceDef::create_native_skel, 0},
+      {"_component", &POA_CORBA::InterfaceDef::_component_skel, 0},
       {"create_interface", &POA_CORBA::InterfaceDef::create_interface_skel, 0},
       {"create_attribute", &POA_CORBA::InterfaceDef::create_attribute_skel, 0},
       {"create_ext_value", &POA_CORBA::InterfaceDef::create_ext_value_skel, 0},
       {"create_union", &POA_CORBA::InterfaceDef::create_union_skel, 0},
+      {"_non_existent", &POA_CORBA::InterfaceDef::_non_existent_skel, 0},
       {"create_exception", &POA_CORBA::InterfaceDef::create_exception_skel, 0},
       {"create_operation", &POA_CORBA::InterfaceDef::create_operation_skel, 0},
       {"create_local_interface", &POA_CORBA::InterfaceDef::create_local_interface_skel, 0},
       {"create_abstract_interface", &POA_CORBA::InterfaceDef::create_abstract_interface_skel, 0},
-      {"lookup_name", &POA_CORBA::InterfaceDef::lookup_name_skel, 0},
-      {"destroy", &POA_CORBA::InterfaceDef::destroy_skel, 0},
-      {"describe", &POA_CORBA::InterfaceDef::describe_skel, 0},
-      {"_is_a", &POA_CORBA::InterfaceDef::_is_a_skel, 0},
       {"create_value_box", &POA_CORBA::InterfaceDef::create_value_box_skel, 0},
+      {"describe_contents", &POA_CORBA::InterfaceDef::describe_contents_skel, 0},
       {"contents", &POA_CORBA::InterfaceDef::contents_skel, 0},
-      {"_get_name", &POA_CORBA::InterfaceDef::_get_name_skel, 0},
-      {"_get_type", &POA_CORBA::InterfaceDef::_get_type_skel, 0},
-      {"_set_name", &POA_CORBA::InterfaceDef::_set_name_skel, 0},
-      {"_interface", &POA_CORBA::InterfaceDef::_interface_skel, 0},
-      {"lookup", &POA_CORBA::InterfaceDef::lookup_skel, 0},
       {"create_alias", &POA_CORBA::InterfaceDef::create_alias_skel, 0},
-      {"describe_interface", &POA_CORBA::InterfaceDef::describe_interface_skel, 0},
-      {"_get_version", &POA_CORBA::InterfaceDef::_get_version_skel, 0},
-      {"_set_version", &POA_CORBA::InterfaceDef::_set_version_skel, 0},
-      {"_get_absolute_name", &POA_CORBA::InterfaceDef::_get_absolute_name_skel, 0},
-      {"_get_defined_in", &POA_CORBA::InterfaceDef::_get_defined_in_skel, 0},
-      {"_get_containing_repository", &POA_CORBA::InterfaceDef::_get_containing_repository_skel, 0},
-      {"_get_id", &POA_CORBA::InterfaceDef::_get_id_skel, 0},
-      {"_set_id", &POA_CORBA::InterfaceDef::_set_id_skel, 0},
       {"create_struct", &POA_CORBA::InterfaceDef::create_struct_skel, 0},
       {"create_constant", &POA_CORBA::InterfaceDef::create_constant_skel, 0},
-      {"_get_def_kind", &POA_CORBA::InterfaceDef::_get_def_kind_skel, 0},
-      {"describe_contents", &POA_CORBA::InterfaceDef::describe_contents_skel, 0},
-      {"_get_base_interfaces", &POA_CORBA::InterfaceDef::_get_base_interfaces_skel, 0},
-      {"_set_base_interfaces", &POA_CORBA::InterfaceDef::_set_base_interfaces_skel, 0},
-      {"_component", &POA_CORBA::InterfaceDef::_component_skel, 0},
-      {"_non_existent", &POA_CORBA::InterfaceDef::_non_existent_skel, 0},
     };
 
   static const signed char lookup[] =
     {
-       -1,  -1,  -1,  -1,   4,  -1,  -1,  -8,  -2,   5,  -1,   6,   7, -84, 
-      -10,  -3, -80,  13,  -1, -14,  -2, -80,  16, -24,  -3,  17,  18,  19, 
-       20,  -1,  21,  22,  -1,  23, -89,  27,  28,  29,  30,  -1, -31,  -2, 
-      -80,  33,  -1,  34,  -1,  -1,  -1, -36,  -2,  35, -81,  38,  -1,  39, 
-       -1,  -1,  40,  -1,  -1,  -1,  41,  -1,  -1,  -1,  -1,  -1, -42,  -2, 
-      -80,  -1,  -1,  -1,  -1,  44,  -1,  -1,  45, 
+       -1,  -1,  -1,  -1,   4,   5,   6,  -7,  -3, -82,  10,  11,  -1,  -1, 
+       12, -13,  -2, -82,  15,  -1,  16,  -1,  -1, -17,  -2, -25,  -2, -84, 
+       19, -29,  -2,  20,  21,  22,  23,  -1, -32,  -3,  24,  -1, -95,  27, 
+       28, -94,  -1,  31, -90,  35,  36, -37,  -2, -82,  39,  -1,  -1,  40, 
+       41,  42,  43,  -1,  -1,  -1,  44,  -1,  -1,  -1,  -1,  -1,  -1,  -1, 
+       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  45,  -1,  46, 
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -17542,7 +19143,7 @@ TAO_CORBA_InterfaceDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned i
 static TAO_CORBA_InterfaceDef_Perfect_Hash_OpTable tao_CORBA_InterfaceDef_optable;
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:999
+// be\be_visitor_interface/interface_ss.cpp:921
 
 TAO::Collocation_Proxy_Broker *
 CORBA__TAO_InterfaceDef_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -17562,10 +19163,7 @@ CORBA__TAO_InterfaceDef_Proxy_Broker_Factory_Initializer (size_t)
 static int
 CORBA__TAO_InterfaceDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
   CORBA__TAO_InterfaceDef_Proxy_Broker_Factory_Initializer (
-      reinterpret_cast<
-          size_t> (
-          CORBA__TAO_InterfaceDef_Proxy_Broker_Factory_Initializer
-        )
+      reinterpret_cast<size_t> (CORBA__TAO_InterfaceDef_Proxy_Broker_Factory_Initializer)
     );
 
 
@@ -17615,8 +19213,8 @@ namespace POA_CORBA
     
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
-      TAO::SArg_Traits< CORBA::InterfaceDefSeq>::ret_arg_type retval =
-        TAO::Portable_Server::get_ret_arg< CORBA::InterfaceDefSeq, TAO::SArg_Traits< CORBA::InterfaceDefSeq>::ret_arg_type> (
+      TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::ret_arg_type retval =
+        TAO::Portable_Server::get_ret_arg< ::CORBA::InterfaceDefSeq, TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::ret_arg_type> (
           this->operation_details_,
           this->args_);
       
@@ -17653,7 +19251,7 @@ void POA_CORBA::InterfaceDef::_get_base_interfaces_skel (
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
   
-  TAO::SArg_Traits< CORBA::InterfaceDefSeq>::ret_val retval;
+  TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::ret_val retval;
   
   TAO::Argument * const args[] =
     {
@@ -17707,8 +19305,8 @@ namespace POA_CORBA
     
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
-      TAO::SArg_Traits< CORBA::InterfaceDefSeq>::in_arg_type arg_1 =
-        TAO::Portable_Server::get_in_arg< CORBA::InterfaceDefSeq, TAO::SArg_Traits< CORBA::InterfaceDefSeq>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_type arg_1 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::InterfaceDefSeq, TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
@@ -17746,7 +19344,7 @@ void POA_CORBA::InterfaceDef::_set_base_interfaces_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   TAO::SArg_Traits< void>::ret_val retval;
-  TAO::SArg_Traits< CORBA::InterfaceDefSeq>::in_arg_val _tao_base_interfaces;
+  TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_val _tao_base_interfaces;
   
   TAO::Argument * const args[] =
     {
@@ -17806,8 +19404,8 @@ namespace POA_CORBA
           this->operation_details_,
           this->args_);
       
-      TAO::SArg_Traits< CORBA::RepositoryId>::in_arg_type arg_1 =
-        TAO::Portable_Server::get_in_arg< CORBA::RepositoryId, TAO::SArg_Traits< CORBA::RepositoryId>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId, TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
@@ -17847,7 +19445,7 @@ void POA_CORBA::InterfaceDef::is_a_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  TAO::SArg_Traits< CORBA::RepositoryId>::in_arg_val _tao_interface_id;
+  TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_interface_id;
   
   TAO::Argument * const args[] =
     {
@@ -17902,8 +19500,8 @@ namespace POA_CORBA
     
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
-      TAO::SArg_Traits< CORBA::InterfaceDef::FullInterfaceDescription>::ret_arg_type retval =
-        TAO::Portable_Server::get_ret_arg< CORBA::InterfaceDef::FullInterfaceDescription, TAO::SArg_Traits< CORBA::InterfaceDef::FullInterfaceDescription>::ret_arg_type> (
+      TAO::SArg_Traits< ::CORBA::InterfaceDef::FullInterfaceDescription>::ret_arg_type retval =
+        TAO::Portable_Server::get_ret_arg< ::CORBA::InterfaceDef::FullInterfaceDescription, TAO::SArg_Traits< ::CORBA::InterfaceDef::FullInterfaceDescription>::ret_arg_type> (
           this->operation_details_,
           this->args_);
       
@@ -17940,7 +19538,7 @@ void POA_CORBA::InterfaceDef::describe_interface_skel (
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
   
-  TAO::SArg_Traits< CORBA::InterfaceDef::FullInterfaceDescription>::ret_val retval;
+  TAO::SArg_Traits< ::CORBA::InterfaceDef::FullInterfaceDescription>::ret_val retval;
   
   TAO::Argument * const args[] =
     {
@@ -17994,37 +19592,37 @@ namespace POA_CORBA
     
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
-      TAO::SArg_Traits< CORBA::AttributeDef>::ret_arg_type retval =
-        TAO::Portable_Server::get_ret_arg< CORBA::AttributeDef, TAO::SArg_Traits< CORBA::AttributeDef>::ret_arg_type> (
+      TAO::SArg_Traits< ::CORBA::AttributeDef>::ret_arg_type retval =
+        TAO::Portable_Server::get_ret_arg< ::CORBA::AttributeDef, TAO::SArg_Traits< ::CORBA::AttributeDef>::ret_arg_type> (
           this->operation_details_,
           this->args_);
       
-      TAO::SArg_Traits< CORBA::RepositoryId>::in_arg_type arg_1 =
-        TAO::Portable_Server::get_in_arg< CORBA::RepositoryId, TAO::SArg_Traits< CORBA::RepositoryId>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId, TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
         
-      TAO::SArg_Traits< CORBA::Identifier>::in_arg_type arg_2 =
-        TAO::Portable_Server::get_in_arg< CORBA::Identifier, TAO::SArg_Traits< CORBA::Identifier>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::Identifier, TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type> (
           this->operation_details_,
           this->args_,
           2);
         
-      TAO::SArg_Traits< CORBA::VersionSpec>::in_arg_type arg_3 =
-        TAO::Portable_Server::get_in_arg< CORBA::VersionSpec, TAO::SArg_Traits< CORBA::VersionSpec>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec, TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type> (
           this->operation_details_,
           this->args_,
           3);
         
-      TAO::SArg_Traits< CORBA::IDLType>::in_arg_type arg_4 =
-        TAO::Portable_Server::get_in_arg< CORBA::IDLType, TAO::SArg_Traits< CORBA::IDLType>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_type arg_4 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::IDLType, TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_type> (
           this->operation_details_,
           this->args_,
           4);
         
-      TAO::SArg_Traits< CORBA::AttributeMode>::in_arg_type arg_5 =
-        TAO::Portable_Server::get_in_arg< CORBA::AttributeMode, TAO::SArg_Traits< CORBA::AttributeMode>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::AttributeMode>::in_arg_type arg_5 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::AttributeMode, TAO::SArg_Traits< ::CORBA::AttributeMode>::in_arg_type> (
           this->operation_details_,
           this->args_,
           5);
@@ -18067,12 +19665,12 @@ void POA_CORBA::InterfaceDef::create_attribute_skel (
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
   
-  TAO::SArg_Traits< CORBA::AttributeDef>::ret_val retval;
-  TAO::SArg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id;
-  TAO::SArg_Traits< CORBA::Identifier>::in_arg_val _tao_name;
-  TAO::SArg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version;
-  TAO::SArg_Traits< CORBA::IDLType>::in_arg_val _tao_type;
-  TAO::SArg_Traits< CORBA::AttributeMode>::in_arg_val _tao_mode;
+  TAO::SArg_Traits< ::CORBA::AttributeDef>::ret_val retval;
+  TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
+  TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
+  TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version;
+  TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_val _tao_type;
+  TAO::SArg_Traits< ::CORBA::AttributeMode>::in_arg_val _tao_mode;
   
   TAO::Argument * const args[] =
     {
@@ -18131,55 +19729,55 @@ namespace POA_CORBA
     
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
-      TAO::SArg_Traits< CORBA::OperationDef>::ret_arg_type retval =
-        TAO::Portable_Server::get_ret_arg< CORBA::OperationDef, TAO::SArg_Traits< CORBA::OperationDef>::ret_arg_type> (
+      TAO::SArg_Traits< ::CORBA::OperationDef>::ret_arg_type retval =
+        TAO::Portable_Server::get_ret_arg< ::CORBA::OperationDef, TAO::SArg_Traits< ::CORBA::OperationDef>::ret_arg_type> (
           this->operation_details_,
           this->args_);
       
-      TAO::SArg_Traits< CORBA::RepositoryId>::in_arg_type arg_1 =
-        TAO::Portable_Server::get_in_arg< CORBA::RepositoryId, TAO::SArg_Traits< CORBA::RepositoryId>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId, TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
         
-      TAO::SArg_Traits< CORBA::Identifier>::in_arg_type arg_2 =
-        TAO::Portable_Server::get_in_arg< CORBA::Identifier, TAO::SArg_Traits< CORBA::Identifier>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::Identifier, TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type> (
           this->operation_details_,
           this->args_,
           2);
         
-      TAO::SArg_Traits< CORBA::VersionSpec>::in_arg_type arg_3 =
-        TAO::Portable_Server::get_in_arg< CORBA::VersionSpec, TAO::SArg_Traits< CORBA::VersionSpec>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec, TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type> (
           this->operation_details_,
           this->args_,
           3);
         
-      TAO::SArg_Traits< CORBA::IDLType>::in_arg_type arg_4 =
-        TAO::Portable_Server::get_in_arg< CORBA::IDLType, TAO::SArg_Traits< CORBA::IDLType>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_type arg_4 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::IDLType, TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_type> (
           this->operation_details_,
           this->args_,
           4);
         
-      TAO::SArg_Traits< CORBA::OperationMode>::in_arg_type arg_5 =
-        TAO::Portable_Server::get_in_arg< CORBA::OperationMode, TAO::SArg_Traits< CORBA::OperationMode>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::OperationMode>::in_arg_type arg_5 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::OperationMode, TAO::SArg_Traits< ::CORBA::OperationMode>::in_arg_type> (
           this->operation_details_,
           this->args_,
           5);
         
-      TAO::SArg_Traits< CORBA::ParDescriptionSeq>::in_arg_type arg_6 =
-        TAO::Portable_Server::get_in_arg< CORBA::ParDescriptionSeq, TAO::SArg_Traits< CORBA::ParDescriptionSeq>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::ParDescriptionSeq>::in_arg_type arg_6 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::ParDescriptionSeq, TAO::SArg_Traits< ::CORBA::ParDescriptionSeq>::in_arg_type> (
           this->operation_details_,
           this->args_,
           6);
         
-      TAO::SArg_Traits< CORBA::ExceptionDefSeq>::in_arg_type arg_7 =
-        TAO::Portable_Server::get_in_arg< CORBA::ExceptionDefSeq, TAO::SArg_Traits< CORBA::ExceptionDefSeq>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::ExceptionDefSeq>::in_arg_type arg_7 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::ExceptionDefSeq, TAO::SArg_Traits< ::CORBA::ExceptionDefSeq>::in_arg_type> (
           this->operation_details_,
           this->args_,
           7);
         
-      TAO::SArg_Traits< CORBA::ContextIdSeq>::in_arg_type arg_8 =
-        TAO::Portable_Server::get_in_arg< CORBA::ContextIdSeq, TAO::SArg_Traits< CORBA::ContextIdSeq>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::ContextIdSeq>::in_arg_type arg_8 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::ContextIdSeq, TAO::SArg_Traits< ::CORBA::ContextIdSeq>::in_arg_type> (
           this->operation_details_,
           this->args_,
           8);
@@ -18225,15 +19823,15 @@ void POA_CORBA::InterfaceDef::create_operation_skel (
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
   
-  TAO::SArg_Traits< CORBA::OperationDef>::ret_val retval;
-  TAO::SArg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id;
-  TAO::SArg_Traits< CORBA::Identifier>::in_arg_val _tao_name;
-  TAO::SArg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version;
-  TAO::SArg_Traits< CORBA::IDLType>::in_arg_val _tao_result;
-  TAO::SArg_Traits< CORBA::OperationMode>::in_arg_val _tao_mode;
-  TAO::SArg_Traits< CORBA::ParDescriptionSeq>::in_arg_val _tao_params;
-  TAO::SArg_Traits< CORBA::ExceptionDefSeq>::in_arg_val _tao_exceptions;
-  TAO::SArg_Traits< CORBA::ContextIdSeq>::in_arg_val _tao_contexts;
+  TAO::SArg_Traits< ::CORBA::OperationDef>::ret_val retval;
+  TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
+  TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
+  TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version;
+  TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_val _tao_result;
+  TAO::SArg_Traits< ::CORBA::OperationMode>::in_arg_val _tao_mode;
+  TAO::SArg_Traits< ::CORBA::ParDescriptionSeq>::in_arg_val _tao_params;
+  TAO::SArg_Traits< ::CORBA::ExceptionDefSeq>::in_arg_val _tao_exceptions;
+  TAO::SArg_Traits< ::CORBA::ContextIdSeq>::in_arg_val _tao_contexts;
   
   TAO::Argument * const args[] =
     {
@@ -18304,8 +19902,8 @@ namespace POA_CORBA
           this->operation_details_,
           this->args_);
       
-      TAO::SArg_Traits< CORBA::Char *>::in_arg_type arg_1 =
-        TAO::Portable_Server::get_in_arg< CORBA::Char *, TAO::SArg_Traits< CORBA::Char *>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
@@ -18340,7 +19938,7 @@ void POA_CORBA::InterfaceDef::_is_a_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  TAO::SArg_Traits< CORBA::Char *>::in_arg_val _tao_repository_id;
+  TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
   
   TAO::Argument * const args[] =
     {
@@ -18461,10 +20059,98 @@ void POA_CORBA::InterfaceDef::_non_existent_skel (
   
 }
 
+namespace POA_CORBA
+{
+  
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_operation/upcall_command_ss.cpp:127
+  
+  class _repository_id_InterfaceDef_Upcall_Command
+    : public TAO::Upcall_Command
+  {
+  public:
+    inline _repository_id_InterfaceDef_Upcall_Command (
+      POA_CORBA::InterfaceDef * servant,
+      TAO_Operation_Details const * operation_details,
+      TAO::Argument * const args[])
+      : servant_ (servant)
+      , operation_details_ (operation_details)
+      , args_ (args)
+    {
+    }
+    
+    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+    {
+      TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
+        TAO::Portable_Server::get_ret_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type> (
+          this->operation_details_,
+          this->args_);
+      
+      
+      retval =
+        this->servant_-> _repository_id (
+          ACE_ENV_SINGLE_ARG_PARAMETER);
+        
+    }
+  
+  private:
+    POA_CORBA::InterfaceDef * const servant_;
+    TAO_Operation_Details const * const operation_details_;
+    TAO::Argument * const * const args_;
+  };
+  
+}
+void POA_CORBA::InterfaceDef::_repository_id_skel (
+    TAO_ServerRequest & server_request, 
+    void * TAO_INTERCEPTOR (servant_upcall),
+    void * servant
+    ACE_ENV_ARG_DECL
+  )
+{
+  
+  
+#if TAO_HAS_INTERCEPTORS == 1
+  static CORBA::TypeCode_ptr const * const exceptions = 0;
+  static size_t const nexceptions = 0;
+#endif /* TAO_HAS_INTERCEPTORS */
+  
+  TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
+  
+  TAO::Argument * const args[] =
+    {
+      &retval
+    };
+  
+  static size_t const nargs = 1;
+  
+  POA_CORBA::InterfaceDef * const impl =
+    static_cast<POA_CORBA::InterfaceDef *> (servant);
+  
+  _repository_id_InterfaceDef_Upcall_Command command (
+    impl,
+    server_request.operation_details (),
+    args);
+  
+  TAO::Upcall_Wrapper upcall_wrapper;
+  upcall_wrapper.upcall (server_request
+                         , args
+                         , nargs
+                         , command
+#if TAO_HAS_INTERCEPTORS == 1
+                         , servant_upcall
+                         , exceptions
+                         , nexceptions
+#endif  /* TAO_HAS_INTERCEPTORS == 1 */
+                         ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+  
+}
+
 
 
 // TAO_IDL - Generated from 
-// be\be_visitor_interface/interface_ss.cpp:393
+// be\be_visitor_interface/interface_ss.cpp:501
 
 
 
@@ -18637,7 +20323,7 @@ const char* POA_CORBA::InterfaceDef::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:940
+// be\be_visitor_interface/interface_ss.cpp:862
 
 void POA_CORBA::InterfaceDef::_dispatch (
     TAO_ServerRequest & req,
@@ -18652,7 +20338,7 @@ void POA_CORBA::InterfaceDef::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:891
+// be\be_visitor_interface/interface_ss.cpp:813
 
 CORBA::InterfaceDef *
 POA_CORBA::InterfaceDef::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -18684,7 +20370,7 @@ POA_CORBA::InterfaceDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1455
+// be\be_interface.cpp:1465
 
 class TAO_CORBA_InterfaceAttrExtension_Perfect_Hash_OpTable
   : public TAO_Perfect_Hash_OpTable
@@ -18697,7 +20383,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: c:\ace\latest\ACE_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0 -a -o -t -p -K opname -L C++ -Z TAO_CORBA_InterfaceAttrExtension_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ACE\Any\ACE_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0 -a -o -t -p -K opname -L C++ -Z TAO_CORBA_InterfaceAttrExtension_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_InterfaceAttrExtension_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -18754,14 +20440,14 @@ TAO_CORBA_InterfaceAttrExtension_Perfect_Hash_OpTable::lookup (const char *str,
 {
   enum
     {
-      TOTAL_KEYWORDS = 6,
+      TOTAL_KEYWORDS = 7,
       MIN_WORD_LENGTH = 5,
       MAX_WORD_LENGTH = 22,
       MIN_HASH_VALUE = 5,
       MAX_HASH_VALUE = 22,
       HASH_VALUE_RANGE = 18,
       DUPLICATES = 0,
-      WORDLIST_SIZE = 11
+      WORDLIST_SIZE = 12
     };
 
   static const TAO_operation_db_entry  wordlist[] =
@@ -18770,7 +20456,8 @@ TAO_CORBA_InterfaceAttrExtension_Perfect_Hash_OpTable::lookup (const char *str,
       {"_is_a", &POA_CORBA::InterfaceAttrExtension::_is_a_skel, 0},
       {"",0,0},{"",0,0},{"",0,0},{"",0,0},
       {"_interface", &POA_CORBA::InterfaceAttrExtension::_interface_skel, 0},
-      {"",0,0},{"",0,0},{"",0,0},{"",0,0},
+      {"",0,0},{"",0,0},{"",0,0},
+      {"_repository_id", &POA_CORBA::InterfaceAttrExtension::_repository_id_skel, 0},
       {"_component", &POA_CORBA::InterfaceAttrExtension::_component_skel, 0},
       {"",0,0},{"",0,0},
       {"_non_existent", &POA_CORBA::InterfaceAttrExtension::_non_existent_skel, 0},
@@ -18798,7 +20485,7 @@ TAO_CORBA_InterfaceAttrExtension_Perfect_Hash_OpTable::lookup (const char *str,
 static TAO_CORBA_InterfaceAttrExtension_Perfect_Hash_OpTable tao_CORBA_InterfaceAttrExtension_optable;
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:999
+// be\be_visitor_interface/interface_ss.cpp:921
 
 TAO::Collocation_Proxy_Broker *
 CORBA__TAO_InterfaceAttrExtension_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -18818,10 +20505,7 @@ CORBA__TAO_InterfaceAttrExtension_Proxy_Broker_Factory_Initializer (size_t)
 static int
 CORBA__TAO_InterfaceAttrExtension_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
   CORBA__TAO_InterfaceAttrExtension_Proxy_Broker_Factory_Initializer (
-      reinterpret_cast<
-          size_t> (
-          CORBA__TAO_InterfaceAttrExtension_Proxy_Broker_Factory_Initializer
-        )
+      reinterpret_cast<size_t> (CORBA__TAO_InterfaceAttrExtension_Proxy_Broker_Factory_Initializer)
     );
 
 
@@ -18867,8 +20551,8 @@ namespace POA_CORBA
     
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
-      TAO::SArg_Traits< CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription>::ret_arg_type retval =
-        TAO::Portable_Server::get_ret_arg< CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription, TAO::SArg_Traits< CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription>::ret_arg_type> (
+      TAO::SArg_Traits< ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription>::ret_arg_type retval =
+        TAO::Portable_Server::get_ret_arg< ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription, TAO::SArg_Traits< ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription>::ret_arg_type> (
           this->operation_details_,
           this->args_);
       
@@ -18905,7 +20589,7 @@ void POA_CORBA::InterfaceAttrExtension::describe_ext_interface_skel (
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
   
-  TAO::SArg_Traits< CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription>::ret_val retval;
+  TAO::SArg_Traits< ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription>::ret_val retval;
   
   TAO::Argument * const args[] =
     {
@@ -18959,49 +20643,49 @@ namespace POA_CORBA
     
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
-      TAO::SArg_Traits< CORBA::ExtAttributeDef>::ret_arg_type retval =
-        TAO::Portable_Server::get_ret_arg< CORBA::ExtAttributeDef, TAO::SArg_Traits< CORBA::ExtAttributeDef>::ret_arg_type> (
+      TAO::SArg_Traits< ::CORBA::ExtAttributeDef>::ret_arg_type retval =
+        TAO::Portable_Server::get_ret_arg< ::CORBA::ExtAttributeDef, TAO::SArg_Traits< ::CORBA::ExtAttributeDef>::ret_arg_type> (
           this->operation_details_,
           this->args_);
       
-      TAO::SArg_Traits< CORBA::RepositoryId>::in_arg_type arg_1 =
-        TAO::Portable_Server::get_in_arg< CORBA::RepositoryId, TAO::SArg_Traits< CORBA::RepositoryId>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId, TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
         
-      TAO::SArg_Traits< CORBA::Identifier>::in_arg_type arg_2 =
-        TAO::Portable_Server::get_in_arg< CORBA::Identifier, TAO::SArg_Traits< CORBA::Identifier>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::Identifier, TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type> (
           this->operation_details_,
           this->args_,
           2);
         
-      TAO::SArg_Traits< CORBA::VersionSpec>::in_arg_type arg_3 =
-        TAO::Portable_Server::get_in_arg< CORBA::VersionSpec, TAO::SArg_Traits< CORBA::VersionSpec>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec, TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type> (
           this->operation_details_,
           this->args_,
           3);
         
-      TAO::SArg_Traits< CORBA::IDLType>::in_arg_type arg_4 =
-        TAO::Portable_Server::get_in_arg< CORBA::IDLType, TAO::SArg_Traits< CORBA::IDLType>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_type arg_4 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::IDLType, TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_type> (
           this->operation_details_,
           this->args_,
           4);
         
-      TAO::SArg_Traits< CORBA::AttributeMode>::in_arg_type arg_5 =
-        TAO::Portable_Server::get_in_arg< CORBA::AttributeMode, TAO::SArg_Traits< CORBA::AttributeMode>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::AttributeMode>::in_arg_type arg_5 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::AttributeMode, TAO::SArg_Traits< ::CORBA::AttributeMode>::in_arg_type> (
           this->operation_details_,
           this->args_,
           5);
         
-      TAO::SArg_Traits< CORBA::ExceptionDefSeq>::in_arg_type arg_6 =
-        TAO::Portable_Server::get_in_arg< CORBA::ExceptionDefSeq, TAO::SArg_Traits< CORBA::ExceptionDefSeq>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::ExceptionDefSeq>::in_arg_type arg_6 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::ExceptionDefSeq, TAO::SArg_Traits< ::CORBA::ExceptionDefSeq>::in_arg_type> (
           this->operation_details_,
           this->args_,
           6);
         
-      TAO::SArg_Traits< CORBA::ExceptionDefSeq>::in_arg_type arg_7 =
-        TAO::Portable_Server::get_in_arg< CORBA::ExceptionDefSeq, TAO::SArg_Traits< CORBA::ExceptionDefSeq>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::ExceptionDefSeq>::in_arg_type arg_7 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::ExceptionDefSeq, TAO::SArg_Traits< ::CORBA::ExceptionDefSeq>::in_arg_type> (
           this->operation_details_,
           this->args_,
           7);
@@ -19046,14 +20730,14 @@ void POA_CORBA::InterfaceAttrExtension::create_ext_attribute_skel (
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
   
-  TAO::SArg_Traits< CORBA::ExtAttributeDef>::ret_val retval;
-  TAO::SArg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id;
-  TAO::SArg_Traits< CORBA::Identifier>::in_arg_val _tao_name;
-  TAO::SArg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version;
-  TAO::SArg_Traits< CORBA::IDLType>::in_arg_val _tao_type;
-  TAO::SArg_Traits< CORBA::AttributeMode>::in_arg_val _tao_mode;
-  TAO::SArg_Traits< CORBA::ExceptionDefSeq>::in_arg_val _tao_get_exceptions;
-  TAO::SArg_Traits< CORBA::ExceptionDefSeq>::in_arg_val _tao_set_exceptions;
+  TAO::SArg_Traits< ::CORBA::ExtAttributeDef>::ret_val retval;
+  TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
+  TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
+  TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version;
+  TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_val _tao_type;
+  TAO::SArg_Traits< ::CORBA::AttributeMode>::in_arg_val _tao_mode;
+  TAO::SArg_Traits< ::CORBA::ExceptionDefSeq>::in_arg_val _tao_get_exceptions;
+  TAO::SArg_Traits< ::CORBA::ExceptionDefSeq>::in_arg_val _tao_set_exceptions;
   
   TAO::Argument * const args[] =
     {
@@ -19123,8 +20807,8 @@ namespace POA_CORBA
           this->operation_details_,
           this->args_);
       
-      TAO::SArg_Traits< CORBA::Char *>::in_arg_type arg_1 =
-        TAO::Portable_Server::get_in_arg< CORBA::Char *, TAO::SArg_Traits< CORBA::Char *>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
@@ -19159,7 +20843,7 @@ void POA_CORBA::InterfaceAttrExtension::_is_a_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  TAO::SArg_Traits< CORBA::Char *>::in_arg_val _tao_repository_id;
+  TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
   
   TAO::Argument * const args[] =
     {
@@ -19280,10 +20964,98 @@ void POA_CORBA::InterfaceAttrExtension::_non_existent_skel (
   
 }
 
+namespace POA_CORBA
+{
+  
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_operation/upcall_command_ss.cpp:127
+  
+  class _repository_id_InterfaceAttrExtension_Upcall_Command
+    : public TAO::Upcall_Command
+  {
+  public:
+    inline _repository_id_InterfaceAttrExtension_Upcall_Command (
+      POA_CORBA::InterfaceAttrExtension * servant,
+      TAO_Operation_Details const * operation_details,
+      TAO::Argument * const args[])
+      : servant_ (servant)
+      , operation_details_ (operation_details)
+      , args_ (args)
+    {
+    }
+    
+    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+    {
+      TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
+        TAO::Portable_Server::get_ret_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type> (
+          this->operation_details_,
+          this->args_);
+      
+      
+      retval =
+        this->servant_-> _repository_id (
+          ACE_ENV_SINGLE_ARG_PARAMETER);
+        
+    }
+  
+  private:
+    POA_CORBA::InterfaceAttrExtension * const servant_;
+    TAO_Operation_Details const * const operation_details_;
+    TAO::Argument * const * const args_;
+  };
+  
+}
+void POA_CORBA::InterfaceAttrExtension::_repository_id_skel (
+    TAO_ServerRequest & server_request, 
+    void * TAO_INTERCEPTOR (servant_upcall),
+    void * servant
+    ACE_ENV_ARG_DECL
+  )
+{
+  
+  
+#if TAO_HAS_INTERCEPTORS == 1
+  static CORBA::TypeCode_ptr const * const exceptions = 0;
+  static size_t const nexceptions = 0;
+#endif /* TAO_HAS_INTERCEPTORS */
+  
+  TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
+  
+  TAO::Argument * const args[] =
+    {
+      &retval
+    };
+  
+  static size_t const nargs = 1;
+  
+  POA_CORBA::InterfaceAttrExtension * const impl =
+    static_cast<POA_CORBA::InterfaceAttrExtension *> (servant);
+  
+  _repository_id_InterfaceAttrExtension_Upcall_Command command (
+    impl,
+    server_request.operation_details (),
+    args);
+  
+  TAO::Upcall_Wrapper upcall_wrapper;
+  upcall_wrapper.upcall (server_request
+                         , args
+                         , nargs
+                         , command
+#if TAO_HAS_INTERCEPTORS == 1
+                         , servant_upcall
+                         , exceptions
+                         , nexceptions
+#endif  /* TAO_HAS_INTERCEPTORS == 1 */
+                         ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+  
+}
+
 
 
 // TAO_IDL - Generated from 
-// be\be_visitor_interface/interface_ss.cpp:393
+// be\be_visitor_interface/interface_ss.cpp:501
 
 
 
@@ -19440,7 +21212,7 @@ const char* POA_CORBA::InterfaceAttrExtension::_interface_repository_id (void) c
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:940
+// be\be_visitor_interface/interface_ss.cpp:862
 
 void POA_CORBA::InterfaceAttrExtension::_dispatch (
     TAO_ServerRequest & req,
@@ -19455,7 +21227,7 @@ void POA_CORBA::InterfaceAttrExtension::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:891
+// be\be_visitor_interface/interface_ss.cpp:813
 
 CORBA::InterfaceAttrExtension *
 POA_CORBA::InterfaceAttrExtension::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -19487,7 +21259,7 @@ POA_CORBA::InterfaceAttrExtension::_this (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1455
+// be\be_interface.cpp:1465
 
 class TAO_CORBA_ExtInterfaceDef_Perfect_Hash_OpTable
   : public TAO_Perfect_Hash_OpTable
@@ -19500,7 +21272,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: c:\ace\latest\ACE_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0 -a -o -t -p -K opname -L C++ -Z TAO_CORBA_ExtInterfaceDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ACE\Any\ACE_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0 -a -o -t -p -K opname -L C++ -Z TAO_CORBA_ExtInterfaceDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_ExtInterfaceDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -19557,14 +21329,14 @@ TAO_CORBA_ExtInterfaceDef_Perfect_Hash_OpTable::lookup (const char *str, unsigne
 {
   enum
     {
-      TOTAL_KEYWORDS = 44,
+      TOTAL_KEYWORDS = 45,
       MIN_WORD_LENGTH = 4,
       MAX_WORD_LENGTH = 26,
       MIN_HASH_VALUE = 4,
       MAX_HASH_VALUE = 73,
       HASH_VALUE_RANGE = 70,
       DUPLICATES = 10,
-      WORDLIST_SIZE = 48
+      WORDLIST_SIZE = 49
     };
 
   static const TAO_operation_db_entry  wordlist[] =
@@ -19610,6 +21382,7 @@ TAO_CORBA_ExtInterfaceDef_Perfect_Hash_OpTable::lookup (const char *str, unsigne
       {"_set_id", &POA_CORBA::ExtInterfaceDef::_set_id_skel, 0},
       {"_get_containing_repository", &POA_CORBA::ExtInterfaceDef::_get_containing_repository_skel, 0},
       {"_get_def_kind", &POA_CORBA::ExtInterfaceDef::_get_def_kind_skel, 0},
+      {"_repository_id", &POA_CORBA::ExtInterfaceDef::_repository_id_skel, 0},
       {"_get_base_interfaces", &POA_CORBA::ExtInterfaceDef::_get_base_interfaces_skel, 0},
       {"_set_base_interfaces", &POA_CORBA::ExtInterfaceDef::_set_base_interfaces_skel, 0},
       {"_component", &POA_CORBA::ExtInterfaceDef::_component_skel, 0},
@@ -19622,8 +21395,8 @@ TAO_CORBA_ExtInterfaceDef_Perfect_Hash_OpTable::lookup (const char *str, unsigne
       -10,  -3, -75,  13, -15,  -2,  14, -76,  17,  18,  -1,  19,  20,  21, 
        22, -28,  -3,  23,  24, -35,  -2,  25,  26,  -1,  27, -83,  31,  -1, 
        32,  33,  -1,  34,  -1, -87,  37,  -1,  38,  -1,  39,  -1,  -1, -40, 
-       -2, -75,  -1, -44,  -2,  42,  -1,  43,  -1, -79,  -1,  -1,  -1,  -1, 
-       46,  -1,  -1,  47, 
+       -2, -75,  -1, -45,  -2,  42,  -1,  43,  44, -79,  -1,  -1,  -1,  -1, 
+       47,  -1,  -1,  48, 
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -19661,7 +21434,7 @@ TAO_CORBA_ExtInterfaceDef_Perfect_Hash_OpTable::lookup (const char *str, unsigne
 static TAO_CORBA_ExtInterfaceDef_Perfect_Hash_OpTable tao_CORBA_ExtInterfaceDef_optable;
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:999
+// be\be_visitor_interface/interface_ss.cpp:921
 
 TAO::Collocation_Proxy_Broker *
 CORBA__TAO_ExtInterfaceDef_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -19681,10 +21454,7 @@ CORBA__TAO_ExtInterfaceDef_Proxy_Broker_Factory_Initializer (size_t)
 static int
 CORBA__TAO_ExtInterfaceDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
   CORBA__TAO_ExtInterfaceDef_Proxy_Broker_Factory_Initializer (
-      reinterpret_cast<
-          size_t> (
-          CORBA__TAO_ExtInterfaceDef_Proxy_Broker_Factory_Initializer
-        )
+      reinterpret_cast<size_t> (CORBA__TAO_ExtInterfaceDef_Proxy_Broker_Factory_Initializer)
     );
 
 
@@ -19745,8 +21515,8 @@ namespace POA_CORBA
           this->operation_details_,
           this->args_);
       
-      TAO::SArg_Traits< CORBA::Char *>::in_arg_type arg_1 =
-        TAO::Portable_Server::get_in_arg< CORBA::Char *, TAO::SArg_Traits< CORBA::Char *>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
@@ -19781,7 +21551,7 @@ void POA_CORBA::ExtInterfaceDef::_is_a_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  TAO::SArg_Traits< CORBA::Char *>::in_arg_val _tao_repository_id;
+  TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
   
   TAO::Argument * const args[] =
     {
@@ -19902,10 +21672,98 @@ void POA_CORBA::ExtInterfaceDef::_non_existent_skel (
   
 }
 
+namespace POA_CORBA
+{
+  
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_operation/upcall_command_ss.cpp:127
+  
+  class _repository_id_ExtInterfaceDef_Upcall_Command
+    : public TAO::Upcall_Command
+  {
+  public:
+    inline _repository_id_ExtInterfaceDef_Upcall_Command (
+      POA_CORBA::ExtInterfaceDef * servant,
+      TAO_Operation_Details const * operation_details,
+      TAO::Argument * const args[])
+      : servant_ (servant)
+      , operation_details_ (operation_details)
+      , args_ (args)
+    {
+    }
+    
+    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+    {
+      TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
+        TAO::Portable_Server::get_ret_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type> (
+          this->operation_details_,
+          this->args_);
+      
+      
+      retval =
+        this->servant_-> _repository_id (
+          ACE_ENV_SINGLE_ARG_PARAMETER);
+        
+    }
+  
+  private:
+    POA_CORBA::ExtInterfaceDef * const servant_;
+    TAO_Operation_Details const * const operation_details_;
+    TAO::Argument * const * const args_;
+  };
+  
+}
+void POA_CORBA::ExtInterfaceDef::_repository_id_skel (
+    TAO_ServerRequest & server_request, 
+    void * TAO_INTERCEPTOR (servant_upcall),
+    void * servant
+    ACE_ENV_ARG_DECL
+  )
+{
+  
+  
+#if TAO_HAS_INTERCEPTORS == 1
+  static CORBA::TypeCode_ptr const * const exceptions = 0;
+  static size_t const nexceptions = 0;
+#endif /* TAO_HAS_INTERCEPTORS */
+  
+  TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
+  
+  TAO::Argument * const args[] =
+    {
+      &retval
+    };
+  
+  static size_t const nargs = 1;
+  
+  POA_CORBA::ExtInterfaceDef * const impl =
+    static_cast<POA_CORBA::ExtInterfaceDef *> (servant);
+  
+  _repository_id_ExtInterfaceDef_Upcall_Command command (
+    impl,
+    server_request.operation_details (),
+    args);
+  
+  TAO::Upcall_Wrapper upcall_wrapper;
+  upcall_wrapper.upcall (server_request
+                         , args
+                         , nargs
+                         , command
+#if TAO_HAS_INTERCEPTORS == 1
+                         , servant_upcall
+                         , exceptions
+                         , nexceptions
+#endif  /* TAO_HAS_INTERCEPTORS == 1 */
+                         ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+  
+}
+
 
 
 // TAO_IDL - Generated from 
-// be\be_visitor_interface/interface_ss.cpp:393
+// be\be_visitor_interface/interface_ss.cpp:501
 
 
 
@@ -20086,7 +21944,7 @@ const char* POA_CORBA::ExtInterfaceDef::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:940
+// be\be_visitor_interface/interface_ss.cpp:862
 
 void POA_CORBA::ExtInterfaceDef::_dispatch (
     TAO_ServerRequest & req,
@@ -20101,7 +21959,7 @@ void POA_CORBA::ExtInterfaceDef::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:891
+// be\be_visitor_interface/interface_ss.cpp:813
 
 CORBA::ExtInterfaceDef *
 POA_CORBA::ExtInterfaceDef::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -20133,7 +21991,7 @@ POA_CORBA::ExtInterfaceDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1455
+// be\be_interface.cpp:1465
 
 class TAO_CORBA_AbstractInterfaceDef_Perfect_Hash_OpTable
   : public TAO_Perfect_Hash_OpTable
@@ -20146,53 +22004,53 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: c:\ace\latest\ACE_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0 -a -o -t -p -K opname -L C++ -Z TAO_CORBA_AbstractInterfaceDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ACE\Any\ACE_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0 -a -o -t -p -K opname -L C++ -Z TAO_CORBA_AbstractInterfaceDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_AbstractInterfaceDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
   static const unsigned char asso_values[] =
     {
 #if defined (ACE_MVS)
-     79, 79, 79, 79, 79, 79, 79, 79, 79, 79,
-     79, 79, 79, 79, 79, 79, 79, 79, 79, 79,
-     79, 79, 79, 79, 79, 79, 79, 79, 79, 79,
-     79, 79, 79, 79, 79, 79, 79, 79, 79, 79,
-     79, 79, 79, 79, 79, 79, 79, 79, 79, 79,
-     79, 79, 79, 79, 79, 79, 79, 79, 79, 79,
-     79, 79, 79, 79, 79, 79, 79, 79, 79, 79,
-     79, 79, 79, 79, 79, 79, 79, 79, 79, 79,
-     79, 79, 79, 79, 79, 79, 79, 79, 79, 79,
-     79, 79, 79, 79, 79, 79, 79, 79, 79, 79,
-     79, 79, 79, 79, 79, 79, 79, 79, 79, 25,
-     79, 79, 79, 79, 79, 79, 79, 79, 79, 79,
-     79, 79, 79, 79, 79, 79, 79, 79, 79,  0,
-     79,  0, 20,  0, 79, 79, 79,  5, 79, 79,
-     79, 79, 79, 79, 79, 79, 79, 15,  0,  5,
-     79, 15, 79, 79, 79, 79, 79, 79, 79, 79,
-     79, 79, 25, 40, 79, 79, 79, 15,  0, 79,
-     79, 79, 79, 79, 79, 79, 79, 79, 79, 79,
-     79, 79, 79, 79, 79, 79, 79, 79, 79, 79,
-     79, 79, 79, 79, 79, 79, 79, 79, 79, 79,
-     79, 79, 79, 79, 79, 79, 79, 79, 79, 79,
-     79, 79, 79, 79, 79, 79, 79, 79, 79, 79,
-     79, 79, 79, 79, 79, 79, 79, 79, 79, 79,
-     79, 79, 79, 79, 79, 79, 79, 79, 79, 79,
-     79, 79, 79, 79, 79, 79, 79, 79, 79, 79,
-     79, 79, 79, 79, 79, 79,
+     81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
+     81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
+     81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
+     81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
+     81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
+     81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
+     81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
+     81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
+     81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
+     81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
+     81, 81, 81, 81, 81, 81, 81, 81, 81,  0,
+     81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
+     81, 81, 81, 81, 81, 81, 81, 81, 81,  0,
+     81, 30, 20,  0, 81, 81, 81, 10, 81, 81,
+     81, 81, 81, 81, 81, 81, 81,  0,  0,  5,
+     81,  0, 81, 81, 81, 81, 81, 81, 81, 81,
+     81, 81, 20, 35, 81, 81, 81, 10,  5, 81,
+     81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
+     81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
+     81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
+     81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
+     81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
+     81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
+     81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
+     81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
+     81, 81, 81, 81, 81, 81,
 #else
-     79, 79, 79, 79, 79, 79, 79, 79, 79, 79,
-     79, 79, 79, 79, 79, 79, 79, 79, 79, 79,
-     79, 79, 79, 79, 79, 79, 79, 79, 79, 79,
-     79, 79, 79, 79, 79, 79, 79, 79, 79, 79,
-     79, 79, 79, 79, 79, 79, 79, 79, 79, 79,
-     79, 79, 79, 79, 79, 79, 79, 79, 79, 79,
-     79, 79, 79, 79, 79, 79, 79, 79, 79, 79,
-     79, 79, 79, 79, 79, 79, 79, 79, 79, 79,
-     79, 79, 79, 79, 79, 79, 79, 79, 79, 79,
-     79, 79, 79, 79, 79, 25, 79,  0, 79,  0,
-     20,  0, 79, 79, 79,  5, 79, 79, 15,  0,
-      5, 79, 15, 79, 79, 25, 40, 79, 79, 79,
-     15,  0, 79, 79, 79, 79, 79, 79,
+     81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
+     81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
+     81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
+     81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
+     81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
+     81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
+     81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
+     81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
+     81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
+     81, 81, 81, 81, 81,  0, 81,  0, 81, 30,
+     20,  0, 81, 81, 81, 10, 81, 81,  0,  0,
+      5, 81,  0, 81, 81, 20, 35, 81, 81, 81,
+     10,  5, 81, 81, 81, 81, 81, 81,
 #endif /* ACE_MVS */
     };
   return len + asso_values[(int) str[len - 1]] + asso_values[(int) str[0]];
@@ -20203,71 +22061,72 @@ TAO_CORBA_AbstractInterfaceDef_Perfect_Hash_OpTable::lookup (const char *str, un
 {
   enum
     {
-      TOTAL_KEYWORDS = 42,
+      TOTAL_KEYWORDS = 43,
       MIN_WORD_LENGTH = 4,
       MAX_WORD_LENGTH = 26,
       MIN_HASH_VALUE = 4,
-      MAX_HASH_VALUE = 78,
-      HASH_VALUE_RANGE = 75,
+      MAX_HASH_VALUE = 80,
+      HASH_VALUE_RANGE = 77,
       DUPLICATES = 10,
-      WORDLIST_SIZE = 46
+      WORDLIST_SIZE = 47
     };
 
   static const TAO_operation_db_entry  wordlist[] =
     {
       {"",0,0},{"",0,0},{"",0,0},{"",0,0},
       {"move", &POA_CORBA::AbstractInterfaceDef::move_skel, 0},
+      {"_is_a", &POA_CORBA::AbstractInterfaceDef::_is_a_skel, 0},
+      {"lookup", &POA_CORBA::AbstractInterfaceDef::lookup_skel, 0},
+      {"_get_name", &POA_CORBA::AbstractInterfaceDef::_get_name_skel, 0},
+      {"_get_type", &POA_CORBA::AbstractInterfaceDef::_get_type_skel, 0},
+      {"_set_name", &POA_CORBA::AbstractInterfaceDef::_set_name_skel, 0},
+      {"_interface", &POA_CORBA::AbstractInterfaceDef::_interface_skel, 0},
+      {"lookup_name", &POA_CORBA::AbstractInterfaceDef::lookup_name_skel, 0},
       {"is_a", &POA_CORBA::AbstractInterfaceDef::is_a_skel, 0},
+      {"_get_version", &POA_CORBA::AbstractInterfaceDef::_get_version_skel, 0},
+      {"_set_version", &POA_CORBA::AbstractInterfaceDef::_set_version_skel, 0},
+      {"_get_absolute_name", &POA_CORBA::AbstractInterfaceDef::_get_absolute_name_skel, 0},
+      {"_get_defined_in", &POA_CORBA::AbstractInterfaceDef::_get_defined_in_skel, 0},
+      {"_get_id", &POA_CORBA::AbstractInterfaceDef::_get_id_skel, 0},
+      {"_set_id", &POA_CORBA::AbstractInterfaceDef::_set_id_skel, 0},
+      {"describe", &POA_CORBA::AbstractInterfaceDef::describe_skel, 0},
+      {"_get_containing_repository", &POA_CORBA::AbstractInterfaceDef::_get_containing_repository_skel, 0},
+      {"destroy", &POA_CORBA::AbstractInterfaceDef::destroy_skel, 0},
+      {"_get_def_kind", &POA_CORBA::AbstractInterfaceDef::_get_def_kind_skel, 0},
+      {"_repository_id", &POA_CORBA::AbstractInterfaceDef::_repository_id_skel, 0},
+      {"describe_interface", &POA_CORBA::AbstractInterfaceDef::describe_interface_skel, 0},
+      {"_get_base_interfaces", &POA_CORBA::AbstractInterfaceDef::_get_base_interfaces_skel, 0},
+      {"_set_base_interfaces", &POA_CORBA::AbstractInterfaceDef::_set_base_interfaces_skel, 0},
       {"create_enum", &POA_CORBA::AbstractInterfaceDef::create_enum_skel, 0},
       {"create_value", &POA_CORBA::AbstractInterfaceDef::create_value_skel, 0},
       {"create_module", &POA_CORBA::AbstractInterfaceDef::create_module_skel, 0},
       {"create_native", &POA_CORBA::AbstractInterfaceDef::create_native_skel, 0},
+      {"_component", &POA_CORBA::AbstractInterfaceDef::_component_skel, 0},
       {"create_interface", &POA_CORBA::AbstractInterfaceDef::create_interface_skel, 0},
       {"create_attribute", &POA_CORBA::AbstractInterfaceDef::create_attribute_skel, 0},
       {"create_ext_value", &POA_CORBA::AbstractInterfaceDef::create_ext_value_skel, 0},
       {"create_union", &POA_CORBA::AbstractInterfaceDef::create_union_skel, 0},
+      {"_non_existent", &POA_CORBA::AbstractInterfaceDef::_non_existent_skel, 0},
       {"create_exception", &POA_CORBA::AbstractInterfaceDef::create_exception_skel, 0},
       {"create_operation", &POA_CORBA::AbstractInterfaceDef::create_operation_skel, 0},
       {"create_local_interface", &POA_CORBA::AbstractInterfaceDef::create_local_interface_skel, 0},
       {"create_abstract_interface", &POA_CORBA::AbstractInterfaceDef::create_abstract_interface_skel, 0},
-      {"lookup_name", &POA_CORBA::AbstractInterfaceDef::lookup_name_skel, 0},
-      {"destroy", &POA_CORBA::AbstractInterfaceDef::destroy_skel, 0},
-      {"describe", &POA_CORBA::AbstractInterfaceDef::describe_skel, 0},
-      {"_is_a", &POA_CORBA::AbstractInterfaceDef::_is_a_skel, 0},
       {"create_value_box", &POA_CORBA::AbstractInterfaceDef::create_value_box_skel, 0},
+      {"describe_contents", &POA_CORBA::AbstractInterfaceDef::describe_contents_skel, 0},
       {"contents", &POA_CORBA::AbstractInterfaceDef::contents_skel, 0},
-      {"_get_name", &POA_CORBA::AbstractInterfaceDef::_get_name_skel, 0},
-      {"_get_type", &POA_CORBA::AbstractInterfaceDef::_get_type_skel, 0},
-      {"_set_name", &POA_CORBA::AbstractInterfaceDef::_set_name_skel, 0},
-      {"_interface", &POA_CORBA::AbstractInterfaceDef::_interface_skel, 0},
-      {"lookup", &POA_CORBA::AbstractInterfaceDef::lookup_skel, 0},
       {"create_alias", &POA_CORBA::AbstractInterfaceDef::create_alias_skel, 0},
-      {"describe_interface", &POA_CORBA::AbstractInterfaceDef::describe_interface_skel, 0},
-      {"_get_version", &POA_CORBA::AbstractInterfaceDef::_get_version_skel, 0},
-      {"_set_version", &POA_CORBA::AbstractInterfaceDef::_set_version_skel, 0},
-      {"_get_absolute_name", &POA_CORBA::AbstractInterfaceDef::_get_absolute_name_skel, 0},
-      {"_get_defined_in", &POA_CORBA::AbstractInterfaceDef::_get_defined_in_skel, 0},
-      {"_get_containing_repository", &POA_CORBA::AbstractInterfaceDef::_get_containing_repository_skel, 0},
-      {"_get_id", &POA_CORBA::AbstractInterfaceDef::_get_id_skel, 0},
-      {"_set_id", &POA_CORBA::AbstractInterfaceDef::_set_id_skel, 0},
       {"create_struct", &POA_CORBA::AbstractInterfaceDef::create_struct_skel, 0},
       {"create_constant", &POA_CORBA::AbstractInterfaceDef::create_constant_skel, 0},
-      {"_get_def_kind", &POA_CORBA::AbstractInterfaceDef::_get_def_kind_skel, 0},
-      {"describe_contents", &POA_CORBA::AbstractInterfaceDef::describe_contents_skel, 0},
-      {"_get_base_interfaces", &POA_CORBA::AbstractInterfaceDef::_get_base_interfaces_skel, 0},
-      {"_set_base_interfaces", &POA_CORBA::AbstractInterfaceDef::_set_base_interfaces_skel, 0},
-      {"_component", &POA_CORBA::AbstractInterfaceDef::_component_skel, 0},
-      {"_non_existent", &POA_CORBA::AbstractInterfaceDef::_non_existent_skel, 0},
     };
 
   static const signed char lookup[] =
     {
-       -1,  -1,  -1,  -1,   4,  -1,  -1,  -8,  -2,   5,  -1,   6,   7, -84, 
-      -10,  -3, -80,  13,  -1, -14,  -2, -80,  16, -24,  -3,  17,  18,  19, 
-       20,  -1,  21,  22,  -1,  23, -89,  27,  28,  29,  30,  -1, -31,  -2, 
-      -80,  33,  -1,  34,  -1,  -1,  -1, -36,  -2,  35, -81,  38,  -1,  39, 
-       -1,  -1,  40,  -1,  -1,  -1,  41,  -1,  -1,  -1,  -1,  -1, -42,  -2, 
-      -80,  -1,  -1,  -1,  -1,  44,  -1,  -1,  45, 
+       -1,  -1,  -1,  -1,   4,   5,   6,  -7,  -3, -82,  10,  11,  -1,  -1, 
+       12, -13,  -2, -82,  15,  -1,  16,  -1,  -1, -17,  -2, -25,  -2, -84, 
+       19, -29,  -2,  20,  21,  22,  23,  -1, -32,  -3,  24,  -1, -95,  27, 
+       28, -94,  -1,  31, -90,  35,  36, -37,  -2, -82,  39,  -1,  -1,  40, 
+       41,  42,  43,  -1,  -1,  -1,  44,  -1,  -1,  -1,  -1,  -1,  -1,  -1, 
+       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  45,  -1,  46, 
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -20305,7 +22164,7 @@ TAO_CORBA_AbstractInterfaceDef_Perfect_Hash_OpTable::lookup (const char *str, un
 static TAO_CORBA_AbstractInterfaceDef_Perfect_Hash_OpTable tao_CORBA_AbstractInterfaceDef_optable;
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:999
+// be\be_visitor_interface/interface_ss.cpp:921
 
 TAO::Collocation_Proxy_Broker *
 CORBA__TAO_AbstractInterfaceDef_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -20325,10 +22184,7 @@ CORBA__TAO_AbstractInterfaceDef_Proxy_Broker_Factory_Initializer (size_t)
 static int
 CORBA__TAO_AbstractInterfaceDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
   CORBA__TAO_AbstractInterfaceDef_Proxy_Broker_Factory_Initializer (
-      reinterpret_cast<
-          size_t> (
-          CORBA__TAO_AbstractInterfaceDef_Proxy_Broker_Factory_Initializer
-        )
+      reinterpret_cast<size_t> (CORBA__TAO_AbstractInterfaceDef_Proxy_Broker_Factory_Initializer)
     );
 
 
@@ -20388,8 +22244,8 @@ namespace POA_CORBA
           this->operation_details_,
           this->args_);
       
-      TAO::SArg_Traits< CORBA::Char *>::in_arg_type arg_1 =
-        TAO::Portable_Server::get_in_arg< CORBA::Char *, TAO::SArg_Traits< CORBA::Char *>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
@@ -20424,7 +22280,7 @@ void POA_CORBA::AbstractInterfaceDef::_is_a_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  TAO::SArg_Traits< CORBA::Char *>::in_arg_val _tao_repository_id;
+  TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
   
   TAO::Argument * const args[] =
     {
@@ -20545,10 +22401,98 @@ void POA_CORBA::AbstractInterfaceDef::_non_existent_skel (
   
 }
 
+namespace POA_CORBA
+{
+  
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_operation/upcall_command_ss.cpp:127
+  
+  class _repository_id_AbstractInterfaceDef_Upcall_Command
+    : public TAO::Upcall_Command
+  {
+  public:
+    inline _repository_id_AbstractInterfaceDef_Upcall_Command (
+      POA_CORBA::AbstractInterfaceDef * servant,
+      TAO_Operation_Details const * operation_details,
+      TAO::Argument * const args[])
+      : servant_ (servant)
+      , operation_details_ (operation_details)
+      , args_ (args)
+    {
+    }
+    
+    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+    {
+      TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
+        TAO::Portable_Server::get_ret_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type> (
+          this->operation_details_,
+          this->args_);
+      
+      
+      retval =
+        this->servant_-> _repository_id (
+          ACE_ENV_SINGLE_ARG_PARAMETER);
+        
+    }
+  
+  private:
+    POA_CORBA::AbstractInterfaceDef * const servant_;
+    TAO_Operation_Details const * const operation_details_;
+    TAO::Argument * const * const args_;
+  };
+  
+}
+void POA_CORBA::AbstractInterfaceDef::_repository_id_skel (
+    TAO_ServerRequest & server_request, 
+    void * TAO_INTERCEPTOR (servant_upcall),
+    void * servant
+    ACE_ENV_ARG_DECL
+  )
+{
+  
+  
+#if TAO_HAS_INTERCEPTORS == 1
+  static CORBA::TypeCode_ptr const * const exceptions = 0;
+  static size_t const nexceptions = 0;
+#endif /* TAO_HAS_INTERCEPTORS */
+  
+  TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
+  
+  TAO::Argument * const args[] =
+    {
+      &retval
+    };
+  
+  static size_t const nargs = 1;
+  
+  POA_CORBA::AbstractInterfaceDef * const impl =
+    static_cast<POA_CORBA::AbstractInterfaceDef *> (servant);
+  
+  _repository_id_AbstractInterfaceDef_Upcall_Command command (
+    impl,
+    server_request.operation_details (),
+    args);
+  
+  TAO::Upcall_Wrapper upcall_wrapper;
+  upcall_wrapper.upcall (server_request
+                         , args
+                         , nargs
+                         , command
+#if TAO_HAS_INTERCEPTORS == 1
+                         , servant_upcall
+                         , exceptions
+                         , nexceptions
+#endif  /* TAO_HAS_INTERCEPTORS == 1 */
+                         ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+  
+}
+
 
 
 // TAO_IDL - Generated from 
-// be\be_visitor_interface/interface_ss.cpp:393
+// be\be_visitor_interface/interface_ss.cpp:501
 
 
 
@@ -20725,7 +22669,7 @@ const char* POA_CORBA::AbstractInterfaceDef::_interface_repository_id (void) con
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:940
+// be\be_visitor_interface/interface_ss.cpp:862
 
 void POA_CORBA::AbstractInterfaceDef::_dispatch (
     TAO_ServerRequest & req,
@@ -20740,7 +22684,7 @@ void POA_CORBA::AbstractInterfaceDef::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:891
+// be\be_visitor_interface/interface_ss.cpp:813
 
 CORBA::AbstractInterfaceDef *
 POA_CORBA::AbstractInterfaceDef::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -20772,7 +22716,7 @@ POA_CORBA::AbstractInterfaceDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1455
+// be\be_interface.cpp:1465
 
 class TAO_CORBA_ExtAbstractInterfaceDef_Perfect_Hash_OpTable
   : public TAO_Perfect_Hash_OpTable
@@ -20785,7 +22729,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: c:\ace\latest\ACE_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0 -a -o -t -p -K opname -L C++ -Z TAO_CORBA_ExtAbstractInterfaceDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ACE\Any\ACE_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0 -a -o -t -p -K opname -L C++ -Z TAO_CORBA_ExtAbstractInterfaceDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_ExtAbstractInterfaceDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -20842,14 +22786,14 @@ TAO_CORBA_ExtAbstractInterfaceDef_Perfect_Hash_OpTable::lookup (const char *str,
 {
   enum
     {
-      TOTAL_KEYWORDS = 44,
+      TOTAL_KEYWORDS = 45,
       MIN_WORD_LENGTH = 4,
       MAX_WORD_LENGTH = 26,
       MIN_HASH_VALUE = 4,
       MAX_HASH_VALUE = 73,
       HASH_VALUE_RANGE = 70,
       DUPLICATES = 10,
-      WORDLIST_SIZE = 48
+      WORDLIST_SIZE = 49
     };
 
   static const TAO_operation_db_entry  wordlist[] =
@@ -20895,6 +22839,7 @@ TAO_CORBA_ExtAbstractInterfaceDef_Perfect_Hash_OpTable::lookup (const char *str,
       {"_set_id", &POA_CORBA::ExtAbstractInterfaceDef::_set_id_skel, 0},
       {"_get_containing_repository", &POA_CORBA::ExtAbstractInterfaceDef::_get_containing_repository_skel, 0},
       {"_get_def_kind", &POA_CORBA::ExtAbstractInterfaceDef::_get_def_kind_skel, 0},
+      {"_repository_id", &POA_CORBA::ExtAbstractInterfaceDef::_repository_id_skel, 0},
       {"_get_base_interfaces", &POA_CORBA::ExtAbstractInterfaceDef::_get_base_interfaces_skel, 0},
       {"_set_base_interfaces", &POA_CORBA::ExtAbstractInterfaceDef::_set_base_interfaces_skel, 0},
       {"_component", &POA_CORBA::ExtAbstractInterfaceDef::_component_skel, 0},
@@ -20907,8 +22852,8 @@ TAO_CORBA_ExtAbstractInterfaceDef_Perfect_Hash_OpTable::lookup (const char *str,
       -10,  -3, -75,  13, -15,  -2,  14, -76,  17,  18,  -1,  19,  20,  21, 
        22, -28,  -3,  23,  24, -35,  -2,  25,  26,  -1,  27, -83,  31,  -1, 
        32,  33,  -1,  34,  -1, -87,  37,  -1,  38,  -1,  39,  -1,  -1, -40, 
-       -2, -75,  -1, -44,  -2,  42,  -1,  43,  -1, -79,  -1,  -1,  -1,  -1, 
-       46,  -1,  -1,  47, 
+       -2, -75,  -1, -45,  -2,  42,  -1,  43,  44, -79,  -1,  -1,  -1,  -1, 
+       47,  -1,  -1,  48, 
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -20946,7 +22891,7 @@ TAO_CORBA_ExtAbstractInterfaceDef_Perfect_Hash_OpTable::lookup (const char *str,
 static TAO_CORBA_ExtAbstractInterfaceDef_Perfect_Hash_OpTable tao_CORBA_ExtAbstractInterfaceDef_optable;
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:999
+// be\be_visitor_interface/interface_ss.cpp:921
 
 TAO::Collocation_Proxy_Broker *
 CORBA__TAO_ExtAbstractInterfaceDef_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -20966,10 +22911,7 @@ CORBA__TAO_ExtAbstractInterfaceDef_Proxy_Broker_Factory_Initializer (size_t)
 static int
 CORBA__TAO_ExtAbstractInterfaceDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
   CORBA__TAO_ExtAbstractInterfaceDef_Proxy_Broker_Factory_Initializer (
-      reinterpret_cast<
-          size_t> (
-          CORBA__TAO_ExtAbstractInterfaceDef_Proxy_Broker_Factory_Initializer
-        )
+      reinterpret_cast<size_t> (CORBA__TAO_ExtAbstractInterfaceDef_Proxy_Broker_Factory_Initializer)
     );
 
 
@@ -21031,8 +22973,8 @@ namespace POA_CORBA
           this->operation_details_,
           this->args_);
       
-      TAO::SArg_Traits< CORBA::Char *>::in_arg_type arg_1 =
-        TAO::Portable_Server::get_in_arg< CORBA::Char *, TAO::SArg_Traits< CORBA::Char *>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
@@ -21067,7 +23009,7 @@ void POA_CORBA::ExtAbstractInterfaceDef::_is_a_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  TAO::SArg_Traits< CORBA::Char *>::in_arg_val _tao_repository_id;
+  TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
   
   TAO::Argument * const args[] =
     {
@@ -21188,10 +23130,98 @@ void POA_CORBA::ExtAbstractInterfaceDef::_non_existent_skel (
   
 }
 
+namespace POA_CORBA
+{
+  
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_operation/upcall_command_ss.cpp:127
+  
+  class _repository_id_ExtAbstractInterfaceDef_Upcall_Command
+    : public TAO::Upcall_Command
+  {
+  public:
+    inline _repository_id_ExtAbstractInterfaceDef_Upcall_Command (
+      POA_CORBA::ExtAbstractInterfaceDef * servant,
+      TAO_Operation_Details const * operation_details,
+      TAO::Argument * const args[])
+      : servant_ (servant)
+      , operation_details_ (operation_details)
+      , args_ (args)
+    {
+    }
+    
+    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+    {
+      TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
+        TAO::Portable_Server::get_ret_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type> (
+          this->operation_details_,
+          this->args_);
+      
+      
+      retval =
+        this->servant_-> _repository_id (
+          ACE_ENV_SINGLE_ARG_PARAMETER);
+        
+    }
+  
+  private:
+    POA_CORBA::ExtAbstractInterfaceDef * const servant_;
+    TAO_Operation_Details const * const operation_details_;
+    TAO::Argument * const * const args_;
+  };
+  
+}
+void POA_CORBA::ExtAbstractInterfaceDef::_repository_id_skel (
+    TAO_ServerRequest & server_request, 
+    void * TAO_INTERCEPTOR (servant_upcall),
+    void * servant
+    ACE_ENV_ARG_DECL
+  )
+{
+  
+  
+#if TAO_HAS_INTERCEPTORS == 1
+  static CORBA::TypeCode_ptr const * const exceptions = 0;
+  static size_t const nexceptions = 0;
+#endif /* TAO_HAS_INTERCEPTORS */
+  
+  TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
+  
+  TAO::Argument * const args[] =
+    {
+      &retval
+    };
+  
+  static size_t const nargs = 1;
+  
+  POA_CORBA::ExtAbstractInterfaceDef * const impl =
+    static_cast<POA_CORBA::ExtAbstractInterfaceDef *> (servant);
+  
+  _repository_id_ExtAbstractInterfaceDef_Upcall_Command command (
+    impl,
+    server_request.operation_details (),
+    args);
+  
+  TAO::Upcall_Wrapper upcall_wrapper;
+  upcall_wrapper.upcall (server_request
+                         , args
+                         , nargs
+                         , command
+#if TAO_HAS_INTERCEPTORS == 1
+                         , servant_upcall
+                         , exceptions
+                         , nexceptions
+#endif  /* TAO_HAS_INTERCEPTORS == 1 */
+                         ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+  
+}
+
 
 
 // TAO_IDL - Generated from 
-// be\be_visitor_interface/interface_ss.cpp:393
+// be\be_visitor_interface/interface_ss.cpp:501
 
 
 
@@ -21376,7 +23406,7 @@ const char* POA_CORBA::ExtAbstractInterfaceDef::_interface_repository_id (void)
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:940
+// be\be_visitor_interface/interface_ss.cpp:862
 
 void POA_CORBA::ExtAbstractInterfaceDef::_dispatch (
     TAO_ServerRequest & req,
@@ -21391,7 +23421,7 @@ void POA_CORBA::ExtAbstractInterfaceDef::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:891
+// be\be_visitor_interface/interface_ss.cpp:813
 
 CORBA::ExtAbstractInterfaceDef *
 POA_CORBA::ExtAbstractInterfaceDef::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -21423,7 +23453,7 @@ POA_CORBA::ExtAbstractInterfaceDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1455
+// be\be_interface.cpp:1465
 
 class TAO_CORBA_LocalInterfaceDef_Perfect_Hash_OpTable
   : public TAO_Perfect_Hash_OpTable
@@ -21436,53 +23466,53 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: c:\ace\latest\ACE_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0 -a -o -t -p -K opname -L C++ -Z TAO_CORBA_LocalInterfaceDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ACE\Any\ACE_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0 -a -o -t -p -K opname -L C++ -Z TAO_CORBA_LocalInterfaceDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_LocalInterfaceDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
   static const unsigned char asso_values[] =
     {
 #if defined (ACE_MVS)
-     79, 79, 79, 79, 79, 79, 79, 79, 79, 79,
-     79, 79, 79, 79, 79, 79, 79, 79, 79, 79,
-     79, 79, 79, 79, 79, 79, 79, 79, 79, 79,
-     79, 79, 79, 79, 79, 79, 79, 79, 79, 79,
-     79, 79, 79, 79, 79, 79, 79, 79, 79, 79,
-     79, 79, 79, 79, 79, 79, 79, 79, 79, 79,
-     79, 79, 79, 79, 79, 79, 79, 79, 79, 79,
-     79, 79, 79, 79, 79, 79, 79, 79, 79, 79,
-     79, 79, 79, 79, 79, 79, 79, 79, 79, 79,
-     79, 79, 79, 79, 79, 79, 79, 79, 79, 79,
-     79, 79, 79, 79, 79, 79, 79, 79, 79, 25,
-     79, 79, 79, 79, 79, 79, 79, 79, 79, 79,
-     79, 79, 79, 79, 79, 79, 79, 79, 79,  0,
-     79,  0, 20,  0, 79, 79, 79,  5, 79, 79,
-     79, 79, 79, 79, 79, 79, 79, 15,  0,  5,
-     79, 15, 79, 79, 79, 79, 79, 79, 79, 79,
-     79, 79, 25, 40, 79, 79, 79, 15,  0, 79,
-     79, 79, 79, 79, 79, 79, 79, 79, 79, 79,
-     79, 79, 79, 79, 79, 79, 79, 79, 79, 79,
-     79, 79, 79, 79, 79, 79, 79, 79, 79, 79,
-     79, 79, 79, 79, 79, 79, 79, 79, 79, 79,
-     79, 79, 79, 79, 79, 79, 79, 79, 79, 79,
-     79, 79, 79, 79, 79, 79, 79, 79, 79, 79,
-     79, 79, 79, 79, 79, 79, 79, 79, 79, 79,
-     79, 79, 79, 79, 79, 79, 79, 79, 79, 79,
-     79, 79, 79, 79, 79, 79,
+     81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
+     81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
+     81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
+     81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
+     81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
+     81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
+     81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
+     81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
+     81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
+     81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
+     81, 81, 81, 81, 81, 81, 81, 81, 81,  0,
+     81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
+     81, 81, 81, 81, 81, 81, 81, 81, 81,  0,
+     81, 30, 20,  0, 81, 81, 81, 10, 81, 81,
+     81, 81, 81, 81, 81, 81, 81,  0,  0,  5,
+     81,  0, 81, 81, 81, 81, 81, 81, 81, 81,
+     81, 81, 20, 35, 81, 81, 81, 10,  5, 81,
+     81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
+     81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
+     81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
+     81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
+     81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
+     81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
+     81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
+     81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
+     81, 81, 81, 81, 81, 81,
 #else
-     79, 79, 79, 79, 79, 79, 79, 79, 79, 79,
-     79, 79, 79, 79, 79, 79, 79, 79, 79, 79,
-     79, 79, 79, 79, 79, 79, 79, 79, 79, 79,
-     79, 79, 79, 79, 79, 79, 79, 79, 79, 79,
-     79, 79, 79, 79, 79, 79, 79, 79, 79, 79,
-     79, 79, 79, 79, 79, 79, 79, 79, 79, 79,
-     79, 79, 79, 79, 79, 79, 79, 79, 79, 79,
-     79, 79, 79, 79, 79, 79, 79, 79, 79, 79,
-     79, 79, 79, 79, 79, 79, 79, 79, 79, 79,
-     79, 79, 79, 79, 79, 25, 79,  0, 79,  0,
-     20,  0, 79, 79, 79,  5, 79, 79, 15,  0,
-      5, 79, 15, 79, 79, 25, 40, 79, 79, 79,
-     15,  0, 79, 79, 79, 79, 79, 79,
+     81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
+     81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
+     81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
+     81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
+     81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
+     81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
+     81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
+     81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
+     81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
+     81, 81, 81, 81, 81,  0, 81,  0, 81, 30,
+     20,  0, 81, 81, 81, 10, 81, 81,  0,  0,
+      5, 81,  0, 81, 81, 20, 35, 81, 81, 81,
+     10,  5, 81, 81, 81, 81, 81, 81,
 #endif /* ACE_MVS */
     };
   return len + asso_values[(int) str[len - 1]] + asso_values[(int) str[0]];
@@ -21493,71 +23523,72 @@ TAO_CORBA_LocalInterfaceDef_Perfect_Hash_OpTable::lookup (const char *str, unsig
 {
   enum
     {
-      TOTAL_KEYWORDS = 42,
+      TOTAL_KEYWORDS = 43,
       MIN_WORD_LENGTH = 4,
       MAX_WORD_LENGTH = 26,
       MIN_HASH_VALUE = 4,
-      MAX_HASH_VALUE = 78,
-      HASH_VALUE_RANGE = 75,
+      MAX_HASH_VALUE = 80,
+      HASH_VALUE_RANGE = 77,
       DUPLICATES = 10,
-      WORDLIST_SIZE = 46
+      WORDLIST_SIZE = 47
     };
 
   static const TAO_operation_db_entry  wordlist[] =
     {
       {"",0,0},{"",0,0},{"",0,0},{"",0,0},
       {"move", &POA_CORBA::LocalInterfaceDef::move_skel, 0},
+      {"_is_a", &POA_CORBA::LocalInterfaceDef::_is_a_skel, 0},
+      {"lookup", &POA_CORBA::LocalInterfaceDef::lookup_skel, 0},
+      {"_get_name", &POA_CORBA::LocalInterfaceDef::_get_name_skel, 0},
+      {"_get_type", &POA_CORBA::LocalInterfaceDef::_get_type_skel, 0},
+      {"_set_name", &POA_CORBA::LocalInterfaceDef::_set_name_skel, 0},
+      {"_interface", &POA_CORBA::LocalInterfaceDef::_interface_skel, 0},
+      {"lookup_name", &POA_CORBA::LocalInterfaceDef::lookup_name_skel, 0},
       {"is_a", &POA_CORBA::LocalInterfaceDef::is_a_skel, 0},
+      {"_get_version", &POA_CORBA::LocalInterfaceDef::_get_version_skel, 0},
+      {"_set_version", &POA_CORBA::LocalInterfaceDef::_set_version_skel, 0},
+      {"_get_absolute_name", &POA_CORBA::LocalInterfaceDef::_get_absolute_name_skel, 0},
+      {"_get_defined_in", &POA_CORBA::LocalInterfaceDef::_get_defined_in_skel, 0},
+      {"_get_id", &POA_CORBA::LocalInterfaceDef::_get_id_skel, 0},
+      {"_set_id", &POA_CORBA::LocalInterfaceDef::_set_id_skel, 0},
+      {"describe", &POA_CORBA::LocalInterfaceDef::describe_skel, 0},
+      {"_get_containing_repository", &POA_CORBA::LocalInterfaceDef::_get_containing_repository_skel, 0},
+      {"destroy", &POA_CORBA::LocalInterfaceDef::destroy_skel, 0},
+      {"_get_def_kind", &POA_CORBA::LocalInterfaceDef::_get_def_kind_skel, 0},
+      {"_repository_id", &POA_CORBA::LocalInterfaceDef::_repository_id_skel, 0},
+      {"describe_interface", &POA_CORBA::LocalInterfaceDef::describe_interface_skel, 0},
+      {"_get_base_interfaces", &POA_CORBA::LocalInterfaceDef::_get_base_interfaces_skel, 0},
+      {"_set_base_interfaces", &POA_CORBA::LocalInterfaceDef::_set_base_interfaces_skel, 0},
       {"create_enum", &POA_CORBA::LocalInterfaceDef::create_enum_skel, 0},
       {"create_value", &POA_CORBA::LocalInterfaceDef::create_value_skel, 0},
       {"create_module", &POA_CORBA::LocalInterfaceDef::create_module_skel, 0},
       {"create_native", &POA_CORBA::LocalInterfaceDef::create_native_skel, 0},
+      {"_component", &POA_CORBA::LocalInterfaceDef::_component_skel, 0},
       {"create_interface", &POA_CORBA::LocalInterfaceDef::create_interface_skel, 0},
       {"create_attribute", &POA_CORBA::LocalInterfaceDef::create_attribute_skel, 0},
       {"create_ext_value", &POA_CORBA::LocalInterfaceDef::create_ext_value_skel, 0},
       {"create_union", &POA_CORBA::LocalInterfaceDef::create_union_skel, 0},
+      {"_non_existent", &POA_CORBA::LocalInterfaceDef::_non_existent_skel, 0},
       {"create_exception", &POA_CORBA::LocalInterfaceDef::create_exception_skel, 0},
       {"create_operation", &POA_CORBA::LocalInterfaceDef::create_operation_skel, 0},
       {"create_local_interface", &POA_CORBA::LocalInterfaceDef::create_local_interface_skel, 0},
       {"create_abstract_interface", &POA_CORBA::LocalInterfaceDef::create_abstract_interface_skel, 0},
-      {"lookup_name", &POA_CORBA::LocalInterfaceDef::lookup_name_skel, 0},
-      {"destroy", &POA_CORBA::LocalInterfaceDef::destroy_skel, 0},
-      {"describe", &POA_CORBA::LocalInterfaceDef::describe_skel, 0},
-      {"_is_a", &POA_CORBA::LocalInterfaceDef::_is_a_skel, 0},
       {"create_value_box", &POA_CORBA::LocalInterfaceDef::create_value_box_skel, 0},
+      {"describe_contents", &POA_CORBA::LocalInterfaceDef::describe_contents_skel, 0},
       {"contents", &POA_CORBA::LocalInterfaceDef::contents_skel, 0},
-      {"_get_name", &POA_CORBA::LocalInterfaceDef::_get_name_skel, 0},
-      {"_get_type", &POA_CORBA::LocalInterfaceDef::_get_type_skel, 0},
-      {"_set_name", &POA_CORBA::LocalInterfaceDef::_set_name_skel, 0},
-      {"_interface", &POA_CORBA::LocalInterfaceDef::_interface_skel, 0},
-      {"lookup", &POA_CORBA::LocalInterfaceDef::lookup_skel, 0},
       {"create_alias", &POA_CORBA::LocalInterfaceDef::create_alias_skel, 0},
-      {"describe_interface", &POA_CORBA::LocalInterfaceDef::describe_interface_skel, 0},
-      {"_get_version", &POA_CORBA::LocalInterfaceDef::_get_version_skel, 0},
-      {"_set_version", &POA_CORBA::LocalInterfaceDef::_set_version_skel, 0},
-      {"_get_absolute_name", &POA_CORBA::LocalInterfaceDef::_get_absolute_name_skel, 0},
-      {"_get_defined_in", &POA_CORBA::LocalInterfaceDef::_get_defined_in_skel, 0},
-      {"_get_containing_repository", &POA_CORBA::LocalInterfaceDef::_get_containing_repository_skel, 0},
-      {"_get_id", &POA_CORBA::LocalInterfaceDef::_get_id_skel, 0},
-      {"_set_id", &POA_CORBA::LocalInterfaceDef::_set_id_skel, 0},
       {"create_struct", &POA_CORBA::LocalInterfaceDef::create_struct_skel, 0},
       {"create_constant", &POA_CORBA::LocalInterfaceDef::create_constant_skel, 0},
-      {"_get_def_kind", &POA_CORBA::LocalInterfaceDef::_get_def_kind_skel, 0},
-      {"describe_contents", &POA_CORBA::LocalInterfaceDef::describe_contents_skel, 0},
-      {"_get_base_interfaces", &POA_CORBA::LocalInterfaceDef::_get_base_interfaces_skel, 0},
-      {"_set_base_interfaces", &POA_CORBA::LocalInterfaceDef::_set_base_interfaces_skel, 0},
-      {"_component", &POA_CORBA::LocalInterfaceDef::_component_skel, 0},
-      {"_non_existent", &POA_CORBA::LocalInterfaceDef::_non_existent_skel, 0},
     };
 
   static const signed char lookup[] =
     {
-       -1,  -1,  -1,  -1,   4,  -1,  -1,  -8,  -2,   5,  -1,   6,   7, -84, 
-      -10,  -3, -80,  13,  -1, -14,  -2, -80,  16, -24,  -3,  17,  18,  19, 
-       20,  -1,  21,  22,  -1,  23, -89,  27,  28,  29,  30,  -1, -31,  -2, 
-      -80,  33,  -1,  34,  -1,  -1,  -1, -36,  -2,  35, -81,  38,  -1,  39, 
-       -1,  -1,  40,  -1,  -1,  -1,  41,  -1,  -1,  -1,  -1,  -1, -42,  -2, 
-      -80,  -1,  -1,  -1,  -1,  44,  -1,  -1,  45, 
+       -1,  -1,  -1,  -1,   4,   5,   6,  -7,  -3, -82,  10,  11,  -1,  -1, 
+       12, -13,  -2, -82,  15,  -1,  16,  -1,  -1, -17,  -2, -25,  -2, -84, 
+       19, -29,  -2,  20,  21,  22,  23,  -1, -32,  -3,  24,  -1, -95,  27, 
+       28, -94,  -1,  31, -90,  35,  36, -37,  -2, -82,  39,  -1,  -1,  40, 
+       41,  42,  43,  -1,  -1,  -1,  44,  -1,  -1,  -1,  -1,  -1,  -1,  -1, 
+       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  45,  -1,  46, 
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -21595,7 +23626,7 @@ TAO_CORBA_LocalInterfaceDef_Perfect_Hash_OpTable::lookup (const char *str, unsig
 static TAO_CORBA_LocalInterfaceDef_Perfect_Hash_OpTable tao_CORBA_LocalInterfaceDef_optable;
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:999
+// be\be_visitor_interface/interface_ss.cpp:921
 
 TAO::Collocation_Proxy_Broker *
 CORBA__TAO_LocalInterfaceDef_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -21615,10 +23646,7 @@ CORBA__TAO_LocalInterfaceDef_Proxy_Broker_Factory_Initializer (size_t)
 static int
 CORBA__TAO_LocalInterfaceDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
   CORBA__TAO_LocalInterfaceDef_Proxy_Broker_Factory_Initializer (
-      reinterpret_cast<
-          size_t> (
-          CORBA__TAO_LocalInterfaceDef_Proxy_Broker_Factory_Initializer
-        )
+      reinterpret_cast<size_t> (CORBA__TAO_LocalInterfaceDef_Proxy_Broker_Factory_Initializer)
     );
 
 
@@ -21678,8 +23706,8 @@ namespace POA_CORBA
           this->operation_details_,
           this->args_);
       
-      TAO::SArg_Traits< CORBA::Char *>::in_arg_type arg_1 =
-        TAO::Portable_Server::get_in_arg< CORBA::Char *, TAO::SArg_Traits< CORBA::Char *>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
@@ -21714,7 +23742,7 @@ void POA_CORBA::LocalInterfaceDef::_is_a_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  TAO::SArg_Traits< CORBA::Char *>::in_arg_val _tao_repository_id;
+  TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
   
   TAO::Argument * const args[] =
     {
@@ -21835,10 +23863,98 @@ void POA_CORBA::LocalInterfaceDef::_non_existent_skel (
   
 }
 
+namespace POA_CORBA
+{
+  
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_operation/upcall_command_ss.cpp:127
+  
+  class _repository_id_LocalInterfaceDef_Upcall_Command
+    : public TAO::Upcall_Command
+  {
+  public:
+    inline _repository_id_LocalInterfaceDef_Upcall_Command (
+      POA_CORBA::LocalInterfaceDef * servant,
+      TAO_Operation_Details const * operation_details,
+      TAO::Argument * const args[])
+      : servant_ (servant)
+      , operation_details_ (operation_details)
+      , args_ (args)
+    {
+    }
+    
+    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+    {
+      TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
+        TAO::Portable_Server::get_ret_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type> (
+          this->operation_details_,
+          this->args_);
+      
+      
+      retval =
+        this->servant_-> _repository_id (
+          ACE_ENV_SINGLE_ARG_PARAMETER);
+        
+    }
+  
+  private:
+    POA_CORBA::LocalInterfaceDef * const servant_;
+    TAO_Operation_Details const * const operation_details_;
+    TAO::Argument * const * const args_;
+  };
+  
+}
+void POA_CORBA::LocalInterfaceDef::_repository_id_skel (
+    TAO_ServerRequest & server_request, 
+    void * TAO_INTERCEPTOR (servant_upcall),
+    void * servant
+    ACE_ENV_ARG_DECL
+  )
+{
+  
+  
+#if TAO_HAS_INTERCEPTORS == 1
+  static CORBA::TypeCode_ptr const * const exceptions = 0;
+  static size_t const nexceptions = 0;
+#endif /* TAO_HAS_INTERCEPTORS */
+  
+  TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
+  
+  TAO::Argument * const args[] =
+    {
+      &retval
+    };
+  
+  static size_t const nargs = 1;
+  
+  POA_CORBA::LocalInterfaceDef * const impl =
+    static_cast<POA_CORBA::LocalInterfaceDef *> (servant);
+  
+  _repository_id_LocalInterfaceDef_Upcall_Command command (
+    impl,
+    server_request.operation_details (),
+    args);
+  
+  TAO::Upcall_Wrapper upcall_wrapper;
+  upcall_wrapper.upcall (server_request
+                         , args
+                         , nargs
+                         , command
+#if TAO_HAS_INTERCEPTORS == 1
+                         , servant_upcall
+                         , exceptions
+                         , nexceptions
+#endif  /* TAO_HAS_INTERCEPTORS == 1 */
+                         ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+  
+}
+
 
 
 // TAO_IDL - Generated from 
-// be\be_visitor_interface/interface_ss.cpp:393
+// be\be_visitor_interface/interface_ss.cpp:501
 
 
 
@@ -22015,7 +24131,7 @@ const char* POA_CORBA::LocalInterfaceDef::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:940
+// be\be_visitor_interface/interface_ss.cpp:862
 
 void POA_CORBA::LocalInterfaceDef::_dispatch (
     TAO_ServerRequest & req,
@@ -22030,7 +24146,7 @@ void POA_CORBA::LocalInterfaceDef::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:891
+// be\be_visitor_interface/interface_ss.cpp:813
 
 CORBA::LocalInterfaceDef *
 POA_CORBA::LocalInterfaceDef::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -22062,7 +24178,7 @@ POA_CORBA::LocalInterfaceDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1455
+// be\be_interface.cpp:1465
 
 class TAO_CORBA_ExtLocalInterfaceDef_Perfect_Hash_OpTable
   : public TAO_Perfect_Hash_OpTable
@@ -22075,7 +24191,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: c:\ace\latest\ACE_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0 -a -o -t -p -K opname -L C++ -Z TAO_CORBA_ExtLocalInterfaceDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ACE\Any\ACE_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0 -a -o -t -p -K opname -L C++ -Z TAO_CORBA_ExtLocalInterfaceDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_ExtLocalInterfaceDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -22132,14 +24248,14 @@ TAO_CORBA_ExtLocalInterfaceDef_Perfect_Hash_OpTable::lookup (const char *str, un
 {
   enum
     {
-      TOTAL_KEYWORDS = 44,
+      TOTAL_KEYWORDS = 45,
       MIN_WORD_LENGTH = 4,
       MAX_WORD_LENGTH = 26,
       MIN_HASH_VALUE = 4,
       MAX_HASH_VALUE = 73,
       HASH_VALUE_RANGE = 70,
       DUPLICATES = 10,
-      WORDLIST_SIZE = 48
+      WORDLIST_SIZE = 49
     };
 
   static const TAO_operation_db_entry  wordlist[] =
@@ -22185,6 +24301,7 @@ TAO_CORBA_ExtLocalInterfaceDef_Perfect_Hash_OpTable::lookup (const char *str, un
       {"_set_id", &POA_CORBA::ExtLocalInterfaceDef::_set_id_skel, 0},
       {"_get_containing_repository", &POA_CORBA::ExtLocalInterfaceDef::_get_containing_repository_skel, 0},
       {"_get_def_kind", &POA_CORBA::ExtLocalInterfaceDef::_get_def_kind_skel, 0},
+      {"_repository_id", &POA_CORBA::ExtLocalInterfaceDef::_repository_id_skel, 0},
       {"_get_base_interfaces", &POA_CORBA::ExtLocalInterfaceDef::_get_base_interfaces_skel, 0},
       {"_set_base_interfaces", &POA_CORBA::ExtLocalInterfaceDef::_set_base_interfaces_skel, 0},
       {"_component", &POA_CORBA::ExtLocalInterfaceDef::_component_skel, 0},
@@ -22197,8 +24314,8 @@ TAO_CORBA_ExtLocalInterfaceDef_Perfect_Hash_OpTable::lookup (const char *str, un
       -10,  -3, -75,  13, -15,  -2,  14, -76,  17,  18,  -1,  19,  20,  21, 
        22, -28,  -3,  23,  24, -35,  -2,  25,  26,  -1,  27, -83,  31,  -1, 
        32,  33,  -1,  34,  -1, -87,  37,  -1,  38,  -1,  39,  -1,  -1, -40, 
-       -2, -75,  -1, -44,  -2,  42,  -1,  43,  -1, -79,  -1,  -1,  -1,  -1, 
-       46,  -1,  -1,  47, 
+       -2, -75,  -1, -45,  -2,  42,  -1,  43,  44, -79,  -1,  -1,  -1,  -1, 
+       47,  -1,  -1,  48, 
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -22236,7 +24353,7 @@ TAO_CORBA_ExtLocalInterfaceDef_Perfect_Hash_OpTable::lookup (const char *str, un
 static TAO_CORBA_ExtLocalInterfaceDef_Perfect_Hash_OpTable tao_CORBA_ExtLocalInterfaceDef_optable;
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:999
+// be\be_visitor_interface/interface_ss.cpp:921
 
 TAO::Collocation_Proxy_Broker *
 CORBA__TAO_ExtLocalInterfaceDef_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -22256,10 +24373,7 @@ CORBA__TAO_ExtLocalInterfaceDef_Proxy_Broker_Factory_Initializer (size_t)
 static int
 CORBA__TAO_ExtLocalInterfaceDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
   CORBA__TAO_ExtLocalInterfaceDef_Proxy_Broker_Factory_Initializer (
-      reinterpret_cast<
-          size_t> (
-          CORBA__TAO_ExtLocalInterfaceDef_Proxy_Broker_Factory_Initializer
-        )
+      reinterpret_cast<size_t> (CORBA__TAO_ExtLocalInterfaceDef_Proxy_Broker_Factory_Initializer)
     );
 
 
@@ -22321,8 +24435,8 @@ namespace POA_CORBA
           this->operation_details_,
           this->args_);
       
-      TAO::SArg_Traits< CORBA::Char *>::in_arg_type arg_1 =
-        TAO::Portable_Server::get_in_arg< CORBA::Char *, TAO::SArg_Traits< CORBA::Char *>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
@@ -22357,7 +24471,7 @@ void POA_CORBA::ExtLocalInterfaceDef::_is_a_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  TAO::SArg_Traits< CORBA::Char *>::in_arg_val _tao_repository_id;
+  TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
   
   TAO::Argument * const args[] =
     {
@@ -22478,10 +24592,98 @@ void POA_CORBA::ExtLocalInterfaceDef::_non_existent_skel (
   
 }
 
+namespace POA_CORBA
+{
+  
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_operation/upcall_command_ss.cpp:127
+  
+  class _repository_id_ExtLocalInterfaceDef_Upcall_Command
+    : public TAO::Upcall_Command
+  {
+  public:
+    inline _repository_id_ExtLocalInterfaceDef_Upcall_Command (
+      POA_CORBA::ExtLocalInterfaceDef * servant,
+      TAO_Operation_Details const * operation_details,
+      TAO::Argument * const args[])
+      : servant_ (servant)
+      , operation_details_ (operation_details)
+      , args_ (args)
+    {
+    }
+    
+    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+    {
+      TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
+        TAO::Portable_Server::get_ret_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type> (
+          this->operation_details_,
+          this->args_);
+      
+      
+      retval =
+        this->servant_-> _repository_id (
+          ACE_ENV_SINGLE_ARG_PARAMETER);
+        
+    }
+  
+  private:
+    POA_CORBA::ExtLocalInterfaceDef * const servant_;
+    TAO_Operation_Details const * const operation_details_;
+    TAO::Argument * const * const args_;
+  };
+  
+}
+void POA_CORBA::ExtLocalInterfaceDef::_repository_id_skel (
+    TAO_ServerRequest & server_request, 
+    void * TAO_INTERCEPTOR (servant_upcall),
+    void * servant
+    ACE_ENV_ARG_DECL
+  )
+{
+  
+  
+#if TAO_HAS_INTERCEPTORS == 1
+  static CORBA::TypeCode_ptr const * const exceptions = 0;
+  static size_t const nexceptions = 0;
+#endif /* TAO_HAS_INTERCEPTORS */
+  
+  TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
+  
+  TAO::Argument * const args[] =
+    {
+      &retval
+    };
+  
+  static size_t const nargs = 1;
+  
+  POA_CORBA::ExtLocalInterfaceDef * const impl =
+    static_cast<POA_CORBA::ExtLocalInterfaceDef *> (servant);
+  
+  _repository_id_ExtLocalInterfaceDef_Upcall_Command command (
+    impl,
+    server_request.operation_details (),
+    args);
+  
+  TAO::Upcall_Wrapper upcall_wrapper;
+  upcall_wrapper.upcall (server_request
+                         , args
+                         , nargs
+                         , command
+#if TAO_HAS_INTERCEPTORS == 1
+                         , servant_upcall
+                         , exceptions
+                         , nexceptions
+#endif  /* TAO_HAS_INTERCEPTORS == 1 */
+                         ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+  
+}
+
 
 
 // TAO_IDL - Generated from 
-// be\be_visitor_interface/interface_ss.cpp:393
+// be\be_visitor_interface/interface_ss.cpp:501
 
 
 
@@ -22666,7 +24868,7 @@ const char* POA_CORBA::ExtLocalInterfaceDef::_interface_repository_id (void) con
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:940
+// be\be_visitor_interface/interface_ss.cpp:862
 
 void POA_CORBA::ExtLocalInterfaceDef::_dispatch (
     TAO_ServerRequest & req,
@@ -22681,7 +24883,7 @@ void POA_CORBA::ExtLocalInterfaceDef::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:891
+// be\be_visitor_interface/interface_ss.cpp:813
 
 CORBA::ExtLocalInterfaceDef *
 POA_CORBA::ExtLocalInterfaceDef::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -22712,1025 +24914,5 @@ POA_CORBA::ExtLocalInterfaceDef::_this (ACE_ENV_SINGLE_ARG_DECL)
       );
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_root/root.cpp:1582
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-#if !defined (_CORBA_DEFINITIONKIND__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_DEFINITIONKIND__SARG_TRAITS_TMPLINST_SS_
-
-  template class TAO::SArg_Traits<CORBA::DefinitionKind>;
-
-  template class TAO::Basic_SArg_Traits_T<CORBA::DefinitionKind>;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_CONTAINED__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_CONTAINED__SARG_TRAITS_TMPLINST_SS_
-
-  template class TAO::SArg_Traits<CORBA::Contained>;
-
-  template class
-    TAO::Object_SArg_Traits_T<
-        CORBA::Contained_ptr,
-        CORBA::Contained_var,
-        CORBA::Contained_out,
-      >;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_REPOSITORY__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_REPOSITORY__SARG_TRAITS_TMPLINST_SS_
-
-  template class TAO::SArg_Traits<CORBA::Repository>;
-
-  template class
-    TAO::Object_SArg_Traits_T<
-        CORBA::Repository_ptr,
-        CORBA::Repository_var,
-        CORBA::Repository_out,
-      >;
-
-#endif /* end #if !defined */
-
-  template class
-    TAO::Ret_Object_SArgument_T<
-        CORBA::Contained_ptr,
-        CORBA::Contained_var
-      >;
-
-  template class
-    TAO::Ret_Object_SArgument_T<
-        CORBA::PrimitiveDef_ptr,
-        CORBA::PrimitiveDef_var
-      >;
-
-  template class
-    TAO::In_Basic_SArgument_T<
-        CORBA::PrimitiveKind
-      >;
-
-  template class
-    TAO::Ret_Object_SArgument_T<
-        CORBA::StringDef_ptr,
-        CORBA::StringDef_var
-      >;
-
-  template class
-    TAO::Ret_Object_SArgument_T<
-        CORBA::WstringDef_ptr,
-        CORBA::WstringDef_var
-      >;
-
-  template class
-    TAO::Ret_Object_SArgument_T<
-        CORBA::SequenceDef_ptr,
-        CORBA::SequenceDef_var
-      >;
-
-  template class
-    TAO::In_Object_SArgument_T<
-        CORBA::IDLType_ptr
-      >;
-
-  template class
-    TAO::Ret_Object_SArgument_T<
-        CORBA::ArrayDef_ptr,
-        CORBA::ArrayDef_var
-      >;
-
-  template class
-    TAO::Ret_Object_SArgument_T<
-        CORBA::FixedDef_ptr,
-        CORBA::FixedDef_var
-      >;
-
-#if !defined (_CORBA_CONTAINER__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_CONTAINER__SARG_TRAITS_TMPLINST_SS_
-
-  template class TAO::SArg_Traits<CORBA::Container>;
-
-  template class
-    TAO::Object_SArg_Traits_T<
-        CORBA::Container_ptr,
-        CORBA::Container_var,
-        CORBA::Container_out,
-      >;
-
-#endif /* end #if !defined */
-
-  template class
-    TAO::Ret_Object_SArgument_T<
-        CORBA::IDLType_ptr,
-        CORBA::IDLType_var
-      >;
-
-#if !defined (_CORBA_IDLTYPE__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_IDLTYPE__SARG_TRAITS_TMPLINST_SS_
-
-  template class TAO::SArg_Traits<CORBA::IDLType>;
-
-  template class
-    TAO::Object_SArg_Traits_T<
-        CORBA::IDLType_ptr,
-        CORBA::IDLType_var,
-        CORBA::IDLType_out,
-      >;
-
-#endif /* end #if !defined */
-
-  template class
-    TAO::Ret_Var_Size_SArgument_T<
-        CORBA::StructMemberSeq,
-        CORBA::StructMemberSeq_var
-      >;
-
-  template class
-    TAO::In_Var_Size_SArgument_T<
-        CORBA::StructMemberSeq
-      >;
-
-  template class
-    TAO::Ret_Var_Size_SArgument_T<
-        CORBA::UnionMemberSeq,
-        CORBA::UnionMemberSeq_var
-      >;
-
-  template class
-    TAO::In_Var_Size_SArgument_T<
-        CORBA::UnionMemberSeq
-      >;
-
-  template class
-    TAO::Ret_Var_Size_SArgument_T<
-        CORBA::EnumMemberSeq,
-        CORBA::EnumMemberSeq_var
-      >;
-
-  template class
-    TAO::In_Var_Size_SArgument_T<
-        CORBA::EnumMemberSeq
-      >;
-
-  template class
-    TAO::Ret_Var_Size_SArgument_T<
-        CORBA::InterfaceDefSeq,
-        CORBA::InterfaceDefSeq_var
-      >;
-
-  template class
-    TAO::In_Var_Size_SArgument_T<
-        CORBA::InterfaceDefSeq
-      >;
-
-#if !defined (_CORBA_INTERFACEDEF_FULLINTERFACEDESCRIPTION__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_INTERFACEDEF_FULLINTERFACEDESCRIPTION__SARG_TRAITS_TMPLINST_SS_
-
-  template class TAO::SArg_Traits<CORBA::InterfaceDef::FullInterfaceDescription>;
-
-  template class
-    TAO::Var_Size_SArg_Traits_T<
-        CORBA::InterfaceDef::FullInterfaceDescription,
-        CORBA::InterfaceDef::FullInterfaceDescription_var,
-        CORBA::InterfaceDef::FullInterfaceDescription_out
-      >;
-
-#endif /* end #if !defined */
-
-  template class
-    TAO::Ret_Var_Size_SArgument_T<
-        CORBA::InterfaceDef::FullInterfaceDescription,
-        CORBA::InterfaceDef::FullInterfaceDescription_var
-      >;
-
-  template class
-    TAO::Ret_Object_SArgument_T<
-        CORBA::AttributeDef_ptr,
-        CORBA::AttributeDef_var
-      >;
-
-  template class
-    TAO::In_Basic_SArgument_T<
-        CORBA::AttributeMode
-      >;
-
-  template class
-    TAO::Ret_Object_SArgument_T<
-        CORBA::OperationDef_ptr,
-        CORBA::OperationDef_var
-      >;
-
-  template class
-    TAO::In_Basic_SArgument_T<
-        CORBA::OperationMode
-      >;
-
-  template class
-    TAO::In_Var_Size_SArgument_T<
-        CORBA::ParDescriptionSeq
-      >;
-
-  template class
-    TAO::In_Var_Size_SArgument_T<
-        CORBA::ExceptionDefSeq
-      >;
-
-  template class
-    TAO::In_Var_Size_SArgument_T<
-        CORBA::ContextIdSeq
-      >;
-
-#if !defined (_CORBA_SEQUENCE__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_SEQUENCE__SARG_TRAITS_TMPLINST_SS_
-
-  template class TAO::SArg_Traits<CORBA::InterfaceDefSeq>;
-
-  template class
-    TAO::Var_Size_SArg_Traits_T<
-        CORBA::InterfaceDefSeq,
-        CORBA::InterfaceDefSeq_var,
-        CORBA::InterfaceDefSeq_out
-      >;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_SEQUENCE__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_SEQUENCE__SARG_TRAITS_TMPLINST_SS_
-
-  template class TAO::SArg_Traits<CORBA::StructMemberSeq>;
-
-  template class
-    TAO::Var_Size_SArg_Traits_T<
-        CORBA::StructMemberSeq,
-        CORBA::StructMemberSeq_var,
-        CORBA::StructMemberSeq_out
-      >;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_SEQUENCE__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_SEQUENCE__SARG_TRAITS_TMPLINST_SS_
-
-  template class TAO::SArg_Traits<CORBA::ExcDescriptionSeq>;
-
-  template class
-    TAO::Var_Size_SArg_Traits_T<
-        CORBA::ExcDescriptionSeq,
-        CORBA::ExcDescriptionSeq_var,
-        CORBA::ExcDescriptionSeq_out
-      >;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_SEQUENCE__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_SEQUENCE__SARG_TRAITS_TMPLINST_SS_
-
-  template class TAO::SArg_Traits<CORBA::UnionMemberSeq>;
-
-  template class
-    TAO::Var_Size_SArg_Traits_T<
-        CORBA::UnionMemberSeq,
-        CORBA::UnionMemberSeq_var,
-        CORBA::UnionMemberSeq_out
-      >;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_SEQUENCE__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_SEQUENCE__SARG_TRAITS_TMPLINST_SS_
-
-  template class TAO::SArg_Traits<CORBA::EnumMemberSeq>;
-
-  template class
-    TAO::Var_Size_SArg_Traits_T<
-        CORBA::EnumMemberSeq,
-        CORBA::EnumMemberSeq_var,
-        CORBA::EnumMemberSeq_out
-      >;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_PRIMITIVEDEF__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_PRIMITIVEDEF__SARG_TRAITS_TMPLINST_SS_
-
-  template class TAO::SArg_Traits<CORBA::PrimitiveDef>;
-
-  template class
-    TAO::Object_SArg_Traits_T<
-        CORBA::PrimitiveDef_ptr,
-        CORBA::PrimitiveDef_var,
-        CORBA::PrimitiveDef_out,
-      >;
-
-#endif /* end #if !defined */
-
-  template class
-    TAO::Ret_Basic_SArgument_T<
-        CORBA::PrimitiveKind
-      >;
-
-#if !defined (_CORBA_STRINGDEF__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_STRINGDEF__SARG_TRAITS_TMPLINST_SS_
-
-  template class TAO::SArg_Traits<CORBA::StringDef>;
-
-  template class
-    TAO::Object_SArg_Traits_T<
-        CORBA::StringDef_ptr,
-        CORBA::StringDef_var,
-        CORBA::StringDef_out,
-      >;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_SEQUENCEDEF__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_SEQUENCEDEF__SARG_TRAITS_TMPLINST_SS_
-
-  template class TAO::SArg_Traits<CORBA::SequenceDef>;
-
-  template class
-    TAO::Object_SArg_Traits_T<
-        CORBA::SequenceDef_ptr,
-        CORBA::SequenceDef_var,
-        CORBA::SequenceDef_out,
-      >;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_ARRAYDEF__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_ARRAYDEF__SARG_TRAITS_TMPLINST_SS_
-
-  template class TAO::SArg_Traits<CORBA::ArrayDef>;
-
-  template class
-    TAO::Object_SArg_Traits_T<
-        CORBA::ArrayDef_ptr,
-        CORBA::ArrayDef_var,
-        CORBA::ArrayDef_out,
-      >;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_WSTRINGDEF__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_WSTRINGDEF__SARG_TRAITS_TMPLINST_SS_
-
-  template class TAO::SArg_Traits<CORBA::WstringDef>;
-
-  template class
-    TAO::Object_SArg_Traits_T<
-        CORBA::WstringDef_ptr,
-        CORBA::WstringDef_var,
-        CORBA::WstringDef_out,
-      >;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_FIXEDDEF__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_FIXEDDEF__SARG_TRAITS_TMPLINST_SS_
-
-  template class TAO::SArg_Traits<CORBA::FixedDef>;
-
-  template class
-    TAO::Object_SArg_Traits_T<
-        CORBA::FixedDef_ptr,
-        CORBA::FixedDef_var,
-        CORBA::FixedDef_out,
-      >;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_PRIMITIVEKIND__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_PRIMITIVEKIND__SARG_TRAITS_TMPLINST_SS_
-
-  template class TAO::SArg_Traits<CORBA::PrimitiveKind>;
-
-  template class TAO::Basic_SArg_Traits_T<CORBA::PrimitiveKind>;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_EXCEPTIONDEFSEQ__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_EXCEPTIONDEFSEQ__SARG_TRAITS_TMPLINST_SS_
-
-  template class TAO::SArg_Traits<CORBA::ExceptionDefSeq>;
-
-  template class
-    TAO::Var_Size_SArg_Traits_T<
-        CORBA::ExceptionDefSeq,
-        CORBA::ExceptionDefSeq_var,
-        CORBA::ExceptionDefSeq_out
-      >;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_ATTRIBUTEMODE__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_ATTRIBUTEMODE__SARG_TRAITS_TMPLINST_SS_
-
-  template class TAO::SArg_Traits<CORBA::AttributeMode>;
-
-  template class TAO::Basic_SArg_Traits_T<CORBA::AttributeMode>;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_ATTRIBUTEDEF__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_ATTRIBUTEDEF__SARG_TRAITS_TMPLINST_SS_
-
-  template class TAO::SArg_Traits<CORBA::AttributeDef>;
-
-  template class
-    TAO::Object_SArg_Traits_T<
-        CORBA::AttributeDef_ptr,
-        CORBA::AttributeDef_var,
-        CORBA::AttributeDef_out,
-      >;
-
-#endif /* end #if !defined */
-
-  template class
-    TAO::Ret_Basic_SArgument_T<
-        CORBA::AttributeMode
-      >;
-
-#if !defined (_CORBA_EXTATTRIBUTEDESCRIPTION__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_EXTATTRIBUTEDESCRIPTION__SARG_TRAITS_TMPLINST_SS_
-
-  template class TAO::SArg_Traits<CORBA::ExtAttributeDescription>;
-
-  template class
-    TAO::Var_Size_SArg_Traits_T<
-        CORBA::ExtAttributeDescription,
-        CORBA::ExtAttributeDescription_var,
-        CORBA::ExtAttributeDescription_out
-      >;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_EXTATTRIBUTEDEF__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_EXTATTRIBUTEDEF__SARG_TRAITS_TMPLINST_SS_
-
-  template class TAO::SArg_Traits<CORBA::ExtAttributeDef>;
-
-  template class
-    TAO::Object_SArg_Traits_T<
-        CORBA::ExtAttributeDef_ptr,
-        CORBA::ExtAttributeDef_var,
-        CORBA::ExtAttributeDef_out,
-      >;
-
-#endif /* end #if !defined */
-
-  template class
-    TAO::Ret_Var_Size_SArgument_T<
-        CORBA::ExcDescriptionSeq,
-        CORBA::ExcDescriptionSeq_var
-      >;
-
-  template class
-    TAO::In_Var_Size_SArgument_T<
-        CORBA::ExcDescriptionSeq
-      >;
-
-  template class
-    TAO::Ret_Var_Size_SArgument_T<
-        CORBA::ExtAttributeDescription,
-        CORBA::ExtAttributeDescription_var
-      >;
-
-#if !defined (_CORBA_OPERATIONMODE__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_OPERATIONMODE__SARG_TRAITS_TMPLINST_SS_
-
-  template class TAO::SArg_Traits<CORBA::OperationMode>;
-
-  template class TAO::Basic_SArg_Traits_T<CORBA::OperationMode>;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_PARDESCRIPTIONSEQ__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_PARDESCRIPTIONSEQ__SARG_TRAITS_TMPLINST_SS_
-
-  template class TAO::SArg_Traits<CORBA::ParDescriptionSeq>;
-
-  template class
-    TAO::Var_Size_SArg_Traits_T<
-        CORBA::ParDescriptionSeq,
-        CORBA::ParDescriptionSeq_var,
-        CORBA::ParDescriptionSeq_out
-      >;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_CONTEXTIDSEQ__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_CONTEXTIDSEQ__SARG_TRAITS_TMPLINST_SS_
-
-  template class TAO::SArg_Traits<CORBA::ContextIdSeq>;
-
-  template class
-    TAO::Var_Size_SArg_Traits_T<
-        CORBA::ContextIdSeq,
-        CORBA::ContextIdSeq_var,
-        CORBA::ContextIdSeq_out
-      >;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_OPERATIONDEF__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_OPERATIONDEF__SARG_TRAITS_TMPLINST_SS_
-
-  template class TAO::SArg_Traits<CORBA::OperationDef>;
-
-  template class
-    TAO::Object_SArg_Traits_T<
-        CORBA::OperationDef_ptr,
-        CORBA::OperationDef_var,
-        CORBA::OperationDef_out,
-      >;
-
-#endif /* end #if !defined */
-
-  template class
-    TAO::Ret_Var_Size_SArgument_T<
-        CORBA::ParDescriptionSeq,
-        CORBA::ParDescriptionSeq_var
-      >;
-
-  template class
-    TAO::Ret_Basic_SArgument_T<
-        CORBA::OperationMode
-      >;
-
-  template class
-    TAO::Ret_Var_Size_SArgument_T<
-        CORBA::ContextIdSeq,
-        CORBA::ContextIdSeq_var
-      >;
-
-  template class
-    TAO::Ret_Var_Size_SArgument_T<
-        CORBA::ExceptionDefSeq,
-        CORBA::ExceptionDefSeq_var
-      >;
-
-#if !defined (_CORBA_INTERFACEATTREXTENSION_EXTFULLINTERFACEDESCRIPTION__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_INTERFACEATTREXTENSION_EXTFULLINTERFACEDESCRIPTION__SARG_TRAITS_TMPLINST_SS_
-
-  template class TAO::SArg_Traits<CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription>;
-
-  template class
-    TAO::Var_Size_SArg_Traits_T<
-        CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription,
-        CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription_var,
-        CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription_out
-      >;
-
-#endif /* end #if !defined */
-
-  template class
-    TAO::Ret_Var_Size_SArgument_T<
-        CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription,
-        CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription_var
-      >;
-
-  template class
-    TAO::Ret_Object_SArgument_T<
-        CORBA::ExtAttributeDef_ptr,
-        CORBA::ExtAttributeDef_var
-      >;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#if !defined (_CORBA_DEFINITIONKIND__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_DEFINITIONKIND__SARG_TRAITS_TMPLINST_SS_
-
-# pragma instantiate TAO::SArg_Traits<CORBA::DefinitionKind>
-
-# pragma instantiate TAO::Basic_SArg_Traits_T<CORBA::DefinitionKind>
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_CONTAINED__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_CONTAINED__SARG_TRAITS_TMPLINST_SS_
-
-# pragma instantiate TAO::SArg_Traits<CORBA::Contained>
-
-# pragma instantiate \
-    TAO::Object_SArg_Traits_T< \
-        CORBA::Contained_ptr, \
-        CORBA::Contained_var, \
-        CORBA::Contained_out, \
-      >
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_REPOSITORY__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_REPOSITORY__SARG_TRAITS_TMPLINST_SS_
-
-# pragma instantiate TAO::SArg_Traits<CORBA::Repository>
-
-# pragma instantiate \
-    TAO::Object_SArg_Traits_T< \
-        CORBA::Repository_ptr, \
-        CORBA::Repository_var, \
-        CORBA::Repository_out, \
-      >
-
-#endif /* end #if !defined */
-
-# pragma instantiate \
-    TAO::In_Basic_SArgument_T< \
-        CORBA::PrimitiveKind \
-      >
-
-# pragma instantiate \
-    TAO::In_Object_SArgument_T< \
-        CORBA::IDLType_ptr \
-      >
-
-#if !defined (_CORBA_CONTAINER__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_CONTAINER__SARG_TRAITS_TMPLINST_SS_
-
-# pragma instantiate TAO::SArg_Traits<CORBA::Container>
-
-# pragma instantiate \
-    TAO::Object_SArg_Traits_T< \
-        CORBA::Container_ptr, \
-        CORBA::Container_var, \
-        CORBA::Container_out, \
-      >
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_IDLTYPE__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_IDLTYPE__SARG_TRAITS_TMPLINST_SS_
-
-# pragma instantiate TAO::SArg_Traits<CORBA::IDLType>
-
-# pragma instantiate \
-    TAO::Object_SArg_Traits_T< \
-        CORBA::IDLType_ptr, \
-        CORBA::IDLType_var, \
-        CORBA::IDLType_out, \
-      >
-
-#endif /* end #if !defined */
-
-# pragma instantiate \
-    TAO::In_Var_Size_SArgument_T< \
-        CORBA::StructMemberSeq \
-      >
-
-# pragma instantiate \
-    TAO::In_Var_Size_SArgument_T< \
-        CORBA::UnionMemberSeq \
-      >
-
-# pragma instantiate \
-    TAO::In_Var_Size_SArgument_T< \
-        CORBA::EnumMemberSeq \
-      >
-
-# pragma instantiate \
-    TAO::In_Var_Size_SArgument_T< \
-        CORBA::InterfaceDefSeq \
-      >
-
-#if !defined (_CORBA_INTERFACEDEF_FULLINTERFACEDESCRIPTION__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_INTERFACEDEF_FULLINTERFACEDESCRIPTION__SARG_TRAITS_TMPLINST_SS_
-
-# pragma instantiate TAO::SArg_Traits<CORBA::InterfaceDef::FullInterfaceDescription>
-
-# pragma instantiate \
-    TAO::Var_Size_SArg_Traits_T< \
-        CORBA::InterfaceDef::FullInterfaceDescription, \
-        CORBA::InterfaceDef::FullInterfaceDescription_var, \
-        CORBA::InterfaceDef::FullInterfaceDescription_out \
-      >
-
-#endif /* end #if !defined */
-
-# pragma instantiate \
-    TAO::In_Basic_SArgument_T< \
-        CORBA::AttributeMode \
-      >
-
-# pragma instantiate \
-    TAO::In_Basic_SArgument_T< \
-        CORBA::OperationMode \
-      >
-
-# pragma instantiate \
-    TAO::In_Var_Size_SArgument_T< \
-        CORBA::ParDescriptionSeq \
-      >
-
-# pragma instantiate \
-    TAO::In_Var_Size_SArgument_T< \
-        CORBA::ExceptionDefSeq \
-      >
-
-# pragma instantiate \
-    TAO::In_Var_Size_SArgument_T< \
-        CORBA::ContextIdSeq \
-      >
-
-#if !defined (_CORBA_SEQUENCE__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_SEQUENCE__SARG_TRAITS_TMPLINST_SS_
-
-# pragma instantiate TAO::SArg_Traits<CORBA::InterfaceDefSeq>
-
-# pragma instantiate \
-    TAO::Var_Size_SArg_Traits_T< \
-        CORBA::InterfaceDefSeq, \
-        CORBA::InterfaceDefSeq_var, \
-        CORBA::InterfaceDefSeq_out \
-      >
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_SEQUENCE__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_SEQUENCE__SARG_TRAITS_TMPLINST_SS_
-
-# pragma instantiate TAO::SArg_Traits<CORBA::StructMemberSeq>
-
-# pragma instantiate \
-    TAO::Var_Size_SArg_Traits_T< \
-        CORBA::StructMemberSeq, \
-        CORBA::StructMemberSeq_var, \
-        CORBA::StructMemberSeq_out \
-      >
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_SEQUENCE__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_SEQUENCE__SARG_TRAITS_TMPLINST_SS_
-
-# pragma instantiate TAO::SArg_Traits<CORBA::ExcDescriptionSeq>
-
-# pragma instantiate \
-    TAO::Var_Size_SArg_Traits_T< \
-        CORBA::ExcDescriptionSeq, \
-        CORBA::ExcDescriptionSeq_var, \
-        CORBA::ExcDescriptionSeq_out \
-      >
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_SEQUENCE__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_SEQUENCE__SARG_TRAITS_TMPLINST_SS_
-
-# pragma instantiate TAO::SArg_Traits<CORBA::UnionMemberSeq>
-
-# pragma instantiate \
-    TAO::Var_Size_SArg_Traits_T< \
-        CORBA::UnionMemberSeq, \
-        CORBA::UnionMemberSeq_var, \
-        CORBA::UnionMemberSeq_out \
-      >
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_SEQUENCE__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_SEQUENCE__SARG_TRAITS_TMPLINST_SS_
-
-# pragma instantiate TAO::SArg_Traits<CORBA::EnumMemberSeq>
-
-# pragma instantiate \
-    TAO::Var_Size_SArg_Traits_T< \
-        CORBA::EnumMemberSeq, \
-        CORBA::EnumMemberSeq_var, \
-        CORBA::EnumMemberSeq_out \
-      >
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_PRIMITIVEDEF__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_PRIMITIVEDEF__SARG_TRAITS_TMPLINST_SS_
-
-# pragma instantiate TAO::SArg_Traits<CORBA::PrimitiveDef>
-
-# pragma instantiate \
-    TAO::Object_SArg_Traits_T< \
-        CORBA::PrimitiveDef_ptr, \
-        CORBA::PrimitiveDef_var, \
-        CORBA::PrimitiveDef_out, \
-      >
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_STRINGDEF__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_STRINGDEF__SARG_TRAITS_TMPLINST_SS_
-
-# pragma instantiate TAO::SArg_Traits<CORBA::StringDef>
-
-# pragma instantiate \
-    TAO::Object_SArg_Traits_T< \
-        CORBA::StringDef_ptr, \
-        CORBA::StringDef_var, \
-        CORBA::StringDef_out, \
-      >
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_SEQUENCEDEF__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_SEQUENCEDEF__SARG_TRAITS_TMPLINST_SS_
-
-# pragma instantiate TAO::SArg_Traits<CORBA::SequenceDef>
-
-# pragma instantiate \
-    TAO::Object_SArg_Traits_T< \
-        CORBA::SequenceDef_ptr, \
-        CORBA::SequenceDef_var, \
-        CORBA::SequenceDef_out, \
-      >
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_ARRAYDEF__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_ARRAYDEF__SARG_TRAITS_TMPLINST_SS_
-
-# pragma instantiate TAO::SArg_Traits<CORBA::ArrayDef>
-
-# pragma instantiate \
-    TAO::Object_SArg_Traits_T< \
-        CORBA::ArrayDef_ptr, \
-        CORBA::ArrayDef_var, \
-        CORBA::ArrayDef_out, \
-      >
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_WSTRINGDEF__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_WSTRINGDEF__SARG_TRAITS_TMPLINST_SS_
-
-# pragma instantiate TAO::SArg_Traits<CORBA::WstringDef>
-
-# pragma instantiate \
-    TAO::Object_SArg_Traits_T< \
-        CORBA::WstringDef_ptr, \
-        CORBA::WstringDef_var, \
-        CORBA::WstringDef_out, \
-      >
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_FIXEDDEF__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_FIXEDDEF__SARG_TRAITS_TMPLINST_SS_
-
-# pragma instantiate TAO::SArg_Traits<CORBA::FixedDef>
-
-# pragma instantiate \
-    TAO::Object_SArg_Traits_T< \
-        CORBA::FixedDef_ptr, \
-        CORBA::FixedDef_var, \
-        CORBA::FixedDef_out, \
-      >
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_PRIMITIVEKIND__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_PRIMITIVEKIND__SARG_TRAITS_TMPLINST_SS_
-
-# pragma instantiate TAO::SArg_Traits<CORBA::PrimitiveKind>
-
-# pragma instantiate TAO::Basic_SArg_Traits_T<CORBA::PrimitiveKind>
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_EXCEPTIONDEFSEQ__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_EXCEPTIONDEFSEQ__SARG_TRAITS_TMPLINST_SS_
-
-# pragma instantiate TAO::SArg_Traits<CORBA::ExceptionDefSeq>
-
-# pragma instantiate \
-    TAO::Var_Size_SArg_Traits_T< \
-        CORBA::ExceptionDefSeq, \
-        CORBA::ExceptionDefSeq_var, \
-        CORBA::ExceptionDefSeq_out \
-      >
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_ATTRIBUTEMODE__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_ATTRIBUTEMODE__SARG_TRAITS_TMPLINST_SS_
-
-# pragma instantiate TAO::SArg_Traits<CORBA::AttributeMode>
-
-# pragma instantiate TAO::Basic_SArg_Traits_T<CORBA::AttributeMode>
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_ATTRIBUTEDEF__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_ATTRIBUTEDEF__SARG_TRAITS_TMPLINST_SS_
-
-# pragma instantiate TAO::SArg_Traits<CORBA::AttributeDef>
-
-# pragma instantiate \
-    TAO::Object_SArg_Traits_T< \
-        CORBA::AttributeDef_ptr, \
-        CORBA::AttributeDef_var, \
-        CORBA::AttributeDef_out, \
-      >
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_EXTATTRIBUTEDESCRIPTION__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_EXTATTRIBUTEDESCRIPTION__SARG_TRAITS_TMPLINST_SS_
-
-# pragma instantiate TAO::SArg_Traits<CORBA::ExtAttributeDescription>
-
-# pragma instantiate \
-    TAO::Var_Size_SArg_Traits_T< \
-        CORBA::ExtAttributeDescription, \
-        CORBA::ExtAttributeDescription_var, \
-        CORBA::ExtAttributeDescription_out \
-      >
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_EXTATTRIBUTEDEF__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_EXTATTRIBUTEDEF__SARG_TRAITS_TMPLINST_SS_
-
-# pragma instantiate TAO::SArg_Traits<CORBA::ExtAttributeDef>
-
-# pragma instantiate \
-    TAO::Object_SArg_Traits_T< \
-        CORBA::ExtAttributeDef_ptr, \
-        CORBA::ExtAttributeDef_var, \
-        CORBA::ExtAttributeDef_out, \
-      >
-
-#endif /* end #if !defined */
-
-# pragma instantiate \
-    TAO::In_Var_Size_SArgument_T< \
-        CORBA::ExcDescriptionSeq \
-      >
-
-#if !defined (_CORBA_OPERATIONMODE__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_OPERATIONMODE__SARG_TRAITS_TMPLINST_SS_
-
-# pragma instantiate TAO::SArg_Traits<CORBA::OperationMode>
-
-# pragma instantiate TAO::Basic_SArg_Traits_T<CORBA::OperationMode>
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_PARDESCRIPTIONSEQ__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_PARDESCRIPTIONSEQ__SARG_TRAITS_TMPLINST_SS_
-
-# pragma instantiate TAO::SArg_Traits<CORBA::ParDescriptionSeq>
-
-# pragma instantiate \
-    TAO::Var_Size_SArg_Traits_T< \
-        CORBA::ParDescriptionSeq, \
-        CORBA::ParDescriptionSeq_var, \
-        CORBA::ParDescriptionSeq_out \
-      >
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_CONTEXTIDSEQ__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_CONTEXTIDSEQ__SARG_TRAITS_TMPLINST_SS_
-
-# pragma instantiate TAO::SArg_Traits<CORBA::ContextIdSeq>
-
-# pragma instantiate \
-    TAO::Var_Size_SArg_Traits_T< \
-        CORBA::ContextIdSeq, \
-        CORBA::ContextIdSeq_var, \
-        CORBA::ContextIdSeq_out \
-      >
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_OPERATIONDEF__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_OPERATIONDEF__SARG_TRAITS_TMPLINST_SS_
-
-# pragma instantiate TAO::SArg_Traits<CORBA::OperationDef>
-
-# pragma instantiate \
-    TAO::Object_SArg_Traits_T< \
-        CORBA::OperationDef_ptr, \
-        CORBA::OperationDef_var, \
-        CORBA::OperationDef_out, \
-      >
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_INTERFACEATTREXTENSION_EXTFULLINTERFACEDESCRIPTION__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_INTERFACEATTREXTENSION_EXTFULLINTERFACEDESCRIPTION__SARG_TRAITS_TMPLINST_SS_
-
-# pragma instantiate TAO::SArg_Traits<CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription>
-
-# pragma instantiate \
-    TAO::Var_Size_SArg_Traits_T< \
-        CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription, \
-        CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription_var, \
-        CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription_out \
-      >
-
-#endif /* end #if !defined */
-
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
-
 #endif /* ifndef */
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.h
index 98c2911ac13..f1116147508 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.h
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:390
+// be\be_codegen.cpp:393
 
 #ifndef _TAO_IDL_ORIG_IFR_BASICS_H_
 #define _TAO_IDL_ORIG_IFR_BASICS_H_
@@ -59,78 +59,85 @@
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_sh.cpp:87
-  
+
   class Repository;
   typedef Repository *Repository_ptr;
-  
-  
+
+
   class  Repository
     : public virtual POA_CORBA::Container
   {
   protected:
     Repository (void);
-  
+
   public:
     // Useful for template programming.
     typedef ::CORBA::Repository _stub_type;
     typedef ::CORBA::Repository_ptr _stub_ptr_type;
     typedef ::CORBA::Repository_var _stub_var_type;
-    
+
     Repository (const Repository& rhs);
     virtual ~Repository (void);
-    
+
     virtual CORBA::Boolean _is_a (
         const char* logical_type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static void _is_a_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
         ACE_ENV_ARG_DECL
       );
-    
+
     static void _non_existent_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
         ACE_ENV_ARG_DECL
       );
-    
+
     static void _interface_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
         ACE_ENV_ARG_DECL
       );
-    
+
     static void _component_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
         ACE_ENV_ARG_DECL
       );
-    
+
+    static void _repository_id_skel (
+        TAO_ServerRequest & req,
+        void * servant_upcall,
+        void * servant
+        ACE_ENV_ARG_DECL
+      );
+
     virtual void _dispatch (
         TAO_ServerRequest & req,
         void * servant_upcall
         ACE_ENV_ARG_DECL
       );
-    
+
     ::CORBA::Repository *_this (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
-    
+
     virtual ::CORBA::Contained_ptr lookup_id (
         const char * search_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -138,17 +145,17 @@ namespace POA_CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     static void lookup_id_skel (
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
         ACE_ENV_ARG_DECL
       );
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
-    
+
     virtual CORBA::TypeCode_ptr get_canonical_typecode (
         ::CORBA::TypeCode_ptr tc
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -156,17 +163,17 @@ namespace POA_CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     static void get_canonical_typecode_skel (
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
         ACE_ENV_ARG_DECL
       );
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
-    
+
     virtual ::CORBA::PrimitiveDef_ptr get_primitive (
         ::CORBA::PrimitiveKind kind
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -174,17 +181,17 @@ namespace POA_CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     static void get_primitive_skel (
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
         ACE_ENV_ARG_DECL
       );
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
-    
+
     virtual ::CORBA::StringDef_ptr create_string (
         ::CORBA::ULong bound
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -192,17 +199,17 @@ namespace POA_CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     static void create_string_skel (
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
         ACE_ENV_ARG_DECL
       );
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
-    
+
     virtual ::CORBA::WstringDef_ptr create_wstring (
         ::CORBA::ULong bound
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -210,17 +217,17 @@ namespace POA_CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     static void create_wstring_skel (
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
         ACE_ENV_ARG_DECL
       );
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
-    
+
     virtual ::CORBA::SequenceDef_ptr create_sequence (
         ::CORBA::ULong bound,
         ::CORBA::IDLType_ptr element_type
@@ -229,17 +236,17 @@ namespace POA_CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     static void create_sequence_skel (
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
         ACE_ENV_ARG_DECL
       );
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
-    
+
     virtual ::CORBA::ArrayDef_ptr create_array (
         ::CORBA::ULong length,
         ::CORBA::IDLType_ptr element_type
@@ -248,17 +255,17 @@ namespace POA_CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     static void create_array_skel (
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
         ACE_ENV_ARG_DECL
       );
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
-    
+
     virtual ::CORBA::FixedDef_ptr create_fixed (
         ::CORBA::UShort digits,
         ::CORBA::Short scale
@@ -267,14 +274,14 @@ namespace POA_CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     static void create_fixed_skel (
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
         ACE_ENV_ARG_DECL
       );
-    
+
     static void
     _get_def_kind_skel (
         TAO_ServerRequest & server_request,
@@ -282,285 +289,292 @@ namespace POA_CORBA
         void * servant
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
-    
+    // be\be_interface.cpp:1869
+
     static void
     destroy_skel (
-        TAO_ServerRequest & server_request, 
+        TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
-    
+    // be\be_interface.cpp:1869
+
     static void
     lookup_skel (
-        TAO_ServerRequest & server_request, 
+        TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
-    
+    // be\be_interface.cpp:1869
+
     static void
     contents_skel (
-        TAO_ServerRequest & server_request, 
+        TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
-    
+    // be\be_interface.cpp:1869
+
     static void
     lookup_name_skel (
-        TAO_ServerRequest & server_request, 
+        TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
-    
+    // be\be_interface.cpp:1869
+
     static void
     describe_contents_skel (
-        TAO_ServerRequest & server_request, 
+        TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
-    
+    // be\be_interface.cpp:1869
+
     static void
     create_module_skel (
-        TAO_ServerRequest & server_request, 
+        TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
-    
+    // be\be_interface.cpp:1869
+
     static void
     create_constant_skel (
-        TAO_ServerRequest & server_request, 
+        TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
-    
+    // be\be_interface.cpp:1869
+
     static void
     create_struct_skel (
-        TAO_ServerRequest & server_request, 
+        TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
-    
+    // be\be_interface.cpp:1869
+
     static void
     create_union_skel (
-        TAO_ServerRequest & server_request, 
+        TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
-    
+    // be\be_interface.cpp:1869
+
     static void
     create_enum_skel (
-        TAO_ServerRequest & server_request, 
+        TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
-    
+    // be\be_interface.cpp:1869
+
     static void
     create_alias_skel (
-        TAO_ServerRequest & server_request, 
+        TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
-    
+    // be\be_interface.cpp:1869
+
     static void
     create_interface_skel (
-        TAO_ServerRequest & server_request, 
+        TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
-    
+    // be\be_interface.cpp:1869
+
     static void
     create_value_skel (
-        TAO_ServerRequest & server_request, 
+        TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
-    
+    // be\be_interface.cpp:1869
+
     static void
     create_value_box_skel (
-        TAO_ServerRequest & server_request, 
+        TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
-    
+    // be\be_interface.cpp:1869
+
     static void
     create_exception_skel (
-        TAO_ServerRequest & server_request, 
+        TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
-    
+    // be\be_interface.cpp:1869
+
     static void
     create_native_skel (
-        TAO_ServerRequest & server_request, 
+        TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
-    
+    // be\be_interface.cpp:1869
+
     static void
     create_abstract_interface_skel (
-        TAO_ServerRequest & server_request, 
+        TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
-    
+    // be\be_interface.cpp:1869
+
     static void
     create_local_interface_skel (
-        TAO_ServerRequest & server_request, 
+        TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
-    
+    // be\be_interface.cpp:1869
+
     static void
     create_ext_value_skel (
-        TAO_ServerRequest & server_request, 
+        TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
   };
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_sh.cpp:87
-  
+
   class ModuleDef;
   typedef ModuleDef *ModuleDef_ptr;
-  
-  
+
+
   class  ModuleDef
     : public virtual POA_CORBA::Container,
       public virtual POA_CORBA::Contained
   {
   protected:
     ModuleDef (void);
-  
+
   public:
     // Useful for template programming.
     typedef ::CORBA::ModuleDef _stub_type;
     typedef ::CORBA::ModuleDef_ptr _stub_ptr_type;
     typedef ::CORBA::ModuleDef_var _stub_var_type;
-    
+
     ModuleDef (const ModuleDef& rhs);
     virtual ~ModuleDef (void);
-    
+
     virtual CORBA::Boolean _is_a (
         const char* logical_type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static void _is_a_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
         ACE_ENV_ARG_DECL
       );
-    
+
     static void _non_existent_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
         ACE_ENV_ARG_DECL
       );
-    
+
     static void _interface_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
         ACE_ENV_ARG_DECL
       );
-    
+
     static void _component_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
         ACE_ENV_ARG_DECL
       );
-    
+
+    static void _repository_id_skel (
+        TAO_ServerRequest & req,
+        void * servant_upcall,
+        void * servant
+        ACE_ENV_ARG_DECL
+      );
+
     virtual void _dispatch (
         TAO_ServerRequest & req,
         void * servant_upcall
         ACE_ENV_ARG_DECL
       );
-    
+
     ::CORBA::ModuleDef *_this (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
-    
+
     static void
     _get_def_kind_skel (
         TAO_ServerRequest & server_request,
@@ -568,216 +582,216 @@ namespace POA_CORBA
         void * servant
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
-    
+    // be\be_interface.cpp:1869
+
     static void
     destroy_skel (
-        TAO_ServerRequest & server_request, 
+        TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
-    
+    // be\be_interface.cpp:1869
+
     static void
     lookup_skel (
-        TAO_ServerRequest & server_request, 
+        TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
-    
+    // be\be_interface.cpp:1869
+
     static void
     contents_skel (
-        TAO_ServerRequest & server_request, 
+        TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
-    
+    // be\be_interface.cpp:1869
+
     static void
     lookup_name_skel (
-        TAO_ServerRequest & server_request, 
+        TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
-    
+    // be\be_interface.cpp:1869
+
     static void
     describe_contents_skel (
-        TAO_ServerRequest & server_request, 
+        TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
-    
+    // be\be_interface.cpp:1869
+
     static void
     create_module_skel (
-        TAO_ServerRequest & server_request, 
+        TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
-    
+    // be\be_interface.cpp:1869
+
     static void
     create_constant_skel (
-        TAO_ServerRequest & server_request, 
+        TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
-    
+    // be\be_interface.cpp:1869
+
     static void
     create_struct_skel (
-        TAO_ServerRequest & server_request, 
+        TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
-    
+    // be\be_interface.cpp:1869
+
     static void
     create_union_skel (
-        TAO_ServerRequest & server_request, 
+        TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
-    
+    // be\be_interface.cpp:1869
+
     static void
     create_enum_skel (
-        TAO_ServerRequest & server_request, 
+        TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
-    
+    // be\be_interface.cpp:1869
+
     static void
     create_alias_skel (
-        TAO_ServerRequest & server_request, 
+        TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
-    
+    // be\be_interface.cpp:1869
+
     static void
     create_interface_skel (
-        TAO_ServerRequest & server_request, 
+        TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
-    
+    // be\be_interface.cpp:1869
+
     static void
     create_value_skel (
-        TAO_ServerRequest & server_request, 
+        TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
-    
+    // be\be_interface.cpp:1869
+
     static void
     create_value_box_skel (
-        TAO_ServerRequest & server_request, 
+        TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
-    
+    // be\be_interface.cpp:1869
+
     static void
     create_exception_skel (
-        TAO_ServerRequest & server_request, 
+        TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
-    
+    // be\be_interface.cpp:1869
+
     static void
     create_native_skel (
-        TAO_ServerRequest & server_request, 
+        TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
-    
+    // be\be_interface.cpp:1869
+
     static void
     create_abstract_interface_skel (
-        TAO_ServerRequest & server_request, 
+        TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
-    
+    // be\be_interface.cpp:1869
+
     static void
     create_local_interface_skel (
-        TAO_ServerRequest & server_request, 
+        TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
-    
+    // be\be_interface.cpp:1869
+
     static void
     create_ext_value_skel (
-        TAO_ServerRequest & server_request, 
+        TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static void
     _get_id_skel (
         TAO_ServerRequest & server_request,
@@ -785,7 +799,7 @@ namespace POA_CORBA
         void * servant
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static void
     _set_id_skel (
         TAO_ServerRequest & server_request,
@@ -793,7 +807,7 @@ namespace POA_CORBA
         void * servant
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static void
     _get_name_skel (
         TAO_ServerRequest & server_request,
@@ -801,7 +815,7 @@ namespace POA_CORBA
         void * servant
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static void
     _set_name_skel (
         TAO_ServerRequest & server_request,
@@ -809,7 +823,7 @@ namespace POA_CORBA
         void * servant
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static void
     _get_version_skel (
         TAO_ServerRequest & server_request,
@@ -817,7 +831,7 @@ namespace POA_CORBA
         void * servant
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static void
     _set_version_skel (
         TAO_ServerRequest & server_request,
@@ -825,7 +839,7 @@ namespace POA_CORBA
         void * servant
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static void
     _get_defined_in_skel (
         TAO_ServerRequest & server_request,
@@ -833,7 +847,7 @@ namespace POA_CORBA
         void * servant
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static void
     _get_absolute_name_skel (
         TAO_ServerRequest & server_request,
@@ -851,7 +865,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     describe_skel (
@@ -862,7 +876,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     move_skel (
@@ -928,6 +942,13 @@ namespace POA_CORBA
         ACE_ENV_ARG_DECL
       );
     
+    static void _repository_id_skel (
+        TAO_ServerRequest & req,
+        void * servant_upcall,
+        void * servant
+        ACE_ENV_ARG_DECL
+      );
+    
     virtual void _dispatch (
         TAO_ServerRequest & req,
         void * servant_upcall
@@ -1036,7 +1057,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     destroy_skel (
@@ -1119,7 +1140,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     describe_skel (
@@ -1130,7 +1151,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     move_skel (
@@ -1197,6 +1218,13 @@ namespace POA_CORBA
         ACE_ENV_ARG_DECL
       );
     
+    static void _repository_id_skel (
+        TAO_ServerRequest & req,
+        void * servant_upcall,
+        void * servant
+        ACE_ENV_ARG_DECL
+      );
+    
     virtual void _dispatch (
         TAO_ServerRequest & req,
         void * servant_upcall
@@ -1253,7 +1281,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     destroy_skel (
@@ -1336,7 +1364,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     describe_skel (
@@ -1347,7 +1375,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     move_skel (
@@ -1366,7 +1394,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     lookup_skel (
@@ -1377,7 +1405,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     contents_skel (
@@ -1388,7 +1416,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     lookup_name_skel (
@@ -1399,7 +1427,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     describe_contents_skel (
@@ -1410,7 +1438,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_module_skel (
@@ -1421,7 +1449,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_constant_skel (
@@ -1432,7 +1460,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_struct_skel (
@@ -1443,7 +1471,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_union_skel (
@@ -1454,7 +1482,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_enum_skel (
@@ -1465,7 +1493,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_alias_skel (
@@ -1476,7 +1504,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_interface_skel (
@@ -1487,7 +1515,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_value_skel (
@@ -1498,7 +1526,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_value_box_skel (
@@ -1509,7 +1537,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_exception_skel (
@@ -1520,7 +1548,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_native_skel (
@@ -1531,7 +1559,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_abstract_interface_skel (
@@ -1542,7 +1570,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_local_interface_skel (
@@ -1553,7 +1581,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_ext_value_skel (
@@ -1620,6 +1648,13 @@ namespace POA_CORBA
         ACE_ENV_ARG_DECL
       );
     
+    static void _repository_id_skel (
+        TAO_ServerRequest & req,
+        void * servant_upcall,
+        void * servant
+        ACE_ENV_ARG_DECL
+      );
+    
     virtual void _dispatch (
         TAO_ServerRequest & req,
         void * servant_upcall
@@ -1728,7 +1763,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     destroy_skel (
@@ -1811,7 +1846,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     describe_skel (
@@ -1822,7 +1857,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     move_skel (
@@ -1841,7 +1876,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     lookup_skel (
@@ -1852,7 +1887,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     contents_skel (
@@ -1863,7 +1898,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     lookup_name_skel (
@@ -1874,7 +1909,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     describe_contents_skel (
@@ -1885,7 +1920,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_module_skel (
@@ -1896,7 +1931,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_constant_skel (
@@ -1907,7 +1942,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_struct_skel (
@@ -1918,7 +1953,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_union_skel (
@@ -1929,7 +1964,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_enum_skel (
@@ -1940,7 +1975,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_alias_skel (
@@ -1951,7 +1986,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_interface_skel (
@@ -1962,7 +1997,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_value_skel (
@@ -1973,7 +2008,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_value_box_skel (
@@ -1984,7 +2019,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_exception_skel (
@@ -1995,7 +2030,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_native_skel (
@@ -2006,7 +2041,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_abstract_interface_skel (
@@ -2017,7 +2052,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_local_interface_skel (
@@ -2028,7 +2063,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_ext_value_skel (
@@ -2094,6 +2129,13 @@ namespace POA_CORBA
         ACE_ENV_ARG_DECL
       );
     
+    static void _repository_id_skel (
+        TAO_ServerRequest & req,
+        void * servant_upcall,
+        void * servant
+        ACE_ENV_ARG_DECL
+      );
+    
     virtual void _dispatch (
         TAO_ServerRequest & req,
         void * servant_upcall
@@ -2150,7 +2192,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     destroy_skel (
@@ -2233,7 +2275,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     describe_skel (
@@ -2244,7 +2286,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     move_skel (
@@ -2318,6 +2360,13 @@ namespace POA_CORBA
         ACE_ENV_ARG_DECL
       );
     
+    static void _repository_id_skel (
+        TAO_ServerRequest & req,
+        void * servant_upcall,
+        void * servant
+        ACE_ENV_ARG_DECL
+      );
+    
     virtual void _dispatch (
         TAO_ServerRequest & req,
         void * servant_upcall
@@ -2374,7 +2423,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     destroy_skel (
@@ -2457,7 +2506,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     describe_skel (
@@ -2468,7 +2517,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     move_skel (
@@ -2542,6 +2591,13 @@ namespace POA_CORBA
         ACE_ENV_ARG_DECL
       );
     
+    static void _repository_id_skel (
+        TAO_ServerRequest & req,
+        void * servant_upcall,
+        void * servant
+        ACE_ENV_ARG_DECL
+      );
+    
     virtual void _dispatch (
         TAO_ServerRequest & req,
         void * servant_upcall
@@ -2563,7 +2619,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     destroy_skel (
@@ -2646,7 +2702,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     describe_skel (
@@ -2657,7 +2713,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     move_skel (
@@ -2731,6 +2787,13 @@ namespace POA_CORBA
         ACE_ENV_ARG_DECL
       );
     
+    static void _repository_id_skel (
+        TAO_ServerRequest & req,
+        void * servant_upcall,
+        void * servant
+        ACE_ENV_ARG_DECL
+      );
+    
     virtual void _dispatch (
         TAO_ServerRequest & req,
         void * servant_upcall
@@ -2769,7 +2832,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     destroy_skel (
@@ -2843,6 +2906,13 @@ namespace POA_CORBA
         ACE_ENV_ARG_DECL
       );
     
+    static void _repository_id_skel (
+        TAO_ServerRequest & req,
+        void * servant_upcall,
+        void * servant
+        ACE_ENV_ARG_DECL
+      );
+    
     virtual void _dispatch (
         TAO_ServerRequest & req,
         void * servant_upcall
@@ -2899,7 +2969,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     destroy_skel (
@@ -2973,6 +3043,13 @@ namespace POA_CORBA
         ACE_ENV_ARG_DECL
       );
     
+    static void _repository_id_skel (
+        TAO_ServerRequest & req,
+        void * servant_upcall,
+        void * servant
+        ACE_ENV_ARG_DECL
+      );
+    
     virtual void _dispatch (
         TAO_ServerRequest & req,
         void * servant_upcall
@@ -3029,7 +3106,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     destroy_skel (
@@ -3103,6 +3180,13 @@ namespace POA_CORBA
         ACE_ENV_ARG_DECL
       );
     
+    static void _repository_id_skel (
+        TAO_ServerRequest & req,
+        void * servant_upcall,
+        void * servant
+        ACE_ENV_ARG_DECL
+      );
+    
     virtual void _dispatch (
         TAO_ServerRequest & req,
         void * servant_upcall
@@ -3211,7 +3295,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     destroy_skel (
@@ -3285,6 +3369,13 @@ namespace POA_CORBA
         ACE_ENV_ARG_DECL
       );
     
+    static void _repository_id_skel (
+        TAO_ServerRequest & req,
+        void * servant_upcall,
+        void * servant
+        ACE_ENV_ARG_DECL
+      );
+    
     virtual void _dispatch (
         TAO_ServerRequest & req,
         void * servant_upcall
@@ -3393,7 +3484,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     destroy_skel (
@@ -3468,6 +3559,13 @@ namespace POA_CORBA
         ACE_ENV_ARG_DECL
       );
     
+    static void _repository_id_skel (
+        TAO_ServerRequest & req,
+        void * servant_upcall,
+        void * servant
+        ACE_ENV_ARG_DECL
+      );
+    
     virtual void _dispatch (
         TAO_ServerRequest & req,
         void * servant_upcall
@@ -3541,7 +3639,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     destroy_skel (
@@ -3624,7 +3722,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     describe_skel (
@@ -3635,7 +3733,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     move_skel (
@@ -3646,7 +3744,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     lookup_skel (
@@ -3657,7 +3755,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     contents_skel (
@@ -3668,7 +3766,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     lookup_name_skel (
@@ -3679,7 +3777,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     describe_contents_skel (
@@ -3690,7 +3788,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_module_skel (
@@ -3701,7 +3799,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_constant_skel (
@@ -3712,7 +3810,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_struct_skel (
@@ -3723,7 +3821,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_union_skel (
@@ -3734,7 +3832,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_enum_skel (
@@ -3745,7 +3843,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_alias_skel (
@@ -3756,7 +3854,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_interface_skel (
@@ -3767,7 +3865,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_value_skel (
@@ -3778,7 +3876,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_value_box_skel (
@@ -3789,7 +3887,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_exception_skel (
@@ -3800,7 +3898,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_native_skel (
@@ -3811,7 +3909,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_abstract_interface_skel (
@@ -3822,7 +3920,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_local_interface_skel (
@@ -3833,7 +3931,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_ext_value_skel (
@@ -3899,6 +3997,13 @@ namespace POA_CORBA
         ACE_ENV_ARG_DECL
       );
     
+    static void _repository_id_skel (
+        TAO_ServerRequest & req,
+        void * servant_upcall,
+        void * servant
+        ACE_ENV_ARG_DECL
+      );
+    
     virtual void _dispatch (
         TAO_ServerRequest & req,
         void * servant_upcall
@@ -4007,7 +4112,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     destroy_skel (
@@ -4090,7 +4195,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     describe_skel (
@@ -4101,7 +4206,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     move_skel (
@@ -4167,6 +4272,13 @@ namespace POA_CORBA
         ACE_ENV_ARG_DECL
       );
     
+    static void _repository_id_skel (
+        TAO_ServerRequest & req,
+        void * servant_upcall,
+        void * servant
+        ACE_ENV_ARG_DECL
+      );
+    
     virtual void _dispatch (
         TAO_ServerRequest & req,
         void * servant_upcall
@@ -4275,7 +4387,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     destroy_skel (
@@ -4358,7 +4470,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     describe_skel (
@@ -4369,7 +4481,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     move_skel (
@@ -4475,6 +4587,13 @@ namespace POA_CORBA
         ACE_ENV_ARG_DECL
       );
     
+    static void _repository_id_skel (
+        TAO_ServerRequest & req,
+        void * servant_upcall,
+        void * servant
+        ACE_ENV_ARG_DECL
+      );
+    
     virtual void _dispatch (
         TAO_ServerRequest & req,
         void * servant_upcall
@@ -4688,7 +4807,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     destroy_skel (
@@ -4771,7 +4890,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     describe_skel (
@@ -4782,7 +4901,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     move_skel (
@@ -4850,6 +4969,13 @@ namespace POA_CORBA
         ACE_ENV_ARG_DECL
       );
     
+    static void _repository_id_skel (
+        TAO_ServerRequest & req,
+        void * servant_upcall,
+        void * servant
+        ACE_ENV_ARG_DECL
+      );
+    
     virtual void _dispatch (
         TAO_ServerRequest & req,
         void * servant_upcall
@@ -4988,7 +5114,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     destroy_skel (
@@ -4999,7 +5125,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     lookup_skel (
@@ -5010,7 +5136,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     contents_skel (
@@ -5021,7 +5147,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     lookup_name_skel (
@@ -5032,7 +5158,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     describe_contents_skel (
@@ -5043,7 +5169,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_module_skel (
@@ -5054,7 +5180,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_constant_skel (
@@ -5065,7 +5191,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_struct_skel (
@@ -5076,7 +5202,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_union_skel (
@@ -5087,7 +5213,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_enum_skel (
@@ -5098,7 +5224,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_alias_skel (
@@ -5109,7 +5235,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_interface_skel (
@@ -5120,7 +5246,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_value_skel (
@@ -5131,7 +5257,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_value_box_skel (
@@ -5142,7 +5268,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_exception_skel (
@@ -5153,7 +5279,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_native_skel (
@@ -5164,7 +5290,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_abstract_interface_skel (
@@ -5175,7 +5301,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_local_interface_skel (
@@ -5186,7 +5312,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_ext_value_skel (
@@ -5269,7 +5395,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     describe_skel (
@@ -5280,7 +5406,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     move_skel (
@@ -5354,6 +5480,13 @@ namespace POA_CORBA
         ACE_ENV_ARG_DECL
       );
     
+    static void _repository_id_skel (
+        TAO_ServerRequest & req,
+        void * servant_upcall,
+        void * servant
+        ACE_ENV_ARG_DECL
+      );
+    
     virtual void _dispatch (
         TAO_ServerRequest & req,
         void * servant_upcall
@@ -5464,6 +5597,13 @@ namespace POA_CORBA
         ACE_ENV_ARG_DECL
       );
     
+    static void _repository_id_skel (
+        TAO_ServerRequest & req,
+        void * servant_upcall,
+        void * servant
+        ACE_ENV_ARG_DECL
+      );
+    
     virtual void _dispatch (
         TAO_ServerRequest & req,
         void * servant_upcall
@@ -5485,7 +5625,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     destroy_skel (
@@ -5496,7 +5636,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     lookup_skel (
@@ -5507,7 +5647,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     contents_skel (
@@ -5518,7 +5658,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     lookup_name_skel (
@@ -5529,7 +5669,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     describe_contents_skel (
@@ -5540,7 +5680,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_module_skel (
@@ -5551,7 +5691,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_constant_skel (
@@ -5562,7 +5702,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_struct_skel (
@@ -5573,7 +5713,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_union_skel (
@@ -5584,7 +5724,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_enum_skel (
@@ -5595,7 +5735,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_alias_skel (
@@ -5606,7 +5746,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_interface_skel (
@@ -5617,7 +5757,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_value_skel (
@@ -5628,7 +5768,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_value_box_skel (
@@ -5639,7 +5779,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_exception_skel (
@@ -5650,7 +5790,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_native_skel (
@@ -5661,7 +5801,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_abstract_interface_skel (
@@ -5672,7 +5812,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_local_interface_skel (
@@ -5683,7 +5823,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_ext_value_skel (
@@ -5766,7 +5906,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     describe_skel (
@@ -5777,7 +5917,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     move_skel (
@@ -5812,7 +5952,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     is_a_skel (
@@ -5823,7 +5963,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     describe_interface_skel (
@@ -5834,7 +5974,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_attribute_skel (
@@ -5845,7 +5985,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_operation_skel (
@@ -5856,7 +5996,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     describe_ext_interface_skel (
@@ -5867,7 +6007,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_ext_attribute_skel (
@@ -5933,6 +6073,13 @@ namespace POA_CORBA
         ACE_ENV_ARG_DECL
       );
     
+    static void _repository_id_skel (
+        TAO_ServerRequest & req,
+        void * servant_upcall,
+        void * servant
+        ACE_ENV_ARG_DECL
+      );
+    
     virtual void _dispatch (
         TAO_ServerRequest & req,
         void * servant_upcall
@@ -5954,7 +6101,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     destroy_skel (
@@ -5965,7 +6112,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     lookup_skel (
@@ -5976,7 +6123,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     contents_skel (
@@ -5987,7 +6134,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     lookup_name_skel (
@@ -5998,7 +6145,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     describe_contents_skel (
@@ -6009,7 +6156,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_module_skel (
@@ -6020,7 +6167,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_constant_skel (
@@ -6031,7 +6178,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_struct_skel (
@@ -6042,7 +6189,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_union_skel (
@@ -6053,7 +6200,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_enum_skel (
@@ -6064,7 +6211,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_alias_skel (
@@ -6075,7 +6222,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_interface_skel (
@@ -6086,7 +6233,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_value_skel (
@@ -6097,7 +6244,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_value_box_skel (
@@ -6108,7 +6255,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_exception_skel (
@@ -6119,7 +6266,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_native_skel (
@@ -6130,7 +6277,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_abstract_interface_skel (
@@ -6141,7 +6288,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_local_interface_skel (
@@ -6152,7 +6299,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_ext_value_skel (
@@ -6235,7 +6382,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     describe_skel (
@@ -6246,7 +6393,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     move_skel (
@@ -6281,7 +6428,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     is_a_skel (
@@ -6292,7 +6439,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     describe_interface_skel (
@@ -6303,7 +6450,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_attribute_skel (
@@ -6314,7 +6461,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_operation_skel (
@@ -6381,6 +6528,13 @@ namespace POA_CORBA
         ACE_ENV_ARG_DECL
       );
     
+    static void _repository_id_skel (
+        TAO_ServerRequest & req,
+        void * servant_upcall,
+        void * servant
+        ACE_ENV_ARG_DECL
+      );
+    
     virtual void _dispatch (
         TAO_ServerRequest & req,
         void * servant_upcall
@@ -6402,7 +6556,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     destroy_skel (
@@ -6413,7 +6567,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     lookup_skel (
@@ -6424,7 +6578,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     contents_skel (
@@ -6435,7 +6589,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     lookup_name_skel (
@@ -6446,7 +6600,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     describe_contents_skel (
@@ -6457,7 +6611,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_module_skel (
@@ -6468,7 +6622,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_constant_skel (
@@ -6479,7 +6633,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_struct_skel (
@@ -6490,7 +6644,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_union_skel (
@@ -6501,7 +6655,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_enum_skel (
@@ -6512,7 +6666,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_alias_skel (
@@ -6523,7 +6677,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_interface_skel (
@@ -6534,7 +6688,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_value_skel (
@@ -6545,7 +6699,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_value_box_skel (
@@ -6556,7 +6710,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_exception_skel (
@@ -6567,7 +6721,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_native_skel (
@@ -6578,7 +6732,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_abstract_interface_skel (
@@ -6589,7 +6743,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_local_interface_skel (
@@ -6600,7 +6754,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_ext_value_skel (
@@ -6683,7 +6837,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     describe_skel (
@@ -6694,7 +6848,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     move_skel (
@@ -6729,7 +6883,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     is_a_skel (
@@ -6740,7 +6894,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     describe_interface_skel (
@@ -6751,7 +6905,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_attribute_skel (
@@ -6762,7 +6916,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_operation_skel (
@@ -6773,7 +6927,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     describe_ext_interface_skel (
@@ -6784,7 +6938,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_ext_attribute_skel (
@@ -6850,6 +7004,13 @@ namespace POA_CORBA
         ACE_ENV_ARG_DECL
       );
     
+    static void _repository_id_skel (
+        TAO_ServerRequest & req,
+        void * servant_upcall,
+        void * servant
+        ACE_ENV_ARG_DECL
+      );
+    
     virtual void _dispatch (
         TAO_ServerRequest & req,
         void * servant_upcall
@@ -6871,7 +7032,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     destroy_skel (
@@ -6882,7 +7043,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     lookup_skel (
@@ -6893,7 +7054,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     contents_skel (
@@ -6904,7 +7065,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     lookup_name_skel (
@@ -6915,7 +7076,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     describe_contents_skel (
@@ -6926,7 +7087,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_module_skel (
@@ -6937,7 +7098,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_constant_skel (
@@ -6948,7 +7109,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_struct_skel (
@@ -6959,7 +7120,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_union_skel (
@@ -6970,7 +7131,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_enum_skel (
@@ -6981,7 +7142,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_alias_skel (
@@ -6992,7 +7153,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_interface_skel (
@@ -7003,7 +7164,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_value_skel (
@@ -7014,7 +7175,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_value_box_skel (
@@ -7025,7 +7186,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_exception_skel (
@@ -7036,7 +7197,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_native_skel (
@@ -7047,7 +7208,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_abstract_interface_skel (
@@ -7058,7 +7219,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_local_interface_skel (
@@ -7069,7 +7230,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_ext_value_skel (
@@ -7152,7 +7313,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     describe_skel (
@@ -7163,7 +7324,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     move_skel (
@@ -7198,7 +7359,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     is_a_skel (
@@ -7209,7 +7370,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     describe_interface_skel (
@@ -7220,7 +7381,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_attribute_skel (
@@ -7231,7 +7392,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_operation_skel (
@@ -7298,6 +7459,13 @@ namespace POA_CORBA
         ACE_ENV_ARG_DECL
       );
     
+    static void _repository_id_skel (
+        TAO_ServerRequest & req,
+        void * servant_upcall,
+        void * servant
+        ACE_ENV_ARG_DECL
+      );
+    
     virtual void _dispatch (
         TAO_ServerRequest & req,
         void * servant_upcall
@@ -7319,7 +7487,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     destroy_skel (
@@ -7330,7 +7498,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     lookup_skel (
@@ -7341,7 +7509,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     contents_skel (
@@ -7352,7 +7520,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     lookup_name_skel (
@@ -7363,7 +7531,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     describe_contents_skel (
@@ -7374,7 +7542,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_module_skel (
@@ -7385,7 +7553,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_constant_skel (
@@ -7396,7 +7564,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_struct_skel (
@@ -7407,7 +7575,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_union_skel (
@@ -7418,7 +7586,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_enum_skel (
@@ -7429,7 +7597,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_alias_skel (
@@ -7440,7 +7608,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_interface_skel (
@@ -7451,7 +7619,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_value_skel (
@@ -7462,7 +7630,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_value_box_skel (
@@ -7473,7 +7641,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_exception_skel (
@@ -7484,7 +7652,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_native_skel (
@@ -7495,7 +7663,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_abstract_interface_skel (
@@ -7506,7 +7674,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_local_interface_skel (
@@ -7517,7 +7685,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_ext_value_skel (
@@ -7600,7 +7768,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     describe_skel (
@@ -7611,7 +7779,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     move_skel (
@@ -7646,7 +7814,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     is_a_skel (
@@ -7657,7 +7825,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     describe_interface_skel (
@@ -7668,7 +7836,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_attribute_skel (
@@ -7679,7 +7847,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_operation_skel (
@@ -7690,7 +7858,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     describe_ext_interface_skel (
@@ -7701,7 +7869,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_ext_attribute_skel (
@@ -7718,7 +7886,7 @@ namespace POA_CORBA
 } // module CORBA
 
 // TAO_IDL - Generated from 
-// be\be_codegen.cpp:997
+// be\be_codegen.cpp:1120
 
 #include "IFR_BasicS_T.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.inl b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.inl
index 45848a776be..6c24298d3e8 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.inl
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS.inl
@@ -45,7 +45,7 @@ POA_CORBA::Repository::_get_def_kind_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -66,7 +66,7 @@ POA_CORBA::Repository::destroy_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -87,7 +87,7 @@ POA_CORBA::Repository::lookup_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -108,7 +108,7 @@ POA_CORBA::Repository::contents_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -129,7 +129,7 @@ POA_CORBA::Repository::lookup_name_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -150,7 +150,7 @@ POA_CORBA::Repository::describe_contents_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -171,7 +171,7 @@ POA_CORBA::Repository::create_module_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -192,7 +192,7 @@ POA_CORBA::Repository::create_constant_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -213,7 +213,7 @@ POA_CORBA::Repository::create_struct_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -234,7 +234,7 @@ POA_CORBA::Repository::create_union_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -255,7 +255,7 @@ POA_CORBA::Repository::create_enum_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -276,7 +276,7 @@ POA_CORBA::Repository::create_alias_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -297,7 +297,7 @@ POA_CORBA::Repository::create_interface_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -318,7 +318,7 @@ POA_CORBA::Repository::create_value_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -339,7 +339,7 @@ POA_CORBA::Repository::create_value_box_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -360,7 +360,7 @@ POA_CORBA::Repository::create_exception_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -381,7 +381,7 @@ POA_CORBA::Repository::create_native_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -402,7 +402,7 @@ POA_CORBA::Repository::create_abstract_interface_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -423,7 +423,7 @@ POA_CORBA::Repository::create_local_interface_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -462,7 +462,7 @@ POA_CORBA::ModuleDef::_get_def_kind_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -483,7 +483,7 @@ POA_CORBA::ModuleDef::destroy_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -504,7 +504,7 @@ POA_CORBA::ModuleDef::lookup_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -525,7 +525,7 @@ POA_CORBA::ModuleDef::contents_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -546,7 +546,7 @@ POA_CORBA::ModuleDef::lookup_name_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -567,7 +567,7 @@ POA_CORBA::ModuleDef::describe_contents_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -588,7 +588,7 @@ POA_CORBA::ModuleDef::create_module_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -609,7 +609,7 @@ POA_CORBA::ModuleDef::create_constant_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -630,7 +630,7 @@ POA_CORBA::ModuleDef::create_struct_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -651,7 +651,7 @@ POA_CORBA::ModuleDef::create_union_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -672,7 +672,7 @@ POA_CORBA::ModuleDef::create_enum_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -693,7 +693,7 @@ POA_CORBA::ModuleDef::create_alias_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -714,7 +714,7 @@ POA_CORBA::ModuleDef::create_interface_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -735,7 +735,7 @@ POA_CORBA::ModuleDef::create_value_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -756,7 +756,7 @@ POA_CORBA::ModuleDef::create_value_box_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -777,7 +777,7 @@ POA_CORBA::ModuleDef::create_exception_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -798,7 +798,7 @@ POA_CORBA::ModuleDef::create_native_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -819,7 +819,7 @@ POA_CORBA::ModuleDef::create_abstract_interface_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -840,7 +840,7 @@ POA_CORBA::ModuleDef::create_local_interface_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -1023,7 +1023,7 @@ POA_CORBA::ModuleDef::_get_containing_repository_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -1044,7 +1044,7 @@ POA_CORBA::ModuleDef::describe_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -1083,7 +1083,7 @@ POA_CORBA::ConstantDef::_get_def_kind_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -1266,7 +1266,7 @@ POA_CORBA::ConstantDef::_get_containing_repository_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -1287,7 +1287,7 @@ POA_CORBA::ConstantDef::describe_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -1326,7 +1326,7 @@ POA_CORBA::StructDef::_get_def_kind_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -1509,7 +1509,7 @@ POA_CORBA::StructDef::_get_containing_repository_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -1530,7 +1530,7 @@ POA_CORBA::StructDef::describe_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -1569,7 +1569,7 @@ POA_CORBA::StructDef::_get_type_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -1590,7 +1590,7 @@ POA_CORBA::StructDef::lookup_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -1611,7 +1611,7 @@ POA_CORBA::StructDef::contents_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -1632,7 +1632,7 @@ POA_CORBA::StructDef::lookup_name_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -1653,7 +1653,7 @@ POA_CORBA::StructDef::describe_contents_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -1674,7 +1674,7 @@ POA_CORBA::StructDef::create_module_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -1695,7 +1695,7 @@ POA_CORBA::StructDef::create_constant_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -1716,7 +1716,7 @@ POA_CORBA::StructDef::create_struct_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -1737,7 +1737,7 @@ POA_CORBA::StructDef::create_union_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -1758,7 +1758,7 @@ POA_CORBA::StructDef::create_enum_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -1779,7 +1779,7 @@ POA_CORBA::StructDef::create_alias_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -1800,7 +1800,7 @@ POA_CORBA::StructDef::create_interface_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -1821,7 +1821,7 @@ POA_CORBA::StructDef::create_value_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -1842,7 +1842,7 @@ POA_CORBA::StructDef::create_value_box_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -1863,7 +1863,7 @@ POA_CORBA::StructDef::create_exception_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -1884,7 +1884,7 @@ POA_CORBA::StructDef::create_native_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -1905,7 +1905,7 @@ POA_CORBA::StructDef::create_abstract_interface_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -1926,7 +1926,7 @@ POA_CORBA::StructDef::create_local_interface_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -1965,7 +1965,7 @@ POA_CORBA::UnionDef::_get_def_kind_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -2148,7 +2148,7 @@ POA_CORBA::UnionDef::_get_containing_repository_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -2169,7 +2169,7 @@ POA_CORBA::UnionDef::describe_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -2208,7 +2208,7 @@ POA_CORBA::UnionDef::_get_type_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -2229,7 +2229,7 @@ POA_CORBA::UnionDef::lookup_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -2250,7 +2250,7 @@ POA_CORBA::UnionDef::contents_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -2271,7 +2271,7 @@ POA_CORBA::UnionDef::lookup_name_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -2292,7 +2292,7 @@ POA_CORBA::UnionDef::describe_contents_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -2313,7 +2313,7 @@ POA_CORBA::UnionDef::create_module_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -2334,7 +2334,7 @@ POA_CORBA::UnionDef::create_constant_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -2355,7 +2355,7 @@ POA_CORBA::UnionDef::create_struct_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -2376,7 +2376,7 @@ POA_CORBA::UnionDef::create_union_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -2397,7 +2397,7 @@ POA_CORBA::UnionDef::create_enum_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -2418,7 +2418,7 @@ POA_CORBA::UnionDef::create_alias_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -2439,7 +2439,7 @@ POA_CORBA::UnionDef::create_interface_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -2460,7 +2460,7 @@ POA_CORBA::UnionDef::create_value_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -2481,7 +2481,7 @@ POA_CORBA::UnionDef::create_value_box_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -2502,7 +2502,7 @@ POA_CORBA::UnionDef::create_exception_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -2523,7 +2523,7 @@ POA_CORBA::UnionDef::create_native_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -2544,7 +2544,7 @@ POA_CORBA::UnionDef::create_abstract_interface_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -2565,7 +2565,7 @@ POA_CORBA::UnionDef::create_local_interface_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -2604,7 +2604,7 @@ POA_CORBA::EnumDef::_get_def_kind_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -2787,7 +2787,7 @@ POA_CORBA::EnumDef::_get_containing_repository_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -2808,7 +2808,7 @@ POA_CORBA::EnumDef::describe_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -2865,7 +2865,7 @@ POA_CORBA::AliasDef::_get_def_kind_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -3048,7 +3048,7 @@ POA_CORBA::AliasDef::_get_containing_repository_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -3069,7 +3069,7 @@ POA_CORBA::AliasDef::describe_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -3126,7 +3126,7 @@ POA_CORBA::NativeDef::_get_def_kind_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -3309,7 +3309,7 @@ POA_CORBA::NativeDef::_get_containing_repository_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -3330,7 +3330,7 @@ POA_CORBA::NativeDef::describe_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -3387,7 +3387,7 @@ POA_CORBA::PrimitiveDef::_get_def_kind_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -3444,7 +3444,7 @@ POA_CORBA::StringDef::_get_def_kind_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -3501,7 +3501,7 @@ POA_CORBA::WstringDef::_get_def_kind_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -3558,7 +3558,7 @@ POA_CORBA::SequenceDef::_get_def_kind_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -3615,7 +3615,7 @@ POA_CORBA::ArrayDef::_get_def_kind_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -3672,7 +3672,7 @@ POA_CORBA::ExceptionDef::_get_def_kind_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -3855,7 +3855,7 @@ POA_CORBA::ExceptionDef::_get_containing_repository_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -3876,7 +3876,7 @@ POA_CORBA::ExceptionDef::describe_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -3897,7 +3897,7 @@ POA_CORBA::ExceptionDef::move_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -3918,7 +3918,7 @@ POA_CORBA::ExceptionDef::lookup_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -3939,7 +3939,7 @@ POA_CORBA::ExceptionDef::contents_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -3960,7 +3960,7 @@ POA_CORBA::ExceptionDef::lookup_name_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -3981,7 +3981,7 @@ POA_CORBA::ExceptionDef::describe_contents_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -4002,7 +4002,7 @@ POA_CORBA::ExceptionDef::create_module_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -4023,7 +4023,7 @@ POA_CORBA::ExceptionDef::create_constant_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -4044,7 +4044,7 @@ POA_CORBA::ExceptionDef::create_struct_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -4065,7 +4065,7 @@ POA_CORBA::ExceptionDef::create_union_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -4086,7 +4086,7 @@ POA_CORBA::ExceptionDef::create_enum_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -4107,7 +4107,7 @@ POA_CORBA::ExceptionDef::create_alias_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -4128,7 +4128,7 @@ POA_CORBA::ExceptionDef::create_interface_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -4149,7 +4149,7 @@ POA_CORBA::ExceptionDef::create_value_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -4170,7 +4170,7 @@ POA_CORBA::ExceptionDef::create_value_box_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -4191,7 +4191,7 @@ POA_CORBA::ExceptionDef::create_exception_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -4212,7 +4212,7 @@ POA_CORBA::ExceptionDef::create_native_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -4233,7 +4233,7 @@ POA_CORBA::ExceptionDef::create_abstract_interface_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -4254,7 +4254,7 @@ POA_CORBA::ExceptionDef::create_local_interface_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -4293,7 +4293,7 @@ POA_CORBA::AttributeDef::_get_def_kind_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -4476,7 +4476,7 @@ POA_CORBA::AttributeDef::_get_containing_repository_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -4497,7 +4497,7 @@ POA_CORBA::AttributeDef::describe_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -4536,7 +4536,7 @@ POA_CORBA::ExtAttributeDef::_get_def_kind_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -4719,7 +4719,7 @@ POA_CORBA::ExtAttributeDef::_get_containing_repository_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -4740,7 +4740,7 @@ POA_CORBA::ExtAttributeDef::describe_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -4869,7 +4869,7 @@ POA_CORBA::OperationDef::_get_def_kind_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -5052,7 +5052,7 @@ POA_CORBA::OperationDef::_get_containing_repository_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -5073,7 +5073,7 @@ POA_CORBA::OperationDef::describe_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -5112,7 +5112,7 @@ POA_CORBA::InterfaceDef::_get_def_kind_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -5133,7 +5133,7 @@ POA_CORBA::InterfaceDef::destroy_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -5154,7 +5154,7 @@ POA_CORBA::InterfaceDef::lookup_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -5175,7 +5175,7 @@ POA_CORBA::InterfaceDef::contents_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -5196,7 +5196,7 @@ POA_CORBA::InterfaceDef::lookup_name_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -5217,7 +5217,7 @@ POA_CORBA::InterfaceDef::describe_contents_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -5238,7 +5238,7 @@ POA_CORBA::InterfaceDef::create_module_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -5259,7 +5259,7 @@ POA_CORBA::InterfaceDef::create_constant_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -5280,7 +5280,7 @@ POA_CORBA::InterfaceDef::create_struct_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -5301,7 +5301,7 @@ POA_CORBA::InterfaceDef::create_union_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -5322,7 +5322,7 @@ POA_CORBA::InterfaceDef::create_enum_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -5343,7 +5343,7 @@ POA_CORBA::InterfaceDef::create_alias_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -5364,7 +5364,7 @@ POA_CORBA::InterfaceDef::create_interface_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -5385,7 +5385,7 @@ POA_CORBA::InterfaceDef::create_value_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -5406,7 +5406,7 @@ POA_CORBA::InterfaceDef::create_value_box_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -5427,7 +5427,7 @@ POA_CORBA::InterfaceDef::create_exception_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -5448,7 +5448,7 @@ POA_CORBA::InterfaceDef::create_native_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -5469,7 +5469,7 @@ POA_CORBA::InterfaceDef::create_abstract_interface_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -5490,7 +5490,7 @@ POA_CORBA::InterfaceDef::create_local_interface_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -5673,7 +5673,7 @@ POA_CORBA::InterfaceDef::_get_containing_repository_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -5694,7 +5694,7 @@ POA_CORBA::InterfaceDef::describe_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -5751,7 +5751,7 @@ POA_CORBA::ExtInterfaceDef::_get_def_kind_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -5772,7 +5772,7 @@ POA_CORBA::ExtInterfaceDef::destroy_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -5793,7 +5793,7 @@ POA_CORBA::ExtInterfaceDef::lookup_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -5814,7 +5814,7 @@ POA_CORBA::ExtInterfaceDef::contents_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -5835,7 +5835,7 @@ POA_CORBA::ExtInterfaceDef::lookup_name_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -5856,7 +5856,7 @@ POA_CORBA::ExtInterfaceDef::describe_contents_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -5877,7 +5877,7 @@ POA_CORBA::ExtInterfaceDef::create_module_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -5898,7 +5898,7 @@ POA_CORBA::ExtInterfaceDef::create_constant_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -5919,7 +5919,7 @@ POA_CORBA::ExtInterfaceDef::create_struct_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -5940,7 +5940,7 @@ POA_CORBA::ExtInterfaceDef::create_union_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -5961,7 +5961,7 @@ POA_CORBA::ExtInterfaceDef::create_enum_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -5982,7 +5982,7 @@ POA_CORBA::ExtInterfaceDef::create_alias_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -6003,7 +6003,7 @@ POA_CORBA::ExtInterfaceDef::create_interface_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -6024,7 +6024,7 @@ POA_CORBA::ExtInterfaceDef::create_value_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -6045,7 +6045,7 @@ POA_CORBA::ExtInterfaceDef::create_value_box_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -6066,7 +6066,7 @@ POA_CORBA::ExtInterfaceDef::create_exception_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -6087,7 +6087,7 @@ POA_CORBA::ExtInterfaceDef::create_native_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -6108,7 +6108,7 @@ POA_CORBA::ExtInterfaceDef::create_abstract_interface_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -6129,7 +6129,7 @@ POA_CORBA::ExtInterfaceDef::create_local_interface_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -6312,7 +6312,7 @@ POA_CORBA::ExtInterfaceDef::_get_containing_repository_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -6333,7 +6333,7 @@ POA_CORBA::ExtInterfaceDef::describe_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -6408,7 +6408,7 @@ POA_CORBA::ExtInterfaceDef::_set_base_interfaces_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -6429,7 +6429,7 @@ POA_CORBA::ExtInterfaceDef::is_a_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -6450,7 +6450,7 @@ POA_CORBA::ExtInterfaceDef::describe_interface_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -6471,7 +6471,7 @@ POA_CORBA::ExtInterfaceDef::create_attribute_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -6492,7 +6492,7 @@ POA_CORBA::ExtInterfaceDef::create_operation_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -6513,7 +6513,7 @@ POA_CORBA::ExtInterfaceDef::describe_ext_interface_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -6552,7 +6552,7 @@ POA_CORBA::AbstractInterfaceDef::_get_def_kind_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -6573,7 +6573,7 @@ POA_CORBA::AbstractInterfaceDef::destroy_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -6594,7 +6594,7 @@ POA_CORBA::AbstractInterfaceDef::lookup_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -6615,7 +6615,7 @@ POA_CORBA::AbstractInterfaceDef::contents_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -6636,7 +6636,7 @@ POA_CORBA::AbstractInterfaceDef::lookup_name_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -6657,7 +6657,7 @@ POA_CORBA::AbstractInterfaceDef::describe_contents_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -6678,7 +6678,7 @@ POA_CORBA::AbstractInterfaceDef::create_module_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -6699,7 +6699,7 @@ POA_CORBA::AbstractInterfaceDef::create_constant_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -6720,7 +6720,7 @@ POA_CORBA::AbstractInterfaceDef::create_struct_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -6741,7 +6741,7 @@ POA_CORBA::AbstractInterfaceDef::create_union_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -6762,7 +6762,7 @@ POA_CORBA::AbstractInterfaceDef::create_enum_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -6783,7 +6783,7 @@ POA_CORBA::AbstractInterfaceDef::create_alias_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -6804,7 +6804,7 @@ POA_CORBA::AbstractInterfaceDef::create_interface_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -6825,7 +6825,7 @@ POA_CORBA::AbstractInterfaceDef::create_value_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -6846,7 +6846,7 @@ POA_CORBA::AbstractInterfaceDef::create_value_box_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -6867,7 +6867,7 @@ POA_CORBA::AbstractInterfaceDef::create_exception_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -6888,7 +6888,7 @@ POA_CORBA::AbstractInterfaceDef::create_native_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -6909,7 +6909,7 @@ POA_CORBA::AbstractInterfaceDef::create_abstract_interface_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -6930,7 +6930,7 @@ POA_CORBA::AbstractInterfaceDef::create_local_interface_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -7113,7 +7113,7 @@ POA_CORBA::AbstractInterfaceDef::_get_containing_repository_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -7134,7 +7134,7 @@ POA_CORBA::AbstractInterfaceDef::describe_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -7209,7 +7209,7 @@ POA_CORBA::AbstractInterfaceDef::_set_base_interfaces_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -7230,7 +7230,7 @@ POA_CORBA::AbstractInterfaceDef::is_a_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -7251,7 +7251,7 @@ POA_CORBA::AbstractInterfaceDef::describe_interface_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -7272,7 +7272,7 @@ POA_CORBA::AbstractInterfaceDef::create_attribute_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -7311,7 +7311,7 @@ POA_CORBA::ExtAbstractInterfaceDef::_get_def_kind_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -7332,7 +7332,7 @@ POA_CORBA::ExtAbstractInterfaceDef::destroy_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -7353,7 +7353,7 @@ POA_CORBA::ExtAbstractInterfaceDef::lookup_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -7374,7 +7374,7 @@ POA_CORBA::ExtAbstractInterfaceDef::contents_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -7395,7 +7395,7 @@ POA_CORBA::ExtAbstractInterfaceDef::lookup_name_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -7416,7 +7416,7 @@ POA_CORBA::ExtAbstractInterfaceDef::describe_contents_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -7437,7 +7437,7 @@ POA_CORBA::ExtAbstractInterfaceDef::create_module_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -7458,7 +7458,7 @@ POA_CORBA::ExtAbstractInterfaceDef::create_constant_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -7479,7 +7479,7 @@ POA_CORBA::ExtAbstractInterfaceDef::create_struct_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -7500,7 +7500,7 @@ POA_CORBA::ExtAbstractInterfaceDef::create_union_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -7521,7 +7521,7 @@ POA_CORBA::ExtAbstractInterfaceDef::create_enum_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -7542,7 +7542,7 @@ POA_CORBA::ExtAbstractInterfaceDef::create_alias_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -7563,7 +7563,7 @@ POA_CORBA::ExtAbstractInterfaceDef::create_interface_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -7584,7 +7584,7 @@ POA_CORBA::ExtAbstractInterfaceDef::create_value_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -7605,7 +7605,7 @@ POA_CORBA::ExtAbstractInterfaceDef::create_value_box_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -7626,7 +7626,7 @@ POA_CORBA::ExtAbstractInterfaceDef::create_exception_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -7647,7 +7647,7 @@ POA_CORBA::ExtAbstractInterfaceDef::create_native_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -7668,7 +7668,7 @@ POA_CORBA::ExtAbstractInterfaceDef::create_abstract_interface_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -7689,7 +7689,7 @@ POA_CORBA::ExtAbstractInterfaceDef::create_local_interface_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -7872,7 +7872,7 @@ POA_CORBA::ExtAbstractInterfaceDef::_get_containing_repository_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -7893,7 +7893,7 @@ POA_CORBA::ExtAbstractInterfaceDef::describe_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -7968,7 +7968,7 @@ POA_CORBA::ExtAbstractInterfaceDef::_set_base_interfaces_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -7989,7 +7989,7 @@ POA_CORBA::ExtAbstractInterfaceDef::is_a_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -8010,7 +8010,7 @@ POA_CORBA::ExtAbstractInterfaceDef::describe_interface_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -8031,7 +8031,7 @@ POA_CORBA::ExtAbstractInterfaceDef::create_attribute_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -8052,7 +8052,7 @@ POA_CORBA::ExtAbstractInterfaceDef::create_operation_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -8073,7 +8073,7 @@ POA_CORBA::ExtAbstractInterfaceDef::describe_ext_interface_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -8112,7 +8112,7 @@ POA_CORBA::LocalInterfaceDef::_get_def_kind_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -8133,7 +8133,7 @@ POA_CORBA::LocalInterfaceDef::destroy_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -8154,7 +8154,7 @@ POA_CORBA::LocalInterfaceDef::lookup_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -8175,7 +8175,7 @@ POA_CORBA::LocalInterfaceDef::contents_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -8196,7 +8196,7 @@ POA_CORBA::LocalInterfaceDef::lookup_name_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -8217,7 +8217,7 @@ POA_CORBA::LocalInterfaceDef::describe_contents_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -8238,7 +8238,7 @@ POA_CORBA::LocalInterfaceDef::create_module_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -8259,7 +8259,7 @@ POA_CORBA::LocalInterfaceDef::create_constant_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -8280,7 +8280,7 @@ POA_CORBA::LocalInterfaceDef::create_struct_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -8301,7 +8301,7 @@ POA_CORBA::LocalInterfaceDef::create_union_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -8322,7 +8322,7 @@ POA_CORBA::LocalInterfaceDef::create_enum_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -8343,7 +8343,7 @@ POA_CORBA::LocalInterfaceDef::create_alias_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -8364,7 +8364,7 @@ POA_CORBA::LocalInterfaceDef::create_interface_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -8385,7 +8385,7 @@ POA_CORBA::LocalInterfaceDef::create_value_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -8406,7 +8406,7 @@ POA_CORBA::LocalInterfaceDef::create_value_box_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -8427,7 +8427,7 @@ POA_CORBA::LocalInterfaceDef::create_exception_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -8448,7 +8448,7 @@ POA_CORBA::LocalInterfaceDef::create_native_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -8469,7 +8469,7 @@ POA_CORBA::LocalInterfaceDef::create_abstract_interface_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -8490,7 +8490,7 @@ POA_CORBA::LocalInterfaceDef::create_local_interface_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -8673,7 +8673,7 @@ POA_CORBA::LocalInterfaceDef::_get_containing_repository_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -8694,7 +8694,7 @@ POA_CORBA::LocalInterfaceDef::describe_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -8769,7 +8769,7 @@ POA_CORBA::LocalInterfaceDef::_set_base_interfaces_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -8790,7 +8790,7 @@ POA_CORBA::LocalInterfaceDef::is_a_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -8811,7 +8811,7 @@ POA_CORBA::LocalInterfaceDef::describe_interface_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -8832,7 +8832,7 @@ POA_CORBA::LocalInterfaceDef::create_attribute_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -8871,7 +8871,7 @@ POA_CORBA::ExtLocalInterfaceDef::_get_def_kind_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -8892,7 +8892,7 @@ POA_CORBA::ExtLocalInterfaceDef::destroy_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -8913,7 +8913,7 @@ POA_CORBA::ExtLocalInterfaceDef::lookup_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -8934,7 +8934,7 @@ POA_CORBA::ExtLocalInterfaceDef::contents_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -8955,7 +8955,7 @@ POA_CORBA::ExtLocalInterfaceDef::lookup_name_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -8976,7 +8976,7 @@ POA_CORBA::ExtLocalInterfaceDef::describe_contents_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -8997,7 +8997,7 @@ POA_CORBA::ExtLocalInterfaceDef::create_module_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -9018,7 +9018,7 @@ POA_CORBA::ExtLocalInterfaceDef::create_constant_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -9039,7 +9039,7 @@ POA_CORBA::ExtLocalInterfaceDef::create_struct_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -9060,7 +9060,7 @@ POA_CORBA::ExtLocalInterfaceDef::create_union_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -9081,7 +9081,7 @@ POA_CORBA::ExtLocalInterfaceDef::create_enum_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -9102,7 +9102,7 @@ POA_CORBA::ExtLocalInterfaceDef::create_alias_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -9123,7 +9123,7 @@ POA_CORBA::ExtLocalInterfaceDef::create_interface_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -9144,7 +9144,7 @@ POA_CORBA::ExtLocalInterfaceDef::create_value_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -9165,7 +9165,7 @@ POA_CORBA::ExtLocalInterfaceDef::create_value_box_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -9186,7 +9186,7 @@ POA_CORBA::ExtLocalInterfaceDef::create_exception_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -9207,7 +9207,7 @@ POA_CORBA::ExtLocalInterfaceDef::create_native_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -9228,7 +9228,7 @@ POA_CORBA::ExtLocalInterfaceDef::create_abstract_interface_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -9249,7 +9249,7 @@ POA_CORBA::ExtLocalInterfaceDef::create_local_interface_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -9432,7 +9432,7 @@ POA_CORBA::ExtLocalInterfaceDef::_get_containing_repository_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -9453,7 +9453,7 @@ POA_CORBA::ExtLocalInterfaceDef::describe_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -9528,7 +9528,7 @@ POA_CORBA::ExtLocalInterfaceDef::_set_base_interfaces_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -9549,7 +9549,7 @@ POA_CORBA::ExtLocalInterfaceDef::is_a_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -9570,7 +9570,7 @@ POA_CORBA::ExtLocalInterfaceDef::describe_interface_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -9591,7 +9591,7 @@ POA_CORBA::ExtLocalInterfaceDef::create_attribute_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -9612,7 +9612,7 @@ POA_CORBA::ExtLocalInterfaceDef::create_operation_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -9633,7 +9633,7 @@ POA_CORBA::ExtLocalInterfaceDef::describe_ext_interface_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.cpp
index b306a172bc0..ee2ae7cdae6 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.cpp
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from 
-// be\be_codegen.cpp:683
+// be\be_codegen.cpp:679
 
 #ifndef _TAO_IDL_ORIG_IFR_BASICS_T_CPP_
 #define _TAO_IDL_ORIG_IFR_BASICS_T_CPP_
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.h
index 888e59361a0..e12be8f440e 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_BasicS_T.h
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:546
+// be\be_codegen.cpp:538
 
 #ifndef _TAO_IDL_ORIG_IFR_BASICS_T_H_
 #define _TAO_IDL_ORIG_IFR_BASICS_T_H_
@@ -7951,7 +7951,7 @@ namespace POA_CORBA
 } // module CORBA
 
 // TAO_IDL - Generated from 
-// be\be_codegen.cpp:1094
+// be\be_codegen.cpp:1221
 
 #if defined (__ACE_INLINE__)
 #include "IFR_BasicS_T.inl"
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.cpp
index 9fa3872b9dc..4f9145481f5 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.cpp
@@ -27,7 +27,7 @@
 
 
 // TAO_IDL - Generated from 
-// be\be_codegen.cpp:617
+// be\be_codegen.cpp:601
 
 #ifndef _TAO_IDL_ORIG_IFR_COMPONENTSS_CPP_
 #define _TAO_IDL_ORIG_IFR_COMPONENTSS_CPP_
@@ -53,8 +53,8 @@
 #include "tao/Stub.h"
 #include "tao/IFR_Client_Adapter.h"
 #include "tao/Object_T.h"
-#include "tao/TypeCode.h"
-#include "tao/DynamicC.h"
+#include "tao/AnyTypeCode/TypeCode.h"
+#include "tao/AnyTypeCode/DynamicC.h"
 #include "tao/CDR.h"
 #include "tao/operation_details.h"
 #include "tao/PortableInterceptor.h"
@@ -75,31 +75,35 @@
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
+// be\be_visitor_arg_traits.cpp:70
 
 // Arg traits specializations.
 namespace TAO
 {
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:702
+  // be\be_visitor_arg_traits.cpp:793
 
-#if !defined (_CORBA_DEFINITIONKIND__SARG_TRAITS_SS_)
-#define _CORBA_DEFINITIONKIND__SARG_TRAITS_SS_
+#if !defined (_CORBA_DEFINITIONKIND__SARG_TRAITS_)
+#define _CORBA_DEFINITIONKIND__SARG_TRAITS_
   
   template<>
-  class TAO_IFR_Client_Export SArg_Traits<CORBA::DefinitionKind>
+  class SArg_Traits<CORBA::DefinitionKind>
     : public
         Basic_SArg_Traits_T<
-            CORBA::DefinitionKind
+            CORBA::DefinitionKind,
+            TAO::Any_Insert_Policy_Stream <CORBA::DefinitionKind>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_REPOSITORY__SARG_TRAITS_SS_)
-#define _CORBA_REPOSITORY__SARG_TRAITS_SS_
+#if !defined (_CORBA_REPOSITORY__SARG_TRAITS_)
+#define _CORBA_REPOSITORY__SARG_TRAITS_
   
   template<>
   class  SArg_Traits<CORBA::Repository>
@@ -107,15 +111,19 @@ namespace TAO
         Object_SArg_Traits_T<
             CORBA::Repository_ptr,
             CORBA::Repository_var,
-            CORBA::Repository_out
+            CORBA::Repository_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::Repository_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_CONTAINER__SARG_TRAITS_SS_)
-#define _CORBA_CONTAINER__SARG_TRAITS_SS_
+#if !defined (_CORBA_CONTAINER__SARG_TRAITS_)
+#define _CORBA_CONTAINER__SARG_TRAITS_
   
   template<>
   class  SArg_Traits<CORBA::Container>
@@ -123,15 +131,19 @@ namespace TAO
         Object_SArg_Traits_T<
             CORBA::Container_ptr,
             CORBA::Container_var,
-            CORBA::Container_out
+            CORBA::Container_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::Container_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_IDLTYPE__SARG_TRAITS_SS_)
-#define _CORBA_IDLTYPE__SARG_TRAITS_SS_
+#if !defined (_CORBA_IDLTYPE__SARG_TRAITS_)
+#define _CORBA_IDLTYPE__SARG_TRAITS_
   
   template<>
   class  SArg_Traits<CORBA::IDLType>
@@ -139,15 +151,19 @@ namespace TAO
         Object_SArg_Traits_T<
             CORBA::IDLType_ptr,
             CORBA::IDLType_var,
-            CORBA::IDLType_out
+            CORBA::IDLType_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::IDLType_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_INTERFACEDEF__SARG_TRAITS_SS_)
-#define _CORBA_INTERFACEDEF__SARG_TRAITS_SS_
+#if !defined (_CORBA_INTERFACEDEF__SARG_TRAITS_)
+#define _CORBA_INTERFACEDEF__SARG_TRAITS_
   
   template<>
   class  SArg_Traits<CORBA::InterfaceDef>
@@ -155,7 +171,8 @@ namespace TAO
         Object_SArg_Traits_T<
             CORBA::InterfaceDef_ptr,
             CORBA::InterfaceDef_var,
-            CORBA::InterfaceDef_out
+            CORBA::InterfaceDef_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::InterfaceDef_ptr>
           >
   {
   };
@@ -163,26 +180,30 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:492
+  // be\be_visitor_arg_traits.cpp:547
 
-#if !defined (_CORBA_INTERFACEDEFSEQ__SARG_TRAITS_SS_)
-#define _CORBA_INTERFACEDEFSEQ__SARG_TRAITS_SS_
+#if !defined (_CORBA_INTERFACEDEFSEQ__SARG_TRAITS_)
+#define _CORBA_INTERFACEDEFSEQ__SARG_TRAITS_
   
   template<>
-  class TAO_IFR_Client_Export SArg_Traits<CORBA::InterfaceDefSeq>
+  class SArg_Traits<CORBA::InterfaceDefSeq>
     : public
         Var_Size_SArg_Traits_T<
             CORBA::InterfaceDefSeq,
             CORBA::InterfaceDefSeq_var,
-            CORBA::InterfaceDefSeq_out
+            CORBA::InterfaceDefSeq_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::InterfaceDefSeq>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_VALUEDEF__SARG_TRAITS_SS_)
-#define _CORBA_VALUEDEF__SARG_TRAITS_SS_
+#if !defined (_CORBA_VALUEDEF__SARG_TRAITS_)
+#define _CORBA_VALUEDEF__SARG_TRAITS_
   
   template<>
   class  SArg_Traits<CORBA::ValueDef>
@@ -190,7 +211,8 @@ namespace TAO
         Object_SArg_Traits_T<
             CORBA::ValueDef_ptr,
             CORBA::ValueDef_var,
-            CORBA::ValueDef_out
+            CORBA::ValueDef_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::ValueDef_ptr>
           >
   {
   };
@@ -198,18 +220,19 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:492
+  // be\be_visitor_arg_traits.cpp:547
 
-#if !defined (_CORBA_VALUEDEFSEQ__SARG_TRAITS_SS_)
-#define _CORBA_VALUEDEFSEQ__SARG_TRAITS_SS_
+#if !defined (_CORBA_VALUEDEFSEQ__SARG_TRAITS_)
+#define _CORBA_VALUEDEFSEQ__SARG_TRAITS_
   
   template<>
-  class TAO_IFR_Client_Export SArg_Traits<CORBA::ValueDefSeq>
+  class SArg_Traits<CORBA::ValueDefSeq>
     : public
         Var_Size_SArg_Traits_T<
             CORBA::ValueDefSeq,
             CORBA::ValueDefSeq_var,
-            CORBA::ValueDefSeq_out
+            CORBA::ValueDefSeq_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::ValueDefSeq>
           >
   {
   };
@@ -217,18 +240,19 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:492
+  // be\be_visitor_arg_traits.cpp:547
 
-#if !defined (_CORBA_INITIALIZERSEQ__SARG_TRAITS_SS_)
-#define _CORBA_INITIALIZERSEQ__SARG_TRAITS_SS_
+#if !defined (_CORBA_INITIALIZERSEQ__SARG_TRAITS_)
+#define _CORBA_INITIALIZERSEQ__SARG_TRAITS_
   
   template<>
-  class TAO_IFR_Client_Export SArg_Traits<CORBA::InitializerSeq>
+  class SArg_Traits<CORBA::InitializerSeq>
     : public
         Var_Size_SArg_Traits_T<
             CORBA::InitializerSeq,
             CORBA::InitializerSeq_var,
-            CORBA::InitializerSeq_out
+            CORBA::InitializerSeq_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::InitializerSeq>
           >
   {
   };
@@ -236,18 +260,19 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:492
+  // be\be_visitor_arg_traits.cpp:547
 
-#if !defined (_CORBA_EXTINITIALIZERSEQ__SARG_TRAITS_SS_)
-#define _CORBA_EXTINITIALIZERSEQ__SARG_TRAITS_SS_
+#if !defined (_CORBA_EXTINITIALIZERSEQ__SARG_TRAITS_)
+#define _CORBA_EXTINITIALIZERSEQ__SARG_TRAITS_
   
   template<>
-  class TAO_IFR_Client_Export SArg_Traits<CORBA::ExtInitializerSeq>
+  class SArg_Traits<CORBA::ExtInitializerSeq>
     : public
         Var_Size_SArg_Traits_T<
             CORBA::ExtInitializerSeq,
             CORBA::ExtInitializerSeq_var,
-            CORBA::ExtInitializerSeq_out
+            CORBA::ExtInitializerSeq_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::ExtInitializerSeq>
           >
   {
   };
@@ -255,18 +280,19 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:492
+  // be\be_visitor_arg_traits.cpp:547
 
-#if !defined (_CORBA_EXCEPTIONDEFSEQ__SARG_TRAITS_SS_)
-#define _CORBA_EXCEPTIONDEFSEQ__SARG_TRAITS_SS_
+#if !defined (_CORBA_EXCEPTIONDEFSEQ__SARG_TRAITS_)
+#define _CORBA_EXCEPTIONDEFSEQ__SARG_TRAITS_
   
   template<>
-  class TAO_IFR_Client_Export SArg_Traits<CORBA::ExceptionDefSeq>
+  class SArg_Traits<CORBA::ExceptionDefSeq>
     : public
         Var_Size_SArg_Traits_T<
             CORBA::ExceptionDefSeq,
             CORBA::ExceptionDefSeq_var,
-            CORBA::ExceptionDefSeq_out
+            CORBA::ExceptionDefSeq_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::ExceptionDefSeq>
           >
   {
   };
@@ -274,16 +300,17 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:702
+  // be\be_visitor_arg_traits.cpp:793
 
-#if !defined (_CORBA_OPERATIONMODE__SARG_TRAITS_SS_)
-#define _CORBA_OPERATIONMODE__SARG_TRAITS_SS_
+#if !defined (_CORBA_OPERATIONMODE__SARG_TRAITS_)
+#define _CORBA_OPERATIONMODE__SARG_TRAITS_
   
   template<>
-  class TAO_IFR_Client_Export SArg_Traits<CORBA::OperationMode>
+  class SArg_Traits<CORBA::OperationMode>
     : public
         Basic_SArg_Traits_T<
-            CORBA::OperationMode
+            CORBA::OperationMode,
+            TAO::Any_Insert_Policy_Stream <CORBA::OperationMode>
           >
   {
   };
@@ -291,18 +318,19 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:492
+  // be\be_visitor_arg_traits.cpp:547
 
-#if !defined (_CORBA_PARDESCRIPTIONSEQ__SARG_TRAITS_SS_)
-#define _CORBA_PARDESCRIPTIONSEQ__SARG_TRAITS_SS_
+#if !defined (_CORBA_PARDESCRIPTIONSEQ__SARG_TRAITS_)
+#define _CORBA_PARDESCRIPTIONSEQ__SARG_TRAITS_
   
   template<>
-  class TAO_IFR_Client_Export SArg_Traits<CORBA::ParDescriptionSeq>
+  class SArg_Traits<CORBA::ParDescriptionSeq>
     : public
         Var_Size_SArg_Traits_T<
             CORBA::ParDescriptionSeq,
             CORBA::ParDescriptionSeq_var,
-            CORBA::ParDescriptionSeq_out
+            CORBA::ParDescriptionSeq_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::ParDescriptionSeq>
           >
   {
   };
@@ -310,26 +338,30 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:492
+  // be\be_visitor_arg_traits.cpp:547
 
-#if !defined (_CORBA_CONTEXTIDSEQ__SARG_TRAITS_SS_)
-#define _CORBA_CONTEXTIDSEQ__SARG_TRAITS_SS_
+#if !defined (_CORBA_CONTEXTIDSEQ__SARG_TRAITS_)
+#define _CORBA_CONTEXTIDSEQ__SARG_TRAITS_
   
   template<>
-  class TAO_IFR_Client_Export SArg_Traits<CORBA::ContextIdSeq>
+  class SArg_Traits<CORBA::ContextIdSeq>
     : public
         Var_Size_SArg_Traits_T<
             CORBA::ContextIdSeq,
             CORBA::ContextIdSeq_var,
-            CORBA::ContextIdSeq_out
+            CORBA::ContextIdSeq_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::ContextIdSeq>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_COMPONENTIR_COMPONENTDEF__SARG_TRAITS_SS_)
-#define _CORBA_COMPONENTIR_COMPONENTDEF__SARG_TRAITS_SS_
+#if !defined (_CORBA_COMPONENTIR_COMPONENTDEF__SARG_TRAITS_)
+#define _CORBA_COMPONENTIR_COMPONENTDEF__SARG_TRAITS_
   
   template<>
   class  SArg_Traits<CORBA::ComponentIR::ComponentDef>
@@ -337,15 +369,19 @@ namespace TAO
         Object_SArg_Traits_T<
             CORBA::ComponentIR::ComponentDef_ptr,
             CORBA::ComponentIR::ComponentDef_var,
-            CORBA::ComponentIR::ComponentDef_out
+            CORBA::ComponentIR::ComponentDef_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::ComponentIR::ComponentDef_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_COMPONENTIR_HOMEDEF__SARG_TRAITS_SS_)
-#define _CORBA_COMPONENTIR_HOMEDEF__SARG_TRAITS_SS_
+#if !defined (_CORBA_COMPONENTIR_HOMEDEF__SARG_TRAITS_)
+#define _CORBA_COMPONENTIR_HOMEDEF__SARG_TRAITS_
   
   template<>
   class  SArg_Traits<CORBA::ComponentIR::HomeDef>
@@ -353,15 +389,19 @@ namespace TAO
         Object_SArg_Traits_T<
             CORBA::ComponentIR::HomeDef_ptr,
             CORBA::ComponentIR::HomeDef_var,
-            CORBA::ComponentIR::HomeDef_out
+            CORBA::ComponentIR::HomeDef_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::ComponentIR::HomeDef_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_COMPONENTIR_EVENTDEF__SARG_TRAITS_SS_)
-#define _CORBA_COMPONENTIR_EVENTDEF__SARG_TRAITS_SS_
+#if !defined (_CORBA_COMPONENTIR_EVENTDEF__SARG_TRAITS_)
+#define _CORBA_COMPONENTIR_EVENTDEF__SARG_TRAITS_
   
   template<>
   class  SArg_Traits<CORBA::ComponentIR::EventDef>
@@ -369,15 +409,19 @@ namespace TAO
         Object_SArg_Traits_T<
             CORBA::ComponentIR::EventDef_ptr,
             CORBA::ComponentIR::EventDef_var,
-            CORBA::ComponentIR::EventDef_out
+            CORBA::ComponentIR::EventDef_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::ComponentIR::EventDef_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_COMPONENTIR_PROVIDESDEF__SARG_TRAITS_SS_)
-#define _CORBA_COMPONENTIR_PROVIDESDEF__SARG_TRAITS_SS_
+#if !defined (_CORBA_COMPONENTIR_PROVIDESDEF__SARG_TRAITS_)
+#define _CORBA_COMPONENTIR_PROVIDESDEF__SARG_TRAITS_
   
   template<>
   class  SArg_Traits<CORBA::ComponentIR::ProvidesDef>
@@ -385,15 +429,19 @@ namespace TAO
         Object_SArg_Traits_T<
             CORBA::ComponentIR::ProvidesDef_ptr,
             CORBA::ComponentIR::ProvidesDef_var,
-            CORBA::ComponentIR::ProvidesDef_out
+            CORBA::ComponentIR::ProvidesDef_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::ComponentIR::ProvidesDef_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_COMPONENTIR_USESDEF__SARG_TRAITS_SS_)
-#define _CORBA_COMPONENTIR_USESDEF__SARG_TRAITS_SS_
+#if !defined (_CORBA_COMPONENTIR_USESDEF__SARG_TRAITS_)
+#define _CORBA_COMPONENTIR_USESDEF__SARG_TRAITS_
   
   template<>
   class  SArg_Traits<CORBA::ComponentIR::UsesDef>
@@ -401,15 +449,19 @@ namespace TAO
         Object_SArg_Traits_T<
             CORBA::ComponentIR::UsesDef_ptr,
             CORBA::ComponentIR::UsesDef_var,
-            CORBA::ComponentIR::UsesDef_out
+            CORBA::ComponentIR::UsesDef_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::ComponentIR::UsesDef_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_COMPONENTIR_EMITSDEF__SARG_TRAITS_SS_)
-#define _CORBA_COMPONENTIR_EMITSDEF__SARG_TRAITS_SS_
+#if !defined (_CORBA_COMPONENTIR_EMITSDEF__SARG_TRAITS_)
+#define _CORBA_COMPONENTIR_EMITSDEF__SARG_TRAITS_
   
   template<>
   class  SArg_Traits<CORBA::ComponentIR::EmitsDef>
@@ -417,15 +469,19 @@ namespace TAO
         Object_SArg_Traits_T<
             CORBA::ComponentIR::EmitsDef_ptr,
             CORBA::ComponentIR::EmitsDef_var,
-            CORBA::ComponentIR::EmitsDef_out
+            CORBA::ComponentIR::EmitsDef_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::ComponentIR::EmitsDef_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_COMPONENTIR_PUBLISHESDEF__SARG_TRAITS_SS_)
-#define _CORBA_COMPONENTIR_PUBLISHESDEF__SARG_TRAITS_SS_
+#if !defined (_CORBA_COMPONENTIR_PUBLISHESDEF__SARG_TRAITS_)
+#define _CORBA_COMPONENTIR_PUBLISHESDEF__SARG_TRAITS_
   
   template<>
   class  SArg_Traits<CORBA::ComponentIR::PublishesDef>
@@ -433,15 +489,19 @@ namespace TAO
         Object_SArg_Traits_T<
             CORBA::ComponentIR::PublishesDef_ptr,
             CORBA::ComponentIR::PublishesDef_var,
-            CORBA::ComponentIR::PublishesDef_out
+            CORBA::ComponentIR::PublishesDef_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::ComponentIR::PublishesDef_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_COMPONENTIR_CONSUMESDEF__SARG_TRAITS_SS_)
-#define _CORBA_COMPONENTIR_CONSUMESDEF__SARG_TRAITS_SS_
+#if !defined (_CORBA_COMPONENTIR_CONSUMESDEF__SARG_TRAITS_)
+#define _CORBA_COMPONENTIR_CONSUMESDEF__SARG_TRAITS_
   
   template<>
   class  SArg_Traits<CORBA::ComponentIR::ConsumesDef>
@@ -449,15 +509,19 @@ namespace TAO
         Object_SArg_Traits_T<
             CORBA::ComponentIR::ConsumesDef_ptr,
             CORBA::ComponentIR::ConsumesDef_var,
-            CORBA::ComponentIR::ConsumesDef_out
+            CORBA::ComponentIR::ConsumesDef_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::ComponentIR::ConsumesDef_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_COMPONENTIR_FACTORYDEF__SARG_TRAITS_SS_)
-#define _CORBA_COMPONENTIR_FACTORYDEF__SARG_TRAITS_SS_
+#if !defined (_CORBA_COMPONENTIR_FACTORYDEF__SARG_TRAITS_)
+#define _CORBA_COMPONENTIR_FACTORYDEF__SARG_TRAITS_
   
   template<>
   class  SArg_Traits<CORBA::ComponentIR::FactoryDef>
@@ -465,15 +529,19 @@ namespace TAO
         Object_SArg_Traits_T<
             CORBA::ComponentIR::FactoryDef_ptr,
             CORBA::ComponentIR::FactoryDef_var,
-            CORBA::ComponentIR::FactoryDef_out
+            CORBA::ComponentIR::FactoryDef_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::ComponentIR::FactoryDef_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_COMPONENTIR_FINDERDEF__SARG_TRAITS_SS_)
-#define _CORBA_COMPONENTIR_FINDERDEF__SARG_TRAITS_SS_
+#if !defined (_CORBA_COMPONENTIR_FINDERDEF__SARG_TRAITS_)
+#define _CORBA_COMPONENTIR_FINDERDEF__SARG_TRAITS_
   
   template<>
   class  SArg_Traits<CORBA::ComponentIR::FinderDef>
@@ -481,7 +549,8 @@ namespace TAO
         Object_SArg_Traits_T<
             CORBA::ComponentIR::FinderDef_ptr,
             CORBA::ComponentIR::FinderDef_var,
-            CORBA::ComponentIR::FinderDef_out
+            CORBA::ComponentIR::FinderDef_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::ComponentIR::FinderDef_ptr>
           >
   {
   };
@@ -491,31 +560,35 @@ namespace TAO
 
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
+// be\be_visitor_arg_traits.cpp:70
 
 // Arg traits specializations.
 namespace TAO
 {
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:702
+  // be\be_visitor_arg_traits.cpp:793
 
-#if !defined (_CORBA_DEFINITIONKIND__ARG_TRAITS_SS_)
-#define _CORBA_DEFINITIONKIND__ARG_TRAITS_SS_
+#if !defined (_CORBA_DEFINITIONKIND__ARG_TRAITS_)
+#define _CORBA_DEFINITIONKIND__ARG_TRAITS_
   
   template<>
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::DefinitionKind>
+  class Arg_Traits<CORBA::DefinitionKind>
     : public
         Basic_Arg_Traits_T<
-            CORBA::DefinitionKind
+            CORBA::DefinitionKind,
+            TAO::Any_Insert_Policy_Stream <CORBA::DefinitionKind>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_REPOSITORY__ARG_TRAITS_SS_)
-#define _CORBA_REPOSITORY__ARG_TRAITS_SS_
+#if !defined (_CORBA_REPOSITORY__ARG_TRAITS_)
+#define _CORBA_REPOSITORY__ARG_TRAITS_
   
   template<>
   class  Arg_Traits<CORBA::Repository>
@@ -524,15 +597,19 @@ namespace TAO
             CORBA::Repository_ptr,
             CORBA::Repository_var,
             CORBA::Repository_out,
-            TAO::Objref_Traits<CORBA::Repository>
+            TAO::Objref_Traits<CORBA::Repository>,
+            TAO::Any_Insert_Policy_Stream <CORBA::Repository_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_CONTAINER__ARG_TRAITS_SS_)
-#define _CORBA_CONTAINER__ARG_TRAITS_SS_
+#if !defined (_CORBA_CONTAINER__ARG_TRAITS_)
+#define _CORBA_CONTAINER__ARG_TRAITS_
   
   template<>
   class  Arg_Traits<CORBA::Container>
@@ -541,15 +618,19 @@ namespace TAO
             CORBA::Container_ptr,
             CORBA::Container_var,
             CORBA::Container_out,
-            TAO::Objref_Traits<CORBA::Container>
+            TAO::Objref_Traits<CORBA::Container>,
+            TAO::Any_Insert_Policy_Stream <CORBA::Container_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_IDLTYPE__ARG_TRAITS_SS_)
-#define _CORBA_IDLTYPE__ARG_TRAITS_SS_
+#if !defined (_CORBA_IDLTYPE__ARG_TRAITS_)
+#define _CORBA_IDLTYPE__ARG_TRAITS_
   
   template<>
   class  Arg_Traits<CORBA::IDLType>
@@ -558,15 +639,19 @@ namespace TAO
             CORBA::IDLType_ptr,
             CORBA::IDLType_var,
             CORBA::IDLType_out,
-            TAO::Objref_Traits<CORBA::IDLType>
+            TAO::Objref_Traits<CORBA::IDLType>,
+            TAO::Any_Insert_Policy_Stream <CORBA::IDLType_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_INTERFACEDEF__ARG_TRAITS_SS_)
-#define _CORBA_INTERFACEDEF__ARG_TRAITS_SS_
+#if !defined (_CORBA_INTERFACEDEF__ARG_TRAITS_)
+#define _CORBA_INTERFACEDEF__ARG_TRAITS_
   
   template<>
   class  Arg_Traits<CORBA::InterfaceDef>
@@ -575,7 +660,8 @@ namespace TAO
             CORBA::InterfaceDef_ptr,
             CORBA::InterfaceDef_var,
             CORBA::InterfaceDef_out,
-            TAO::Objref_Traits<CORBA::InterfaceDef>
+            TAO::Objref_Traits<CORBA::InterfaceDef>,
+            TAO::Any_Insert_Policy_Stream <CORBA::InterfaceDef_ptr>
           >
   {
   };
@@ -583,26 +669,30 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:492
+  // be\be_visitor_arg_traits.cpp:547
 
-#if !defined (_CORBA_INTERFACEDEFSEQ__ARG_TRAITS_SS_)
-#define _CORBA_INTERFACEDEFSEQ__ARG_TRAITS_SS_
+#if !defined (_CORBA_INTERFACEDEFSEQ__ARG_TRAITS_)
+#define _CORBA_INTERFACEDEFSEQ__ARG_TRAITS_
   
   template<>
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::InterfaceDefSeq>
+  class Arg_Traits<CORBA::InterfaceDefSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::InterfaceDefSeq,
             CORBA::InterfaceDefSeq_var,
-            CORBA::InterfaceDefSeq_out
+            CORBA::InterfaceDefSeq_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::InterfaceDefSeq>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_VALUEDEF__ARG_TRAITS_SS_)
-#define _CORBA_VALUEDEF__ARG_TRAITS_SS_
+#if !defined (_CORBA_VALUEDEF__ARG_TRAITS_)
+#define _CORBA_VALUEDEF__ARG_TRAITS_
   
   template<>
   class  Arg_Traits<CORBA::ValueDef>
@@ -611,7 +701,8 @@ namespace TAO
             CORBA::ValueDef_ptr,
             CORBA::ValueDef_var,
             CORBA::ValueDef_out,
-            TAO::Objref_Traits<CORBA::ValueDef>
+            TAO::Objref_Traits<CORBA::ValueDef>,
+            TAO::Any_Insert_Policy_Stream <CORBA::ValueDef_ptr>
           >
   {
   };
@@ -619,18 +710,19 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:492
+  // be\be_visitor_arg_traits.cpp:547
 
-#if !defined (_CORBA_VALUEDEFSEQ__ARG_TRAITS_SS_)
-#define _CORBA_VALUEDEFSEQ__ARG_TRAITS_SS_
+#if !defined (_CORBA_VALUEDEFSEQ__ARG_TRAITS_)
+#define _CORBA_VALUEDEFSEQ__ARG_TRAITS_
   
   template<>
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::ValueDefSeq>
+  class Arg_Traits<CORBA::ValueDefSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::ValueDefSeq,
             CORBA::ValueDefSeq_var,
-            CORBA::ValueDefSeq_out
+            CORBA::ValueDefSeq_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::ValueDefSeq>
           >
   {
   };
@@ -638,18 +730,19 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:492
+  // be\be_visitor_arg_traits.cpp:547
 
-#if !defined (_CORBA_INITIALIZERSEQ__ARG_TRAITS_SS_)
-#define _CORBA_INITIALIZERSEQ__ARG_TRAITS_SS_
+#if !defined (_CORBA_INITIALIZERSEQ__ARG_TRAITS_)
+#define _CORBA_INITIALIZERSEQ__ARG_TRAITS_
   
   template<>
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::InitializerSeq>
+  class Arg_Traits<CORBA::InitializerSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::InitializerSeq,
             CORBA::InitializerSeq_var,
-            CORBA::InitializerSeq_out
+            CORBA::InitializerSeq_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::InitializerSeq>
           >
   {
   };
@@ -657,18 +750,19 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:492
+  // be\be_visitor_arg_traits.cpp:547
 
-#if !defined (_CORBA_EXTINITIALIZERSEQ__ARG_TRAITS_SS_)
-#define _CORBA_EXTINITIALIZERSEQ__ARG_TRAITS_SS_
+#if !defined (_CORBA_EXTINITIALIZERSEQ__ARG_TRAITS_)
+#define _CORBA_EXTINITIALIZERSEQ__ARG_TRAITS_
   
   template<>
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::ExtInitializerSeq>
+  class Arg_Traits<CORBA::ExtInitializerSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::ExtInitializerSeq,
             CORBA::ExtInitializerSeq_var,
-            CORBA::ExtInitializerSeq_out
+            CORBA::ExtInitializerSeq_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::ExtInitializerSeq>
           >
   {
   };
@@ -676,18 +770,19 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:492
+  // be\be_visitor_arg_traits.cpp:547
 
-#if !defined (_CORBA_EXCEPTIONDEFSEQ__ARG_TRAITS_SS_)
-#define _CORBA_EXCEPTIONDEFSEQ__ARG_TRAITS_SS_
+#if !defined (_CORBA_EXCEPTIONDEFSEQ__ARG_TRAITS_)
+#define _CORBA_EXCEPTIONDEFSEQ__ARG_TRAITS_
   
   template<>
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::ExceptionDefSeq>
+  class Arg_Traits<CORBA::ExceptionDefSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::ExceptionDefSeq,
             CORBA::ExceptionDefSeq_var,
-            CORBA::ExceptionDefSeq_out
+            CORBA::ExceptionDefSeq_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::ExceptionDefSeq>
           >
   {
   };
@@ -695,16 +790,17 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:702
+  // be\be_visitor_arg_traits.cpp:793
 
-#if !defined (_CORBA_OPERATIONMODE__ARG_TRAITS_SS_)
-#define _CORBA_OPERATIONMODE__ARG_TRAITS_SS_
+#if !defined (_CORBA_OPERATIONMODE__ARG_TRAITS_)
+#define _CORBA_OPERATIONMODE__ARG_TRAITS_
   
   template<>
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::OperationMode>
+  class Arg_Traits<CORBA::OperationMode>
     : public
         Basic_Arg_Traits_T<
-            CORBA::OperationMode
+            CORBA::OperationMode,
+            TAO::Any_Insert_Policy_Stream <CORBA::OperationMode>
           >
   {
   };
@@ -712,18 +808,19 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:492
+  // be\be_visitor_arg_traits.cpp:547
 
-#if !defined (_CORBA_PARDESCRIPTIONSEQ__ARG_TRAITS_SS_)
-#define _CORBA_PARDESCRIPTIONSEQ__ARG_TRAITS_SS_
+#if !defined (_CORBA_PARDESCRIPTIONSEQ__ARG_TRAITS_)
+#define _CORBA_PARDESCRIPTIONSEQ__ARG_TRAITS_
   
   template<>
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::ParDescriptionSeq>
+  class Arg_Traits<CORBA::ParDescriptionSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::ParDescriptionSeq,
             CORBA::ParDescriptionSeq_var,
-            CORBA::ParDescriptionSeq_out
+            CORBA::ParDescriptionSeq_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::ParDescriptionSeq>
           >
   {
   };
@@ -731,26 +828,30 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:492
+  // be\be_visitor_arg_traits.cpp:547
 
-#if !defined (_CORBA_CONTEXTIDSEQ__ARG_TRAITS_SS_)
-#define _CORBA_CONTEXTIDSEQ__ARG_TRAITS_SS_
+#if !defined (_CORBA_CONTEXTIDSEQ__ARG_TRAITS_)
+#define _CORBA_CONTEXTIDSEQ__ARG_TRAITS_
   
   template<>
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::ContextIdSeq>
+  class Arg_Traits<CORBA::ContextIdSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::ContextIdSeq,
             CORBA::ContextIdSeq_var,
-            CORBA::ContextIdSeq_out
+            CORBA::ContextIdSeq_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::ContextIdSeq>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_COMPONENTIR_COMPONENTDEF__ARG_TRAITS_SS_)
-#define _CORBA_COMPONENTIR_COMPONENTDEF__ARG_TRAITS_SS_
+#if !defined (_CORBA_COMPONENTIR_COMPONENTDEF__ARG_TRAITS_)
+#define _CORBA_COMPONENTIR_COMPONENTDEF__ARG_TRAITS_
   
   template<>
   class  Arg_Traits<CORBA::ComponentIR::ComponentDef>
@@ -759,15 +860,19 @@ namespace TAO
             CORBA::ComponentIR::ComponentDef_ptr,
             CORBA::ComponentIR::ComponentDef_var,
             CORBA::ComponentIR::ComponentDef_out,
-            TAO::Objref_Traits<CORBA::ComponentIR::ComponentDef>
+            TAO::Objref_Traits<CORBA::ComponentIR::ComponentDef>,
+            TAO::Any_Insert_Policy_Stream <CORBA::ComponentIR::ComponentDef_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_COMPONENTIR_HOMEDEF__ARG_TRAITS_SS_)
-#define _CORBA_COMPONENTIR_HOMEDEF__ARG_TRAITS_SS_
+#if !defined (_CORBA_COMPONENTIR_HOMEDEF__ARG_TRAITS_)
+#define _CORBA_COMPONENTIR_HOMEDEF__ARG_TRAITS_
   
   template<>
   class  Arg_Traits<CORBA::ComponentIR::HomeDef>
@@ -776,15 +881,19 @@ namespace TAO
             CORBA::ComponentIR::HomeDef_ptr,
             CORBA::ComponentIR::HomeDef_var,
             CORBA::ComponentIR::HomeDef_out,
-            TAO::Objref_Traits<CORBA::ComponentIR::HomeDef>
+            TAO::Objref_Traits<CORBA::ComponentIR::HomeDef>,
+            TAO::Any_Insert_Policy_Stream <CORBA::ComponentIR::HomeDef_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_COMPONENTIR_EVENTDEF__ARG_TRAITS_SS_)
-#define _CORBA_COMPONENTIR_EVENTDEF__ARG_TRAITS_SS_
+#if !defined (_CORBA_COMPONENTIR_EVENTDEF__ARG_TRAITS_)
+#define _CORBA_COMPONENTIR_EVENTDEF__ARG_TRAITS_
   
   template<>
   class  Arg_Traits<CORBA::ComponentIR::EventDef>
@@ -793,15 +902,19 @@ namespace TAO
             CORBA::ComponentIR::EventDef_ptr,
             CORBA::ComponentIR::EventDef_var,
             CORBA::ComponentIR::EventDef_out,
-            TAO::Objref_Traits<CORBA::ComponentIR::EventDef>
+            TAO::Objref_Traits<CORBA::ComponentIR::EventDef>,
+            TAO::Any_Insert_Policy_Stream <CORBA::ComponentIR::EventDef_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_COMPONENTIR_PROVIDESDEF__ARG_TRAITS_SS_)
-#define _CORBA_COMPONENTIR_PROVIDESDEF__ARG_TRAITS_SS_
+#if !defined (_CORBA_COMPONENTIR_PROVIDESDEF__ARG_TRAITS_)
+#define _CORBA_COMPONENTIR_PROVIDESDEF__ARG_TRAITS_
   
   template<>
   class  Arg_Traits<CORBA::ComponentIR::ProvidesDef>
@@ -810,15 +923,19 @@ namespace TAO
             CORBA::ComponentIR::ProvidesDef_ptr,
             CORBA::ComponentIR::ProvidesDef_var,
             CORBA::ComponentIR::ProvidesDef_out,
-            TAO::Objref_Traits<CORBA::ComponentIR::ProvidesDef>
+            TAO::Objref_Traits<CORBA::ComponentIR::ProvidesDef>,
+            TAO::Any_Insert_Policy_Stream <CORBA::ComponentIR::ProvidesDef_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_COMPONENTIR_USESDEF__ARG_TRAITS_SS_)
-#define _CORBA_COMPONENTIR_USESDEF__ARG_TRAITS_SS_
+#if !defined (_CORBA_COMPONENTIR_USESDEF__ARG_TRAITS_)
+#define _CORBA_COMPONENTIR_USESDEF__ARG_TRAITS_
   
   template<>
   class  Arg_Traits<CORBA::ComponentIR::UsesDef>
@@ -827,15 +944,19 @@ namespace TAO
             CORBA::ComponentIR::UsesDef_ptr,
             CORBA::ComponentIR::UsesDef_var,
             CORBA::ComponentIR::UsesDef_out,
-            TAO::Objref_Traits<CORBA::ComponentIR::UsesDef>
+            TAO::Objref_Traits<CORBA::ComponentIR::UsesDef>,
+            TAO::Any_Insert_Policy_Stream <CORBA::ComponentIR::UsesDef_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_COMPONENTIR_EMITSDEF__ARG_TRAITS_SS_)
-#define _CORBA_COMPONENTIR_EMITSDEF__ARG_TRAITS_SS_
+#if !defined (_CORBA_COMPONENTIR_EMITSDEF__ARG_TRAITS_)
+#define _CORBA_COMPONENTIR_EMITSDEF__ARG_TRAITS_
   
   template<>
   class  Arg_Traits<CORBA::ComponentIR::EmitsDef>
@@ -844,15 +965,19 @@ namespace TAO
             CORBA::ComponentIR::EmitsDef_ptr,
             CORBA::ComponentIR::EmitsDef_var,
             CORBA::ComponentIR::EmitsDef_out,
-            TAO::Objref_Traits<CORBA::ComponentIR::EmitsDef>
+            TAO::Objref_Traits<CORBA::ComponentIR::EmitsDef>,
+            TAO::Any_Insert_Policy_Stream <CORBA::ComponentIR::EmitsDef_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_COMPONENTIR_PUBLISHESDEF__ARG_TRAITS_SS_)
-#define _CORBA_COMPONENTIR_PUBLISHESDEF__ARG_TRAITS_SS_
+#if !defined (_CORBA_COMPONENTIR_PUBLISHESDEF__ARG_TRAITS_)
+#define _CORBA_COMPONENTIR_PUBLISHESDEF__ARG_TRAITS_
   
   template<>
   class  Arg_Traits<CORBA::ComponentIR::PublishesDef>
@@ -861,15 +986,19 @@ namespace TAO
             CORBA::ComponentIR::PublishesDef_ptr,
             CORBA::ComponentIR::PublishesDef_var,
             CORBA::ComponentIR::PublishesDef_out,
-            TAO::Objref_Traits<CORBA::ComponentIR::PublishesDef>
+            TAO::Objref_Traits<CORBA::ComponentIR::PublishesDef>,
+            TAO::Any_Insert_Policy_Stream <CORBA::ComponentIR::PublishesDef_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_COMPONENTIR_CONSUMESDEF__ARG_TRAITS_SS_)
-#define _CORBA_COMPONENTIR_CONSUMESDEF__ARG_TRAITS_SS_
+#if !defined (_CORBA_COMPONENTIR_CONSUMESDEF__ARG_TRAITS_)
+#define _CORBA_COMPONENTIR_CONSUMESDEF__ARG_TRAITS_
   
   template<>
   class  Arg_Traits<CORBA::ComponentIR::ConsumesDef>
@@ -878,15 +1007,19 @@ namespace TAO
             CORBA::ComponentIR::ConsumesDef_ptr,
             CORBA::ComponentIR::ConsumesDef_var,
             CORBA::ComponentIR::ConsumesDef_out,
-            TAO::Objref_Traits<CORBA::ComponentIR::ConsumesDef>
+            TAO::Objref_Traits<CORBA::ComponentIR::ConsumesDef>,
+            TAO::Any_Insert_Policy_Stream <CORBA::ComponentIR::ConsumesDef_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_COMPONENTIR_FACTORYDEF__ARG_TRAITS_SS_)
-#define _CORBA_COMPONENTIR_FACTORYDEF__ARG_TRAITS_SS_
+#if !defined (_CORBA_COMPONENTIR_FACTORYDEF__ARG_TRAITS_)
+#define _CORBA_COMPONENTIR_FACTORYDEF__ARG_TRAITS_
   
   template<>
   class  Arg_Traits<CORBA::ComponentIR::FactoryDef>
@@ -895,15 +1028,19 @@ namespace TAO
             CORBA::ComponentIR::FactoryDef_ptr,
             CORBA::ComponentIR::FactoryDef_var,
             CORBA::ComponentIR::FactoryDef_out,
-            TAO::Objref_Traits<CORBA::ComponentIR::FactoryDef>
+            TAO::Objref_Traits<CORBA::ComponentIR::FactoryDef>,
+            TAO::Any_Insert_Policy_Stream <CORBA::ComponentIR::FactoryDef_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_COMPONENTIR_FINDERDEF__ARG_TRAITS_SS_)
-#define _CORBA_COMPONENTIR_FINDERDEF__ARG_TRAITS_SS_
+#if !defined (_CORBA_COMPONENTIR_FINDERDEF__ARG_TRAITS_)
+#define _CORBA_COMPONENTIR_FINDERDEF__ARG_TRAITS_
   
   template<>
   class  Arg_Traits<CORBA::ComponentIR::FinderDef>
@@ -912,7 +1049,8 @@ namespace TAO
             CORBA::ComponentIR::FinderDef_ptr,
             CORBA::ComponentIR::FinderDef_var,
             CORBA::ComponentIR::FinderDef_out,
-            TAO::Objref_Traits<CORBA::ComponentIR::FinderDef>
+            TAO::Objref_Traits<CORBA::ComponentIR::FinderDef>,
+            TAO::Any_Insert_Policy_Stream <CORBA::ComponentIR::FinderDef_ptr>
           >
   {
   };
@@ -922,7 +1060,7 @@ namespace TAO
 
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1455
+// be\be_interface.cpp:1465
 
 class TAO_CORBA_ComponentIR_EventDef_Perfect_Hash_OpTable
   : public TAO_Perfect_Hash_OpTable
@@ -935,53 +1073,53 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: c:\ace\latest\ACE_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0 -a -o -t -p -K opname -L C++ -Z TAO_CORBA_ComponentIR_EventDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ACE\Any\ACE_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0 -a -o -t -p -K opname -L C++ -Z TAO_CORBA_ComponentIR_EventDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_ComponentIR_EventDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
   static const unsigned char asso_values[] =
     {
 #if defined (ACE_MVS)
-     92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
-     92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
-     92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
-     92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
-     92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
-     92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
-     92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
-     92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
-     92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
-     92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
-     92, 92, 92, 92, 92, 92, 92, 92, 92,  0,
-     92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
-     92, 92, 92, 92, 92, 92, 92, 92, 92,  0,
-     92, 45, 30,  0, 92, 92, 92, 20, 92, 92,
-     92, 92, 92, 92, 92, 92, 92,  0,  0, 30,
-     92,  0, 92,  0, 92, 92, 92, 92, 92, 92,
-     92, 92, 15, 15, 92, 92, 92,  5, 15, 92,
-     92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
-     92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
-     92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
-     92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
-     92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
-     92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
-     92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
-     92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
-     92, 92, 92, 92, 92, 92,
+     109, 109, 109, 109, 109, 109, 109, 109, 109, 109,
+     109, 109, 109, 109, 109, 109, 109, 109, 109, 109,
+     109, 109, 109, 109, 109, 109, 109, 109, 109, 109,
+     109, 109, 109, 109, 109, 109, 109, 109, 109, 109,
+     109, 109, 109, 109, 109, 109, 109, 109, 109, 109,
+     109, 109, 109, 109, 109, 109, 109, 109, 109, 109,
+     109, 109, 109, 109, 109, 109, 109, 109, 109, 109,
+     109, 109, 109, 109, 109, 109, 109, 109, 109, 109,
+     109, 109, 109, 109, 109, 109, 109, 109, 109, 109,
+     109, 109, 109, 109, 109, 109, 109, 109, 109, 109,
+     109, 109, 109, 109, 109, 109, 109, 109, 109,   0,
+     109, 109, 109, 109, 109, 109, 109, 109, 109, 109,
+     109, 109, 109, 109, 109, 109, 109, 109, 109,   0,
+     109,  15,  50,  40, 109, 109, 109,   0, 109, 109,
+     109, 109, 109, 109, 109, 109, 109,   0,   0,   0,
+     109,   0, 109,   0, 109, 109, 109, 109, 109, 109,
+     109, 109,  15,   0, 109, 109, 109,  15,  15, 109,
+     109, 109, 109, 109, 109, 109, 109, 109, 109, 109,
+     109, 109, 109, 109, 109, 109, 109, 109, 109, 109,
+     109, 109, 109, 109, 109, 109, 109, 109, 109, 109,
+     109, 109, 109, 109, 109, 109, 109, 109, 109, 109,
+     109, 109, 109, 109, 109, 109, 109, 109, 109, 109,
+     109, 109, 109, 109, 109, 109, 109, 109, 109, 109,
+     109, 109, 109, 109, 109, 109, 109, 109, 109, 109,
+     109, 109, 109, 109, 109, 109, 109, 109, 109, 109,
+     109, 109, 109, 109, 109, 109,
 #else
-     92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
-     92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
-     92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
-     92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
-     92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
-     92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
-     92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
-     92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
-     92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
-     92, 92, 92, 92, 92,  0, 92,  0, 92, 45,
-     30,  0, 92, 92, 92, 20, 92, 92,  0,  0,
-     30, 92,  0, 92,  0, 15, 15, 92, 92, 92,
-      5, 15, 92, 92, 92, 92, 92, 92,
+     109, 109, 109, 109, 109, 109, 109, 109, 109, 109,
+     109, 109, 109, 109, 109, 109, 109, 109, 109, 109,
+     109, 109, 109, 109, 109, 109, 109, 109, 109, 109,
+     109, 109, 109, 109, 109, 109, 109, 109, 109, 109,
+     109, 109, 109, 109, 109, 109, 109, 109, 109, 109,
+     109, 109, 109, 109, 109, 109, 109, 109, 109, 109,
+     109, 109, 109, 109, 109, 109, 109, 109, 109, 109,
+     109, 109, 109, 109, 109, 109, 109, 109, 109, 109,
+     109, 109, 109, 109, 109, 109, 109, 109, 109, 109,
+     109, 109, 109, 109, 109,   0, 109,   0, 109,  15,
+      50,  40, 109, 109, 109,   0, 109, 109,   0,   0,
+       0, 109,   0, 109,   0,  15,   0, 109, 109, 109,
+      15,  15, 109, 109, 109, 109, 109, 109,
 #endif /* ACE_MVS */
     };
   return len + asso_values[(int) str[len - 1]] + asso_values[(int) str[0]];
@@ -992,89 +1130,91 @@ TAO_CORBA_ComponentIR_EventDef_Perfect_Hash_OpTable::lookup (const char *str, un
 {
   enum
     {
-      TOTAL_KEYWORDS = 59,
+      TOTAL_KEYWORDS = 60,
       MIN_WORD_LENGTH = 4,
       MAX_WORD_LENGTH = 26,
       MIN_HASH_VALUE = 4,
-      MAX_HASH_VALUE = 91,
-      HASH_VALUE_RANGE = 88,
+      MAX_HASH_VALUE = 108,
+      HASH_VALUE_RANGE = 105,
       DUPLICATES = 18,
-      WORDLIST_SIZE = 63
+      WORDLIST_SIZE = 64
     };
 
   static const TAO_operation_db_entry  wordlist[] =
     {
       {"",0,0},{"",0,0},{"",0,0},{"",0,0},
-      {"move", &POA_CORBA::ComponentIR::EventDef::move_skel, 0},
+      {"is_a", &POA_CORBA::ComponentIR::EventDef::is_a_skel, 0},
       {"_is_a", &POA_CORBA::ComponentIR::EventDef::_is_a_skel, 0},
       {"lookup", &POA_CORBA::ComponentIR::EventDef::lookup_skel, 0},
-      {"_get_name", &POA_CORBA::ComponentIR::EventDef::_get_name_skel, 0},
-      {"_get_type", &POA_CORBA::ComponentIR::EventDef::_get_type_skel, 0},
-      {"_set_name", &POA_CORBA::ComponentIR::EventDef::_set_name_skel, 0},
-      {"_interface", &POA_CORBA::ComponentIR::EventDef::_interface_skel, 0},
-      {"lookup_name", &POA_CORBA::ComponentIR::EventDef::lookup_name_skel, 0},
-      {"_get_is_custom", &POA_CORBA::ComponentIR::EventDef::_get_is_custom_skel, 0},
-      {"_set_is_custom", &POA_CORBA::ComponentIR::EventDef::_set_is_custom_skel, 0},
-      {"_get_base_value", &POA_CORBA::ComponentIR::EventDef::_get_base_value_skel, 0},
-      {"_set_base_value", &POA_CORBA::ComponentIR::EventDef::_set_base_value_skel, 0},
-      {"_get_absolute_name", &POA_CORBA::ComponentIR::EventDef::_get_absolute_name_skel, 0},
-      {"_get_is_truncatable", &POA_CORBA::ComponentIR::EventDef::_get_is_truncatable_skel, 0},
-      {"_set_is_truncatable", &POA_CORBA::ComponentIR::EventDef::_set_is_truncatable_skel, 0},
-      {"is_a", &POA_CORBA::ComponentIR::EventDef::is_a_skel, 0},
       {"_component", &POA_CORBA::ComponentIR::EventDef::_component_skel, 0},
+      {"_get_version", &POA_CORBA::ComponentIR::EventDef::_get_version_skel, 0},
+      {"_set_version", &POA_CORBA::ComponentIR::EventDef::_set_version_skel, 0},
       {"_non_existent", &POA_CORBA::ComponentIR::EventDef::_non_existent_skel, 0},
+      {"_get_is_custom", &POA_CORBA::ComponentIR::EventDef::_get_is_custom_skel, 0},
+      {"_set_is_custom", &POA_CORBA::ComponentIR::EventDef::_set_is_custom_skel, 0},
+      {"_get_defined_in", &POA_CORBA::ComponentIR::EventDef::_get_defined_in_skel, 0},
       {"_get_is_abstract", &POA_CORBA::ComponentIR::EventDef::_get_is_abstract_skel, 0},
       {"_set_is_abstract", &POA_CORBA::ComponentIR::EventDef::_set_is_abstract_skel, 0},
+      {"create_enum", &POA_CORBA::ComponentIR::EventDef::create_enum_skel, 0},
+      {"create_union", &POA_CORBA::ComponentIR::EventDef::create_union_skel, 0},
+      {"create_struct", &POA_CORBA::ComponentIR::EventDef::create_struct_skel, 0},
+      {"create_constant", &POA_CORBA::ComponentIR::EventDef::create_constant_skel, 0},
+      {"create_exception", &POA_CORBA::ComponentIR::EventDef::create_exception_skel, 0},
+      {"create_operation", &POA_CORBA::ComponentIR::EventDef::create_operation_skel, 0},
       {"_get_initializers", &POA_CORBA::ComponentIR::EventDef::_get_initializers_skel, 0},
       {"_set_initializers", &POA_CORBA::ComponentIR::EventDef::_set_initializers_skel, 0},
+      {"create_value_member", &POA_CORBA::ComponentIR::EventDef::create_value_member_skel, 0},
       {"_get_ext_initializers", &POA_CORBA::ComponentIR::EventDef::_get_ext_initializers_skel, 0},
       {"_set_ext_initializers", &POA_CORBA::ComponentIR::EventDef::_set_ext_initializers_skel, 0},
-      {"_get_id", &POA_CORBA::ComponentIR::EventDef::_get_id_skel, 0},
-      {"_set_id", &POA_CORBA::ComponentIR::EventDef::_set_id_skel, 0},
-      {"describe", &POA_CORBA::ComponentIR::EventDef::describe_skel, 0},
+      {"contents", &POA_CORBA::ComponentIR::EventDef::contents_skel, 0},
       {"_get_supported_interfaces", &POA_CORBA::ComponentIR::EventDef::_get_supported_interfaces_skel, 0},
       {"_set_abstract_base_values", &POA_CORBA::ComponentIR::EventDef::_set_abstract_base_values_skel, 0},
       {"_get_abstract_base_values", &POA_CORBA::ComponentIR::EventDef::_get_abstract_base_values_skel, 0},
       {"_set_supported_interfaces", &POA_CORBA::ComponentIR::EventDef::_set_supported_interfaces_skel, 0},
       {"_get_containing_repository", &POA_CORBA::ComponentIR::EventDef::_get_containing_repository_skel, 0},
-      {"_get_version", &POA_CORBA::ComponentIR::EventDef::_get_version_skel, 0},
-      {"_set_version", &POA_CORBA::ComponentIR::EventDef::_set_version_skel, 0},
+      {"create_alias", &POA_CORBA::ComponentIR::EventDef::create_alias_skel, 0},
+      {"move", &POA_CORBA::ComponentIR::EventDef::move_skel, 0},
+      {"create_value_box", &POA_CORBA::ComponentIR::EventDef::create_value_box_skel, 0},
+      {"_get_name", &POA_CORBA::ComponentIR::EventDef::_get_name_skel, 0},
+      {"_get_type", &POA_CORBA::ComponentIR::EventDef::_get_type_skel, 0},
+      {"_set_name", &POA_CORBA::ComponentIR::EventDef::_set_name_skel, 0},
+      {"_interface", &POA_CORBA::ComponentIR::EventDef::_interface_skel, 0},
+      {"lookup_name", &POA_CORBA::ComponentIR::EventDef::lookup_name_skel, 0},
+      {"_get_base_value", &POA_CORBA::ComponentIR::EventDef::_get_base_value_skel, 0},
+      {"_set_base_value", &POA_CORBA::ComponentIR::EventDef::_set_base_value_skel, 0},
+      {"_get_id", &POA_CORBA::ComponentIR::EventDef::_get_id_skel, 0},
+      {"_set_id", &POA_CORBA::ComponentIR::EventDef::_set_id_skel, 0},
+      {"_get_absolute_name", &POA_CORBA::ComponentIR::EventDef::_get_absolute_name_skel, 0},
+      {"_get_is_truncatable", &POA_CORBA::ComponentIR::EventDef::_get_is_truncatable_skel, 0},
+      {"_set_is_truncatable", &POA_CORBA::ComponentIR::EventDef::_set_is_truncatable_skel, 0},
       {"_get_def_kind", &POA_CORBA::ComponentIR::EventDef::_get_def_kind_skel, 0},
-      {"describe_value", &POA_CORBA::ComponentIR::EventDef::describe_value_skel, 0},
-      {"_get_defined_in", &POA_CORBA::ComponentIR::EventDef::_get_defined_in_skel, 0},
-      {"describe_ext_value", &POA_CORBA::ComponentIR::EventDef::describe_ext_value_skel, 0},
-      {"destroy", &POA_CORBA::ComponentIR::EventDef::destroy_skel, 0},
-      {"create_enum", &POA_CORBA::ComponentIR::EventDef::create_enum_skel, 0},
+      {"_repository_id", &POA_CORBA::ComponentIR::EventDef::_repository_id_skel, 0},
       {"create_value", &POA_CORBA::ComponentIR::EventDef::create_value_skel, 0},
       {"create_module", &POA_CORBA::ComponentIR::EventDef::create_module_skel, 0},
       {"create_native", &POA_CORBA::ComponentIR::EventDef::create_native_skel, 0},
       {"create_interface", &POA_CORBA::ComponentIR::EventDef::create_interface_skel, 0},
       {"create_attribute", &POA_CORBA::ComponentIR::EventDef::create_attribute_skel, 0},
       {"create_ext_value", &POA_CORBA::ComponentIR::EventDef::create_ext_value_skel, 0},
-      {"describe_contents", &POA_CORBA::ComponentIR::EventDef::describe_contents_skel, 0},
-      {"create_value_member", &POA_CORBA::ComponentIR::EventDef::create_value_member_skel, 0},
+      {"destroy", &POA_CORBA::ComponentIR::EventDef::destroy_skel, 0},
       {"create_ext_attribute", &POA_CORBA::ComponentIR::EventDef::create_ext_attribute_skel, 0},
-      {"create_value_box", &POA_CORBA::ComponentIR::EventDef::create_value_box_skel, 0},
       {"create_local_interface", &POA_CORBA::ComponentIR::EventDef::create_local_interface_skel, 0},
-      {"contents", &POA_CORBA::ComponentIR::EventDef::contents_skel, 0},
       {"create_abstract_interface", &POA_CORBA::ComponentIR::EventDef::create_abstract_interface_skel, 0},
-      {"create_alias", &POA_CORBA::ComponentIR::EventDef::create_alias_skel, 0},
-      {"create_struct", &POA_CORBA::ComponentIR::EventDef::create_struct_skel, 0},
-      {"create_constant", &POA_CORBA::ComponentIR::EventDef::create_constant_skel, 0},
-      {"create_union", &POA_CORBA::ComponentIR::EventDef::create_union_skel, 0},
-      {"create_exception", &POA_CORBA::ComponentIR::EventDef::create_exception_skel, 0},
-      {"create_operation", &POA_CORBA::ComponentIR::EventDef::create_operation_skel, 0},
+      {"describe_contents", &POA_CORBA::ComponentIR::EventDef::describe_contents_skel, 0},
+      {"describe", &POA_CORBA::ComponentIR::EventDef::describe_skel, 0},
+      {"describe_value", &POA_CORBA::ComponentIR::EventDef::describe_value_skel, 0},
+      {"describe_ext_value", &POA_CORBA::ComponentIR::EventDef::describe_ext_value_skel, 0},
     };
 
-  static const signed char lookup[] =
+  static const signed short lookup[] =
     {
-        -7,   -3,  -12,   -2,    4,    5,    6,  -14,   -2, -100,   10,   11,  -17,   -2, 
-      -103,  -99,  -22,   -2,   16,  -98,  -24,   -2,  -26,   -2,   19,   20,  -28,   -2, 
-        21,  -31,   -4, -106, -103,   -1,  -36,   -2, -105, -102,   30,   -1, -102,   35, 
-       -99,   38,   39,   40,   -1,   -1,   41,   -1,   -1,   -1,   42,   -1,  -45,   -2, 
-        43,   44,  -95,  -47,   -3,  -93,   50,   -1,   51,   52,   53,   54,   55,   -1, 
-        56,   -1,   57,   58,   -1,   59,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-        -1,   -1,   -1,   60,   -1,  -61,   -2,  -93, 
+       -14,   -2,  -20,   -2,    4,    5,    6,   -1,  -22,   -2,    7,   -1,  169,   10, 
+       154,   13, -124,   -1,  -25,   -2,  -28,   -4,  -36,   -3,  -41,   -2,   16,   17, 
+        18,   -1,   19, -137, -132,   -1,   24,   -1, -126,   -1,   27,   -1, -128,   32, 
+        33,   -1,   34,   -1,   35,  -43,   -2, -135,   39,   40,   -1,  -46,   -2, -139, 
+        -1, -118,   45, -114,  -11,   -2,   -1,   48,   49,  -51,   -2,   50, -111,  -53, 
+        -3, -110,   56,   -8,   -2,   57,   -1,   58,   -1,   -1,   59,   -1,   60,   -1, 
+        -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+        61,   -1,   -1,   -1,   -1,   -1,   62,   -1,   -1,   -1,   63, 
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -1112,7 +1252,7 @@ TAO_CORBA_ComponentIR_EventDef_Perfect_Hash_OpTable::lookup (const char *str, un
 static TAO_CORBA_ComponentIR_EventDef_Perfect_Hash_OpTable tao_CORBA_ComponentIR_EventDef_optable;
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:999
+// be\be_visitor_interface/interface_ss.cpp:921
 
 TAO::Collocation_Proxy_Broker *
 CORBA_ComponentIR__TAO_EventDef_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -1132,10 +1272,7 @@ CORBA_ComponentIR__TAO_EventDef_Proxy_Broker_Factory_Initializer (size_t)
 static int
 CORBA_ComponentIR__TAO_EventDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
   CORBA_ComponentIR__TAO_EventDef_Proxy_Broker_Factory_Initializer (
-      reinterpret_cast<
-          size_t> (
-          CORBA_ComponentIR__TAO_EventDef_Proxy_Broker_Factory_Initializer
-        )
+      reinterpret_cast<size_t> (CORBA_ComponentIR__TAO_EventDef_Proxy_Broker_Factory_Initializer)
     );
 
 
@@ -1198,8 +1335,8 @@ namespace POA_CORBA
             this->operation_details_,
             this->args_);
         
-        TAO::SArg_Traits< CORBA::Char *>::in_arg_type arg_1 =
-          TAO::Portable_Server::get_in_arg< CORBA::Char *, TAO::SArg_Traits< CORBA::Char *>::in_arg_type> (
+        TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
+          TAO::Portable_Server::get_in_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type> (
             this->operation_details_,
             this->args_,
             1);
@@ -1236,7 +1373,7 @@ void POA_CORBA::ComponentIR::EventDef::_is_a_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  TAO::SArg_Traits< CORBA::Char *>::in_arg_val _tao_repository_id;
+  TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
   
   TAO::Argument * const args[] =
     {
@@ -1361,10 +1498,102 @@ void POA_CORBA::ComponentIR::EventDef::_non_existent_skel (
   
 }
 
+namespace POA_CORBA
+{
+  namespace ComponentIR
+  {
+    
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/upcall_command_ss.cpp:127
+    
+    class _repository_id_EventDef_Upcall_Command
+      : public TAO::Upcall_Command
+    {
+    public:
+      inline _repository_id_EventDef_Upcall_Command (
+        POA_CORBA::ComponentIR::EventDef * servant,
+        TAO_Operation_Details const * operation_details,
+        TAO::Argument * const args[])
+        : servant_ (servant)
+        , operation_details_ (operation_details)
+        , args_ (args)
+      {
+      }
+      
+      virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+      {
+        TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
+          TAO::Portable_Server::get_ret_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type> (
+            this->operation_details_,
+            this->args_);
+        
+        
+        retval =
+          this->servant_-> _repository_id (
+            ACE_ENV_SINGLE_ARG_PARAMETER);
+          
+      }
+    
+    private:
+      POA_CORBA::ComponentIR::EventDef * const servant_;
+      TAO_Operation_Details const * const operation_details_;
+      TAO::Argument * const * const args_;
+    };
+    
+  }
+  
+}
+void POA_CORBA::ComponentIR::EventDef::_repository_id_skel (
+    TAO_ServerRequest & server_request, 
+    void * TAO_INTERCEPTOR (servant_upcall),
+    void * servant
+    ACE_ENV_ARG_DECL
+  )
+{
+  
+  
+#if TAO_HAS_INTERCEPTORS == 1
+  static CORBA::TypeCode_ptr const * const exceptions = 0;
+  static size_t const nexceptions = 0;
+#endif /* TAO_HAS_INTERCEPTORS */
+  
+  TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
+  
+  TAO::Argument * const args[] =
+    {
+      &retval
+    };
+  
+  static size_t const nargs = 1;
+  
+  POA_CORBA::ComponentIR::EventDef * const impl =
+    static_cast<POA_CORBA::ComponentIR::EventDef *> (servant);
+  
+  _repository_id_EventDef_Upcall_Command command (
+    impl,
+    server_request.operation_details (),
+    args);
+  
+  TAO::Upcall_Wrapper upcall_wrapper;
+  upcall_wrapper.upcall (server_request
+                         , args
+                         , nargs
+                         , command
+#if TAO_HAS_INTERCEPTORS == 1
+                         , servant_upcall
+                         , exceptions
+                         , nexceptions
+#endif  /* TAO_HAS_INTERCEPTORS == 1 */
+                         ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+  
+}
+
 
 
 // TAO_IDL - Generated from 
-// be\be_visitor_interface/interface_ss.cpp:393
+// be\be_visitor_interface/interface_ss.cpp:501
 
 
 
@@ -1549,7 +1778,7 @@ const char* POA_CORBA::ComponentIR::EventDef::_interface_repository_id (void) co
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:940
+// be\be_visitor_interface/interface_ss.cpp:862
 
 void POA_CORBA::ComponentIR::EventDef::_dispatch (
     TAO_ServerRequest & req,
@@ -1564,7 +1793,7 @@ void POA_CORBA::ComponentIR::EventDef::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:891
+// be\be_visitor_interface/interface_ss.cpp:813
 
 CORBA::ComponentIR::EventDef *
 POA_CORBA::ComponentIR::EventDef::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -1596,7 +1825,7 @@ POA_CORBA::ComponentIR::EventDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1455
+// be\be_interface.cpp:1465
 
 class TAO_CORBA_ComponentIR_Container_Perfect_Hash_OpTable
   : public TAO_Perfect_Hash_OpTable
@@ -1609,7 +1838,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: c:\ace\latest\ACE_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0 -a -o -t -p -K opname -L C++ -Z TAO_CORBA_ComponentIR_Container_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ACE\Any\ACE_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0 -a -o -t -p -K opname -L C++ -Z TAO_CORBA_ComponentIR_Container_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_ComponentIR_Container_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -1666,14 +1895,14 @@ TAO_CORBA_ComponentIR_Container_Perfect_Hash_OpTable::lookup (const char *str, u
 {
   enum
     {
-      TOTAL_KEYWORDS = 27,
+      TOTAL_KEYWORDS = 28,
       MIN_WORD_LENGTH = 5,
       MAX_WORD_LENGTH = 25,
       MIN_HASH_VALUE = 7,
       MAX_HASH_VALUE = 46,
       HASH_VALUE_RANGE = 40,
       DUPLICATES = 3,
-      WORDLIST_SIZE = 34
+      WORDLIST_SIZE = 35
     };
 
   static const TAO_operation_db_entry  wordlist[] =
@@ -1699,6 +1928,7 @@ TAO_CORBA_ComponentIR_Container_Perfect_Hash_OpTable::lookup (const char *str, u
       {"create_enum", &POA_CORBA::ComponentIR::Container::create_enum_skel, 0},
       {"describe_contents", &POA_CORBA::ComponentIR::Container::describe_contents_skel, 0},
       {"_get_def_kind", &POA_CORBA::ComponentIR::Container::_get_def_kind_skel, 0},
+      {"_repository_id", &POA_CORBA::ComponentIR::Container::_repository_id_skel, 0},
       {"_component", &POA_CORBA::ComponentIR::Container::_component_skel, 0},
       {"lookup", &POA_CORBA::ComponentIR::Container::lookup_skel, 0},
       {"_non_existent", &POA_CORBA::ComponentIR::Container::_non_existent_skel, 0},
@@ -1712,8 +1942,8 @@ TAO_CORBA_ComponentIR_Container_Perfect_Hash_OpTable::lookup (const char *str, u
     {
        -1,  -1,  -1,  -1,  -1,  -1,  -1,   7,  -1, -10,  -2,   8,   9, -50, 
       -12,  -2, -48,  14,  15,  -1,  16,  17,  18,  19,  -1,  20,  21,  22, 
-       -1,  -1,  23,  24,  25,  26,  -1,  27,  28,  -1,  29,  -1,  30,  31, 
-       32,  -1,  -1,  -1,  33, 
+       -1,  -1,  23,  24,  25,  26,  27,  28,  29,  -1,  30,  -1,  31,  32, 
+       33,  -1,  -1,  -1,  34, 
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -1751,7 +1981,7 @@ TAO_CORBA_ComponentIR_Container_Perfect_Hash_OpTable::lookup (const char *str, u
 static TAO_CORBA_ComponentIR_Container_Perfect_Hash_OpTable tao_CORBA_ComponentIR_Container_optable;
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:999
+// be\be_visitor_interface/interface_ss.cpp:921
 
 TAO::Collocation_Proxy_Broker *
 CORBA_ComponentIR__TAO_Container_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -1771,10 +2001,7 @@ CORBA_ComponentIR__TAO_Container_Proxy_Broker_Factory_Initializer (size_t)
 static int
 CORBA_ComponentIR__TAO_Container_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
   CORBA_ComponentIR__TAO_Container_Proxy_Broker_Factory_Initializer (
-      reinterpret_cast<
-          size_t> (
-          CORBA_ComponentIR__TAO_Container_Proxy_Broker_Factory_Initializer
-        )
+      reinterpret_cast<size_t> (CORBA_ComponentIR__TAO_Container_Proxy_Broker_Factory_Initializer)
     );
 
 
@@ -1824,37 +2051,37 @@ namespace POA_CORBA
       
       virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
       {
-        TAO::SArg_Traits< CORBA::ComponentIR::ComponentDef>::ret_arg_type retval =
-          TAO::Portable_Server::get_ret_arg< CORBA::ComponentIR::ComponentDef, TAO::SArg_Traits< CORBA::ComponentIR::ComponentDef>::ret_arg_type> (
+        TAO::SArg_Traits< ::CORBA::ComponentIR::ComponentDef>::ret_arg_type retval =
+          TAO::Portable_Server::get_ret_arg< ::CORBA::ComponentIR::ComponentDef, TAO::SArg_Traits< ::CORBA::ComponentIR::ComponentDef>::ret_arg_type> (
             this->operation_details_,
             this->args_);
         
-        TAO::SArg_Traits< CORBA::RepositoryId>::in_arg_type arg_1 =
-          TAO::Portable_Server::get_in_arg< CORBA::RepositoryId, TAO::SArg_Traits< CORBA::RepositoryId>::in_arg_type> (
+        TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
+          TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId, TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type> (
             this->operation_details_,
             this->args_,
             1);
           
-        TAO::SArg_Traits< CORBA::Identifier>::in_arg_type arg_2 =
-          TAO::Portable_Server::get_in_arg< CORBA::Identifier, TAO::SArg_Traits< CORBA::Identifier>::in_arg_type> (
+        TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
+          TAO::Portable_Server::get_in_arg< ::CORBA::Identifier, TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type> (
             this->operation_details_,
             this->args_,
             2);
           
-        TAO::SArg_Traits< CORBA::VersionSpec>::in_arg_type arg_3 =
-          TAO::Portable_Server::get_in_arg< CORBA::VersionSpec, TAO::SArg_Traits< CORBA::VersionSpec>::in_arg_type> (
+        TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
+          TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec, TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type> (
             this->operation_details_,
             this->args_,
             3);
           
-        TAO::SArg_Traits< CORBA::ComponentIR::ComponentDef>::in_arg_type arg_4 =
-          TAO::Portable_Server::get_in_arg< CORBA::ComponentIR::ComponentDef, TAO::SArg_Traits< CORBA::ComponentIR::ComponentDef>::in_arg_type> (
+        TAO::SArg_Traits< ::CORBA::ComponentIR::ComponentDef>::in_arg_type arg_4 =
+          TAO::Portable_Server::get_in_arg< ::CORBA::ComponentIR::ComponentDef, TAO::SArg_Traits< ::CORBA::ComponentIR::ComponentDef>::in_arg_type> (
             this->operation_details_,
             this->args_,
             4);
           
-        TAO::SArg_Traits< CORBA::InterfaceDefSeq>::in_arg_type arg_5 =
-          TAO::Portable_Server::get_in_arg< CORBA::InterfaceDefSeq, TAO::SArg_Traits< CORBA::InterfaceDefSeq>::in_arg_type> (
+        TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_type arg_5 =
+          TAO::Portable_Server::get_in_arg< ::CORBA::InterfaceDefSeq, TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_type> (
             this->operation_details_,
             this->args_,
             5);
@@ -1899,12 +2126,12 @@ void POA_CORBA::ComponentIR::Container::create_component_skel (
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
   
-  TAO::SArg_Traits< CORBA::ComponentIR::ComponentDef>::ret_val retval;
-  TAO::SArg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id;
-  TAO::SArg_Traits< CORBA::Identifier>::in_arg_val _tao_name;
-  TAO::SArg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version;
-  TAO::SArg_Traits< CORBA::ComponentIR::ComponentDef>::in_arg_val _tao_base_component;
-  TAO::SArg_Traits< CORBA::InterfaceDefSeq>::in_arg_val _tao_supports_interfaces;
+  TAO::SArg_Traits< ::CORBA::ComponentIR::ComponentDef>::ret_val retval;
+  TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
+  TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
+  TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version;
+  TAO::SArg_Traits< ::CORBA::ComponentIR::ComponentDef>::in_arg_val _tao_base_component;
+  TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_val _tao_supports_interfaces;
   
   TAO::Argument * const args[] =
     {
@@ -1965,49 +2192,49 @@ namespace POA_CORBA
       
       virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
       {
-        TAO::SArg_Traits< CORBA::ComponentIR::HomeDef>::ret_arg_type retval =
-          TAO::Portable_Server::get_ret_arg< CORBA::ComponentIR::HomeDef, TAO::SArg_Traits< CORBA::ComponentIR::HomeDef>::ret_arg_type> (
+        TAO::SArg_Traits< ::CORBA::ComponentIR::HomeDef>::ret_arg_type retval =
+          TAO::Portable_Server::get_ret_arg< ::CORBA::ComponentIR::HomeDef, TAO::SArg_Traits< ::CORBA::ComponentIR::HomeDef>::ret_arg_type> (
             this->operation_details_,
             this->args_);
         
-        TAO::SArg_Traits< CORBA::RepositoryId>::in_arg_type arg_1 =
-          TAO::Portable_Server::get_in_arg< CORBA::RepositoryId, TAO::SArg_Traits< CORBA::RepositoryId>::in_arg_type> (
+        TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
+          TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId, TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type> (
             this->operation_details_,
             this->args_,
             1);
           
-        TAO::SArg_Traits< CORBA::Identifier>::in_arg_type arg_2 =
-          TAO::Portable_Server::get_in_arg< CORBA::Identifier, TAO::SArg_Traits< CORBA::Identifier>::in_arg_type> (
+        TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
+          TAO::Portable_Server::get_in_arg< ::CORBA::Identifier, TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type> (
             this->operation_details_,
             this->args_,
             2);
           
-        TAO::SArg_Traits< CORBA::VersionSpec>::in_arg_type arg_3 =
-          TAO::Portable_Server::get_in_arg< CORBA::VersionSpec, TAO::SArg_Traits< CORBA::VersionSpec>::in_arg_type> (
+        TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
+          TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec, TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type> (
             this->operation_details_,
             this->args_,
             3);
           
-        TAO::SArg_Traits< CORBA::ComponentIR::HomeDef>::in_arg_type arg_4 =
-          TAO::Portable_Server::get_in_arg< CORBA::ComponentIR::HomeDef, TAO::SArg_Traits< CORBA::ComponentIR::HomeDef>::in_arg_type> (
+        TAO::SArg_Traits< ::CORBA::ComponentIR::HomeDef>::in_arg_type arg_4 =
+          TAO::Portable_Server::get_in_arg< ::CORBA::ComponentIR::HomeDef, TAO::SArg_Traits< ::CORBA::ComponentIR::HomeDef>::in_arg_type> (
             this->operation_details_,
             this->args_,
             4);
           
-        TAO::SArg_Traits< CORBA::ComponentIR::ComponentDef>::in_arg_type arg_5 =
-          TAO::Portable_Server::get_in_arg< CORBA::ComponentIR::ComponentDef, TAO::SArg_Traits< CORBA::ComponentIR::ComponentDef>::in_arg_type> (
+        TAO::SArg_Traits< ::CORBA::ComponentIR::ComponentDef>::in_arg_type arg_5 =
+          TAO::Portable_Server::get_in_arg< ::CORBA::ComponentIR::ComponentDef, TAO::SArg_Traits< ::CORBA::ComponentIR::ComponentDef>::in_arg_type> (
             this->operation_details_,
             this->args_,
             5);
           
-        TAO::SArg_Traits< CORBA::InterfaceDefSeq>::in_arg_type arg_6 =
-          TAO::Portable_Server::get_in_arg< CORBA::InterfaceDefSeq, TAO::SArg_Traits< CORBA::InterfaceDefSeq>::in_arg_type> (
+        TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_type arg_6 =
+          TAO::Portable_Server::get_in_arg< ::CORBA::InterfaceDefSeq, TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_type> (
             this->operation_details_,
             this->args_,
             6);
           
-        TAO::SArg_Traits< CORBA::ValueDef>::in_arg_type arg_7 =
-          TAO::Portable_Server::get_in_arg< CORBA::ValueDef, TAO::SArg_Traits< CORBA::ValueDef>::in_arg_type> (
+        TAO::SArg_Traits< ::CORBA::ValueDef>::in_arg_type arg_7 =
+          TAO::Portable_Server::get_in_arg< ::CORBA::ValueDef, TAO::SArg_Traits< ::CORBA::ValueDef>::in_arg_type> (
             this->operation_details_,
             this->args_,
             7);
@@ -2054,14 +2281,14 @@ void POA_CORBA::ComponentIR::Container::create_home_skel (
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
   
-  TAO::SArg_Traits< CORBA::ComponentIR::HomeDef>::ret_val retval;
-  TAO::SArg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id;
-  TAO::SArg_Traits< CORBA::Identifier>::in_arg_val _tao_name;
-  TAO::SArg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version;
-  TAO::SArg_Traits< CORBA::ComponentIR::HomeDef>::in_arg_val _tao_base_home;
-  TAO::SArg_Traits< CORBA::ComponentIR::ComponentDef>::in_arg_val _tao_managed_component;
-  TAO::SArg_Traits< CORBA::InterfaceDefSeq>::in_arg_val _tao_supports_interfaces;
-  TAO::SArg_Traits< CORBA::ValueDef>::in_arg_val _tao_primary_key;
+  TAO::SArg_Traits< ::CORBA::ComponentIR::HomeDef>::ret_val retval;
+  TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
+  TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
+  TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version;
+  TAO::SArg_Traits< ::CORBA::ComponentIR::HomeDef>::in_arg_val _tao_base_home;
+  TAO::SArg_Traits< ::CORBA::ComponentIR::ComponentDef>::in_arg_val _tao_managed_component;
+  TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_val _tao_supports_interfaces;
+  TAO::SArg_Traits< ::CORBA::ValueDef>::in_arg_val _tao_primary_key;
   
   TAO::Argument * const args[] =
     {
@@ -2124,25 +2351,25 @@ namespace POA_CORBA
       
       virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
       {
-        TAO::SArg_Traits< CORBA::ComponentIR::EventDef>::ret_arg_type retval =
-          TAO::Portable_Server::get_ret_arg< CORBA::ComponentIR::EventDef, TAO::SArg_Traits< CORBA::ComponentIR::EventDef>::ret_arg_type> (
+        TAO::SArg_Traits< ::CORBA::ComponentIR::EventDef>::ret_arg_type retval =
+          TAO::Portable_Server::get_ret_arg< ::CORBA::ComponentIR::EventDef, TAO::SArg_Traits< ::CORBA::ComponentIR::EventDef>::ret_arg_type> (
             this->operation_details_,
             this->args_);
         
-        TAO::SArg_Traits< CORBA::RepositoryId>::in_arg_type arg_1 =
-          TAO::Portable_Server::get_in_arg< CORBA::RepositoryId, TAO::SArg_Traits< CORBA::RepositoryId>::in_arg_type> (
+        TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
+          TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId, TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type> (
             this->operation_details_,
             this->args_,
             1);
           
-        TAO::SArg_Traits< CORBA::Identifier>::in_arg_type arg_2 =
-          TAO::Portable_Server::get_in_arg< CORBA::Identifier, TAO::SArg_Traits< CORBA::Identifier>::in_arg_type> (
+        TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
+          TAO::Portable_Server::get_in_arg< ::CORBA::Identifier, TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type> (
             this->operation_details_,
             this->args_,
             2);
           
-        TAO::SArg_Traits< CORBA::VersionSpec>::in_arg_type arg_3 =
-          TAO::Portable_Server::get_in_arg< CORBA::VersionSpec, TAO::SArg_Traits< CORBA::VersionSpec>::in_arg_type> (
+        TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
+          TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec, TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type> (
             this->operation_details_,
             this->args_,
             3);
@@ -2159,8 +2386,8 @@ namespace POA_CORBA
             this->args_,
             5);
           
-        TAO::SArg_Traits< CORBA::ValueDef>::in_arg_type arg_6 =
-          TAO::Portable_Server::get_in_arg< CORBA::ValueDef, TAO::SArg_Traits< CORBA::ValueDef>::in_arg_type> (
+        TAO::SArg_Traits< ::CORBA::ValueDef>::in_arg_type arg_6 =
+          TAO::Portable_Server::get_in_arg< ::CORBA::ValueDef, TAO::SArg_Traits< ::CORBA::ValueDef>::in_arg_type> (
             this->operation_details_,
             this->args_,
             6);
@@ -2171,20 +2398,20 @@ namespace POA_CORBA
             this->args_,
             7);
           
-        TAO::SArg_Traits< CORBA::ValueDefSeq>::in_arg_type arg_8 =
-          TAO::Portable_Server::get_in_arg< CORBA::ValueDefSeq, TAO::SArg_Traits< CORBA::ValueDefSeq>::in_arg_type> (
+        TAO::SArg_Traits< ::CORBA::ValueDefSeq>::in_arg_type arg_8 =
+          TAO::Portable_Server::get_in_arg< ::CORBA::ValueDefSeq, TAO::SArg_Traits< ::CORBA::ValueDefSeq>::in_arg_type> (
             this->operation_details_,
             this->args_,
             8);
           
-        TAO::SArg_Traits< CORBA::InterfaceDefSeq>::in_arg_type arg_9 =
-          TAO::Portable_Server::get_in_arg< CORBA::InterfaceDefSeq, TAO::SArg_Traits< CORBA::InterfaceDefSeq>::in_arg_type> (
+        TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_type arg_9 =
+          TAO::Portable_Server::get_in_arg< ::CORBA::InterfaceDefSeq, TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_type> (
             this->operation_details_,
             this->args_,
             9);
           
-        TAO::SArg_Traits< CORBA::ExtInitializerSeq>::in_arg_type arg_10 =
-          TAO::Portable_Server::get_in_arg< CORBA::ExtInitializerSeq, TAO::SArg_Traits< CORBA::ExtInitializerSeq>::in_arg_type> (
+        TAO::SArg_Traits< ::CORBA::ExtInitializerSeq>::in_arg_type arg_10 =
+          TAO::Portable_Server::get_in_arg< ::CORBA::ExtInitializerSeq, TAO::SArg_Traits< ::CORBA::ExtInitializerSeq>::in_arg_type> (
             this->operation_details_,
             this->args_,
             10);
@@ -2234,17 +2461,17 @@ void POA_CORBA::ComponentIR::Container::create_event_skel (
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
   
-  TAO::SArg_Traits< CORBA::ComponentIR::EventDef>::ret_val retval;
-  TAO::SArg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id;
-  TAO::SArg_Traits< CORBA::Identifier>::in_arg_val _tao_name;
-  TAO::SArg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version;
+  TAO::SArg_Traits< ::CORBA::ComponentIR::EventDef>::ret_val retval;
+  TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
+  TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
+  TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version;
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_is_custom;
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_is_abstract;
-  TAO::SArg_Traits< CORBA::ValueDef>::in_arg_val _tao_base_value;
+  TAO::SArg_Traits< ::CORBA::ValueDef>::in_arg_val _tao_base_value;
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_is_truncatable;
-  TAO::SArg_Traits< CORBA::ValueDefSeq>::in_arg_val _tao_abstract_base_values;
-  TAO::SArg_Traits< CORBA::InterfaceDefSeq>::in_arg_val _tao_supported_interfaces;
-  TAO::SArg_Traits< CORBA::ExtInitializerSeq>::in_arg_val _tao_initializers;
+  TAO::SArg_Traits< ::CORBA::ValueDefSeq>::in_arg_val _tao_abstract_base_values;
+  TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_val _tao_supported_interfaces;
+  TAO::SArg_Traits< ::CORBA::ExtInitializerSeq>::in_arg_val _tao_initializers;
   
   TAO::Argument * const args[] =
     {
@@ -2319,8 +2546,8 @@ namespace POA_CORBA
             this->operation_details_,
             this->args_);
         
-        TAO::SArg_Traits< CORBA::Char *>::in_arg_type arg_1 =
-          TAO::Portable_Server::get_in_arg< CORBA::Char *, TAO::SArg_Traits< CORBA::Char *>::in_arg_type> (
+        TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
+          TAO::Portable_Server::get_in_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type> (
             this->operation_details_,
             this->args_,
             1);
@@ -2357,7 +2584,7 @@ void POA_CORBA::ComponentIR::Container::_is_a_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  TAO::SArg_Traits< CORBA::Char *>::in_arg_val _tao_repository_id;
+  TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
   
   TAO::Argument * const args[] =
     {
@@ -2482,10 +2709,102 @@ void POA_CORBA::ComponentIR::Container::_non_existent_skel (
   
 }
 
+namespace POA_CORBA
+{
+  namespace ComponentIR
+  {
+    
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/upcall_command_ss.cpp:127
+    
+    class _repository_id_Container_Upcall_Command
+      : public TAO::Upcall_Command
+    {
+    public:
+      inline _repository_id_Container_Upcall_Command (
+        POA_CORBA::ComponentIR::Container * servant,
+        TAO_Operation_Details const * operation_details,
+        TAO::Argument * const args[])
+        : servant_ (servant)
+        , operation_details_ (operation_details)
+        , args_ (args)
+      {
+      }
+      
+      virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+      {
+        TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
+          TAO::Portable_Server::get_ret_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type> (
+            this->operation_details_,
+            this->args_);
+        
+        
+        retval =
+          this->servant_-> _repository_id (
+            ACE_ENV_SINGLE_ARG_PARAMETER);
+          
+      }
+    
+    private:
+      POA_CORBA::ComponentIR::Container * const servant_;
+      TAO_Operation_Details const * const operation_details_;
+      TAO::Argument * const * const args_;
+    };
+    
+  }
+  
+}
+void POA_CORBA::ComponentIR::Container::_repository_id_skel (
+    TAO_ServerRequest & server_request, 
+    void * TAO_INTERCEPTOR (servant_upcall),
+    void * servant
+    ACE_ENV_ARG_DECL
+  )
+{
+  
+  
+#if TAO_HAS_INTERCEPTORS == 1
+  static CORBA::TypeCode_ptr const * const exceptions = 0;
+  static size_t const nexceptions = 0;
+#endif /* TAO_HAS_INTERCEPTORS */
+  
+  TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
+  
+  TAO::Argument * const args[] =
+    {
+      &retval
+    };
+  
+  static size_t const nargs = 1;
+  
+  POA_CORBA::ComponentIR::Container * const impl =
+    static_cast<POA_CORBA::ComponentIR::Container *> (servant);
+  
+  _repository_id_Container_Upcall_Command command (
+    impl,
+    server_request.operation_details (),
+    args);
+  
+  TAO::Upcall_Wrapper upcall_wrapper;
+  upcall_wrapper.upcall (server_request
+                         , args
+                         , nargs
+                         , command
+#if TAO_HAS_INTERCEPTORS == 1
+                         , servant_upcall
+                         , exceptions
+                         , nexceptions
+#endif  /* TAO_HAS_INTERCEPTORS == 1 */
+                         ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+  
+}
+
 
 
 // TAO_IDL - Generated from 
-// be\be_visitor_interface/interface_ss.cpp:393
+// be\be_visitor_interface/interface_ss.cpp:501
 
 
 
@@ -2654,7 +2973,7 @@ const char* POA_CORBA::ComponentIR::Container::_interface_repository_id (void) c
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:940
+// be\be_visitor_interface/interface_ss.cpp:862
 
 void POA_CORBA::ComponentIR::Container::_dispatch (
     TAO_ServerRequest & req,
@@ -2669,7 +2988,7 @@ void POA_CORBA::ComponentIR::Container::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:891
+// be\be_visitor_interface/interface_ss.cpp:813
 
 CORBA::ComponentIR::Container *
 POA_CORBA::ComponentIR::Container::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -2701,7 +3020,7 @@ POA_CORBA::ComponentIR::Container::_this (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1455
+// be\be_interface.cpp:1465
 
 class TAO_CORBA_ComponentIR_ModuleDef_Perfect_Hash_OpTable
   : public TAO_Perfect_Hash_OpTable
@@ -2714,7 +3033,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: c:\ace\latest\ACE_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0 -a -o -t -p -K opname -L C++ -Z TAO_CORBA_ComponentIR_ModuleDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ACE\Any\ACE_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0 -a -o -t -p -K opname -L C++ -Z TAO_CORBA_ComponentIR_ModuleDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_ComponentIR_ModuleDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -2731,13 +3050,13 @@ TAO_CORBA_ComponentIR_ModuleDef_Perfect_Hash_OpTable::hash (const char *str, uns
      58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
      58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
      58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
-     58, 58, 58, 58, 58, 58, 58, 58, 58, 10,
+     58, 58, 58, 58, 58, 58, 58, 58, 58, 25,
      58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
-     58, 58, 58, 58, 58, 58, 58, 58, 58,  0,
+     58, 58, 58, 58, 58, 58, 58, 58, 58, 10,
      58,  0,  0,  0, 58, 58, 58, 58, 58, 58,
-     58, 58, 58, 58, 58, 58, 58, 20, 10, 25,
-     58, 20, 58, 58, 58, 58, 58, 58, 58, 58,
-     58, 58, 40, 20, 58, 58, 58, 10, 20, 58,
+     58, 58, 58, 58, 58, 58, 58, 30, 15,  5,
+     58, 10, 58, 58, 58, 58, 58, 58, 58, 58,
+     58, 58, 40, 15, 58, 58, 58, 20,  0, 58,
      58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
      58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
      58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
@@ -2757,10 +3076,10 @@ TAO_CORBA_ComponentIR_ModuleDef_Perfect_Hash_OpTable::hash (const char *str, uns
      58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
      58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
      58, 58, 58, 58, 58, 58, 58, 58, 58, 58,
-     58, 58, 58, 58, 58, 10, 58,  0, 58,  0,
-      0,  0, 58, 58, 58, 58, 58, 58, 20, 10,
-     25, 58, 20, 58, 58, 40, 20, 58, 58, 58,
-     10, 20, 58, 58, 58, 58, 58, 58,
+     58, 58, 58, 58, 58, 25, 58, 10, 58,  0,
+      0,  0, 58, 58, 58, 58, 58, 58, 30, 15,
+      5, 58, 10, 58, 58, 40, 15, 58, 58, 58,
+     20,  0, 58, 58, 58, 58, 58, 58,
 #endif /* ACE_MVS */
     };
   return len + asso_values[(int) str[len - 1]] + asso_values[(int) str[0]];
@@ -2771,66 +3090,67 @@ TAO_CORBA_ComponentIR_ModuleDef_Perfect_Hash_OpTable::lookup (const char *str, u
 {
   enum
     {
-      TOTAL_KEYWORDS = 38,
+      TOTAL_KEYWORDS = 39,
       MIN_WORD_LENGTH = 4,
       MAX_WORD_LENGTH = 26,
-      MIN_HASH_VALUE = 8,
+      MIN_HASH_VALUE = 7,
       MAX_HASH_VALUE = 57,
-      HASH_VALUE_RANGE = 50,
+      HASH_VALUE_RANGE = 51,
       DUPLICATES = 6,
       WORDLIST_SIZE = 46
     };
 
   static const TAO_operation_db_entry  wordlist[] =
     {
-      {"",0,0},{"",0,0},{"",0,0},{"",0,0},{"",0,0},{"",0,0},{"",0,0},{"",0,0},
+      {"",0,0},{"",0,0},{"",0,0},{"",0,0},{"",0,0},{"",0,0},{"",0,0},
+      {"destroy", &POA_CORBA::ComponentIR::ModuleDef::destroy_skel, 0},
       {"describe", &POA_CORBA::ComponentIR::ModuleDef::describe_skel, 0},
       {"create_home", &POA_CORBA::ComponentIR::ModuleDef::create_home_skel, 0},
       {"create_value", &POA_CORBA::ComponentIR::ModuleDef::create_value_skel, 0},
       {"create_module", &POA_CORBA::ComponentIR::ModuleDef::create_module_skel, 0},
       {"create_native", &POA_CORBA::ComponentIR::ModuleDef::create_native_skel, 0},
-      {"move", &POA_CORBA::ComponentIR::ModuleDef::move_skel, 0},
-      {"_is_a", &POA_CORBA::ComponentIR::ModuleDef::_is_a_skel, 0},
       {"create_interface", &POA_CORBA::ComponentIR::ModuleDef::create_interface_skel, 0},
       {"create_ext_value", &POA_CORBA::ComponentIR::ModuleDef::create_ext_value_skel, 0},
+      {"create_union", &POA_CORBA::ComponentIR::ModuleDef::create_union_skel, 0},
+      {"move", &POA_CORBA::ComponentIR::ModuleDef::move_skel, 0},
+      {"create_exception", &POA_CORBA::ComponentIR::ModuleDef::create_exception_skel, 0},
+      {"create_local_interface", &POA_CORBA::ComponentIR::ModuleDef::create_local_interface_skel, 0},
+      {"create_abstract_interface", &POA_CORBA::ComponentIR::ModuleDef::create_abstract_interface_skel, 0},
+      {"create_enum", &POA_CORBA::ComponentIR::ModuleDef::create_enum_skel, 0},
+      {"create_event", &POA_CORBA::ComponentIR::ModuleDef::create_event_skel, 0},
+      {"create_struct", &POA_CORBA::ComponentIR::ModuleDef::create_struct_skel, 0},
+      {"create_constant", &POA_CORBA::ComponentIR::ModuleDef::create_constant_skel, 0},
+      {"create_component", &POA_CORBA::ComponentIR::ModuleDef::create_component_skel, 0},
       {"_get_id", &POA_CORBA::ComponentIR::ModuleDef::_get_id_skel, 0},
       {"_set_id", &POA_CORBA::ComponentIR::ModuleDef::_set_id_skel, 0},
       {"_get_name", &POA_CORBA::ComponentIR::ModuleDef::_get_name_skel, 0},
       {"_set_name", &POA_CORBA::ComponentIR::ModuleDef::_set_name_skel, 0},
       {"_interface", &POA_CORBA::ComponentIR::ModuleDef::_interface_skel, 0},
-      {"create_enum", &POA_CORBA::ComponentIR::ModuleDef::create_enum_skel, 0},
-      {"create_local_interface", &POA_CORBA::ComponentIR::ModuleDef::create_local_interface_skel, 0},
-      {"_get_def_kind", &POA_CORBA::ComponentIR::ModuleDef::_get_def_kind_skel, 0},
-      {"create_abstract_interface", &POA_CORBA::ComponentIR::ModuleDef::create_abstract_interface_skel, 0},
       {"create_value_box", &POA_CORBA::ComponentIR::ModuleDef::create_value_box_skel, 0},
-      {"destroy", &POA_CORBA::ComponentIR::ModuleDef::destroy_skel, 0},
-      {"_get_absolute_name", &POA_CORBA::ComponentIR::ModuleDef::_get_absolute_name_skel, 0},
+      {"_get_def_kind", &POA_CORBA::ComponentIR::ModuleDef::_get_def_kind_skel, 0},
+      {"_repository_id", &POA_CORBA::ComponentIR::ModuleDef::_repository_id_skel, 0},
+      {"_is_a", &POA_CORBA::ComponentIR::ModuleDef::_is_a_skel, 0},
       {"lookup_name", &POA_CORBA::ComponentIR::ModuleDef::lookup_name_skel, 0},
-      {"create_event", &POA_CORBA::ComponentIR::ModuleDef::create_event_skel, 0},
-      {"create_struct", &POA_CORBA::ComponentIR::ModuleDef::create_struct_skel, 0},
-      {"create_constant", &POA_CORBA::ComponentIR::ModuleDef::create_constant_skel, 0},
-      {"create_component", &POA_CORBA::ComponentIR::ModuleDef::create_component_skel, 0},
-      {"create_union", &POA_CORBA::ComponentIR::ModuleDef::create_union_skel, 0},
-      {"_component", &POA_CORBA::ComponentIR::ModuleDef::_component_skel, 0},
-      {"create_exception", &POA_CORBA::ComponentIR::ModuleDef::create_exception_skel, 0},
-      {"_non_existent", &POA_CORBA::ComponentIR::ModuleDef::_non_existent_skel, 0},
-      {"lookup", &POA_CORBA::ComponentIR::ModuleDef::lookup_skel, 0},
       {"_get_version", &POA_CORBA::ComponentIR::ModuleDef::_get_version_skel, 0},
       {"_set_version", &POA_CORBA::ComponentIR::ModuleDef::_set_version_skel, 0},
-      {"contents", &POA_CORBA::ComponentIR::ModuleDef::contents_skel, 0},
+      {"_get_absolute_name", &POA_CORBA::ComponentIR::ModuleDef::_get_absolute_name_skel, 0},
       {"_get_defined_in", &POA_CORBA::ComponentIR::ModuleDef::_get_defined_in_skel, 0},
-      {"create_alias", &POA_CORBA::ComponentIR::ModuleDef::create_alias_skel, 0},
+      {"lookup", &POA_CORBA::ComponentIR::ModuleDef::lookup_skel, 0},
+      {"contents", &POA_CORBA::ComponentIR::ModuleDef::contents_skel, 0},
+      {"_component", &POA_CORBA::ComponentIR::ModuleDef::_component_skel, 0},
       {"_get_containing_repository", &POA_CORBA::ComponentIR::ModuleDef::_get_containing_repository_skel, 0},
+      {"create_alias", &POA_CORBA::ComponentIR::ModuleDef::create_alias_skel, 0},
+      {"_non_existent", &POA_CORBA::ComponentIR::ModuleDef::_non_existent_skel, 0},
       {"describe_contents", &POA_CORBA::ComponentIR::ModuleDef::describe_contents_skel, 0},
     };
 
   static const signed char lookup[] =
     {
-       -1,  -1, -11,  -2, -15,  -2, -17,  -2,   8, -19,  -2,   9,  10, -68, 
-       13,  14, -69, -68,  -1, -67,  21,  22,  23,  24,  -1,  25,  26,  27, 
-       28,  -1,  -1,  29,  30,  31,  -1,  32,  33,  34,  -1,  -1,  35,  36, 
-       -1,  37, -39,  -2,  38, -60,  41,  -1,  42,  -1,  43,  -1,  -1,  -1, 
-       44,  45, 
+       -1,  -1,  -1, -11,  -2, -13,  -2,   7,   8, -25,  -2,   9,  10, -67, 
+      -27,  -2, -68,  15,  -1,  16,  -1,  17,  18, -35,  -2,  19,  20,  21, 
+       22,  -1,  23,  24, -80,  -1, -77,  29,  30,  -1,  31,  32,  33,  34, 
+      -76,  37,  -1,  38,  39,  -1,  40,  -1,  41,  42,  43,  44,  -1,  -1, 
+       -1,  45, 
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -2868,7 +3188,7 @@ TAO_CORBA_ComponentIR_ModuleDef_Perfect_Hash_OpTable::lookup (const char *str, u
 static TAO_CORBA_ComponentIR_ModuleDef_Perfect_Hash_OpTable tao_CORBA_ComponentIR_ModuleDef_optable;
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:999
+// be\be_visitor_interface/interface_ss.cpp:921
 
 TAO::Collocation_Proxy_Broker *
 CORBA_ComponentIR__TAO_ModuleDef_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -2888,10 +3208,7 @@ CORBA_ComponentIR__TAO_ModuleDef_Proxy_Broker_Factory_Initializer (size_t)
 static int
 CORBA_ComponentIR__TAO_ModuleDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
   CORBA_ComponentIR__TAO_ModuleDef_Proxy_Broker_Factory_Initializer (
-      reinterpret_cast<
-          size_t> (
-          CORBA_ComponentIR__TAO_ModuleDef_Proxy_Broker_Factory_Initializer
-        )
+      reinterpret_cast<size_t> (CORBA_ComponentIR__TAO_ModuleDef_Proxy_Broker_Factory_Initializer)
     );
 
 
@@ -2953,8 +3270,8 @@ namespace POA_CORBA
             this->operation_details_,
             this->args_);
         
-        TAO::SArg_Traits< CORBA::Char *>::in_arg_type arg_1 =
-          TAO::Portable_Server::get_in_arg< CORBA::Char *, TAO::SArg_Traits< CORBA::Char *>::in_arg_type> (
+        TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
+          TAO::Portable_Server::get_in_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type> (
             this->operation_details_,
             this->args_,
             1);
@@ -2991,7 +3308,7 @@ void POA_CORBA::ComponentIR::ModuleDef::_is_a_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  TAO::SArg_Traits< CORBA::Char *>::in_arg_val _tao_repository_id;
+  TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
   
   TAO::Argument * const args[] =
     {
@@ -3116,10 +3433,102 @@ void POA_CORBA::ComponentIR::ModuleDef::_non_existent_skel (
   
 }
 
+namespace POA_CORBA
+{
+  namespace ComponentIR
+  {
+    
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/upcall_command_ss.cpp:127
+    
+    class _repository_id_ModuleDef_Upcall_Command
+      : public TAO::Upcall_Command
+    {
+    public:
+      inline _repository_id_ModuleDef_Upcall_Command (
+        POA_CORBA::ComponentIR::ModuleDef * servant,
+        TAO_Operation_Details const * operation_details,
+        TAO::Argument * const args[])
+        : servant_ (servant)
+        , operation_details_ (operation_details)
+        , args_ (args)
+      {
+      }
+      
+      virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+      {
+        TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
+          TAO::Portable_Server::get_ret_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type> (
+            this->operation_details_,
+            this->args_);
+        
+        
+        retval =
+          this->servant_-> _repository_id (
+            ACE_ENV_SINGLE_ARG_PARAMETER);
+          
+      }
+    
+    private:
+      POA_CORBA::ComponentIR::ModuleDef * const servant_;
+      TAO_Operation_Details const * const operation_details_;
+      TAO::Argument * const * const args_;
+    };
+    
+  }
+  
+}
+void POA_CORBA::ComponentIR::ModuleDef::_repository_id_skel (
+    TAO_ServerRequest & server_request, 
+    void * TAO_INTERCEPTOR (servant_upcall),
+    void * servant
+    ACE_ENV_ARG_DECL
+  )
+{
+  
+  
+#if TAO_HAS_INTERCEPTORS == 1
+  static CORBA::TypeCode_ptr const * const exceptions = 0;
+  static size_t const nexceptions = 0;
+#endif /* TAO_HAS_INTERCEPTORS */
+  
+  TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
+  
+  TAO::Argument * const args[] =
+    {
+      &retval
+    };
+  
+  static size_t const nargs = 1;
+  
+  POA_CORBA::ComponentIR::ModuleDef * const impl =
+    static_cast<POA_CORBA::ComponentIR::ModuleDef *> (servant);
+  
+  _repository_id_ModuleDef_Upcall_Command command (
+    impl,
+    server_request.operation_details (),
+    args);
+  
+  TAO::Upcall_Wrapper upcall_wrapper;
+  upcall_wrapper.upcall (server_request
+                         , args
+                         , nargs
+                         , command
+#if TAO_HAS_INTERCEPTORS == 1
+                         , servant_upcall
+                         , exceptions
+                         , nexceptions
+#endif  /* TAO_HAS_INTERCEPTORS == 1 */
+                         ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+  
+}
+
 
 
 // TAO_IDL - Generated from 
-// be\be_visitor_interface/interface_ss.cpp:393
+// be\be_visitor_interface/interface_ss.cpp:501
 
 
 
@@ -3300,7 +3709,7 @@ const char* POA_CORBA::ComponentIR::ModuleDef::_interface_repository_id (void) c
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:940
+// be\be_visitor_interface/interface_ss.cpp:862
 
 void POA_CORBA::ComponentIR::ModuleDef::_dispatch (
     TAO_ServerRequest & req,
@@ -3315,7 +3724,7 @@ void POA_CORBA::ComponentIR::ModuleDef::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:891
+// be\be_visitor_interface/interface_ss.cpp:813
 
 CORBA::ComponentIR::ModuleDef *
 POA_CORBA::ComponentIR::ModuleDef::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -3347,7 +3756,7 @@ POA_CORBA::ComponentIR::ModuleDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1455
+// be\be_interface.cpp:1465
 
 class TAO_CORBA_ComponentIR_Repository_Perfect_Hash_OpTable
   : public TAO_Perfect_Hash_OpTable
@@ -3360,7 +3769,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: c:\ace\latest\ACE_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0 -a -o -t -p -K opname -L C++ -Z TAO_CORBA_ComponentIR_Repository_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ACE\Any\ACE_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0 -a -o -t -p -K opname -L C++ -Z TAO_CORBA_ComponentIR_Repository_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_ComponentIR_Repository_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -3381,8 +3790,8 @@ TAO_CORBA_ComponentIR_Repository_Perfect_Hash_OpTable::hash (const char *str, un
      78, 78, 78, 78, 78, 78, 78, 78, 78, 78,
      78, 78, 78, 78, 78, 78, 78, 78, 78,  0,
      78,  0, 15, 20, 78, 10, 78, 78, 78, 78,
-     78, 78, 78, 78, 78, 78, 78, 15,  0, 25,
-     78,  5, 78, 78, 78, 78, 78, 78, 78, 78,
+     78, 78, 78, 78, 78, 78, 78, 20,  0, 25,
+     78,  0, 78, 78, 78, 78, 78, 78, 78, 78,
      78, 78, 45,  5, 78, 78, 78,  0,  0, 78,
      78, 78, 78, 78, 78, 78, 78, 78, 78, 78,
      78, 78, 78, 78, 78, 78, 78, 78, 78, 78,
@@ -3404,8 +3813,8 @@ TAO_CORBA_ComponentIR_Repository_Perfect_Hash_OpTable::hash (const char *str, un
      78, 78, 78, 78, 78, 78, 78, 78, 78, 78,
      78, 78, 78, 78, 78, 78, 78, 78, 78, 78,
      78, 78, 78, 78, 78, 10, 78,  0, 78,  0,
-     15, 20, 78, 10, 78, 78, 78, 78, 15,  0,
-     25, 78,  5, 78, 78, 45,  5, 78, 78, 78,
+     15, 20, 78, 10, 78, 78, 78, 78, 20,  0,
+     25, 78,  0, 78, 78, 45,  5, 78, 78, 78,
       0,  0, 78, 78, 78, 78, 78, 78,
 #endif /* ACE_MVS */
     };
@@ -3417,14 +3826,14 @@ TAO_CORBA_ComponentIR_Repository_Perfect_Hash_OpTable::lookup (const char *str,
 {
   enum
     {
-      TOTAL_KEYWORDS = 35,
+      TOTAL_KEYWORDS = 36,
       MIN_WORD_LENGTH = 5,
       MAX_WORD_LENGTH = 25,
       MIN_HASH_VALUE = 11,
       MAX_HASH_VALUE = 77,
       HASH_VALUE_RANGE = 67,
       DUPLICATES = 3,
-      WORDLIST_SIZE = 46
+      WORDLIST_SIZE = 47
     };
 
   static const TAO_operation_db_entry  wordlist[] =
@@ -3455,11 +3864,12 @@ TAO_CORBA_ComponentIR_Repository_Perfect_Hash_OpTable::lookup (const char *str,
       {"create_ext_value", &POA_CORBA::ComponentIR::Repository::create_ext_value_skel, 0},
       {"create_union", &POA_CORBA::ComponentIR::Repository::create_union_skel, 0},
       {"_get_def_kind", &POA_CORBA::ComponentIR::Repository::_get_def_kind_skel, 0},
-      {"lookup_id", &POA_CORBA::ComponentIR::Repository::lookup_id_skel, 0},
+      {"_repository_id", &POA_CORBA::ComponentIR::Repository::_repository_id_skel, 0},
       {"_interface", &POA_CORBA::ComponentIR::Repository::_interface_skel, 0},
       {"create_exception", &POA_CORBA::ComponentIR::Repository::create_exception_skel, 0},
       {"create_local_interface", &POA_CORBA::ComponentIR::Repository::create_local_interface_skel, 0},
       {"get_primitive", &POA_CORBA::ComponentIR::Repository::get_primitive_skel, 0},
+      {"lookup_id", &POA_CORBA::ComponentIR::Repository::lookup_id_skel, 0},
       {"create_abstract_interface", &POA_CORBA::ComponentIR::Repository::create_abstract_interface_skel, 0},
       {"lookup_name", &POA_CORBA::ComponentIR::Repository::lookup_name_skel, 0},
       {"get_canonical_typecode", &POA_CORBA::ComponentIR::Repository::get_canonical_typecode_skel, 0},
@@ -3473,9 +3883,9 @@ TAO_CORBA_ComponentIR_Repository_Perfect_Hash_OpTable::lookup (const char *str,
        -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  11,  12, -28, 
        -2,  13,  14,  15,  16,  -1,  17,  18,  19,  20,  21,  22,  23,  24, 
        25, -31,  -2,  26,  27, -97,  -1,  30, -84,  33,  34,  35,  36,  37, 
-       38,  39,  -1,  40,  41,  -1,  -1,  -1,  -1,  -1,  42,  43,  -1,  -1, 
-       -1,  44,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1, 
-       -1,  -1,  -1,  -1,  -1,  -1,  -1,  45, 
+       38,  39,  40,  41,  -1,  -1,  -1,  -1,  -1,  42,  43,  44,  -1,  -1, 
+       -1,  45,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1, 
+       -1,  -1,  -1,  -1,  -1,  -1,  -1,  46, 
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -3513,7 +3923,7 @@ TAO_CORBA_ComponentIR_Repository_Perfect_Hash_OpTable::lookup (const char *str,
 static TAO_CORBA_ComponentIR_Repository_Perfect_Hash_OpTable tao_CORBA_ComponentIR_Repository_optable;
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:999
+// be\be_visitor_interface/interface_ss.cpp:921
 
 TAO::Collocation_Proxy_Broker *
 CORBA_ComponentIR__TAO_Repository_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -3533,10 +3943,7 @@ CORBA_ComponentIR__TAO_Repository_Proxy_Broker_Factory_Initializer (size_t)
 static int
 CORBA_ComponentIR__TAO_Repository_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
   CORBA_ComponentIR__TAO_Repository_Proxy_Broker_Factory_Initializer (
-      reinterpret_cast<
-          size_t> (
-          CORBA_ComponentIR__TAO_Repository_Proxy_Broker_Factory_Initializer
-        )
+      reinterpret_cast<size_t> (CORBA_ComponentIR__TAO_Repository_Proxy_Broker_Factory_Initializer)
     );
 
 
@@ -3597,8 +4004,8 @@ namespace POA_CORBA
             this->operation_details_,
             this->args_);
         
-        TAO::SArg_Traits< CORBA::Char *>::in_arg_type arg_1 =
-          TAO::Portable_Server::get_in_arg< CORBA::Char *, TAO::SArg_Traits< CORBA::Char *>::in_arg_type> (
+        TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
+          TAO::Portable_Server::get_in_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type> (
             this->operation_details_,
             this->args_,
             1);
@@ -3635,7 +4042,7 @@ void POA_CORBA::ComponentIR::Repository::_is_a_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  TAO::SArg_Traits< CORBA::Char *>::in_arg_val _tao_repository_id;
+  TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
   
   TAO::Argument * const args[] =
     {
@@ -3760,10 +4167,102 @@ void POA_CORBA::ComponentIR::Repository::_non_existent_skel (
   
 }
 
+namespace POA_CORBA
+{
+  namespace ComponentIR
+  {
+    
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/upcall_command_ss.cpp:127
+    
+    class _repository_id_Repository_Upcall_Command
+      : public TAO::Upcall_Command
+    {
+    public:
+      inline _repository_id_Repository_Upcall_Command (
+        POA_CORBA::ComponentIR::Repository * servant,
+        TAO_Operation_Details const * operation_details,
+        TAO::Argument * const args[])
+        : servant_ (servant)
+        , operation_details_ (operation_details)
+        , args_ (args)
+      {
+      }
+      
+      virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+      {
+        TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
+          TAO::Portable_Server::get_ret_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type> (
+            this->operation_details_,
+            this->args_);
+        
+        
+        retval =
+          this->servant_-> _repository_id (
+            ACE_ENV_SINGLE_ARG_PARAMETER);
+          
+      }
+    
+    private:
+      POA_CORBA::ComponentIR::Repository * const servant_;
+      TAO_Operation_Details const * const operation_details_;
+      TAO::Argument * const * const args_;
+    };
+    
+  }
+  
+}
+void POA_CORBA::ComponentIR::Repository::_repository_id_skel (
+    TAO_ServerRequest & server_request, 
+    void * TAO_INTERCEPTOR (servant_upcall),
+    void * servant
+    ACE_ENV_ARG_DECL
+  )
+{
+  
+  
+#if TAO_HAS_INTERCEPTORS == 1
+  static CORBA::TypeCode_ptr const * const exceptions = 0;
+  static size_t const nexceptions = 0;
+#endif /* TAO_HAS_INTERCEPTORS */
+  
+  TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
+  
+  TAO::Argument * const args[] =
+    {
+      &retval
+    };
+  
+  static size_t const nargs = 1;
+  
+  POA_CORBA::ComponentIR::Repository * const impl =
+    static_cast<POA_CORBA::ComponentIR::Repository *> (servant);
+  
+  _repository_id_Repository_Upcall_Command command (
+    impl,
+    server_request.operation_details (),
+    args);
+  
+  TAO::Upcall_Wrapper upcall_wrapper;
+  upcall_wrapper.upcall (server_request
+                         , args
+                         , nargs
+                         , command
+#if TAO_HAS_INTERCEPTORS == 1
+                         , servant_upcall
+                         , exceptions
+                         , nexceptions
+#endif  /* TAO_HAS_INTERCEPTORS == 1 */
+                         ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+  
+}
+
 
 
 // TAO_IDL - Generated from 
-// be\be_visitor_interface/interface_ss.cpp:393
+// be\be_visitor_interface/interface_ss.cpp:501
 
 
 
@@ -3940,7 +4439,7 @@ const char* POA_CORBA::ComponentIR::Repository::_interface_repository_id (void)
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:940
+// be\be_visitor_interface/interface_ss.cpp:862
 
 void POA_CORBA::ComponentIR::Repository::_dispatch (
     TAO_ServerRequest & req,
@@ -3955,7 +4454,7 @@ void POA_CORBA::ComponentIR::Repository::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:891
+// be\be_visitor_interface/interface_ss.cpp:813
 
 CORBA::ComponentIR::Repository *
 POA_CORBA::ComponentIR::Repository::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -3987,7 +4486,7 @@ POA_CORBA::ComponentIR::Repository::_this (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1455
+// be\be_interface.cpp:1465
 
 class TAO_CORBA_ComponentIR_ProvidesDef_Perfect_Hash_OpTable
   : public TAO_Perfect_Hash_OpTable
@@ -4000,7 +4499,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: c:\ace\latest\ACE_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0 -a -o -t -p -K opname -L C++ -Z TAO_CORBA_ComponentIR_ProvidesDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ACE\Any\ACE_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0 -a -o -t -p -K opname -L C++ -Z TAO_CORBA_ComponentIR_ProvidesDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_ComponentIR_ProvidesDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -4057,14 +4556,14 @@ TAO_CORBA_ComponentIR_ProvidesDef_Perfect_Hash_OpTable::lookup (const char *str,
 {
   enum
     {
-      TOTAL_KEYWORDS = 19,
+      TOTAL_KEYWORDS = 20,
       MIN_WORD_LENGTH = 4,
       MAX_WORD_LENGTH = 26,
       MIN_HASH_VALUE = 4,
       MAX_HASH_VALUE = 36,
       HASH_VALUE_RANGE = 33,
       DUPLICATES = 5,
-      WORDLIST_SIZE = 23
+      WORDLIST_SIZE = 24
     };
 
   static const TAO_operation_db_entry  wordlist[] =
@@ -4081,6 +4580,7 @@ TAO_CORBA_ComponentIR_ProvidesDef_Perfect_Hash_OpTable::lookup (const char *str,
       {"_get_version", &POA_CORBA::ComponentIR::ProvidesDef::_get_version_skel, 0},
       {"_set_version", &POA_CORBA::ComponentIR::ProvidesDef::_set_version_skel, 0},
       {"_get_def_kind", &POA_CORBA::ComponentIR::ProvidesDef::_get_def_kind_skel, 0},
+      {"_repository_id", &POA_CORBA::ComponentIR::ProvidesDef::_repository_id_skel, 0},
       {"_get_defined_in", &POA_CORBA::ComponentIR::ProvidesDef::_get_defined_in_skel, 0},
       {"destroy", &POA_CORBA::ComponentIR::ProvidesDef::destroy_skel, 0},
       {"_get_absolute_name", &POA_CORBA::ComponentIR::ProvidesDef::_get_absolute_name_skel, 0},
@@ -4093,9 +4593,9 @@ TAO_CORBA_ComponentIR_ProvidesDef_Perfect_Hash_OpTable::lookup (const char *str,
 
   static const signed char lookup[] =
     {
-      -12,  -2, -18,  -2,   4,   5,  -1,  53,   8,  48,  11,  -1, -48,  14, 
-       -1,  15,  -1,  16,  17, -53,  20,  -9,  -2,  21,  -6,  -2,  -1,  -1, 
-       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  22, 
+      -12,  -2, -19,  -2,   4,   5,  -1,  53,   8,  48,  11,  -1, -48,  14, 
+       15,  16,  -1,  17,  18, -53,  21,  -9,  -2,  22,  -6,  -2,  -1,  -1, 
+       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  23, 
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -4133,7 +4633,7 @@ TAO_CORBA_ComponentIR_ProvidesDef_Perfect_Hash_OpTable::lookup (const char *str,
 static TAO_CORBA_ComponentIR_ProvidesDef_Perfect_Hash_OpTable tao_CORBA_ComponentIR_ProvidesDef_optable;
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:999
+// be\be_visitor_interface/interface_ss.cpp:921
 
 TAO::Collocation_Proxy_Broker *
 CORBA_ComponentIR__TAO_ProvidesDef_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -4153,10 +4653,7 @@ CORBA_ComponentIR__TAO_ProvidesDef_Proxy_Broker_Factory_Initializer (size_t)
 static int
 CORBA_ComponentIR__TAO_ProvidesDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
   CORBA_ComponentIR__TAO_ProvidesDef_Proxy_Broker_Factory_Initializer (
-      reinterpret_cast<
-          size_t> (
-          CORBA_ComponentIR__TAO_ProvidesDef_Proxy_Broker_Factory_Initializer
-        )
+      reinterpret_cast<size_t> (CORBA_ComponentIR__TAO_ProvidesDef_Proxy_Broker_Factory_Initializer)
     );
 
 
@@ -4206,8 +4703,8 @@ namespace POA_CORBA
       
       virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
       {
-        TAO::SArg_Traits< CORBA::InterfaceDef>::ret_arg_type retval =
-          TAO::Portable_Server::get_ret_arg< CORBA::InterfaceDef, TAO::SArg_Traits< CORBA::InterfaceDef>::ret_arg_type> (
+        TAO::SArg_Traits< ::CORBA::InterfaceDef>::ret_arg_type retval =
+          TAO::Portable_Server::get_ret_arg< ::CORBA::InterfaceDef, TAO::SArg_Traits< ::CORBA::InterfaceDef>::ret_arg_type> (
             this->operation_details_,
             this->args_);
         
@@ -4246,7 +4743,7 @@ void POA_CORBA::ComponentIR::ProvidesDef::_get_interface_type_skel (
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
   
-  TAO::SArg_Traits< CORBA::InterfaceDef>::ret_val retval;
+  TAO::SArg_Traits< ::CORBA::InterfaceDef>::ret_val retval;
   
   TAO::Argument * const args[] =
     {
@@ -4302,8 +4799,8 @@ namespace POA_CORBA
       
       virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
       {
-        TAO::SArg_Traits< CORBA::InterfaceDef>::in_arg_type arg_1 =
-          TAO::Portable_Server::get_in_arg< CORBA::InterfaceDef, TAO::SArg_Traits< CORBA::InterfaceDef>::in_arg_type> (
+        TAO::SArg_Traits< ::CORBA::InterfaceDef>::in_arg_type arg_1 =
+          TAO::Portable_Server::get_in_arg< ::CORBA::InterfaceDef, TAO::SArg_Traits< ::CORBA::InterfaceDef>::in_arg_type> (
             this->operation_details_,
             this->args_,
             1);
@@ -4343,7 +4840,7 @@ void POA_CORBA::ComponentIR::ProvidesDef::_set_interface_type_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   TAO::SArg_Traits< void>::ret_val retval;
-  TAO::SArg_Traits< CORBA::InterfaceDef>::in_arg_val _tao_interface_type;
+  TAO::SArg_Traits< ::CORBA::InterfaceDef>::in_arg_val _tao_interface_type;
   
   TAO::Argument * const args[] =
     {
@@ -4409,8 +4906,8 @@ namespace POA_CORBA
             this->operation_details_,
             this->args_);
         
-        TAO::SArg_Traits< CORBA::Char *>::in_arg_type arg_1 =
-          TAO::Portable_Server::get_in_arg< CORBA::Char *, TAO::SArg_Traits< CORBA::Char *>::in_arg_type> (
+        TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
+          TAO::Portable_Server::get_in_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type> (
             this->operation_details_,
             this->args_,
             1);
@@ -4447,7 +4944,7 @@ void POA_CORBA::ComponentIR::ProvidesDef::_is_a_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  TAO::SArg_Traits< CORBA::Char *>::in_arg_val _tao_repository_id;
+  TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
   
   TAO::Argument * const args[] =
     {
@@ -4572,10 +5069,102 @@ void POA_CORBA::ComponentIR::ProvidesDef::_non_existent_skel (
   
 }
 
+namespace POA_CORBA
+{
+  namespace ComponentIR
+  {
+    
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/upcall_command_ss.cpp:127
+    
+    class _repository_id_ProvidesDef_Upcall_Command
+      : public TAO::Upcall_Command
+    {
+    public:
+      inline _repository_id_ProvidesDef_Upcall_Command (
+        POA_CORBA::ComponentIR::ProvidesDef * servant,
+        TAO_Operation_Details const * operation_details,
+        TAO::Argument * const args[])
+        : servant_ (servant)
+        , operation_details_ (operation_details)
+        , args_ (args)
+      {
+      }
+      
+      virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+      {
+        TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
+          TAO::Portable_Server::get_ret_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type> (
+            this->operation_details_,
+            this->args_);
+        
+        
+        retval =
+          this->servant_-> _repository_id (
+            ACE_ENV_SINGLE_ARG_PARAMETER);
+          
+      }
+    
+    private:
+      POA_CORBA::ComponentIR::ProvidesDef * const servant_;
+      TAO_Operation_Details const * const operation_details_;
+      TAO::Argument * const * const args_;
+    };
+    
+  }
+  
+}
+void POA_CORBA::ComponentIR::ProvidesDef::_repository_id_skel (
+    TAO_ServerRequest & server_request, 
+    void * TAO_INTERCEPTOR (servant_upcall),
+    void * servant
+    ACE_ENV_ARG_DECL
+  )
+{
+  
+  
+#if TAO_HAS_INTERCEPTORS == 1
+  static CORBA::TypeCode_ptr const * const exceptions = 0;
+  static size_t const nexceptions = 0;
+#endif /* TAO_HAS_INTERCEPTORS */
+  
+  TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
+  
+  TAO::Argument * const args[] =
+    {
+      &retval
+    };
+  
+  static size_t const nargs = 1;
+  
+  POA_CORBA::ComponentIR::ProvidesDef * const impl =
+    static_cast<POA_CORBA::ComponentIR::ProvidesDef *> (servant);
+  
+  _repository_id_ProvidesDef_Upcall_Command command (
+    impl,
+    server_request.operation_details (),
+    args);
+  
+  TAO::Upcall_Wrapper upcall_wrapper;
+  upcall_wrapper.upcall (server_request
+                         , args
+                         , nargs
+                         , command
+#if TAO_HAS_INTERCEPTORS == 1
+                         , servant_upcall
+                         , exceptions
+                         , nexceptions
+#endif  /* TAO_HAS_INTERCEPTORS == 1 */
+                         ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+  
+}
+
 
 
 // TAO_IDL - Generated from 
-// be\be_visitor_interface/interface_ss.cpp:393
+// be\be_visitor_interface/interface_ss.cpp:501
 
 
 
@@ -4744,7 +5333,7 @@ const char* POA_CORBA::ComponentIR::ProvidesDef::_interface_repository_id (void)
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:940
+// be\be_visitor_interface/interface_ss.cpp:862
 
 void POA_CORBA::ComponentIR::ProvidesDef::_dispatch (
     TAO_ServerRequest & req,
@@ -4759,7 +5348,7 @@ void POA_CORBA::ComponentIR::ProvidesDef::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:891
+// be\be_visitor_interface/interface_ss.cpp:813
 
 CORBA::ComponentIR::ProvidesDef *
 POA_CORBA::ComponentIR::ProvidesDef::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -4791,7 +5380,7 @@ POA_CORBA::ComponentIR::ProvidesDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1455
+// be\be_interface.cpp:1465
 
 class TAO_CORBA_ComponentIR_UsesDef_Perfect_Hash_OpTable
   : public TAO_Perfect_Hash_OpTable
@@ -4804,7 +5393,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: c:\ace\latest\ACE_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0 -a -o -t -p -K opname -L C++ -Z TAO_CORBA_ComponentIR_UsesDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ACE\Any\ACE_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0 -a -o -t -p -K opname -L C++ -Z TAO_CORBA_ComponentIR_UsesDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_ComponentIR_UsesDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -4861,14 +5450,14 @@ TAO_CORBA_ComponentIR_UsesDef_Perfect_Hash_OpTable::lookup (const char *str, uns
 {
   enum
     {
-      TOTAL_KEYWORDS = 21,
+      TOTAL_KEYWORDS = 22,
       MIN_WORD_LENGTH = 4,
       MAX_WORD_LENGTH = 26,
       MIN_HASH_VALUE = 4,
       MAX_HASH_VALUE = 36,
       HASH_VALUE_RANGE = 33,
       DUPLICATES = 6,
-      WORDLIST_SIZE = 25
+      WORDLIST_SIZE = 26
     };
 
   static const TAO_operation_db_entry  wordlist[] =
@@ -4885,6 +5474,7 @@ TAO_CORBA_ComponentIR_UsesDef_Perfect_Hash_OpTable::lookup (const char *str, uns
       {"_get_version", &POA_CORBA::ComponentIR::UsesDef::_get_version_skel, 0},
       {"_set_version", &POA_CORBA::ComponentIR::UsesDef::_set_version_skel, 0},
       {"_get_def_kind", &POA_CORBA::ComponentIR::UsesDef::_get_def_kind_skel, 0},
+      {"_repository_id", &POA_CORBA::ComponentIR::UsesDef::_repository_id_skel, 0},
       {"_get_defined_in", &POA_CORBA::ComponentIR::UsesDef::_get_defined_in_skel, 0},
       {"_get_is_multiple", &POA_CORBA::ComponentIR::UsesDef::_get_is_multiple_skel, 0},
       {"_set_is_multiple", &POA_CORBA::ComponentIR::UsesDef::_set_is_multiple_skel, 0},
@@ -4899,9 +5489,9 @@ TAO_CORBA_ComponentIR_UsesDef_Perfect_Hash_OpTable::lookup (const char *str, uns
 
   static const signed char lookup[] =
     {
-      -16,  -2, -20,  -2,   4,   5,  -1,  55,   8,  51,  11,  -1,  45,  14, 
-       -1,  15, -52,  18,  19, -53,  22, -12,  -2,  23,  -9,  -2,  -6,  -2, 
-       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  24, 
+      -17,  -2, -21,  -2,   4,   5,  -1,  55,   8,  51,  11,  -1,  45,  14, 
+       15,  16, -52,  19,  20, -53,  23, -12,  -2,  24,  -9,  -2,  -6,  -2, 
+       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  25, 
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -4939,7 +5529,7 @@ TAO_CORBA_ComponentIR_UsesDef_Perfect_Hash_OpTable::lookup (const char *str, uns
 static TAO_CORBA_ComponentIR_UsesDef_Perfect_Hash_OpTable tao_CORBA_ComponentIR_UsesDef_optable;
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:999
+// be\be_visitor_interface/interface_ss.cpp:921
 
 TAO::Collocation_Proxy_Broker *
 CORBA_ComponentIR__TAO_UsesDef_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -4959,10 +5549,7 @@ CORBA_ComponentIR__TAO_UsesDef_Proxy_Broker_Factory_Initializer (size_t)
 static int
 CORBA_ComponentIR__TAO_UsesDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
   CORBA_ComponentIR__TAO_UsesDef_Proxy_Broker_Factory_Initializer (
-      reinterpret_cast<
-          size_t> (
-          CORBA_ComponentIR__TAO_UsesDef_Proxy_Broker_Factory_Initializer
-        )
+      reinterpret_cast<size_t> (CORBA_ComponentIR__TAO_UsesDef_Proxy_Broker_Factory_Initializer)
     );
 
 
@@ -5012,8 +5599,8 @@ namespace POA_CORBA
       
       virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
       {
-        TAO::SArg_Traits< CORBA::InterfaceDef>::ret_arg_type retval =
-          TAO::Portable_Server::get_ret_arg< CORBA::InterfaceDef, TAO::SArg_Traits< CORBA::InterfaceDef>::ret_arg_type> (
+        TAO::SArg_Traits< ::CORBA::InterfaceDef>::ret_arg_type retval =
+          TAO::Portable_Server::get_ret_arg< ::CORBA::InterfaceDef, TAO::SArg_Traits< ::CORBA::InterfaceDef>::ret_arg_type> (
             this->operation_details_,
             this->args_);
         
@@ -5052,7 +5639,7 @@ void POA_CORBA::ComponentIR::UsesDef::_get_interface_type_skel (
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
   
-  TAO::SArg_Traits< CORBA::InterfaceDef>::ret_val retval;
+  TAO::SArg_Traits< ::CORBA::InterfaceDef>::ret_val retval;
   
   TAO::Argument * const args[] =
     {
@@ -5108,8 +5695,8 @@ namespace POA_CORBA
       
       virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
       {
-        TAO::SArg_Traits< CORBA::InterfaceDef>::in_arg_type arg_1 =
-          TAO::Portable_Server::get_in_arg< CORBA::InterfaceDef, TAO::SArg_Traits< CORBA::InterfaceDef>::in_arg_type> (
+        TAO::SArg_Traits< ::CORBA::InterfaceDef>::in_arg_type arg_1 =
+          TAO::Portable_Server::get_in_arg< ::CORBA::InterfaceDef, TAO::SArg_Traits< ::CORBA::InterfaceDef>::in_arg_type> (
             this->operation_details_,
             this->args_,
             1);
@@ -5149,7 +5736,7 @@ void POA_CORBA::ComponentIR::UsesDef::_set_interface_type_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   TAO::SArg_Traits< void>::ret_val retval;
-  TAO::SArg_Traits< CORBA::InterfaceDef>::in_arg_val _tao_interface_type;
+  TAO::SArg_Traits< ::CORBA::InterfaceDef>::in_arg_val _tao_interface_type;
   
   TAO::Argument * const args[] =
     {
@@ -5409,8 +5996,8 @@ namespace POA_CORBA
             this->operation_details_,
             this->args_);
         
-        TAO::SArg_Traits< CORBA::Char *>::in_arg_type arg_1 =
-          TAO::Portable_Server::get_in_arg< CORBA::Char *, TAO::SArg_Traits< CORBA::Char *>::in_arg_type> (
+        TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
+          TAO::Portable_Server::get_in_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type> (
             this->operation_details_,
             this->args_,
             1);
@@ -5447,7 +6034,7 @@ void POA_CORBA::ComponentIR::UsesDef::_is_a_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  TAO::SArg_Traits< CORBA::Char *>::in_arg_val _tao_repository_id;
+  TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
   
   TAO::Argument * const args[] =
     {
@@ -5572,10 +6159,102 @@ void POA_CORBA::ComponentIR::UsesDef::_non_existent_skel (
   
 }
 
+namespace POA_CORBA
+{
+  namespace ComponentIR
+  {
+    
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/upcall_command_ss.cpp:127
+    
+    class _repository_id_UsesDef_Upcall_Command
+      : public TAO::Upcall_Command
+    {
+    public:
+      inline _repository_id_UsesDef_Upcall_Command (
+        POA_CORBA::ComponentIR::UsesDef * servant,
+        TAO_Operation_Details const * operation_details,
+        TAO::Argument * const args[])
+        : servant_ (servant)
+        , operation_details_ (operation_details)
+        , args_ (args)
+      {
+      }
+      
+      virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+      {
+        TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
+          TAO::Portable_Server::get_ret_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type> (
+            this->operation_details_,
+            this->args_);
+        
+        
+        retval =
+          this->servant_-> _repository_id (
+            ACE_ENV_SINGLE_ARG_PARAMETER);
+          
+      }
+    
+    private:
+      POA_CORBA::ComponentIR::UsesDef * const servant_;
+      TAO_Operation_Details const * const operation_details_;
+      TAO::Argument * const * const args_;
+    };
+    
+  }
+  
+}
+void POA_CORBA::ComponentIR::UsesDef::_repository_id_skel (
+    TAO_ServerRequest & server_request, 
+    void * TAO_INTERCEPTOR (servant_upcall),
+    void * servant
+    ACE_ENV_ARG_DECL
+  )
+{
+  
+  
+#if TAO_HAS_INTERCEPTORS == 1
+  static CORBA::TypeCode_ptr const * const exceptions = 0;
+  static size_t const nexceptions = 0;
+#endif /* TAO_HAS_INTERCEPTORS */
+  
+  TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
+  
+  TAO::Argument * const args[] =
+    {
+      &retval
+    };
+  
+  static size_t const nargs = 1;
+  
+  POA_CORBA::ComponentIR::UsesDef * const impl =
+    static_cast<POA_CORBA::ComponentIR::UsesDef *> (servant);
+  
+  _repository_id_UsesDef_Upcall_Command command (
+    impl,
+    server_request.operation_details (),
+    args);
+  
+  TAO::Upcall_Wrapper upcall_wrapper;
+  upcall_wrapper.upcall (server_request
+                         , args
+                         , nargs
+                         , command
+#if TAO_HAS_INTERCEPTORS == 1
+                         , servant_upcall
+                         , exceptions
+                         , nexceptions
+#endif  /* TAO_HAS_INTERCEPTORS == 1 */
+                         ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+  
+}
+
 
 
 // TAO_IDL - Generated from 
-// be\be_visitor_interface/interface_ss.cpp:393
+// be\be_visitor_interface/interface_ss.cpp:501
 
 
 
@@ -5744,7 +6423,7 @@ const char* POA_CORBA::ComponentIR::UsesDef::_interface_repository_id (void) con
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:940
+// be\be_visitor_interface/interface_ss.cpp:862
 
 void POA_CORBA::ComponentIR::UsesDef::_dispatch (
     TAO_ServerRequest & req,
@@ -5759,7 +6438,7 @@ void POA_CORBA::ComponentIR::UsesDef::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:891
+// be\be_visitor_interface/interface_ss.cpp:813
 
 CORBA::ComponentIR::UsesDef *
 POA_CORBA::ComponentIR::UsesDef::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -5791,7 +6470,7 @@ POA_CORBA::ComponentIR::UsesDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1455
+// be\be_interface.cpp:1465
 
 class TAO_CORBA_ComponentIR_EventPortDef_Perfect_Hash_OpTable
   : public TAO_Perfect_Hash_OpTable
@@ -5804,7 +6483,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: c:\ace\latest\ACE_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0 -a -o -t -p -K opname -L C++ -Z TAO_CORBA_ComponentIR_EventPortDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ACE\Any\ACE_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0 -a -o -t -p -K opname -L C++ -Z TAO_CORBA_ComponentIR_EventPortDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_ComponentIR_EventPortDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -5824,7 +6503,7 @@ TAO_CORBA_ComponentIR_EventPortDef_Perfect_Hash_OpTable::hash (const char *str,
      37, 37, 37, 37, 37, 37, 37, 37, 37,  0,
      37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
      37, 37, 37, 37, 37, 37, 37, 37, 37,  0,
-     37, 37,  0,  0, 37, 37, 37, 10, 37, 37,
+     37, 37,  0,  0, 37, 37, 37, 15, 37, 37,
      37, 37, 37, 37, 37, 37, 37, 37,  0,  0,
      37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
      37, 37, 37, 10, 37, 37, 37, 37, 10, 37,
@@ -5848,7 +6527,7 @@ TAO_CORBA_ComponentIR_EventPortDef_Perfect_Hash_OpTable::hash (const char *str,
      37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
      37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
      37, 37, 37, 37, 37,  0, 37,  0, 37, 37,
-      0,  0, 37, 37, 37, 10, 37, 37, 37,  0,
+      0,  0, 37, 37, 37, 15, 37, 37, 37,  0,
       0, 37, 37, 37, 37, 37, 10, 37, 37, 37,
      37, 10, 37, 37, 37, 37, 37, 37,
 #endif /* ACE_MVS */
@@ -5861,14 +6540,14 @@ TAO_CORBA_ComponentIR_EventPortDef_Perfect_Hash_OpTable::lookup (const char *str
 {
   enum
     {
-      TOTAL_KEYWORDS = 20,
+      TOTAL_KEYWORDS = 21,
       MIN_WORD_LENGTH = 4,
       MAX_WORD_LENGTH = 26,
       MIN_HASH_VALUE = 4,
       MAX_HASH_VALUE = 36,
       HASH_VALUE_RANGE = 33,
       DUPLICATES = 6,
-      WORDLIST_SIZE = 24
+      WORDLIST_SIZE = 25
     };
 
   static const TAO_operation_db_entry  wordlist[] =
@@ -5885,10 +6564,11 @@ TAO_CORBA_ComponentIR_EventPortDef_Perfect_Hash_OpTable::lookup (const char *str
       {"_get_version", &POA_CORBA::ComponentIR::EventPortDef::_get_version_skel, 0},
       {"_set_version", &POA_CORBA::ComponentIR::EventPortDef::_set_version_skel, 0},
       {"_get_def_kind", &POA_CORBA::ComponentIR::EventPortDef::_get_def_kind_skel, 0},
-      {"is_a", &POA_CORBA::ComponentIR::EventPortDef::is_a_skel, 0},
+      {"_repository_id", &POA_CORBA::ComponentIR::EventPortDef::_repository_id_skel, 0},
       {"_get_defined_in", &POA_CORBA::ComponentIR::EventPortDef::_get_defined_in_skel, 0},
       {"destroy", &POA_CORBA::ComponentIR::EventPortDef::destroy_skel, 0},
       {"_get_absolute_name", &POA_CORBA::ComponentIR::EventPortDef::_get_absolute_name_skel, 0},
+      {"is_a", &POA_CORBA::ComponentIR::EventPortDef::is_a_skel, 0},
       {"_get_event", &POA_CORBA::ComponentIR::EventPortDef::_get_event_skel, 0},
       {"_component", &POA_CORBA::ComponentIR::EventPortDef::_component_skel, 0},
       {"_set_event", &POA_CORBA::ComponentIR::EventPortDef::_set_event_skel, 0},
@@ -5898,9 +6578,9 @@ TAO_CORBA_ComponentIR_EventPortDef_Perfect_Hash_OpTable::lookup (const char *str
 
   static const signed char lookup[] =
     {
-      -12,  -2, -19,  -3,   4,   5,  -1,  53,   8,  48,  11,  -1, -48,  14, 
-       15,  16,  -1,  17,  18,  -1, -54,  -9,  -2,  22,  -6,  -2,  -1,  -1, 
-       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  23, 
+      -12,  -2, -20,  -3,   4,   5,  -1,  53,   8,  48,  11,  -1, -48,  14, 
+       15,  16,  -1,  17,  18,  19, -54,  -9,  -2,  23,  -6,  -2,  -1,  -1, 
+       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  24, 
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -5938,7 +6618,7 @@ TAO_CORBA_ComponentIR_EventPortDef_Perfect_Hash_OpTable::lookup (const char *str
 static TAO_CORBA_ComponentIR_EventPortDef_Perfect_Hash_OpTable tao_CORBA_ComponentIR_EventPortDef_optable;
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:999
+// be\be_visitor_interface/interface_ss.cpp:921
 
 TAO::Collocation_Proxy_Broker *
 CORBA_ComponentIR__TAO_EventPortDef_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -5958,10 +6638,7 @@ CORBA_ComponentIR__TAO_EventPortDef_Proxy_Broker_Factory_Initializer (size_t)
 static int
 CORBA_ComponentIR__TAO_EventPortDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
   CORBA_ComponentIR__TAO_EventPortDef_Proxy_Broker_Factory_Initializer (
-      reinterpret_cast<
-          size_t> (
-          CORBA_ComponentIR__TAO_EventPortDef_Proxy_Broker_Factory_Initializer
-        )
+      reinterpret_cast<size_t> (CORBA_ComponentIR__TAO_EventPortDef_Proxy_Broker_Factory_Initializer)
     );
 
 
@@ -6011,8 +6688,8 @@ namespace POA_CORBA
       
       virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
       {
-        TAO::SArg_Traits< CORBA::ComponentIR::EventDef>::ret_arg_type retval =
-          TAO::Portable_Server::get_ret_arg< CORBA::ComponentIR::EventDef, TAO::SArg_Traits< CORBA::ComponentIR::EventDef>::ret_arg_type> (
+        TAO::SArg_Traits< ::CORBA::ComponentIR::EventDef>::ret_arg_type retval =
+          TAO::Portable_Server::get_ret_arg< ::CORBA::ComponentIR::EventDef, TAO::SArg_Traits< ::CORBA::ComponentIR::EventDef>::ret_arg_type> (
             this->operation_details_,
             this->args_);
         
@@ -6051,7 +6728,7 @@ void POA_CORBA::ComponentIR::EventPortDef::_get_event_skel (
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
   
-  TAO::SArg_Traits< CORBA::ComponentIR::EventDef>::ret_val retval;
+  TAO::SArg_Traits< ::CORBA::ComponentIR::EventDef>::ret_val retval;
   
   TAO::Argument * const args[] =
     {
@@ -6107,8 +6784,8 @@ namespace POA_CORBA
       
       virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
       {
-        TAO::SArg_Traits< CORBA::ComponentIR::EventDef>::in_arg_type arg_1 =
-          TAO::Portable_Server::get_in_arg< CORBA::ComponentIR::EventDef, TAO::SArg_Traits< CORBA::ComponentIR::EventDef>::in_arg_type> (
+        TAO::SArg_Traits< ::CORBA::ComponentIR::EventDef>::in_arg_type arg_1 =
+          TAO::Portable_Server::get_in_arg< ::CORBA::ComponentIR::EventDef, TAO::SArg_Traits< ::CORBA::ComponentIR::EventDef>::in_arg_type> (
             this->operation_details_,
             this->args_,
             1);
@@ -6148,7 +6825,7 @@ void POA_CORBA::ComponentIR::EventPortDef::_set_event_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   TAO::SArg_Traits< void>::ret_val retval;
-  TAO::SArg_Traits< CORBA::ComponentIR::EventDef>::in_arg_val _tao_event;
+  TAO::SArg_Traits< ::CORBA::ComponentIR::EventDef>::in_arg_val _tao_event;
   
   TAO::Argument * const args[] =
     {
@@ -6210,8 +6887,8 @@ namespace POA_CORBA
             this->operation_details_,
             this->args_);
         
-        TAO::SArg_Traits< CORBA::RepositoryId>::in_arg_type arg_1 =
-          TAO::Portable_Server::get_in_arg< CORBA::RepositoryId, TAO::SArg_Traits< CORBA::RepositoryId>::in_arg_type> (
+        TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
+          TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId, TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type> (
             this->operation_details_,
             this->args_,
             1);
@@ -6253,7 +6930,7 @@ void POA_CORBA::ComponentIR::EventPortDef::is_a_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  TAO::SArg_Traits< CORBA::RepositoryId>::in_arg_val _tao_event_id;
+  TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_event_id;
   
   TAO::Argument * const args[] =
     {
@@ -6319,8 +6996,8 @@ namespace POA_CORBA
             this->operation_details_,
             this->args_);
         
-        TAO::SArg_Traits< CORBA::Char *>::in_arg_type arg_1 =
-          TAO::Portable_Server::get_in_arg< CORBA::Char *, TAO::SArg_Traits< CORBA::Char *>::in_arg_type> (
+        TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
+          TAO::Portable_Server::get_in_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type> (
             this->operation_details_,
             this->args_,
             1);
@@ -6357,7 +7034,7 @@ void POA_CORBA::ComponentIR::EventPortDef::_is_a_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  TAO::SArg_Traits< CORBA::Char *>::in_arg_val _tao_repository_id;
+  TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
   
   TAO::Argument * const args[] =
     {
@@ -6482,10 +7159,102 @@ void POA_CORBA::ComponentIR::EventPortDef::_non_existent_skel (
   
 }
 
+namespace POA_CORBA
+{
+  namespace ComponentIR
+  {
+    
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/upcall_command_ss.cpp:127
+    
+    class _repository_id_EventPortDef_Upcall_Command
+      : public TAO::Upcall_Command
+    {
+    public:
+      inline _repository_id_EventPortDef_Upcall_Command (
+        POA_CORBA::ComponentIR::EventPortDef * servant,
+        TAO_Operation_Details const * operation_details,
+        TAO::Argument * const args[])
+        : servant_ (servant)
+        , operation_details_ (operation_details)
+        , args_ (args)
+      {
+      }
+      
+      virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+      {
+        TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
+          TAO::Portable_Server::get_ret_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type> (
+            this->operation_details_,
+            this->args_);
+        
+        
+        retval =
+          this->servant_-> _repository_id (
+            ACE_ENV_SINGLE_ARG_PARAMETER);
+          
+      }
+    
+    private:
+      POA_CORBA::ComponentIR::EventPortDef * const servant_;
+      TAO_Operation_Details const * const operation_details_;
+      TAO::Argument * const * const args_;
+    };
+    
+  }
+  
+}
+void POA_CORBA::ComponentIR::EventPortDef::_repository_id_skel (
+    TAO_ServerRequest & server_request, 
+    void * TAO_INTERCEPTOR (servant_upcall),
+    void * servant
+    ACE_ENV_ARG_DECL
+  )
+{
+  
+  
+#if TAO_HAS_INTERCEPTORS == 1
+  static CORBA::TypeCode_ptr const * const exceptions = 0;
+  static size_t const nexceptions = 0;
+#endif /* TAO_HAS_INTERCEPTORS */
+  
+  TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
+  
+  TAO::Argument * const args[] =
+    {
+      &retval
+    };
+  
+  static size_t const nargs = 1;
+  
+  POA_CORBA::ComponentIR::EventPortDef * const impl =
+    static_cast<POA_CORBA::ComponentIR::EventPortDef *> (servant);
+  
+  _repository_id_EventPortDef_Upcall_Command command (
+    impl,
+    server_request.operation_details (),
+    args);
+  
+  TAO::Upcall_Wrapper upcall_wrapper;
+  upcall_wrapper.upcall (server_request
+                         , args
+                         , nargs
+                         , command
+#if TAO_HAS_INTERCEPTORS == 1
+                         , servant_upcall
+                         , exceptions
+                         , nexceptions
+#endif  /* TAO_HAS_INTERCEPTORS == 1 */
+                         ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+  
+}
+
 
 
 // TAO_IDL - Generated from 
-// be\be_visitor_interface/interface_ss.cpp:393
+// be\be_visitor_interface/interface_ss.cpp:501
 
 
 
@@ -6654,7 +7423,7 @@ const char* POA_CORBA::ComponentIR::EventPortDef::_interface_repository_id (void
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:940
+// be\be_visitor_interface/interface_ss.cpp:862
 
 void POA_CORBA::ComponentIR::EventPortDef::_dispatch (
     TAO_ServerRequest & req,
@@ -6669,7 +7438,7 @@ void POA_CORBA::ComponentIR::EventPortDef::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:891
+// be\be_visitor_interface/interface_ss.cpp:813
 
 CORBA::ComponentIR::EventPortDef *
 POA_CORBA::ComponentIR::EventPortDef::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -6701,7 +7470,7 @@ POA_CORBA::ComponentIR::EventPortDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1455
+// be\be_interface.cpp:1465
 
 class TAO_CORBA_ComponentIR_EmitsDef_Perfect_Hash_OpTable
   : public TAO_Perfect_Hash_OpTable
@@ -6714,7 +7483,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: c:\ace\latest\ACE_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0 -a -o -t -p -K opname -L C++ -Z TAO_CORBA_ComponentIR_EmitsDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ACE\Any\ACE_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0 -a -o -t -p -K opname -L C++ -Z TAO_CORBA_ComponentIR_EmitsDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_ComponentIR_EmitsDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -6734,7 +7503,7 @@ TAO_CORBA_ComponentIR_EmitsDef_Perfect_Hash_OpTable::hash (const char *str, unsi
      37, 37, 37, 37, 37, 37, 37, 37, 37,  0,
      37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
      37, 37, 37, 37, 37, 37, 37, 37, 37,  0,
-     37, 37,  0,  0, 37, 37, 37, 10, 37, 37,
+     37, 37,  0,  0, 37, 37, 37, 15, 37, 37,
      37, 37, 37, 37, 37, 37, 37, 37,  0,  0,
      37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
      37, 37, 37, 10, 37, 37, 37, 37, 10, 37,
@@ -6758,7 +7527,7 @@ TAO_CORBA_ComponentIR_EmitsDef_Perfect_Hash_OpTable::hash (const char *str, unsi
      37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
      37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
      37, 37, 37, 37, 37,  0, 37,  0, 37, 37,
-      0,  0, 37, 37, 37, 10, 37, 37, 37,  0,
+      0,  0, 37, 37, 37, 15, 37, 37, 37,  0,
       0, 37, 37, 37, 37, 37, 10, 37, 37, 37,
      37, 10, 37, 37, 37, 37, 37, 37,
 #endif /* ACE_MVS */
@@ -6771,14 +7540,14 @@ TAO_CORBA_ComponentIR_EmitsDef_Perfect_Hash_OpTable::lookup (const char *str, un
 {
   enum
     {
-      TOTAL_KEYWORDS = 20,
+      TOTAL_KEYWORDS = 21,
       MIN_WORD_LENGTH = 4,
       MAX_WORD_LENGTH = 26,
       MIN_HASH_VALUE = 4,
       MAX_HASH_VALUE = 36,
       HASH_VALUE_RANGE = 33,
       DUPLICATES = 6,
-      WORDLIST_SIZE = 24
+      WORDLIST_SIZE = 25
     };
 
   static const TAO_operation_db_entry  wordlist[] =
@@ -6795,10 +7564,11 @@ TAO_CORBA_ComponentIR_EmitsDef_Perfect_Hash_OpTable::lookup (const char *str, un
       {"_get_version", &POA_CORBA::ComponentIR::EmitsDef::_get_version_skel, 0},
       {"_set_version", &POA_CORBA::ComponentIR::EmitsDef::_set_version_skel, 0},
       {"_get_def_kind", &POA_CORBA::ComponentIR::EmitsDef::_get_def_kind_skel, 0},
-      {"is_a", &POA_CORBA::ComponentIR::EmitsDef::is_a_skel, 0},
+      {"_repository_id", &POA_CORBA::ComponentIR::EmitsDef::_repository_id_skel, 0},
       {"_get_defined_in", &POA_CORBA::ComponentIR::EmitsDef::_get_defined_in_skel, 0},
       {"destroy", &POA_CORBA::ComponentIR::EmitsDef::destroy_skel, 0},
       {"_get_absolute_name", &POA_CORBA::ComponentIR::EmitsDef::_get_absolute_name_skel, 0},
+      {"is_a", &POA_CORBA::ComponentIR::EmitsDef::is_a_skel, 0},
       {"_get_event", &POA_CORBA::ComponentIR::EmitsDef::_get_event_skel, 0},
       {"_component", &POA_CORBA::ComponentIR::EmitsDef::_component_skel, 0},
       {"_set_event", &POA_CORBA::ComponentIR::EmitsDef::_set_event_skel, 0},
@@ -6808,9 +7578,9 @@ TAO_CORBA_ComponentIR_EmitsDef_Perfect_Hash_OpTable::lookup (const char *str, un
 
   static const signed char lookup[] =
     {
-      -12,  -2, -19,  -3,   4,   5,  -1,  53,   8,  48,  11,  -1, -48,  14, 
-       15,  16,  -1,  17,  18,  -1, -54,  -9,  -2,  22,  -6,  -2,  -1,  -1, 
-       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  23, 
+      -12,  -2, -20,  -3,   4,   5,  -1,  53,   8,  48,  11,  -1, -48,  14, 
+       15,  16,  -1,  17,  18,  19, -54,  -9,  -2,  23,  -6,  -2,  -1,  -1, 
+       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  24, 
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -6848,7 +7618,7 @@ TAO_CORBA_ComponentIR_EmitsDef_Perfect_Hash_OpTable::lookup (const char *str, un
 static TAO_CORBA_ComponentIR_EmitsDef_Perfect_Hash_OpTable tao_CORBA_ComponentIR_EmitsDef_optable;
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:999
+// be\be_visitor_interface/interface_ss.cpp:921
 
 TAO::Collocation_Proxy_Broker *
 CORBA_ComponentIR__TAO_EmitsDef_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -6868,10 +7638,7 @@ CORBA_ComponentIR__TAO_EmitsDef_Proxy_Broker_Factory_Initializer (size_t)
 static int
 CORBA_ComponentIR__TAO_EmitsDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
   CORBA_ComponentIR__TAO_EmitsDef_Proxy_Broker_Factory_Initializer (
-      reinterpret_cast<
-          size_t> (
-          CORBA_ComponentIR__TAO_EmitsDef_Proxy_Broker_Factory_Initializer
-        )
+      reinterpret_cast<size_t> (CORBA_ComponentIR__TAO_EmitsDef_Proxy_Broker_Factory_Initializer)
     );
 
 
@@ -6931,8 +7698,8 @@ namespace POA_CORBA
             this->operation_details_,
             this->args_);
         
-        TAO::SArg_Traits< CORBA::Char *>::in_arg_type arg_1 =
-          TAO::Portable_Server::get_in_arg< CORBA::Char *, TAO::SArg_Traits< CORBA::Char *>::in_arg_type> (
+        TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
+          TAO::Portable_Server::get_in_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type> (
             this->operation_details_,
             this->args_,
             1);
@@ -6969,7 +7736,7 @@ void POA_CORBA::ComponentIR::EmitsDef::_is_a_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  TAO::SArg_Traits< CORBA::Char *>::in_arg_val _tao_repository_id;
+  TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
   
   TAO::Argument * const args[] =
     {
@@ -7094,10 +7861,102 @@ void POA_CORBA::ComponentIR::EmitsDef::_non_existent_skel (
   
 }
 
+namespace POA_CORBA
+{
+  namespace ComponentIR
+  {
+    
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/upcall_command_ss.cpp:127
+    
+    class _repository_id_EmitsDef_Upcall_Command
+      : public TAO::Upcall_Command
+    {
+    public:
+      inline _repository_id_EmitsDef_Upcall_Command (
+        POA_CORBA::ComponentIR::EmitsDef * servant,
+        TAO_Operation_Details const * operation_details,
+        TAO::Argument * const args[])
+        : servant_ (servant)
+        , operation_details_ (operation_details)
+        , args_ (args)
+      {
+      }
+      
+      virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+      {
+        TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
+          TAO::Portable_Server::get_ret_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type> (
+            this->operation_details_,
+            this->args_);
+        
+        
+        retval =
+          this->servant_-> _repository_id (
+            ACE_ENV_SINGLE_ARG_PARAMETER);
+          
+      }
+    
+    private:
+      POA_CORBA::ComponentIR::EmitsDef * const servant_;
+      TAO_Operation_Details const * const operation_details_;
+      TAO::Argument * const * const args_;
+    };
+    
+  }
+  
+}
+void POA_CORBA::ComponentIR::EmitsDef::_repository_id_skel (
+    TAO_ServerRequest & server_request, 
+    void * TAO_INTERCEPTOR (servant_upcall),
+    void * servant
+    ACE_ENV_ARG_DECL
+  )
+{
+  
+  
+#if TAO_HAS_INTERCEPTORS == 1
+  static CORBA::TypeCode_ptr const * const exceptions = 0;
+  static size_t const nexceptions = 0;
+#endif /* TAO_HAS_INTERCEPTORS */
+  
+  TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
+  
+  TAO::Argument * const args[] =
+    {
+      &retval
+    };
+  
+  static size_t const nargs = 1;
+  
+  POA_CORBA::ComponentIR::EmitsDef * const impl =
+    static_cast<POA_CORBA::ComponentIR::EmitsDef *> (servant);
+  
+  _repository_id_EmitsDef_Upcall_Command command (
+    impl,
+    server_request.operation_details (),
+    args);
+  
+  TAO::Upcall_Wrapper upcall_wrapper;
+  upcall_wrapper.upcall (server_request
+                         , args
+                         , nargs
+                         , command
+#if TAO_HAS_INTERCEPTORS == 1
+                         , servant_upcall
+                         , exceptions
+                         , nexceptions
+#endif  /* TAO_HAS_INTERCEPTORS == 1 */
+                         ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+  
+}
+
 
 
 // TAO_IDL - Generated from 
-// be\be_visitor_interface/interface_ss.cpp:393
+// be\be_visitor_interface/interface_ss.cpp:501
 
 
 
@@ -7270,7 +8129,7 @@ const char* POA_CORBA::ComponentIR::EmitsDef::_interface_repository_id (void) co
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:940
+// be\be_visitor_interface/interface_ss.cpp:862
 
 void POA_CORBA::ComponentIR::EmitsDef::_dispatch (
     TAO_ServerRequest & req,
@@ -7285,7 +8144,7 @@ void POA_CORBA::ComponentIR::EmitsDef::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:891
+// be\be_visitor_interface/interface_ss.cpp:813
 
 CORBA::ComponentIR::EmitsDef *
 POA_CORBA::ComponentIR::EmitsDef::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -7317,7 +8176,7 @@ POA_CORBA::ComponentIR::EmitsDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1455
+// be\be_interface.cpp:1465
 
 class TAO_CORBA_ComponentIR_PublishesDef_Perfect_Hash_OpTable
   : public TAO_Perfect_Hash_OpTable
@@ -7330,7 +8189,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: c:\ace\latest\ACE_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0 -a -o -t -p -K opname -L C++ -Z TAO_CORBA_ComponentIR_PublishesDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ACE\Any\ACE_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0 -a -o -t -p -K opname -L C++ -Z TAO_CORBA_ComponentIR_PublishesDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_ComponentIR_PublishesDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -7350,7 +8209,7 @@ TAO_CORBA_ComponentIR_PublishesDef_Perfect_Hash_OpTable::hash (const char *str,
      37, 37, 37, 37, 37, 37, 37, 37, 37,  0,
      37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
      37, 37, 37, 37, 37, 37, 37, 37, 37,  0,
-     37, 37,  0,  0, 37, 37, 37, 10, 37, 37,
+     37, 37,  0,  0, 37, 37, 37, 15, 37, 37,
      37, 37, 37, 37, 37, 37, 37, 37,  0,  0,
      37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
      37, 37, 37, 10, 37, 37, 37, 37, 10, 37,
@@ -7374,7 +8233,7 @@ TAO_CORBA_ComponentIR_PublishesDef_Perfect_Hash_OpTable::hash (const char *str,
      37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
      37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
      37, 37, 37, 37, 37,  0, 37,  0, 37, 37,
-      0,  0, 37, 37, 37, 10, 37, 37, 37,  0,
+      0,  0, 37, 37, 37, 15, 37, 37, 37,  0,
       0, 37, 37, 37, 37, 37, 10, 37, 37, 37,
      37, 10, 37, 37, 37, 37, 37, 37,
 #endif /* ACE_MVS */
@@ -7387,14 +8246,14 @@ TAO_CORBA_ComponentIR_PublishesDef_Perfect_Hash_OpTable::lookup (const char *str
 {
   enum
     {
-      TOTAL_KEYWORDS = 20,
+      TOTAL_KEYWORDS = 21,
       MIN_WORD_LENGTH = 4,
       MAX_WORD_LENGTH = 26,
       MIN_HASH_VALUE = 4,
       MAX_HASH_VALUE = 36,
       HASH_VALUE_RANGE = 33,
       DUPLICATES = 6,
-      WORDLIST_SIZE = 24
+      WORDLIST_SIZE = 25
     };
 
   static const TAO_operation_db_entry  wordlist[] =
@@ -7411,10 +8270,11 @@ TAO_CORBA_ComponentIR_PublishesDef_Perfect_Hash_OpTable::lookup (const char *str
       {"_get_version", &POA_CORBA::ComponentIR::PublishesDef::_get_version_skel, 0},
       {"_set_version", &POA_CORBA::ComponentIR::PublishesDef::_set_version_skel, 0},
       {"_get_def_kind", &POA_CORBA::ComponentIR::PublishesDef::_get_def_kind_skel, 0},
-      {"is_a", &POA_CORBA::ComponentIR::PublishesDef::is_a_skel, 0},
+      {"_repository_id", &POA_CORBA::ComponentIR::PublishesDef::_repository_id_skel, 0},
       {"_get_defined_in", &POA_CORBA::ComponentIR::PublishesDef::_get_defined_in_skel, 0},
       {"destroy", &POA_CORBA::ComponentIR::PublishesDef::destroy_skel, 0},
       {"_get_absolute_name", &POA_CORBA::ComponentIR::PublishesDef::_get_absolute_name_skel, 0},
+      {"is_a", &POA_CORBA::ComponentIR::PublishesDef::is_a_skel, 0},
       {"_get_event", &POA_CORBA::ComponentIR::PublishesDef::_get_event_skel, 0},
       {"_component", &POA_CORBA::ComponentIR::PublishesDef::_component_skel, 0},
       {"_set_event", &POA_CORBA::ComponentIR::PublishesDef::_set_event_skel, 0},
@@ -7424,9 +8284,9 @@ TAO_CORBA_ComponentIR_PublishesDef_Perfect_Hash_OpTable::lookup (const char *str
 
   static const signed char lookup[] =
     {
-      -12,  -2, -19,  -3,   4,   5,  -1,  53,   8,  48,  11,  -1, -48,  14, 
-       15,  16,  -1,  17,  18,  -1, -54,  -9,  -2,  22,  -6,  -2,  -1,  -1, 
-       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  23, 
+      -12,  -2, -20,  -3,   4,   5,  -1,  53,   8,  48,  11,  -1, -48,  14, 
+       15,  16,  -1,  17,  18,  19, -54,  -9,  -2,  23,  -6,  -2,  -1,  -1, 
+       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  24, 
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -7464,7 +8324,7 @@ TAO_CORBA_ComponentIR_PublishesDef_Perfect_Hash_OpTable::lookup (const char *str
 static TAO_CORBA_ComponentIR_PublishesDef_Perfect_Hash_OpTable tao_CORBA_ComponentIR_PublishesDef_optable;
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:999
+// be\be_visitor_interface/interface_ss.cpp:921
 
 TAO::Collocation_Proxy_Broker *
 CORBA_ComponentIR__TAO_PublishesDef_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -7484,10 +8344,7 @@ CORBA_ComponentIR__TAO_PublishesDef_Proxy_Broker_Factory_Initializer (size_t)
 static int
 CORBA_ComponentIR__TAO_PublishesDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
   CORBA_ComponentIR__TAO_PublishesDef_Proxy_Broker_Factory_Initializer (
-      reinterpret_cast<
-          size_t> (
-          CORBA_ComponentIR__TAO_PublishesDef_Proxy_Broker_Factory_Initializer
-        )
+      reinterpret_cast<size_t> (CORBA_ComponentIR__TAO_PublishesDef_Proxy_Broker_Factory_Initializer)
     );
 
 
@@ -7547,8 +8404,8 @@ namespace POA_CORBA
             this->operation_details_,
             this->args_);
         
-        TAO::SArg_Traits< CORBA::Char *>::in_arg_type arg_1 =
-          TAO::Portable_Server::get_in_arg< CORBA::Char *, TAO::SArg_Traits< CORBA::Char *>::in_arg_type> (
+        TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
+          TAO::Portable_Server::get_in_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type> (
             this->operation_details_,
             this->args_,
             1);
@@ -7585,7 +8442,7 @@ void POA_CORBA::ComponentIR::PublishesDef::_is_a_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  TAO::SArg_Traits< CORBA::Char *>::in_arg_val _tao_repository_id;
+  TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
   
   TAO::Argument * const args[] =
     {
@@ -7710,10 +8567,102 @@ void POA_CORBA::ComponentIR::PublishesDef::_non_existent_skel (
   
 }
 
+namespace POA_CORBA
+{
+  namespace ComponentIR
+  {
+    
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/upcall_command_ss.cpp:127
+    
+    class _repository_id_PublishesDef_Upcall_Command
+      : public TAO::Upcall_Command
+    {
+    public:
+      inline _repository_id_PublishesDef_Upcall_Command (
+        POA_CORBA::ComponentIR::PublishesDef * servant,
+        TAO_Operation_Details const * operation_details,
+        TAO::Argument * const args[])
+        : servant_ (servant)
+        , operation_details_ (operation_details)
+        , args_ (args)
+      {
+      }
+      
+      virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+      {
+        TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
+          TAO::Portable_Server::get_ret_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type> (
+            this->operation_details_,
+            this->args_);
+        
+        
+        retval =
+          this->servant_-> _repository_id (
+            ACE_ENV_SINGLE_ARG_PARAMETER);
+          
+      }
+    
+    private:
+      POA_CORBA::ComponentIR::PublishesDef * const servant_;
+      TAO_Operation_Details const * const operation_details_;
+      TAO::Argument * const * const args_;
+    };
+    
+  }
+  
+}
+void POA_CORBA::ComponentIR::PublishesDef::_repository_id_skel (
+    TAO_ServerRequest & server_request, 
+    void * TAO_INTERCEPTOR (servant_upcall),
+    void * servant
+    ACE_ENV_ARG_DECL
+  )
+{
+  
+  
+#if TAO_HAS_INTERCEPTORS == 1
+  static CORBA::TypeCode_ptr const * const exceptions = 0;
+  static size_t const nexceptions = 0;
+#endif /* TAO_HAS_INTERCEPTORS */
+  
+  TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
+  
+  TAO::Argument * const args[] =
+    {
+      &retval
+    };
+  
+  static size_t const nargs = 1;
+  
+  POA_CORBA::ComponentIR::PublishesDef * const impl =
+    static_cast<POA_CORBA::ComponentIR::PublishesDef *> (servant);
+  
+  _repository_id_PublishesDef_Upcall_Command command (
+    impl,
+    server_request.operation_details (),
+    args);
+  
+  TAO::Upcall_Wrapper upcall_wrapper;
+  upcall_wrapper.upcall (server_request
+                         , args
+                         , nargs
+                         , command
+#if TAO_HAS_INTERCEPTORS == 1
+                         , servant_upcall
+                         , exceptions
+                         , nexceptions
+#endif  /* TAO_HAS_INTERCEPTORS == 1 */
+                         ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+  
+}
+
 
 
 // TAO_IDL - Generated from 
-// be\be_visitor_interface/interface_ss.cpp:393
+// be\be_visitor_interface/interface_ss.cpp:501
 
 
 
@@ -7886,7 +8835,7 @@ const char* POA_CORBA::ComponentIR::PublishesDef::_interface_repository_id (void
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:940
+// be\be_visitor_interface/interface_ss.cpp:862
 
 void POA_CORBA::ComponentIR::PublishesDef::_dispatch (
     TAO_ServerRequest & req,
@@ -7901,7 +8850,7 @@ void POA_CORBA::ComponentIR::PublishesDef::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:891
+// be\be_visitor_interface/interface_ss.cpp:813
 
 CORBA::ComponentIR::PublishesDef *
 POA_CORBA::ComponentIR::PublishesDef::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -7933,7 +8882,7 @@ POA_CORBA::ComponentIR::PublishesDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1455
+// be\be_interface.cpp:1465
 
 class TAO_CORBA_ComponentIR_ConsumesDef_Perfect_Hash_OpTable
   : public TAO_Perfect_Hash_OpTable
@@ -7946,7 +8895,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: c:\ace\latest\ACE_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0 -a -o -t -p -K opname -L C++ -Z TAO_CORBA_ComponentIR_ConsumesDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ACE\Any\ACE_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0 -a -o -t -p -K opname -L C++ -Z TAO_CORBA_ComponentIR_ConsumesDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_ComponentIR_ConsumesDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -7966,7 +8915,7 @@ TAO_CORBA_ComponentIR_ConsumesDef_Perfect_Hash_OpTable::hash (const char *str, u
      37, 37, 37, 37, 37, 37, 37, 37, 37,  0,
      37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
      37, 37, 37, 37, 37, 37, 37, 37, 37,  0,
-     37, 37,  0,  0, 37, 37, 37, 10, 37, 37,
+     37, 37,  0,  0, 37, 37, 37, 15, 37, 37,
      37, 37, 37, 37, 37, 37, 37, 37,  0,  0,
      37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
      37, 37, 37, 10, 37, 37, 37, 37, 10, 37,
@@ -7990,7 +8939,7 @@ TAO_CORBA_ComponentIR_ConsumesDef_Perfect_Hash_OpTable::hash (const char *str, u
      37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
      37, 37, 37, 37, 37, 37, 37, 37, 37, 37,
      37, 37, 37, 37, 37,  0, 37,  0, 37, 37,
-      0,  0, 37, 37, 37, 10, 37, 37, 37,  0,
+      0,  0, 37, 37, 37, 15, 37, 37, 37,  0,
       0, 37, 37, 37, 37, 37, 10, 37, 37, 37,
      37, 10, 37, 37, 37, 37, 37, 37,
 #endif /* ACE_MVS */
@@ -8003,14 +8952,14 @@ TAO_CORBA_ComponentIR_ConsumesDef_Perfect_Hash_OpTable::lookup (const char *str,
 {
   enum
     {
-      TOTAL_KEYWORDS = 20,
+      TOTAL_KEYWORDS = 21,
       MIN_WORD_LENGTH = 4,
       MAX_WORD_LENGTH = 26,
       MIN_HASH_VALUE = 4,
       MAX_HASH_VALUE = 36,
       HASH_VALUE_RANGE = 33,
       DUPLICATES = 6,
-      WORDLIST_SIZE = 24
+      WORDLIST_SIZE = 25
     };
 
   static const TAO_operation_db_entry  wordlist[] =
@@ -8027,10 +8976,11 @@ TAO_CORBA_ComponentIR_ConsumesDef_Perfect_Hash_OpTable::lookup (const char *str,
       {"_get_version", &POA_CORBA::ComponentIR::ConsumesDef::_get_version_skel, 0},
       {"_set_version", &POA_CORBA::ComponentIR::ConsumesDef::_set_version_skel, 0},
       {"_get_def_kind", &POA_CORBA::ComponentIR::ConsumesDef::_get_def_kind_skel, 0},
-      {"is_a", &POA_CORBA::ComponentIR::ConsumesDef::is_a_skel, 0},
+      {"_repository_id", &POA_CORBA::ComponentIR::ConsumesDef::_repository_id_skel, 0},
       {"_get_defined_in", &POA_CORBA::ComponentIR::ConsumesDef::_get_defined_in_skel, 0},
       {"destroy", &POA_CORBA::ComponentIR::ConsumesDef::destroy_skel, 0},
       {"_get_absolute_name", &POA_CORBA::ComponentIR::ConsumesDef::_get_absolute_name_skel, 0},
+      {"is_a", &POA_CORBA::ComponentIR::ConsumesDef::is_a_skel, 0},
       {"_get_event", &POA_CORBA::ComponentIR::ConsumesDef::_get_event_skel, 0},
       {"_component", &POA_CORBA::ComponentIR::ConsumesDef::_component_skel, 0},
       {"_set_event", &POA_CORBA::ComponentIR::ConsumesDef::_set_event_skel, 0},
@@ -8040,9 +8990,9 @@ TAO_CORBA_ComponentIR_ConsumesDef_Perfect_Hash_OpTable::lookup (const char *str,
 
   static const signed char lookup[] =
     {
-      -12,  -2, -19,  -3,   4,   5,  -1,  53,   8,  48,  11,  -1, -48,  14, 
-       15,  16,  -1,  17,  18,  -1, -54,  -9,  -2,  22,  -6,  -2,  -1,  -1, 
-       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  23, 
+      -12,  -2, -20,  -3,   4,   5,  -1,  53,   8,  48,  11,  -1, -48,  14, 
+       15,  16,  -1,  17,  18,  19, -54,  -9,  -2,  23,  -6,  -2,  -1,  -1, 
+       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  24, 
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -8080,7 +9030,7 @@ TAO_CORBA_ComponentIR_ConsumesDef_Perfect_Hash_OpTable::lookup (const char *str,
 static TAO_CORBA_ComponentIR_ConsumesDef_Perfect_Hash_OpTable tao_CORBA_ComponentIR_ConsumesDef_optable;
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:999
+// be\be_visitor_interface/interface_ss.cpp:921
 
 TAO::Collocation_Proxy_Broker *
 CORBA_ComponentIR__TAO_ConsumesDef_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -8100,10 +9050,7 @@ CORBA_ComponentIR__TAO_ConsumesDef_Proxy_Broker_Factory_Initializer (size_t)
 static int
 CORBA_ComponentIR__TAO_ConsumesDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
   CORBA_ComponentIR__TAO_ConsumesDef_Proxy_Broker_Factory_Initializer (
-      reinterpret_cast<
-          size_t> (
-          CORBA_ComponentIR__TAO_ConsumesDef_Proxy_Broker_Factory_Initializer
-        )
+      reinterpret_cast<size_t> (CORBA_ComponentIR__TAO_ConsumesDef_Proxy_Broker_Factory_Initializer)
     );
 
 
@@ -8163,8 +9110,8 @@ namespace POA_CORBA
             this->operation_details_,
             this->args_);
         
-        TAO::SArg_Traits< CORBA::Char *>::in_arg_type arg_1 =
-          TAO::Portable_Server::get_in_arg< CORBA::Char *, TAO::SArg_Traits< CORBA::Char *>::in_arg_type> (
+        TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
+          TAO::Portable_Server::get_in_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type> (
             this->operation_details_,
             this->args_,
             1);
@@ -8201,7 +9148,7 @@ void POA_CORBA::ComponentIR::ConsumesDef::_is_a_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  TAO::SArg_Traits< CORBA::Char *>::in_arg_val _tao_repository_id;
+  TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
   
   TAO::Argument * const args[] =
     {
@@ -8326,10 +9273,102 @@ void POA_CORBA::ComponentIR::ConsumesDef::_non_existent_skel (
   
 }
 
+namespace POA_CORBA
+{
+  namespace ComponentIR
+  {
+    
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/upcall_command_ss.cpp:127
+    
+    class _repository_id_ConsumesDef_Upcall_Command
+      : public TAO::Upcall_Command
+    {
+    public:
+      inline _repository_id_ConsumesDef_Upcall_Command (
+        POA_CORBA::ComponentIR::ConsumesDef * servant,
+        TAO_Operation_Details const * operation_details,
+        TAO::Argument * const args[])
+        : servant_ (servant)
+        , operation_details_ (operation_details)
+        , args_ (args)
+      {
+      }
+      
+      virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+      {
+        TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
+          TAO::Portable_Server::get_ret_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type> (
+            this->operation_details_,
+            this->args_);
+        
+        
+        retval =
+          this->servant_-> _repository_id (
+            ACE_ENV_SINGLE_ARG_PARAMETER);
+          
+      }
+    
+    private:
+      POA_CORBA::ComponentIR::ConsumesDef * const servant_;
+      TAO_Operation_Details const * const operation_details_;
+      TAO::Argument * const * const args_;
+    };
+    
+  }
+  
+}
+void POA_CORBA::ComponentIR::ConsumesDef::_repository_id_skel (
+    TAO_ServerRequest & server_request, 
+    void * TAO_INTERCEPTOR (servant_upcall),
+    void * servant
+    ACE_ENV_ARG_DECL
+  )
+{
+  
+  
+#if TAO_HAS_INTERCEPTORS == 1
+  static CORBA::TypeCode_ptr const * const exceptions = 0;
+  static size_t const nexceptions = 0;
+#endif /* TAO_HAS_INTERCEPTORS */
+  
+  TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
+  
+  TAO::Argument * const args[] =
+    {
+      &retval
+    };
+  
+  static size_t const nargs = 1;
+  
+  POA_CORBA::ComponentIR::ConsumesDef * const impl =
+    static_cast<POA_CORBA::ComponentIR::ConsumesDef *> (servant);
+  
+  _repository_id_ConsumesDef_Upcall_Command command (
+    impl,
+    server_request.operation_details (),
+    args);
+  
+  TAO::Upcall_Wrapper upcall_wrapper;
+  upcall_wrapper.upcall (server_request
+                         , args
+                         , nargs
+                         , command
+#if TAO_HAS_INTERCEPTORS == 1
+                         , servant_upcall
+                         , exceptions
+                         , nexceptions
+#endif  /* TAO_HAS_INTERCEPTORS == 1 */
+                         ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+  
+}
+
 
 
 // TAO_IDL - Generated from 
-// be\be_visitor_interface/interface_ss.cpp:393
+// be\be_visitor_interface/interface_ss.cpp:501
 
 
 
@@ -8502,7 +9541,7 @@ const char* POA_CORBA::ComponentIR::ConsumesDef::_interface_repository_id (void)
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:940
+// be\be_visitor_interface/interface_ss.cpp:862
 
 void POA_CORBA::ComponentIR::ConsumesDef::_dispatch (
     TAO_ServerRequest & req,
@@ -8517,7 +9556,7 @@ void POA_CORBA::ComponentIR::ConsumesDef::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:891
+// be\be_visitor_interface/interface_ss.cpp:813
 
 CORBA::ComponentIR::ConsumesDef *
 POA_CORBA::ComponentIR::ConsumesDef::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -8549,7 +9588,7 @@ POA_CORBA::ComponentIR::ConsumesDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1455
+// be\be_interface.cpp:1465
 
 class TAO_CORBA_ComponentIR_ComponentDef_Perfect_Hash_OpTable
   : public TAO_Perfect_Hash_OpTable
@@ -8562,7 +9601,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: c:\ace\latest\ACE_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0 -a -o -t -p -K opname -L C++ -Z TAO_CORBA_ComponentIR_ComponentDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ACE\Any\ACE_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0 -a -o -t -p -K opname -L C++ -Z TAO_CORBA_ComponentIR_ComponentDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_ComponentIR_ComponentDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -8619,14 +9658,14 @@ TAO_CORBA_ComponentIR_ComponentDef_Perfect_Hash_OpTable::lookup (const char *str
 {
   enum
     {
-      TOTAL_KEYWORDS = 53,
+      TOTAL_KEYWORDS = 54,
       MIN_WORD_LENGTH = 4,
       MAX_WORD_LENGTH = 26,
       MIN_HASH_VALUE = 4,
       MAX_HASH_VALUE = 89,
       HASH_VALUE_RANGE = 86,
       DUPLICATES = 14,
-      WORDLIST_SIZE = 57
+      WORDLIST_SIZE = 58
     };
 
   static const TAO_operation_db_entry  wordlist[] =
@@ -8679,6 +9718,7 @@ TAO_CORBA_ComponentIR_ComponentDef_Perfect_Hash_OpTable::lookup (const char *str
       {"_get_base_interfaces", &POA_CORBA::ComponentIR::ComponentDef::_get_base_interfaces_skel, 0},
       {"_set_base_interfaces", &POA_CORBA::ComponentIR::ComponentDef::_set_base_interfaces_skel, 0},
       {"_get_def_kind", &POA_CORBA::ComponentIR::ComponentDef::_get_def_kind_skel, 0},
+      {"_repository_id", &POA_CORBA::ComponentIR::ComponentDef::_repository_id_skel, 0},
       {"_get_supported_interfaces", &POA_CORBA::ComponentIR::ComponentDef::_get_supported_interfaces_skel, 0},
       {"_set_supported_interfaces", &POA_CORBA::ComponentIR::ComponentDef::_set_supported_interfaces_skel, 0},
       {"_component", &POA_CORBA::ComponentIR::ComponentDef::_component_skel, 0},
@@ -8694,8 +9734,8 @@ TAO_CORBA_ComponentIR_ComponentDef_Perfect_Hash_OpTable::lookup (const char *str
        -23,   -2,  -91,   25,   26,   27,  -32,   -3,   28,   -1,  -40,   -2,   29,   30, 
         -1,   31,  -99,   35,   36,   37,   38,   -1,   39,   -1, -103,   42,   -1,   43, 
         -1,   44,   -1,   -1,   -1,   45,   -1,   -1,   -1,  -46,   -2,  -91,  -48,   -2, 
-       -91,  -51,   -2,   50,   -1,  -93,   -1,   -1,   -1,   -1,   53,   -1,   -1,   54, 
-        -1,   -1,   -1,  -55,   -2,  -91, 
+       -91,  -52,   -2,   50,   51,  -93,   -1,   -1,   -1,   -1,   54,   -1,   -1,   55, 
+        -1,   -1,   -1,  -56,   -2,  -91, 
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -8733,7 +9773,7 @@ TAO_CORBA_ComponentIR_ComponentDef_Perfect_Hash_OpTable::lookup (const char *str
 static TAO_CORBA_ComponentIR_ComponentDef_Perfect_Hash_OpTable tao_CORBA_ComponentIR_ComponentDef_optable;
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:999
+// be\be_visitor_interface/interface_ss.cpp:921
 
 TAO::Collocation_Proxy_Broker *
 CORBA_ComponentIR__TAO_ComponentDef_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -8753,10 +9793,7 @@ CORBA_ComponentIR__TAO_ComponentDef_Proxy_Broker_Factory_Initializer (size_t)
 static int
 CORBA_ComponentIR__TAO_ComponentDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
   CORBA_ComponentIR__TAO_ComponentDef_Proxy_Broker_Factory_Initializer (
-      reinterpret_cast<
-          size_t> (
-          CORBA_ComponentIR__TAO_ComponentDef_Proxy_Broker_Factory_Initializer
-        )
+      reinterpret_cast<size_t> (CORBA_ComponentIR__TAO_ComponentDef_Proxy_Broker_Factory_Initializer)
     );
 
 
@@ -8811,8 +9848,8 @@ namespace POA_CORBA
       
       virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
       {
-        TAO::SArg_Traits< CORBA::ComponentIR::ComponentDef>::ret_arg_type retval =
-          TAO::Portable_Server::get_ret_arg< CORBA::ComponentIR::ComponentDef, TAO::SArg_Traits< CORBA::ComponentIR::ComponentDef>::ret_arg_type> (
+        TAO::SArg_Traits< ::CORBA::ComponentIR::ComponentDef>::ret_arg_type retval =
+          TAO::Portable_Server::get_ret_arg< ::CORBA::ComponentIR::ComponentDef, TAO::SArg_Traits< ::CORBA::ComponentIR::ComponentDef>::ret_arg_type> (
             this->operation_details_,
             this->args_);
         
@@ -8851,7 +9888,7 @@ void POA_CORBA::ComponentIR::ComponentDef::_get_base_component_skel (
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
   
-  TAO::SArg_Traits< CORBA::ComponentIR::ComponentDef>::ret_val retval;
+  TAO::SArg_Traits< ::CORBA::ComponentIR::ComponentDef>::ret_val retval;
   
   TAO::Argument * const args[] =
     {
@@ -8907,8 +9944,8 @@ namespace POA_CORBA
       
       virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
       {
-        TAO::SArg_Traits< CORBA::ComponentIR::ComponentDef>::in_arg_type arg_1 =
-          TAO::Portable_Server::get_in_arg< CORBA::ComponentIR::ComponentDef, TAO::SArg_Traits< CORBA::ComponentIR::ComponentDef>::in_arg_type> (
+        TAO::SArg_Traits< ::CORBA::ComponentIR::ComponentDef>::in_arg_type arg_1 =
+          TAO::Portable_Server::get_in_arg< ::CORBA::ComponentIR::ComponentDef, TAO::SArg_Traits< ::CORBA::ComponentIR::ComponentDef>::in_arg_type> (
             this->operation_details_,
             this->args_,
             1);
@@ -8948,7 +9985,7 @@ void POA_CORBA::ComponentIR::ComponentDef::_set_base_component_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   TAO::SArg_Traits< void>::ret_val retval;
-  TAO::SArg_Traits< CORBA::ComponentIR::ComponentDef>::in_arg_val _tao_base_component;
+  TAO::SArg_Traits< ::CORBA::ComponentIR::ComponentDef>::in_arg_val _tao_base_component;
   
   TAO::Argument * const args[] =
     {
@@ -9005,8 +10042,8 @@ namespace POA_CORBA
       
       virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
       {
-        TAO::SArg_Traits< CORBA::InterfaceDefSeq>::ret_arg_type retval =
-          TAO::Portable_Server::get_ret_arg< CORBA::InterfaceDefSeq, TAO::SArg_Traits< CORBA::InterfaceDefSeq>::ret_arg_type> (
+        TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::ret_arg_type retval =
+          TAO::Portable_Server::get_ret_arg< ::CORBA::InterfaceDefSeq, TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::ret_arg_type> (
             this->operation_details_,
             this->args_);
         
@@ -9045,7 +10082,7 @@ void POA_CORBA::ComponentIR::ComponentDef::_get_supported_interfaces_skel (
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
   
-  TAO::SArg_Traits< CORBA::InterfaceDefSeq>::ret_val retval;
+  TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::ret_val retval;
   
   TAO::Argument * const args[] =
     {
@@ -9101,8 +10138,8 @@ namespace POA_CORBA
       
       virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
       {
-        TAO::SArg_Traits< CORBA::InterfaceDefSeq>::in_arg_type arg_1 =
-          TAO::Portable_Server::get_in_arg< CORBA::InterfaceDefSeq, TAO::SArg_Traits< CORBA::InterfaceDefSeq>::in_arg_type> (
+        TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_type arg_1 =
+          TAO::Portable_Server::get_in_arg< ::CORBA::InterfaceDefSeq, TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_type> (
             this->operation_details_,
             this->args_,
             1);
@@ -9142,7 +10179,7 @@ void POA_CORBA::ComponentIR::ComponentDef::_set_supported_interfaces_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   TAO::SArg_Traits< void>::ret_val retval;
-  TAO::SArg_Traits< CORBA::InterfaceDefSeq>::in_arg_val _tao_supported_interfaces;
+  TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_val _tao_supported_interfaces;
   
   TAO::Argument * const args[] =
     {
@@ -9199,31 +10236,31 @@ namespace POA_CORBA
       
       virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
       {
-        TAO::SArg_Traits< CORBA::ComponentIR::ProvidesDef>::ret_arg_type retval =
-          TAO::Portable_Server::get_ret_arg< CORBA::ComponentIR::ProvidesDef, TAO::SArg_Traits< CORBA::ComponentIR::ProvidesDef>::ret_arg_type> (
+        TAO::SArg_Traits< ::CORBA::ComponentIR::ProvidesDef>::ret_arg_type retval =
+          TAO::Portable_Server::get_ret_arg< ::CORBA::ComponentIR::ProvidesDef, TAO::SArg_Traits< ::CORBA::ComponentIR::ProvidesDef>::ret_arg_type> (
             this->operation_details_,
             this->args_);
         
-        TAO::SArg_Traits< CORBA::RepositoryId>::in_arg_type arg_1 =
-          TAO::Portable_Server::get_in_arg< CORBA::RepositoryId, TAO::SArg_Traits< CORBA::RepositoryId>::in_arg_type> (
+        TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
+          TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId, TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type> (
             this->operation_details_,
             this->args_,
             1);
           
-        TAO::SArg_Traits< CORBA::Identifier>::in_arg_type arg_2 =
-          TAO::Portable_Server::get_in_arg< CORBA::Identifier, TAO::SArg_Traits< CORBA::Identifier>::in_arg_type> (
+        TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
+          TAO::Portable_Server::get_in_arg< ::CORBA::Identifier, TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type> (
             this->operation_details_,
             this->args_,
             2);
           
-        TAO::SArg_Traits< CORBA::VersionSpec>::in_arg_type arg_3 =
-          TAO::Portable_Server::get_in_arg< CORBA::VersionSpec, TAO::SArg_Traits< CORBA::VersionSpec>::in_arg_type> (
+        TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
+          TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec, TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type> (
             this->operation_details_,
             this->args_,
             3);
           
-        TAO::SArg_Traits< CORBA::InterfaceDef>::in_arg_type arg_4 =
-          TAO::Portable_Server::get_in_arg< CORBA::InterfaceDef, TAO::SArg_Traits< CORBA::InterfaceDef>::in_arg_type> (
+        TAO::SArg_Traits< ::CORBA::InterfaceDef>::in_arg_type arg_4 =
+          TAO::Portable_Server::get_in_arg< ::CORBA::InterfaceDef, TAO::SArg_Traits< ::CORBA::InterfaceDef>::in_arg_type> (
             this->operation_details_,
             this->args_,
             4);
@@ -9267,11 +10304,11 @@ void POA_CORBA::ComponentIR::ComponentDef::create_provides_skel (
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
   
-  TAO::SArg_Traits< CORBA::ComponentIR::ProvidesDef>::ret_val retval;
-  TAO::SArg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id;
-  TAO::SArg_Traits< CORBA::Identifier>::in_arg_val _tao_name;
-  TAO::SArg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version;
-  TAO::SArg_Traits< CORBA::InterfaceDef>::in_arg_val _tao_interface_type;
+  TAO::SArg_Traits< ::CORBA::ComponentIR::ProvidesDef>::ret_val retval;
+  TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
+  TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
+  TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version;
+  TAO::SArg_Traits< ::CORBA::InterfaceDef>::in_arg_val _tao_interface_type;
   
   TAO::Argument * const args[] =
     {
@@ -9331,31 +10368,31 @@ namespace POA_CORBA
       
       virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
       {
-        TAO::SArg_Traits< CORBA::ComponentIR::UsesDef>::ret_arg_type retval =
-          TAO::Portable_Server::get_ret_arg< CORBA::ComponentIR::UsesDef, TAO::SArg_Traits< CORBA::ComponentIR::UsesDef>::ret_arg_type> (
+        TAO::SArg_Traits< ::CORBA::ComponentIR::UsesDef>::ret_arg_type retval =
+          TAO::Portable_Server::get_ret_arg< ::CORBA::ComponentIR::UsesDef, TAO::SArg_Traits< ::CORBA::ComponentIR::UsesDef>::ret_arg_type> (
             this->operation_details_,
             this->args_);
         
-        TAO::SArg_Traits< CORBA::RepositoryId>::in_arg_type arg_1 =
-          TAO::Portable_Server::get_in_arg< CORBA::RepositoryId, TAO::SArg_Traits< CORBA::RepositoryId>::in_arg_type> (
+        TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
+          TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId, TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type> (
             this->operation_details_,
             this->args_,
             1);
           
-        TAO::SArg_Traits< CORBA::Identifier>::in_arg_type arg_2 =
-          TAO::Portable_Server::get_in_arg< CORBA::Identifier, TAO::SArg_Traits< CORBA::Identifier>::in_arg_type> (
+        TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
+          TAO::Portable_Server::get_in_arg< ::CORBA::Identifier, TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type> (
             this->operation_details_,
             this->args_,
             2);
           
-        TAO::SArg_Traits< CORBA::VersionSpec>::in_arg_type arg_3 =
-          TAO::Portable_Server::get_in_arg< CORBA::VersionSpec, TAO::SArg_Traits< CORBA::VersionSpec>::in_arg_type> (
+        TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
+          TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec, TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type> (
             this->operation_details_,
             this->args_,
             3);
           
-        TAO::SArg_Traits< CORBA::InterfaceDef>::in_arg_type arg_4 =
-          TAO::Portable_Server::get_in_arg< CORBA::InterfaceDef, TAO::SArg_Traits< CORBA::InterfaceDef>::in_arg_type> (
+        TAO::SArg_Traits< ::CORBA::InterfaceDef>::in_arg_type arg_4 =
+          TAO::Portable_Server::get_in_arg< ::CORBA::InterfaceDef, TAO::SArg_Traits< ::CORBA::InterfaceDef>::in_arg_type> (
             this->operation_details_,
             this->args_,
             4);
@@ -9406,11 +10443,11 @@ void POA_CORBA::ComponentIR::ComponentDef::create_uses_skel (
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
   
-  TAO::SArg_Traits< CORBA::ComponentIR::UsesDef>::ret_val retval;
-  TAO::SArg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id;
-  TAO::SArg_Traits< CORBA::Identifier>::in_arg_val _tao_name;
-  TAO::SArg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version;
-  TAO::SArg_Traits< CORBA::InterfaceDef>::in_arg_val _tao_interface_type;
+  TAO::SArg_Traits< ::CORBA::ComponentIR::UsesDef>::ret_val retval;
+  TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
+  TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
+  TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version;
+  TAO::SArg_Traits< ::CORBA::InterfaceDef>::in_arg_val _tao_interface_type;
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_is_multiple;
   
   TAO::Argument * const args[] =
@@ -9472,31 +10509,31 @@ namespace POA_CORBA
       
       virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
       {
-        TAO::SArg_Traits< CORBA::ComponentIR::EmitsDef>::ret_arg_type retval =
-          TAO::Portable_Server::get_ret_arg< CORBA::ComponentIR::EmitsDef, TAO::SArg_Traits< CORBA::ComponentIR::EmitsDef>::ret_arg_type> (
+        TAO::SArg_Traits< ::CORBA::ComponentIR::EmitsDef>::ret_arg_type retval =
+          TAO::Portable_Server::get_ret_arg< ::CORBA::ComponentIR::EmitsDef, TAO::SArg_Traits< ::CORBA::ComponentIR::EmitsDef>::ret_arg_type> (
             this->operation_details_,
             this->args_);
         
-        TAO::SArg_Traits< CORBA::RepositoryId>::in_arg_type arg_1 =
-          TAO::Portable_Server::get_in_arg< CORBA::RepositoryId, TAO::SArg_Traits< CORBA::RepositoryId>::in_arg_type> (
+        TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
+          TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId, TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type> (
             this->operation_details_,
             this->args_,
             1);
           
-        TAO::SArg_Traits< CORBA::Identifier>::in_arg_type arg_2 =
-          TAO::Portable_Server::get_in_arg< CORBA::Identifier, TAO::SArg_Traits< CORBA::Identifier>::in_arg_type> (
+        TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
+          TAO::Portable_Server::get_in_arg< ::CORBA::Identifier, TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type> (
             this->operation_details_,
             this->args_,
             2);
           
-        TAO::SArg_Traits< CORBA::VersionSpec>::in_arg_type arg_3 =
-          TAO::Portable_Server::get_in_arg< CORBA::VersionSpec, TAO::SArg_Traits< CORBA::VersionSpec>::in_arg_type> (
+        TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
+          TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec, TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type> (
             this->operation_details_,
             this->args_,
             3);
           
-        TAO::SArg_Traits< CORBA::ComponentIR::EventDef>::in_arg_type arg_4 =
-          TAO::Portable_Server::get_in_arg< CORBA::ComponentIR::EventDef, TAO::SArg_Traits< CORBA::ComponentIR::EventDef>::in_arg_type> (
+        TAO::SArg_Traits< ::CORBA::ComponentIR::EventDef>::in_arg_type arg_4 =
+          TAO::Portable_Server::get_in_arg< ::CORBA::ComponentIR::EventDef, TAO::SArg_Traits< ::CORBA::ComponentIR::EventDef>::in_arg_type> (
             this->operation_details_,
             this->args_,
             4);
@@ -9540,11 +10577,11 @@ void POA_CORBA::ComponentIR::ComponentDef::create_emits_skel (
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
   
-  TAO::SArg_Traits< CORBA::ComponentIR::EmitsDef>::ret_val retval;
-  TAO::SArg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id;
-  TAO::SArg_Traits< CORBA::Identifier>::in_arg_val _tao_name;
-  TAO::SArg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version;
-  TAO::SArg_Traits< CORBA::ComponentIR::EventDef>::in_arg_val _tao_event;
+  TAO::SArg_Traits< ::CORBA::ComponentIR::EmitsDef>::ret_val retval;
+  TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
+  TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
+  TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version;
+  TAO::SArg_Traits< ::CORBA::ComponentIR::EventDef>::in_arg_val _tao_event;
   
   TAO::Argument * const args[] =
     {
@@ -9604,31 +10641,31 @@ namespace POA_CORBA
       
       virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
       {
-        TAO::SArg_Traits< CORBA::ComponentIR::PublishesDef>::ret_arg_type retval =
-          TAO::Portable_Server::get_ret_arg< CORBA::ComponentIR::PublishesDef, TAO::SArg_Traits< CORBA::ComponentIR::PublishesDef>::ret_arg_type> (
+        TAO::SArg_Traits< ::CORBA::ComponentIR::PublishesDef>::ret_arg_type retval =
+          TAO::Portable_Server::get_ret_arg< ::CORBA::ComponentIR::PublishesDef, TAO::SArg_Traits< ::CORBA::ComponentIR::PublishesDef>::ret_arg_type> (
             this->operation_details_,
             this->args_);
         
-        TAO::SArg_Traits< CORBA::RepositoryId>::in_arg_type arg_1 =
-          TAO::Portable_Server::get_in_arg< CORBA::RepositoryId, TAO::SArg_Traits< CORBA::RepositoryId>::in_arg_type> (
+        TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
+          TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId, TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type> (
             this->operation_details_,
             this->args_,
             1);
           
-        TAO::SArg_Traits< CORBA::Identifier>::in_arg_type arg_2 =
-          TAO::Portable_Server::get_in_arg< CORBA::Identifier, TAO::SArg_Traits< CORBA::Identifier>::in_arg_type> (
+        TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
+          TAO::Portable_Server::get_in_arg< ::CORBA::Identifier, TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type> (
             this->operation_details_,
             this->args_,
             2);
           
-        TAO::SArg_Traits< CORBA::VersionSpec>::in_arg_type arg_3 =
-          TAO::Portable_Server::get_in_arg< CORBA::VersionSpec, TAO::SArg_Traits< CORBA::VersionSpec>::in_arg_type> (
+        TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
+          TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec, TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type> (
             this->operation_details_,
             this->args_,
             3);
           
-        TAO::SArg_Traits< CORBA::ComponentIR::EventDef>::in_arg_type arg_4 =
-          TAO::Portable_Server::get_in_arg< CORBA::ComponentIR::EventDef, TAO::SArg_Traits< CORBA::ComponentIR::EventDef>::in_arg_type> (
+        TAO::SArg_Traits< ::CORBA::ComponentIR::EventDef>::in_arg_type arg_4 =
+          TAO::Portable_Server::get_in_arg< ::CORBA::ComponentIR::EventDef, TAO::SArg_Traits< ::CORBA::ComponentIR::EventDef>::in_arg_type> (
             this->operation_details_,
             this->args_,
             4);
@@ -9672,11 +10709,11 @@ void POA_CORBA::ComponentIR::ComponentDef::create_publishes_skel (
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
   
-  TAO::SArg_Traits< CORBA::ComponentIR::PublishesDef>::ret_val retval;
-  TAO::SArg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id;
-  TAO::SArg_Traits< CORBA::Identifier>::in_arg_val _tao_name;
-  TAO::SArg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version;
-  TAO::SArg_Traits< CORBA::ComponentIR::EventDef>::in_arg_val _tao_event;
+  TAO::SArg_Traits< ::CORBA::ComponentIR::PublishesDef>::ret_val retval;
+  TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
+  TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
+  TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version;
+  TAO::SArg_Traits< ::CORBA::ComponentIR::EventDef>::in_arg_val _tao_event;
   
   TAO::Argument * const args[] =
     {
@@ -9736,31 +10773,31 @@ namespace POA_CORBA
       
       virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
       {
-        TAO::SArg_Traits< CORBA::ComponentIR::ConsumesDef>::ret_arg_type retval =
-          TAO::Portable_Server::get_ret_arg< CORBA::ComponentIR::ConsumesDef, TAO::SArg_Traits< CORBA::ComponentIR::ConsumesDef>::ret_arg_type> (
+        TAO::SArg_Traits< ::CORBA::ComponentIR::ConsumesDef>::ret_arg_type retval =
+          TAO::Portable_Server::get_ret_arg< ::CORBA::ComponentIR::ConsumesDef, TAO::SArg_Traits< ::CORBA::ComponentIR::ConsumesDef>::ret_arg_type> (
             this->operation_details_,
             this->args_);
         
-        TAO::SArg_Traits< CORBA::RepositoryId>::in_arg_type arg_1 =
-          TAO::Portable_Server::get_in_arg< CORBA::RepositoryId, TAO::SArg_Traits< CORBA::RepositoryId>::in_arg_type> (
+        TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
+          TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId, TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type> (
             this->operation_details_,
             this->args_,
             1);
           
-        TAO::SArg_Traits< CORBA::Identifier>::in_arg_type arg_2 =
-          TAO::Portable_Server::get_in_arg< CORBA::Identifier, TAO::SArg_Traits< CORBA::Identifier>::in_arg_type> (
+        TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
+          TAO::Portable_Server::get_in_arg< ::CORBA::Identifier, TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type> (
             this->operation_details_,
             this->args_,
             2);
           
-        TAO::SArg_Traits< CORBA::VersionSpec>::in_arg_type arg_3 =
-          TAO::Portable_Server::get_in_arg< CORBA::VersionSpec, TAO::SArg_Traits< CORBA::VersionSpec>::in_arg_type> (
+        TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
+          TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec, TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type> (
             this->operation_details_,
             this->args_,
             3);
           
-        TAO::SArg_Traits< CORBA::ComponentIR::EventDef>::in_arg_type arg_4 =
-          TAO::Portable_Server::get_in_arg< CORBA::ComponentIR::EventDef, TAO::SArg_Traits< CORBA::ComponentIR::EventDef>::in_arg_type> (
+        TAO::SArg_Traits< ::CORBA::ComponentIR::EventDef>::in_arg_type arg_4 =
+          TAO::Portable_Server::get_in_arg< ::CORBA::ComponentIR::EventDef, TAO::SArg_Traits< ::CORBA::ComponentIR::EventDef>::in_arg_type> (
             this->operation_details_,
             this->args_,
             4);
@@ -9804,11 +10841,11 @@ void POA_CORBA::ComponentIR::ComponentDef::create_consumes_skel (
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
   
-  TAO::SArg_Traits< CORBA::ComponentIR::ConsumesDef>::ret_val retval;
-  TAO::SArg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id;
-  TAO::SArg_Traits< CORBA::Identifier>::in_arg_val _tao_name;
-  TAO::SArg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version;
-  TAO::SArg_Traits< CORBA::ComponentIR::EventDef>::in_arg_val _tao_event;
+  TAO::SArg_Traits< ::CORBA::ComponentIR::ConsumesDef>::ret_val retval;
+  TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
+  TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
+  TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version;
+  TAO::SArg_Traits< ::CORBA::ComponentIR::EventDef>::in_arg_val _tao_event;
   
   TAO::Argument * const args[] =
     {
@@ -9877,8 +10914,8 @@ namespace POA_CORBA
             this->operation_details_,
             this->args_);
         
-        TAO::SArg_Traits< CORBA::Char *>::in_arg_type arg_1 =
-          TAO::Portable_Server::get_in_arg< CORBA::Char *, TAO::SArg_Traits< CORBA::Char *>::in_arg_type> (
+        TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
+          TAO::Portable_Server::get_in_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type> (
             this->operation_details_,
             this->args_,
             1);
@@ -9915,7 +10952,7 @@ void POA_CORBA::ComponentIR::ComponentDef::_is_a_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  TAO::SArg_Traits< CORBA::Char *>::in_arg_val _tao_repository_id;
+  TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
   
   TAO::Argument * const args[] =
     {
@@ -10040,10 +11077,102 @@ void POA_CORBA::ComponentIR::ComponentDef::_non_existent_skel (
   
 }
 
+namespace POA_CORBA
+{
+  namespace ComponentIR
+  {
+    
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/upcall_command_ss.cpp:127
+    
+    class _repository_id_ComponentDef_Upcall_Command
+      : public TAO::Upcall_Command
+    {
+    public:
+      inline _repository_id_ComponentDef_Upcall_Command (
+        POA_CORBA::ComponentIR::ComponentDef * servant,
+        TAO_Operation_Details const * operation_details,
+        TAO::Argument * const args[])
+        : servant_ (servant)
+        , operation_details_ (operation_details)
+        , args_ (args)
+      {
+      }
+      
+      virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+      {
+        TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
+          TAO::Portable_Server::get_ret_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type> (
+            this->operation_details_,
+            this->args_);
+        
+        
+        retval =
+          this->servant_-> _repository_id (
+            ACE_ENV_SINGLE_ARG_PARAMETER);
+          
+      }
+    
+    private:
+      POA_CORBA::ComponentIR::ComponentDef * const servant_;
+      TAO_Operation_Details const * const operation_details_;
+      TAO::Argument * const * const args_;
+    };
+    
+  }
+  
+}
+void POA_CORBA::ComponentIR::ComponentDef::_repository_id_skel (
+    TAO_ServerRequest & server_request, 
+    void * TAO_INTERCEPTOR (servant_upcall),
+    void * servant
+    ACE_ENV_ARG_DECL
+  )
+{
+  
+  
+#if TAO_HAS_INTERCEPTORS == 1
+  static CORBA::TypeCode_ptr const * const exceptions = 0;
+  static size_t const nexceptions = 0;
+#endif /* TAO_HAS_INTERCEPTORS */
+  
+  TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
+  
+  TAO::Argument * const args[] =
+    {
+      &retval
+    };
+  
+  static size_t const nargs = 1;
+  
+  POA_CORBA::ComponentIR::ComponentDef * const impl =
+    static_cast<POA_CORBA::ComponentIR::ComponentDef *> (servant);
+  
+  _repository_id_ComponentDef_Upcall_Command command (
+    impl,
+    server_request.operation_details (),
+    args);
+  
+  TAO::Upcall_Wrapper upcall_wrapper;
+  upcall_wrapper.upcall (server_request
+                         , args
+                         , nargs
+                         , command
+#if TAO_HAS_INTERCEPTORS == 1
+                         , servant_upcall
+                         , exceptions
+                         , nexceptions
+#endif  /* TAO_HAS_INTERCEPTORS == 1 */
+                         ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+  
+}
+
 
 
 // TAO_IDL - Generated from 
-// be\be_visitor_interface/interface_ss.cpp:393
+// be\be_visitor_interface/interface_ss.cpp:501
 
 
 
@@ -10232,7 +11361,7 @@ const char* POA_CORBA::ComponentIR::ComponentDef::_interface_repository_id (void
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:940
+// be\be_visitor_interface/interface_ss.cpp:862
 
 void POA_CORBA::ComponentIR::ComponentDef::_dispatch (
     TAO_ServerRequest & req,
@@ -10247,7 +11376,7 @@ void POA_CORBA::ComponentIR::ComponentDef::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:891
+// be\be_visitor_interface/interface_ss.cpp:813
 
 CORBA::ComponentIR::ComponentDef *
 POA_CORBA::ComponentIR::ComponentDef::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -10279,7 +11408,7 @@ POA_CORBA::ComponentIR::ComponentDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1455
+// be\be_interface.cpp:1465
 
 class TAO_CORBA_ComponentIR_FactoryDef_Perfect_Hash_OpTable
   : public TAO_Perfect_Hash_OpTable
@@ -10292,7 +11421,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: c:\ace\latest\ACE_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0 -a -o -t -p -K opname -L C++ -Z TAO_CORBA_ComponentIR_FactoryDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ACE\Any\ACE_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0 -a -o -t -p -K opname -L C++ -Z TAO_CORBA_ComponentIR_FactoryDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_ComponentIR_FactoryDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -10349,14 +11478,14 @@ TAO_CORBA_ComponentIR_FactoryDef_Perfect_Hash_OpTable::lookup (const char *str,
 {
   enum
     {
-      TOTAL_KEYWORDS = 28,
+      TOTAL_KEYWORDS = 29,
       MIN_WORD_LENGTH = 4,
       MAX_WORD_LENGTH = 26,
       MIN_HASH_VALUE = 4,
       MAX_HASH_VALUE = 36,
       HASH_VALUE_RANGE = 33,
       DUPLICATES = 10,
-      WORDLIST_SIZE = 32
+      WORDLIST_SIZE = 33
     };
 
   static const TAO_operation_db_entry  wordlist[] =
@@ -10385,6 +11514,7 @@ TAO_CORBA_ComponentIR_FactoryDef_Perfect_Hash_OpTable::lookup (const char *str,
       {"_get_result_def", &POA_CORBA::ComponentIR::FactoryDef::_get_result_def_skel, 0},
       {"_set_result_def", &POA_CORBA::ComponentIR::FactoryDef::_set_result_def_skel, 0},
       {"_get_def_kind", &POA_CORBA::ComponentIR::FactoryDef::_get_def_kind_skel, 0},
+      {"_repository_id", &POA_CORBA::ComponentIR::FactoryDef::_repository_id_skel, 0},
       {"_component", &POA_CORBA::ComponentIR::FactoryDef::_component_skel, 0},
       {"_get_result", &POA_CORBA::ComponentIR::FactoryDef::_get_result_skel, 0},
       {"destroy", &POA_CORBA::ComponentIR::FactoryDef::destroy_skel, 0},
@@ -10463,16 +11593,18 @@ TAO_CORBA_ComponentIR_FactoryDef_Perfect_Hash_OpTable::lookup (const char *str,
                   return 0;
                 case  28:
                   resword = &wordlist[26]; break;
-                case  30:
+                case  29:
                   resword = &wordlist[27]; break;
-                case  31:
+                case  30:
                   resword = &wordlist[28]; break;
-                case  32:
+                case  31:
                   resword = &wordlist[29]; break;
-                case  33:
+                case  32:
                   resword = &wordlist[30]; break;
-                case  36:
+                case  33:
                   resword = &wordlist[31]; break;
+                case  36:
+                  resword = &wordlist[32]; break;
                 default: return 0;
                 }
               if (*str == *resword->opname && !strncmp (str + 1, resword->opname + 1, len - 1))
@@ -10487,7 +11619,7 @@ TAO_CORBA_ComponentIR_FactoryDef_Perfect_Hash_OpTable::lookup (const char *str,
 static TAO_CORBA_ComponentIR_FactoryDef_Perfect_Hash_OpTable tao_CORBA_ComponentIR_FactoryDef_optable;
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:999
+// be\be_visitor_interface/interface_ss.cpp:921
 
 TAO::Collocation_Proxy_Broker *
 CORBA_ComponentIR__TAO_FactoryDef_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -10507,10 +11639,7 @@ CORBA_ComponentIR__TAO_FactoryDef_Proxy_Broker_Factory_Initializer (size_t)
 static int
 CORBA_ComponentIR__TAO_FactoryDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
   CORBA_ComponentIR__TAO_FactoryDef_Proxy_Broker_Factory_Initializer (
-      reinterpret_cast<
-          size_t> (
-          CORBA_ComponentIR__TAO_FactoryDef_Proxy_Broker_Factory_Initializer
-        )
+      reinterpret_cast<size_t> (CORBA_ComponentIR__TAO_FactoryDef_Proxy_Broker_Factory_Initializer)
     );
 
 
@@ -10570,8 +11699,8 @@ namespace POA_CORBA
             this->operation_details_,
             this->args_);
         
-        TAO::SArg_Traits< CORBA::Char *>::in_arg_type arg_1 =
-          TAO::Portable_Server::get_in_arg< CORBA::Char *, TAO::SArg_Traits< CORBA::Char *>::in_arg_type> (
+        TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
+          TAO::Portable_Server::get_in_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type> (
             this->operation_details_,
             this->args_,
             1);
@@ -10608,7 +11737,7 @@ void POA_CORBA::ComponentIR::FactoryDef::_is_a_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  TAO::SArg_Traits< CORBA::Char *>::in_arg_val _tao_repository_id;
+  TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
   
   TAO::Argument * const args[] =
     {
@@ -10733,10 +11862,102 @@ void POA_CORBA::ComponentIR::FactoryDef::_non_existent_skel (
   
 }
 
+namespace POA_CORBA
+{
+  namespace ComponentIR
+  {
+    
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/upcall_command_ss.cpp:127
+    
+    class _repository_id_FactoryDef_Upcall_Command
+      : public TAO::Upcall_Command
+    {
+    public:
+      inline _repository_id_FactoryDef_Upcall_Command (
+        POA_CORBA::ComponentIR::FactoryDef * servant,
+        TAO_Operation_Details const * operation_details,
+        TAO::Argument * const args[])
+        : servant_ (servant)
+        , operation_details_ (operation_details)
+        , args_ (args)
+      {
+      }
+      
+      virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+      {
+        TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
+          TAO::Portable_Server::get_ret_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type> (
+            this->operation_details_,
+            this->args_);
+        
+        
+        retval =
+          this->servant_-> _repository_id (
+            ACE_ENV_SINGLE_ARG_PARAMETER);
+          
+      }
+    
+    private:
+      POA_CORBA::ComponentIR::FactoryDef * const servant_;
+      TAO_Operation_Details const * const operation_details_;
+      TAO::Argument * const * const args_;
+    };
+    
+  }
+  
+}
+void POA_CORBA::ComponentIR::FactoryDef::_repository_id_skel (
+    TAO_ServerRequest & server_request, 
+    void * TAO_INTERCEPTOR (servant_upcall),
+    void * servant
+    ACE_ENV_ARG_DECL
+  )
+{
+  
+  
+#if TAO_HAS_INTERCEPTORS == 1
+  static CORBA::TypeCode_ptr const * const exceptions = 0;
+  static size_t const nexceptions = 0;
+#endif /* TAO_HAS_INTERCEPTORS */
+  
+  TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
+  
+  TAO::Argument * const args[] =
+    {
+      &retval
+    };
+  
+  static size_t const nargs = 1;
+  
+  POA_CORBA::ComponentIR::FactoryDef * const impl =
+    static_cast<POA_CORBA::ComponentIR::FactoryDef *> (servant);
+  
+  _repository_id_FactoryDef_Upcall_Command command (
+    impl,
+    server_request.operation_details (),
+    args);
+  
+  TAO::Upcall_Wrapper upcall_wrapper;
+  upcall_wrapper.upcall (server_request
+                         , args
+                         , nargs
+                         , command
+#if TAO_HAS_INTERCEPTORS == 1
+                         , servant_upcall
+                         , exceptions
+                         , nexceptions
+#endif  /* TAO_HAS_INTERCEPTORS == 1 */
+                         ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+  
+}
+
 
 
 // TAO_IDL - Generated from 
-// be\be_visitor_interface/interface_ss.cpp:393
+// be\be_visitor_interface/interface_ss.cpp:501
 
 
 
@@ -10909,7 +12130,7 @@ const char* POA_CORBA::ComponentIR::FactoryDef::_interface_repository_id (void)
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:940
+// be\be_visitor_interface/interface_ss.cpp:862
 
 void POA_CORBA::ComponentIR::FactoryDef::_dispatch (
     TAO_ServerRequest & req,
@@ -10924,7 +12145,7 @@ void POA_CORBA::ComponentIR::FactoryDef::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:891
+// be\be_visitor_interface/interface_ss.cpp:813
 
 CORBA::ComponentIR::FactoryDef *
 POA_CORBA::ComponentIR::FactoryDef::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -10956,7 +12177,7 @@ POA_CORBA::ComponentIR::FactoryDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1455
+// be\be_interface.cpp:1465
 
 class TAO_CORBA_ComponentIR_FinderDef_Perfect_Hash_OpTable
   : public TAO_Perfect_Hash_OpTable
@@ -10969,7 +12190,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: c:\ace\latest\ACE_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0 -a -o -t -p -K opname -L C++ -Z TAO_CORBA_ComponentIR_FinderDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ACE\Any\ACE_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0 -a -o -t -p -K opname -L C++ -Z TAO_CORBA_ComponentIR_FinderDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_ComponentIR_FinderDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -11026,14 +12247,14 @@ TAO_CORBA_ComponentIR_FinderDef_Perfect_Hash_OpTable::lookup (const char *str, u
 {
   enum
     {
-      TOTAL_KEYWORDS = 28,
+      TOTAL_KEYWORDS = 29,
       MIN_WORD_LENGTH = 4,
       MAX_WORD_LENGTH = 26,
       MIN_HASH_VALUE = 4,
       MAX_HASH_VALUE = 36,
       HASH_VALUE_RANGE = 33,
       DUPLICATES = 10,
-      WORDLIST_SIZE = 32
+      WORDLIST_SIZE = 33
     };
 
   static const TAO_operation_db_entry  wordlist[] =
@@ -11062,6 +12283,7 @@ TAO_CORBA_ComponentIR_FinderDef_Perfect_Hash_OpTable::lookup (const char *str, u
       {"_get_result_def", &POA_CORBA::ComponentIR::FinderDef::_get_result_def_skel, 0},
       {"_set_result_def", &POA_CORBA::ComponentIR::FinderDef::_set_result_def_skel, 0},
       {"_get_def_kind", &POA_CORBA::ComponentIR::FinderDef::_get_def_kind_skel, 0},
+      {"_repository_id", &POA_CORBA::ComponentIR::FinderDef::_repository_id_skel, 0},
       {"_component", &POA_CORBA::ComponentIR::FinderDef::_component_skel, 0},
       {"_get_result", &POA_CORBA::ComponentIR::FinderDef::_get_result_skel, 0},
       {"destroy", &POA_CORBA::ComponentIR::FinderDef::destroy_skel, 0},
@@ -11140,16 +12362,18 @@ TAO_CORBA_ComponentIR_FinderDef_Perfect_Hash_OpTable::lookup (const char *str, u
                   return 0;
                 case  28:
                   resword = &wordlist[26]; break;
-                case  30:
+                case  29:
                   resword = &wordlist[27]; break;
-                case  31:
+                case  30:
                   resword = &wordlist[28]; break;
-                case  32:
+                case  31:
                   resword = &wordlist[29]; break;
-                case  33:
+                case  32:
                   resword = &wordlist[30]; break;
-                case  36:
+                case  33:
                   resword = &wordlist[31]; break;
+                case  36:
+                  resword = &wordlist[32]; break;
                 default: return 0;
                 }
               if (*str == *resword->opname && !strncmp (str + 1, resword->opname + 1, len - 1))
@@ -11164,7 +12388,7 @@ TAO_CORBA_ComponentIR_FinderDef_Perfect_Hash_OpTable::lookup (const char *str, u
 static TAO_CORBA_ComponentIR_FinderDef_Perfect_Hash_OpTable tao_CORBA_ComponentIR_FinderDef_optable;
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:999
+// be\be_visitor_interface/interface_ss.cpp:921
 
 TAO::Collocation_Proxy_Broker *
 CORBA_ComponentIR__TAO_FinderDef_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -11184,10 +12408,7 @@ CORBA_ComponentIR__TAO_FinderDef_Proxy_Broker_Factory_Initializer (size_t)
 static int
 CORBA_ComponentIR__TAO_FinderDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
   CORBA_ComponentIR__TAO_FinderDef_Proxy_Broker_Factory_Initializer (
-      reinterpret_cast<
-          size_t> (
-          CORBA_ComponentIR__TAO_FinderDef_Proxy_Broker_Factory_Initializer
-        )
+      reinterpret_cast<size_t> (CORBA_ComponentIR__TAO_FinderDef_Proxy_Broker_Factory_Initializer)
     );
 
 
@@ -11247,8 +12468,8 @@ namespace POA_CORBA
             this->operation_details_,
             this->args_);
         
-        TAO::SArg_Traits< CORBA::Char *>::in_arg_type arg_1 =
-          TAO::Portable_Server::get_in_arg< CORBA::Char *, TAO::SArg_Traits< CORBA::Char *>::in_arg_type> (
+        TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
+          TAO::Portable_Server::get_in_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type> (
             this->operation_details_,
             this->args_,
             1);
@@ -11285,7 +12506,7 @@ void POA_CORBA::ComponentIR::FinderDef::_is_a_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  TAO::SArg_Traits< CORBA::Char *>::in_arg_val _tao_repository_id;
+  TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
   
   TAO::Argument * const args[] =
     {
@@ -11410,10 +12631,102 @@ void POA_CORBA::ComponentIR::FinderDef::_non_existent_skel (
   
 }
 
+namespace POA_CORBA
+{
+  namespace ComponentIR
+  {
+    
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/upcall_command_ss.cpp:127
+    
+    class _repository_id_FinderDef_Upcall_Command
+      : public TAO::Upcall_Command
+    {
+    public:
+      inline _repository_id_FinderDef_Upcall_Command (
+        POA_CORBA::ComponentIR::FinderDef * servant,
+        TAO_Operation_Details const * operation_details,
+        TAO::Argument * const args[])
+        : servant_ (servant)
+        , operation_details_ (operation_details)
+        , args_ (args)
+      {
+      }
+      
+      virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+      {
+        TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
+          TAO::Portable_Server::get_ret_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type> (
+            this->operation_details_,
+            this->args_);
+        
+        
+        retval =
+          this->servant_-> _repository_id (
+            ACE_ENV_SINGLE_ARG_PARAMETER);
+          
+      }
+    
+    private:
+      POA_CORBA::ComponentIR::FinderDef * const servant_;
+      TAO_Operation_Details const * const operation_details_;
+      TAO::Argument * const * const args_;
+    };
+    
+  }
+  
+}
+void POA_CORBA::ComponentIR::FinderDef::_repository_id_skel (
+    TAO_ServerRequest & server_request, 
+    void * TAO_INTERCEPTOR (servant_upcall),
+    void * servant
+    ACE_ENV_ARG_DECL
+  )
+{
+  
+  
+#if TAO_HAS_INTERCEPTORS == 1
+  static CORBA::TypeCode_ptr const * const exceptions = 0;
+  static size_t const nexceptions = 0;
+#endif /* TAO_HAS_INTERCEPTORS */
+  
+  TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
+  
+  TAO::Argument * const args[] =
+    {
+      &retval
+    };
+  
+  static size_t const nargs = 1;
+  
+  POA_CORBA::ComponentIR::FinderDef * const impl =
+    static_cast<POA_CORBA::ComponentIR::FinderDef *> (servant);
+  
+  _repository_id_FinderDef_Upcall_Command command (
+    impl,
+    server_request.operation_details (),
+    args);
+  
+  TAO::Upcall_Wrapper upcall_wrapper;
+  upcall_wrapper.upcall (server_request
+                         , args
+                         , nargs
+                         , command
+#if TAO_HAS_INTERCEPTORS == 1
+                         , servant_upcall
+                         , exceptions
+                         , nexceptions
+#endif  /* TAO_HAS_INTERCEPTORS == 1 */
+                         ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+  
+}
+
 
 
 // TAO_IDL - Generated from 
-// be\be_visitor_interface/interface_ss.cpp:393
+// be\be_visitor_interface/interface_ss.cpp:501
 
 
 
@@ -11586,7 +12899,7 @@ const char* POA_CORBA::ComponentIR::FinderDef::_interface_repository_id (void) c
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:940
+// be\be_visitor_interface/interface_ss.cpp:862
 
 void POA_CORBA::ComponentIR::FinderDef::_dispatch (
     TAO_ServerRequest & req,
@@ -11601,7 +12914,7 @@ void POA_CORBA::ComponentIR::FinderDef::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:891
+// be\be_visitor_interface/interface_ss.cpp:813
 
 CORBA::ComponentIR::FinderDef *
 POA_CORBA::ComponentIR::FinderDef::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -11633,7 +12946,7 @@ POA_CORBA::ComponentIR::FinderDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1455
+// be\be_interface.cpp:1465
 
 class TAO_CORBA_ComponentIR_HomeDef_Perfect_Hash_OpTable
   : public TAO_Perfect_Hash_OpTable
@@ -11646,53 +12959,53 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: c:\ace\latest\ACE_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0 -a -o -t -p -K opname -L C++ -Z TAO_CORBA_ComponentIR_HomeDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ACE\Any\ACE_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0 -a -o -t -p -K opname -L C++ -Z TAO_CORBA_ComponentIR_HomeDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_ComponentIR_HomeDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
   static const unsigned char asso_values[] =
     {
 #if defined (ACE_MVS)
-     106, 106, 106, 106, 106, 106, 106, 106, 106, 106,
-     106, 106, 106, 106, 106, 106, 106, 106, 106, 106,
-     106, 106, 106, 106, 106, 106, 106, 106, 106, 106,
-     106, 106, 106, 106, 106, 106, 106, 106, 106, 106,
-     106, 106, 106, 106, 106, 106, 106, 106, 106, 106,
-     106, 106, 106, 106, 106, 106, 106, 106, 106, 106,
-     106, 106, 106, 106, 106, 106, 106, 106, 106, 106,
-     106, 106, 106, 106, 106, 106, 106, 106, 106, 106,
-     106, 106, 106, 106, 106, 106, 106, 106, 106, 106,
-     106, 106, 106, 106, 106, 106, 106, 106, 106, 106,
-     106, 106, 106, 106, 106, 106, 106, 106, 106,   0,
-     106, 106, 106, 106, 106, 106, 106, 106, 106, 106,
-     106, 106, 106, 106, 106, 106, 106, 106, 106,   0,
-     106,  55,  20,   0, 106, 106, 106,  15, 106, 106,
-     106, 106, 106, 106, 106, 106, 106,   0,   0,  20,
-     106,   0, 106,   5, 106, 106, 106, 106, 106, 106,
-     106, 106,  35,  35, 106, 106, 106,   5,  10, 106,
-     106, 106, 106, 106, 106, 106, 106, 106, 106, 106,
-     106, 106, 106, 106, 106, 106, 106, 106, 106, 106,
-     106, 106, 106, 106, 106, 106, 106, 106, 106, 106,
-     106, 106, 106, 106, 106, 106, 106, 106, 106, 106,
-     106, 106, 106, 106, 106, 106, 106, 106, 106, 106,
-     106, 106, 106, 106, 106, 106, 106, 106, 106, 106,
-     106, 106, 106, 106, 106, 106, 106, 106, 106, 106,
-     106, 106, 106, 106, 106, 106, 106, 106, 106, 106,
-     106, 106, 106, 106, 106, 106,
+     101, 101, 101, 101, 101, 101, 101, 101, 101, 101,
+     101, 101, 101, 101, 101, 101, 101, 101, 101, 101,
+     101, 101, 101, 101, 101, 101, 101, 101, 101, 101,
+     101, 101, 101, 101, 101, 101, 101, 101, 101, 101,
+     101, 101, 101, 101, 101, 101, 101, 101, 101, 101,
+     101, 101, 101, 101, 101, 101, 101, 101, 101, 101,
+     101, 101, 101, 101, 101, 101, 101, 101, 101, 101,
+     101, 101, 101, 101, 101, 101, 101, 101, 101, 101,
+     101, 101, 101, 101, 101, 101, 101, 101, 101, 101,
+     101, 101, 101, 101, 101, 101, 101, 101, 101, 101,
+     101, 101, 101, 101, 101, 101, 101, 101, 101,   0,
+     101, 101, 101, 101, 101, 101, 101, 101, 101, 101,
+     101, 101, 101, 101, 101, 101, 101, 101, 101,   0,
+     101,  45,  20,   0, 101, 101, 101,  15, 101, 101,
+     101, 101, 101, 101, 101, 101, 101,   0,   0,  20,
+     101,   0, 101,   5, 101, 101, 101, 101, 101, 101,
+     101, 101,  35,  40, 101, 101, 101,   5,  10, 101,
+     101, 101, 101, 101, 101, 101, 101, 101, 101, 101,
+     101, 101, 101, 101, 101, 101, 101, 101, 101, 101,
+     101, 101, 101, 101, 101, 101, 101, 101, 101, 101,
+     101, 101, 101, 101, 101, 101, 101, 101, 101, 101,
+     101, 101, 101, 101, 101, 101, 101, 101, 101, 101,
+     101, 101, 101, 101, 101, 101, 101, 101, 101, 101,
+     101, 101, 101, 101, 101, 101, 101, 101, 101, 101,
+     101, 101, 101, 101, 101, 101, 101, 101, 101, 101,
+     101, 101, 101, 101, 101, 101,
 #else
-     106, 106, 106, 106, 106, 106, 106, 106, 106, 106,
-     106, 106, 106, 106, 106, 106, 106, 106, 106, 106,
-     106, 106, 106, 106, 106, 106, 106, 106, 106, 106,
-     106, 106, 106, 106, 106, 106, 106, 106, 106, 106,
-     106, 106, 106, 106, 106, 106, 106, 106, 106, 106,
-     106, 106, 106, 106, 106, 106, 106, 106, 106, 106,
-     106, 106, 106, 106, 106, 106, 106, 106, 106, 106,
-     106, 106, 106, 106, 106, 106, 106, 106, 106, 106,
-     106, 106, 106, 106, 106, 106, 106, 106, 106, 106,
-     106, 106, 106, 106, 106,   0, 106,   0, 106,  55,
-      20,   0, 106, 106, 106,  15, 106, 106,   0,   0,
-      20, 106,   0, 106,   5,  35,  35, 106, 106, 106,
-       5,  10, 106, 106, 106, 106, 106, 106,
+     101, 101, 101, 101, 101, 101, 101, 101, 101, 101,
+     101, 101, 101, 101, 101, 101, 101, 101, 101, 101,
+     101, 101, 101, 101, 101, 101, 101, 101, 101, 101,
+     101, 101, 101, 101, 101, 101, 101, 101, 101, 101,
+     101, 101, 101, 101, 101, 101, 101, 101, 101, 101,
+     101, 101, 101, 101, 101, 101, 101, 101, 101, 101,
+     101, 101, 101, 101, 101, 101, 101, 101, 101, 101,
+     101, 101, 101, 101, 101, 101, 101, 101, 101, 101,
+     101, 101, 101, 101, 101, 101, 101, 101, 101, 101,
+     101, 101, 101, 101, 101,   0, 101,   0, 101,  45,
+      20,   0, 101, 101, 101,  15, 101, 101,   0,   0,
+      20, 101,   0, 101,   5,  35,  40, 101, 101, 101,
+       5,  10, 101, 101, 101, 101, 101, 101,
 #endif /* ACE_MVS */
     };
   return len + asso_values[(int) str[len - 1]] + asso_values[(int) str[0]];
@@ -11703,14 +13016,14 @@ TAO_CORBA_ComponentIR_HomeDef_Perfect_Hash_OpTable::lookup (const char *str, uns
 {
   enum
     {
-      TOTAL_KEYWORDS = 54,
+      TOTAL_KEYWORDS = 55,
       MIN_WORD_LENGTH = 4,
       MAX_WORD_LENGTH = 26,
       MIN_HASH_VALUE = 4,
-      MAX_HASH_VALUE = 105,
-      HASH_VALUE_RANGE = 102,
+      MAX_HASH_VALUE = 100,
+      HASH_VALUE_RANGE = 97,
       DUPLICATES = 14,
-      WORDLIST_SIZE = 58
+      WORDLIST_SIZE = 59
     };
 
   static const TAO_operation_db_entry  wordlist[] =
@@ -11736,6 +13049,7 @@ TAO_CORBA_ComponentIR_HomeDef_Perfect_Hash_OpTable::lookup (const char *str, uns
       {"_get_version", &POA_CORBA::ComponentIR::HomeDef::_get_version_skel, 0},
       {"_set_version", &POA_CORBA::ComponentIR::HomeDef::_set_version_skel, 0},
       {"_get_def_kind", &POA_CORBA::ComponentIR::HomeDef::_get_def_kind_skel, 0},
+      {"_repository_id", &POA_CORBA::ComponentIR::HomeDef::_repository_id_skel, 0},
       {"_get_defined_in", &POA_CORBA::ComponentIR::HomeDef::_get_defined_in_skel, 0},
       {"_get_containing_repository", &POA_CORBA::ComponentIR::HomeDef::_get_containing_repository_skel, 0},
       {"destroy", &POA_CORBA::ComponentIR::HomeDef::destroy_skel, 0},
@@ -11745,24 +13059,24 @@ TAO_CORBA_ComponentIR_HomeDef_Perfect_Hash_OpTable::lookup (const char *str, uns
       {"_non_existent", &POA_CORBA::ComponentIR::HomeDef::_non_existent_skel, 0},
       {"_get_base_interfaces", &POA_CORBA::ComponentIR::HomeDef::_get_base_interfaces_skel, 0},
       {"_set_base_interfaces", &POA_CORBA::ComponentIR::HomeDef::_set_base_interfaces_skel, 0},
-      {"_get_managed_component", &POA_CORBA::ComponentIR::HomeDef::_get_managed_component_skel, 0},
-      {"_set_managed_component", &POA_CORBA::ComponentIR::HomeDef::_set_managed_component_skel, 0},
-      {"_get_supported_interfaces", &POA_CORBA::ComponentIR::HomeDef::_get_supported_interfaces_skel, 0},
-      {"_set_supported_interfaces", &POA_CORBA::ComponentIR::HomeDef::_set_supported_interfaces_skel, 0},
       {"create_enum", &POA_CORBA::ComponentIR::HomeDef::create_enum_skel, 0},
       {"create_value", &POA_CORBA::ComponentIR::HomeDef::create_value_skel, 0},
       {"create_module", &POA_CORBA::ComponentIR::HomeDef::create_module_skel, 0},
       {"create_native", &POA_CORBA::ComponentIR::HomeDef::create_native_skel, 0},
+      {"_get_supported_interfaces", &POA_CORBA::ComponentIR::HomeDef::_get_supported_interfaces_skel, 0},
+      {"_set_supported_interfaces", &POA_CORBA::ComponentIR::HomeDef::_set_supported_interfaces_skel, 0},
       {"create_interface", &POA_CORBA::ComponentIR::HomeDef::create_interface_skel, 0},
       {"create_attribute", &POA_CORBA::ComponentIR::HomeDef::create_attribute_skel, 0},
       {"create_ext_value", &POA_CORBA::ComponentIR::HomeDef::create_ext_value_skel, 0},
-      {"describe_contents", &POA_CORBA::ComponentIR::HomeDef::describe_contents_skel, 0},
+      {"_get_managed_component", &POA_CORBA::ComponentIR::HomeDef::_get_managed_component_skel, 0},
+      {"_set_managed_component", &POA_CORBA::ComponentIR::HomeDef::_set_managed_component_skel, 0},
       {"create_finder", &POA_CORBA::ComponentIR::HomeDef::create_finder_skel, 0},
       {"create_ext_attribute", &POA_CORBA::ComponentIR::HomeDef::create_ext_attribute_skel, 0},
       {"create_value_box", &POA_CORBA::ComponentIR::HomeDef::create_value_box_skel, 0},
       {"create_local_interface", &POA_CORBA::ComponentIR::HomeDef::create_local_interface_skel, 0},
       {"create_factory", &POA_CORBA::ComponentIR::HomeDef::create_factory_skel, 0},
       {"create_abstract_interface", &POA_CORBA::ComponentIR::HomeDef::create_abstract_interface_skel, 0},
+      {"describe_contents", &POA_CORBA::ComponentIR::HomeDef::describe_contents_skel, 0},
       {"create_union", &POA_CORBA::ComponentIR::HomeDef::create_union_skel, 0},
       {"create_exception", &POA_CORBA::ComponentIR::HomeDef::create_exception_skel, 0},
       {"create_operation", &POA_CORBA::ComponentIR::HomeDef::create_operation_skel, 0},
@@ -11774,14 +13088,14 @@ TAO_CORBA_ComponentIR_HomeDef_Perfect_Hash_OpTable::lookup (const char *str, uns
 
   static const signed char lookup[] =
     {
-        -1,   -1,   -1,   -1,    4,    5,    6,   -7,   -3, -107,   10,   11,  -12,   -2, 
-      -107,   -1,   -1,   -1,   14,   15,   -1,   -1,  -16,   -2,  -18,   -2, -109, -108, 
-        20,   -1,  -21,   -2, -107,   23,   -1,   24,   25,   26,   27,   -1,   -1,   -1, 
-        28,   -1,   -1,   29,   -1,   -1,   30,   -1,   -1,  -31,   -2,  -33,   -2, -109, 
-        -1, -109,  -35,   -2, -107,   -1,   -1,   -1,  -39,   -2,   37,   38, -109,  -41, 
-        -3, -107,   44,   45,   -1,   46,   47,   48,   -1,   49,   50,   -1,   -1,   -1, 
-        -1,   -1,   -1,   51,   -1,  -52,   -2, -107,   -1,   -1,   -1,   -1,   -1,   -1, 
-        54,   -1,   -1,   -1,   55,   56,   -1,   57, 
+        -1,   -1,   -1,   -1,    4,    5,    6,   -7,   -3, -102,   10,   11,  -12,   -2, 
+      -102,   -1,   -1,   -1,   14,   15,   -1,   -1,  -16,   -2,  -18,   -2, -104, -103, 
+        20,   -1,  -21,   -2, -102,   23,   24,   25,   26,   27,   28,   -1,  -32,   -2, 
+        29,   -1,  -36,   -2,  -38,   -2,  -40,   -3,   30,  -43,   -2,   31,   -1, -115, 
+        34,   35, -114,   -1, -114, -113, -111,   45,   -1,   46,   47,   48,   -1,   49, 
+        50,   -1,   51,   -1,   -1,   -1,   -1,   52,   -1,  -53,   -2, -102,   -1,   -1, 
+        -1,   -1,   -1,   -1,   55,   -1,   -1,   -1,   56,   -1,   -1,   -1,   -1,   -1, 
+        57,   -1,   58, 
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -11819,7 +13133,7 @@ TAO_CORBA_ComponentIR_HomeDef_Perfect_Hash_OpTable::lookup (const char *str, uns
 static TAO_CORBA_ComponentIR_HomeDef_Perfect_Hash_OpTable tao_CORBA_ComponentIR_HomeDef_optable;
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:999
+// be\be_visitor_interface/interface_ss.cpp:921
 
 TAO::Collocation_Proxy_Broker *
 CORBA_ComponentIR__TAO_HomeDef_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -11839,10 +13153,7 @@ CORBA_ComponentIR__TAO_HomeDef_Proxy_Broker_Factory_Initializer (size_t)
 static int
 CORBA_ComponentIR__TAO_HomeDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
   CORBA_ComponentIR__TAO_HomeDef_Proxy_Broker_Factory_Initializer (
-      reinterpret_cast<
-          size_t> (
-          CORBA_ComponentIR__TAO_HomeDef_Proxy_Broker_Factory_Initializer
-        )
+      reinterpret_cast<size_t> (CORBA_ComponentIR__TAO_HomeDef_Proxy_Broker_Factory_Initializer)
     );
 
 
@@ -11897,8 +13208,8 @@ namespace POA_CORBA
       
       virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
       {
-        TAO::SArg_Traits< CORBA::ComponentIR::HomeDef>::ret_arg_type retval =
-          TAO::Portable_Server::get_ret_arg< CORBA::ComponentIR::HomeDef, TAO::SArg_Traits< CORBA::ComponentIR::HomeDef>::ret_arg_type> (
+        TAO::SArg_Traits< ::CORBA::ComponentIR::HomeDef>::ret_arg_type retval =
+          TAO::Portable_Server::get_ret_arg< ::CORBA::ComponentIR::HomeDef, TAO::SArg_Traits< ::CORBA::ComponentIR::HomeDef>::ret_arg_type> (
             this->operation_details_,
             this->args_);
         
@@ -11937,7 +13248,7 @@ void POA_CORBA::ComponentIR::HomeDef::_get_base_home_skel (
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
   
-  TAO::SArg_Traits< CORBA::ComponentIR::HomeDef>::ret_val retval;
+  TAO::SArg_Traits< ::CORBA::ComponentIR::HomeDef>::ret_val retval;
   
   TAO::Argument * const args[] =
     {
@@ -11993,8 +13304,8 @@ namespace POA_CORBA
       
       virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
       {
-        TAO::SArg_Traits< CORBA::ComponentIR::HomeDef>::in_arg_type arg_1 =
-          TAO::Portable_Server::get_in_arg< CORBA::ComponentIR::HomeDef, TAO::SArg_Traits< CORBA::ComponentIR::HomeDef>::in_arg_type> (
+        TAO::SArg_Traits< ::CORBA::ComponentIR::HomeDef>::in_arg_type arg_1 =
+          TAO::Portable_Server::get_in_arg< ::CORBA::ComponentIR::HomeDef, TAO::SArg_Traits< ::CORBA::ComponentIR::HomeDef>::in_arg_type> (
             this->operation_details_,
             this->args_,
             1);
@@ -12034,7 +13345,7 @@ void POA_CORBA::ComponentIR::HomeDef::_set_base_home_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   TAO::SArg_Traits< void>::ret_val retval;
-  TAO::SArg_Traits< CORBA::ComponentIR::HomeDef>::in_arg_val _tao_base_home;
+  TAO::SArg_Traits< ::CORBA::ComponentIR::HomeDef>::in_arg_val _tao_base_home;
   
   TAO::Argument * const args[] =
     {
@@ -12091,8 +13402,8 @@ namespace POA_CORBA
       
       virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
       {
-        TAO::SArg_Traits< CORBA::InterfaceDefSeq>::ret_arg_type retval =
-          TAO::Portable_Server::get_ret_arg< CORBA::InterfaceDefSeq, TAO::SArg_Traits< CORBA::InterfaceDefSeq>::ret_arg_type> (
+        TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::ret_arg_type retval =
+          TAO::Portable_Server::get_ret_arg< ::CORBA::InterfaceDefSeq, TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::ret_arg_type> (
             this->operation_details_,
             this->args_);
         
@@ -12131,7 +13442,7 @@ void POA_CORBA::ComponentIR::HomeDef::_get_supported_interfaces_skel (
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
   
-  TAO::SArg_Traits< CORBA::InterfaceDefSeq>::ret_val retval;
+  TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::ret_val retval;
   
   TAO::Argument * const args[] =
     {
@@ -12187,8 +13498,8 @@ namespace POA_CORBA
       
       virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
       {
-        TAO::SArg_Traits< CORBA::InterfaceDefSeq>::in_arg_type arg_1 =
-          TAO::Portable_Server::get_in_arg< CORBA::InterfaceDefSeq, TAO::SArg_Traits< CORBA::InterfaceDefSeq>::in_arg_type> (
+        TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_type arg_1 =
+          TAO::Portable_Server::get_in_arg< ::CORBA::InterfaceDefSeq, TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_type> (
             this->operation_details_,
             this->args_,
             1);
@@ -12228,7 +13539,7 @@ void POA_CORBA::ComponentIR::HomeDef::_set_supported_interfaces_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   TAO::SArg_Traits< void>::ret_val retval;
-  TAO::SArg_Traits< CORBA::InterfaceDefSeq>::in_arg_val _tao_supported_interfaces;
+  TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_val _tao_supported_interfaces;
   
   TAO::Argument * const args[] =
     {
@@ -12285,8 +13596,8 @@ namespace POA_CORBA
       
       virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
       {
-        TAO::SArg_Traits< CORBA::ComponentIR::ComponentDef>::ret_arg_type retval =
-          TAO::Portable_Server::get_ret_arg< CORBA::ComponentIR::ComponentDef, TAO::SArg_Traits< CORBA::ComponentIR::ComponentDef>::ret_arg_type> (
+        TAO::SArg_Traits< ::CORBA::ComponentIR::ComponentDef>::ret_arg_type retval =
+          TAO::Portable_Server::get_ret_arg< ::CORBA::ComponentIR::ComponentDef, TAO::SArg_Traits< ::CORBA::ComponentIR::ComponentDef>::ret_arg_type> (
             this->operation_details_,
             this->args_);
         
@@ -12325,7 +13636,7 @@ void POA_CORBA::ComponentIR::HomeDef::_get_managed_component_skel (
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
   
-  TAO::SArg_Traits< CORBA::ComponentIR::ComponentDef>::ret_val retval;
+  TAO::SArg_Traits< ::CORBA::ComponentIR::ComponentDef>::ret_val retval;
   
   TAO::Argument * const args[] =
     {
@@ -12381,8 +13692,8 @@ namespace POA_CORBA
       
       virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
       {
-        TAO::SArg_Traits< CORBA::ComponentIR::ComponentDef>::in_arg_type arg_1 =
-          TAO::Portable_Server::get_in_arg< CORBA::ComponentIR::ComponentDef, TAO::SArg_Traits< CORBA::ComponentIR::ComponentDef>::in_arg_type> (
+        TAO::SArg_Traits< ::CORBA::ComponentIR::ComponentDef>::in_arg_type arg_1 =
+          TAO::Portable_Server::get_in_arg< ::CORBA::ComponentIR::ComponentDef, TAO::SArg_Traits< ::CORBA::ComponentIR::ComponentDef>::in_arg_type> (
             this->operation_details_,
             this->args_,
             1);
@@ -12422,7 +13733,7 @@ void POA_CORBA::ComponentIR::HomeDef::_set_managed_component_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   TAO::SArg_Traits< void>::ret_val retval;
-  TAO::SArg_Traits< CORBA::ComponentIR::ComponentDef>::in_arg_val _tao_managed_component;
+  TAO::SArg_Traits< ::CORBA::ComponentIR::ComponentDef>::in_arg_val _tao_managed_component;
   
   TAO::Argument * const args[] =
     {
@@ -12479,8 +13790,8 @@ namespace POA_CORBA
       
       virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
       {
-        TAO::SArg_Traits< CORBA::ValueDef>::ret_arg_type retval =
-          TAO::Portable_Server::get_ret_arg< CORBA::ValueDef, TAO::SArg_Traits< CORBA::ValueDef>::ret_arg_type> (
+        TAO::SArg_Traits< ::CORBA::ValueDef>::ret_arg_type retval =
+          TAO::Portable_Server::get_ret_arg< ::CORBA::ValueDef, TAO::SArg_Traits< ::CORBA::ValueDef>::ret_arg_type> (
             this->operation_details_,
             this->args_);
         
@@ -12519,7 +13830,7 @@ void POA_CORBA::ComponentIR::HomeDef::_get_primary_key_skel (
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
   
-  TAO::SArg_Traits< CORBA::ValueDef>::ret_val retval;
+  TAO::SArg_Traits< ::CORBA::ValueDef>::ret_val retval;
   
   TAO::Argument * const args[] =
     {
@@ -12575,8 +13886,8 @@ namespace POA_CORBA
       
       virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
       {
-        TAO::SArg_Traits< CORBA::ValueDef>::in_arg_type arg_1 =
-          TAO::Portable_Server::get_in_arg< CORBA::ValueDef, TAO::SArg_Traits< CORBA::ValueDef>::in_arg_type> (
+        TAO::SArg_Traits< ::CORBA::ValueDef>::in_arg_type arg_1 =
+          TAO::Portable_Server::get_in_arg< ::CORBA::ValueDef, TAO::SArg_Traits< ::CORBA::ValueDef>::in_arg_type> (
             this->operation_details_,
             this->args_,
             1);
@@ -12616,7 +13927,7 @@ void POA_CORBA::ComponentIR::HomeDef::_set_primary_key_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   TAO::SArg_Traits< void>::ret_val retval;
-  TAO::SArg_Traits< CORBA::ValueDef>::in_arg_val _tao_primary_key;
+  TAO::SArg_Traits< ::CORBA::ValueDef>::in_arg_val _tao_primary_key;
   
   TAO::Argument * const args[] =
     {
@@ -12673,37 +13984,37 @@ namespace POA_CORBA
       
       virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
       {
-        TAO::SArg_Traits< CORBA::ComponentIR::FactoryDef>::ret_arg_type retval =
-          TAO::Portable_Server::get_ret_arg< CORBA::ComponentIR::FactoryDef, TAO::SArg_Traits< CORBA::ComponentIR::FactoryDef>::ret_arg_type> (
+        TAO::SArg_Traits< ::CORBA::ComponentIR::FactoryDef>::ret_arg_type retval =
+          TAO::Portable_Server::get_ret_arg< ::CORBA::ComponentIR::FactoryDef, TAO::SArg_Traits< ::CORBA::ComponentIR::FactoryDef>::ret_arg_type> (
             this->operation_details_,
             this->args_);
         
-        TAO::SArg_Traits< CORBA::RepositoryId>::in_arg_type arg_1 =
-          TAO::Portable_Server::get_in_arg< CORBA::RepositoryId, TAO::SArg_Traits< CORBA::RepositoryId>::in_arg_type> (
+        TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
+          TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId, TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type> (
             this->operation_details_,
             this->args_,
             1);
           
-        TAO::SArg_Traits< CORBA::Identifier>::in_arg_type arg_2 =
-          TAO::Portable_Server::get_in_arg< CORBA::Identifier, TAO::SArg_Traits< CORBA::Identifier>::in_arg_type> (
+        TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
+          TAO::Portable_Server::get_in_arg< ::CORBA::Identifier, TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type> (
             this->operation_details_,
             this->args_,
             2);
           
-        TAO::SArg_Traits< CORBA::VersionSpec>::in_arg_type arg_3 =
-          TAO::Portable_Server::get_in_arg< CORBA::VersionSpec, TAO::SArg_Traits< CORBA::VersionSpec>::in_arg_type> (
+        TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
+          TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec, TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type> (
             this->operation_details_,
             this->args_,
             3);
           
-        TAO::SArg_Traits< CORBA::ParDescriptionSeq>::in_arg_type arg_4 =
-          TAO::Portable_Server::get_in_arg< CORBA::ParDescriptionSeq, TAO::SArg_Traits< CORBA::ParDescriptionSeq>::in_arg_type> (
+        TAO::SArg_Traits< ::CORBA::ParDescriptionSeq>::in_arg_type arg_4 =
+          TAO::Portable_Server::get_in_arg< ::CORBA::ParDescriptionSeq, TAO::SArg_Traits< ::CORBA::ParDescriptionSeq>::in_arg_type> (
             this->operation_details_,
             this->args_,
             4);
           
-        TAO::SArg_Traits< CORBA::ExceptionDefSeq>::in_arg_type arg_5 =
-          TAO::Portable_Server::get_in_arg< CORBA::ExceptionDefSeq, TAO::SArg_Traits< CORBA::ExceptionDefSeq>::in_arg_type> (
+        TAO::SArg_Traits< ::CORBA::ExceptionDefSeq>::in_arg_type arg_5 =
+          TAO::Portable_Server::get_in_arg< ::CORBA::ExceptionDefSeq, TAO::SArg_Traits< ::CORBA::ExceptionDefSeq>::in_arg_type> (
             this->operation_details_,
             this->args_,
             5);
@@ -12748,12 +14059,12 @@ void POA_CORBA::ComponentIR::HomeDef::create_factory_skel (
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
   
-  TAO::SArg_Traits< CORBA::ComponentIR::FactoryDef>::ret_val retval;
-  TAO::SArg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id;
-  TAO::SArg_Traits< CORBA::Identifier>::in_arg_val _tao_name;
-  TAO::SArg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version;
-  TAO::SArg_Traits< CORBA::ParDescriptionSeq>::in_arg_val _tao_params;
-  TAO::SArg_Traits< CORBA::ExceptionDefSeq>::in_arg_val _tao_exceptions;
+  TAO::SArg_Traits< ::CORBA::ComponentIR::FactoryDef>::ret_val retval;
+  TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
+  TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
+  TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version;
+  TAO::SArg_Traits< ::CORBA::ParDescriptionSeq>::in_arg_val _tao_params;
+  TAO::SArg_Traits< ::CORBA::ExceptionDefSeq>::in_arg_val _tao_exceptions;
   
   TAO::Argument * const args[] =
     {
@@ -12814,37 +14125,37 @@ namespace POA_CORBA
       
       virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
       {
-        TAO::SArg_Traits< CORBA::ComponentIR::FinderDef>::ret_arg_type retval =
-          TAO::Portable_Server::get_ret_arg< CORBA::ComponentIR::FinderDef, TAO::SArg_Traits< CORBA::ComponentIR::FinderDef>::ret_arg_type> (
+        TAO::SArg_Traits< ::CORBA::ComponentIR::FinderDef>::ret_arg_type retval =
+          TAO::Portable_Server::get_ret_arg< ::CORBA::ComponentIR::FinderDef, TAO::SArg_Traits< ::CORBA::ComponentIR::FinderDef>::ret_arg_type> (
             this->operation_details_,
             this->args_);
         
-        TAO::SArg_Traits< CORBA::RepositoryId>::in_arg_type arg_1 =
-          TAO::Portable_Server::get_in_arg< CORBA::RepositoryId, TAO::SArg_Traits< CORBA::RepositoryId>::in_arg_type> (
+        TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
+          TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId, TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type> (
             this->operation_details_,
             this->args_,
             1);
           
-        TAO::SArg_Traits< CORBA::Identifier>::in_arg_type arg_2 =
-          TAO::Portable_Server::get_in_arg< CORBA::Identifier, TAO::SArg_Traits< CORBA::Identifier>::in_arg_type> (
+        TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
+          TAO::Portable_Server::get_in_arg< ::CORBA::Identifier, TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type> (
             this->operation_details_,
             this->args_,
             2);
           
-        TAO::SArg_Traits< CORBA::VersionSpec>::in_arg_type arg_3 =
-          TAO::Portable_Server::get_in_arg< CORBA::VersionSpec, TAO::SArg_Traits< CORBA::VersionSpec>::in_arg_type> (
+        TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
+          TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec, TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type> (
             this->operation_details_,
             this->args_,
             3);
           
-        TAO::SArg_Traits< CORBA::ParDescriptionSeq>::in_arg_type arg_4 =
-          TAO::Portable_Server::get_in_arg< CORBA::ParDescriptionSeq, TAO::SArg_Traits< CORBA::ParDescriptionSeq>::in_arg_type> (
+        TAO::SArg_Traits< ::CORBA::ParDescriptionSeq>::in_arg_type arg_4 =
+          TAO::Portable_Server::get_in_arg< ::CORBA::ParDescriptionSeq, TAO::SArg_Traits< ::CORBA::ParDescriptionSeq>::in_arg_type> (
             this->operation_details_,
             this->args_,
             4);
           
-        TAO::SArg_Traits< CORBA::ExceptionDefSeq>::in_arg_type arg_5 =
-          TAO::Portable_Server::get_in_arg< CORBA::ExceptionDefSeq, TAO::SArg_Traits< CORBA::ExceptionDefSeq>::in_arg_type> (
+        TAO::SArg_Traits< ::CORBA::ExceptionDefSeq>::in_arg_type arg_5 =
+          TAO::Portable_Server::get_in_arg< ::CORBA::ExceptionDefSeq, TAO::SArg_Traits< ::CORBA::ExceptionDefSeq>::in_arg_type> (
             this->operation_details_,
             this->args_,
             5);
@@ -12889,12 +14200,12 @@ void POA_CORBA::ComponentIR::HomeDef::create_finder_skel (
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
   
-  TAO::SArg_Traits< CORBA::ComponentIR::FinderDef>::ret_val retval;
-  TAO::SArg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id;
-  TAO::SArg_Traits< CORBA::Identifier>::in_arg_val _tao_name;
-  TAO::SArg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version;
-  TAO::SArg_Traits< CORBA::ParDescriptionSeq>::in_arg_val _tao_params;
-  TAO::SArg_Traits< CORBA::ExceptionDefSeq>::in_arg_val _tao_exceptions;
+  TAO::SArg_Traits< ::CORBA::ComponentIR::FinderDef>::ret_val retval;
+  TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
+  TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
+  TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version;
+  TAO::SArg_Traits< ::CORBA::ParDescriptionSeq>::in_arg_val _tao_params;
+  TAO::SArg_Traits< ::CORBA::ExceptionDefSeq>::in_arg_val _tao_exceptions;
   
   TAO::Argument * const args[] =
     {
@@ -12964,8 +14275,8 @@ namespace POA_CORBA
             this->operation_details_,
             this->args_);
         
-        TAO::SArg_Traits< CORBA::Char *>::in_arg_type arg_1 =
-          TAO::Portable_Server::get_in_arg< CORBA::Char *, TAO::SArg_Traits< CORBA::Char *>::in_arg_type> (
+        TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
+          TAO::Portable_Server::get_in_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type> (
             this->operation_details_,
             this->args_,
             1);
@@ -13002,7 +14313,7 @@ void POA_CORBA::ComponentIR::HomeDef::_is_a_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  TAO::SArg_Traits< CORBA::Char *>::in_arg_val _tao_repository_id;
+  TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
   
   TAO::Argument * const args[] =
     {
@@ -13127,10 +14438,102 @@ void POA_CORBA::ComponentIR::HomeDef::_non_existent_skel (
   
 }
 
+namespace POA_CORBA
+{
+  namespace ComponentIR
+  {
+    
+    
+    // TAO_IDL - Generated from
+    // be\be_visitor_operation/upcall_command_ss.cpp:127
+    
+    class _repository_id_HomeDef_Upcall_Command
+      : public TAO::Upcall_Command
+    {
+    public:
+      inline _repository_id_HomeDef_Upcall_Command (
+        POA_CORBA::ComponentIR::HomeDef * servant,
+        TAO_Operation_Details const * operation_details,
+        TAO::Argument * const args[])
+        : servant_ (servant)
+        , operation_details_ (operation_details)
+        , args_ (args)
+      {
+      }
+      
+      virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+      {
+        TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
+          TAO::Portable_Server::get_ret_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type> (
+            this->operation_details_,
+            this->args_);
+        
+        
+        retval =
+          this->servant_-> _repository_id (
+            ACE_ENV_SINGLE_ARG_PARAMETER);
+          
+      }
+    
+    private:
+      POA_CORBA::ComponentIR::HomeDef * const servant_;
+      TAO_Operation_Details const * const operation_details_;
+      TAO::Argument * const * const args_;
+    };
+    
+  }
+  
+}
+void POA_CORBA::ComponentIR::HomeDef::_repository_id_skel (
+    TAO_ServerRequest & server_request, 
+    void * TAO_INTERCEPTOR (servant_upcall),
+    void * servant
+    ACE_ENV_ARG_DECL
+  )
+{
+  
+  
+#if TAO_HAS_INTERCEPTORS == 1
+  static CORBA::TypeCode_ptr const * const exceptions = 0;
+  static size_t const nexceptions = 0;
+#endif /* TAO_HAS_INTERCEPTORS */
+  
+  TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
+  
+  TAO::Argument * const args[] =
+    {
+      &retval
+    };
+  
+  static size_t const nargs = 1;
+  
+  POA_CORBA::ComponentIR::HomeDef * const impl =
+    static_cast<POA_CORBA::ComponentIR::HomeDef *> (servant);
+  
+  _repository_id_HomeDef_Upcall_Command command (
+    impl,
+    server_request.operation_details (),
+    args);
+  
+  TAO::Upcall_Wrapper upcall_wrapper;
+  upcall_wrapper.upcall (server_request
+                         , args
+                         , nargs
+                         , command
+#if TAO_HAS_INTERCEPTORS == 1
+                         , servant_upcall
+                         , exceptions
+                         , nexceptions
+#endif  /* TAO_HAS_INTERCEPTORS == 1 */
+                         ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+  
+}
+
 
 
 // TAO_IDL - Generated from 
-// be\be_visitor_interface/interface_ss.cpp:393
+// be\be_visitor_interface/interface_ss.cpp:501
 
 
 
@@ -13319,7 +14722,7 @@ const char* POA_CORBA::ComponentIR::HomeDef::_interface_repository_id (void) con
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:940
+// be\be_visitor_interface/interface_ss.cpp:862
 
 void POA_CORBA::ComponentIR::HomeDef::_dispatch (
     TAO_ServerRequest & req,
@@ -13334,7 +14737,7 @@ void POA_CORBA::ComponentIR::HomeDef::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:891
+// be\be_visitor_interface/interface_ss.cpp:813
 
 CORBA::ComponentIR::HomeDef *
 POA_CORBA::ComponentIR::HomeDef::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -13365,844 +14768,5 @@ POA_CORBA::ComponentIR::HomeDef::_this (ACE_ENV_SINGLE_ARG_DECL)
       );
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_root/root.cpp:1582
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-#if !defined (_CORBA_DEFINITIONKIND__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_DEFINITIONKIND__SARG_TRAITS_TMPLINST_SS_
-
-  template class TAO::SArg_Traits<CORBA::DefinitionKind>;
-
-  template class TAO::Basic_SArg_Traits_T<CORBA::DefinitionKind>;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_REPOSITORY__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_REPOSITORY__SARG_TRAITS_TMPLINST_SS_
-
-  template class TAO::SArg_Traits<CORBA::Repository>;
-
-  template class
-    TAO::Object_SArg_Traits_T<
-        CORBA::Repository_ptr,
-        CORBA::Repository_var,
-        CORBA::Repository_out,
-      >;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_CONTAINER__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_CONTAINER__SARG_TRAITS_TMPLINST_SS_
-
-  template class TAO::SArg_Traits<CORBA::Container>;
-
-  template class
-    TAO::Object_SArg_Traits_T<
-        CORBA::Container_ptr,
-        CORBA::Container_var,
-        CORBA::Container_out,
-      >;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_IDLTYPE__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_IDLTYPE__SARG_TRAITS_TMPLINST_SS_
-
-  template class TAO::SArg_Traits<CORBA::IDLType>;
-
-  template class
-    TAO::Object_SArg_Traits_T<
-        CORBA::IDLType_ptr,
-        CORBA::IDLType_var,
-        CORBA::IDLType_out,
-      >;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_INTERFACEDEF__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_INTERFACEDEF__SARG_TRAITS_TMPLINST_SS_
-
-  template class TAO::SArg_Traits<CORBA::InterfaceDef>;
-
-  template class
-    TAO::Object_SArg_Traits_T<
-        CORBA::InterfaceDef_ptr,
-        CORBA::InterfaceDef_var,
-        CORBA::InterfaceDef_out,
-      >;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_SEQUENCE__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_SEQUENCE__SARG_TRAITS_TMPLINST_SS_
-
-  template class TAO::SArg_Traits<CORBA::InterfaceDefSeq>;
-
-  template class
-    TAO::Var_Size_SArg_Traits_T<
-        CORBA::InterfaceDefSeq,
-        CORBA::InterfaceDefSeq_var,
-        CORBA::InterfaceDefSeq_out
-      >;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_VALUEDEF__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_VALUEDEF__SARG_TRAITS_TMPLINST_SS_
-
-  template class TAO::SArg_Traits<CORBA::ValueDef>;
-
-  template class
-    TAO::Object_SArg_Traits_T<
-        CORBA::ValueDef_ptr,
-        CORBA::ValueDef_var,
-        CORBA::ValueDef_out,
-      >;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_SEQUENCE__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_SEQUENCE__SARG_TRAITS_TMPLINST_SS_
-
-  template class TAO::SArg_Traits<CORBA::ValueDefSeq>;
-
-  template class
-    TAO::Var_Size_SArg_Traits_T<
-        CORBA::ValueDefSeq,
-        CORBA::ValueDefSeq_var,
-        CORBA::ValueDefSeq_out
-      >;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_SEQUENCE__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_SEQUENCE__SARG_TRAITS_TMPLINST_SS_
-
-  template class TAO::SArg_Traits<CORBA::InitializerSeq>;
-
-  template class
-    TAO::Var_Size_SArg_Traits_T<
-        CORBA::InitializerSeq,
-        CORBA::InitializerSeq_var,
-        CORBA::InitializerSeq_out
-      >;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_SEQUENCE__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_SEQUENCE__SARG_TRAITS_TMPLINST_SS_
-
-  template class TAO::SArg_Traits<CORBA::ExtInitializerSeq>;
-
-  template class
-    TAO::Var_Size_SArg_Traits_T<
-        CORBA::ExtInitializerSeq,
-        CORBA::ExtInitializerSeq_var,
-        CORBA::ExtInitializerSeq_out
-      >;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_SEQUENCE__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_SEQUENCE__SARG_TRAITS_TMPLINST_SS_
-
-  template class TAO::SArg_Traits<CORBA::ExceptionDefSeq>;
-
-  template class
-    TAO::Var_Size_SArg_Traits_T<
-        CORBA::ExceptionDefSeq,
-        CORBA::ExceptionDefSeq_var,
-        CORBA::ExceptionDefSeq_out
-      >;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_OPERATIONMODE__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_OPERATIONMODE__SARG_TRAITS_TMPLINST_SS_
-
-  template class TAO::SArg_Traits<CORBA::OperationMode>;
-
-  template class TAO::Basic_SArg_Traits_T<CORBA::OperationMode>;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_SEQUENCE__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_SEQUENCE__SARG_TRAITS_TMPLINST_SS_
-
-  template class TAO::SArg_Traits<CORBA::ParDescriptionSeq>;
-
-  template class
-    TAO::Var_Size_SArg_Traits_T<
-        CORBA::ParDescriptionSeq,
-        CORBA::ParDescriptionSeq_var,
-        CORBA::ParDescriptionSeq_out
-      >;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_SEQUENCE__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_SEQUENCE__SARG_TRAITS_TMPLINST_SS_
-
-  template class TAO::SArg_Traits<CORBA::ContextIdSeq>;
-
-  template class
-    TAO::Var_Size_SArg_Traits_T<
-        CORBA::ContextIdSeq,
-        CORBA::ContextIdSeq_var,
-        CORBA::ContextIdSeq_out
-      >;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_COMPONENTIR_COMPONENTDEF__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_COMPONENTIR_COMPONENTDEF__SARG_TRAITS_TMPLINST_SS_
-
-  template class TAO::SArg_Traits<CORBA::ComponentIR::ComponentDef>;
-
-  template class
-    TAO::Object_SArg_Traits_T<
-        CORBA::ComponentIR::ComponentDef_ptr,
-        CORBA::ComponentIR::ComponentDef_var,
-        CORBA::ComponentIR::ComponentDef_out,
-      >;
-
-#endif /* end #if !defined */
-
-  template class
-    TAO::Ret_Object_SArgument_T<
-        CORBA::ComponentIR::ComponentDef_ptr,
-        CORBA::ComponentIR::ComponentDef_var
-      >;
-
-  template class
-    TAO::In_Object_SArgument_T<
-        CORBA::ComponentIR::ComponentDef_ptr
-      >;
-
-  template class
-    TAO::Ret_Var_Size_SArgument_T<
-        CORBA::InterfaceDefSeq,
-        CORBA::InterfaceDefSeq_var
-      >;
-
-  template class
-    TAO::In_Var_Size_SArgument_T<
-        CORBA::InterfaceDefSeq
-      >;
-
-  template class
-    TAO::Ret_Object_SArgument_T<
-        CORBA::ComponentIR::ProvidesDef_ptr,
-        CORBA::ComponentIR::ProvidesDef_var
-      >;
-
-  template class
-    TAO::In_Object_SArgument_T<
-        CORBA::InterfaceDef_ptr
-      >;
-
-  template class
-    TAO::Ret_Object_SArgument_T<
-        CORBA::ComponentIR::UsesDef_ptr,
-        CORBA::ComponentIR::UsesDef_var
-      >;
-
-  template class
-    TAO::Ret_Object_SArgument_T<
-        CORBA::ComponentIR::EmitsDef_ptr,
-        CORBA::ComponentIR::EmitsDef_var
-      >;
-
-  template class
-    TAO::In_Object_SArgument_T<
-        CORBA::ComponentIR::EventDef_ptr
-      >;
-
-  template class
-    TAO::Ret_Object_SArgument_T<
-        CORBA::ComponentIR::PublishesDef_ptr,
-        CORBA::ComponentIR::PublishesDef_var
-      >;
-
-  template class
-    TAO::Ret_Object_SArgument_T<
-        CORBA::ComponentIR::ConsumesDef_ptr,
-        CORBA::ComponentIR::ConsumesDef_var
-      >;
-
-#if !defined (_CORBA_COMPONENTIR_HOMEDEF__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_COMPONENTIR_HOMEDEF__SARG_TRAITS_TMPLINST_SS_
-
-  template class TAO::SArg_Traits<CORBA::ComponentIR::HomeDef>;
-
-  template class
-    TAO::Object_SArg_Traits_T<
-        CORBA::ComponentIR::HomeDef_ptr,
-        CORBA::ComponentIR::HomeDef_var,
-        CORBA::ComponentIR::HomeDef_out,
-      >;
-
-#endif /* end #if !defined */
-
-  template class
-    TAO::Ret_Object_SArgument_T<
-        CORBA::ComponentIR::HomeDef_ptr,
-        CORBA::ComponentIR::HomeDef_var
-      >;
-
-  template class
-    TAO::In_Object_SArgument_T<
-        CORBA::ComponentIR::HomeDef_ptr
-      >;
-
-  template class
-    TAO::Ret_Object_SArgument_T<
-        CORBA::ValueDef_ptr,
-        CORBA::ValueDef_var
-      >;
-
-  template class
-    TAO::In_Object_SArgument_T<
-        CORBA::ValueDef_ptr
-      >;
-
-  template class
-    TAO::Ret_Object_SArgument_T<
-        CORBA::ComponentIR::FactoryDef_ptr,
-        CORBA::ComponentIR::FactoryDef_var
-      >;
-
-  template class
-    TAO::In_Var_Size_SArgument_T<
-        CORBA::ParDescriptionSeq
-      >;
-
-  template class
-    TAO::In_Var_Size_SArgument_T<
-        CORBA::ExceptionDefSeq
-      >;
-
-  template class
-    TAO::Ret_Object_SArgument_T<
-        CORBA::ComponentIR::FinderDef_ptr,
-        CORBA::ComponentIR::FinderDef_var
-      >;
-
-#if !defined (_CORBA_COMPONENTIR_EVENTDEF__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_COMPONENTIR_EVENTDEF__SARG_TRAITS_TMPLINST_SS_
-
-  template class TAO::SArg_Traits<CORBA::ComponentIR::EventDef>;
-
-  template class
-    TAO::Object_SArg_Traits_T<
-        CORBA::ComponentIR::EventDef_ptr,
-        CORBA::ComponentIR::EventDef_var,
-        CORBA::ComponentIR::EventDef_out,
-      >;
-
-#endif /* end #if !defined */
-
-  template class
-    TAO::Ret_Object_SArgument_T<
-        CORBA::ComponentIR::EventDef_ptr,
-        CORBA::ComponentIR::EventDef_var
-      >;
-
-  template class
-    TAO::In_Var_Size_SArgument_T<
-        CORBA::ValueDefSeq
-      >;
-
-  template class
-    TAO::In_Var_Size_SArgument_T<
-        CORBA::ExtInitializerSeq
-      >;
-
-#if !defined (_CORBA_COMPONENTIR_PROVIDESDEF__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_COMPONENTIR_PROVIDESDEF__SARG_TRAITS_TMPLINST_SS_
-
-  template class TAO::SArg_Traits<CORBA::ComponentIR::ProvidesDef>;
-
-  template class
-    TAO::Object_SArg_Traits_T<
-        CORBA::ComponentIR::ProvidesDef_ptr,
-        CORBA::ComponentIR::ProvidesDef_var,
-        CORBA::ComponentIR::ProvidesDef_out,
-      >;
-
-#endif /* end #if !defined */
-
-  template class
-    TAO::Ret_Object_SArgument_T<
-        CORBA::InterfaceDef_ptr,
-        CORBA::InterfaceDef_var
-      >;
-
-#if !defined (_CORBA_COMPONENTIR_USESDEF__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_COMPONENTIR_USESDEF__SARG_TRAITS_TMPLINST_SS_
-
-  template class TAO::SArg_Traits<CORBA::ComponentIR::UsesDef>;
-
-  template class
-    TAO::Object_SArg_Traits_T<
-        CORBA::ComponentIR::UsesDef_ptr,
-        CORBA::ComponentIR::UsesDef_var,
-        CORBA::ComponentIR::UsesDef_out,
-      >;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_COMPONENTIR_EMITSDEF__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_COMPONENTIR_EMITSDEF__SARG_TRAITS_TMPLINST_SS_
-
-  template class TAO::SArg_Traits<CORBA::ComponentIR::EmitsDef>;
-
-  template class
-    TAO::Object_SArg_Traits_T<
-        CORBA::ComponentIR::EmitsDef_ptr,
-        CORBA::ComponentIR::EmitsDef_var,
-        CORBA::ComponentIR::EmitsDef_out,
-      >;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_COMPONENTIR_PUBLISHESDEF__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_COMPONENTIR_PUBLISHESDEF__SARG_TRAITS_TMPLINST_SS_
-
-  template class TAO::SArg_Traits<CORBA::ComponentIR::PublishesDef>;
-
-  template class
-    TAO::Object_SArg_Traits_T<
-        CORBA::ComponentIR::PublishesDef_ptr,
-        CORBA::ComponentIR::PublishesDef_var,
-        CORBA::ComponentIR::PublishesDef_out,
-      >;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_COMPONENTIR_CONSUMESDEF__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_COMPONENTIR_CONSUMESDEF__SARG_TRAITS_TMPLINST_SS_
-
-  template class TAO::SArg_Traits<CORBA::ComponentIR::ConsumesDef>;
-
-  template class
-    TAO::Object_SArg_Traits_T<
-        CORBA::ComponentIR::ConsumesDef_ptr,
-        CORBA::ComponentIR::ConsumesDef_var,
-        CORBA::ComponentIR::ConsumesDef_out,
-      >;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_COMPONENTIR_FACTORYDEF__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_COMPONENTIR_FACTORYDEF__SARG_TRAITS_TMPLINST_SS_
-
-  template class TAO::SArg_Traits<CORBA::ComponentIR::FactoryDef>;
-
-  template class
-    TAO::Object_SArg_Traits_T<
-        CORBA::ComponentIR::FactoryDef_ptr,
-        CORBA::ComponentIR::FactoryDef_var,
-        CORBA::ComponentIR::FactoryDef_out,
-      >;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_COMPONENTIR_FINDERDEF__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_COMPONENTIR_FINDERDEF__SARG_TRAITS_TMPLINST_SS_
-
-  template class TAO::SArg_Traits<CORBA::ComponentIR::FinderDef>;
-
-  template class
-    TAO::Object_SArg_Traits_T<
-        CORBA::ComponentIR::FinderDef_ptr,
-        CORBA::ComponentIR::FinderDef_var,
-        CORBA::ComponentIR::FinderDef_out,
-      >;
-
-#endif /* end #if !defined */
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#if !defined (_CORBA_DEFINITIONKIND__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_DEFINITIONKIND__SARG_TRAITS_TMPLINST_SS_
-
-# pragma instantiate TAO::SArg_Traits<CORBA::DefinitionKind>
-
-# pragma instantiate TAO::Basic_SArg_Traits_T<CORBA::DefinitionKind>
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_REPOSITORY__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_REPOSITORY__SARG_TRAITS_TMPLINST_SS_
-
-# pragma instantiate TAO::SArg_Traits<CORBA::Repository>
-
-# pragma instantiate \
-    TAO::Object_SArg_Traits_T< \
-        CORBA::Repository_ptr, \
-        CORBA::Repository_var, \
-        CORBA::Repository_out, \
-      >
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_CONTAINER__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_CONTAINER__SARG_TRAITS_TMPLINST_SS_
-
-# pragma instantiate TAO::SArg_Traits<CORBA::Container>
-
-# pragma instantiate \
-    TAO::Object_SArg_Traits_T< \
-        CORBA::Container_ptr, \
-        CORBA::Container_var, \
-        CORBA::Container_out, \
-      >
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_IDLTYPE__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_IDLTYPE__SARG_TRAITS_TMPLINST_SS_
-
-# pragma instantiate TAO::SArg_Traits<CORBA::IDLType>
-
-# pragma instantiate \
-    TAO::Object_SArg_Traits_T< \
-        CORBA::IDLType_ptr, \
-        CORBA::IDLType_var, \
-        CORBA::IDLType_out, \
-      >
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_INTERFACEDEF__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_INTERFACEDEF__SARG_TRAITS_TMPLINST_SS_
-
-# pragma instantiate TAO::SArg_Traits<CORBA::InterfaceDef>
-
-# pragma instantiate \
-    TAO::Object_SArg_Traits_T< \
-        CORBA::InterfaceDef_ptr, \
-        CORBA::InterfaceDef_var, \
-        CORBA::InterfaceDef_out, \
-      >
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_SEQUENCE__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_SEQUENCE__SARG_TRAITS_TMPLINST_SS_
-
-# pragma instantiate TAO::SArg_Traits<CORBA::InterfaceDefSeq>
-
-# pragma instantiate \
-    TAO::Var_Size_SArg_Traits_T< \
-        CORBA::InterfaceDefSeq, \
-        CORBA::InterfaceDefSeq_var, \
-        CORBA::InterfaceDefSeq_out \
-      >
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_VALUEDEF__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_VALUEDEF__SARG_TRAITS_TMPLINST_SS_
-
-# pragma instantiate TAO::SArg_Traits<CORBA::ValueDef>
-
-# pragma instantiate \
-    TAO::Object_SArg_Traits_T< \
-        CORBA::ValueDef_ptr, \
-        CORBA::ValueDef_var, \
-        CORBA::ValueDef_out, \
-      >
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_SEQUENCE__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_SEQUENCE__SARG_TRAITS_TMPLINST_SS_
-
-# pragma instantiate TAO::SArg_Traits<CORBA::ValueDefSeq>
-
-# pragma instantiate \
-    TAO::Var_Size_SArg_Traits_T< \
-        CORBA::ValueDefSeq, \
-        CORBA::ValueDefSeq_var, \
-        CORBA::ValueDefSeq_out \
-      >
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_SEQUENCE__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_SEQUENCE__SARG_TRAITS_TMPLINST_SS_
-
-# pragma instantiate TAO::SArg_Traits<CORBA::InitializerSeq>
-
-# pragma instantiate \
-    TAO::Var_Size_SArg_Traits_T< \
-        CORBA::InitializerSeq, \
-        CORBA::InitializerSeq_var, \
-        CORBA::InitializerSeq_out \
-      >
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_SEQUENCE__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_SEQUENCE__SARG_TRAITS_TMPLINST_SS_
-
-# pragma instantiate TAO::SArg_Traits<CORBA::ExtInitializerSeq>
-
-# pragma instantiate \
-    TAO::Var_Size_SArg_Traits_T< \
-        CORBA::ExtInitializerSeq, \
-        CORBA::ExtInitializerSeq_var, \
-        CORBA::ExtInitializerSeq_out \
-      >
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_SEQUENCE__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_SEQUENCE__SARG_TRAITS_TMPLINST_SS_
-
-# pragma instantiate TAO::SArg_Traits<CORBA::ExceptionDefSeq>
-
-# pragma instantiate \
-    TAO::Var_Size_SArg_Traits_T< \
-        CORBA::ExceptionDefSeq, \
-        CORBA::ExceptionDefSeq_var, \
-        CORBA::ExceptionDefSeq_out \
-      >
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_OPERATIONMODE__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_OPERATIONMODE__SARG_TRAITS_TMPLINST_SS_
-
-# pragma instantiate TAO::SArg_Traits<CORBA::OperationMode>
-
-# pragma instantiate TAO::Basic_SArg_Traits_T<CORBA::OperationMode>
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_SEQUENCE__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_SEQUENCE__SARG_TRAITS_TMPLINST_SS_
-
-# pragma instantiate TAO::SArg_Traits<CORBA::ParDescriptionSeq>
-
-# pragma instantiate \
-    TAO::Var_Size_SArg_Traits_T< \
-        CORBA::ParDescriptionSeq, \
-        CORBA::ParDescriptionSeq_var, \
-        CORBA::ParDescriptionSeq_out \
-      >
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_SEQUENCE__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_SEQUENCE__SARG_TRAITS_TMPLINST_SS_
-
-# pragma instantiate TAO::SArg_Traits<CORBA::ContextIdSeq>
-
-# pragma instantiate \
-    TAO::Var_Size_SArg_Traits_T< \
-        CORBA::ContextIdSeq, \
-        CORBA::ContextIdSeq_var, \
-        CORBA::ContextIdSeq_out \
-      >
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_COMPONENTIR_COMPONENTDEF__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_COMPONENTIR_COMPONENTDEF__SARG_TRAITS_TMPLINST_SS_
-
-# pragma instantiate TAO::SArg_Traits<CORBA::ComponentIR::ComponentDef>
-
-# pragma instantiate \
-    TAO::Object_SArg_Traits_T< \
-        CORBA::ComponentIR::ComponentDef_ptr, \
-        CORBA::ComponentIR::ComponentDef_var, \
-        CORBA::ComponentIR::ComponentDef_out, \
-      >
-
-#endif /* end #if !defined */
-
-# pragma instantiate \
-    TAO::In_Object_SArgument_T< \
-        CORBA::ComponentIR::ComponentDef_ptr \
-      >
-
-# pragma instantiate \
-    TAO::In_Var_Size_SArgument_T< \
-        CORBA::InterfaceDefSeq \
-      >
-
-# pragma instantiate \
-    TAO::In_Object_SArgument_T< \
-        CORBA::InterfaceDef_ptr \
-      >
-
-# pragma instantiate \
-    TAO::In_Object_SArgument_T< \
-        CORBA::ComponentIR::EventDef_ptr \
-      >
-
-#if !defined (_CORBA_COMPONENTIR_HOMEDEF__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_COMPONENTIR_HOMEDEF__SARG_TRAITS_TMPLINST_SS_
-
-# pragma instantiate TAO::SArg_Traits<CORBA::ComponentIR::HomeDef>
-
-# pragma instantiate \
-    TAO::Object_SArg_Traits_T< \
-        CORBA::ComponentIR::HomeDef_ptr, \
-        CORBA::ComponentIR::HomeDef_var, \
-        CORBA::ComponentIR::HomeDef_out, \
-      >
-
-#endif /* end #if !defined */
-
-# pragma instantiate \
-    TAO::In_Object_SArgument_T< \
-        CORBA::ComponentIR::HomeDef_ptr \
-      >
-
-# pragma instantiate \
-    TAO::In_Object_SArgument_T< \
-        CORBA::ValueDef_ptr \
-      >
-
-# pragma instantiate \
-    TAO::In_Var_Size_SArgument_T< \
-        CORBA::ParDescriptionSeq \
-      >
-
-# pragma instantiate \
-    TAO::In_Var_Size_SArgument_T< \
-        CORBA::ExceptionDefSeq \
-      >
-
-#if !defined (_CORBA_COMPONENTIR_EVENTDEF__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_COMPONENTIR_EVENTDEF__SARG_TRAITS_TMPLINST_SS_
-
-# pragma instantiate TAO::SArg_Traits<CORBA::ComponentIR::EventDef>
-
-# pragma instantiate \
-    TAO::Object_SArg_Traits_T< \
-        CORBA::ComponentIR::EventDef_ptr, \
-        CORBA::ComponentIR::EventDef_var, \
-        CORBA::ComponentIR::EventDef_out, \
-      >
-
-#endif /* end #if !defined */
-
-# pragma instantiate \
-    TAO::In_Var_Size_SArgument_T< \
-        CORBA::ValueDefSeq \
-      >
-
-# pragma instantiate \
-    TAO::In_Var_Size_SArgument_T< \
-        CORBA::ExtInitializerSeq \
-      >
-
-#if !defined (_CORBA_COMPONENTIR_PROVIDESDEF__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_COMPONENTIR_PROVIDESDEF__SARG_TRAITS_TMPLINST_SS_
-
-# pragma instantiate TAO::SArg_Traits<CORBA::ComponentIR::ProvidesDef>
-
-# pragma instantiate \
-    TAO::Object_SArg_Traits_T< \
-        CORBA::ComponentIR::ProvidesDef_ptr, \
-        CORBA::ComponentIR::ProvidesDef_var, \
-        CORBA::ComponentIR::ProvidesDef_out, \
-      >
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_COMPONENTIR_USESDEF__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_COMPONENTIR_USESDEF__SARG_TRAITS_TMPLINST_SS_
-
-# pragma instantiate TAO::SArg_Traits<CORBA::ComponentIR::UsesDef>
-
-# pragma instantiate \
-    TAO::Object_SArg_Traits_T< \
-        CORBA::ComponentIR::UsesDef_ptr, \
-        CORBA::ComponentIR::UsesDef_var, \
-        CORBA::ComponentIR::UsesDef_out, \
-      >
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_COMPONENTIR_EMITSDEF__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_COMPONENTIR_EMITSDEF__SARG_TRAITS_TMPLINST_SS_
-
-# pragma instantiate TAO::SArg_Traits<CORBA::ComponentIR::EmitsDef>
-
-# pragma instantiate \
-    TAO::Object_SArg_Traits_T< \
-        CORBA::ComponentIR::EmitsDef_ptr, \
-        CORBA::ComponentIR::EmitsDef_var, \
-        CORBA::ComponentIR::EmitsDef_out, \
-      >
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_COMPONENTIR_PUBLISHESDEF__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_COMPONENTIR_PUBLISHESDEF__SARG_TRAITS_TMPLINST_SS_
-
-# pragma instantiate TAO::SArg_Traits<CORBA::ComponentIR::PublishesDef>
-
-# pragma instantiate \
-    TAO::Object_SArg_Traits_T< \
-        CORBA::ComponentIR::PublishesDef_ptr, \
-        CORBA::ComponentIR::PublishesDef_var, \
-        CORBA::ComponentIR::PublishesDef_out, \
-      >
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_COMPONENTIR_CONSUMESDEF__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_COMPONENTIR_CONSUMESDEF__SARG_TRAITS_TMPLINST_SS_
-
-# pragma instantiate TAO::SArg_Traits<CORBA::ComponentIR::ConsumesDef>
-
-# pragma instantiate \
-    TAO::Object_SArg_Traits_T< \
-        CORBA::ComponentIR::ConsumesDef_ptr, \
-        CORBA::ComponentIR::ConsumesDef_var, \
-        CORBA::ComponentIR::ConsumesDef_out, \
-      >
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_COMPONENTIR_FACTORYDEF__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_COMPONENTIR_FACTORYDEF__SARG_TRAITS_TMPLINST_SS_
-
-# pragma instantiate TAO::SArg_Traits<CORBA::ComponentIR::FactoryDef>
-
-# pragma instantiate \
-    TAO::Object_SArg_Traits_T< \
-        CORBA::ComponentIR::FactoryDef_ptr, \
-        CORBA::ComponentIR::FactoryDef_var, \
-        CORBA::ComponentIR::FactoryDef_out, \
-      >
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_COMPONENTIR_FINDERDEF__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_COMPONENTIR_FINDERDEF__SARG_TRAITS_TMPLINST_SS_
-
-# pragma instantiate TAO::SArg_Traits<CORBA::ComponentIR::FinderDef>
-
-# pragma instantiate \
-    TAO::Object_SArg_Traits_T< \
-        CORBA::ComponentIR::FinderDef_ptr, \
-        CORBA::ComponentIR::FinderDef_var, \
-        CORBA::ComponentIR::FinderDef_out, \
-      >
-
-#endif /* end #if !defined */
-
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
-
 #endif /* ifndef */
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.h
index ad6ea8424a4..7f292047ff5 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.h
@@ -26,15 +26,15 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:390
+// be\be_codegen.cpp:393
 
 #ifndef _TAO_IDL_ORIG_IFR_COMPONENTSS_H_
 #define _TAO_IDL_ORIG_IFR_COMPONENTSS_H_
 
 #include /**/ "ace/pre.h"
 
-#include "IFR_ExtendedS.h"
 #include "tao/IFR_Client/IFR_ComponentsC.h"
+#include "IFR_ExtendedS.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -58,82 +58,89 @@
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_module/module_sh.cpp:49
-  
+
   namespace ComponentIR
   {
-    
-    
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_sh.cpp:87
-    
+
     class EventDef;
     typedef EventDef *EventDef_ptr;
-    
-    
+
+
     class  EventDef
       : public virtual POA_CORBA::ExtValueDef
     {
     protected:
       EventDef (void);
-    
+
     public:
       // Useful for template programming.
       typedef ::CORBA::ComponentIR::EventDef _stub_type;
       typedef ::CORBA::ComponentIR::EventDef_ptr _stub_ptr_type;
       typedef ::CORBA::ComponentIR::EventDef_var _stub_var_type;
-      
+
       EventDef (const EventDef& rhs);
       virtual ~EventDef (void);
-      
+
       virtual CORBA::Boolean _is_a (
           const char* logical_type_id
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
-      
+
       static void _is_a_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
           ACE_ENV_ARG_DECL
         );
-      
+
       static void _non_existent_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
           ACE_ENV_ARG_DECL
         );
-      
+
       static void _interface_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
           ACE_ENV_ARG_DECL
         );
-      
+
       static void _component_skel (
           TAO_ServerRequest & req,
           void * servant_upcall,
           void * servant
           ACE_ENV_ARG_DECL
         );
-      
+
+      static void _repository_id_skel (
+          TAO_ServerRequest & req,
+          void * servant_upcall,
+          void * servant
+          ACE_ENV_ARG_DECL
+        );
+
       virtual void _dispatch (
           TAO_ServerRequest & req,
           void * servant_upcall
           ACE_ENV_ARG_DECL
         );
-      
+
       ::CORBA::ComponentIR::EventDef *_this (
           ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
         );
-      
+
       virtual const char* _interface_repository_id (void) const;
-      
+
       static void
       _get_def_kind_skel (
           TAO_ServerRequest & server_request,
@@ -141,54 +148,54 @@ namespace POA_CORBA
           void * servant
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
-      
+
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
-      
+      // be\be_interface.cpp:1869
+
       static void
       destroy_skel (
-          TAO_ServerRequest & server_request, 
+          TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
-      
+
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
-      
+      // be\be_interface.cpp:1869
+
       static void
       lookup_skel (
-          TAO_ServerRequest & server_request, 
+          TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
-      
+
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
-      
+      // be\be_interface.cpp:1869
+
       static void
       contents_skel (
-          TAO_ServerRequest & server_request, 
+          TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
-      
+
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
-      
+      // be\be_interface.cpp:1869
+
       static void
       lookup_name_skel (
-          TAO_ServerRequest & server_request, 
+          TAO_ServerRequest & server_request,
           void * servant_upcall,
           void * servant
           ACE_ENV_ARG_DECL_WITH_DEFAULTS
         );
-      
+
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
-      
+      // be\be_interface.cpp:1869
+
       static void
       describe_contents_skel (
           TAO_ServerRequest & server_request, 
@@ -198,7 +205,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       create_module_skel (
@@ -209,7 +216,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       create_constant_skel (
@@ -220,7 +227,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       create_struct_skel (
@@ -231,7 +238,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       create_union_skel (
@@ -242,7 +249,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       create_enum_skel (
@@ -253,7 +260,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       create_alias_skel (
@@ -264,7 +271,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       create_interface_skel (
@@ -275,7 +282,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       create_value_skel (
@@ -286,7 +293,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       create_value_box_skel (
@@ -297,7 +304,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       create_exception_skel (
@@ -308,7 +315,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       create_native_skel (
@@ -319,7 +326,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       create_abstract_interface_skel (
@@ -330,7 +337,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       create_local_interface_skel (
@@ -341,7 +348,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       create_ext_value_skel (
@@ -424,7 +431,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       describe_skel (
@@ -435,7 +442,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       move_skel (
@@ -566,7 +573,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       is_a_skel (
@@ -577,7 +584,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       describe_value_skel (
@@ -588,7 +595,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       create_value_member_skel (
@@ -599,7 +606,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       create_attribute_skel (
@@ -610,7 +617,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       create_operation_skel (
@@ -637,7 +644,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       describe_ext_value_skel (
@@ -648,7 +655,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       create_ext_attribute_skel (
@@ -714,6 +721,13 @@ namespace POA_CORBA
           ACE_ENV_ARG_DECL
         );
       
+      static void _repository_id_skel (
+          TAO_ServerRequest & req,
+          void * servant_upcall,
+          void * servant
+          ACE_ENV_ARG_DECL
+        );
+      
       virtual void _dispatch (
           TAO_ServerRequest & req,
           void * servant_upcall
@@ -808,7 +822,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       destroy_skel (
@@ -819,7 +833,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       lookup_skel (
@@ -830,7 +844,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       contents_skel (
@@ -841,7 +855,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       lookup_name_skel (
@@ -852,7 +866,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       describe_contents_skel (
@@ -863,7 +877,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       create_module_skel (
@@ -874,7 +888,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       create_constant_skel (
@@ -885,7 +899,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       create_struct_skel (
@@ -896,7 +910,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       create_union_skel (
@@ -907,7 +921,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       create_enum_skel (
@@ -918,7 +932,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       create_alias_skel (
@@ -929,7 +943,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       create_interface_skel (
@@ -940,7 +954,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       create_value_skel (
@@ -951,7 +965,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       create_value_box_skel (
@@ -962,7 +976,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       create_exception_skel (
@@ -973,7 +987,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       create_native_skel (
@@ -984,7 +998,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       create_abstract_interface_skel (
@@ -995,7 +1009,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       create_local_interface_skel (
@@ -1006,7 +1020,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       create_ext_value_skel (
@@ -1073,6 +1087,13 @@ namespace POA_CORBA
           ACE_ENV_ARG_DECL
         );
       
+      static void _repository_id_skel (
+          TAO_ServerRequest & req,
+          void * servant_upcall,
+          void * servant
+          ACE_ENV_ARG_DECL
+        );
+      
       virtual void _dispatch (
           TAO_ServerRequest & req,
           void * servant_upcall
@@ -1094,7 +1115,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       destroy_skel (
@@ -1105,7 +1126,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       lookup_skel (
@@ -1116,7 +1137,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       contents_skel (
@@ -1127,7 +1148,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       lookup_name_skel (
@@ -1138,7 +1159,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       describe_contents_skel (
@@ -1149,7 +1170,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       create_module_skel (
@@ -1160,7 +1181,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       create_constant_skel (
@@ -1171,7 +1192,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       create_struct_skel (
@@ -1182,7 +1203,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       create_union_skel (
@@ -1193,7 +1214,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       create_enum_skel (
@@ -1204,7 +1225,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       create_alias_skel (
@@ -1215,7 +1236,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       create_interface_skel (
@@ -1226,7 +1247,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       create_value_skel (
@@ -1237,7 +1258,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       create_value_box_skel (
@@ -1248,7 +1269,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       create_exception_skel (
@@ -1259,7 +1280,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       create_native_skel (
@@ -1270,7 +1291,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       create_abstract_interface_skel (
@@ -1281,7 +1302,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       create_local_interface_skel (
@@ -1292,7 +1313,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       create_ext_value_skel (
@@ -1375,7 +1396,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       describe_skel (
@@ -1386,7 +1407,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       move_skel (
@@ -1397,7 +1418,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       create_component_skel (
@@ -1408,7 +1429,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       create_home_skel (
@@ -1419,7 +1440,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       create_event_skel (
@@ -1486,6 +1507,13 @@ namespace POA_CORBA
           ACE_ENV_ARG_DECL
         );
       
+      static void _repository_id_skel (
+          TAO_ServerRequest & req,
+          void * servant_upcall,
+          void * servant
+          ACE_ENV_ARG_DECL
+        );
+      
       virtual void _dispatch (
           TAO_ServerRequest & req,
           void * servant_upcall
@@ -1507,7 +1535,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       destroy_skel (
@@ -1518,7 +1546,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       lookup_skel (
@@ -1529,7 +1557,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       contents_skel (
@@ -1540,7 +1568,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       lookup_name_skel (
@@ -1551,7 +1579,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       describe_contents_skel (
@@ -1562,7 +1590,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       create_module_skel (
@@ -1573,7 +1601,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       create_constant_skel (
@@ -1584,7 +1612,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       create_struct_skel (
@@ -1595,7 +1623,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       create_union_skel (
@@ -1606,7 +1634,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       create_enum_skel (
@@ -1617,7 +1645,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       create_alias_skel (
@@ -1628,7 +1656,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       create_interface_skel (
@@ -1639,7 +1667,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       create_value_skel (
@@ -1650,7 +1678,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       create_value_box_skel (
@@ -1661,7 +1689,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       create_exception_skel (
@@ -1672,7 +1700,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       create_native_skel (
@@ -1683,7 +1711,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       create_abstract_interface_skel (
@@ -1694,7 +1722,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       create_local_interface_skel (
@@ -1705,7 +1733,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       create_ext_value_skel (
@@ -1716,7 +1744,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       lookup_id_skel (
@@ -1727,7 +1755,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       get_canonical_typecode_skel (
@@ -1738,7 +1766,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       get_primitive_skel (
@@ -1749,7 +1777,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       create_string_skel (
@@ -1760,7 +1788,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       create_wstring_skel (
@@ -1771,7 +1799,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       create_sequence_skel (
@@ -1782,7 +1810,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       create_array_skel (
@@ -1793,7 +1821,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       create_fixed_skel (
@@ -1804,7 +1832,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       create_component_skel (
@@ -1815,7 +1843,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       create_home_skel (
@@ -1826,7 +1854,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       create_event_skel (
@@ -1892,6 +1920,13 @@ namespace POA_CORBA
           ACE_ENV_ARG_DECL
         );
       
+      static void _repository_id_skel (
+          TAO_ServerRequest & req,
+          void * servant_upcall,
+          void * servant
+          ACE_ENV_ARG_DECL
+        );
+      
       virtual void _dispatch (
           TAO_ServerRequest & req,
           void * servant_upcall
@@ -1948,7 +1983,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       destroy_skel (
@@ -2031,7 +2066,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       describe_skel (
@@ -2042,7 +2077,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       move_skel (
@@ -2108,6 +2143,13 @@ namespace POA_CORBA
           ACE_ENV_ARG_DECL
         );
       
+      static void _repository_id_skel (
+          TAO_ServerRequest & req,
+          void * servant_upcall,
+          void * servant
+          ACE_ENV_ARG_DECL
+        );
+      
       virtual void _dispatch (
           TAO_ServerRequest & req,
           void * servant_upcall
@@ -2199,7 +2241,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       destroy_skel (
@@ -2282,7 +2324,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       describe_skel (
@@ -2293,7 +2335,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       move_skel (
@@ -2359,6 +2401,13 @@ namespace POA_CORBA
           ACE_ENV_ARG_DECL
         );
       
+      static void _repository_id_skel (
+          TAO_ServerRequest & req,
+          void * servant_upcall,
+          void * servant
+          ACE_ENV_ARG_DECL
+        );
+      
       virtual void _dispatch (
           TAO_ServerRequest & req,
           void * servant_upcall
@@ -2433,7 +2482,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       destroy_skel (
@@ -2516,7 +2565,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       describe_skel (
@@ -2527,7 +2576,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       move_skel (
@@ -2593,6 +2642,13 @@ namespace POA_CORBA
           ACE_ENV_ARG_DECL
         );
       
+      static void _repository_id_skel (
+          TAO_ServerRequest & req,
+          void * servant_upcall,
+          void * servant
+          ACE_ENV_ARG_DECL
+        );
+      
       virtual void _dispatch (
           TAO_ServerRequest & req,
           void * servant_upcall
@@ -2614,7 +2670,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       destroy_skel (
@@ -2697,7 +2753,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       describe_skel (
@@ -2708,7 +2764,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       move_skel (
@@ -2735,7 +2791,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       is_a_skel (
@@ -2801,6 +2857,13 @@ namespace POA_CORBA
           ACE_ENV_ARG_DECL
         );
       
+      static void _repository_id_skel (
+          TAO_ServerRequest & req,
+          void * servant_upcall,
+          void * servant
+          ACE_ENV_ARG_DECL
+        );
+      
       virtual void _dispatch (
           TAO_ServerRequest & req,
           void * servant_upcall
@@ -2822,7 +2885,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       destroy_skel (
@@ -2905,7 +2968,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       describe_skel (
@@ -2916,7 +2979,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       move_skel (
@@ -2943,7 +3006,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       is_a_skel (
@@ -3009,6 +3072,13 @@ namespace POA_CORBA
           ACE_ENV_ARG_DECL
         );
       
+      static void _repository_id_skel (
+          TAO_ServerRequest & req,
+          void * servant_upcall,
+          void * servant
+          ACE_ENV_ARG_DECL
+        );
+      
       virtual void _dispatch (
           TAO_ServerRequest & req,
           void * servant_upcall
@@ -3030,7 +3100,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       destroy_skel (
@@ -3113,7 +3183,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       describe_skel (
@@ -3124,7 +3194,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       move_skel (
@@ -3151,7 +3221,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       is_a_skel (
@@ -3217,6 +3287,13 @@ namespace POA_CORBA
           ACE_ENV_ARG_DECL
         );
       
+      static void _repository_id_skel (
+          TAO_ServerRequest & req,
+          void * servant_upcall,
+          void * servant
+          ACE_ENV_ARG_DECL
+        );
+      
       virtual void _dispatch (
           TAO_ServerRequest & req,
           void * servant_upcall
@@ -3414,7 +3491,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       destroy_skel (
@@ -3425,7 +3502,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       lookup_skel (
@@ -3436,7 +3513,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       contents_skel (
@@ -3447,7 +3524,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       lookup_name_skel (
@@ -3458,7 +3535,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       describe_contents_skel (
@@ -3469,7 +3546,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       create_module_skel (
@@ -3480,7 +3557,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       create_constant_skel (
@@ -3491,7 +3568,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       create_struct_skel (
@@ -3502,7 +3579,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       create_union_skel (
@@ -3513,7 +3590,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       create_enum_skel (
@@ -3524,7 +3601,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       create_alias_skel (
@@ -3535,7 +3612,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       create_interface_skel (
@@ -3546,7 +3623,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       create_value_skel (
@@ -3557,7 +3634,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       create_value_box_skel (
@@ -3568,7 +3645,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       create_exception_skel (
@@ -3579,7 +3656,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       create_native_skel (
@@ -3590,7 +3667,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       create_abstract_interface_skel (
@@ -3601,7 +3678,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       create_local_interface_skel (
@@ -3612,7 +3689,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       create_ext_value_skel (
@@ -3695,7 +3772,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       describe_skel (
@@ -3706,7 +3783,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       move_skel (
@@ -3741,7 +3818,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       is_a_skel (
@@ -3752,7 +3829,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       describe_interface_skel (
@@ -3763,7 +3840,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       create_attribute_skel (
@@ -3774,7 +3851,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       create_operation_skel (
@@ -3785,7 +3862,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       describe_ext_interface_skel (
@@ -3796,7 +3873,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       create_ext_attribute_skel (
@@ -3862,6 +3939,13 @@ namespace POA_CORBA
           ACE_ENV_ARG_DECL
         );
       
+      static void _repository_id_skel (
+          TAO_ServerRequest & req,
+          void * servant_upcall,
+          void * servant
+          ACE_ENV_ARG_DECL
+        );
+      
       virtual void _dispatch (
           TAO_ServerRequest & req,
           void * servant_upcall
@@ -3883,7 +3967,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       destroy_skel (
@@ -3966,7 +4050,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       describe_skel (
@@ -3977,7 +4061,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       move_skel (
@@ -4131,6 +4215,13 @@ namespace POA_CORBA
           ACE_ENV_ARG_DECL
         );
       
+      static void _repository_id_skel (
+          TAO_ServerRequest & req,
+          void * servant_upcall,
+          void * servant
+          ACE_ENV_ARG_DECL
+        );
+      
       virtual void _dispatch (
           TAO_ServerRequest & req,
           void * servant_upcall
@@ -4152,7 +4243,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       destroy_skel (
@@ -4235,7 +4326,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       describe_skel (
@@ -4246,7 +4337,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       move_skel (
@@ -4400,6 +4491,13 @@ namespace POA_CORBA
           ACE_ENV_ARG_DECL
         );
       
+      static void _repository_id_skel (
+          TAO_ServerRequest & req,
+          void * servant_upcall,
+          void * servant
+          ACE_ENV_ARG_DECL
+        );
+      
       virtual void _dispatch (
           TAO_ServerRequest & req,
           void * servant_upcall
@@ -4605,7 +4703,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       destroy_skel (
@@ -4616,7 +4714,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       lookup_skel (
@@ -4627,7 +4725,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       contents_skel (
@@ -4638,7 +4736,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       lookup_name_skel (
@@ -4649,7 +4747,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       describe_contents_skel (
@@ -4660,7 +4758,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       create_module_skel (
@@ -4671,7 +4769,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       create_constant_skel (
@@ -4682,7 +4780,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       create_struct_skel (
@@ -4693,7 +4791,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       create_union_skel (
@@ -4704,7 +4802,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       create_enum_skel (
@@ -4715,7 +4813,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       create_alias_skel (
@@ -4726,7 +4824,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       create_interface_skel (
@@ -4737,7 +4835,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       create_value_skel (
@@ -4748,7 +4846,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       create_value_box_skel (
@@ -4759,7 +4857,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       create_exception_skel (
@@ -4770,7 +4868,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       create_native_skel (
@@ -4781,7 +4879,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       create_abstract_interface_skel (
@@ -4792,7 +4890,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       create_local_interface_skel (
@@ -4803,7 +4901,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       create_ext_value_skel (
@@ -4886,7 +4984,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       describe_skel (
@@ -4897,7 +4995,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       move_skel (
@@ -4932,7 +5030,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       is_a_skel (
@@ -4943,7 +5041,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       describe_interface_skel (
@@ -4954,7 +5052,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       create_attribute_skel (
@@ -4965,7 +5063,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       create_operation_skel (
@@ -4976,7 +5074,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       describe_ext_interface_skel (
@@ -4987,7 +5085,7 @@ namespace POA_CORBA
         );
       
       // TAO_IDL - Generated from
-      // be\be_interface.cpp:1859
+      // be\be_interface.cpp:1869
       
       static void
       create_ext_attribute_skel (
@@ -5009,7 +5107,7 @@ namespace POA_CORBA
 } // module CORBA
 
 // TAO_IDL - Generated from 
-// be\be_codegen.cpp:997
+// be\be_codegen.cpp:1120
 
 #include "IFR_ComponentsS_T.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.inl b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.inl
index daee23c91fd..d0110e8dece 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.inl
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS.inl
@@ -45,7 +45,7 @@ POA_CORBA::ComponentIR::EventDef::_get_def_kind_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -66,7 +66,7 @@ POA_CORBA::ComponentIR::EventDef::destroy_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -87,7 +87,7 @@ POA_CORBA::ComponentIR::EventDef::lookup_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -108,7 +108,7 @@ POA_CORBA::ComponentIR::EventDef::contents_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -129,7 +129,7 @@ POA_CORBA::ComponentIR::EventDef::lookup_name_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -150,7 +150,7 @@ POA_CORBA::ComponentIR::EventDef::describe_contents_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -171,7 +171,7 @@ POA_CORBA::ComponentIR::EventDef::create_module_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -192,7 +192,7 @@ POA_CORBA::ComponentIR::EventDef::create_constant_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -213,7 +213,7 @@ POA_CORBA::ComponentIR::EventDef::create_struct_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -234,7 +234,7 @@ POA_CORBA::ComponentIR::EventDef::create_union_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -255,7 +255,7 @@ POA_CORBA::ComponentIR::EventDef::create_enum_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -276,7 +276,7 @@ POA_CORBA::ComponentIR::EventDef::create_alias_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -297,7 +297,7 @@ POA_CORBA::ComponentIR::EventDef::create_interface_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -318,7 +318,7 @@ POA_CORBA::ComponentIR::EventDef::create_value_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -339,7 +339,7 @@ POA_CORBA::ComponentIR::EventDef::create_value_box_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -360,7 +360,7 @@ POA_CORBA::ComponentIR::EventDef::create_exception_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -381,7 +381,7 @@ POA_CORBA::ComponentIR::EventDef::create_native_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -402,7 +402,7 @@ POA_CORBA::ComponentIR::EventDef::create_abstract_interface_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -423,7 +423,7 @@ POA_CORBA::ComponentIR::EventDef::create_local_interface_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -606,7 +606,7 @@ POA_CORBA::ComponentIR::EventDef::_get_containing_repository_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -627,7 +627,7 @@ POA_CORBA::ComponentIR::EventDef::describe_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -918,7 +918,7 @@ POA_CORBA::ComponentIR::EventDef::_set_is_truncatable_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -939,7 +939,7 @@ POA_CORBA::ComponentIR::EventDef::is_a_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -960,7 +960,7 @@ POA_CORBA::ComponentIR::EventDef::describe_value_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -981,7 +981,7 @@ POA_CORBA::ComponentIR::EventDef::create_value_member_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -1002,7 +1002,7 @@ POA_CORBA::ComponentIR::EventDef::create_attribute_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -1059,7 +1059,7 @@ POA_CORBA::ComponentIR::EventDef::_set_ext_initializers_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -1080,7 +1080,7 @@ POA_CORBA::ComponentIR::EventDef::describe_ext_value_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -1119,7 +1119,7 @@ POA_CORBA::ComponentIR::Container::_get_def_kind_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -1140,7 +1140,7 @@ POA_CORBA::ComponentIR::Container::destroy_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -1161,7 +1161,7 @@ POA_CORBA::ComponentIR::Container::lookup_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -1182,7 +1182,7 @@ POA_CORBA::ComponentIR::Container::contents_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -1203,7 +1203,7 @@ POA_CORBA::ComponentIR::Container::lookup_name_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -1224,7 +1224,7 @@ POA_CORBA::ComponentIR::Container::describe_contents_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -1245,7 +1245,7 @@ POA_CORBA::ComponentIR::Container::create_module_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -1266,7 +1266,7 @@ POA_CORBA::ComponentIR::Container::create_constant_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -1287,7 +1287,7 @@ POA_CORBA::ComponentIR::Container::create_struct_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -1308,7 +1308,7 @@ POA_CORBA::ComponentIR::Container::create_union_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -1329,7 +1329,7 @@ POA_CORBA::ComponentIR::Container::create_enum_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -1350,7 +1350,7 @@ POA_CORBA::ComponentIR::Container::create_alias_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -1371,7 +1371,7 @@ POA_CORBA::ComponentIR::Container::create_interface_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -1392,7 +1392,7 @@ POA_CORBA::ComponentIR::Container::create_value_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -1413,7 +1413,7 @@ POA_CORBA::ComponentIR::Container::create_value_box_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -1434,7 +1434,7 @@ POA_CORBA::ComponentIR::Container::create_exception_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -1455,7 +1455,7 @@ POA_CORBA::ComponentIR::Container::create_native_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -1476,7 +1476,7 @@ POA_CORBA::ComponentIR::Container::create_abstract_interface_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -1497,7 +1497,7 @@ POA_CORBA::ComponentIR::Container::create_local_interface_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -1536,7 +1536,7 @@ POA_CORBA::ComponentIR::ModuleDef::_get_def_kind_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -1557,7 +1557,7 @@ POA_CORBA::ComponentIR::ModuleDef::destroy_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -1578,7 +1578,7 @@ POA_CORBA::ComponentIR::ModuleDef::lookup_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -1599,7 +1599,7 @@ POA_CORBA::ComponentIR::ModuleDef::contents_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -1620,7 +1620,7 @@ POA_CORBA::ComponentIR::ModuleDef::lookup_name_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -1641,7 +1641,7 @@ POA_CORBA::ComponentIR::ModuleDef::describe_contents_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -1662,7 +1662,7 @@ POA_CORBA::ComponentIR::ModuleDef::create_module_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -1683,7 +1683,7 @@ POA_CORBA::ComponentIR::ModuleDef::create_constant_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -1704,7 +1704,7 @@ POA_CORBA::ComponentIR::ModuleDef::create_struct_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -1725,7 +1725,7 @@ POA_CORBA::ComponentIR::ModuleDef::create_union_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -1746,7 +1746,7 @@ POA_CORBA::ComponentIR::ModuleDef::create_enum_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -1767,7 +1767,7 @@ POA_CORBA::ComponentIR::ModuleDef::create_alias_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -1788,7 +1788,7 @@ POA_CORBA::ComponentIR::ModuleDef::create_interface_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -1809,7 +1809,7 @@ POA_CORBA::ComponentIR::ModuleDef::create_value_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -1830,7 +1830,7 @@ POA_CORBA::ComponentIR::ModuleDef::create_value_box_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -1851,7 +1851,7 @@ POA_CORBA::ComponentIR::ModuleDef::create_exception_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -1872,7 +1872,7 @@ POA_CORBA::ComponentIR::ModuleDef::create_native_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -1893,7 +1893,7 @@ POA_CORBA::ComponentIR::ModuleDef::create_abstract_interface_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -1914,7 +1914,7 @@ POA_CORBA::ComponentIR::ModuleDef::create_local_interface_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -2097,7 +2097,7 @@ POA_CORBA::ComponentIR::ModuleDef::_get_containing_repository_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -2118,7 +2118,7 @@ POA_CORBA::ComponentIR::ModuleDef::describe_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -2139,7 +2139,7 @@ POA_CORBA::ComponentIR::ModuleDef::move_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -2160,7 +2160,7 @@ POA_CORBA::ComponentIR::ModuleDef::create_component_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -2181,7 +2181,7 @@ POA_CORBA::ComponentIR::ModuleDef::create_home_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -2220,7 +2220,7 @@ POA_CORBA::ComponentIR::Repository::_get_def_kind_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -2241,7 +2241,7 @@ POA_CORBA::ComponentIR::Repository::destroy_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -2262,7 +2262,7 @@ POA_CORBA::ComponentIR::Repository::lookup_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -2283,7 +2283,7 @@ POA_CORBA::ComponentIR::Repository::contents_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -2304,7 +2304,7 @@ POA_CORBA::ComponentIR::Repository::lookup_name_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -2325,7 +2325,7 @@ POA_CORBA::ComponentIR::Repository::describe_contents_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -2346,7 +2346,7 @@ POA_CORBA::ComponentIR::Repository::create_module_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -2367,7 +2367,7 @@ POA_CORBA::ComponentIR::Repository::create_constant_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -2388,7 +2388,7 @@ POA_CORBA::ComponentIR::Repository::create_struct_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -2409,7 +2409,7 @@ POA_CORBA::ComponentIR::Repository::create_union_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -2430,7 +2430,7 @@ POA_CORBA::ComponentIR::Repository::create_enum_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -2451,7 +2451,7 @@ POA_CORBA::ComponentIR::Repository::create_alias_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -2472,7 +2472,7 @@ POA_CORBA::ComponentIR::Repository::create_interface_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -2493,7 +2493,7 @@ POA_CORBA::ComponentIR::Repository::create_value_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -2514,7 +2514,7 @@ POA_CORBA::ComponentIR::Repository::create_value_box_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -2535,7 +2535,7 @@ POA_CORBA::ComponentIR::Repository::create_exception_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -2556,7 +2556,7 @@ POA_CORBA::ComponentIR::Repository::create_native_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -2577,7 +2577,7 @@ POA_CORBA::ComponentIR::Repository::create_abstract_interface_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -2598,7 +2598,7 @@ POA_CORBA::ComponentIR::Repository::create_local_interface_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -2619,7 +2619,7 @@ POA_CORBA::ComponentIR::Repository::create_ext_value_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -2640,7 +2640,7 @@ POA_CORBA::ComponentIR::Repository::lookup_id_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -2661,7 +2661,7 @@ POA_CORBA::ComponentIR::Repository::get_canonical_typecode_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -2682,7 +2682,7 @@ POA_CORBA::ComponentIR::Repository::get_primitive_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -2703,7 +2703,7 @@ POA_CORBA::ComponentIR::Repository::create_string_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -2724,7 +2724,7 @@ POA_CORBA::ComponentIR::Repository::create_wstring_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -2745,7 +2745,7 @@ POA_CORBA::ComponentIR::Repository::create_sequence_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -2766,7 +2766,7 @@ POA_CORBA::ComponentIR::Repository::create_array_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -2787,7 +2787,7 @@ POA_CORBA::ComponentIR::Repository::create_fixed_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -2808,7 +2808,7 @@ POA_CORBA::ComponentIR::Repository::create_component_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -2829,7 +2829,7 @@ POA_CORBA::ComponentIR::Repository::create_home_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -2868,7 +2868,7 @@ POA_CORBA::ComponentIR::ProvidesDef::_get_def_kind_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -3051,7 +3051,7 @@ POA_CORBA::ComponentIR::ProvidesDef::_get_containing_repository_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -3072,7 +3072,7 @@ POA_CORBA::ComponentIR::ProvidesDef::describe_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -3111,7 +3111,7 @@ POA_CORBA::ComponentIR::UsesDef::_get_def_kind_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -3294,7 +3294,7 @@ POA_CORBA::ComponentIR::UsesDef::_get_containing_repository_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -3315,7 +3315,7 @@ POA_CORBA::ComponentIR::UsesDef::describe_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -3354,7 +3354,7 @@ POA_CORBA::ComponentIR::EventPortDef::_get_def_kind_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -3537,7 +3537,7 @@ POA_CORBA::ComponentIR::EventPortDef::_get_containing_repository_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -3558,7 +3558,7 @@ POA_CORBA::ComponentIR::EventPortDef::describe_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -3597,7 +3597,7 @@ POA_CORBA::ComponentIR::EmitsDef::_get_def_kind_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -3780,7 +3780,7 @@ POA_CORBA::ComponentIR::EmitsDef::_get_containing_repository_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -3801,7 +3801,7 @@ POA_CORBA::ComponentIR::EmitsDef::describe_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -3858,7 +3858,7 @@ POA_CORBA::ComponentIR::EmitsDef::_set_event_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -3897,7 +3897,7 @@ POA_CORBA::ComponentIR::PublishesDef::_get_def_kind_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -4080,7 +4080,7 @@ POA_CORBA::ComponentIR::PublishesDef::_get_containing_repository_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -4101,7 +4101,7 @@ POA_CORBA::ComponentIR::PublishesDef::describe_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -4158,7 +4158,7 @@ POA_CORBA::ComponentIR::PublishesDef::_set_event_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -4197,7 +4197,7 @@ POA_CORBA::ComponentIR::ConsumesDef::_get_def_kind_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -4380,7 +4380,7 @@ POA_CORBA::ComponentIR::ConsumesDef::_get_containing_repository_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -4401,7 +4401,7 @@ POA_CORBA::ComponentIR::ConsumesDef::describe_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -4458,7 +4458,7 @@ POA_CORBA::ComponentIR::ConsumesDef::_set_event_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -4497,7 +4497,7 @@ POA_CORBA::ComponentIR::ComponentDef::_get_def_kind_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -4518,7 +4518,7 @@ POA_CORBA::ComponentIR::ComponentDef::destroy_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -4539,7 +4539,7 @@ POA_CORBA::ComponentIR::ComponentDef::lookup_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -4560,7 +4560,7 @@ POA_CORBA::ComponentIR::ComponentDef::contents_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -4581,7 +4581,7 @@ POA_CORBA::ComponentIR::ComponentDef::lookup_name_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -4602,7 +4602,7 @@ POA_CORBA::ComponentIR::ComponentDef::describe_contents_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -4623,7 +4623,7 @@ POA_CORBA::ComponentIR::ComponentDef::create_module_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -4644,7 +4644,7 @@ POA_CORBA::ComponentIR::ComponentDef::create_constant_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -4665,7 +4665,7 @@ POA_CORBA::ComponentIR::ComponentDef::create_struct_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -4686,7 +4686,7 @@ POA_CORBA::ComponentIR::ComponentDef::create_union_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -4707,7 +4707,7 @@ POA_CORBA::ComponentIR::ComponentDef::create_enum_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -4728,7 +4728,7 @@ POA_CORBA::ComponentIR::ComponentDef::create_alias_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -4749,7 +4749,7 @@ POA_CORBA::ComponentIR::ComponentDef::create_interface_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -4770,7 +4770,7 @@ POA_CORBA::ComponentIR::ComponentDef::create_value_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -4791,7 +4791,7 @@ POA_CORBA::ComponentIR::ComponentDef::create_value_box_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -4812,7 +4812,7 @@ POA_CORBA::ComponentIR::ComponentDef::create_exception_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -4833,7 +4833,7 @@ POA_CORBA::ComponentIR::ComponentDef::create_native_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -4854,7 +4854,7 @@ POA_CORBA::ComponentIR::ComponentDef::create_abstract_interface_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -4875,7 +4875,7 @@ POA_CORBA::ComponentIR::ComponentDef::create_local_interface_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -5058,7 +5058,7 @@ POA_CORBA::ComponentIR::ComponentDef::_get_containing_repository_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -5079,7 +5079,7 @@ POA_CORBA::ComponentIR::ComponentDef::describe_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -5154,7 +5154,7 @@ POA_CORBA::ComponentIR::ComponentDef::_set_base_interfaces_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -5175,7 +5175,7 @@ POA_CORBA::ComponentIR::ComponentDef::is_a_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -5196,7 +5196,7 @@ POA_CORBA::ComponentIR::ComponentDef::describe_interface_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -5217,7 +5217,7 @@ POA_CORBA::ComponentIR::ComponentDef::create_attribute_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -5238,7 +5238,7 @@ POA_CORBA::ComponentIR::ComponentDef::create_operation_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -5259,7 +5259,7 @@ POA_CORBA::ComponentIR::ComponentDef::describe_ext_interface_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -5298,7 +5298,7 @@ POA_CORBA::ComponentIR::FactoryDef::_get_def_kind_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -5481,7 +5481,7 @@ POA_CORBA::ComponentIR::FactoryDef::_get_containing_repository_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -5502,7 +5502,7 @@ POA_CORBA::ComponentIR::FactoryDef::describe_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -5739,7 +5739,7 @@ POA_CORBA::ComponentIR::FinderDef::_get_def_kind_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -5922,7 +5922,7 @@ POA_CORBA::ComponentIR::FinderDef::_get_containing_repository_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -5943,7 +5943,7 @@ POA_CORBA::ComponentIR::FinderDef::describe_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -6180,7 +6180,7 @@ POA_CORBA::ComponentIR::HomeDef::_get_def_kind_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -6201,7 +6201,7 @@ POA_CORBA::ComponentIR::HomeDef::destroy_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -6222,7 +6222,7 @@ POA_CORBA::ComponentIR::HomeDef::lookup_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -6243,7 +6243,7 @@ POA_CORBA::ComponentIR::HomeDef::contents_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -6264,7 +6264,7 @@ POA_CORBA::ComponentIR::HomeDef::lookup_name_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -6285,7 +6285,7 @@ POA_CORBA::ComponentIR::HomeDef::describe_contents_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -6306,7 +6306,7 @@ POA_CORBA::ComponentIR::HomeDef::create_module_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -6327,7 +6327,7 @@ POA_CORBA::ComponentIR::HomeDef::create_constant_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -6348,7 +6348,7 @@ POA_CORBA::ComponentIR::HomeDef::create_struct_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -6369,7 +6369,7 @@ POA_CORBA::ComponentIR::HomeDef::create_union_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -6390,7 +6390,7 @@ POA_CORBA::ComponentIR::HomeDef::create_enum_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -6411,7 +6411,7 @@ POA_CORBA::ComponentIR::HomeDef::create_alias_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -6432,7 +6432,7 @@ POA_CORBA::ComponentIR::HomeDef::create_interface_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -6453,7 +6453,7 @@ POA_CORBA::ComponentIR::HomeDef::create_value_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -6474,7 +6474,7 @@ POA_CORBA::ComponentIR::HomeDef::create_value_box_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -6495,7 +6495,7 @@ POA_CORBA::ComponentIR::HomeDef::create_exception_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -6516,7 +6516,7 @@ POA_CORBA::ComponentIR::HomeDef::create_native_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -6537,7 +6537,7 @@ POA_CORBA::ComponentIR::HomeDef::create_abstract_interface_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -6558,7 +6558,7 @@ POA_CORBA::ComponentIR::HomeDef::create_local_interface_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -6741,7 +6741,7 @@ POA_CORBA::ComponentIR::HomeDef::_get_containing_repository_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -6762,7 +6762,7 @@ POA_CORBA::ComponentIR::HomeDef::describe_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -6837,7 +6837,7 @@ POA_CORBA::ComponentIR::HomeDef::_set_base_interfaces_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -6858,7 +6858,7 @@ POA_CORBA::ComponentIR::HomeDef::is_a_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -6879,7 +6879,7 @@ POA_CORBA::ComponentIR::HomeDef::describe_interface_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -6900,7 +6900,7 @@ POA_CORBA::ComponentIR::HomeDef::create_attribute_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -6921,7 +6921,7 @@ POA_CORBA::ComponentIR::HomeDef::create_operation_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -6942,7 +6942,7 @@ POA_CORBA::ComponentIR::HomeDef::describe_ext_interface_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.cpp
index 0652c1dcafc..a47d308c930 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.cpp
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from 
-// be\be_codegen.cpp:683
+// be\be_codegen.cpp:679
 
 #ifndef _TAO_IDL_ORIG_IFR_COMPONENTSS_T_CPP_
 #define _TAO_IDL_ORIG_IFR_COMPONENTSS_T_CPP_
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.h
index 1de0d707030..8cabacb2822 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ComponentsS_T.h
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:546
+// be\be_codegen.cpp:538
 
 #ifndef _TAO_IDL_ORIG_IFR_COMPONENTSS_T_H_
 #define _TAO_IDL_ORIG_IFR_COMPONENTSS_T_H_
@@ -5367,7 +5367,7 @@ namespace POA_CORBA
 } // module CORBA
 
 // TAO_IDL - Generated from 
-// be\be_codegen.cpp:1094
+// be\be_codegen.cpp:1221
 
 #if defined (__ACE_INLINE__)
 #include "IFR_ComponentsS_T.inl"
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.cpp
index d28b64a464b..d4c7d4fdc63 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.cpp
@@ -27,7 +27,7 @@
 
 
 // TAO_IDL - Generated from 
-// be\be_codegen.cpp:617
+// be\be_codegen.cpp:601
 
 #ifndef _TAO_IDL_ORIG_IFR_EXTENDEDS_CPP_
 #define _TAO_IDL_ORIG_IFR_EXTENDEDS_CPP_
@@ -53,8 +53,8 @@
 #include "tao/Stub.h"
 #include "tao/IFR_Client_Adapter.h"
 #include "tao/Object_T.h"
-#include "tao/TypeCode.h"
-#include "tao/DynamicC.h"
+#include "tao/AnyTypeCode/TypeCode.h"
+#include "tao/AnyTypeCode/DynamicC.h"
 #include "tao/CDR.h"
 #include "tao/operation_details.h"
 #include "tao/PortableInterceptor.h"
@@ -75,31 +75,35 @@
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
+// be\be_visitor_arg_traits.cpp:70
 
 // Arg traits specializations.
 namespace TAO
 {
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:702
+  // be\be_visitor_arg_traits.cpp:793
 
-#if !defined (_CORBA_DEFINITIONKIND__SARG_TRAITS_SS_)
-#define _CORBA_DEFINITIONKIND__SARG_TRAITS_SS_
+#if !defined (_CORBA_DEFINITIONKIND__SARG_TRAITS_)
+#define _CORBA_DEFINITIONKIND__SARG_TRAITS_
   
   template<>
-  class TAO_IFR_Client_Export SArg_Traits<CORBA::DefinitionKind>
+  class SArg_Traits<CORBA::DefinitionKind>
     : public
         Basic_SArg_Traits_T<
-            CORBA::DefinitionKind
+            CORBA::DefinitionKind,
+            TAO::Any_Insert_Policy_Stream <CORBA::DefinitionKind>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_REPOSITORY__SARG_TRAITS_SS_)
-#define _CORBA_REPOSITORY__SARG_TRAITS_SS_
+#if !defined (_CORBA_REPOSITORY__SARG_TRAITS_)
+#define _CORBA_REPOSITORY__SARG_TRAITS_
   
   template<>
   class  SArg_Traits<CORBA::Repository>
@@ -107,15 +111,19 @@ namespace TAO
         Object_SArg_Traits_T<
             CORBA::Repository_ptr,
             CORBA::Repository_var,
-            CORBA::Repository_out
+            CORBA::Repository_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::Repository_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_CONTAINER__SARG_TRAITS_SS_)
-#define _CORBA_CONTAINER__SARG_TRAITS_SS_
+#if !defined (_CORBA_CONTAINER__SARG_TRAITS_)
+#define _CORBA_CONTAINER__SARG_TRAITS_
   
   template<>
   class  SArg_Traits<CORBA::Container>
@@ -123,15 +131,19 @@ namespace TAO
         Object_SArg_Traits_T<
             CORBA::Container_ptr,
             CORBA::Container_var,
-            CORBA::Container_out
+            CORBA::Container_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::Container_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_IDLTYPE__SARG_TRAITS_SS_)
-#define _CORBA_IDLTYPE__SARG_TRAITS_SS_
+#if !defined (_CORBA_IDLTYPE__SARG_TRAITS_)
+#define _CORBA_IDLTYPE__SARG_TRAITS_
   
   template<>
   class  SArg_Traits<CORBA::IDLType>
@@ -139,7 +151,8 @@ namespace TAO
         Object_SArg_Traits_T<
             CORBA::IDLType_ptr,
             CORBA::IDLType_var,
-            CORBA::IDLType_out
+            CORBA::IDLType_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::IDLType_ptr>
           >
   {
   };
@@ -147,26 +160,30 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:492
+  // be\be_visitor_arg_traits.cpp:547
 
-#if !defined (_CORBA_INTERFACEDEFSEQ__SARG_TRAITS_SS_)
-#define _CORBA_INTERFACEDEFSEQ__SARG_TRAITS_SS_
+#if !defined (_CORBA_INTERFACEDEFSEQ__SARG_TRAITS_)
+#define _CORBA_INTERFACEDEFSEQ__SARG_TRAITS_
   
   template<>
-  class TAO_IFR_Client_Export SArg_Traits<CORBA::InterfaceDefSeq>
+  class SArg_Traits<CORBA::InterfaceDefSeq>
     : public
         Var_Size_SArg_Traits_T<
             CORBA::InterfaceDefSeq,
             CORBA::InterfaceDefSeq_var,
-            CORBA::InterfaceDefSeq_out
+            CORBA::InterfaceDefSeq_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::InterfaceDefSeq>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_VALUEDEF__SARG_TRAITS_SS_)
-#define _CORBA_VALUEDEF__SARG_TRAITS_SS_
+#if !defined (_CORBA_VALUEDEF__SARG_TRAITS_)
+#define _CORBA_VALUEDEF__SARG_TRAITS_
   
   template<>
   class  SArg_Traits<CORBA::ValueDef>
@@ -174,7 +191,8 @@ namespace TAO
         Object_SArg_Traits_T<
             CORBA::ValueDef_ptr,
             CORBA::ValueDef_var,
-            CORBA::ValueDef_out
+            CORBA::ValueDef_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::ValueDef_ptr>
           >
   {
   };
@@ -182,18 +200,19 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:743
+  // be\be_visitor_arg_traits.cpp:835
 
-#if !defined (_CORBA_VALUEDEF_FULLVALUEDESCRIPTION__SARG_TRAITS_SS_)
-#define _CORBA_VALUEDEF_FULLVALUEDESCRIPTION__SARG_TRAITS_SS_
+#if !defined (_CORBA_VALUEDEF_FULLVALUEDESCRIPTION__SARG_TRAITS_)
+#define _CORBA_VALUEDEF_FULLVALUEDESCRIPTION__SARG_TRAITS_
   
   template<>
-  class TAO_IFR_Client_Export SArg_Traits<CORBA::ValueDef::FullValueDescription>
+  class SArg_Traits<CORBA::ValueDef::FullValueDescription>
     : public
         Var_Size_SArg_Traits_T<
             CORBA::ValueDef::FullValueDescription,
             CORBA::ValueDef::FullValueDescription_var,
-            CORBA::ValueDef::FullValueDescription_out
+            CORBA::ValueDef::FullValueDescription_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::ValueDef::FullValueDescription>
           >
   {
   };
@@ -201,18 +220,19 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:492
+  // be\be_visitor_arg_traits.cpp:547
 
-#if !defined (_CORBA_INITIALIZERSEQ__SARG_TRAITS_SS_)
-#define _CORBA_INITIALIZERSEQ__SARG_TRAITS_SS_
+#if !defined (_CORBA_INITIALIZERSEQ__SARG_TRAITS_)
+#define _CORBA_INITIALIZERSEQ__SARG_TRAITS_
   
   template<>
-  class TAO_IFR_Client_Export SArg_Traits<CORBA::InitializerSeq>
+  class SArg_Traits<CORBA::InitializerSeq>
     : public
         Var_Size_SArg_Traits_T<
             CORBA::InitializerSeq,
             CORBA::InitializerSeq_var,
-            CORBA::InitializerSeq_out
+            CORBA::InitializerSeq_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::InitializerSeq>
           >
   {
   };
@@ -220,18 +240,19 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:492
+  // be\be_visitor_arg_traits.cpp:547
 
-#if !defined (_CORBA_VALUEDEFSEQ__SARG_TRAITS_SS_)
-#define _CORBA_VALUEDEFSEQ__SARG_TRAITS_SS_
+#if !defined (_CORBA_VALUEDEFSEQ__SARG_TRAITS_)
+#define _CORBA_VALUEDEFSEQ__SARG_TRAITS_
   
   template<>
-  class TAO_IFR_Client_Export SArg_Traits<CORBA::ValueDefSeq>
+  class SArg_Traits<CORBA::ValueDefSeq>
     : public
         Var_Size_SArg_Traits_T<
             CORBA::ValueDefSeq,
             CORBA::ValueDefSeq_var,
-            CORBA::ValueDefSeq_out
+            CORBA::ValueDefSeq_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::ValueDefSeq>
           >
   {
   };
@@ -239,18 +260,19 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:743
+  // be\be_visitor_arg_traits.cpp:835
 
-#if !defined (_CORBA_EXTVALUEDEF_EXTFULLVALUEDESCRIPTION__SARG_TRAITS_SS_)
-#define _CORBA_EXTVALUEDEF_EXTFULLVALUEDESCRIPTION__SARG_TRAITS_SS_
+#if !defined (_CORBA_EXTVALUEDEF_EXTFULLVALUEDESCRIPTION__SARG_TRAITS_)
+#define _CORBA_EXTVALUEDEF_EXTFULLVALUEDESCRIPTION__SARG_TRAITS_
   
   template<>
-  class TAO_IFR_Client_Export SArg_Traits<CORBA::ExtValueDef::ExtFullValueDescription>
+  class SArg_Traits<CORBA::ExtValueDef::ExtFullValueDescription>
     : public
         Var_Size_SArg_Traits_T<
             CORBA::ExtValueDef::ExtFullValueDescription,
             CORBA::ExtValueDef::ExtFullValueDescription_var,
-            CORBA::ExtValueDef::ExtFullValueDescription_out
+            CORBA::ExtValueDef::ExtFullValueDescription_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::ExtValueDef::ExtFullValueDescription>
           >
   {
   };
@@ -258,18 +280,19 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:492
+  // be\be_visitor_arg_traits.cpp:547
 
-#if !defined (_CORBA_EXTINITIALIZERSEQ__SARG_TRAITS_SS_)
-#define _CORBA_EXTINITIALIZERSEQ__SARG_TRAITS_SS_
+#if !defined (_CORBA_EXTINITIALIZERSEQ__SARG_TRAITS_)
+#define _CORBA_EXTINITIALIZERSEQ__SARG_TRAITS_
   
   template<>
-  class TAO_IFR_Client_Export SArg_Traits<CORBA::ExtInitializerSeq>
+  class SArg_Traits<CORBA::ExtInitializerSeq>
     : public
         Var_Size_SArg_Traits_T<
             CORBA::ExtInitializerSeq,
             CORBA::ExtInitializerSeq_var,
-            CORBA::ExtInitializerSeq_out
+            CORBA::ExtInitializerSeq_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::ExtInitializerSeq>
           >
   {
   };
@@ -277,18 +300,19 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:492
+  // be\be_visitor_arg_traits.cpp:547
 
-#if !defined (_CORBA_EXCEPTIONDEFSEQ__SARG_TRAITS_SS_)
-#define _CORBA_EXCEPTIONDEFSEQ__SARG_TRAITS_SS_
+#if !defined (_CORBA_EXCEPTIONDEFSEQ__SARG_TRAITS_)
+#define _CORBA_EXCEPTIONDEFSEQ__SARG_TRAITS_
   
   template<>
-  class TAO_IFR_Client_Export SArg_Traits<CORBA::ExceptionDefSeq>
+  class SArg_Traits<CORBA::ExceptionDefSeq>
     : public
         Var_Size_SArg_Traits_T<
             CORBA::ExceptionDefSeq,
             CORBA::ExceptionDefSeq_var,
-            CORBA::ExceptionDefSeq_out
+            CORBA::ExceptionDefSeq_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::ExceptionDefSeq>
           >
   {
   };
@@ -296,24 +320,28 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:702
+  // be\be_visitor_arg_traits.cpp:793
 
-#if !defined (_CORBA_ATTRIBUTEMODE__SARG_TRAITS_SS_)
-#define _CORBA_ATTRIBUTEMODE__SARG_TRAITS_SS_
+#if !defined (_CORBA_ATTRIBUTEMODE__SARG_TRAITS_)
+#define _CORBA_ATTRIBUTEMODE__SARG_TRAITS_
   
   template<>
-  class TAO_IFR_Client_Export SArg_Traits<CORBA::AttributeMode>
+  class SArg_Traits<CORBA::AttributeMode>
     : public
         Basic_SArg_Traits_T<
-            CORBA::AttributeMode
+            CORBA::AttributeMode,
+            TAO::Any_Insert_Policy_Stream <CORBA::AttributeMode>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_ATTRIBUTEDEF__SARG_TRAITS_SS_)
-#define _CORBA_ATTRIBUTEDEF__SARG_TRAITS_SS_
+#if !defined (_CORBA_ATTRIBUTEDEF__SARG_TRAITS_)
+#define _CORBA_ATTRIBUTEDEF__SARG_TRAITS_
   
   template<>
   class  SArg_Traits<CORBA::AttributeDef>
@@ -321,15 +349,19 @@ namespace TAO
         Object_SArg_Traits_T<
             CORBA::AttributeDef_ptr,
             CORBA::AttributeDef_var,
-            CORBA::AttributeDef_out
+            CORBA::AttributeDef_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::AttributeDef_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_EXTATTRIBUTEDEF__SARG_TRAITS_SS_)
-#define _CORBA_EXTATTRIBUTEDEF__SARG_TRAITS_SS_
+#if !defined (_CORBA_EXTATTRIBUTEDEF__SARG_TRAITS_)
+#define _CORBA_EXTATTRIBUTEDEF__SARG_TRAITS_
   
   template<>
   class  SArg_Traits<CORBA::ExtAttributeDef>
@@ -337,7 +369,8 @@ namespace TAO
         Object_SArg_Traits_T<
             CORBA::ExtAttributeDef_ptr,
             CORBA::ExtAttributeDef_var,
-            CORBA::ExtAttributeDef_out
+            CORBA::ExtAttributeDef_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::ExtAttributeDef_ptr>
           >
   {
   };
@@ -345,16 +378,17 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:702
+  // be\be_visitor_arg_traits.cpp:793
 
-#if !defined (_CORBA_OPERATIONMODE__SARG_TRAITS_SS_)
-#define _CORBA_OPERATIONMODE__SARG_TRAITS_SS_
+#if !defined (_CORBA_OPERATIONMODE__SARG_TRAITS_)
+#define _CORBA_OPERATIONMODE__SARG_TRAITS_
   
   template<>
-  class TAO_IFR_Client_Export SArg_Traits<CORBA::OperationMode>
+  class SArg_Traits<CORBA::OperationMode>
     : public
         Basic_SArg_Traits_T<
-            CORBA::OperationMode
+            CORBA::OperationMode,
+            TAO::Any_Insert_Policy_Stream <CORBA::OperationMode>
           >
   {
   };
@@ -362,18 +396,19 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:492
+  // be\be_visitor_arg_traits.cpp:547
 
-#if !defined (_CORBA_PARDESCRIPTIONSEQ__SARG_TRAITS_SS_)
-#define _CORBA_PARDESCRIPTIONSEQ__SARG_TRAITS_SS_
+#if !defined (_CORBA_PARDESCRIPTIONSEQ__SARG_TRAITS_)
+#define _CORBA_PARDESCRIPTIONSEQ__SARG_TRAITS_
   
   template<>
-  class TAO_IFR_Client_Export SArg_Traits<CORBA::ParDescriptionSeq>
+  class SArg_Traits<CORBA::ParDescriptionSeq>
     : public
         Var_Size_SArg_Traits_T<
             CORBA::ParDescriptionSeq,
             CORBA::ParDescriptionSeq_var,
-            CORBA::ParDescriptionSeq_out
+            CORBA::ParDescriptionSeq_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::ParDescriptionSeq>
           >
   {
   };
@@ -381,26 +416,30 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:492
+  // be\be_visitor_arg_traits.cpp:547
 
-#if !defined (_CORBA_CONTEXTIDSEQ__SARG_TRAITS_SS_)
-#define _CORBA_CONTEXTIDSEQ__SARG_TRAITS_SS_
+#if !defined (_CORBA_CONTEXTIDSEQ__SARG_TRAITS_)
+#define _CORBA_CONTEXTIDSEQ__SARG_TRAITS_
   
   template<>
-  class TAO_IFR_Client_Export SArg_Traits<CORBA::ContextIdSeq>
+  class SArg_Traits<CORBA::ContextIdSeq>
     : public
         Var_Size_SArg_Traits_T<
             CORBA::ContextIdSeq,
             CORBA::ContextIdSeq_var,
-            CORBA::ContextIdSeq_out
+            CORBA::ContextIdSeq_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::ContextIdSeq>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_OPERATIONDEF__SARG_TRAITS_SS_)
-#define _CORBA_OPERATIONDEF__SARG_TRAITS_SS_
+#if !defined (_CORBA_OPERATIONDEF__SARG_TRAITS_)
+#define _CORBA_OPERATIONDEF__SARG_TRAITS_
   
   template<>
   class  SArg_Traits<CORBA::OperationDef>
@@ -408,15 +447,19 @@ namespace TAO
         Object_SArg_Traits_T<
             CORBA::OperationDef_ptr,
             CORBA::OperationDef_var,
-            CORBA::OperationDef_out
+            CORBA::OperationDef_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::OperationDef_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_VALUEMEMBERDEF__SARG_TRAITS_SS_)
-#define _CORBA_VALUEMEMBERDEF__SARG_TRAITS_SS_
+#if !defined (_CORBA_VALUEMEMBERDEF__SARG_TRAITS_)
+#define _CORBA_VALUEMEMBERDEF__SARG_TRAITS_
   
   template<>
   class  SArg_Traits<CORBA::ValueMemberDef>
@@ -424,7 +467,8 @@ namespace TAO
         Object_SArg_Traits_T<
             CORBA::ValueMemberDef_ptr,
             CORBA::ValueMemberDef_var,
-            CORBA::ValueMemberDef_out
+            CORBA::ValueMemberDef_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::ValueMemberDef_ptr>
           >
   {
   };
@@ -434,31 +478,35 @@ namespace TAO
 
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
+// be\be_visitor_arg_traits.cpp:70
 
 // Arg traits specializations.
 namespace TAO
 {
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:702
+  // be\be_visitor_arg_traits.cpp:793
 
-#if !defined (_CORBA_DEFINITIONKIND__ARG_TRAITS_SS_)
-#define _CORBA_DEFINITIONKIND__ARG_TRAITS_SS_
+#if !defined (_CORBA_DEFINITIONKIND__ARG_TRAITS_)
+#define _CORBA_DEFINITIONKIND__ARG_TRAITS_
   
   template<>
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::DefinitionKind>
+  class Arg_Traits<CORBA::DefinitionKind>
     : public
         Basic_Arg_Traits_T<
-            CORBA::DefinitionKind
+            CORBA::DefinitionKind,
+            TAO::Any_Insert_Policy_Stream <CORBA::DefinitionKind>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_REPOSITORY__ARG_TRAITS_SS_)
-#define _CORBA_REPOSITORY__ARG_TRAITS_SS_
+#if !defined (_CORBA_REPOSITORY__ARG_TRAITS_)
+#define _CORBA_REPOSITORY__ARG_TRAITS_
   
   template<>
   class  Arg_Traits<CORBA::Repository>
@@ -467,15 +515,19 @@ namespace TAO
             CORBA::Repository_ptr,
             CORBA::Repository_var,
             CORBA::Repository_out,
-            TAO::Objref_Traits<CORBA::Repository>
+            TAO::Objref_Traits<CORBA::Repository>,
+            TAO::Any_Insert_Policy_Stream <CORBA::Repository_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_CONTAINER__ARG_TRAITS_SS_)
-#define _CORBA_CONTAINER__ARG_TRAITS_SS_
+#if !defined (_CORBA_CONTAINER__ARG_TRAITS_)
+#define _CORBA_CONTAINER__ARG_TRAITS_
   
   template<>
   class  Arg_Traits<CORBA::Container>
@@ -484,15 +536,19 @@ namespace TAO
             CORBA::Container_ptr,
             CORBA::Container_var,
             CORBA::Container_out,
-            TAO::Objref_Traits<CORBA::Container>
+            TAO::Objref_Traits<CORBA::Container>,
+            TAO::Any_Insert_Policy_Stream <CORBA::Container_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_IDLTYPE__ARG_TRAITS_SS_)
-#define _CORBA_IDLTYPE__ARG_TRAITS_SS_
+#if !defined (_CORBA_IDLTYPE__ARG_TRAITS_)
+#define _CORBA_IDLTYPE__ARG_TRAITS_
   
   template<>
   class  Arg_Traits<CORBA::IDLType>
@@ -501,7 +557,8 @@ namespace TAO
             CORBA::IDLType_ptr,
             CORBA::IDLType_var,
             CORBA::IDLType_out,
-            TAO::Objref_Traits<CORBA::IDLType>
+            TAO::Objref_Traits<CORBA::IDLType>,
+            TAO::Any_Insert_Policy_Stream <CORBA::IDLType_ptr>
           >
   {
   };
@@ -509,26 +566,30 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:492
+  // be\be_visitor_arg_traits.cpp:547
 
-#if !defined (_CORBA_INTERFACEDEFSEQ__ARG_TRAITS_SS_)
-#define _CORBA_INTERFACEDEFSEQ__ARG_TRAITS_SS_
+#if !defined (_CORBA_INTERFACEDEFSEQ__ARG_TRAITS_)
+#define _CORBA_INTERFACEDEFSEQ__ARG_TRAITS_
   
   template<>
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::InterfaceDefSeq>
+  class Arg_Traits<CORBA::InterfaceDefSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::InterfaceDefSeq,
             CORBA::InterfaceDefSeq_var,
-            CORBA::InterfaceDefSeq_out
+            CORBA::InterfaceDefSeq_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::InterfaceDefSeq>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_VALUEDEF__ARG_TRAITS_SS_)
-#define _CORBA_VALUEDEF__ARG_TRAITS_SS_
+#if !defined (_CORBA_VALUEDEF__ARG_TRAITS_)
+#define _CORBA_VALUEDEF__ARG_TRAITS_
   
   template<>
   class  Arg_Traits<CORBA::ValueDef>
@@ -537,7 +598,8 @@ namespace TAO
             CORBA::ValueDef_ptr,
             CORBA::ValueDef_var,
             CORBA::ValueDef_out,
-            TAO::Objref_Traits<CORBA::ValueDef>
+            TAO::Objref_Traits<CORBA::ValueDef>,
+            TAO::Any_Insert_Policy_Stream <CORBA::ValueDef_ptr>
           >
   {
   };
@@ -545,18 +607,19 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:743
+  // be\be_visitor_arg_traits.cpp:835
 
-#if !defined (_CORBA_VALUEDEF_FULLVALUEDESCRIPTION__ARG_TRAITS_SS_)
-#define _CORBA_VALUEDEF_FULLVALUEDESCRIPTION__ARG_TRAITS_SS_
+#if !defined (_CORBA_VALUEDEF_FULLVALUEDESCRIPTION__ARG_TRAITS_)
+#define _CORBA_VALUEDEF_FULLVALUEDESCRIPTION__ARG_TRAITS_
   
   template<>
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::ValueDef::FullValueDescription>
+  class Arg_Traits<CORBA::ValueDef::FullValueDescription>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::ValueDef::FullValueDescription,
             CORBA::ValueDef::FullValueDescription_var,
-            CORBA::ValueDef::FullValueDescription_out
+            CORBA::ValueDef::FullValueDescription_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::ValueDef::FullValueDescription>
           >
   {
   };
@@ -564,18 +627,19 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:492
+  // be\be_visitor_arg_traits.cpp:547
 
-#if !defined (_CORBA_INITIALIZERSEQ__ARG_TRAITS_SS_)
-#define _CORBA_INITIALIZERSEQ__ARG_TRAITS_SS_
+#if !defined (_CORBA_INITIALIZERSEQ__ARG_TRAITS_)
+#define _CORBA_INITIALIZERSEQ__ARG_TRAITS_
   
   template<>
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::InitializerSeq>
+  class Arg_Traits<CORBA::InitializerSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::InitializerSeq,
             CORBA::InitializerSeq_var,
-            CORBA::InitializerSeq_out
+            CORBA::InitializerSeq_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::InitializerSeq>
           >
   {
   };
@@ -583,18 +647,19 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:492
+  // be\be_visitor_arg_traits.cpp:547
 
-#if !defined (_CORBA_VALUEDEFSEQ__ARG_TRAITS_SS_)
-#define _CORBA_VALUEDEFSEQ__ARG_TRAITS_SS_
+#if !defined (_CORBA_VALUEDEFSEQ__ARG_TRAITS_)
+#define _CORBA_VALUEDEFSEQ__ARG_TRAITS_
   
   template<>
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::ValueDefSeq>
+  class Arg_Traits<CORBA::ValueDefSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::ValueDefSeq,
             CORBA::ValueDefSeq_var,
-            CORBA::ValueDefSeq_out
+            CORBA::ValueDefSeq_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::ValueDefSeq>
           >
   {
   };
@@ -602,18 +667,19 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:743
+  // be\be_visitor_arg_traits.cpp:835
 
-#if !defined (_CORBA_EXTVALUEDEF_EXTFULLVALUEDESCRIPTION__ARG_TRAITS_SS_)
-#define _CORBA_EXTVALUEDEF_EXTFULLVALUEDESCRIPTION__ARG_TRAITS_SS_
+#if !defined (_CORBA_EXTVALUEDEF_EXTFULLVALUEDESCRIPTION__ARG_TRAITS_)
+#define _CORBA_EXTVALUEDEF_EXTFULLVALUEDESCRIPTION__ARG_TRAITS_
   
   template<>
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::ExtValueDef::ExtFullValueDescription>
+  class Arg_Traits<CORBA::ExtValueDef::ExtFullValueDescription>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::ExtValueDef::ExtFullValueDescription,
             CORBA::ExtValueDef::ExtFullValueDescription_var,
-            CORBA::ExtValueDef::ExtFullValueDescription_out
+            CORBA::ExtValueDef::ExtFullValueDescription_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::ExtValueDef::ExtFullValueDescription>
           >
   {
   };
@@ -621,18 +687,19 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:492
+  // be\be_visitor_arg_traits.cpp:547
 
-#if !defined (_CORBA_EXTINITIALIZERSEQ__ARG_TRAITS_SS_)
-#define _CORBA_EXTINITIALIZERSEQ__ARG_TRAITS_SS_
+#if !defined (_CORBA_EXTINITIALIZERSEQ__ARG_TRAITS_)
+#define _CORBA_EXTINITIALIZERSEQ__ARG_TRAITS_
   
   template<>
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::ExtInitializerSeq>
+  class Arg_Traits<CORBA::ExtInitializerSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::ExtInitializerSeq,
             CORBA::ExtInitializerSeq_var,
-            CORBA::ExtInitializerSeq_out
+            CORBA::ExtInitializerSeq_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::ExtInitializerSeq>
           >
   {
   };
@@ -640,18 +707,19 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:492
+  // be\be_visitor_arg_traits.cpp:547
 
-#if !defined (_CORBA_EXCEPTIONDEFSEQ__ARG_TRAITS_SS_)
-#define _CORBA_EXCEPTIONDEFSEQ__ARG_TRAITS_SS_
+#if !defined (_CORBA_EXCEPTIONDEFSEQ__ARG_TRAITS_)
+#define _CORBA_EXCEPTIONDEFSEQ__ARG_TRAITS_
   
   template<>
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::ExceptionDefSeq>
+  class Arg_Traits<CORBA::ExceptionDefSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::ExceptionDefSeq,
             CORBA::ExceptionDefSeq_var,
-            CORBA::ExceptionDefSeq_out
+            CORBA::ExceptionDefSeq_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::ExceptionDefSeq>
           >
   {
   };
@@ -659,24 +727,28 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:702
+  // be\be_visitor_arg_traits.cpp:793
 
-#if !defined (_CORBA_ATTRIBUTEMODE__ARG_TRAITS_SS_)
-#define _CORBA_ATTRIBUTEMODE__ARG_TRAITS_SS_
+#if !defined (_CORBA_ATTRIBUTEMODE__ARG_TRAITS_)
+#define _CORBA_ATTRIBUTEMODE__ARG_TRAITS_
   
   template<>
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::AttributeMode>
+  class Arg_Traits<CORBA::AttributeMode>
     : public
         Basic_Arg_Traits_T<
-            CORBA::AttributeMode
+            CORBA::AttributeMode,
+            TAO::Any_Insert_Policy_Stream <CORBA::AttributeMode>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_ATTRIBUTEDEF__ARG_TRAITS_SS_)
-#define _CORBA_ATTRIBUTEDEF__ARG_TRAITS_SS_
+#if !defined (_CORBA_ATTRIBUTEDEF__ARG_TRAITS_)
+#define _CORBA_ATTRIBUTEDEF__ARG_TRAITS_
   
   template<>
   class  Arg_Traits<CORBA::AttributeDef>
@@ -685,15 +757,19 @@ namespace TAO
             CORBA::AttributeDef_ptr,
             CORBA::AttributeDef_var,
             CORBA::AttributeDef_out,
-            TAO::Objref_Traits<CORBA::AttributeDef>
+            TAO::Objref_Traits<CORBA::AttributeDef>,
+            TAO::Any_Insert_Policy_Stream <CORBA::AttributeDef_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_EXTATTRIBUTEDEF__ARG_TRAITS_SS_)
-#define _CORBA_EXTATTRIBUTEDEF__ARG_TRAITS_SS_
+#if !defined (_CORBA_EXTATTRIBUTEDEF__ARG_TRAITS_)
+#define _CORBA_EXTATTRIBUTEDEF__ARG_TRAITS_
   
   template<>
   class  Arg_Traits<CORBA::ExtAttributeDef>
@@ -702,7 +778,8 @@ namespace TAO
             CORBA::ExtAttributeDef_ptr,
             CORBA::ExtAttributeDef_var,
             CORBA::ExtAttributeDef_out,
-            TAO::Objref_Traits<CORBA::ExtAttributeDef>
+            TAO::Objref_Traits<CORBA::ExtAttributeDef>,
+            TAO::Any_Insert_Policy_Stream <CORBA::ExtAttributeDef_ptr>
           >
   {
   };
@@ -710,16 +787,17 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:702
+  // be\be_visitor_arg_traits.cpp:793
 
-#if !defined (_CORBA_OPERATIONMODE__ARG_TRAITS_SS_)
-#define _CORBA_OPERATIONMODE__ARG_TRAITS_SS_
+#if !defined (_CORBA_OPERATIONMODE__ARG_TRAITS_)
+#define _CORBA_OPERATIONMODE__ARG_TRAITS_
   
   template<>
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::OperationMode>
+  class Arg_Traits<CORBA::OperationMode>
     : public
         Basic_Arg_Traits_T<
-            CORBA::OperationMode
+            CORBA::OperationMode,
+            TAO::Any_Insert_Policy_Stream <CORBA::OperationMode>
           >
   {
   };
@@ -727,18 +805,19 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:492
+  // be\be_visitor_arg_traits.cpp:547
 
-#if !defined (_CORBA_PARDESCRIPTIONSEQ__ARG_TRAITS_SS_)
-#define _CORBA_PARDESCRIPTIONSEQ__ARG_TRAITS_SS_
+#if !defined (_CORBA_PARDESCRIPTIONSEQ__ARG_TRAITS_)
+#define _CORBA_PARDESCRIPTIONSEQ__ARG_TRAITS_
   
   template<>
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::ParDescriptionSeq>
+  class Arg_Traits<CORBA::ParDescriptionSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::ParDescriptionSeq,
             CORBA::ParDescriptionSeq_var,
-            CORBA::ParDescriptionSeq_out
+            CORBA::ParDescriptionSeq_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::ParDescriptionSeq>
           >
   {
   };
@@ -746,26 +825,30 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:492
+  // be\be_visitor_arg_traits.cpp:547
 
-#if !defined (_CORBA_CONTEXTIDSEQ__ARG_TRAITS_SS_)
-#define _CORBA_CONTEXTIDSEQ__ARG_TRAITS_SS_
+#if !defined (_CORBA_CONTEXTIDSEQ__ARG_TRAITS_)
+#define _CORBA_CONTEXTIDSEQ__ARG_TRAITS_
   
   template<>
-  class TAO_IFR_Client_Export Arg_Traits<CORBA::ContextIdSeq>
+  class Arg_Traits<CORBA::ContextIdSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::ContextIdSeq,
             CORBA::ContextIdSeq_var,
-            CORBA::ContextIdSeq_out
+            CORBA::ContextIdSeq_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::ContextIdSeq>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_OPERATIONDEF__ARG_TRAITS_SS_)
-#define _CORBA_OPERATIONDEF__ARG_TRAITS_SS_
+#if !defined (_CORBA_OPERATIONDEF__ARG_TRAITS_)
+#define _CORBA_OPERATIONDEF__ARG_TRAITS_
   
   template<>
   class  Arg_Traits<CORBA::OperationDef>
@@ -774,15 +857,19 @@ namespace TAO
             CORBA::OperationDef_ptr,
             CORBA::OperationDef_var,
             CORBA::OperationDef_out,
-            TAO::Objref_Traits<CORBA::OperationDef>
+            TAO::Objref_Traits<CORBA::OperationDef>,
+            TAO::Any_Insert_Policy_Stream <CORBA::OperationDef_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_VALUEMEMBERDEF__ARG_TRAITS_SS_)
-#define _CORBA_VALUEMEMBERDEF__ARG_TRAITS_SS_
+#if !defined (_CORBA_VALUEMEMBERDEF__ARG_TRAITS_)
+#define _CORBA_VALUEMEMBERDEF__ARG_TRAITS_
   
   template<>
   class  Arg_Traits<CORBA::ValueMemberDef>
@@ -791,7 +878,8 @@ namespace TAO
             CORBA::ValueMemberDef_ptr,
             CORBA::ValueMemberDef_var,
             CORBA::ValueMemberDef_out,
-            TAO::Objref_Traits<CORBA::ValueMemberDef>
+            TAO::Objref_Traits<CORBA::ValueMemberDef>,
+            TAO::Any_Insert_Policy_Stream <CORBA::ValueMemberDef_ptr>
           >
   {
   };
@@ -801,7 +889,7 @@ namespace TAO
 
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1455
+// be\be_interface.cpp:1465
 
 class TAO_CORBA_FixedDef_Perfect_Hash_OpTable
   : public TAO_Perfect_Hash_OpTable
@@ -814,7 +902,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: c:\ace\latest\ACE_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0 -a -o -t -p -K opname -L C++ -Z TAO_CORBA_FixedDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ACE\Any\ACE_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0 -a -o -t -p -K opname -L C++ -Z TAO_CORBA_FixedDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_FixedDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -871,14 +959,14 @@ TAO_CORBA_FixedDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int l
 {
   enum
     {
-      TOTAL_KEYWORDS = 11,
+      TOTAL_KEYWORDS = 12,
       MIN_WORD_LENGTH = 5,
-      MAX_WORD_LENGTH = 13,
+      MAX_WORD_LENGTH = 14,
       MIN_HASH_VALUE = 5,
       MAX_HASH_VALUE = 18,
       HASH_VALUE_RANGE = 14,
       DUPLICATES = 4,
-      WORDLIST_SIZE = 16
+      WORDLIST_SIZE = 17
     };
 
   static const TAO_operation_db_entry  wordlist[] =
@@ -893,6 +981,7 @@ TAO_CORBA_FixedDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int l
       {"_get_digits", &POA_CORBA::FixedDef::_get_digits_skel, 0},
       {"_set_digits", &POA_CORBA::FixedDef::_set_digits_skel, 0},
       {"_get_def_kind", &POA_CORBA::FixedDef::_get_def_kind_skel, 0},
+      {"_repository_id", &POA_CORBA::FixedDef::_repository_id_skel, 0},
       {"_component", &POA_CORBA::FixedDef::_component_skel, 0},
       {"_non_existent", &POA_CORBA::FixedDef::_non_existent_skel, 0},
     };
@@ -900,7 +989,7 @@ TAO_CORBA_FixedDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int l
   static const signed char lookup[] =
     {
        -1,  -8,  -3, -11,  -2,   5,  -1,   6,  -1,   7, -27, -26,  -1,  13, 
-       -1,  14,  -1,  -1,  15, 
+       14,  15,  -1,  -1,  16, 
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -938,7 +1027,7 @@ TAO_CORBA_FixedDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int l
 static TAO_CORBA_FixedDef_Perfect_Hash_OpTable tao_CORBA_FixedDef_optable;
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:999
+// be\be_visitor_interface/interface_ss.cpp:921
 
 TAO::Collocation_Proxy_Broker *
 CORBA__TAO_FixedDef_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -958,10 +1047,7 @@ CORBA__TAO_FixedDef_Proxy_Broker_Factory_Initializer (size_t)
 static int
 CORBA__TAO_FixedDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
   CORBA__TAO_FixedDef_Proxy_Broker_Factory_Initializer (
-      reinterpret_cast<
-          size_t> (
-          CORBA__TAO_FixedDef_Proxy_Broker_Factory_Initializer
-        )
+      reinterpret_cast<size_t> (CORBA__TAO_FixedDef_Proxy_Broker_Factory_Initializer)
     );
 
 
@@ -1390,8 +1476,8 @@ namespace POA_CORBA
           this->operation_details_,
           this->args_);
       
-      TAO::SArg_Traits< CORBA::Char *>::in_arg_type arg_1 =
-        TAO::Portable_Server::get_in_arg< CORBA::Char *, TAO::SArg_Traits< CORBA::Char *>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
@@ -1426,7 +1512,7 @@ void POA_CORBA::FixedDef::_is_a_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  TAO::SArg_Traits< CORBA::Char *>::in_arg_val _tao_repository_id;
+  TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
   
   TAO::Argument * const args[] =
     {
@@ -1547,10 +1633,98 @@ void POA_CORBA::FixedDef::_non_existent_skel (
   
 }
 
+namespace POA_CORBA
+{
+  
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_operation/upcall_command_ss.cpp:127
+  
+  class _repository_id_FixedDef_Upcall_Command
+    : public TAO::Upcall_Command
+  {
+  public:
+    inline _repository_id_FixedDef_Upcall_Command (
+      POA_CORBA::FixedDef * servant,
+      TAO_Operation_Details const * operation_details,
+      TAO::Argument * const args[])
+      : servant_ (servant)
+      , operation_details_ (operation_details)
+      , args_ (args)
+    {
+    }
+    
+    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+    {
+      TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
+        TAO::Portable_Server::get_ret_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type> (
+          this->operation_details_,
+          this->args_);
+      
+      
+      retval =
+        this->servant_-> _repository_id (
+          ACE_ENV_SINGLE_ARG_PARAMETER);
+        
+    }
+  
+  private:
+    POA_CORBA::FixedDef * const servant_;
+    TAO_Operation_Details const * const operation_details_;
+    TAO::Argument * const * const args_;
+  };
+  
+}
+void POA_CORBA::FixedDef::_repository_id_skel (
+    TAO_ServerRequest & server_request, 
+    void * TAO_INTERCEPTOR (servant_upcall),
+    void * servant
+    ACE_ENV_ARG_DECL
+  )
+{
+  
+  
+#if TAO_HAS_INTERCEPTORS == 1
+  static CORBA::TypeCode_ptr const * const exceptions = 0;
+  static size_t const nexceptions = 0;
+#endif /* TAO_HAS_INTERCEPTORS */
+  
+  TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
+  
+  TAO::Argument * const args[] =
+    {
+      &retval
+    };
+  
+  static size_t const nargs = 1;
+  
+  POA_CORBA::FixedDef * const impl =
+    static_cast<POA_CORBA::FixedDef *> (servant);
+  
+  _repository_id_FixedDef_Upcall_Command command (
+    impl,
+    server_request.operation_details (),
+    args);
+  
+  TAO::Upcall_Wrapper upcall_wrapper;
+  upcall_wrapper.upcall (server_request
+                         , args
+                         , nargs
+                         , command
+#if TAO_HAS_INTERCEPTORS == 1
+                         , servant_upcall
+                         , exceptions
+                         , nexceptions
+#endif  /* TAO_HAS_INTERCEPTORS == 1 */
+                         ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+  
+}
+
 
 
 // TAO_IDL - Generated from 
-// be\be_visitor_interface/interface_ss.cpp:393
+// be\be_visitor_interface/interface_ss.cpp:501
 
 
 
@@ -1715,7 +1889,7 @@ const char* POA_CORBA::FixedDef::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:940
+// be\be_visitor_interface/interface_ss.cpp:862
 
 void POA_CORBA::FixedDef::_dispatch (
     TAO_ServerRequest & req,
@@ -1730,7 +1904,7 @@ void POA_CORBA::FixedDef::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:891
+// be\be_visitor_interface/interface_ss.cpp:813
 
 CORBA::FixedDef *
 POA_CORBA::FixedDef::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -1762,7 +1936,7 @@ POA_CORBA::FixedDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1455
+// be\be_interface.cpp:1465
 
 class TAO_CORBA_ValueMemberDef_Perfect_Hash_OpTable
   : public TAO_Perfect_Hash_OpTable
@@ -1775,7 +1949,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: c:\ace\latest\ACE_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0 -a -o -t -p -K opname -L C++ -Z TAO_CORBA_ValueMemberDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ACE\Any\ACE_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0 -a -o -t -p -K opname -L C++ -Z TAO_CORBA_ValueMemberDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_ValueMemberDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -1832,14 +2006,14 @@ TAO_CORBA_ValueMemberDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned
 {
   enum
     {
-      TOTAL_KEYWORDS = 22,
+      TOTAL_KEYWORDS = 23,
       MIN_WORD_LENGTH = 4,
       MAX_WORD_LENGTH = 26,
       MIN_HASH_VALUE = 4,
       MAX_HASH_VALUE = 36,
       HASH_VALUE_RANGE = 33,
       DUPLICATES = 7,
-      WORDLIST_SIZE = 26
+      WORDLIST_SIZE = 27
     };
 
   static const TAO_operation_db_entry  wordlist[] =
@@ -1859,6 +2033,7 @@ TAO_CORBA_ValueMemberDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned
       {"_get_version", &POA_CORBA::ValueMemberDef::_get_version_skel, 0},
       {"_set_version", &POA_CORBA::ValueMemberDef::_set_version_skel, 0},
       {"_get_def_kind", &POA_CORBA::ValueMemberDef::_get_def_kind_skel, 0},
+      {"_repository_id", &POA_CORBA::ValueMemberDef::_repository_id_skel, 0},
       {"_get_defined_in", &POA_CORBA::ValueMemberDef::_get_defined_in_skel, 0},
       {"destroy", &POA_CORBA::ValueMemberDef::destroy_skel, 0},
       {"_get_absolute_name", &POA_CORBA::ValueMemberDef::_get_absolute_name_skel, 0},
@@ -1872,8 +2047,8 @@ TAO_CORBA_ValueMemberDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned
   static const signed char lookup[] =
     {
       -13,  -2, -15,  -2,   4,   5,  -1,  53,   8,  48,  12, -47, -46,  17, 
-       -1,  18,  -1,  19,  20,  -1,  21,  -9,  -3,  22,  -6,  -2, -23,  -2, 
-      -38,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  25, 
+       18,  19,  -1,  20,  21,  -1,  22,  -9,  -3,  23,  -6,  -2, -24,  -2, 
+      -38,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  26, 
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -1911,7 +2086,7 @@ TAO_CORBA_ValueMemberDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned
 static TAO_CORBA_ValueMemberDef_Perfect_Hash_OpTable tao_CORBA_ValueMemberDef_optable;
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:999
+// be\be_visitor_interface/interface_ss.cpp:921
 
 TAO::Collocation_Proxy_Broker *
 CORBA__TAO_ValueMemberDef_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -1931,10 +2106,7 @@ CORBA__TAO_ValueMemberDef_Proxy_Broker_Factory_Initializer (size_t)
 static int
 CORBA__TAO_ValueMemberDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
   CORBA__TAO_ValueMemberDef_Proxy_Broker_Factory_Initializer (
-      reinterpret_cast<
-          size_t> (
-          CORBA__TAO_ValueMemberDef_Proxy_Broker_Factory_Initializer
-        )
+      reinterpret_cast<size_t> (CORBA__TAO_ValueMemberDef_Proxy_Broker_Factory_Initializer)
     );
 
 
@@ -2074,8 +2246,8 @@ namespace POA_CORBA
     
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
-      TAO::SArg_Traits< CORBA::IDLType>::ret_arg_type retval =
-        TAO::Portable_Server::get_ret_arg< CORBA::IDLType, TAO::SArg_Traits< CORBA::IDLType>::ret_arg_type> (
+      TAO::SArg_Traits< ::CORBA::IDLType>::ret_arg_type retval =
+        TAO::Portable_Server::get_ret_arg< ::CORBA::IDLType, TAO::SArg_Traits< ::CORBA::IDLType>::ret_arg_type> (
           this->operation_details_,
           this->args_);
       
@@ -2112,7 +2284,7 @@ void POA_CORBA::ValueMemberDef::_get_type_def_skel (
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
   
-  TAO::SArg_Traits< CORBA::IDLType>::ret_val retval;
+  TAO::SArg_Traits< ::CORBA::IDLType>::ret_val retval;
   
   TAO::Argument * const args[] =
     {
@@ -2166,8 +2338,8 @@ namespace POA_CORBA
     
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
-      TAO::SArg_Traits< CORBA::IDLType>::in_arg_type arg_1 =
-        TAO::Portable_Server::get_in_arg< CORBA::IDLType, TAO::SArg_Traits< CORBA::IDLType>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_type arg_1 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::IDLType, TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
@@ -2205,7 +2377,7 @@ void POA_CORBA::ValueMemberDef::_set_type_def_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   TAO::SArg_Traits< void>::ret_val retval;
-  TAO::SArg_Traits< CORBA::IDLType>::in_arg_val _tao_type_def;
+  TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_val _tao_type_def;
   
   TAO::Argument * const args[] =
     {
@@ -2455,8 +2627,8 @@ namespace POA_CORBA
           this->operation_details_,
           this->args_);
       
-      TAO::SArg_Traits< CORBA::Char *>::in_arg_type arg_1 =
-        TAO::Portable_Server::get_in_arg< CORBA::Char *, TAO::SArg_Traits< CORBA::Char *>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
@@ -2491,7 +2663,7 @@ void POA_CORBA::ValueMemberDef::_is_a_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  TAO::SArg_Traits< CORBA::Char *>::in_arg_val _tao_repository_id;
+  TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
   
   TAO::Argument * const args[] =
     {
@@ -2612,10 +2784,98 @@ void POA_CORBA::ValueMemberDef::_non_existent_skel (
   
 }
 
+namespace POA_CORBA
+{
+  
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_operation/upcall_command_ss.cpp:127
+  
+  class _repository_id_ValueMemberDef_Upcall_Command
+    : public TAO::Upcall_Command
+  {
+  public:
+    inline _repository_id_ValueMemberDef_Upcall_Command (
+      POA_CORBA::ValueMemberDef * servant,
+      TAO_Operation_Details const * operation_details,
+      TAO::Argument * const args[])
+      : servant_ (servant)
+      , operation_details_ (operation_details)
+      , args_ (args)
+    {
+    }
+    
+    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+    {
+      TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
+        TAO::Portable_Server::get_ret_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type> (
+          this->operation_details_,
+          this->args_);
+      
+      
+      retval =
+        this->servant_-> _repository_id (
+          ACE_ENV_SINGLE_ARG_PARAMETER);
+        
+    }
+  
+  private:
+    POA_CORBA::ValueMemberDef * const servant_;
+    TAO_Operation_Details const * const operation_details_;
+    TAO::Argument * const * const args_;
+  };
+  
+}
+void POA_CORBA::ValueMemberDef::_repository_id_skel (
+    TAO_ServerRequest & server_request, 
+    void * TAO_INTERCEPTOR (servant_upcall),
+    void * servant
+    ACE_ENV_ARG_DECL
+  )
+{
+  
+  
+#if TAO_HAS_INTERCEPTORS == 1
+  static CORBA::TypeCode_ptr const * const exceptions = 0;
+  static size_t const nexceptions = 0;
+#endif /* TAO_HAS_INTERCEPTORS */
+  
+  TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
+  
+  TAO::Argument * const args[] =
+    {
+      &retval
+    };
+  
+  static size_t const nargs = 1;
+  
+  POA_CORBA::ValueMemberDef * const impl =
+    static_cast<POA_CORBA::ValueMemberDef *> (servant);
+  
+  _repository_id_ValueMemberDef_Upcall_Command command (
+    impl,
+    server_request.operation_details (),
+    args);
+  
+  TAO::Upcall_Wrapper upcall_wrapper;
+  upcall_wrapper.upcall (server_request
+                         , args
+                         , nargs
+                         , command
+#if TAO_HAS_INTERCEPTORS == 1
+                         , servant_upcall
+                         , exceptions
+                         , nexceptions
+#endif  /* TAO_HAS_INTERCEPTORS == 1 */
+                         ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+  
+}
+
 
 
 // TAO_IDL - Generated from 
-// be\be_visitor_interface/interface_ss.cpp:393
+// be\be_visitor_interface/interface_ss.cpp:501
 
 
 
@@ -2780,7 +3040,7 @@ const char* POA_CORBA::ValueMemberDef::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:940
+// be\be_visitor_interface/interface_ss.cpp:862
 
 void POA_CORBA::ValueMemberDef::_dispatch (
     TAO_ServerRequest & req,
@@ -2795,7 +3055,7 @@ void POA_CORBA::ValueMemberDef::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:891
+// be\be_visitor_interface/interface_ss.cpp:813
 
 CORBA::ValueMemberDef *
 POA_CORBA::ValueMemberDef::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -2827,7 +3087,7 @@ POA_CORBA::ValueMemberDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1455
+// be\be_interface.cpp:1465
 
 class TAO_CORBA_ValueDef_Perfect_Hash_OpTable
   : public TAO_Perfect_Hash_OpTable
@@ -2840,53 +3100,53 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: c:\ace\latest\ACE_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0 -a -o -t -p -K opname -L C++ -Z TAO_CORBA_ValueDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ACE\Any\ACE_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0 -a -o -t -p -K opname -L C++ -Z TAO_CORBA_ValueDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_ValueDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
   static const unsigned char asso_values[] =
     {
 #if defined (ACE_MVS)
-     92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
-     92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
-     92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
-     92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
-     92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
-     92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
-     92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
-     92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
-     92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
-     92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
-     92, 92, 92, 92, 92, 92, 92, 92, 92,  0,
-     92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
-     92, 92, 92, 92, 92, 92, 92, 92, 92,  0,
-     92, 45, 30,  0, 92, 92, 92, 20, 92, 92,
-     92, 92, 92, 92, 92, 92, 92,  0,  0, 30,
-     92,  0, 92,  0, 92, 92, 92, 92, 92, 92,
-     92, 92, 15, 20, 92, 92, 92,  5, 15, 92,
-     92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
-     92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
-     92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
-     92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
-     92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
-     92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
-     92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
-     92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
-     92, 92, 92, 92, 92, 92,
+     105, 105, 105, 105, 105, 105, 105, 105, 105, 105,
+     105, 105, 105, 105, 105, 105, 105, 105, 105, 105,
+     105, 105, 105, 105, 105, 105, 105, 105, 105, 105,
+     105, 105, 105, 105, 105, 105, 105, 105, 105, 105,
+     105, 105, 105, 105, 105, 105, 105, 105, 105, 105,
+     105, 105, 105, 105, 105, 105, 105, 105, 105, 105,
+     105, 105, 105, 105, 105, 105, 105, 105, 105, 105,
+     105, 105, 105, 105, 105, 105, 105, 105, 105, 105,
+     105, 105, 105, 105, 105, 105, 105, 105, 105, 105,
+     105, 105, 105, 105, 105, 105, 105, 105, 105, 105,
+     105, 105, 105, 105, 105, 105, 105, 105, 105,   0,
+     105, 105, 105, 105, 105, 105, 105, 105, 105, 105,
+     105, 105, 105, 105, 105, 105, 105, 105, 105,   0,
+     105,  15,  50,  40, 105, 105, 105,   0, 105, 105,
+     105, 105, 105, 105, 105, 105, 105,   0,   0,   0,
+     105,   0, 105,   0, 105, 105, 105, 105, 105, 105,
+     105, 105,  15,   0, 105, 105, 105,   5,  15, 105,
+     105, 105, 105, 105, 105, 105, 105, 105, 105, 105,
+     105, 105, 105, 105, 105, 105, 105, 105, 105, 105,
+     105, 105, 105, 105, 105, 105, 105, 105, 105, 105,
+     105, 105, 105, 105, 105, 105, 105, 105, 105, 105,
+     105, 105, 105, 105, 105, 105, 105, 105, 105, 105,
+     105, 105, 105, 105, 105, 105, 105, 105, 105, 105,
+     105, 105, 105, 105, 105, 105, 105, 105, 105, 105,
+     105, 105, 105, 105, 105, 105, 105, 105, 105, 105,
+     105, 105, 105, 105, 105, 105,
 #else
-     92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
-     92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
-     92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
-     92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
-     92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
-     92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
-     92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
-     92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
-     92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
-     92, 92, 92, 92, 92,  0, 92,  0, 92, 45,
-     30,  0, 92, 92, 92, 20, 92, 92,  0,  0,
-     30, 92,  0, 92,  0, 15, 20, 92, 92, 92,
-      5, 15, 92, 92, 92, 92, 92, 92,
+     105, 105, 105, 105, 105, 105, 105, 105, 105, 105,
+     105, 105, 105, 105, 105, 105, 105, 105, 105, 105,
+     105, 105, 105, 105, 105, 105, 105, 105, 105, 105,
+     105, 105, 105, 105, 105, 105, 105, 105, 105, 105,
+     105, 105, 105, 105, 105, 105, 105, 105, 105, 105,
+     105, 105, 105, 105, 105, 105, 105, 105, 105, 105,
+     105, 105, 105, 105, 105, 105, 105, 105, 105, 105,
+     105, 105, 105, 105, 105, 105, 105, 105, 105, 105,
+     105, 105, 105, 105, 105, 105, 105, 105, 105, 105,
+     105, 105, 105, 105, 105,   0, 105,   0, 105,  15,
+      50,  40, 105, 105, 105,   0, 105, 105,   0,   0,
+       0, 105,   0, 105,   0,  15,   0, 105, 105, 105,
+       5,  15, 105, 105, 105, 105, 105, 105,
 #endif /* ACE_MVS */
     };
   return len + asso_values[(int) str[len - 1]] + asso_values[(int) str[0]];
@@ -2897,85 +3157,87 @@ TAO_CORBA_ValueDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int l
 {
   enum
     {
-      TOTAL_KEYWORDS = 55,
+      TOTAL_KEYWORDS = 56,
       MIN_WORD_LENGTH = 4,
       MAX_WORD_LENGTH = 26,
       MIN_HASH_VALUE = 4,
-      MAX_HASH_VALUE = 91,
-      HASH_VALUE_RANGE = 88,
+      MAX_HASH_VALUE = 104,
+      HASH_VALUE_RANGE = 101,
       DUPLICATES = 17,
-      WORDLIST_SIZE = 59
+      WORDLIST_SIZE = 60
     };
 
   static const TAO_operation_db_entry  wordlist[] =
     {
       {"",0,0},{"",0,0},{"",0,0},{"",0,0},
-      {"move", &POA_CORBA::ValueDef::move_skel, 0},
+      {"is_a", &POA_CORBA::ValueDef::is_a_skel, 0},
       {"_is_a", &POA_CORBA::ValueDef::_is_a_skel, 0},
       {"lookup", &POA_CORBA::ValueDef::lookup_skel, 0},
+      {"_component", &POA_CORBA::ValueDef::_component_skel, 0},
+      {"_get_version", &POA_CORBA::ValueDef::_get_version_skel, 0},
+      {"_set_version", &POA_CORBA::ValueDef::_set_version_skel, 0},
+      {"_non_existent", &POA_CORBA::ValueDef::_non_existent_skel, 0},
+      {"_get_is_custom", &POA_CORBA::ValueDef::_get_is_custom_skel, 0},
+      {"_set_is_custom", &POA_CORBA::ValueDef::_set_is_custom_skel, 0},
+      {"_get_defined_in", &POA_CORBA::ValueDef::_get_defined_in_skel, 0},
+      {"_get_is_abstract", &POA_CORBA::ValueDef::_get_is_abstract_skel, 0},
+      {"_set_is_abstract", &POA_CORBA::ValueDef::_set_is_abstract_skel, 0},
+      {"create_enum", &POA_CORBA::ValueDef::create_enum_skel, 0},
+      {"create_union", &POA_CORBA::ValueDef::create_union_skel, 0},
+      {"create_struct", &POA_CORBA::ValueDef::create_struct_skel, 0},
+      {"create_constant", &POA_CORBA::ValueDef::create_constant_skel, 0},
+      {"create_exception", &POA_CORBA::ValueDef::create_exception_skel, 0},
+      {"create_operation", &POA_CORBA::ValueDef::create_operation_skel, 0},
+      {"_get_initializers", &POA_CORBA::ValueDef::_get_initializers_skel, 0},
+      {"_set_initializers", &POA_CORBA::ValueDef::_set_initializers_skel, 0},
+      {"create_value_member", &POA_CORBA::ValueDef::create_value_member_skel, 0},
+      {"create_value_box", &POA_CORBA::ValueDef::create_value_box_skel, 0},
+      {"contents", &POA_CORBA::ValueDef::contents_skel, 0},
+      {"_get_supported_interfaces", &POA_CORBA::ValueDef::_get_supported_interfaces_skel, 0},
+      {"_set_abstract_base_values", &POA_CORBA::ValueDef::_set_abstract_base_values_skel, 0},
+      {"_get_abstract_base_values", &POA_CORBA::ValueDef::_get_abstract_base_values_skel, 0},
+      {"_set_supported_interfaces", &POA_CORBA::ValueDef::_set_supported_interfaces_skel, 0},
+      {"_get_containing_repository", &POA_CORBA::ValueDef::_get_containing_repository_skel, 0},
+      {"create_alias", &POA_CORBA::ValueDef::create_alias_skel, 0},
+      {"move", &POA_CORBA::ValueDef::move_skel, 0},
       {"_get_name", &POA_CORBA::ValueDef::_get_name_skel, 0},
       {"_get_type", &POA_CORBA::ValueDef::_get_type_skel, 0},
       {"_set_name", &POA_CORBA::ValueDef::_set_name_skel, 0},
       {"_interface", &POA_CORBA::ValueDef::_interface_skel, 0},
       {"lookup_name", &POA_CORBA::ValueDef::lookup_name_skel, 0},
-      {"_get_is_custom", &POA_CORBA::ValueDef::_get_is_custom_skel, 0},
-      {"_set_is_custom", &POA_CORBA::ValueDef::_set_is_custom_skel, 0},
       {"_get_base_value", &POA_CORBA::ValueDef::_get_base_value_skel, 0},
       {"_set_base_value", &POA_CORBA::ValueDef::_set_base_value_skel, 0},
+      {"_get_id", &POA_CORBA::ValueDef::_get_id_skel, 0},
+      {"_set_id", &POA_CORBA::ValueDef::_set_id_skel, 0},
       {"_get_absolute_name", &POA_CORBA::ValueDef::_get_absolute_name_skel, 0},
       {"_get_is_truncatable", &POA_CORBA::ValueDef::_get_is_truncatable_skel, 0},
       {"_set_is_truncatable", &POA_CORBA::ValueDef::_set_is_truncatable_skel, 0},
-      {"is_a", &POA_CORBA::ValueDef::is_a_skel, 0},
-      {"_component", &POA_CORBA::ValueDef::_component_skel, 0},
-      {"_get_initializers", &POA_CORBA::ValueDef::_get_initializers_skel, 0},
-      {"_set_initializers", &POA_CORBA::ValueDef::_set_initializers_skel, 0},
-      {"_non_existent", &POA_CORBA::ValueDef::_non_existent_skel, 0},
-      {"_get_is_abstract", &POA_CORBA::ValueDef::_get_is_abstract_skel, 0},
-      {"_set_is_abstract", &POA_CORBA::ValueDef::_set_is_abstract_skel, 0},
-      {"_get_id", &POA_CORBA::ValueDef::_get_id_skel, 0},
-      {"_set_id", &POA_CORBA::ValueDef::_set_id_skel, 0},
-      {"describe", &POA_CORBA::ValueDef::describe_skel, 0},
-      {"_get_supported_interfaces", &POA_CORBA::ValueDef::_get_supported_interfaces_skel, 0},
-      {"_set_abstract_base_values", &POA_CORBA::ValueDef::_set_abstract_base_values_skel, 0},
-      {"_get_abstract_base_values", &POA_CORBA::ValueDef::_get_abstract_base_values_skel, 0},
-      {"_set_supported_interfaces", &POA_CORBA::ValueDef::_set_supported_interfaces_skel, 0},
-      {"_get_containing_repository", &POA_CORBA::ValueDef::_get_containing_repository_skel, 0},
-      {"_get_version", &POA_CORBA::ValueDef::_get_version_skel, 0},
-      {"_set_version", &POA_CORBA::ValueDef::_set_version_skel, 0},
       {"_get_def_kind", &POA_CORBA::ValueDef::_get_def_kind_skel, 0},
-      {"describe_value", &POA_CORBA::ValueDef::describe_value_skel, 0},
-      {"_get_defined_in", &POA_CORBA::ValueDef::_get_defined_in_skel, 0},
-      {"destroy", &POA_CORBA::ValueDef::destroy_skel, 0},
-      {"create_enum", &POA_CORBA::ValueDef::create_enum_skel, 0},
+      {"_repository_id", &POA_CORBA::ValueDef::_repository_id_skel, 0},
       {"create_value", &POA_CORBA::ValueDef::create_value_skel, 0},
       {"create_module", &POA_CORBA::ValueDef::create_module_skel, 0},
       {"create_native", &POA_CORBA::ValueDef::create_native_skel, 0},
       {"create_interface", &POA_CORBA::ValueDef::create_interface_skel, 0},
       {"create_attribute", &POA_CORBA::ValueDef::create_attribute_skel, 0},
       {"create_ext_value", &POA_CORBA::ValueDef::create_ext_value_skel, 0},
-      {"describe_contents", &POA_CORBA::ValueDef::describe_contents_skel, 0},
-      {"create_value_member", &POA_CORBA::ValueDef::create_value_member_skel, 0},
-      {"create_value_box", &POA_CORBA::ValueDef::create_value_box_skel, 0},
+      {"destroy", &POA_CORBA::ValueDef::destroy_skel, 0},
       {"create_local_interface", &POA_CORBA::ValueDef::create_local_interface_skel, 0},
-      {"contents", &POA_CORBA::ValueDef::contents_skel, 0},
       {"create_abstract_interface", &POA_CORBA::ValueDef::create_abstract_interface_skel, 0},
-      {"create_alias", &POA_CORBA::ValueDef::create_alias_skel, 0},
-      {"create_struct", &POA_CORBA::ValueDef::create_struct_skel, 0},
-      {"create_constant", &POA_CORBA::ValueDef::create_constant_skel, 0},
-      {"create_union", &POA_CORBA::ValueDef::create_union_skel, 0},
-      {"create_exception", &POA_CORBA::ValueDef::create_exception_skel, 0},
-      {"create_operation", &POA_CORBA::ValueDef::create_operation_skel, 0},
+      {"describe_contents", &POA_CORBA::ValueDef::describe_contents_skel, 0},
+      {"describe", &POA_CORBA::ValueDef::describe_skel, 0},
+      {"describe_value", &POA_CORBA::ValueDef::describe_value_skel, 0},
     };
 
-  static const signed char lookup[] =
+  static const signed short lookup[] =
     {
-        -1,   -1,   -7,   -3,    4,    5,    6,  -12,   -2,  -98,   10,   11,  -14,   -2, 
-       -98,  -94,  -17,   -2,   16,  -94,  -21,   -2,  -24,   -2,   19,   -1,  -26,   -2, 
-       -29,   -4,   20,   -1, -103,   23,  -34,   -2, -105, -102,   28,   -1, -103,   33, 
-       -99,   36,   37,   38,   -1,   -1,   -1,   -1,   -1,   -1,   39,   -1,  -42,   -2, 
-        40,   41,  -95,  -44,   -3,  -93,   47,   -1,   48,   -1,   49,   50,   51,   -1, 
-        52,   -1,   53,   -1,   -1,   -1,   -1,   -1,   54,   -1,   55,   -1,   -1,   -1, 
-        -1,   -1,   -1,   56,   -1,  -57,   -2,  -93, 
+        -8,   -2,  -11,   -2,    4,    5,    6,   -1,  -14,   -2,    7,   -1, -116,   10, 
+      -116,   13, -112,   -1,  -20,   -2,  -22,   -2,  -27,   -4,  -34,   -3,   16,   17, 
+        18,   -1,   19, -117, -116,   -1,   24,   -1,   25,   -1,   26,   -1, -122,   31, 
+        32,   -1,   33,  -39,   -2,  -41,   -2, -129,   37,   38,   -1,  -44,   -2, -114, 
+        -1, -114,   43, -110,   -1,   -1,   -1,   46,   47,  -49,   -2,   48, -107,  -51, 
+        -3, -106,   54,   -1,   -1,   -1,   -1,   55,   -1,   -1,   56,   -1,   57,   -1, 
+        -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+        58,   -1,   -1,   -1,   -1,   -1,   59, 
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -3013,7 +3275,7 @@ TAO_CORBA_ValueDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned int l
 static TAO_CORBA_ValueDef_Perfect_Hash_OpTable tao_CORBA_ValueDef_optable;
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:999
+// be\be_visitor_interface/interface_ss.cpp:921
 
 TAO::Collocation_Proxy_Broker *
 CORBA__TAO_ValueDef_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -3033,10 +3295,7 @@ CORBA__TAO_ValueDef_Proxy_Broker_Factory_Initializer (size_t)
 static int
 CORBA__TAO_ValueDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
   CORBA__TAO_ValueDef_Proxy_Broker_Factory_Initializer (
-      reinterpret_cast<
-          size_t> (
-          CORBA__TAO_ValueDef_Proxy_Broker_Factory_Initializer
-        )
+      reinterpret_cast<size_t> (CORBA__TAO_ValueDef_Proxy_Broker_Factory_Initializer)
     );
 
 
@@ -3086,8 +3345,8 @@ namespace POA_CORBA
     
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
-      TAO::SArg_Traits< CORBA::InterfaceDefSeq>::ret_arg_type retval =
-        TAO::Portable_Server::get_ret_arg< CORBA::InterfaceDefSeq, TAO::SArg_Traits< CORBA::InterfaceDefSeq>::ret_arg_type> (
+      TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::ret_arg_type retval =
+        TAO::Portable_Server::get_ret_arg< ::CORBA::InterfaceDefSeq, TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::ret_arg_type> (
           this->operation_details_,
           this->args_);
       
@@ -3124,7 +3383,7 @@ void POA_CORBA::ValueDef::_get_supported_interfaces_skel (
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
   
-  TAO::SArg_Traits< CORBA::InterfaceDefSeq>::ret_val retval;
+  TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::ret_val retval;
   
   TAO::Argument * const args[] =
     {
@@ -3178,8 +3437,8 @@ namespace POA_CORBA
     
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
-      TAO::SArg_Traits< CORBA::InterfaceDefSeq>::in_arg_type arg_1 =
-        TAO::Portable_Server::get_in_arg< CORBA::InterfaceDefSeq, TAO::SArg_Traits< CORBA::InterfaceDefSeq>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_type arg_1 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::InterfaceDefSeq, TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
@@ -3217,7 +3476,7 @@ void POA_CORBA::ValueDef::_set_supported_interfaces_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   TAO::SArg_Traits< void>::ret_val retval;
-  TAO::SArg_Traits< CORBA::InterfaceDefSeq>::in_arg_val _tao_supported_interfaces;
+  TAO::SArg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_val _tao_supported_interfaces;
   
   TAO::Argument * const args[] =
     {
@@ -3272,8 +3531,8 @@ namespace POA_CORBA
     
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
-      TAO::SArg_Traits< CORBA::InitializerSeq>::ret_arg_type retval =
-        TAO::Portable_Server::get_ret_arg< CORBA::InitializerSeq, TAO::SArg_Traits< CORBA::InitializerSeq>::ret_arg_type> (
+      TAO::SArg_Traits< ::CORBA::InitializerSeq>::ret_arg_type retval =
+        TAO::Portable_Server::get_ret_arg< ::CORBA::InitializerSeq, TAO::SArg_Traits< ::CORBA::InitializerSeq>::ret_arg_type> (
           this->operation_details_,
           this->args_);
       
@@ -3310,7 +3569,7 @@ void POA_CORBA::ValueDef::_get_initializers_skel (
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
   
-  TAO::SArg_Traits< CORBA::InitializerSeq>::ret_val retval;
+  TAO::SArg_Traits< ::CORBA::InitializerSeq>::ret_val retval;
   
   TAO::Argument * const args[] =
     {
@@ -3364,8 +3623,8 @@ namespace POA_CORBA
     
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
-      TAO::SArg_Traits< CORBA::InitializerSeq>::in_arg_type arg_1 =
-        TAO::Portable_Server::get_in_arg< CORBA::InitializerSeq, TAO::SArg_Traits< CORBA::InitializerSeq>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::InitializerSeq>::in_arg_type arg_1 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::InitializerSeq, TAO::SArg_Traits< ::CORBA::InitializerSeq>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
@@ -3403,7 +3662,7 @@ void POA_CORBA::ValueDef::_set_initializers_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   TAO::SArg_Traits< void>::ret_val retval;
-  TAO::SArg_Traits< CORBA::InitializerSeq>::in_arg_val _tao_initializers;
+  TAO::SArg_Traits< ::CORBA::InitializerSeq>::in_arg_val _tao_initializers;
   
   TAO::Argument * const args[] =
     {
@@ -3458,8 +3717,8 @@ namespace POA_CORBA
     
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
-      TAO::SArg_Traits< CORBA::ValueDef>::ret_arg_type retval =
-        TAO::Portable_Server::get_ret_arg< CORBA::ValueDef, TAO::SArg_Traits< CORBA::ValueDef>::ret_arg_type> (
+      TAO::SArg_Traits< ::CORBA::ValueDef>::ret_arg_type retval =
+        TAO::Portable_Server::get_ret_arg< ::CORBA::ValueDef, TAO::SArg_Traits< ::CORBA::ValueDef>::ret_arg_type> (
           this->operation_details_,
           this->args_);
       
@@ -3496,7 +3755,7 @@ void POA_CORBA::ValueDef::_get_base_value_skel (
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
   
-  TAO::SArg_Traits< CORBA::ValueDef>::ret_val retval;
+  TAO::SArg_Traits< ::CORBA::ValueDef>::ret_val retval;
   
   TAO::Argument * const args[] =
     {
@@ -3550,8 +3809,8 @@ namespace POA_CORBA
     
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
-      TAO::SArg_Traits< CORBA::ValueDef>::in_arg_type arg_1 =
-        TAO::Portable_Server::get_in_arg< CORBA::ValueDef, TAO::SArg_Traits< CORBA::ValueDef>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::ValueDef>::in_arg_type arg_1 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::ValueDef, TAO::SArg_Traits< ::CORBA::ValueDef>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
@@ -3589,7 +3848,7 @@ void POA_CORBA::ValueDef::_set_base_value_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   TAO::SArg_Traits< void>::ret_val retval;
-  TAO::SArg_Traits< CORBA::ValueDef>::in_arg_val _tao_base_value;
+  TAO::SArg_Traits< ::CORBA::ValueDef>::in_arg_val _tao_base_value;
   
   TAO::Argument * const args[] =
     {
@@ -3644,8 +3903,8 @@ namespace POA_CORBA
     
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
-      TAO::SArg_Traits< CORBA::ValueDefSeq>::ret_arg_type retval =
-        TAO::Portable_Server::get_ret_arg< CORBA::ValueDefSeq, TAO::SArg_Traits< CORBA::ValueDefSeq>::ret_arg_type> (
+      TAO::SArg_Traits< ::CORBA::ValueDefSeq>::ret_arg_type retval =
+        TAO::Portable_Server::get_ret_arg< ::CORBA::ValueDefSeq, TAO::SArg_Traits< ::CORBA::ValueDefSeq>::ret_arg_type> (
           this->operation_details_,
           this->args_);
       
@@ -3682,7 +3941,7 @@ void POA_CORBA::ValueDef::_get_abstract_base_values_skel (
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
   
-  TAO::SArg_Traits< CORBA::ValueDefSeq>::ret_val retval;
+  TAO::SArg_Traits< ::CORBA::ValueDefSeq>::ret_val retval;
   
   TAO::Argument * const args[] =
     {
@@ -3736,8 +3995,8 @@ namespace POA_CORBA
     
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
-      TAO::SArg_Traits< CORBA::ValueDefSeq>::in_arg_type arg_1 =
-        TAO::Portable_Server::get_in_arg< CORBA::ValueDefSeq, TAO::SArg_Traits< CORBA::ValueDefSeq>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::ValueDefSeq>::in_arg_type arg_1 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::ValueDefSeq, TAO::SArg_Traits< ::CORBA::ValueDefSeq>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
@@ -3775,7 +4034,7 @@ void POA_CORBA::ValueDef::_set_abstract_base_values_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   TAO::SArg_Traits< void>::ret_val retval;
-  TAO::SArg_Traits< CORBA::ValueDefSeq>::in_arg_val _tao_abstract_base_values;
+  TAO::SArg_Traits< ::CORBA::ValueDefSeq>::in_arg_val _tao_abstract_base_values;
   
   TAO::Argument * const args[] =
     {
@@ -4393,8 +4652,8 @@ namespace POA_CORBA
           this->operation_details_,
           this->args_);
       
-      TAO::SArg_Traits< CORBA::RepositoryId>::in_arg_type arg_1 =
-        TAO::Portable_Server::get_in_arg< CORBA::RepositoryId, TAO::SArg_Traits< CORBA::RepositoryId>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId, TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
@@ -4434,7 +4693,7 @@ void POA_CORBA::ValueDef::is_a_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  TAO::SArg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id;
+  TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
   
   TAO::Argument * const args[] =
     {
@@ -4489,8 +4748,8 @@ namespace POA_CORBA
     
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
-      TAO::SArg_Traits< CORBA::ValueDef::FullValueDescription>::ret_arg_type retval =
-        TAO::Portable_Server::get_ret_arg< CORBA::ValueDef::FullValueDescription, TAO::SArg_Traits< CORBA::ValueDef::FullValueDescription>::ret_arg_type> (
+      TAO::SArg_Traits< ::CORBA::ValueDef::FullValueDescription>::ret_arg_type retval =
+        TAO::Portable_Server::get_ret_arg< ::CORBA::ValueDef::FullValueDescription, TAO::SArg_Traits< ::CORBA::ValueDef::FullValueDescription>::ret_arg_type> (
           this->operation_details_,
           this->args_);
       
@@ -4527,7 +4786,7 @@ void POA_CORBA::ValueDef::describe_value_skel (
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
   
-  TAO::SArg_Traits< CORBA::ValueDef::FullValueDescription>::ret_val retval;
+  TAO::SArg_Traits< ::CORBA::ValueDef::FullValueDescription>::ret_val retval;
   
   TAO::Argument * const args[] =
     {
@@ -4581,31 +4840,31 @@ namespace POA_CORBA
     
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
-      TAO::SArg_Traits< CORBA::ValueMemberDef>::ret_arg_type retval =
-        TAO::Portable_Server::get_ret_arg< CORBA::ValueMemberDef, TAO::SArg_Traits< CORBA::ValueMemberDef>::ret_arg_type> (
+      TAO::SArg_Traits< ::CORBA::ValueMemberDef>::ret_arg_type retval =
+        TAO::Portable_Server::get_ret_arg< ::CORBA::ValueMemberDef, TAO::SArg_Traits< ::CORBA::ValueMemberDef>::ret_arg_type> (
           this->operation_details_,
           this->args_);
       
-      TAO::SArg_Traits< CORBA::RepositoryId>::in_arg_type arg_1 =
-        TAO::Portable_Server::get_in_arg< CORBA::RepositoryId, TAO::SArg_Traits< CORBA::RepositoryId>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId, TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
         
-      TAO::SArg_Traits< CORBA::Identifier>::in_arg_type arg_2 =
-        TAO::Portable_Server::get_in_arg< CORBA::Identifier, TAO::SArg_Traits< CORBA::Identifier>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::Identifier, TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type> (
           this->operation_details_,
           this->args_,
           2);
         
-      TAO::SArg_Traits< CORBA::VersionSpec>::in_arg_type arg_3 =
-        TAO::Portable_Server::get_in_arg< CORBA::VersionSpec, TAO::SArg_Traits< CORBA::VersionSpec>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec, TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type> (
           this->operation_details_,
           this->args_,
           3);
         
-      TAO::SArg_Traits< CORBA::IDLType>::in_arg_type arg_4 =
-        TAO::Portable_Server::get_in_arg< CORBA::IDLType, TAO::SArg_Traits< CORBA::IDLType>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_type arg_4 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::IDLType, TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_type> (
           this->operation_details_,
           this->args_,
           4);
@@ -4654,11 +4913,11 @@ void POA_CORBA::ValueDef::create_value_member_skel (
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
   
-  TAO::SArg_Traits< CORBA::ValueMemberDef>::ret_val retval;
-  TAO::SArg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id;
-  TAO::SArg_Traits< CORBA::Identifier>::in_arg_val _tao_name;
-  TAO::SArg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version;
-  TAO::SArg_Traits< CORBA::IDLType>::in_arg_val _tao_type;
+  TAO::SArg_Traits< ::CORBA::ValueMemberDef>::ret_val retval;
+  TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
+  TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
+  TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version;
+  TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_val _tao_type;
   TAO::SArg_Traits< ::CORBA::Visibility>::in_arg_val _tao_access;
   
   TAO::Argument * const args[] =
@@ -4718,37 +4977,37 @@ namespace POA_CORBA
     
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
-      TAO::SArg_Traits< CORBA::AttributeDef>::ret_arg_type retval =
-        TAO::Portable_Server::get_ret_arg< CORBA::AttributeDef, TAO::SArg_Traits< CORBA::AttributeDef>::ret_arg_type> (
+      TAO::SArg_Traits< ::CORBA::AttributeDef>::ret_arg_type retval =
+        TAO::Portable_Server::get_ret_arg< ::CORBA::AttributeDef, TAO::SArg_Traits< ::CORBA::AttributeDef>::ret_arg_type> (
           this->operation_details_,
           this->args_);
       
-      TAO::SArg_Traits< CORBA::RepositoryId>::in_arg_type arg_1 =
-        TAO::Portable_Server::get_in_arg< CORBA::RepositoryId, TAO::SArg_Traits< CORBA::RepositoryId>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId, TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
         
-      TAO::SArg_Traits< CORBA::Identifier>::in_arg_type arg_2 =
-        TAO::Portable_Server::get_in_arg< CORBA::Identifier, TAO::SArg_Traits< CORBA::Identifier>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::Identifier, TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type> (
           this->operation_details_,
           this->args_,
           2);
         
-      TAO::SArg_Traits< CORBA::VersionSpec>::in_arg_type arg_3 =
-        TAO::Portable_Server::get_in_arg< CORBA::VersionSpec, TAO::SArg_Traits< CORBA::VersionSpec>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec, TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type> (
           this->operation_details_,
           this->args_,
           3);
         
-      TAO::SArg_Traits< CORBA::IDLType>::in_arg_type arg_4 =
-        TAO::Portable_Server::get_in_arg< CORBA::IDLType, TAO::SArg_Traits< CORBA::IDLType>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_type arg_4 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::IDLType, TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_type> (
           this->operation_details_,
           this->args_,
           4);
         
-      TAO::SArg_Traits< CORBA::AttributeMode>::in_arg_type arg_5 =
-        TAO::Portable_Server::get_in_arg< CORBA::AttributeMode, TAO::SArg_Traits< CORBA::AttributeMode>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::AttributeMode>::in_arg_type arg_5 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::AttributeMode, TAO::SArg_Traits< ::CORBA::AttributeMode>::in_arg_type> (
           this->operation_details_,
           this->args_,
           5);
@@ -4791,12 +5050,12 @@ void POA_CORBA::ValueDef::create_attribute_skel (
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
   
-  TAO::SArg_Traits< CORBA::AttributeDef>::ret_val retval;
-  TAO::SArg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id;
-  TAO::SArg_Traits< CORBA::Identifier>::in_arg_val _tao_name;
-  TAO::SArg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version;
-  TAO::SArg_Traits< CORBA::IDLType>::in_arg_val _tao_type;
-  TAO::SArg_Traits< CORBA::AttributeMode>::in_arg_val _tao_mode;
+  TAO::SArg_Traits< ::CORBA::AttributeDef>::ret_val retval;
+  TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
+  TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
+  TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version;
+  TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_val _tao_type;
+  TAO::SArg_Traits< ::CORBA::AttributeMode>::in_arg_val _tao_mode;
   
   TAO::Argument * const args[] =
     {
@@ -4855,55 +5114,55 @@ namespace POA_CORBA
     
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
-      TAO::SArg_Traits< CORBA::OperationDef>::ret_arg_type retval =
-        TAO::Portable_Server::get_ret_arg< CORBA::OperationDef, TAO::SArg_Traits< CORBA::OperationDef>::ret_arg_type> (
+      TAO::SArg_Traits< ::CORBA::OperationDef>::ret_arg_type retval =
+        TAO::Portable_Server::get_ret_arg< ::CORBA::OperationDef, TAO::SArg_Traits< ::CORBA::OperationDef>::ret_arg_type> (
           this->operation_details_,
           this->args_);
       
-      TAO::SArg_Traits< CORBA::RepositoryId>::in_arg_type arg_1 =
-        TAO::Portable_Server::get_in_arg< CORBA::RepositoryId, TAO::SArg_Traits< CORBA::RepositoryId>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId, TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
         
-      TAO::SArg_Traits< CORBA::Identifier>::in_arg_type arg_2 =
-        TAO::Portable_Server::get_in_arg< CORBA::Identifier, TAO::SArg_Traits< CORBA::Identifier>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::Identifier, TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type> (
           this->operation_details_,
           this->args_,
           2);
         
-      TAO::SArg_Traits< CORBA::VersionSpec>::in_arg_type arg_3 =
-        TAO::Portable_Server::get_in_arg< CORBA::VersionSpec, TAO::SArg_Traits< CORBA::VersionSpec>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec, TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type> (
           this->operation_details_,
           this->args_,
           3);
         
-      TAO::SArg_Traits< CORBA::IDLType>::in_arg_type arg_4 =
-        TAO::Portable_Server::get_in_arg< CORBA::IDLType, TAO::SArg_Traits< CORBA::IDLType>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_type arg_4 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::IDLType, TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_type> (
           this->operation_details_,
           this->args_,
           4);
         
-      TAO::SArg_Traits< CORBA::OperationMode>::in_arg_type arg_5 =
-        TAO::Portable_Server::get_in_arg< CORBA::OperationMode, TAO::SArg_Traits< CORBA::OperationMode>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::OperationMode>::in_arg_type arg_5 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::OperationMode, TAO::SArg_Traits< ::CORBA::OperationMode>::in_arg_type> (
           this->operation_details_,
           this->args_,
           5);
         
-      TAO::SArg_Traits< CORBA::ParDescriptionSeq>::in_arg_type arg_6 =
-        TAO::Portable_Server::get_in_arg< CORBA::ParDescriptionSeq, TAO::SArg_Traits< CORBA::ParDescriptionSeq>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::ParDescriptionSeq>::in_arg_type arg_6 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::ParDescriptionSeq, TAO::SArg_Traits< ::CORBA::ParDescriptionSeq>::in_arg_type> (
           this->operation_details_,
           this->args_,
           6);
         
-      TAO::SArg_Traits< CORBA::ExceptionDefSeq>::in_arg_type arg_7 =
-        TAO::Portable_Server::get_in_arg< CORBA::ExceptionDefSeq, TAO::SArg_Traits< CORBA::ExceptionDefSeq>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::ExceptionDefSeq>::in_arg_type arg_7 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::ExceptionDefSeq, TAO::SArg_Traits< ::CORBA::ExceptionDefSeq>::in_arg_type> (
           this->operation_details_,
           this->args_,
           7);
         
-      TAO::SArg_Traits< CORBA::ContextIdSeq>::in_arg_type arg_8 =
-        TAO::Portable_Server::get_in_arg< CORBA::ContextIdSeq, TAO::SArg_Traits< CORBA::ContextIdSeq>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::ContextIdSeq>::in_arg_type arg_8 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::ContextIdSeq, TAO::SArg_Traits< ::CORBA::ContextIdSeq>::in_arg_type> (
           this->operation_details_,
           this->args_,
           8);
@@ -4949,15 +5208,15 @@ void POA_CORBA::ValueDef::create_operation_skel (
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
   
-  TAO::SArg_Traits< CORBA::OperationDef>::ret_val retval;
-  TAO::SArg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id;
-  TAO::SArg_Traits< CORBA::Identifier>::in_arg_val _tao_name;
-  TAO::SArg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version;
-  TAO::SArg_Traits< CORBA::IDLType>::in_arg_val _tao_result;
-  TAO::SArg_Traits< CORBA::OperationMode>::in_arg_val _tao_mode;
-  TAO::SArg_Traits< CORBA::ParDescriptionSeq>::in_arg_val _tao_params;
-  TAO::SArg_Traits< CORBA::ExceptionDefSeq>::in_arg_val _tao_exceptions;
-  TAO::SArg_Traits< CORBA::ContextIdSeq>::in_arg_val _tao_contexts;
+  TAO::SArg_Traits< ::CORBA::OperationDef>::ret_val retval;
+  TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
+  TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
+  TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version;
+  TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_val _tao_result;
+  TAO::SArg_Traits< ::CORBA::OperationMode>::in_arg_val _tao_mode;
+  TAO::SArg_Traits< ::CORBA::ParDescriptionSeq>::in_arg_val _tao_params;
+  TAO::SArg_Traits< ::CORBA::ExceptionDefSeq>::in_arg_val _tao_exceptions;
+  TAO::SArg_Traits< ::CORBA::ContextIdSeq>::in_arg_val _tao_contexts;
   
   TAO::Argument * const args[] =
     {
@@ -5028,8 +5287,8 @@ namespace POA_CORBA
           this->operation_details_,
           this->args_);
       
-      TAO::SArg_Traits< CORBA::Char *>::in_arg_type arg_1 =
-        TAO::Portable_Server::get_in_arg< CORBA::Char *, TAO::SArg_Traits< CORBA::Char *>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
@@ -5064,7 +5323,7 @@ void POA_CORBA::ValueDef::_is_a_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  TAO::SArg_Traits< CORBA::Char *>::in_arg_val _tao_repository_id;
+  TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
   
   TAO::Argument * const args[] =
     {
@@ -5185,10 +5444,98 @@ void POA_CORBA::ValueDef::_non_existent_skel (
   
 }
 
+namespace POA_CORBA
+{
+  
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_operation/upcall_command_ss.cpp:127
+  
+  class _repository_id_ValueDef_Upcall_Command
+    : public TAO::Upcall_Command
+  {
+  public:
+    inline _repository_id_ValueDef_Upcall_Command (
+      POA_CORBA::ValueDef * servant,
+      TAO_Operation_Details const * operation_details,
+      TAO::Argument * const args[])
+      : servant_ (servant)
+      , operation_details_ (operation_details)
+      , args_ (args)
+    {
+    }
+    
+    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+    {
+      TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
+        TAO::Portable_Server::get_ret_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type> (
+          this->operation_details_,
+          this->args_);
+      
+      
+      retval =
+        this->servant_-> _repository_id (
+          ACE_ENV_SINGLE_ARG_PARAMETER);
+        
+    }
+  
+  private:
+    POA_CORBA::ValueDef * const servant_;
+    TAO_Operation_Details const * const operation_details_;
+    TAO::Argument * const * const args_;
+  };
+  
+}
+void POA_CORBA::ValueDef::_repository_id_skel (
+    TAO_ServerRequest & server_request, 
+    void * TAO_INTERCEPTOR (servant_upcall),
+    void * servant
+    ACE_ENV_ARG_DECL
+  )
+{
+  
+  
+#if TAO_HAS_INTERCEPTORS == 1
+  static CORBA::TypeCode_ptr const * const exceptions = 0;
+  static size_t const nexceptions = 0;
+#endif /* TAO_HAS_INTERCEPTORS */
+  
+  TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
+  
+  TAO::Argument * const args[] =
+    {
+      &retval
+    };
+  
+  static size_t const nargs = 1;
+  
+  POA_CORBA::ValueDef * const impl =
+    static_cast<POA_CORBA::ValueDef *> (servant);
+  
+  _repository_id_ValueDef_Upcall_Command command (
+    impl,
+    server_request.operation_details (),
+    args);
+  
+  TAO::Upcall_Wrapper upcall_wrapper;
+  upcall_wrapper.upcall (server_request
+                         , args
+                         , nargs
+                         , command
+#if TAO_HAS_INTERCEPTORS == 1
+                         , servant_upcall
+                         , exceptions
+                         , nexceptions
+#endif  /* TAO_HAS_INTERCEPTORS == 1 */
+                         ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+  
+}
+
 
 
 // TAO_IDL - Generated from 
-// be\be_visitor_interface/interface_ss.cpp:393
+// be\be_visitor_interface/interface_ss.cpp:501
 
 
 
@@ -5361,7 +5708,7 @@ const char* POA_CORBA::ValueDef::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:940
+// be\be_visitor_interface/interface_ss.cpp:862
 
 void POA_CORBA::ValueDef::_dispatch (
     TAO_ServerRequest & req,
@@ -5376,7 +5723,7 @@ void POA_CORBA::ValueDef::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:891
+// be\be_visitor_interface/interface_ss.cpp:813
 
 CORBA::ValueDef *
 POA_CORBA::ValueDef::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -5408,7 +5755,7 @@ POA_CORBA::ValueDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1455
+// be\be_interface.cpp:1465
 
 class TAO_CORBA_ExtValueDef_Perfect_Hash_OpTable
   : public TAO_Perfect_Hash_OpTable
@@ -5421,53 +5768,53 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: c:\ace\latest\ACE_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0 -a -o -t -p -K opname -L C++ -Z TAO_CORBA_ExtValueDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ACE\Any\ACE_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0 -a -o -t -p -K opname -L C++ -Z TAO_CORBA_ExtValueDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_ExtValueDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
   static const unsigned char asso_values[] =
     {
 #if defined (ACE_MVS)
-     92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
-     92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
-     92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
-     92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
-     92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
-     92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
-     92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
-     92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
-     92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
-     92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
-     92, 92, 92, 92, 92, 92, 92, 92, 92,  0,
-     92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
-     92, 92, 92, 92, 92, 92, 92, 92, 92,  0,
-     92, 45, 30,  0, 92, 92, 92, 20, 92, 92,
-     92, 92, 92, 92, 92, 92, 92,  0,  0, 30,
-     92,  0, 92,  0, 92, 92, 92, 92, 92, 92,
-     92, 92, 15, 15, 92, 92, 92,  5, 15, 92,
-     92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
-     92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
-     92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
-     92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
-     92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
-     92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
-     92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
-     92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
-     92, 92, 92, 92, 92, 92,
+     109, 109, 109, 109, 109, 109, 109, 109, 109, 109,
+     109, 109, 109, 109, 109, 109, 109, 109, 109, 109,
+     109, 109, 109, 109, 109, 109, 109, 109, 109, 109,
+     109, 109, 109, 109, 109, 109, 109, 109, 109, 109,
+     109, 109, 109, 109, 109, 109, 109, 109, 109, 109,
+     109, 109, 109, 109, 109, 109, 109, 109, 109, 109,
+     109, 109, 109, 109, 109, 109, 109, 109, 109, 109,
+     109, 109, 109, 109, 109, 109, 109, 109, 109, 109,
+     109, 109, 109, 109, 109, 109, 109, 109, 109, 109,
+     109, 109, 109, 109, 109, 109, 109, 109, 109, 109,
+     109, 109, 109, 109, 109, 109, 109, 109, 109,   0,
+     109, 109, 109, 109, 109, 109, 109, 109, 109, 109,
+     109, 109, 109, 109, 109, 109, 109, 109, 109,   0,
+     109,  15,  50,  40, 109, 109, 109,   0, 109, 109,
+     109, 109, 109, 109, 109, 109, 109,   0,   0,   0,
+     109,   0, 109,   0, 109, 109, 109, 109, 109, 109,
+     109, 109,  15,   0, 109, 109, 109,  15,  15, 109,
+     109, 109, 109, 109, 109, 109, 109, 109, 109, 109,
+     109, 109, 109, 109, 109, 109, 109, 109, 109, 109,
+     109, 109, 109, 109, 109, 109, 109, 109, 109, 109,
+     109, 109, 109, 109, 109, 109, 109, 109, 109, 109,
+     109, 109, 109, 109, 109, 109, 109, 109, 109, 109,
+     109, 109, 109, 109, 109, 109, 109, 109, 109, 109,
+     109, 109, 109, 109, 109, 109, 109, 109, 109, 109,
+     109, 109, 109, 109, 109, 109, 109, 109, 109, 109,
+     109, 109, 109, 109, 109, 109,
 #else
-     92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
-     92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
-     92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
-     92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
-     92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
-     92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
-     92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
-     92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
-     92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
-     92, 92, 92, 92, 92,  0, 92,  0, 92, 45,
-     30,  0, 92, 92, 92, 20, 92, 92,  0,  0,
-     30, 92,  0, 92,  0, 15, 15, 92, 92, 92,
-      5, 15, 92, 92, 92, 92, 92, 92,
+     109, 109, 109, 109, 109, 109, 109, 109, 109, 109,
+     109, 109, 109, 109, 109, 109, 109, 109, 109, 109,
+     109, 109, 109, 109, 109, 109, 109, 109, 109, 109,
+     109, 109, 109, 109, 109, 109, 109, 109, 109, 109,
+     109, 109, 109, 109, 109, 109, 109, 109, 109, 109,
+     109, 109, 109, 109, 109, 109, 109, 109, 109, 109,
+     109, 109, 109, 109, 109, 109, 109, 109, 109, 109,
+     109, 109, 109, 109, 109, 109, 109, 109, 109, 109,
+     109, 109, 109, 109, 109, 109, 109, 109, 109, 109,
+     109, 109, 109, 109, 109,   0, 109,   0, 109,  15,
+      50,  40, 109, 109, 109,   0, 109, 109,   0,   0,
+       0, 109,   0, 109,   0,  15,   0, 109, 109, 109,
+      15,  15, 109, 109, 109, 109, 109, 109,
 #endif /* ACE_MVS */
     };
   return len + asso_values[(int) str[len - 1]] + asso_values[(int) str[0]];
@@ -5478,89 +5825,91 @@ TAO_CORBA_ExtValueDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned in
 {
   enum
     {
-      TOTAL_KEYWORDS = 59,
+      TOTAL_KEYWORDS = 60,
       MIN_WORD_LENGTH = 4,
       MAX_WORD_LENGTH = 26,
       MIN_HASH_VALUE = 4,
-      MAX_HASH_VALUE = 91,
-      HASH_VALUE_RANGE = 88,
+      MAX_HASH_VALUE = 108,
+      HASH_VALUE_RANGE = 105,
       DUPLICATES = 18,
-      WORDLIST_SIZE = 63
+      WORDLIST_SIZE = 64
     };
 
   static const TAO_operation_db_entry  wordlist[] =
     {
       {"",0,0},{"",0,0},{"",0,0},{"",0,0},
-      {"move", &POA_CORBA::ExtValueDef::move_skel, 0},
+      {"is_a", &POA_CORBA::ExtValueDef::is_a_skel, 0},
       {"_is_a", &POA_CORBA::ExtValueDef::_is_a_skel, 0},
       {"lookup", &POA_CORBA::ExtValueDef::lookup_skel, 0},
-      {"_get_name", &POA_CORBA::ExtValueDef::_get_name_skel, 0},
-      {"_get_type", &POA_CORBA::ExtValueDef::_get_type_skel, 0},
-      {"_set_name", &POA_CORBA::ExtValueDef::_set_name_skel, 0},
-      {"_interface", &POA_CORBA::ExtValueDef::_interface_skel, 0},
-      {"lookup_name", &POA_CORBA::ExtValueDef::lookup_name_skel, 0},
-      {"_get_is_custom", &POA_CORBA::ExtValueDef::_get_is_custom_skel, 0},
-      {"_set_is_custom", &POA_CORBA::ExtValueDef::_set_is_custom_skel, 0},
-      {"_get_base_value", &POA_CORBA::ExtValueDef::_get_base_value_skel, 0},
-      {"_set_base_value", &POA_CORBA::ExtValueDef::_set_base_value_skel, 0},
-      {"_get_absolute_name", &POA_CORBA::ExtValueDef::_get_absolute_name_skel, 0},
-      {"_get_is_truncatable", &POA_CORBA::ExtValueDef::_get_is_truncatable_skel, 0},
-      {"_set_is_truncatable", &POA_CORBA::ExtValueDef::_set_is_truncatable_skel, 0},
-      {"is_a", &POA_CORBA::ExtValueDef::is_a_skel, 0},
       {"_component", &POA_CORBA::ExtValueDef::_component_skel, 0},
+      {"_get_version", &POA_CORBA::ExtValueDef::_get_version_skel, 0},
+      {"_set_version", &POA_CORBA::ExtValueDef::_set_version_skel, 0},
       {"_non_existent", &POA_CORBA::ExtValueDef::_non_existent_skel, 0},
+      {"_get_is_custom", &POA_CORBA::ExtValueDef::_get_is_custom_skel, 0},
+      {"_set_is_custom", &POA_CORBA::ExtValueDef::_set_is_custom_skel, 0},
+      {"_get_defined_in", &POA_CORBA::ExtValueDef::_get_defined_in_skel, 0},
       {"_get_is_abstract", &POA_CORBA::ExtValueDef::_get_is_abstract_skel, 0},
       {"_set_is_abstract", &POA_CORBA::ExtValueDef::_set_is_abstract_skel, 0},
+      {"create_enum", &POA_CORBA::ExtValueDef::create_enum_skel, 0},
+      {"create_union", &POA_CORBA::ExtValueDef::create_union_skel, 0},
+      {"create_struct", &POA_CORBA::ExtValueDef::create_struct_skel, 0},
+      {"create_constant", &POA_CORBA::ExtValueDef::create_constant_skel, 0},
+      {"create_exception", &POA_CORBA::ExtValueDef::create_exception_skel, 0},
+      {"create_operation", &POA_CORBA::ExtValueDef::create_operation_skel, 0},
       {"_get_initializers", &POA_CORBA::ExtValueDef::_get_initializers_skel, 0},
       {"_set_initializers", &POA_CORBA::ExtValueDef::_set_initializers_skel, 0},
+      {"create_value_member", &POA_CORBA::ExtValueDef::create_value_member_skel, 0},
       {"_get_ext_initializers", &POA_CORBA::ExtValueDef::_get_ext_initializers_skel, 0},
       {"_set_ext_initializers", &POA_CORBA::ExtValueDef::_set_ext_initializers_skel, 0},
-      {"_get_id", &POA_CORBA::ExtValueDef::_get_id_skel, 0},
-      {"_set_id", &POA_CORBA::ExtValueDef::_set_id_skel, 0},
-      {"describe", &POA_CORBA::ExtValueDef::describe_skel, 0},
+      {"contents", &POA_CORBA::ExtValueDef::contents_skel, 0},
       {"_get_supported_interfaces", &POA_CORBA::ExtValueDef::_get_supported_interfaces_skel, 0},
       {"_set_abstract_base_values", &POA_CORBA::ExtValueDef::_set_abstract_base_values_skel, 0},
       {"_get_abstract_base_values", &POA_CORBA::ExtValueDef::_get_abstract_base_values_skel, 0},
       {"_set_supported_interfaces", &POA_CORBA::ExtValueDef::_set_supported_interfaces_skel, 0},
       {"_get_containing_repository", &POA_CORBA::ExtValueDef::_get_containing_repository_skel, 0},
-      {"_get_version", &POA_CORBA::ExtValueDef::_get_version_skel, 0},
-      {"_set_version", &POA_CORBA::ExtValueDef::_set_version_skel, 0},
+      {"create_alias", &POA_CORBA::ExtValueDef::create_alias_skel, 0},
+      {"move", &POA_CORBA::ExtValueDef::move_skel, 0},
+      {"create_value_box", &POA_CORBA::ExtValueDef::create_value_box_skel, 0},
+      {"_get_name", &POA_CORBA::ExtValueDef::_get_name_skel, 0},
+      {"_get_type", &POA_CORBA::ExtValueDef::_get_type_skel, 0},
+      {"_set_name", &POA_CORBA::ExtValueDef::_set_name_skel, 0},
+      {"_interface", &POA_CORBA::ExtValueDef::_interface_skel, 0},
+      {"lookup_name", &POA_CORBA::ExtValueDef::lookup_name_skel, 0},
+      {"_get_base_value", &POA_CORBA::ExtValueDef::_get_base_value_skel, 0},
+      {"_set_base_value", &POA_CORBA::ExtValueDef::_set_base_value_skel, 0},
+      {"_get_id", &POA_CORBA::ExtValueDef::_get_id_skel, 0},
+      {"_set_id", &POA_CORBA::ExtValueDef::_set_id_skel, 0},
+      {"_get_absolute_name", &POA_CORBA::ExtValueDef::_get_absolute_name_skel, 0},
+      {"_get_is_truncatable", &POA_CORBA::ExtValueDef::_get_is_truncatable_skel, 0},
+      {"_set_is_truncatable", &POA_CORBA::ExtValueDef::_set_is_truncatable_skel, 0},
       {"_get_def_kind", &POA_CORBA::ExtValueDef::_get_def_kind_skel, 0},
-      {"describe_value", &POA_CORBA::ExtValueDef::describe_value_skel, 0},
-      {"_get_defined_in", &POA_CORBA::ExtValueDef::_get_defined_in_skel, 0},
-      {"describe_ext_value", &POA_CORBA::ExtValueDef::describe_ext_value_skel, 0},
-      {"destroy", &POA_CORBA::ExtValueDef::destroy_skel, 0},
-      {"create_enum", &POA_CORBA::ExtValueDef::create_enum_skel, 0},
+      {"_repository_id", &POA_CORBA::ExtValueDef::_repository_id_skel, 0},
       {"create_value", &POA_CORBA::ExtValueDef::create_value_skel, 0},
       {"create_module", &POA_CORBA::ExtValueDef::create_module_skel, 0},
       {"create_native", &POA_CORBA::ExtValueDef::create_native_skel, 0},
       {"create_interface", &POA_CORBA::ExtValueDef::create_interface_skel, 0},
       {"create_attribute", &POA_CORBA::ExtValueDef::create_attribute_skel, 0},
       {"create_ext_value", &POA_CORBA::ExtValueDef::create_ext_value_skel, 0},
-      {"describe_contents", &POA_CORBA::ExtValueDef::describe_contents_skel, 0},
-      {"create_value_member", &POA_CORBA::ExtValueDef::create_value_member_skel, 0},
+      {"destroy", &POA_CORBA::ExtValueDef::destroy_skel, 0},
       {"create_ext_attribute", &POA_CORBA::ExtValueDef::create_ext_attribute_skel, 0},
-      {"create_value_box", &POA_CORBA::ExtValueDef::create_value_box_skel, 0},
       {"create_local_interface", &POA_CORBA::ExtValueDef::create_local_interface_skel, 0},
-      {"contents", &POA_CORBA::ExtValueDef::contents_skel, 0},
       {"create_abstract_interface", &POA_CORBA::ExtValueDef::create_abstract_interface_skel, 0},
-      {"create_alias", &POA_CORBA::ExtValueDef::create_alias_skel, 0},
-      {"create_struct", &POA_CORBA::ExtValueDef::create_struct_skel, 0},
-      {"create_constant", &POA_CORBA::ExtValueDef::create_constant_skel, 0},
-      {"create_union", &POA_CORBA::ExtValueDef::create_union_skel, 0},
-      {"create_exception", &POA_CORBA::ExtValueDef::create_exception_skel, 0},
-      {"create_operation", &POA_CORBA::ExtValueDef::create_operation_skel, 0},
+      {"describe_contents", &POA_CORBA::ExtValueDef::describe_contents_skel, 0},
+      {"describe", &POA_CORBA::ExtValueDef::describe_skel, 0},
+      {"describe_value", &POA_CORBA::ExtValueDef::describe_value_skel, 0},
+      {"describe_ext_value", &POA_CORBA::ExtValueDef::describe_ext_value_skel, 0},
     };
 
-  static const signed char lookup[] =
+  static const signed short lookup[] =
     {
-        -7,   -3,  -12,   -2,    4,    5,    6,  -14,   -2, -100,   10,   11,  -17,   -2, 
-      -103,  -99,  -22,   -2,   16,  -98,  -24,   -2,  -26,   -2,   19,   20,  -28,   -2, 
-        21,  -31,   -4, -106, -103,   -1,  -36,   -2, -105, -102,   30,   -1, -102,   35, 
-       -99,   38,   39,   40,   -1,   -1,   41,   -1,   -1,   -1,   42,   -1,  -45,   -2, 
-        43,   44,  -95,  -47,   -3,  -93,   50,   -1,   51,   52,   53,   54,   55,   -1, 
-        56,   -1,   57,   58,   -1,   59,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
-        -1,   -1,   -1,   60,   -1,  -61,   -2,  -93, 
+       -14,   -2,  -20,   -2,    4,    5,    6,   -1,  -22,   -2,    7,   -1,  169,   10, 
+       154,   13, -124,   -1,  -25,   -2,  -28,   -4,  -36,   -3,  -41,   -2,   16,   17, 
+        18,   -1,   19, -137, -132,   -1,   24,   -1, -126,   -1,   27,   -1, -128,   32, 
+        33,   -1,   34,   -1,   35,  -43,   -2, -135,   39,   40,   -1,  -46,   -2, -139, 
+        -1, -118,   45, -114,  -11,   -2,   -1,   48,   49,  -51,   -2,   50, -111,  -53, 
+        -3, -110,   56,   -8,   -2,   57,   -1,   58,   -1,   -1,   59,   -1,   60,   -1, 
+        -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1, 
+        61,   -1,   -1,   -1,   -1,   -1,   62,   -1,   -1,   -1,   63, 
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -5598,7 +5947,7 @@ TAO_CORBA_ExtValueDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned in
 static TAO_CORBA_ExtValueDef_Perfect_Hash_OpTable tao_CORBA_ExtValueDef_optable;
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:999
+// be\be_visitor_interface/interface_ss.cpp:921
 
 TAO::Collocation_Proxy_Broker *
 CORBA__TAO_ExtValueDef_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -5618,10 +5967,7 @@ CORBA__TAO_ExtValueDef_Proxy_Broker_Factory_Initializer (size_t)
 static int
 CORBA__TAO_ExtValueDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
   CORBA__TAO_ExtValueDef_Proxy_Broker_Factory_Initializer (
-      reinterpret_cast<
-          size_t> (
-          CORBA__TAO_ExtValueDef_Proxy_Broker_Factory_Initializer
-        )
+      reinterpret_cast<size_t> (CORBA__TAO_ExtValueDef_Proxy_Broker_Factory_Initializer)
     );
 
 
@@ -5672,8 +6018,8 @@ namespace POA_CORBA
     
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
-      TAO::SArg_Traits< CORBA::ExtInitializerSeq>::ret_arg_type retval =
-        TAO::Portable_Server::get_ret_arg< CORBA::ExtInitializerSeq, TAO::SArg_Traits< CORBA::ExtInitializerSeq>::ret_arg_type> (
+      TAO::SArg_Traits< ::CORBA::ExtInitializerSeq>::ret_arg_type retval =
+        TAO::Portable_Server::get_ret_arg< ::CORBA::ExtInitializerSeq, TAO::SArg_Traits< ::CORBA::ExtInitializerSeq>::ret_arg_type> (
           this->operation_details_,
           this->args_);
       
@@ -5710,7 +6056,7 @@ void POA_CORBA::ExtValueDef::_get_ext_initializers_skel (
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
   
-  TAO::SArg_Traits< CORBA::ExtInitializerSeq>::ret_val retval;
+  TAO::SArg_Traits< ::CORBA::ExtInitializerSeq>::ret_val retval;
   
   TAO::Argument * const args[] =
     {
@@ -5764,8 +6110,8 @@ namespace POA_CORBA
     
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
-      TAO::SArg_Traits< CORBA::ExtInitializerSeq>::in_arg_type arg_1 =
-        TAO::Portable_Server::get_in_arg< CORBA::ExtInitializerSeq, TAO::SArg_Traits< CORBA::ExtInitializerSeq>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::ExtInitializerSeq>::in_arg_type arg_1 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::ExtInitializerSeq, TAO::SArg_Traits< ::CORBA::ExtInitializerSeq>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
@@ -5803,7 +6149,7 @@ void POA_CORBA::ExtValueDef::_set_ext_initializers_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   TAO::SArg_Traits< void>::ret_val retval;
-  TAO::SArg_Traits< CORBA::ExtInitializerSeq>::in_arg_val _tao_ext_initializers;
+  TAO::SArg_Traits< ::CORBA::ExtInitializerSeq>::in_arg_val _tao_ext_initializers;
   
   TAO::Argument * const args[] =
     {
@@ -5858,8 +6204,8 @@ namespace POA_CORBA
     
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
-      TAO::SArg_Traits< CORBA::ExtValueDef::ExtFullValueDescription>::ret_arg_type retval =
-        TAO::Portable_Server::get_ret_arg< CORBA::ExtValueDef::ExtFullValueDescription, TAO::SArg_Traits< CORBA::ExtValueDef::ExtFullValueDescription>::ret_arg_type> (
+      TAO::SArg_Traits< ::CORBA::ExtValueDef::ExtFullValueDescription>::ret_arg_type retval =
+        TAO::Portable_Server::get_ret_arg< ::CORBA::ExtValueDef::ExtFullValueDescription, TAO::SArg_Traits< ::CORBA::ExtValueDef::ExtFullValueDescription>::ret_arg_type> (
           this->operation_details_,
           this->args_);
       
@@ -5896,7 +6242,7 @@ void POA_CORBA::ExtValueDef::describe_ext_value_skel (
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
   
-  TAO::SArg_Traits< CORBA::ExtValueDef::ExtFullValueDescription>::ret_val retval;
+  TAO::SArg_Traits< ::CORBA::ExtValueDef::ExtFullValueDescription>::ret_val retval;
   
   TAO::Argument * const args[] =
     {
@@ -5950,49 +6296,49 @@ namespace POA_CORBA
     
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
-      TAO::SArg_Traits< CORBA::ExtAttributeDef>::ret_arg_type retval =
-        TAO::Portable_Server::get_ret_arg< CORBA::ExtAttributeDef, TAO::SArg_Traits< CORBA::ExtAttributeDef>::ret_arg_type> (
+      TAO::SArg_Traits< ::CORBA::ExtAttributeDef>::ret_arg_type retval =
+        TAO::Portable_Server::get_ret_arg< ::CORBA::ExtAttributeDef, TAO::SArg_Traits< ::CORBA::ExtAttributeDef>::ret_arg_type> (
           this->operation_details_,
           this->args_);
       
-      TAO::SArg_Traits< CORBA::RepositoryId>::in_arg_type arg_1 =
-        TAO::Portable_Server::get_in_arg< CORBA::RepositoryId, TAO::SArg_Traits< CORBA::RepositoryId>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type arg_1 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::RepositoryId, TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
         
-      TAO::SArg_Traits< CORBA::Identifier>::in_arg_type arg_2 =
-        TAO::Portable_Server::get_in_arg< CORBA::Identifier, TAO::SArg_Traits< CORBA::Identifier>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type arg_2 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::Identifier, TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_type> (
           this->operation_details_,
           this->args_,
           2);
         
-      TAO::SArg_Traits< CORBA::VersionSpec>::in_arg_type arg_3 =
-        TAO::Portable_Server::get_in_arg< CORBA::VersionSpec, TAO::SArg_Traits< CORBA::VersionSpec>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type arg_3 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::VersionSpec, TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_type> (
           this->operation_details_,
           this->args_,
           3);
         
-      TAO::SArg_Traits< CORBA::IDLType>::in_arg_type arg_4 =
-        TAO::Portable_Server::get_in_arg< CORBA::IDLType, TAO::SArg_Traits< CORBA::IDLType>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_type arg_4 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::IDLType, TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_type> (
           this->operation_details_,
           this->args_,
           4);
         
-      TAO::SArg_Traits< CORBA::AttributeMode>::in_arg_type arg_5 =
-        TAO::Portable_Server::get_in_arg< CORBA::AttributeMode, TAO::SArg_Traits< CORBA::AttributeMode>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::AttributeMode>::in_arg_type arg_5 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::AttributeMode, TAO::SArg_Traits< ::CORBA::AttributeMode>::in_arg_type> (
           this->operation_details_,
           this->args_,
           5);
         
-      TAO::SArg_Traits< CORBA::ExceptionDefSeq>::in_arg_type arg_6 =
-        TAO::Portable_Server::get_in_arg< CORBA::ExceptionDefSeq, TAO::SArg_Traits< CORBA::ExceptionDefSeq>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::ExceptionDefSeq>::in_arg_type arg_6 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::ExceptionDefSeq, TAO::SArg_Traits< ::CORBA::ExceptionDefSeq>::in_arg_type> (
           this->operation_details_,
           this->args_,
           6);
         
-      TAO::SArg_Traits< CORBA::ExceptionDefSeq>::in_arg_type arg_7 =
-        TAO::Portable_Server::get_in_arg< CORBA::ExceptionDefSeq, TAO::SArg_Traits< CORBA::ExceptionDefSeq>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::ExceptionDefSeq>::in_arg_type arg_7 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::ExceptionDefSeq, TAO::SArg_Traits< ::CORBA::ExceptionDefSeq>::in_arg_type> (
           this->operation_details_,
           this->args_,
           7);
@@ -6037,14 +6383,14 @@ void POA_CORBA::ExtValueDef::create_ext_attribute_skel (
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
   
-  TAO::SArg_Traits< CORBA::ExtAttributeDef>::ret_val retval;
-  TAO::SArg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id;
-  TAO::SArg_Traits< CORBA::Identifier>::in_arg_val _tao_name;
-  TAO::SArg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version;
-  TAO::SArg_Traits< CORBA::IDLType>::in_arg_val _tao_type;
-  TAO::SArg_Traits< CORBA::AttributeMode>::in_arg_val _tao_mode;
-  TAO::SArg_Traits< CORBA::ExceptionDefSeq>::in_arg_val _tao_get_exceptions;
-  TAO::SArg_Traits< CORBA::ExceptionDefSeq>::in_arg_val _tao_set_exceptions;
+  TAO::SArg_Traits< ::CORBA::ExtAttributeDef>::ret_val retval;
+  TAO::SArg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id;
+  TAO::SArg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name;
+  TAO::SArg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version;
+  TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_val _tao_type;
+  TAO::SArg_Traits< ::CORBA::AttributeMode>::in_arg_val _tao_mode;
+  TAO::SArg_Traits< ::CORBA::ExceptionDefSeq>::in_arg_val _tao_get_exceptions;
+  TAO::SArg_Traits< ::CORBA::ExceptionDefSeq>::in_arg_val _tao_set_exceptions;
   
   TAO::Argument * const args[] =
     {
@@ -6114,8 +6460,8 @@ namespace POA_CORBA
           this->operation_details_,
           this->args_);
       
-      TAO::SArg_Traits< CORBA::Char *>::in_arg_type arg_1 =
-        TAO::Portable_Server::get_in_arg< CORBA::Char *, TAO::SArg_Traits< CORBA::Char *>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
@@ -6150,7 +6496,7 @@ void POA_CORBA::ExtValueDef::_is_a_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  TAO::SArg_Traits< CORBA::Char *>::in_arg_val _tao_repository_id;
+  TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
   
   TAO::Argument * const args[] =
     {
@@ -6271,10 +6617,98 @@ void POA_CORBA::ExtValueDef::_non_existent_skel (
   
 }
 
+namespace POA_CORBA
+{
+  
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_operation/upcall_command_ss.cpp:127
+  
+  class _repository_id_ExtValueDef_Upcall_Command
+    : public TAO::Upcall_Command
+  {
+  public:
+    inline _repository_id_ExtValueDef_Upcall_Command (
+      POA_CORBA::ExtValueDef * servant,
+      TAO_Operation_Details const * operation_details,
+      TAO::Argument * const args[])
+      : servant_ (servant)
+      , operation_details_ (operation_details)
+      , args_ (args)
+    {
+    }
+    
+    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+    {
+      TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
+        TAO::Portable_Server::get_ret_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type> (
+          this->operation_details_,
+          this->args_);
+      
+      
+      retval =
+        this->servant_-> _repository_id (
+          ACE_ENV_SINGLE_ARG_PARAMETER);
+        
+    }
+  
+  private:
+    POA_CORBA::ExtValueDef * const servant_;
+    TAO_Operation_Details const * const operation_details_;
+    TAO::Argument * const * const args_;
+  };
+  
+}
+void POA_CORBA::ExtValueDef::_repository_id_skel (
+    TAO_ServerRequest & server_request, 
+    void * TAO_INTERCEPTOR (servant_upcall),
+    void * servant
+    ACE_ENV_ARG_DECL
+  )
+{
+  
+  
+#if TAO_HAS_INTERCEPTORS == 1
+  static CORBA::TypeCode_ptr const * const exceptions = 0;
+  static size_t const nexceptions = 0;
+#endif /* TAO_HAS_INTERCEPTORS */
+  
+  TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
+  
+  TAO::Argument * const args[] =
+    {
+      &retval
+    };
+  
+  static size_t const nargs = 1;
+  
+  POA_CORBA::ExtValueDef * const impl =
+    static_cast<POA_CORBA::ExtValueDef *> (servant);
+  
+  _repository_id_ExtValueDef_Upcall_Command command (
+    impl,
+    server_request.operation_details (),
+    args);
+  
+  TAO::Upcall_Wrapper upcall_wrapper;
+  upcall_wrapper.upcall (server_request
+                         , args
+                         , nargs
+                         , command
+#if TAO_HAS_INTERCEPTORS == 1
+                         , servant_upcall
+                         , exceptions
+                         , nexceptions
+#endif  /* TAO_HAS_INTERCEPTORS == 1 */
+                         ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+  
+}
+
 
 
 // TAO_IDL - Generated from 
-// be\be_visitor_interface/interface_ss.cpp:393
+// be\be_visitor_interface/interface_ss.cpp:501
 
 
 
@@ -6451,7 +6885,7 @@ const char* POA_CORBA::ExtValueDef::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:940
+// be\be_visitor_interface/interface_ss.cpp:862
 
 void POA_CORBA::ExtValueDef::_dispatch (
     TAO_ServerRequest & req,
@@ -6466,7 +6900,7 @@ void POA_CORBA::ExtValueDef::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:891
+// be\be_visitor_interface/interface_ss.cpp:813
 
 CORBA::ExtValueDef *
 POA_CORBA::ExtValueDef::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -6498,7 +6932,7 @@ POA_CORBA::ExtValueDef::_this (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1455
+// be\be_interface.cpp:1465
 
 class TAO_CORBA_ValueBoxDef_Perfect_Hash_OpTable
   : public TAO_Perfect_Hash_OpTable
@@ -6511,7 +6945,7 @@ public:
 };
 
 /* C++ code produced by gperf version 2.8 (ACE version) */
-/* Command-line: c:\ace\latest\ACE_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0 -a -o -t -p -K opname -L C++ -Z TAO_CORBA_ValueBoxDef_Perfect_Hash_OpTable -N lookup  */
+/* Command-line: c:\ACE\Any\ACE_wrappers\bin\gperf.exe -m -M -J -c -C -D -E -T -f 0 -F 0,0 -a -o -t -p -K opname -L C++ -Z TAO_CORBA_ValueBoxDef_Perfect_Hash_OpTable -N lookup  */
 unsigned int
 TAO_CORBA_ValueBoxDef_Perfect_Hash_OpTable::hash (const char *str, unsigned int len)
 {
@@ -6568,14 +7002,14 @@ TAO_CORBA_ValueBoxDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned in
 {
   enum
     {
-      TOTAL_KEYWORDS = 20,
+      TOTAL_KEYWORDS = 21,
       MIN_WORD_LENGTH = 4,
       MAX_WORD_LENGTH = 26,
       MIN_HASH_VALUE = 4,
       MAX_HASH_VALUE = 36,
       HASH_VALUE_RANGE = 33,
       DUPLICATES = 6,
-      WORDLIST_SIZE = 24
+      WORDLIST_SIZE = 25
     };
 
   static const TAO_operation_db_entry  wordlist[] =
@@ -6593,6 +7027,7 @@ TAO_CORBA_ValueBoxDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned in
       {"_get_version", &POA_CORBA::ValueBoxDef::_get_version_skel, 0},
       {"_set_version", &POA_CORBA::ValueBoxDef::_set_version_skel, 0},
       {"_get_def_kind", &POA_CORBA::ValueBoxDef::_get_def_kind_skel, 0},
+      {"_repository_id", &POA_CORBA::ValueBoxDef::_repository_id_skel, 0},
       {"_get_defined_in", &POA_CORBA::ValueBoxDef::_get_defined_in_skel, 0},
       {"destroy", &POA_CORBA::ValueBoxDef::destroy_skel, 0},
       {"_get_absolute_name", &POA_CORBA::ValueBoxDef::_get_absolute_name_skel, 0},
@@ -6605,9 +7040,9 @@ TAO_CORBA_ValueBoxDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned in
 
   static const signed char lookup[] =
     {
-      -13,  -2, -20,  -2,   4,   5,  -1,  55,   8,  51,  12,  -1, -48,  15, 
-       -1,  16,  -1,  17,  18,  -1,  19,  -1, -56,  22,  -9,  -3,  -6,  -2, 
-       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  23, 
+      -13,  -2, -21,  -2,   4,   5,  -1,  55,   8,  51,  12,  -1, -48,  15, 
+       16,  17,  -1,  18,  19,  -1,  20,  -1, -56,  23,  -9,  -3,  -6,  -2, 
+       -1,  -1,  -1,  -1,  -1,  -1,  -1,  -1,  24, 
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -6645,7 +7080,7 @@ TAO_CORBA_ValueBoxDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned in
 static TAO_CORBA_ValueBoxDef_Perfect_Hash_OpTable tao_CORBA_ValueBoxDef_optable;
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:999
+// be\be_visitor_interface/interface_ss.cpp:921
 
 TAO::Collocation_Proxy_Broker *
 CORBA__TAO_ValueBoxDef_Proxy_Broker_Factory_function (CORBA::Object_ptr)
@@ -6665,10 +7100,7 @@ CORBA__TAO_ValueBoxDef_Proxy_Broker_Factory_Initializer (size_t)
 static int
 CORBA__TAO_ValueBoxDef_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
   CORBA__TAO_ValueBoxDef_Proxy_Broker_Factory_Initializer (
-      reinterpret_cast<
-          size_t> (
-          CORBA__TAO_ValueBoxDef_Proxy_Broker_Factory_Initializer
-        )
+      reinterpret_cast<size_t> (CORBA__TAO_ValueBoxDef_Proxy_Broker_Factory_Initializer)
     );
 
 
@@ -6718,8 +7150,8 @@ namespace POA_CORBA
     
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
-      TAO::SArg_Traits< CORBA::IDLType>::ret_arg_type retval =
-        TAO::Portable_Server::get_ret_arg< CORBA::IDLType, TAO::SArg_Traits< CORBA::IDLType>::ret_arg_type> (
+      TAO::SArg_Traits< ::CORBA::IDLType>::ret_arg_type retval =
+        TAO::Portable_Server::get_ret_arg< ::CORBA::IDLType, TAO::SArg_Traits< ::CORBA::IDLType>::ret_arg_type> (
           this->operation_details_,
           this->args_);
       
@@ -6756,7 +7188,7 @@ void POA_CORBA::ValueBoxDef::_get_original_type_def_skel (
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
   
-  TAO::SArg_Traits< CORBA::IDLType>::ret_val retval;
+  TAO::SArg_Traits< ::CORBA::IDLType>::ret_val retval;
   
   TAO::Argument * const args[] =
     {
@@ -6810,8 +7242,8 @@ namespace POA_CORBA
     
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
-      TAO::SArg_Traits< CORBA::IDLType>::in_arg_type arg_1 =
-        TAO::Portable_Server::get_in_arg< CORBA::IDLType, TAO::SArg_Traits< CORBA::IDLType>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_type arg_1 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::IDLType, TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
@@ -6849,7 +7281,7 @@ void POA_CORBA::ValueBoxDef::_set_original_type_def_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   TAO::SArg_Traits< void>::ret_val retval;
-  TAO::SArg_Traits< CORBA::IDLType>::in_arg_val _tao_original_type_def;
+  TAO::SArg_Traits< ::CORBA::IDLType>::in_arg_val _tao_original_type_def;
   
   TAO::Argument * const args[] =
     {
@@ -6913,8 +7345,8 @@ namespace POA_CORBA
           this->operation_details_,
           this->args_);
       
-      TAO::SArg_Traits< CORBA::Char *>::in_arg_type arg_1 =
-        TAO::Portable_Server::get_in_arg< CORBA::Char *, TAO::SArg_Traits< CORBA::Char *>::in_arg_type> (
+      TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
+        TAO::Portable_Server::get_in_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
@@ -6949,7 +7381,7 @@ void POA_CORBA::ValueBoxDef::_is_a_skel (
 #endif /* TAO_HAS_INTERCEPTORS */
   
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  TAO::SArg_Traits< CORBA::Char *>::in_arg_val _tao_repository_id;
+  TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
   
   TAO::Argument * const args[] =
     {
@@ -7070,10 +7502,98 @@ void POA_CORBA::ValueBoxDef::_non_existent_skel (
   
 }
 
+namespace POA_CORBA
+{
+  
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_operation/upcall_command_ss.cpp:127
+  
+  class _repository_id_ValueBoxDef_Upcall_Command
+    : public TAO::Upcall_Command
+  {
+  public:
+    inline _repository_id_ValueBoxDef_Upcall_Command (
+      POA_CORBA::ValueBoxDef * servant,
+      TAO_Operation_Details const * operation_details,
+      TAO::Argument * const args[])
+      : servant_ (servant)
+      , operation_details_ (operation_details)
+      , args_ (args)
+    {
+    }
+    
+    virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
+    {
+      TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type retval =
+        TAO::Portable_Server::get_ret_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::ret_arg_type> (
+          this->operation_details_,
+          this->args_);
+      
+      
+      retval =
+        this->servant_-> _repository_id (
+          ACE_ENV_SINGLE_ARG_PARAMETER);
+        
+    }
+  
+  private:
+    POA_CORBA::ValueBoxDef * const servant_;
+    TAO_Operation_Details const * const operation_details_;
+    TAO::Argument * const * const args_;
+  };
+  
+}
+void POA_CORBA::ValueBoxDef::_repository_id_skel (
+    TAO_ServerRequest & server_request, 
+    void * TAO_INTERCEPTOR (servant_upcall),
+    void * servant
+    ACE_ENV_ARG_DECL
+  )
+{
+  
+  
+#if TAO_HAS_INTERCEPTORS == 1
+  static CORBA::TypeCode_ptr const * const exceptions = 0;
+  static size_t const nexceptions = 0;
+#endif /* TAO_HAS_INTERCEPTORS */
+  
+  TAO::SArg_Traits< ::CORBA::Char *>::ret_val retval;
+  
+  TAO::Argument * const args[] =
+    {
+      &retval
+    };
+  
+  static size_t const nargs = 1;
+  
+  POA_CORBA::ValueBoxDef * const impl =
+    static_cast<POA_CORBA::ValueBoxDef *> (servant);
+  
+  _repository_id_ValueBoxDef_Upcall_Command command (
+    impl,
+    server_request.operation_details (),
+    args);
+  
+  TAO::Upcall_Wrapper upcall_wrapper;
+  upcall_wrapper.upcall (server_request
+                         , args
+                         , nargs
+                         , command
+#if TAO_HAS_INTERCEPTORS == 1
+                         , servant_upcall
+                         , exceptions
+                         , nexceptions
+#endif  /* TAO_HAS_INTERCEPTORS == 1 */
+                         ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK;
+  
+}
+
 
 
 // TAO_IDL - Generated from 
-// be\be_visitor_interface/interface_ss.cpp:393
+// be\be_visitor_interface/interface_ss.cpp:501
 
 
 
@@ -7246,7 +7766,7 @@ const char* POA_CORBA::ValueBoxDef::_interface_repository_id (void) const
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:940
+// be\be_visitor_interface/interface_ss.cpp:862
 
 void POA_CORBA::ValueBoxDef::_dispatch (
     TAO_ServerRequest & req,
@@ -7261,7 +7781,7 @@ void POA_CORBA::ValueBoxDef::_dispatch (
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/interface_ss.cpp:891
+// be\be_visitor_interface/interface_ss.cpp:813
 
 CORBA::ValueBoxDef *
 POA_CORBA::ValueBoxDef::_this (ACE_ENV_SINGLE_ARG_DECL)
@@ -7292,726 +7812,5 @@ POA_CORBA::ValueBoxDef::_this (ACE_ENV_SINGLE_ARG_DECL)
       );
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_root/root.cpp:1582
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-#if !defined (_CORBA_DEFINITIONKIND__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_DEFINITIONKIND__SARG_TRAITS_TMPLINST_SS_
-
-  template class TAO::SArg_Traits<CORBA::DefinitionKind>;
-
-  template class TAO::Basic_SArg_Traits_T<CORBA::DefinitionKind>;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_REPOSITORY__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_REPOSITORY__SARG_TRAITS_TMPLINST_SS_
-
-  template class TAO::SArg_Traits<CORBA::Repository>;
-
-  template class
-    TAO::Object_SArg_Traits_T<
-        CORBA::Repository_ptr,
-        CORBA::Repository_var,
-        CORBA::Repository_out,
-      >;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_CONTAINER__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_CONTAINER__SARG_TRAITS_TMPLINST_SS_
-
-  template class TAO::SArg_Traits<CORBA::Container>;
-
-  template class
-    TAO::Object_SArg_Traits_T<
-        CORBA::Container_ptr,
-        CORBA::Container_var,
-        CORBA::Container_out,
-      >;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_IDLTYPE__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_IDLTYPE__SARG_TRAITS_TMPLINST_SS_
-
-  template class TAO::SArg_Traits<CORBA::IDLType>;
-
-  template class
-    TAO::Object_SArg_Traits_T<
-        CORBA::IDLType_ptr,
-        CORBA::IDLType_var,
-        CORBA::IDLType_out,
-      >;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_SEQUENCE__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_SEQUENCE__SARG_TRAITS_TMPLINST_SS_
-
-  template class TAO::SArg_Traits<CORBA::InterfaceDefSeq>;
-
-  template class
-    TAO::Var_Size_SArg_Traits_T<
-        CORBA::InterfaceDefSeq,
-        CORBA::InterfaceDefSeq_var,
-        CORBA::InterfaceDefSeq_out
-      >;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_VALUEDEF__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_VALUEDEF__SARG_TRAITS_TMPLINST_SS_
-
-  template class TAO::SArg_Traits<CORBA::ValueDef>;
-
-  template class
-    TAO::Object_SArg_Traits_T<
-        CORBA::ValueDef_ptr,
-        CORBA::ValueDef_var,
-        CORBA::ValueDef_out,
-      >;
-
-#endif /* end #if !defined */
-
-  template class
-    TAO::Ret_Var_Size_SArgument_T<
-        CORBA::InterfaceDefSeq,
-        CORBA::InterfaceDefSeq_var
-      >;
-
-  template class
-    TAO::In_Var_Size_SArgument_T<
-        CORBA::InterfaceDefSeq
-      >;
-
-  template class
-    TAO::Ret_Var_Size_SArgument_T<
-        CORBA::InitializerSeq,
-        CORBA::InitializerSeq_var
-      >;
-
-  template class
-    TAO::In_Var_Size_SArgument_T<
-        CORBA::InitializerSeq
-      >;
-
-  template class
-    TAO::Ret_Object_SArgument_T<
-        CORBA::ValueDef_ptr,
-        CORBA::ValueDef_var
-      >;
-
-  template class
-    TAO::In_Object_SArgument_T<
-        CORBA::ValueDef_ptr
-      >;
-
-  template class
-    TAO::Ret_Var_Size_SArgument_T<
-        CORBA::ValueDefSeq,
-        CORBA::ValueDefSeq_var
-      >;
-
-  template class
-    TAO::In_Var_Size_SArgument_T<
-        CORBA::ValueDefSeq
-      >;
-
-#if !defined (_CORBA_VALUEDEF_FULLVALUEDESCRIPTION__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_VALUEDEF_FULLVALUEDESCRIPTION__SARG_TRAITS_TMPLINST_SS_
-
-  template class TAO::SArg_Traits<CORBA::ValueDef::FullValueDescription>;
-
-  template class
-    TAO::Var_Size_SArg_Traits_T<
-        CORBA::ValueDef::FullValueDescription,
-        CORBA::ValueDef::FullValueDescription_var,
-        CORBA::ValueDef::FullValueDescription_out
-      >;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_SEQUENCE__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_SEQUENCE__SARG_TRAITS_TMPLINST_SS_
-
-  template class TAO::SArg_Traits<CORBA::InitializerSeq>;
-
-  template class
-    TAO::Var_Size_SArg_Traits_T<
-        CORBA::InitializerSeq,
-        CORBA::InitializerSeq_var,
-        CORBA::InitializerSeq_out
-      >;
-
-#endif /* end #if !defined */
-
-  template class
-    TAO::Ret_Var_Size_SArgument_T<
-        CORBA::ValueDef::FullValueDescription,
-        CORBA::ValueDef::FullValueDescription_var
-      >;
-
-  template class
-    TAO::Ret_Object_SArgument_T<
-        CORBA::ValueMemberDef_ptr,
-        CORBA::ValueMemberDef_var
-      >;
-
-  template class
-    TAO::In_Object_SArgument_T<
-        CORBA::IDLType_ptr
-      >;
-
-  template class
-    TAO::Ret_Object_SArgument_T<
-        CORBA::AttributeDef_ptr,
-        CORBA::AttributeDef_var
-      >;
-
-  template class
-    TAO::In_Basic_SArgument_T<
-        CORBA::AttributeMode
-      >;
-
-  template class
-    TAO::Ret_Object_SArgument_T<
-        CORBA::OperationDef_ptr,
-        CORBA::OperationDef_var
-      >;
-
-  template class
-    TAO::In_Basic_SArgument_T<
-        CORBA::OperationMode
-      >;
-
-  template class
-    TAO::In_Var_Size_SArgument_T<
-        CORBA::ParDescriptionSeq
-      >;
-
-  template class
-    TAO::In_Var_Size_SArgument_T<
-        CORBA::ExceptionDefSeq
-      >;
-
-  template class
-    TAO::In_Var_Size_SArgument_T<
-        CORBA::ContextIdSeq
-      >;
-
-#if !defined (_CORBA_SEQUENCE__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_SEQUENCE__SARG_TRAITS_TMPLINST_SS_
-
-  template class TAO::SArg_Traits<CORBA::ValueDefSeq>;
-
-  template class
-    TAO::Var_Size_SArg_Traits_T<
-        CORBA::ValueDefSeq,
-        CORBA::ValueDefSeq_var,
-        CORBA::ValueDefSeq_out
-      >;
-
-#endif /* end #if !defined */
-
-  template class
-    TAO::Ret_Object_SArgument_T<
-        CORBA::IDLType_ptr,
-        CORBA::IDLType_var
-      >;
-
-  template class
-    TAO::Ret_Var_Size_SArgument_T<
-        CORBA::ExtInitializerSeq,
-        CORBA::ExtInitializerSeq_var
-      >;
-
-  template class
-    TAO::In_Var_Size_SArgument_T<
-        CORBA::ExtInitializerSeq
-      >;
-
-#if !defined (_CORBA_EXTVALUEDEF_EXTFULLVALUEDESCRIPTION__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_EXTVALUEDEF_EXTFULLVALUEDESCRIPTION__SARG_TRAITS_TMPLINST_SS_
-
-  template class TAO::SArg_Traits<CORBA::ExtValueDef::ExtFullValueDescription>;
-
-  template class
-    TAO::Var_Size_SArg_Traits_T<
-        CORBA::ExtValueDef::ExtFullValueDescription,
-        CORBA::ExtValueDef::ExtFullValueDescription_var,
-        CORBA::ExtValueDef::ExtFullValueDescription_out
-      >;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_SEQUENCE__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_SEQUENCE__SARG_TRAITS_TMPLINST_SS_
-
-  template class TAO::SArg_Traits<CORBA::ExtInitializerSeq>;
-
-  template class
-    TAO::Var_Size_SArg_Traits_T<
-        CORBA::ExtInitializerSeq,
-        CORBA::ExtInitializerSeq_var,
-        CORBA::ExtInitializerSeq_out
-      >;
-
-#endif /* end #if !defined */
-
-  template class
-    TAO::Ret_Var_Size_SArgument_T<
-        CORBA::ExtValueDef::ExtFullValueDescription,
-        CORBA::ExtValueDef::ExtFullValueDescription_var
-      >;
-
-  template class
-    TAO::Ret_Object_SArgument_T<
-        CORBA::ExtAttributeDef_ptr,
-        CORBA::ExtAttributeDef_var
-      >;
-
-#if !defined (_CORBA_SEQUENCE__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_SEQUENCE__SARG_TRAITS_TMPLINST_SS_
-
-  template class TAO::SArg_Traits<CORBA::ExceptionDefSeq>;
-
-  template class
-    TAO::Var_Size_SArg_Traits_T<
-        CORBA::ExceptionDefSeq,
-        CORBA::ExceptionDefSeq_var,
-        CORBA::ExceptionDefSeq_out
-      >;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_ATTRIBUTEMODE__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_ATTRIBUTEMODE__SARG_TRAITS_TMPLINST_SS_
-
-  template class TAO::SArg_Traits<CORBA::AttributeMode>;
-
-  template class TAO::Basic_SArg_Traits_T<CORBA::AttributeMode>;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_ATTRIBUTEDEF__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_ATTRIBUTEDEF__SARG_TRAITS_TMPLINST_SS_
-
-  template class TAO::SArg_Traits<CORBA::AttributeDef>;
-
-  template class
-    TAO::Object_SArg_Traits_T<
-        CORBA::AttributeDef_ptr,
-        CORBA::AttributeDef_var,
-        CORBA::AttributeDef_out,
-      >;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_EXTATTRIBUTEDEF__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_EXTATTRIBUTEDEF__SARG_TRAITS_TMPLINST_SS_
-
-  template class TAO::SArg_Traits<CORBA::ExtAttributeDef>;
-
-  template class
-    TAO::Object_SArg_Traits_T<
-        CORBA::ExtAttributeDef_ptr,
-        CORBA::ExtAttributeDef_var,
-        CORBA::ExtAttributeDef_out,
-      >;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_OPERATIONMODE__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_OPERATIONMODE__SARG_TRAITS_TMPLINST_SS_
-
-  template class TAO::SArg_Traits<CORBA::OperationMode>;
-
-  template class TAO::Basic_SArg_Traits_T<CORBA::OperationMode>;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_SEQUENCE__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_SEQUENCE__SARG_TRAITS_TMPLINST_SS_
-
-  template class TAO::SArg_Traits<CORBA::ParDescriptionSeq>;
-
-  template class
-    TAO::Var_Size_SArg_Traits_T<
-        CORBA::ParDescriptionSeq,
-        CORBA::ParDescriptionSeq_var,
-        CORBA::ParDescriptionSeq_out
-      >;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_SEQUENCE__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_SEQUENCE__SARG_TRAITS_TMPLINST_SS_
-
-  template class TAO::SArg_Traits<CORBA::ContextIdSeq>;
-
-  template class
-    TAO::Var_Size_SArg_Traits_T<
-        CORBA::ContextIdSeq,
-        CORBA::ContextIdSeq_var,
-        CORBA::ContextIdSeq_out
-      >;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_OPERATIONDEF__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_OPERATIONDEF__SARG_TRAITS_TMPLINST_SS_
-
-  template class TAO::SArg_Traits<CORBA::OperationDef>;
-
-  template class
-    TAO::Object_SArg_Traits_T<
-        CORBA::OperationDef_ptr,
-        CORBA::OperationDef_var,
-        CORBA::OperationDef_out,
-      >;
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_VALUEMEMBERDEF__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_VALUEMEMBERDEF__SARG_TRAITS_TMPLINST_SS_
-
-  template class TAO::SArg_Traits<CORBA::ValueMemberDef>;
-
-  template class
-    TAO::Object_SArg_Traits_T<
-        CORBA::ValueMemberDef_ptr,
-        CORBA::ValueMemberDef_var,
-        CORBA::ValueMemberDef_out,
-      >;
-
-#endif /* end #if !defined */
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#if !defined (_CORBA_DEFINITIONKIND__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_DEFINITIONKIND__SARG_TRAITS_TMPLINST_SS_
-
-# pragma instantiate TAO::SArg_Traits<CORBA::DefinitionKind>
-
-# pragma instantiate TAO::Basic_SArg_Traits_T<CORBA::DefinitionKind>
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_REPOSITORY__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_REPOSITORY__SARG_TRAITS_TMPLINST_SS_
-
-# pragma instantiate TAO::SArg_Traits<CORBA::Repository>
-
-# pragma instantiate \
-    TAO::Object_SArg_Traits_T< \
-        CORBA::Repository_ptr, \
-        CORBA::Repository_var, \
-        CORBA::Repository_out, \
-      >
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_CONTAINER__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_CONTAINER__SARG_TRAITS_TMPLINST_SS_
-
-# pragma instantiate TAO::SArg_Traits<CORBA::Container>
-
-# pragma instantiate \
-    TAO::Object_SArg_Traits_T< \
-        CORBA::Container_ptr, \
-        CORBA::Container_var, \
-        CORBA::Container_out, \
-      >
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_IDLTYPE__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_IDLTYPE__SARG_TRAITS_TMPLINST_SS_
-
-# pragma instantiate TAO::SArg_Traits<CORBA::IDLType>
-
-# pragma instantiate \
-    TAO::Object_SArg_Traits_T< \
-        CORBA::IDLType_ptr, \
-        CORBA::IDLType_var, \
-        CORBA::IDLType_out, \
-      >
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_SEQUENCE__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_SEQUENCE__SARG_TRAITS_TMPLINST_SS_
-
-# pragma instantiate TAO::SArg_Traits<CORBA::InterfaceDefSeq>
-
-# pragma instantiate \
-    TAO::Var_Size_SArg_Traits_T< \
-        CORBA::InterfaceDefSeq, \
-        CORBA::InterfaceDefSeq_var, \
-        CORBA::InterfaceDefSeq_out \
-      >
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_VALUEDEF__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_VALUEDEF__SARG_TRAITS_TMPLINST_SS_
-
-# pragma instantiate TAO::SArg_Traits<CORBA::ValueDef>
-
-# pragma instantiate \
-    TAO::Object_SArg_Traits_T< \
-        CORBA::ValueDef_ptr, \
-        CORBA::ValueDef_var, \
-        CORBA::ValueDef_out, \
-      >
-
-#endif /* end #if !defined */
-
-# pragma instantiate \
-    TAO::In_Var_Size_SArgument_T< \
-        CORBA::InterfaceDefSeq \
-      >
-
-# pragma instantiate \
-    TAO::In_Var_Size_SArgument_T< \
-        CORBA::InitializerSeq \
-      >
-
-# pragma instantiate \
-    TAO::In_Object_SArgument_T< \
-        CORBA::ValueDef_ptr \
-      >
-
-# pragma instantiate \
-    TAO::In_Var_Size_SArgument_T< \
-        CORBA::ValueDefSeq \
-      >
-
-#if !defined (_CORBA_VALUEDEF_FULLVALUEDESCRIPTION__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_VALUEDEF_FULLVALUEDESCRIPTION__SARG_TRAITS_TMPLINST_SS_
-
-# pragma instantiate TAO::SArg_Traits<CORBA::ValueDef::FullValueDescription>
-
-# pragma instantiate \
-    TAO::Var_Size_SArg_Traits_T< \
-        CORBA::ValueDef::FullValueDescription, \
-        CORBA::ValueDef::FullValueDescription_var, \
-        CORBA::ValueDef::FullValueDescription_out \
-      >
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_SEQUENCE__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_SEQUENCE__SARG_TRAITS_TMPLINST_SS_
-
-# pragma instantiate TAO::SArg_Traits<CORBA::InitializerSeq>
-
-# pragma instantiate \
-    TAO::Var_Size_SArg_Traits_T< \
-        CORBA::InitializerSeq, \
-        CORBA::InitializerSeq_var, \
-        CORBA::InitializerSeq_out \
-      >
-
-#endif /* end #if !defined */
-
-# pragma instantiate \
-    TAO::In_Object_SArgument_T< \
-        CORBA::IDLType_ptr \
-      >
-
-# pragma instantiate \
-    TAO::In_Basic_SArgument_T< \
-        CORBA::AttributeMode \
-      >
-
-# pragma instantiate \
-    TAO::In_Basic_SArgument_T< \
-        CORBA::OperationMode \
-      >
-
-# pragma instantiate \
-    TAO::In_Var_Size_SArgument_T< \
-        CORBA::ParDescriptionSeq \
-      >
-
-# pragma instantiate \
-    TAO::In_Var_Size_SArgument_T< \
-        CORBA::ExceptionDefSeq \
-      >
-
-# pragma instantiate \
-    TAO::In_Var_Size_SArgument_T< \
-        CORBA::ContextIdSeq \
-      >
-
-#if !defined (_CORBA_SEQUENCE__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_SEQUENCE__SARG_TRAITS_TMPLINST_SS_
-
-# pragma instantiate TAO::SArg_Traits<CORBA::ValueDefSeq>
-
-# pragma instantiate \
-    TAO::Var_Size_SArg_Traits_T< \
-        CORBA::ValueDefSeq, \
-        CORBA::ValueDefSeq_var, \
-        CORBA::ValueDefSeq_out \
-      >
-
-#endif /* end #if !defined */
-
-# pragma instantiate \
-    TAO::In_Var_Size_SArgument_T< \
-        CORBA::ExtInitializerSeq \
-      >
-
-#if !defined (_CORBA_EXTVALUEDEF_EXTFULLVALUEDESCRIPTION__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_EXTVALUEDEF_EXTFULLVALUEDESCRIPTION__SARG_TRAITS_TMPLINST_SS_
-
-# pragma instantiate TAO::SArg_Traits<CORBA::ExtValueDef::ExtFullValueDescription>
-
-# pragma instantiate \
-    TAO::Var_Size_SArg_Traits_T< \
-        CORBA::ExtValueDef::ExtFullValueDescription, \
-        CORBA::ExtValueDef::ExtFullValueDescription_var, \
-        CORBA::ExtValueDef::ExtFullValueDescription_out \
-      >
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_SEQUENCE__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_SEQUENCE__SARG_TRAITS_TMPLINST_SS_
-
-# pragma instantiate TAO::SArg_Traits<CORBA::ExtInitializerSeq>
-
-# pragma instantiate \
-    TAO::Var_Size_SArg_Traits_T< \
-        CORBA::ExtInitializerSeq, \
-        CORBA::ExtInitializerSeq_var, \
-        CORBA::ExtInitializerSeq_out \
-      >
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_SEQUENCE__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_SEQUENCE__SARG_TRAITS_TMPLINST_SS_
-
-# pragma instantiate TAO::SArg_Traits<CORBA::ExceptionDefSeq>
-
-# pragma instantiate \
-    TAO::Var_Size_SArg_Traits_T< \
-        CORBA::ExceptionDefSeq, \
-        CORBA::ExceptionDefSeq_var, \
-        CORBA::ExceptionDefSeq_out \
-      >
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_ATTRIBUTEMODE__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_ATTRIBUTEMODE__SARG_TRAITS_TMPLINST_SS_
-
-# pragma instantiate TAO::SArg_Traits<CORBA::AttributeMode>
-
-# pragma instantiate TAO::Basic_SArg_Traits_T<CORBA::AttributeMode>
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_ATTRIBUTEDEF__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_ATTRIBUTEDEF__SARG_TRAITS_TMPLINST_SS_
-
-# pragma instantiate TAO::SArg_Traits<CORBA::AttributeDef>
-
-# pragma instantiate \
-    TAO::Object_SArg_Traits_T< \
-        CORBA::AttributeDef_ptr, \
-        CORBA::AttributeDef_var, \
-        CORBA::AttributeDef_out, \
-      >
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_EXTATTRIBUTEDEF__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_EXTATTRIBUTEDEF__SARG_TRAITS_TMPLINST_SS_
-
-# pragma instantiate TAO::SArg_Traits<CORBA::ExtAttributeDef>
-
-# pragma instantiate \
-    TAO::Object_SArg_Traits_T< \
-        CORBA::ExtAttributeDef_ptr, \
-        CORBA::ExtAttributeDef_var, \
-        CORBA::ExtAttributeDef_out, \
-      >
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_OPERATIONMODE__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_OPERATIONMODE__SARG_TRAITS_TMPLINST_SS_
-
-# pragma instantiate TAO::SArg_Traits<CORBA::OperationMode>
-
-# pragma instantiate TAO::Basic_SArg_Traits_T<CORBA::OperationMode>
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_SEQUENCE__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_SEQUENCE__SARG_TRAITS_TMPLINST_SS_
-
-# pragma instantiate TAO::SArg_Traits<CORBA::ParDescriptionSeq>
-
-# pragma instantiate \
-    TAO::Var_Size_SArg_Traits_T< \
-        CORBA::ParDescriptionSeq, \
-        CORBA::ParDescriptionSeq_var, \
-        CORBA::ParDescriptionSeq_out \
-      >
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_SEQUENCE__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_SEQUENCE__SARG_TRAITS_TMPLINST_SS_
-
-# pragma instantiate TAO::SArg_Traits<CORBA::ContextIdSeq>
-
-# pragma instantiate \
-    TAO::Var_Size_SArg_Traits_T< \
-        CORBA::ContextIdSeq, \
-        CORBA::ContextIdSeq_var, \
-        CORBA::ContextIdSeq_out \
-      >
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_OPERATIONDEF__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_OPERATIONDEF__SARG_TRAITS_TMPLINST_SS_
-
-# pragma instantiate TAO::SArg_Traits<CORBA::OperationDef>
-
-# pragma instantiate \
-    TAO::Object_SArg_Traits_T< \
-        CORBA::OperationDef_ptr, \
-        CORBA::OperationDef_var, \
-        CORBA::OperationDef_out, \
-      >
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_VALUEMEMBERDEF__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_VALUEMEMBERDEF__SARG_TRAITS_TMPLINST_SS_
-
-# pragma instantiate TAO::SArg_Traits<CORBA::ValueMemberDef>
-
-# pragma instantiate \
-    TAO::Object_SArg_Traits_T< \
-        CORBA::ValueMemberDef_ptr, \
-        CORBA::ValueMemberDef_var, \
-        CORBA::ValueMemberDef_out, \
-      >
-
-#endif /* end #if !defined */
-
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
-
 #endif /* ifndef */
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.h
index 5dc70bed445..d45ebbd1fb9 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.h
@@ -26,17 +26,17 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:390
+// be\be_codegen.cpp:393
 
 #ifndef _TAO_IDL_ORIG_IFR_EXTENDEDS_H_
 #define _TAO_IDL_ORIG_IFR_EXTENDEDS_H_
 
 #include /**/ "ace/pre.h"
 
-#include "IFR_BasicS.h"
 #include "tao/IFR_Client/IFR_ExtendedC.h"
-#include "tao/VisibilityS.h"
-#include "tao/ValueModifierS.h"
+#include "IFR_BasicS.h"
+#include "tao/AnyTypeCode/VisibilityS.h"
+#include "tao/AnyTypeCode/ValueModifierS.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -60,95 +60,102 @@
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_sh.cpp:87
-  
+
   class FixedDef;
   typedef FixedDef *FixedDef_ptr;
-  
-  
+
+
   class  FixedDef
     : public virtual POA_CORBA::IDLType
   {
   protected:
     FixedDef (void);
-  
+
   public:
     // Useful for template programming.
     typedef ::CORBA::FixedDef _stub_type;
     typedef ::CORBA::FixedDef_ptr _stub_ptr_type;
     typedef ::CORBA::FixedDef_var _stub_var_type;
-    
+
     FixedDef (const FixedDef& rhs);
     virtual ~FixedDef (void);
-    
+
     virtual CORBA::Boolean _is_a (
         const char* logical_type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static void _is_a_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
         ACE_ENV_ARG_DECL
       );
-    
+
     static void _non_existent_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
         ACE_ENV_ARG_DECL
       );
-    
+
     static void _interface_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
         ACE_ENV_ARG_DECL
       );
-    
+
     static void _component_skel (
         TAO_ServerRequest & req,
         void * servant_upcall,
         void * servant
         ACE_ENV_ARG_DECL
       );
-    
+
+    static void _repository_id_skel (
+        TAO_ServerRequest & req,
+        void * servant_upcall,
+        void * servant
+        ACE_ENV_ARG_DECL
+      );
+
     virtual void _dispatch (
         TAO_ServerRequest & req,
         void * servant_upcall
         ACE_ENV_ARG_DECL
       );
-    
+
     ::CORBA::FixedDef *_this (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
-    
+
     virtual CORBA::UShort digits (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     static void _get_digits_skel (
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
         ACE_ENV_ARG_DECL
       );
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
-    
+
     virtual void digits (
         ::CORBA::UShort digits
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -156,34 +163,34 @@ namespace POA_CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     static void _set_digits_skel (
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
         ACE_ENV_ARG_DECL
       );
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
-    
+
     virtual CORBA::Short scale (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     static void _get_scale_skel (
         TAO_ServerRequest & server_request,
         void * servant_upcall,
         void * servant
         ACE_ENV_ARG_DECL
       );
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_sh.cpp:45
-    
+
     virtual void scale (
         ::CORBA::Short scale
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -208,7 +215,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     destroy_skel (
@@ -282,6 +289,13 @@ namespace POA_CORBA
         ACE_ENV_ARG_DECL
       );
     
+    static void _repository_id_skel (
+        TAO_ServerRequest & req,
+        void * servant_upcall,
+        void * servant
+        ACE_ENV_ARG_DECL
+      );
+    
     virtual void _dispatch (
         TAO_ServerRequest & req,
         void * servant_upcall
@@ -390,7 +404,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     destroy_skel (
@@ -473,7 +487,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     describe_skel (
@@ -484,7 +498,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     move_skel (
@@ -552,6 +566,13 @@ namespace POA_CORBA
         ACE_ENV_ARG_DECL
       );
     
+    static void _repository_id_skel (
+        TAO_ServerRequest & req,
+        void * servant_upcall,
+        void * servant
+        ACE_ENV_ARG_DECL
+      );
+    
     virtual void _dispatch (
         TAO_ServerRequest & req,
         void * servant_upcall
@@ -922,7 +943,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     destroy_skel (
@@ -933,7 +954,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     lookup_skel (
@@ -944,7 +965,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     contents_skel (
@@ -955,7 +976,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     lookup_name_skel (
@@ -966,7 +987,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     describe_contents_skel (
@@ -977,7 +998,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_module_skel (
@@ -988,7 +1009,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_constant_skel (
@@ -999,7 +1020,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_struct_skel (
@@ -1010,7 +1031,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_union_skel (
@@ -1021,7 +1042,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_enum_skel (
@@ -1032,7 +1053,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_alias_skel (
@@ -1043,7 +1064,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_interface_skel (
@@ -1054,7 +1075,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_value_skel (
@@ -1065,7 +1086,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_value_box_skel (
@@ -1076,7 +1097,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_exception_skel (
@@ -1087,7 +1108,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_native_skel (
@@ -1098,7 +1119,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_abstract_interface_skel (
@@ -1109,7 +1130,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_local_interface_skel (
@@ -1120,7 +1141,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_ext_value_skel (
@@ -1203,7 +1224,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     describe_skel (
@@ -1214,7 +1235,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     move_skel (
@@ -1288,6 +1309,13 @@ namespace POA_CORBA
         ACE_ENV_ARG_DECL
       );
     
+    static void _repository_id_skel (
+        TAO_ServerRequest & req,
+        void * servant_upcall,
+        void * servant
+        ACE_ENV_ARG_DECL
+      );
+    
     virtual void _dispatch (
         TAO_ServerRequest & req,
         void * servant_upcall
@@ -1385,7 +1413,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     destroy_skel (
@@ -1396,7 +1424,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     lookup_skel (
@@ -1407,7 +1435,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     contents_skel (
@@ -1418,7 +1446,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     lookup_name_skel (
@@ -1429,7 +1457,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     describe_contents_skel (
@@ -1440,7 +1468,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_module_skel (
@@ -1451,7 +1479,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_constant_skel (
@@ -1462,7 +1490,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_struct_skel (
@@ -1473,7 +1501,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_union_skel (
@@ -1484,7 +1512,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_enum_skel (
@@ -1495,7 +1523,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_alias_skel (
@@ -1506,7 +1534,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_interface_skel (
@@ -1517,7 +1545,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_value_skel (
@@ -1528,7 +1556,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_value_box_skel (
@@ -1539,7 +1567,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_exception_skel (
@@ -1550,7 +1578,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_native_skel (
@@ -1561,7 +1589,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_abstract_interface_skel (
@@ -1572,7 +1600,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_local_interface_skel (
@@ -1583,7 +1611,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_ext_value_skel (
@@ -1666,7 +1694,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     describe_skel (
@@ -1677,7 +1705,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     move_skel (
@@ -1808,7 +1836,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     is_a_skel (
@@ -1819,7 +1847,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     describe_value_skel (
@@ -1830,7 +1858,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_value_member_skel (
@@ -1841,7 +1869,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_attribute_skel (
@@ -1852,7 +1880,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     create_operation_skel (
@@ -1918,6 +1946,13 @@ namespace POA_CORBA
         ACE_ENV_ARG_DECL
       );
     
+    static void _repository_id_skel (
+        TAO_ServerRequest & req,
+        void * servant_upcall,
+        void * servant
+        ACE_ENV_ARG_DECL
+      );
+    
     virtual void _dispatch (
         TAO_ServerRequest & req,
         void * servant_upcall
@@ -1974,7 +2009,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     destroy_skel (
@@ -2057,7 +2092,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     describe_skel (
@@ -2068,7 +2103,7 @@ namespace POA_CORBA
       );
     
     // TAO_IDL - Generated from
-    // be\be_interface.cpp:1859
+    // be\be_interface.cpp:1869
     
     static void
     move_skel (
@@ -2093,7 +2128,7 @@ namespace POA_CORBA
 } // module CORBA
 
 // TAO_IDL - Generated from 
-// be\be_codegen.cpp:997
+// be\be_codegen.cpp:1120
 
 #include "IFR_ExtendedS_T.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.inl b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.inl
index 401ddbed39e..b71e62d0ac5 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.inl
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS.inl
@@ -45,7 +45,7 @@ POA_CORBA::FixedDef::_get_def_kind_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -102,7 +102,7 @@ POA_CORBA::ValueMemberDef::_get_def_kind_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -285,7 +285,7 @@ POA_CORBA::ValueMemberDef::_get_containing_repository_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -306,7 +306,7 @@ POA_CORBA::ValueMemberDef::describe_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -345,7 +345,7 @@ POA_CORBA::ValueDef::_get_def_kind_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -366,7 +366,7 @@ POA_CORBA::ValueDef::destroy_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -387,7 +387,7 @@ POA_CORBA::ValueDef::lookup_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -408,7 +408,7 @@ POA_CORBA::ValueDef::contents_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -429,7 +429,7 @@ POA_CORBA::ValueDef::lookup_name_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -450,7 +450,7 @@ POA_CORBA::ValueDef::describe_contents_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -471,7 +471,7 @@ POA_CORBA::ValueDef::create_module_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -492,7 +492,7 @@ POA_CORBA::ValueDef::create_constant_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -513,7 +513,7 @@ POA_CORBA::ValueDef::create_struct_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -534,7 +534,7 @@ POA_CORBA::ValueDef::create_union_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -555,7 +555,7 @@ POA_CORBA::ValueDef::create_enum_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -576,7 +576,7 @@ POA_CORBA::ValueDef::create_alias_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -597,7 +597,7 @@ POA_CORBA::ValueDef::create_interface_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -618,7 +618,7 @@ POA_CORBA::ValueDef::create_value_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -639,7 +639,7 @@ POA_CORBA::ValueDef::create_value_box_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -660,7 +660,7 @@ POA_CORBA::ValueDef::create_exception_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -681,7 +681,7 @@ POA_CORBA::ValueDef::create_native_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -702,7 +702,7 @@ POA_CORBA::ValueDef::create_abstract_interface_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -723,7 +723,7 @@ POA_CORBA::ValueDef::create_local_interface_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -906,7 +906,7 @@ POA_CORBA::ValueDef::_get_containing_repository_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -927,7 +927,7 @@ POA_CORBA::ValueDef::describe_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -984,7 +984,7 @@ POA_CORBA::ExtValueDef::_get_def_kind_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -1005,7 +1005,7 @@ POA_CORBA::ExtValueDef::destroy_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -1026,7 +1026,7 @@ POA_CORBA::ExtValueDef::lookup_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -1047,7 +1047,7 @@ POA_CORBA::ExtValueDef::contents_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -1068,7 +1068,7 @@ POA_CORBA::ExtValueDef::lookup_name_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -1089,7 +1089,7 @@ POA_CORBA::ExtValueDef::describe_contents_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -1110,7 +1110,7 @@ POA_CORBA::ExtValueDef::create_module_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -1131,7 +1131,7 @@ POA_CORBA::ExtValueDef::create_constant_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -1152,7 +1152,7 @@ POA_CORBA::ExtValueDef::create_struct_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -1173,7 +1173,7 @@ POA_CORBA::ExtValueDef::create_union_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -1194,7 +1194,7 @@ POA_CORBA::ExtValueDef::create_enum_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -1215,7 +1215,7 @@ POA_CORBA::ExtValueDef::create_alias_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -1236,7 +1236,7 @@ POA_CORBA::ExtValueDef::create_interface_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -1257,7 +1257,7 @@ POA_CORBA::ExtValueDef::create_value_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -1278,7 +1278,7 @@ POA_CORBA::ExtValueDef::create_value_box_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -1299,7 +1299,7 @@ POA_CORBA::ExtValueDef::create_exception_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -1320,7 +1320,7 @@ POA_CORBA::ExtValueDef::create_native_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -1341,7 +1341,7 @@ POA_CORBA::ExtValueDef::create_abstract_interface_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -1362,7 +1362,7 @@ POA_CORBA::ExtValueDef::create_local_interface_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -1545,7 +1545,7 @@ POA_CORBA::ExtValueDef::_get_containing_repository_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -1566,7 +1566,7 @@ POA_CORBA::ExtValueDef::describe_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -1857,7 +1857,7 @@ POA_CORBA::ExtValueDef::_set_is_truncatable_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -1878,7 +1878,7 @@ POA_CORBA::ExtValueDef::is_a_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -1899,7 +1899,7 @@ POA_CORBA::ExtValueDef::describe_value_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -1920,7 +1920,7 @@ POA_CORBA::ExtValueDef::create_value_member_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -1941,7 +1941,7 @@ POA_CORBA::ExtValueDef::create_attribute_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -1980,7 +1980,7 @@ POA_CORBA::ValueBoxDef::_get_def_kind_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -2163,7 +2163,7 @@ POA_CORBA::ValueBoxDef::_get_containing_repository_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
@@ -2184,7 +2184,7 @@ POA_CORBA::ValueBoxDef::describe_skel (
 }
 
 // TAO_IDL - Generated from
-// be\be_interface.cpp:1859
+// be\be_interface.cpp:1869
 
 ACE_INLINE
 void
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.cpp
index a4e0504caff..5397150d35f 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.cpp
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from 
-// be\be_codegen.cpp:683
+// be\be_codegen.cpp:679
 
 #ifndef _TAO_IDL_ORIG_IFR_EXTENDEDS_T_CPP_
 #define _TAO_IDL_ORIG_IFR_EXTENDEDS_T_CPP_
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.h b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.h
index 6f768189445..586bb1df157 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_ExtendedS_T.h
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:546
+// be\be_codegen.cpp:538
 
 #ifndef _TAO_IDL_ORIG_IFR_EXTENDEDS_T_H_
 #define _TAO_IDL_ORIG_IFR_EXTENDEDS_T_H_
@@ -2012,7 +2012,7 @@ namespace POA_CORBA
 } // module CORBA
 
 // TAO_IDL - Generated from 
-// be\be_codegen.cpp:1094
+// be\be_codegen.cpp:1221
 
 #if defined (__ACE_INLINE__)
 #include "IFR_ExtendedS_T.inl"
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp
index 22ea6ddc455..93cf1521f66 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IFR_Service_Utils.cpp
@@ -14,7 +14,7 @@
 #include "tao/PortableServer/Root_POA.h"
 #include "tao/Stub.h"
 #include "tao/Profile.h"
-#include "tao/ValueModifierC.h"
+#include "tao/AnyTypeCode/ValueModifierC.h"
 #include "ace/Auto_Ptr.h"
 
 ACE_RCSID (IFR_Service,
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.cpp
index c598742583f..5fd3d758894 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.cpp
@@ -47,7 +47,7 @@ TAO_IRObject_i::update_key (ACE_ENV_SINGLE_ARG_DECL)
 {
   TAO::Portable_Server::POA_Current_Impl *pc_impl =
     static_cast <TAO::Portable_Server::POA_Current_Impl *>
-                     (TAO_TSS_RESOURCES::instance ()->poa_current_impl_);
+                     (TAO_TSS_Resources::instance ()->poa_current_impl_);
 
   PortableServer::ObjectId object_id;
   int status = TAO_Root_POA::parse_ir_object_key (pc_impl->object_key (),
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp
index 68d57c03519..96600c3ac55 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp
@@ -5,7 +5,7 @@
 #include "Repository_i.h"
 #include "IFR_Service_Utils.h"
 
-#include "tao/Any_Unknown_IDL_Type.h"
+#include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h"
 #include "tao/CDR.h"
 
 #include "ace/Auto_Ptr.h"
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/tmplinst.cpp b/TAO/orbsvcs/orbsvcs/IFRService/tmplinst.cpp
deleted file mode 100644
index 622639d5723..00000000000
--- a/TAO/orbsvcs/orbsvcs/IFRService/tmplinst.cpp
+++ /dev/null
@@ -1,435 +0,0 @@
-// $Id$
-
-#include "concrete_classes.h"
-#include "Options.h"
-#include "IFR_Service_Utils_T.h"
-#include "ComponentRepository_i.h"
-#include "OperationDef_i.h"
-#include "ace/Auto_Ptr.h"
-
-ACE_RCSID (IFRService,
-           tmplinst,
-           "$Id$")
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) \
-    || defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-ACE_TEMPLATE_SPECIALIZATION
-void
-TAO_IFR_Generic_Utils<TAO_AttributeDef_i>::set_initializers (
-    const TAO_AttributeDef_i &,
-    ACE_Configuration *,
-    ACE_Configuration_Section_Key &
-  )
-{
-}
-
-ACE_TEMPLATE_SPECIALIZATION
-void
-TAO_IFR_Generic_Utils<TAO_OperationDef_i>::set_initializers (
-    const TAO_OperationDef_i &,
-    ACE_Configuration *,
-    ACE_Configuration_Section_Key &
-  )
-{
-}
-
-ACE_TEMPLATE_SPECIALIZATION
-void
-TAO_IFR_Generic_Utils<TAO_ProvidesDef_i>::set_initializers (
-    const TAO_ProvidesDef_i &,
-    ACE_Configuration *,
-    ACE_Configuration_Section_Key &
-  )
-{
-}
-
-ACE_TEMPLATE_SPECIALIZATION
-void
-TAO_IFR_Generic_Utils<TAO_UsesDef_i>::set_initializers (
-    const TAO_UsesDef_i &,
-    ACE_Configuration *,
-    ACE_Configuration_Section_Key &
-  )
-{
-}
-
-ACE_TEMPLATE_SPECIALIZATION
-void
-TAO_IFR_Generic_Utils<TAO_EmitsDef_i>::set_initializers (
-    const TAO_EmitsDef_i &,
-    ACE_Configuration *,
-    ACE_Configuration_Section_Key &
-  )
-{
-}
-
-ACE_TEMPLATE_SPECIALIZATION
-void
-TAO_IFR_Generic_Utils<TAO_PublishesDef_i>::set_initializers (
-    const TAO_PublishesDef_i &,
-    ACE_Configuration *,
-    ACE_Configuration_Section_Key &
-  )
-{
-}
-
-ACE_TEMPLATE_SPECIALIZATION
-void
-TAO_IFR_Generic_Utils<TAO_ConsumesDef_i>::set_initializers (
-    const TAO_ConsumesDef_i &,
-    ACE_Configuration *,
-    ACE_Configuration_Section_Key &
-  )
-{
-}
-
-ACE_TEMPLATE_SPECIALIZATION
-void
-TAO_IFR_Generic_Utils<TAO_FinderDef_i>::set_initializers (
-    const TAO_FinderDef_i &,
-    ACE_Configuration *,
-    ACE_Configuration_Section_Key &
-  )
-{
-}
-
-ACE_TEMPLATE_SPECIALIZATION
-void
-TAO_IFR_Generic_Utils<TAO_FactoryDef_i>::set_initializers (
-    const TAO_FactoryDef_i &,
-    ACE_Configuration *,
-    ACE_Configuration_Section_Key &
-  )
-{
-}
-
-ACE_TEMPLATE_SPECIALIZATION
-void
-TAO_IFR_Generic_Utils<CORBA::InitializerSeq>::destroy_special (
-    const char *,
-    TAO_Repository_i *,
-    ACE_Configuration_Section_Key &
-    ACE_ENV_ARG_DECL_NOT_USED)
-{
-}
-
-ACE_TEMPLATE_SPECIALIZATION
-void
-TAO_IFR_Generic_Utils<CORBA::ExtInitializerSeq>::destroy_special (
-    const char *,
-    TAO_Repository_i *,
-    ACE_Configuration_Section_Key &
-    ACE_ENV_ARG_DECL_NOT_USED)
-{
-}
-
-#endif
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class ACE_Node<CORBA::DefinitionKind>;
-template class ACE_Unbounded_Queue<CORBA::DefinitionKind>;
-template class ACE_Unbounded_Queue_Iterator<CORBA::DefinitionKind>;
-template class ACE_Node<ACE_Configuration_Section_Key>;
-template class ACE_Unbounded_Queue<ACE_Configuration_Section_Key>;
-template class ACE_Unbounded_Queue_Iterator<ACE_Configuration_Section_Key>;
-
-template class POA_CORBA::Repository_tie<TAO_Repository_i>;
-template class POA_CORBA::ComponentIR::Repository_tie<TAO_ComponentRepository_i>;
-template class POA_CORBA::PrimitiveDef_tie<TAO_PrimitiveDef_i>;
-template class POA_CORBA::StringDef_tie<TAO_StringDef_i>;
-template class POA_CORBA::WstringDef_tie<TAO_WstringDef_i>;
-template class POA_CORBA::SequenceDef_tie<TAO_SequenceDef_i>;
-template class POA_CORBA::ArrayDef_tie<TAO_ArrayDef_i>;
-template class POA_CORBA::FixedDef_tie<TAO_FixedDef_i>;
-template class POA_CORBA::EnumDef_tie<TAO_EnumDef_i>;
-template class POA_CORBA::AliasDef_tie<TAO_AliasDef_i>;
-template class POA_CORBA::NativeDef_tie<TAO_NativeDef_i>;
-template class POA_CORBA::ValueBoxDef_tie<TAO_ValueBoxDef_i>;
-template class POA_CORBA::UnionDef_tie<TAO_UnionDef_i>;
-template class POA_CORBA::StructDef_tie<TAO_StructDef_i>;
-template class POA_CORBA::ComponentIR::ConsumesDef_tie<TAO_ConsumesDef_i>;
-template class POA_CORBA::ComponentIR::PublishesDef_tie<TAO_PublishesDef_i>;
-template class POA_CORBA::ComponentIR::EmitsDef_tie<TAO_EmitsDef_i>;
-template class POA_CORBA::ComponentIR::EventDef_tie<TAO_EventDef_i>;
-template class POA_CORBA::ComponentIR::ProvidesDef_tie<TAO_ProvidesDef_i>;
-template class POA_CORBA::ComponentIR::UsesDef_tie<TAO_UsesDef_i>;
-template class POA_CORBA::ValueMemberDef_tie<TAO_ValueMemberDef_i>;
-template class POA_CORBA::ComponentIR::FactoryDef_tie<TAO_FactoryDef_i>;
-template class POA_CORBA::ComponentIR::FinderDef_tie<TAO_FinderDef_i>;
-template class POA_CORBA::AttributeDef_tie<TAO_AttributeDef_i>;
-template class POA_CORBA::ConstantDef_tie<TAO_ConstantDef_i>;
-template class POA_CORBA::ComponentIR::ComponentDef_tie<TAO_ComponentDef_i>;
-template class POA_CORBA::ComponentIR::HomeDef_tie<TAO_HomeDef_i>;
-template class POA_CORBA::ValueDef_tie<TAO_ValueDef_i>;
-template class POA_CORBA::ExceptionDef_tie<TAO_ExceptionDef_i>;
-template class POA_CORBA::ModuleDef_tie<TAO_ModuleDef_i>;
-template class POA_CORBA::OperationDef_tie<TAO_OperationDef_i>;
-template class POA_CORBA::InterfaceDef_tie<TAO_InterfaceDef_i>;
-template class POA_CORBA::AbstractInterfaceDef_tie<TAO_AbstractInterfaceDef_i>;
-template class POA_CORBA::LocalInterfaceDef_tie<TAO_LocalInterfaceDef_i>;
-template class POA_CORBA::ExtValueDef_tie<TAO_ExtValueDef_i>;
-template class POA_CORBA::ComponentIR::ModuleDef_tie<TAO_ModuleDef_i>;
-
-template class auto_ptr<TAO_Repository_i>;
-template class ACE_Auto_Basic_Ptr<TAO_Repository_i>;
-template class auto_ptr<TAO_ComponentRepository_i>;
-template class ACE_Auto_Basic_Ptr<TAO_ComponentRepository_i>;
-template class auto_ptr<TAO_PrimitiveDef_i>;
-template class ACE_Auto_Basic_Ptr<TAO_PrimitiveDef_i>;
-template class auto_ptr<TAO_StringDef_i>;
-template class ACE_Auto_Basic_Ptr<TAO_StringDef_i>;
-template class auto_ptr<TAO_WstringDef_i>;
-template class ACE_Auto_Basic_Ptr<TAO_WstringDef_i>;
-template class auto_ptr<TAO_SequenceDef_i>;
-template class ACE_Auto_Basic_Ptr<TAO_SequenceDef_i>;
-template class auto_ptr<TAO_ArrayDef_i>;
-template class ACE_Auto_Basic_Ptr<TAO_ArrayDef_i>;
-template class auto_ptr<TAO_FixedDef_i>;
-template class ACE_Auto_Basic_Ptr<TAO_FixedDef_i>;
-template class auto_ptr<TAO_EnumDef_i>;
-template class ACE_Auto_Basic_Ptr<TAO_EnumDef_i>;
-template class auto_ptr<TAO_AliasDef_i>;
-template class ACE_Auto_Basic_Ptr<TAO_AliasDef_i>;
-template class auto_ptr<TAO_NativeDef_i>;
-template class ACE_Auto_Basic_Ptr<TAO_NativeDef_i>;
-template class auto_ptr<TAO_ValueBoxDef_i>;
-template class ACE_Auto_Basic_Ptr<TAO_ValueBoxDef_i>;
-template class auto_ptr<TAO_UnionDef_i>;
-template class ACE_Auto_Basic_Ptr<TAO_UnionDef_i>;
-template class auto_ptr<TAO_StructDef_i>;
-template class ACE_Auto_Basic_Ptr<TAO_StructDef_i>;
-template class auto_ptr<TAO_ConsumesDef_i>;
-template class ACE_Auto_Basic_Ptr<TAO_ConsumesDef_i>;
-template class auto_ptr<TAO_PublishesDef_i>;
-template class ACE_Auto_Basic_Ptr<TAO_PublishesDef_i>;
-template class auto_ptr<TAO_EmitsDef_i>;
-template class ACE_Auto_Basic_Ptr<TAO_EmitsDef_i>;
-template class auto_ptr<TAO_EventDef_i>;
-template class ACE_Auto_Basic_Ptr<TAO_EventDef_i>;
-template class auto_ptr<TAO_ProvidesDef_i>;
-template class ACE_Auto_Basic_Ptr<TAO_ProvidesDef_i>;
-template class auto_ptr<TAO_UsesDef_i>;
-template class ACE_Auto_Basic_Ptr<TAO_UsesDef_i>;
-template class auto_ptr<TAO_ValueMemberDef_i>;
-template class ACE_Auto_Basic_Ptr<TAO_ValueMemberDef_i>;
-template class auto_ptr<TAO_FactoryDef_i>;
-template class ACE_Auto_Basic_Ptr<TAO_FactoryDef_i>;
-template class auto_ptr<TAO_FinderDef_i>;
-template class ACE_Auto_Basic_Ptr<TAO_FinderDef_i>;
-template class auto_ptr<TAO_AttributeDef_i>;
-template class ACE_Auto_Basic_Ptr<TAO_AttributeDef_i>;
-template class auto_ptr<TAO_ConstantDef_i>;
-template class ACE_Auto_Basic_Ptr<TAO_ConstantDef_i>;
-template class auto_ptr<TAO_ComponentDef_i>;
-template class ACE_Auto_Basic_Ptr<TAO_ComponentDef_i>;
-template class auto_ptr<TAO_HomeDef_i>;
-template class ACE_Auto_Basic_Ptr<TAO_HomeDef_i>;
-template class auto_ptr<TAO_ValueDef_i>;
-template class ACE_Auto_Basic_Ptr<TAO_ValueDef_i>;
-template class auto_ptr<TAO_ExceptionDef_i>;
-template class ACE_Auto_Basic_Ptr<TAO_ExceptionDef_i>;
-template class auto_ptr<TAO_ModuleDef_i>;
-template class ACE_Auto_Basic_Ptr<TAO_ModuleDef_i>;
-template class auto_ptr<TAO_OperationDef_i>;
-template class ACE_Auto_Basic_Ptr<TAO_OperationDef_i>;
-template class auto_ptr<TAO_InterfaceDef_i>;
-template class ACE_Auto_Basic_Ptr<TAO_InterfaceDef_i>;
-template class auto_ptr<TAO_AbstractInterfaceDef_i>;
-template class ACE_Auto_Basic_Ptr<TAO_AbstractInterfaceDef_i>;
-template class auto_ptr<TAO_LocalInterfaceDef_i>;
-template class ACE_Auto_Basic_Ptr<TAO_LocalInterfaceDef_i>;
-template class auto_ptr<TAO_Container_i>;
-template class ACE_Auto_Basic_Ptr<TAO_Container_i>;
-template class auto_ptr<TAO_Contained_i>;
-template class ACE_Auto_Basic_Ptr<TAO_Contained_i>;
-template class auto_ptr<TAO_IDLType_i>;
-template class ACE_Auto_Basic_Ptr<TAO_IDLType_i>;
-
-template class ACE_Auto_Basic_Ptr<char>;
-
-template class TAO_IFR_Generic_Utils<TAO_AttributeDef_i>;
-template class TAO_IFR_Generic_Utils<TAO_OperationDef_i>;
-template class TAO_IFR_Generic_Utils<TAO_ProvidesDef_i>;
-template class TAO_IFR_Generic_Utils<TAO_UsesDef_i>;
-template class TAO_IFR_Generic_Utils<TAO_EmitsDef_i>;
-template class TAO_IFR_Generic_Utils<TAO_PublishesDef_i>;
-template class TAO_IFR_Generic_Utils<TAO_ConsumesDef_i>;
-template class TAO_IFR_Generic_Utils<TAO_FinderDef_i>;
-template class TAO_IFR_Generic_Utils<TAO_FactoryDef_i>;
-template class TAO_IFR_Generic_Utils<CORBA::ExtInitializerSeq>;
-template class TAO_IFR_Generic_Utils<CORBA::InitializerSeq>;
-template class TAO_Port_Desc_Seq_Utils<CORBA::ComponentIR::ProvidesDescriptionSeq>;
-template class TAO_Port_Utils<CORBA::ComponentIR::ProvidesDef>;
-template class TAO_Port_Utils<CORBA::ComponentIR::EmitsDef>;
-template class TAO_Port_Utils<CORBA::ComponentIR::PublishesDef>;
-template class TAO_Port_Utils<CORBA::ComponentIR::ConsumesDef>;
-template class TAO_IFR_Strseq_Utils<CORBA::RepositoryIdSeq>;
-template class TAO_IFR_Strseq_Utils<CORBA::ContextIdSeq>;
-template class TAO_IFR_Desc_Utils<CORBA::ComponentIR::HomeDescription, TAO_HomeDef_i>;
-template class TAO_IFR_Desc_Utils<CORBA::ExceptionDescription, TAO_ExceptionDef_i>;
-template class TAO_IFR_Desc_Utils<CORBA::ExtAttributeDescription, TAO_AttributeDef_i>;
-template class TAO_IFR_Desc_Utils<CORBA::ComponentIR::EventPortDescription, TAO_EventPortDef_i>;
-template class TAO_IFR_Desc_Utils<CORBA::ComponentIR::UsesDescription, TAO_UsesDef_i>;
-template class TAO_IFR_Desc_Utils<CORBA::ComponentIR::ProvidesDescription, TAO_ProvidesDef_i>;
-template class TAO_IFR_Desc_Utils<CORBA::ComponentIR::ComponentDescription, TAO_ComponentDef_i>;
-template class TAO_IFR_Desc_Utils<CORBA::ValueMember, TAO_ValueMemberDef_i>;
-template class TAO_IFR_Desc_Utils<CORBA::OperationDescription, TAO_OperationDef_i>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_Node<CORBA::DefinitionKind>
-#pragma instantiate ACE_Unbounded_Queue<CORBA::DefinitionKind>
-#pragma instantiate ACE_Unbounded_Queue_Iterator<CORBA::DefinitionKind>
-#pragma instantiate ACE_Node<ACE_Configuration_Section_Key>
-#pragma instantiate ACE_Unbounded_Queue<ACE_Configuration_Section_Key>
-#pragma instantiate ACE_Unbounded_Queue_Iterator<ACE_Configuration_Section_Key>
-
-#pragma instantiate POA_CORBA::Repository_tie<TAO_Repository_i>
-#pragma instantiate POA_CORBA::ComponentIR::Repository_tie<TAO_ComponentRepository_i>
-#pragma instantiate POA_CORBA::PrimitiveDef_tie<TAO_PrimitiveDef_i>
-#pragma instantiate POA_CORBA::StringDef_tie<TAO_StringDef_i>
-#pragma instantiate POA_CORBA::WstringDef_tie<TAO_WstringDef_i>
-#pragma instantiate POA_CORBA::SequenceDef_tie<TAO_SequenceDef_i>
-#pragma instantiate POA_CORBA::ArrayDef_tie<TAO_ArrayDef_i>
-#pragma instantiate POA_CORBA::FixedDef_tie<TAO_FixedDef_i>
-#pragma instantiate POA_CORBA::EnumDef_tie<TAO_EnumDef_i>
-#pragma instantiate POA_CORBA::AliasDef_tie<TAO_AliasDef_i>
-#pragma instantiate POA_CORBA::NativeDef_tie<TAO_NativeDef_i>
-#pragma instantiate POA_CORBA::ValueBoxDef_tie<TAO_ValueBoxDef_i>
-#pragma instantiate POA_CORBA::UnionDef_tie<TAO_UnionDef_i>
-#pragma instantiate POA_CORBA::StructDef_tie<TAO_StructDef_i>
-#pragma instantiate POA_CORBA::ComponentIR::ConsumesDef_tie<TAO_ConsumesDef_i>
-#pragma instantiate POA_CORBA::ComponentIR::PublishesDef_tie<TAO_PublishesDef_i>
-#pragma instantiate POA_CORBA::ComponentIR::EmitsDef_tie<TAO_EmitsDef_i>
-#pragma instantiate POA_CORBA::ComponentIR::EventDef_tie<TAO_PrimaryKeyDef_i>
-#pragma instantiate POA_CORBA::ComponentIR::ProvidesDef_tie<TAO_ProvidesDef_i>
-#pragma instantiate POA_CORBA::ComponentIR::UsesDef_tie<TAO_UsesDef_i>
-#pragma instantiate POA_CORBA::ValueMemberDef_tie<TAO_ValueMemberDef_i>
-#pragma instantiate POA_CORBA::ComponentIR::FactoryDef_tie<TAO_FactoryDef_i>
-#pragma instantiate POA_CORBA::ComponentIR::FinderDef_tie<TAO_FinderDef_i>
-#pragma instantiate POA_CORBA::AttributeDef_tie<TAO_AttributeDef_i>
-#pragma instantiate POA_CORBA::ConstantDef_tie<TAO_ConstantDef_i>
-#pragma instantiate POA_CORBA::ComponentIR::ComponentDef_tie<TAO_ComponentDef_i>
-#pragma instantiate POA_CORBA::ComponentIR::HomeDef_tie<TAO_HomeDef_i>
-#pragma instantiate POA_CORBA::ValueDef_tie<TAO_ValueDef_i>
-#pragma instantiate POA_CORBA::ExceptionDef_tie<TAO_ExceptionDef_i>
-#pragma instantiate POA_CORBA::ModuleDef_tie<TAO_ModuleDef_i>
-#pragma instantiate POA_CORBA::OperationDef_tie<TAO_OperationDef_i>
-#pragma instantiate POA_CORBA::InterfaceDef_tie<TAO_>
-#pragma instantiate POA_CORBA::AbstractInterfaceDef_tie<TAO_AbstractInterfaceDef_i>
-#pragma instantiate POA_CORBA::LocalInterfaceDef_tie<TAO_LocalInterfaceDef_i>
-#pragma instantiate POA_CORBA::ExtValueDef_tie<TAO_ExtValueDef_i>
-#pragma instantiate POA_CORBA::ComponentIR::ModuleDef_tie<TAO_ModuleDef_i>
-
-#pragma instantiate auto_ptr<TAO_Repository_i>
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_Repository_i>
-#pragma instantiate auto_ptr<TAO_ComponentRepository_i>
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_ComponentRepository_i>
-#pragma instantiate auto_ptr<TAO_PrimitiveDef_i>
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_PrimitiveDef_i>
-#pragma instantiate auto_ptr<TAO_StringDef_i>
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_StringDef_i>
-#pragma instantiate auto_ptr<TAO_WstringDef_i>
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_WstringDef_i>
-#pragma instantiate auto_ptr<TAO_SequenceDef_i>
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_SequenceDef_i>
-#pragma instantiate auto_ptr<TAO_ArrayDef_i>
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_ArrayDef_i>
-#pragma instantiate auto_ptr<TAO_FixedDef_i>
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_FixedDef_i>
-#pragma instantiate auto_ptr<TAO_EnumDef_i>
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_EnumDef_i>
-#pragma instantiate auto_ptr<TAO_AliasDef_i>
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_AliasDef_i>
-#pragma instantiate auto_ptr<TAO_NativeDef_i>
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_NativeDef_i>
-#pragma instantiate auto_ptr<TAO_ValueBoxDef_i>
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_ValueBoxDef_i>
-#pragma instantiate auto_ptr<TAO_UnionDef_i>
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_UnionDef_i>
-#pragma instantiate auto_ptr<TAO_StructDef_i>
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_StructDef_i>
-#pragma instantiate auto_ptr<TAO_ConsumesDef_i>
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_ConsumesDef_i>
-#pragma instantiate auto_ptr<TAO_PublishesDef_i>
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_PublishesDef_i>
-#pragma instantiate auto_ptr<TAO_EmitsDef_i>
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_EmitsDef_i>
-#pragma instantiate auto_ptr<TAO_EventDef_i>
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_EventDef_i>
-#pragma instantiate auto_ptr<TAO_ProvidesDef_i>
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_ProvidesDef_i>
-#pragma instantiate auto_ptr<TAO_UsesDef_i>
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_UsesDef_i>
-#pragma instantiate auto_ptr<TAO_ValueMemberDef_i>
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_ValueMemberDef_i>
-#pragma instantiate auto_ptr<TAO_FactoryDef_i>
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_FactoryDef_i>
-#pragma instantiate auto_ptr<TAO_FinderDef_i>
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_FinderDef_i>
-#pragma instantiate auto_ptr<TAO_AttributeDef_i>
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_AttributeDef_i>
-#pragma instantiate auto_ptr<TAO_ConstantDef_i>
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_ConstantDef_i>
-#pragma instantiate auto_ptr<TAO_ComponentDef_i>
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_ComponentDef_i>
-#pragma instantiate auto_ptr<TAO_HomeDef_i>
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_HomeDef_i>
-#pragma instantiate auto_ptr<TAO_ValueDef_i>
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_ValueDef_i>
-#pragma instantiate auto_ptr<TAO_ExceptionDef_i>
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_ExceptionDef_i>
-#pragma instantiate auto_ptr<TAO_ModuleDef_i>
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_ModuleDef_i>
-#pragma instantiate auto_ptr<TAO_OperationDef_i>
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_OperationDef_i>
-#pragma instantiate auto_ptr<TAO_InterfaceDef_i>
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_InterfaceDef_i>
-#pragma instantiate auto_ptr<TAO_AbstractInterfaceDef_i>
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_AbstractInterfaceDef_i>
-#pragma instantiate auto_ptr<TAO_LocalInterfaceDef_i>
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_LocalInterfaceDef_i>
-#pragma instantiate auto_ptr<TAO_Container_i>
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_Container_i>
-#pragma instantiate auto_ptr<TAO_Contained_i>
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_Contained_i>
-#pragma instantiate auto_ptr<TAO_IDLType_i>
-#pragma instantiate ACE_Auto_Basic_Ptr<TAO_IDLType_i>
-
-#pragma instantiate ACE_Auto_Basic_Ptr<char>
-
-#pragma instantiate TAO_IFR_Generic_Utils<TAO_AttributeDef_i>
-#pragma instantiate TAO_IFR_Generic_Utils<TAO_OperationDef_i>
-#pragma instantiate TAO_IFR_Generic_Utils<TAO_ProvidesDef_i>
-#pragma instantiate TAO_IFR_Generic_Utils<TAO_UsesDef_i>
-#pragma instantiate TAO_IFR_Generic_Utils<TAO_EmitsDef_i>
-#pragma instantiate TAO_IFR_Generic_Utils<TAO_PublishesDef_i>
-#pragma instantiate TAO_IFR_Generic_Utils<TAO_ConsumesDef_i>
-#pragma instantiate TAO_IFR_Generic_Utils<TAO_FinderDef_i>
-#pragma instantiate TAO_IFR_Generic_Utils<TAO_FactoryDef_i>
-#pragma instantiate TAO_IFR_Generic_Utils<CORBA::ExtInitializerSeq>
-#pragma instantiate TAO_IFR_Generic_Utils<CORBA::InitializerSeq>
-#pragma instantiate TAO_Port_Desc_Seq_Utils<CORBA::ComponentIR::ProvidesDescriptionSeq>
-#pragma instantiate TAO_Port_Utils<CORBA::ComponentIR::ProvidesDef>
-#pragma instantiate TAO_Port_Utils<CORBA::ComponentIR::EmitsDef>
-#pragma instantiate TAO_Port_Utils<CORBA::ComponentIR::PublishesDef>
-#pragma instantiate TAO_Port_Utils<CORBA::ComponentIR::ConsumesDef>
-#pragma instantiate TAO_IFR_Strseq_Utils<CORBA::RepositoryIdSeq>
-#pragma instantiate TAO_IFR_Strseq_Utils<CORBA::ContextIdSeq>
-#pragma instantiate TAO_IFR_Desc_Utils<CORBA::ComponentIR::HomeDescription, TAO_HomeDef_i>
-#pragma instantiate TAO_IFR_Desc_Utils<CORBA::ExceptionDescription, TAO_ExceptionDef_i>
-#pragma instantiate TAO_IFR_Desc_Utils<CORBA::ExtAttributeDescription, TAO_AttributeDef_i>
-#pragma instantiate TAO_IFR_Desc_Utils<CORBA::ComponentIR::EventPortDescription, TAO_EventPortDef_i>
-#pragma instantiate TAO_IFR_Desc_Utils<CORBA::ComponentIR::UsesDescription, TAO_UsesDef_i>
-#pragma instantiate TAO_IFR_Desc_Utils<CORBA::ComponentIR::ProvidesDescription, TAO_ProvidesDef_i>
-#pragma instantiate TAO_IFR_Desc_Utils<CORBA::ComponentIR::ComponentDescription, TAO_ComponentDef_i>
-#pragma instantiate TAO_IFR_Desc_Utils<CORBA::ValueMember, TAO_ValueMemberDef_i>
-#pragma instantiate TAO_IFR_Desc_Utils<CORBA::OperationDescription, TAO_OperationDef_i>
-
-#elif defined (ACE_HAS_EXPLICIT_STATIC_TEMPLATE_MEMBER_INSTANTIATION)
-
-template ACE_Singleton<Options, ACE_Null_Mutex> *ACE_Singleton<Options, ACE_Null_Mutex>::singleton_;
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp b/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp
index 2a5e769ac68..562b0325b2c 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/Hash_LogRecordStore.cpp
@@ -3,7 +3,7 @@
 #include "orbsvcs/Log/Log_Constraint_Interpreter.h"
 #include "orbsvcs/Log/Log_Constraint_Visitors.h"
 #include "orbsvcs/Time_Utilities.h"
-#include "tao/Any_Unknown_IDL_Type.h"
+#include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h"
 #include "tao/ORB_Core.h"
 #include "tao/debug.h"
 #include "ace/OS_NS_sys_time.h"
diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp
index 9b325d330bd..0e1c783cd00 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.cpp
@@ -10,7 +10,7 @@
 #include "tao/DynamicAny/DynEnum_i.h"
 #include "tao/DynamicAny/DynAnyFactory.h"
 
-#include "tao/Any_Unknown_IDL_Type.h"
+#include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h"
 #include "tao/CDR.h"
 
 ACE_RCSID (Log,
@@ -66,14 +66,14 @@ TAO_Log_Constraint_Visitor::TAO_Log_Constraint_Visitor (
 
   // Bind an entry for each item in the record's attribute list.
   CORBA::Long len = this->rec_.attr_list.length();
-  for (CORBA::Long i = 0; i < len; ++i) 
+  for (CORBA::Long i = 0; i < len; ++i)
     {
       const char* name = this->rec_.attr_list[i].name;
- 
+
       CORBA::Any* value;
       ACE_NEW(value, CORBA::Any);
- 
-      if (value != 0) 
+
+      if (value != 0)
 	{
 	  *value = this->rec_.attr_list[i].value;
 	  this->property_lookup_.bind (name, value);
diff --git a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.h b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.h
index e934a88548c..06a6549aff3 100644
--- a/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.h
+++ b/TAO/orbsvcs/orbsvcs/Log/Log_Constraint_Visitors.h
@@ -28,8 +28,6 @@
 #include "orbsvcs/ETCL/ETCL_Constraint_Visitor.h"
 #include "orbsvcs/DsLogAdminC.h"
 
-#include "tao/TypeCode.h"
-
 #include "log_serv_export.h"
 
 class TAO_ETCL_Constraint;
diff --git a/TAO/orbsvcs/orbsvcs/Log/PersistStore.cpp b/TAO/orbsvcs/orbsvcs/Log/PersistStore.cpp
index 3f1b92bedaa..857d07740f2 100644
--- a/TAO/orbsvcs/orbsvcs/Log/PersistStore.cpp
+++ b/TAO/orbsvcs/orbsvcs/Log/PersistStore.cpp
@@ -1,5 +1,5 @@
 #include "PersistStore.h"
-#include "tao/Any_Unknown_IDL_Type.h"
+#include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h"
 #include "ace/OS_NS_fcntl.h"
 #include "ace/OS_NS_sys_time.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Log/PersistStore.h b/TAO/orbsvcs/orbsvcs/Log/PersistStore.h
index 966032096e0..ef769afb0df 100644
--- a/TAO/orbsvcs/orbsvcs/Log/PersistStore.h
+++ b/TAO/orbsvcs/orbsvcs/Log/PersistStore.h
@@ -18,7 +18,7 @@
 #include /**/ "ace/pre.h"
 
 #include "orbsvcs/DsLogAdminS.h"
-#include "tao/TypeCode.h"
+#include "tao/AnyTypeCode/TypeCode.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp
index ea7cecc647b..85bc1c2e675 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp
@@ -14,6 +14,7 @@
 
 #include "tao/IORTable/IORTable.h"
 #include "tao/Messaging/Messaging.h"
+#include "tao/AnyTypeCode/Any.h"
 
 #include "ace/Arg_Shifter.h"
 #include "ace/Auto_Ptr.h"
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp
index bd2ac4a4d51..6f5f604bc4e 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.cpp
@@ -3,14 +3,13 @@
 #include "Notify_Constraint_Visitors.h"
 #include "orbsvcs/ETCL/ETCL_Constraint.h"
 #include "orbsvcs/ETCL/ETCL_y.h"
-#include "tao/Any_Unknown_IDL_Type.h"
+#include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h"
 #include "tao/DynamicAny/DynArray_i.h"
 #include "tao/DynamicAny/DynSequence_i.h"
 #include "tao/DynamicAny/DynStruct_i.h"
 #include "tao/DynamicAny/DynUnion_i.h"
 #include "tao/DynamicAny/DynEnum_i.h"
 #include "tao/DynamicAny/DynAnyFactory.h"
-#include "tao/Any_Unknown_IDL_Type.h"
 #include "tao/CDR.h"
 
 TAO_Notify_Constraint_Visitor::TAO_Notify_Constraint_Visitor (void)
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.h
index 618c74fa3ab..fb4d48ee3ff 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Constraint_Visitors.h
@@ -27,8 +27,6 @@
 #include "orbsvcs/ETCL/ETCL_Constraint.h"
 #include "orbsvcs/CosNotificationC.h"
 
-#include "tao/TypeCode.h"
-
 #include "notify_serv_export.h"
 
 class TAO_Notify_Property_Constraint;
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup.mpc b/TAO/orbsvcs/orbsvcs/PortableGroup.mpc
index 0ff9ef8270a..62979dc481d 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup.mpc
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup.mpc
@@ -3,9 +3,9 @@
 
 project(PortableGroup) : orbsvcslib, core, naming, iormanip, messaging, minimum_corba {
   sharedname   = TAO_PortableGroup
-  idlflags    += -Wb,export_macro=TAO_PortableGroup_Export -Wb,export_include=orbsvcs/PortableGroup/portablegroup_export.h
+  idlflags    += -Wb,export_macro=TAO_PortableGroup_Export \
+                 -Wb,export_include=orbsvcs/PortableGroup/portablegroup_export.h
   dynamicflags = TAO_PORTABLEGROUP_BUILD_DLL
-  tagchecks   += PortableGroup
 
   IDL_Files {
     miop.idl
@@ -17,15 +17,13 @@ project(PortableGroup) : orbsvcslib, core, naming, iormanip, messaging, minimum_
     PortableGroup.idl
   }
 
-  Source_Files(ORBSVCS_COMPONENTS) {
-    PortableGroup {
-      miopC.cpp
-      miopS.cpp
-      PortableGroupC.cpp
-      PortableGroupS.cpp
-      PortableGroup_Simple_DSC.cpp
-      PortableGroup
-    }
+  Source_Files {
+    miopC.cpp
+    miopS.cpp
+    PortableGroupC.cpp
+    PortableGroupS.cpp
+    PortableGroup_Simple_DSC.cpp
+    PortableGroup
   }
 
   Header_Files {
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp
index 1866aa10b83..8d37f91bb1d 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Acceptor.cpp
@@ -1,6 +1,5 @@
 #include "SSLIOP_Acceptor.h"
 #include "SSLIOP_Profile.h"
-#include "SSLIOP_Current.h"
 
 #include "tao/MProfile.h"
 #include "tao/ORB_Core.h"
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h
index 1639801b311..a71b824b845 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current.h
@@ -25,6 +25,7 @@
 
 #include "orbsvcs/SSLIOPC.h"
 #include "tao/ORB_Core.h"
+#include "tao/LocalObject.h"
 
 // This is to remove "inherits via dominance" warnings from MSVC.
 // MSVC is being a little too paranoid.
@@ -144,7 +145,7 @@ namespace TAO
       ACE_UNIMPLEMENTED_FUNC (void operator= (const Current &))
       //@}
 
-        private:
+    private:
 
       /// TSS slot assigned to this object.
       size_t tss_slot_;
diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/ssl_endpointsC.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/ssl_endpointsC.cpp
index 364ec34e23d..861a1699848 100644
--- a/TAO/orbsvcs/orbsvcs/SSLIOP/ssl_endpointsC.cpp
+++ b/TAO/orbsvcs/orbsvcs/SSLIOP/ssl_endpointsC.cpp
@@ -31,11 +31,11 @@
 
 #include "ssl_endpointsC.h"
 #include "tao/CDR.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Sequence_TypeCode_Static.h"
-#include "tao/String_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Sequence_TypeCode_Static.h"
+#include "tao/AnyTypeCode/String_TypeCode_Static.h"
 
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
@@ -50,7 +50,7 @@ namespace TAO
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_TAO_SSLENDPOINTSEQUENCE_CS_)
@@ -115,10 +115,10 @@ namespace TAO
         CORBA::tk_sequence,
         &SSLIOP::_tc_SSL,
         0U);
-      
+
     ::CORBA::TypeCode_ptr const tc_TAO_SSLEndpointSequence_0 =
       &TAO_SSLEndpointSequence_0;
-    
+
   }
 }
 
@@ -132,7 +132,7 @@ static TAO::TypeCode::Alias<char const *,
     "IDL:TAO_SSLEndpointSequence:1.0",
     "TAO_SSLEndpointSequence",
     &TAO::TypeCode::tc_TAO_SSLEndpointSequence_0);
-  
+
 ::CORBA::TypeCode_ptr const _tc_TAO_SSLEndpointSequence =
   &_tao_tc_TAO_SSLEndpointSequence;
 
@@ -148,20 +148,20 @@ CORBA::Boolean operator<< (
   )
 {
   const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
+
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
       CORBA::Boolean _tao_marshal_flag = true;
-      
+
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm << _tao_sequence[i]);
         }
-      
+
       return _tao_marshal_flag;
     }
-  
+
   return false;
 }
 
@@ -171,7 +171,7 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
-  
+
   if (strm >> _tao_seq_len)
     {
       // Add a check to the length of the sequence
@@ -181,19 +181,19 @@ CORBA::Boolean operator>> (
         {
           return false;
         }
-      
+
       // Set the length of the sequence.
       _tao_sequence.length (_tao_seq_len);
-      
+
       // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
+      if (0 >= _tao_seq_len)
         {
           return true;
         }
-      
+
       // Retrieve all the elements.
       CORBA::Boolean _tao_marshal_flag = true;
-      
+
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm >> _tao_sequence[i]);
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.cpp
index 755920913f8..7262bb8ce04 100644
--- a/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.cpp
@@ -21,7 +21,7 @@ TAO::SL3::PolicyFactory::create_policy (CORBA::PolicyType type,
 
   if (type == SecurityLevel3::ContextEstablishmentPolicyType)
     {
-      SecurityLevel3::ContextEstablishmentPolicyArgument * arg;
+      SecurityLevel3::ContextEstablishmentPolicyArgument * arg = 0;
       if (!(value >>= arg))
         ACE_THROW_RETURN (CORBA::INTERNAL (),
                           policy);
@@ -39,7 +39,7 @@ TAO::SL3::PolicyFactory::create_policy (CORBA::PolicyType type,
     }
   else if (type == SecurityLevel3::ObjectCredentialsPolicyType)
     {
-      SecurityLevel3::ObjectCredentialsPolicyArgument * creds;
+      SecurityLevel3::ObjectCredentialsPolicyArgument * creds = 0;
       if (!(value >>= creds))
         ACE_THROW_RETURN (CORBA::INTERNAL (),
                           policy);
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp
index 4b041f83fd2..d39235d4340 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp
@@ -3,6 +3,7 @@
 #include "Constraint_Nodes.h"
 #include "Constraint_Visitors.h"
 
+#include "tao/AnyTypeCode/Any.h"
 #include "tao/Managed_Types.h"
 #include "ace/OS_NS_string.h"
 
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h
index 8d833bd8e8b..509d455ec03 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Interpreter_Utils.h
@@ -5,8 +5,6 @@
  * @file   Interpreter_Utils.h
  *
  * $Id$
- *
- * @author
  */
 //=============================================================================
 
@@ -18,7 +16,7 @@
 #include "ace/Hash_Map_Manager.h"
 #include "ace/Null_Mutex.h"
 
-#include "tao/TypeCode.h"
+#include "tao/AnyTypeCode/TypeCode.h"
 #include "tao/CORBA_String.h"
 #include "tao/SystemException.h"
 
@@ -26,11 +24,12 @@
 
 // =  Classes to deal with the ACE_Hash_Map_Manager.
 
+/**
+ * Key for the Hash Table. The EXT_ID of the
+ * ACE_Hash_Map_Manager.
+ */
 class TAO_Trading_Serv_Export TAO_String_Hash_Key : public CORBA::String_var
 {
-  // = TITLE
-  //     Key for the Hash Table. The EXT_ID of the
-  //     ACE_Hash_Map_Manager.
 public:
   // = Initialization and termination methods.
   TAO_String_Hash_Key (void);
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/SyncScope_Setup.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/SyncScope_Setup.cpp
index 594837f3152..b0f66d12d9e 100644
--- a/TAO/orbsvcs/performance-tests/RTEvent/lib/SyncScope_Setup.cpp
+++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/SyncScope_Setup.cpp
@@ -8,13 +8,14 @@
 
 #include "SyncScope_Setup.h"
 #include "RIR_Narrow.h"
+#include "tao/AnyTypeCode/Any.h"
 
 #if !defined(__ACE_INLINE__)
 #include "SyncScope_Setup.inl"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID (TAO_PERF_RTEC, 
-           SyncScope_Setup, 
+ACE_RCSID (TAO_PERF_RTEC,
+           SyncScope_Setup,
            "$Id$")
 
 SyncScope_Setup::SyncScope_Setup (CORBA::ORB_ptr orb,
diff --git a/TAO/orbsvcs/tests/BiDir_CORBALOC/BiDirCORBALOC.mpc b/TAO/orbsvcs/tests/BiDir_CORBALOC/BiDirCORBALOC.mpc
index f8e6671faca..1201bb99646 100644
--- a/TAO/orbsvcs/tests/BiDir_CORBALOC/BiDirCORBALOC.mpc
+++ b/TAO/orbsvcs/tests/BiDir_CORBALOC/BiDirCORBALOC.mpc
@@ -1,12 +1,9 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): namingexe, portableserver,bidir_giop, utils {
-
-  idlflags += -GA
-
+project(*Server): namingexe, portableserver, bidir_giop, utils {
   Source_Files {
-  TimeServer.cpp
+    TimeServer.cpp
   }
 }
 
diff --git a/TAO/orbsvcs/tests/BiDir_CORBALOC/TimeServer.cpp b/TAO/orbsvcs/tests/BiDir_CORBALOC/TimeServer.cpp
index efbfef8b350..23f3ff6baf8 100644
--- a/TAO/orbsvcs/tests/BiDir_CORBALOC/TimeServer.cpp
+++ b/TAO/orbsvcs/tests/BiDir_CORBALOC/TimeServer.cpp
@@ -1,10 +1,10 @@
 //$Id$
 #include "TimeModuleS.h"
 #include "tao/BiDir_GIOP/BiDirGIOP.h"
+#include "tao/AnyTypeCode/Any.h"
 #include "tao/Utils/PolicyList_Destroyer.h"
 #include "orbsvcs/CosNamingC.h"
-
-
+#include "tao/AnyTypeCode/Any.h"
 
 class Time_impl :
   public POA_TimeModule::Time
diff --git a/TAO/orbsvcs/tests/Bug_1630_Regression/test.mpc b/TAO/orbsvcs/tests/Bug_1630_Regression/test.mpc
index 463d501d9f8..bb3c6ac0488 100644
--- a/TAO/orbsvcs/tests/Bug_1630_Regression/test.mpc
+++ b/TAO/orbsvcs/tests/Bug_1630_Regression/test.mpc
@@ -1,11 +1,9 @@
 // -*- MPC -*-
 // $Id$
 
-project(Bug_1630_testclient ) : taoexe, minimum_corba, ifr_client {
+project(Bug_1630_testclient ) : taoclient, anytypecode, minimum_corba, ifr_client {
    exename = testclient
-   
-   IDL_Files {
-   }
+
    Source_Files {
       testclient.cpp
    }
diff --git a/TAO/orbsvcs/tests/Bug_1630_Regression/testclient.cpp b/TAO/orbsvcs/tests/Bug_1630_Regression/testclient.cpp
index 69d8873ce3c..a1cdd8da9e4 100644
--- a/TAO/orbsvcs/tests/Bug_1630_Regression/testclient.cpp
+++ b/TAO/orbsvcs/tests/Bug_1630_Regression/testclient.cpp
@@ -2,7 +2,7 @@
 // $Id$
 //
 
-#include "tao/NVList.h"
+#include "tao/AnyTypeCode/NVList.h"
 #include "tao/IFR_Client/IFR_BasicC.h"
 #include "tao/IFR_Client/IFR_Client_Adapter_Impl.h"
 #include "ace/OS_NS_string.h"
diff --git a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/test.idl b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/test.idl
index b286a53a1db..beadf9759da 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/test.idl
+++ b/TAO/orbsvcs/tests/FaultTolerance/GroupRef_Manipulation/test.idl
@@ -1,7 +1,7 @@
 // -*- IDL -*-
 //$Id$
 #include "tao/PortableInterceptor.pidl"
-#include "tao/PI_Server/ServerRequestInterceptor.pidl"
+#include "tao/PI_Server/PI_Server_include.pidl"
 
 module ForwardRequestTest
 {
diff --git a/TAO/orbsvcs/tests/HTIOP/BiDirectional/client.cpp b/TAO/orbsvcs/tests/HTIOP/BiDirectional/client.cpp
index 81033e925b2..a9a6dac7d63 100644
--- a/TAO/orbsvcs/tests/HTIOP/BiDirectional/client.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/BiDirectional/client.cpp
@@ -3,6 +3,7 @@
 #include "ace/Get_Opt.h"
 #include "test_i.h"
 #include "tao/BiDir_GIOP/BiDirGIOP.h"
+#include "tao/AnyTypeCode/Any.h"
 
 ACE_RCSID(BiDirectional, client, "$Id$")
 
diff --git a/TAO/orbsvcs/tests/HTIOP/BiDirectional/server.cpp b/TAO/orbsvcs/tests/HTIOP/BiDirectional/server.cpp
index b1d21dce77c..acd21da590e 100644
--- a/TAO/orbsvcs/tests/HTIOP/BiDirectional/server.cpp
+++ b/TAO/orbsvcs/tests/HTIOP/BiDirectional/server.cpp
@@ -4,6 +4,7 @@
 #include "ace/Get_Opt.h"
 #include "test_i.h"
 #include "tao/BiDir_GIOP/BiDirGIOP.h"
+#include "tao/AnyTypeCode/Any.h"
 
 ACE_RCSID(BiDirectional, server, "$Id$")
 
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp
index 1cc9275b0d3..533dbbd1ee2 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp
@@ -3,7 +3,7 @@
 
 #include "Admin_Client.h"
 
-#include "tao/Any_Unknown_IDL_Type.h"
+#include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h"
 #include "tao/CDR.h"
 
 #include "ace/Get_Opt.h"
diff --git a/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp b/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp
index 8eff006fecd..002e2bf8f0e 100644
--- a/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp
+++ b/TAO/orbsvcs/tests/Notify/Reconnecting/Consumer.cpp
@@ -6,7 +6,7 @@
 #include "tao/TimeBaseC.h"
 #include "ace/OS_NS_strings.h"
 #include "ace/OS_NS_stdio.h"
-#include "tao/Any.h"
+#include "tao/AnyTypeCode/Any.h"
 
 ACE_RCSID (Notify_Tests, Consumer_Main, "$Id$")
 
diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/client.cpp b/TAO/orbsvcs/tests/Security/BiDirectional/client.cpp
index fc46760a6b7..75faf72a213 100644
--- a/TAO/orbsvcs/tests/Security/BiDirectional/client.cpp
+++ b/TAO/orbsvcs/tests/Security/BiDirectional/client.cpp
@@ -3,6 +3,7 @@
 #include "ace/Get_Opt.h"
 #include "test_i.h"
 #include "tao/BiDir_GIOP/BiDirGIOP.h"
+#include "tao/AnyTypeCode/Any.h"
 
 #include "tao/ORB_Core.h"
 #include "tao/Transport_Cache_Manager.h"
@@ -131,17 +132,17 @@ main (int argc, char *argv[])
                                           &callback_impl
                                           ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
+
       CORBA::Object_var callback_object =
         child_poa->id_to_reference (id.in ()
                                     ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
+
       Callback_var callback =
         Callback::_narrow (callback_object.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
-      
+
+
       CORBA::String_var ior =
         orb->object_to_string (callback.in () ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
@@ -155,9 +156,9 @@ main (int argc, char *argv[])
 
       // This is a non-portable, but the only currently available way of
       // determining the number of currently open connections.
-      int pre_call_connections = 
+      int pre_call_connections =
         orb->orb_core ()->lane_resources ().transport_cache ().current_size ();
-      
+
       // A  method to kickstart callbacks from the server
       CORBA::Long r =
         server->test_method (1 ACE_ENV_ARG_PARAMETER);
@@ -175,9 +176,9 @@ main (int argc, char *argv[])
 
       // This is a non-portable, but the only currently available way of
       // determining the number of currently open connections.
-      int cur_connections = 
+      int cur_connections =
         orb->orb_core()->lane_resources().transport_cache().current_size ();
-      
+
       if (cur_connections > pre_call_connections)
         {
           ACE_ERROR ((LM_ERROR,
diff --git a/TAO/orbsvcs/tests/Security/BiDirectional/server.cpp b/TAO/orbsvcs/tests/Security/BiDirectional/server.cpp
index 741f4001635..44ddec21390 100644
--- a/TAO/orbsvcs/tests/Security/BiDirectional/server.cpp
+++ b/TAO/orbsvcs/tests/Security/BiDirectional/server.cpp
@@ -4,6 +4,7 @@
 #include "ace/OS_NS_stdio.h"
 #include "test_i.h"
 #include "tao/BiDir_GIOP/BiDirGIOP.h"
+#include "tao/AnyTypeCode/Any.h"
 
 ACE_RCSID(BiDirectional, server, "$Id$")
 
diff --git a/TAO/orbsvcs/tests/Security/Big_Request/Big_Request.mpc b/TAO/orbsvcs/tests/Security/Big_Request/Big_Request.mpc
index 8b80e1dc40c..a8adf63cf92 100644
--- a/TAO/orbsvcs/tests/Security/Big_Request/Big_Request.mpc
+++ b/TAO/orbsvcs/tests/Security/Big_Request/Big_Request.mpc
@@ -1,17 +1,17 @@
 // -*- MPC -*-
 // $Id$
 
-project(*security server): taoexe, portableserver, ssl {
+project(*security client): taoclient, anytypecode, ssl {
   Source_Files {
-    TX_Object_i.cpp
-    server.cpp
+    TX_ObjectC.cpp
+    client.cpp
   }
 }
 
-project(*security client): taoexe, ssl {
+project(*security server): taoserver, ssl {
   Source_Files {
-    TX_ObjectC.cpp
-    client.cpp
+    TX_Object_i.cpp
+    server.cpp
   }
 }
 
diff --git a/TAO/performance-tests/Anyop/Anyop.mpc b/TAO/performance-tests/Anyop/Anyop.mpc
index 8aa28b23573..9a936c24fcc 100644
--- a/TAO/performance-tests/Anyop/Anyop.mpc
+++ b/TAO/performance-tests/Anyop/Anyop.mpc
@@ -1,5 +1,5 @@
 // $Id$
-project: taoexe {
+project: taoexe, anytypecode {
   Source_Files {
     testC.cpp
     anyop.cpp
diff --git a/TAO/performance-tests/Anyop/anyop.cpp b/TAO/performance-tests/Anyop/anyop.cpp
index 34438f7ac8d..3777b0ed92e 100644
--- a/TAO/performance-tests/Anyop/anyop.cpp
+++ b/TAO/performance-tests/Anyop/anyop.cpp
@@ -20,7 +20,7 @@
 
 #include "testC.h"
 #include "tao/debug.h"
-#include "tao/Any.h"
+#include "tao/AnyTypeCode/Any.h"
 #include "tao/Stub.h"
 #include "tao/Object_T.h"
 #include "ace/Get_Opt.h"
diff --git a/TAO/performance-tests/Callback/client.cpp b/TAO/performance-tests/Callback/client.cpp
index 9a4fd95412e..a6270abd3a6 100644
--- a/TAO/performance-tests/Callback/client.cpp
+++ b/TAO/performance-tests/Callback/client.cpp
@@ -5,6 +5,7 @@
 #include "tao/Messaging/Messaging.h"
 #include "tao/PortableServer/PortableServer.h"
 #include "tao/Strategies/advanced_resource.h"
+#include "tao/AnyTypeCode/Any.h"
 #include "ace/High_Res_Timer.h"
 #include "ace/Get_Opt.h"
 #include "ace/Basic_Stats.h"
diff --git a/TAO/performance-tests/Callback/server.cpp b/TAO/performance-tests/Callback/server.cpp
index f36c48039ec..81ae5c39bd0 100644
--- a/TAO/performance-tests/Callback/server.cpp
+++ b/TAO/performance-tests/Callback/server.cpp
@@ -4,6 +4,7 @@
 
 #include "tao/Messaging/Messaging.h"
 #include "tao/Strategies/advanced_resource.h"
+#include "tao/AnyTypeCode/Any.h"
 #include "ace/Get_Opt.h"
 #include "ace/Sched_Params.h"
 #include "ace/OS_NS_errno.h"
diff --git a/TAO/performance-tests/Cubit/TAO/DII_Cubit/client.cpp b/TAO/performance-tests/Cubit/TAO/DII_Cubit/client.cpp
index d78f85faa1e..7ae2dd9e07d 100644
--- a/TAO/performance-tests/Cubit/TAO/DII_Cubit/client.cpp
+++ b/TAO/performance-tests/Cubit/TAO/DII_Cubit/client.cpp
@@ -20,7 +20,7 @@
 
 #include "tao/DynamicInterface/Request.h"
 #include "tao/debug.h"
-#include "tao/TC_Constants_Forward.h"
+#include "tao/AnyTypeCode/TC_Constants_Forward.h"
 #include "ace/Profile_Timer.h"
 #include "ace/Get_Opt.h"
 #include "ace/Read_Buffer.h"
diff --git a/TAO/performance-tests/Latency/DII/client.cpp b/TAO/performance-tests/Latency/DII/client.cpp
index b39b498f2eb..91123684512 100644
--- a/TAO/performance-tests/Latency/DII/client.cpp
+++ b/TAO/performance-tests/Latency/DII/client.cpp
@@ -2,7 +2,7 @@
 
 #include "tao/DynamicInterface/Request.h"
 #include "tao/Strategies/advanced_resource.h"
-#include "tao/TC_Constants_Forward.h"
+#include "tao/AnyTypeCode/TC_Constants_Forward.h"
 
 #include "ace/Get_Opt.h"
 #include "ace/High_Res_Timer.h"
diff --git a/TAO/performance-tests/Latency/DSI/Roundtrip.cpp b/TAO/performance-tests/Latency/DSI/Roundtrip.cpp
index 376da69c473..d822a3588e0 100644
--- a/TAO/performance-tests/Latency/DSI/Roundtrip.cpp
+++ b/TAO/performance-tests/Latency/DSI/Roundtrip.cpp
@@ -2,8 +2,9 @@
 // $Id$
 //
 #include "Roundtrip.h"
-#include "tao/TC_Constants_Forward.h"
-#include "tao/NVList.h"
+#include "tao/AnyTypeCode/TC_Constants_Forward.h"
+#include "tao/AnyTypeCode/NVList.h"
+#include "tao/AnyTypeCode/SystemExceptionA.h"
 #include "tao/DynamicInterface/Server_Request.h"
 
 ACE_RCSID(Single_Threaded_Latency, Roundtrip, "$Id$")
diff --git a/TAO/performance-tests/Latency/Deferred/client.cpp b/TAO/performance-tests/Latency/Deferred/client.cpp
index 0c460f23409..7d47a4b831b 100644
--- a/TAO/performance-tests/Latency/Deferred/client.cpp
+++ b/TAO/performance-tests/Latency/Deferred/client.cpp
@@ -5,7 +5,7 @@
 
 #include "TestC.h"
 
-#include "tao/TC_Constants_Forward.h"
+#include "tao/AnyTypeCode/TC_Constants_Forward.h"
 
 #include "tao/Strategies/advanced_resource.h"
 
diff --git a/TAO/performance-tests/RTCorba/Oneways/Reliable/client.cpp b/TAO/performance-tests/RTCorba/Oneways/Reliable/client.cpp
index 6ff62b839ee..f09a8e1343b 100644
--- a/TAO/performance-tests/RTCorba/Oneways/Reliable/client.cpp
+++ b/TAO/performance-tests/RTCorba/Oneways/Reliable/client.cpp
@@ -3,6 +3,8 @@
 #include "testC.h"
 
 #include "tao/Messaging/Messaging.h"
+#include "tao/AnyTypeCode/TAOA.h"
+#include "tao/AnyTypeCode/Any.h"
 #include "tao/TAOC.h"
 #include "ace/Get_Opt.h"
 #include "ace/Sched_Params.h"
diff --git a/TAO/performance-tests/Sequence_Latency/DII/client.cpp b/TAO/performance-tests/Sequence_Latency/DII/client.cpp
index 54f395c4393..fb70ff52021 100644
--- a/TAO/performance-tests/Sequence_Latency/DII/client.cpp
+++ b/TAO/performance-tests/Sequence_Latency/DII/client.cpp
@@ -2,7 +2,7 @@
 
 #include "tao/DynamicInterface/Request.h"
 #include "tao/Strategies/advanced_resource.h"
-#include "tao/TC_Constants_Forward.h"
+#include "tao/AnyTypeCode/TC_Constants_Forward.h"
 
 #include "TestC.h"
 
diff --git a/TAO/performance-tests/Sequence_Latency/DSI/Roundtrip.cpp b/TAO/performance-tests/Sequence_Latency/DSI/Roundtrip.cpp
index 4c602ae06f4..860c6a9f410 100644
--- a/TAO/performance-tests/Sequence_Latency/DSI/Roundtrip.cpp
+++ b/TAO/performance-tests/Sequence_Latency/DSI/Roundtrip.cpp
@@ -3,8 +3,9 @@
 //
 
 #include "TestC.h"
-#include "tao/TC_Constants_Forward.h"
-#include "tao/NVList.h"
+#include "tao/AnyTypeCode/TC_Constants_Forward.h"
+#include "tao/AnyTypeCode/NVList.h"
+#include "tao/AnyTypeCode/SystemExceptionA.h"
 #include "Roundtrip.h"
 #include "tao/DynamicInterface/Server_Request.h"
 
@@ -68,14 +69,14 @@ Roundtrip::invoke (CORBA::ServerRequest_ptr request
       CORBA::NVList_ptr list;
       this->orb_->create_list (0, list ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
-		
+
 		  // Set up the argument list
 
 	    CORBA::Any octet_load;
       octet_load._tao_set_typecode (Test::_tc_octet_load);
 	    list->add_value ("octet_load", octet_load, CORBA::ARG_IN
 					     ACE_ENV_ARG_PARAMETER);
-		  
+
 	    CORBA::Any send_time;
       send_time._tao_set_typecode (CORBA::_tc_ulonglong);
       list->add_value ("send_time", send_time, CORBA::ARG_IN
@@ -101,7 +102,7 @@ Roundtrip::invoke (CORBA::ServerRequest_ptr request
       CORBA::NVList_ptr list;
       this->orb_->create_list (0, list ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
-		
+
 		  // Set up the argument list
 
 	    CORBA::Any long_load;
@@ -109,7 +110,7 @@ Roundtrip::invoke (CORBA::ServerRequest_ptr request
 	    list->add_value ("long_load", long_load, CORBA::ARG_IN
 					     ACE_ENV_ARG_PARAMETER);
         ACE_CHECK;
-		  
+
 	    CORBA::Any send_time;
       send_time._tao_set_typecode (CORBA::_tc_ulonglong);
       list->add_value ("send_time", send_time, CORBA::ARG_IN
@@ -135,7 +136,7 @@ Roundtrip::invoke (CORBA::ServerRequest_ptr request
       CORBA::NVList_ptr list;
       this->orb_->create_list (0, list ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
-		
+
 		  // Set up the argument list
 
 	    CORBA::Any short_load;
@@ -143,7 +144,7 @@ Roundtrip::invoke (CORBA::ServerRequest_ptr request
 	    list->add_value ("short_load", short_load, CORBA::ARG_IN
 					     ACE_ENV_ARG_PARAMETER);
         ACE_CHECK;
-		  
+
 	    CORBA::Any send_time;
       send_time._tao_set_typecode (CORBA::_tc_ulonglong);
       list->add_value ("send_time", send_time, CORBA::ARG_IN
@@ -169,7 +170,7 @@ Roundtrip::invoke (CORBA::ServerRequest_ptr request
       CORBA::NVList_ptr list;
       this->orb_->create_list (0, list ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
-		
+
 		  // Set up the argument list
 
 	    CORBA::Any char_load;
@@ -177,7 +178,7 @@ Roundtrip::invoke (CORBA::ServerRequest_ptr request
 	    list->add_value ("char_load", char_load, CORBA::ARG_IN
 					     ACE_ENV_ARG_PARAMETER);
         ACE_CHECK;
-		  
+
 	    CORBA::Any send_time;
       send_time._tao_set_typecode (CORBA::_tc_ulonglong);
       list->add_value ("send_time", send_time, CORBA::ARG_IN
diff --git a/TAO/performance-tests/Sequence_Latency/Deferred/client.cpp b/TAO/performance-tests/Sequence_Latency/Deferred/client.cpp
index 2cdb7d6c261..5296a210893 100644
--- a/TAO/performance-tests/Sequence_Latency/Deferred/client.cpp
+++ b/TAO/performance-tests/Sequence_Latency/Deferred/client.cpp
@@ -6,7 +6,7 @@
 #include "TestC.h"
 
 #include "tao/Strategies/advanced_resource.h"
-#include "tao/TC_Constants_Forward.h"
+#include "tao/AnyTypeCode/TC_Constants_Forward.h"
 
 #include "ace/Get_Opt.h"
 #include "ace/Sched_Params.h"
diff --git a/TAO/tao/Alias_TypeCode.cpp b/TAO/tao/Alias_TypeCode.cpp
deleted file mode 100644
index 1968f944047..00000000000
--- a/TAO/tao/Alias_TypeCode.cpp
+++ /dev/null
@@ -1,201 +0,0 @@
-// $Id$
-
-#ifndef TAO_ALIAS_TYPECODE_CPP
-#define TAO_ALIAS_TYPECODE_CPP
-
-#include "tao/Alias_TypeCode.h"
-
-#ifndef __ACE_INLINE__
-# include "tao/Alias_TypeCode.inl"
-#endif  /* !__ACE_INLINE__ */
-
-#include "tao/ORB_Core.h"
-#include "tao/CDR.h"
-#include "tao/TypeCode_Traits.h"
-
-#include "ace/Dynamic_Service.h"
-
-
-template <typename StringType,
-          typename TypeCodeType,
-          class RefCountPolicy>
-bool
-TAO::TypeCode::Alias<StringType,
-                     TypeCodeType,
-                     RefCountPolicy>::tao_marshal (TAO_OutputCDR & cdr,
-                                                   CORBA::ULong offset) const
-{
-  // A tk_alias TypeCode has a "complex" parameter list type (see
-  // Table 15-2 in Section 15.3.5.1 "TypeCode" in the CDR section of
-  // the CORBA specification), meaning that it must be marshaled into
-  // a CDR encapsulation.
-
-  // Create a CDR encapsulation.
-
-  TAO_OutputCDR enc;
-
-  // Account for the encoded CDR encapsulation length and byte order.
-  //
-  // Aligning on an octet since the next value after the CDR
-  // encapsulation length will always be the byte order octet/boolean
-  // in this case.
-  offset = ACE_align_binary (offset + 4,
-                             ACE_CDR::OCTET_ALIGN);
-
-  return
-    enc << TAO_OutputCDR::from_boolean (TAO_ENCAP_BYTE_ORDER)
-    && enc << TAO_OutputCDR::from_string (this->attributes_.id (), 0)
-    && enc << TAO_OutputCDR::from_string (this->attributes_.name (), 0)
-    && marshal (enc,
-                Traits<StringType>::get_typecode (this->content_type_),
-                offset + enc.total_length ())
-    && cdr << static_cast<CORBA::ULong> (enc.total_length ())
-    && cdr.write_octet_array_mb (enc.begin ());
-}
-
-template<typename StringType,
-         typename TypeCodeType,
-         class RefCountPolicy>
-void
-TAO::TypeCode::Alias<StringType,
-                     TypeCodeType,
-                     RefCountPolicy>::tao_duplicate (void)
-{
-  this->RefCountPolicy::add_ref ();
-}
-
-template<typename StringType,
-         typename TypeCodeType,
-         class RefCountPolicy>
-void
-TAO::TypeCode::Alias<StringType,
-                     TypeCodeType,
-                     RefCountPolicy>::tao_release (void)
-{
-  this->RefCountPolicy::remove_ref ();
-}
-
-template<typename StringType,
-         typename TypeCodeType,
-         class RefCountPolicy>
-CORBA::Boolean
-TAO::TypeCode::Alias<StringType,
-                     TypeCodeType,
-                     RefCountPolicy>::equal_i (CORBA::TypeCode_ptr tc
-                                               ACE_ENV_ARG_DECL) const
-{
-  // The CORBA::TypeCode base class already verified equality of the
-  // base attributes (id and name).  Perform an equality comparison of
-  // the content.
-
-  CORBA::TypeCode_var rhs_content_type =
-    tc->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  return
-    Traits<StringType>::get_typecode (this->content_type_)->equal (
-      rhs_content_type.in ()
-      ACE_ENV_ARG_PARAMETER);
-}
-
-template<typename StringType,
-         typename TypeCodeType,
-         class RefCountPolicy>
-CORBA::Boolean
-TAO::TypeCode::Alias<StringType,
-                     TypeCodeType,
-                     RefCountPolicy>::equivalent_i (
-  CORBA::TypeCode_ptr
-  ACE_ENV_ARG_DECL_NOT_USED) const
-{
-  // Equivalence already verified in the base class
-  // CORBA::TypeCode::equivalent() method.
-
-  return true;
-}
-
-template<typename StringType,
-         typename TypeCodeType,
-         class RefCountPolicy>
-CORBA::TypeCode_ptr
-TAO::TypeCode::Alias<StringType,
-                     TypeCodeType,
-                     RefCountPolicy>::get_compact_typecode_i (
-  ACE_ENV_SINGLE_ARG_DECL) const
-{
-  TAO_TypeCodeFactory_Adapter * const adapter =
-    ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
-        TAO_ORB_Core::typecodefactory_adapter_name ()
-      );
-
-  if (adapter == 0)
-    {
-      ACE_THROW_RETURN (CORBA::INITIALIZE (),
-                        CORBA::TypeCode::_nil ());
-    }
-
-  CORBA::TypeCode_var compact_content_type =
-    Traits<StringType>::get_typecode (
-      this->content_type_)->get_compact_typecode (
-        ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
-
-  if (this->kind_ == CORBA::tk_alias)
-    {
-      return adapter->create_alias_tc (this->attributes_.id (),
-                                       "",  /* empty name */
-                                       compact_content_type.in ()
-                                       ACE_ENV_ARG_PARAMETER);
-    }
-  else
-    {
-      return adapter->create_value_box_tc (this->attributes_.id (),
-                                           "",  /* empty name */
-                                           compact_content_type.in ()
-                                           ACE_ENV_ARG_PARAMETER);
-    }
-}
-
-template<typename StringType,
-         typename TypeCodeType,
-         class RefCountPolicy>
-char const *
-TAO::TypeCode::Alias<StringType,
-                     TypeCodeType,
-                     RefCountPolicy>::id_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  // Ownership is retained by the TypeCode, as required by the C++
-  // mapping.
-  return this->attributes_.id ();
-}
-
-template<typename StringType,
-         typename TypeCodeType,
-         class RefCountPolicy>
-char const *
-TAO::TypeCode::Alias<StringType,
-                     TypeCodeType,
-                     RefCountPolicy>::name_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  // Ownership is retained by the TypeCode, as required by the C++
-  // mapping.
-  return this->attributes_.name ();
-}
-
-template<typename StringType,
-         typename TypeCodeType,
-         class RefCountPolicy>
-CORBA::TypeCode_ptr
-TAO::TypeCode::Alias<StringType,
-                     TypeCodeType,
-                     RefCountPolicy>::content_type_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  return
-     CORBA::TypeCode::_duplicate (
-       Traits<StringType>::get_typecode (this->content_type_));
-}
-
-#endif  /*  TAO_ALIAS_TYPECODE_CPP */
diff --git a/TAO/tao/Alias_TypeCode.h b/TAO/tao/Alias_TypeCode.h
deleted file mode 100644
index db2a74f3827..00000000000
--- a/TAO/tao/Alias_TypeCode.h
+++ /dev/null
@@ -1,141 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Alias_TypeCode.h
- *
- *  $Id$
- *
- *  Header file for a @c tk_alias and @c tk_value_box
- *  @c CORBA::TypeCode.
- *
- *  @author Ossama Othman <ossama@dre.vanderbilt.edu>
- */
-//=============================================================================
-
-#ifndef TAO_ALIAS_TYPECODE_H
-#define TAO_ALIAS_TYPECODE_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/TypeCode.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TypeCodeFactory_Adapter.h"
-#include "tao/TypeCode_Base_Attributes.h"
-
-
-namespace TAO
-{
-  namespace TypeCode
-  {
-    /**
-     * @class Alias
-     *
-     * @brief @c CORBA::TypeCode implementation for an OMG IDL
-     *        @c typedef.
-     *
-     * This class implements a @c CORBA::TypeCode for an OMG IDL
-     * @c typedef.
-     */
-    template <typename StringType,
-              typename TypeCodeType,
-              class RefCountPolicy>
-    class Alias
-      : public CORBA::TypeCode,
-        private RefCountPolicy
-    {
-    public:
-
-      /// Constructor.
-      Alias (CORBA::TCKind kind,
-             char const * id,
-             char const * name,
-#if defined (__BORLANDC__) && (__BORLANDC__ < 0x572)
-             // Borland C++ currently can't handle a reference to
-             // const pointer to const CORBA::TypeCode_ptr
-             TypeCodeType tc);
-#else
-             TypeCodeType const & tc);
-#endif
-
-      /**
-       * @name TAO-specific @c CORBA::TypeCode Methods
-       *
-       * Methods required by TAO's implementation of the
-       * @c CORBA::TypeCode class.
-       *
-       * @see @c CORBA::TypeCode
-       */
-      //@{
-      virtual bool tao_marshal (TAO_OutputCDR & cdr,
-                                CORBA::ULong offset) const;
-      virtual void tao_duplicate (void);
-      virtual void tao_release (void);
-      //@}
-
-    protected:
-
-      /**
-       * @name @c TAO CORBA::TypeCode Template Methods
-       *
-       * @c tk_alias and @c tk_value_box @c CORBA::TypeCode -specific
-       * template methods.
-       *
-       * @see @c CORBA::TypeCode
-       */
-      //@{
-      virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc
-                                      ACE_ENV_ARG_DECL) const;
-      virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc
-                                           ACE_ENV_ARG_DECL) const;
-      virtual CORBA::TypeCode_ptr get_compact_typecode_i (
-        ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual char const * id_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual char const * name_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual CORBA::TypeCode_ptr content_type_i (ACE_ENV_SINGLE_ARG_DECL) const;
-
-    private:
-
-      /// Base attributes for this @c TypeCode containing the
-      /// repository ID and name of the @c typedef.
-      Base_Attributes<StringType> attributes_;
-
-      /// The @c TypeCode corresponding to the original type upon
-      /// which the IDL @c typedef was made.
-      /**
-       * A pointer to the @c CORBA::TypeCode_ptr rather than the
-       * @c CORBA::TypeCode_ptr itself is stored since that address is
-       * well-defined.  We may not know the value of the @c
-       * CORBA::TypeCode_ptr when creating this @c Field statically at
-       * compile-time, hence the indirection.
-       *
-       * @note This @c TypeCode is released upon destruction of this
-       *       @c TypeCode::Alias.
-       */
-      TypeCodeType const content_type_;
-
-    };
-
-  }  // End namespace TypeCode
-}  // End namespace TAO
-
-
-#ifdef __ACE_INLINE__
-# include "tao/Alias_TypeCode.inl"
-#endif  /* __ACE_INLINE__ */
-
-#ifdef ACE_TEMPLATES_REQUIRE_SOURCE
-# include "tao/Alias_TypeCode.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#ifdef ACE_TEMPLATES_REQUIRE_PRAGMA
-# pragma implementation ("Alias_TypeCode.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_ALIAS_TYPECODE_H */
diff --git a/TAO/tao/Alias_TypeCode.inl b/TAO/tao/Alias_TypeCode.inl
deleted file mode 100644
index fb692130538..00000000000
--- a/TAO/tao/Alias_TypeCode.inl
+++ /dev/null
@@ -1,28 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-
-template<typename StringType,
-         typename TypeCodeType,
-         class RefCountPolicy>
-ACE_INLINE
-TAO::TypeCode::Alias<StringType,
-                     TypeCodeType,
-                     RefCountPolicy>::Alias (
-  CORBA::TCKind kind,
-  char const * id,
-  char const * name,
-#if defined (__BORLANDC__) && (__BORLANDC__ < 0x572)
-  // Borland C++ currently can't handle a reference to
-  // const pointer to const CORBA::TypeCode_ptr
-  TypeCodeType tc)
-#else
-  TypeCodeType const & tc)
-#endif
-  : CORBA::TypeCode (kind)
-  , RefCountPolicy ()
-  , attributes_ (id, name)
-  , content_type_ (tc)
-{
-}
diff --git a/TAO/tao/Alias_TypeCode_Static.cpp b/TAO/tao/Alias_TypeCode_Static.cpp
deleted file mode 100644
index 1c6e43bbe5f..00000000000
--- a/TAO/tao/Alias_TypeCode_Static.cpp
+++ /dev/null
@@ -1,174 +0,0 @@
-// $Id$
-
-#include "tao/Alias_TypeCode_Static.h"
-
-#ifndef __ACE_INLINE__
-# include "tao/Alias_TypeCode_Static.inl"
-#endif  /* !__ACE_INLINE__ */
-
-#include "tao/ORB_Core.h"
-#include "tao/CDR.h"
-#include "tao/TypeCode_Traits.h"
-#include "tao/TypeCodeFactory_Adapter.h"
-
-#include "ace/Dynamic_Service.h"
-
-
-ACE_RCSID (tao,
-           Alias_TypeCode_Static,
-           "$Id$")
-
-
-bool
-TAO::TypeCode::Alias<char const *,
-                     CORBA::TypeCode_ptr const *,
-                     TAO::Null_RefCount_Policy>::tao_marshal (
-  TAO_OutputCDR & cdr,
-  CORBA::ULong offset) const
-{
-  // A tk_alias TypeCode has a "complex" parameter list type (see
-  // Table 15-2 in Section 15.3.5.1 "TypeCode" in the CDR section of
-  // the CORBA specification), meaning that it must be marshaled into
-  // a CDR encapsulation.
-
-  // Create a CDR encapsulation.
-
-  TAO_OutputCDR enc;
-
-  // Account for the encoded CDR encapsulation length and byte order.
-  //
-  // Aligning on an octet since the next value after the CDR
-  // encapsulation length will always be the byte order octet/boolean
-  // in this case.
-  offset = ACE_align_binary (offset + 4,
-                             ACE_CDR::OCTET_ALIGN);
-
-  return
-    enc << TAO_OutputCDR::from_boolean (TAO_ENCAP_BYTE_ORDER)
-    && enc << TAO_OutputCDR::from_string (this->attributes_.id (), 0)
-    && enc << TAO_OutputCDR::from_string (this->attributes_.name (), 0)
-    && marshal (enc,
-                Traits<char const *>::get_typecode (this->content_type_),
-                offset + enc.total_length ())
-    && cdr << static_cast<CORBA::ULong> (enc.total_length ())
-    && cdr.write_octet_array_mb (enc.begin ());
-}
-
-void
-TAO::TypeCode::Alias<char const *,
-                     CORBA::TypeCode_ptr const *,
-                     TAO::Null_RefCount_Policy>::tao_duplicate (void)
-{
-}
-
-void
-TAO::TypeCode::Alias<char const *,
-                     CORBA::TypeCode_ptr const *,
-                     TAO::Null_RefCount_Policy>::tao_release (void)
-{
-}
-
-CORBA::Boolean
-TAO::TypeCode::Alias<char const *,
-                     CORBA::TypeCode_ptr const *,
-                     TAO::Null_RefCount_Policy>::equal_i (CORBA::TypeCode_ptr tc
-                                               ACE_ENV_ARG_DECL) const
-{
-  // The CORBA::TypeCode base class already verified equality of the
-  // base attributes (id and name).  Perform an equality comparison of
-  // the content.
-
-  CORBA::TypeCode_var rhs_content_type =
-    tc->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  return
-    Traits<char const *>::get_typecode (this->content_type_)->equal (
-      rhs_content_type.in ()
-      ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Boolean
-TAO::TypeCode::Alias<char const *,
-                     CORBA::TypeCode_ptr const *,
-                     TAO::Null_RefCount_Policy>::equivalent_i (
-  CORBA::TypeCode_ptr
-  ACE_ENV_ARG_DECL_NOT_USED) const
-{
-  // Equivalence already verified in the base class
-  // CORBA::TypeCode::equivalent() method.
-
-  return true;
-}
-
-CORBA::TypeCode_ptr
-TAO::TypeCode::Alias<char const *,
-                     CORBA::TypeCode_ptr const *,
-                     TAO::Null_RefCount_Policy>::get_compact_typecode_i (
-  ACE_ENV_SINGLE_ARG_DECL) const
-{
-  TAO_TypeCodeFactory_Adapter * const adapter =
-    ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
-        TAO_ORB_Core::typecodefactory_adapter_name ()
-      );
-
-  if (adapter == 0)
-    {
-      ACE_THROW_RETURN (CORBA::INITIALIZE (),
-                        CORBA::TypeCode::_nil ());
-    }
-
-  CORBA::TypeCode_var compact_content_type =
-    Traits<char const *>::get_typecode (
-      this->content_type_)->get_compact_typecode (
-        ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
-
-  if (this->kind_ == CORBA::tk_alias)
-    {
-      return adapter->create_alias_tc (this->attributes_.id (),
-                                       "",  /* empty name */
-                                       compact_content_type.in ()
-                                       ACE_ENV_ARG_PARAMETER);
-    }
-  else
-    {
-      return adapter->create_value_box_tc (this->attributes_.id (),
-                                           "",  /* empty name */
-                                           compact_content_type.in ()
-                                           ACE_ENV_ARG_PARAMETER);
-    }
-}
-
-char const *
-TAO::TypeCode::Alias<char const *,
-                     CORBA::TypeCode_ptr const *,
-                     TAO::Null_RefCount_Policy>::id_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  // Ownership is retained by the TypeCode, as required by the C++
-  // mapping.
-  return this->attributes_.id ();
-}
-
-char const *
-TAO::TypeCode::Alias<char const *,
-                     CORBA::TypeCode_ptr const *,
-                     TAO::Null_RefCount_Policy>::name_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  // Ownership is retained by the TypeCode, as required by the C++
-  // mapping.
-  return this->attributes_.name ();
-}
-
-CORBA::TypeCode_ptr
-TAO::TypeCode::Alias<char const *,
-                     CORBA::TypeCode_ptr const *,
-                     TAO::Null_RefCount_Policy>::content_type_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  return
-     CORBA::TypeCode::_duplicate (
-       Traits<char const *>::get_typecode (this->content_type_));
-}
diff --git a/TAO/tao/Alias_TypeCode_Static.h b/TAO/tao/Alias_TypeCode_Static.h
deleted file mode 100644
index 8f933096297..00000000000
--- a/TAO/tao/Alias_TypeCode_Static.h
+++ /dev/null
@@ -1,131 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Alias_TypeCode_Static.h
- *
- *  $Id$
- *
- *  Header file for a static @c tk_alias and @c tk_value_box
- *  @c CORBA::TypeCode.
- *
- *  @author Ossama Othman <ossama@dre.vanderbilt.edu>
- */
-//=============================================================================
-
-#ifndef TAO_ALIAS_TYPECODE_STATIC_H
-#define TAO_ALIAS_TYPECODE_STATIC_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/TypeCode.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TypeCode_Base_Attributes.h"
-#include "tao/Null_RefCount_Policy.h"
-
-
-namespace TAO
-{
-  namespace TypeCode
-  {
-    template <typename StringType,
-              typename TypeCodeType,
-              class RefCountPolicy> class Alias;
-
-    /**
-     * @class Alias
-     *
-     * @brief @c CORBA::TypeCode implementation for an OMG IDL
-     *        @c typedef.
-     *
-     * This class implements a @c CORBA::TypeCode for an OMG IDL
-     * @c typedef.
-     */
-    template<>
-    class TAO_Export Alias<char const *,
-                           CORBA::TypeCode_ptr const *,
-                           TAO::Null_RefCount_Policy>
-      : public CORBA::TypeCode,
-        private TAO::Null_RefCount_Policy
-    {
-    public:
-
-      /// Constructor.
-      Alias (CORBA::TCKind kind,
-             char const * id,
-             char const * name,
-             CORBA::TypeCode_ptr const * tc);
-
-      /**
-       * @name TAO-specific @c CORBA::TypeCode Methods
-       *
-       * Methods required by TAO's implementation of the
-       * @c CORBA::TypeCode class.
-       *
-       * @see @c CORBA::TypeCode
-       */
-      //@{
-      virtual bool tao_marshal (TAO_OutputCDR & cdr,
-                                CORBA::ULong offset) const;
-      virtual void tao_duplicate (void);
-      virtual void tao_release (void);
-      //@}
-
-    protected:
-
-      /**
-       * @name @c TAO CORBA::TypeCode Template Methods
-       *
-       * @c tk_alias and @c tk_value_box @c CORBA::TypeCode -specific
-       * template methods.
-       *
-       * @see @c CORBA::TypeCode
-       */
-      //@{
-      virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc
-                                      ACE_ENV_ARG_DECL) const;
-      virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc
-                                           ACE_ENV_ARG_DECL) const;
-      virtual CORBA::TypeCode_ptr get_compact_typecode_i (
-        ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual char const * id_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual char const * name_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual CORBA::TypeCode_ptr content_type_i (ACE_ENV_SINGLE_ARG_DECL) const;
-
-    private:
-
-      /// Base attributes for this @c TypeCode containing the
-      /// repository ID and name of the @c typedef.
-      Base_Attributes<char const *> attributes_;
-
-      /// The @c TypeCode corresponding to the original type upon
-      /// which the IDL @c typedef was made.
-      /**
-       * A pointer to the @c CORBA::TypeCode_ptr rather than the
-       * @c CORBA::TypeCode_ptr itself is stored since that address is
-       * well-defined.  We may not know the value of the @c
-       * CORBA::TypeCode_ptr when creating this @c Field statically at
-       * compile-time, hence the indirection.
-       *
-       * @note This @c TypeCode is released upon destruction of this
-       *       @c TypeCode::Alias.
-       */
-      CORBA::TypeCode_ptr const * content_type_;
-
-    };
-
-  }  // End namespace TypeCode
-}  // End namespace TAO
-
-
-#ifdef __ACE_INLINE__
-# include "tao/Alias_TypeCode_Static.inl"
-#endif  /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_ALIAS_TYPECODE_STATIC_H */
diff --git a/TAO/tao/Alias_TypeCode_Static.inl b/TAO/tao/Alias_TypeCode_Static.inl
deleted file mode 100644
index a2665f5e461..00000000000
--- a/TAO/tao/Alias_TypeCode_Static.inl
+++ /dev/null
@@ -1,18 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-ACE_INLINE
-TAO::TypeCode::Alias<char const *,
-                     CORBA::TypeCode_ptr const *,
-                     TAO::Null_RefCount_Policy>::Alias (
-  CORBA::TCKind kind,
-  char const * id,
-  char const * name,
-  CORBA::TypeCode_ptr const * tc)
-  : CORBA::TypeCode (kind)
-  , ACE_NESTED_CLASS (TAO, Null_RefCount_Policy) ()
-  , attributes_ (id, name)
-  , content_type_ (tc)
-{
-}
diff --git a/TAO/tao/Any.cpp b/TAO/tao/Any.cpp
deleted file mode 100644
index f2b95db1eb7..00000000000
--- a/TAO/tao/Any.cpp
+++ /dev/null
@@ -1,887 +0,0 @@
-// $Id$
-
-#include "tao/Any.h"
-#include "tao/Any_Basic_Impl.h"
-#include "tao/Any_Impl_T.h"
-#include "tao/Any_Special_Impl_T.h"
-#include "tao/Any_Dual_Impl_T.h"
-#include "tao/Any_Unknown_IDL_Type.h"
-#include "tao/Object.h"
-#include "tao/TypeCode.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/SystemException.h"
-#include "tao/CDR.h"
-
-#include "ace/Log_Msg.h"
-#include "ace/OS_NS_string.h"
-#include "ace/OS_NS_wchar.h"
-#include "ace/OS_Memory.h"
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) \
-    || defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#include "Var_Size_Argument_T.h"
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-#if !defined (__ACE_INLINE__)
-# include "tao/Any.i"
-#endif /* ! __ACE_INLINE__ */
-
-ACE_RCSID (tao,
-           Any,
-           "$Id$")
-
-using namespace TAO;
-
-CORBA::Any::Any (void)
-  : impl_ (0)
-{
-}
-
-CORBA::Any::Any (const CORBA::Any &rhs)
-  : impl_ (rhs.impl_)
-{
-  if (this->impl_ != 0)
-    {
-      this->impl_->_add_ref ();
-    }
-}
-
-CORBA::Any::~Any (void)
-{
-  if (this->impl_ != 0)
-    {
-      this->impl_->_remove_ref ();
-    }
-}
-
-CORBA::Any &
-CORBA::Any::operator= (const CORBA::Any &rhs)
-{
-  if (this->impl_ != rhs.impl_)
-    {
-      if (this->impl_ != 0)
-        {
-          this->impl_->_remove_ref ();
-        }
-
-      this->impl_ = rhs.impl_;
-
-      if (this->impl_ != 0)
-        {
-          this->impl_->_add_ref ();
-        }
-    }
-
-  return *this;
-}
-
-void
-CORBA::Any::replace (TAO::Any_Impl *new_impl)
-{
-  ACE_ASSERT (new_impl != 0);
-
-  if (this->impl_ != 0)
-    {
-      this->impl_->_remove_ref ();
-    }
-
-  this->impl_ = new_impl;
-}
-
-CORBA::TypeCode_ptr
-CORBA::Any::type (void) const
-{
-  if (this->impl_ != 0)
-    {
-      return this->impl_->type ();
-    }
-
-  return CORBA::TypeCode::_duplicate (CORBA::_tc_null);
-}
-
-CORBA::TypeCode_ptr
-CORBA::Any::_tao_get_typecode (void) const
-{
-  if (this->impl_ != 0)
-    {
-      return this->impl_->_tao_get_typecode ();
-    }
-
-  return CORBA::_tc_null;
-}
-
-void
-CORBA::Any::_tao_set_typecode (const CORBA::TypeCode_ptr tc)
-{
-  if (this->impl_ == 0)
-    {
-      ACE_NEW (this->impl_,
-               TAO::Unknown_IDL_Type (tc));
-    }
-  else
-    {
-      this->impl_->type (tc);
-    }
-}
-
-int
-CORBA::Any::_tao_byte_order (void) const
-{
-  if (this->impl_ != 0)
-    {
-      return this->impl_->_tao_byte_order ();
-    }
-
-  return TAO_ENCAP_BYTE_ORDER;
-}
-
-void
-CORBA::Any::type (CORBA::TypeCode_ptr tc
-                  ACE_ENV_ARG_DECL)
-{
-  CORBA::Boolean equiv = 0;
-
-  if (this->impl_ != 0)
-    {
-      equiv =
-        this->impl_->_tao_get_typecode ()->equivalent (tc
-                                                       ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-    }
-
-  if (equiv)
-    {
-      this->impl_->type (tc);
-    }
-  else
-    {
-      ACE_THROW (CORBA::BAD_TYPECODE ());
-    }
-}
-
-void
-CORBA::Any::_tao_any_destructor (void *x)
-{
-  CORBA::Any *tmp = static_cast<CORBA::Any *> (x);
-  delete tmp;
-}
-
-// Deprecated by the OMG.
-const void *
-CORBA::Any::value (void) const
-{
-  if (this->impl_ != 0)
-    {
-      return this->impl_->value ();
-    }
-
-  return 0;
-}
-
-CORBA::Any::to_object::to_object (CORBA::Object_out obj)
-  : ref_ (obj.ptr ())
-{
-}
-
-CORBA::Any::to_abstract_base::to_abstract_base (CORBA::AbstractBase_ptr &obj)
-  : ref_ (obj)
-{
-}
-
-CORBA::Any::to_value::to_value (CORBA::ValueBase *& obj)
-  : ref_ (obj)
-{
-}
-
-CORBA::Boolean
-CORBA::Any::checked_to_object (CORBA::Object_ptr &_tao_elem) const
-{
-  if (this->impl_ == 0)
-    {
-      return 0;
-    }
-
-  return this->impl_->to_object (_tao_elem);
-}
-
-CORBA::Boolean
-CORBA::Any::checked_to_value (CORBA::ValueBase *&_tao_elem) const
-{
-  if (this->impl_ == 0)
-    {
-      return 0;
-    }
-
-  return this->impl_->to_value (_tao_elem);
-}
-
-CORBA::Boolean
-CORBA::Any::checked_to_abstract_base (
-    CORBA::AbstractBase_ptr &_tao_elem
-  ) const
-{
-  if (this->impl_ == 0)
-    {
-      return 0;
-    }
-
-  return this->impl_->to_abstract_base (_tao_elem);
-}
-
-// ****************************************************************
-
-CORBA::Any_var::Any_var (const CORBA::Any_var &r)
-  : ptr_ (0)
-{
-  if (r.ptr_ != 0)
-    {
-      ACE_NEW (this->ptr_,
-               CORBA::Any (*r.ptr_));
-    }
-}
-
-CORBA::Any_var &
-CORBA::Any_var::operator= (CORBA::Any *p)
-{
-  if (this->ptr_ != p)
-    {
-      delete this->ptr_;
-      this->ptr_ = p;
-    }
-
-  return *this;
-}
-
-CORBA::Any_var &
-CORBA::Any_var::operator= (const CORBA::Any_var &r)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-
-  if (r.ptr_ != 0)
-    {
-      ACE_NEW_RETURN (this->ptr_,
-                      CORBA::Any (*r.ptr_),
-                      *this);
-    }
-
-  return *this;
-}
-
-// ***********************************************************************
-
-CORBA::Boolean
-operator<< (TAO_OutputCDR &cdr, const CORBA::Any &any)
-{
-  TAO::Any_Impl *impl = any.impl ();
-
-  if (impl != 0)
-    {
-      return impl->marshal (cdr);
-    }
-
-  return (cdr << CORBA::_tc_null);
-}
-
-CORBA::Boolean
-operator>> (TAO_InputCDR &cdr, CORBA::Any &any)
-{
-  CORBA::TypeCode_var tc;
-
-  if ((cdr >> tc.out ()) == 0)
-    {
-      return 0;
-    }
-
-  ACE_TRY_NEW_ENV
-    {
-      TAO::Unknown_IDL_Type *impl = 0;
-      ACE_NEW_RETURN (impl,
-                      TAO::Unknown_IDL_Type (tc.in ()),
-                      0);
-
-      any.replace (impl);
-      impl->_tao_decode (cdr
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (CORBA::Exception, ex)
-    {
-      return 0;
-    }
-  ACE_ENDTRY;
-
-  return 1;
-}
-
-// =======================================================================
-
-// Insertion of the special basic types.
-
-void
-CORBA::Any::operator<<= (CORBA::Any::from_boolean b)
-{
-  TAO::Any_Basic_Impl::insert (*this,
-                               CORBA::_tc_boolean,
-                               &b.val_);
-}
-
-void
-CORBA::Any::operator<<= (CORBA::Any::from_octet o)
-{
-  TAO::Any_Basic_Impl::insert (*this,
-                               CORBA::_tc_octet,
-                               &o.val_);
-}
-
-void
-CORBA::Any::operator<<= (CORBA::Any::from_char c)
-{
-  TAO::Any_Basic_Impl::insert (*this,
-                               CORBA::_tc_char,
-                               &c.val_);
-}
-
-void
-CORBA::Any::operator<<= (CORBA::Any::from_wchar wc)
-{
-  TAO::Any_Basic_Impl::insert (*this,
-                               CORBA::_tc_wchar,
-                               &wc.val_);
-}
-
-void
-CORBA::Any::operator<<= (CORBA::Any::from_string s)
-{
-  if (s.bound_ > 0 && s.val_ != 0 && ACE_OS::strlen (s.val_) > s.bound_)
-    {
-      return;
-    }
-
-  TAO::Any_Special_Impl_T<
-      char,
-      CORBA::Any::from_string,
-      CORBA::Any::to_string
-    >::insert (*this,
-               TAO::Any_Impl::_tao_any_string_destructor,
-               CORBA::_tc_string,
-               s.nocopy_ ? s.val_ : CORBA::string_dup (s.val_),
-               s.bound_);
-}
-
-void
-CORBA::Any::operator<<= (CORBA::Any::from_wstring ws)
-{
-  if (ws.bound_ > 0 && ws.val_ != 0 && ACE_OS::wslen (ws.val_) > ws.bound_)
-    {
-      return;
-    }
-
-  TAO::Any_Special_Impl_T<
-      CORBA::WChar,
-      CORBA::Any::from_wstring,
-      CORBA::Any::to_wstring
-    >::insert (*this,
-               TAO::Any_Impl::_tao_any_wstring_destructor,
-               CORBA::_tc_wstring,
-               ws.nocopy_ ? ws.val_ : CORBA::wstring_dup (ws.val_),
-               ws.bound_);
-}
-
-// Insertion of the other basic types.
-
-void
-operator<<= (CORBA::Any &any, CORBA::Short s)
-{
-  TAO::Any_Basic_Impl::insert (any,
-                               CORBA::_tc_short,
-                               &s);
-}
-
-void
-operator<<= (CORBA::Any &any, CORBA::UShort us)
-{
-  TAO::Any_Basic_Impl::insert (any,
-                               CORBA::_tc_ushort,
-                               &us);
-}
-
-void
-operator<<= (CORBA::Any &any, CORBA::Long l)
-{
-  TAO::Any_Basic_Impl::insert (any,
-                               CORBA::_tc_long,
-                               &l);
-}
-
-void
-operator<<= (CORBA::Any &any, CORBA::ULong ul)
-{
-  TAO::Any_Basic_Impl::insert (any,
-                               CORBA::_tc_ulong,
-                               &ul);
-}
-
-void
-operator<<= (CORBA::Any &any, CORBA::LongLong ll)
-{
-  TAO::Any_Basic_Impl::insert (any,
-                               CORBA::_tc_longlong,
-                               &ll);
-}
-
-void
-operator<<= (CORBA::Any &any, CORBA::ULongLong ull)
-{
-  TAO::Any_Basic_Impl::insert (any,
-                               CORBA::_tc_ulonglong,
-                               &ull);
-}
-
-void
-operator<<= (CORBA::Any &any, CORBA::Float f)
-{
-  TAO::Any_Basic_Impl::insert (any,
-                               CORBA::_tc_float,
-                               &f);
-}
-
-void
-operator<<= (CORBA::Any &any, CORBA::Double d)
-{
-  TAO::Any_Basic_Impl::insert (any,
-                               CORBA::_tc_double,
-                               &d);
-}
-
-void
-operator<<= (CORBA::Any &any, CORBA::LongDouble ld)
-{
-  TAO::Any_Basic_Impl::insert (any,
-                               CORBA::_tc_longdouble,
-                               &ld);
-}
-
-// Insertion of Any - copying.
-void
-operator<<= (CORBA::Any &any, const CORBA::Any &a)
-{
-  TAO::Any_Dual_Impl_T<CORBA::Any>::insert_copy (
-      any,
-      CORBA::Any::_tao_any_destructor,
-      CORBA::_tc_any,
-      a
-    );
-}
-
-// Insertion of Any - non-copying.
-void
-operator<<= (CORBA::Any &any, CORBA::Any *a)
-{
-  TAO::Any_Dual_Impl_T<CORBA::Any>::insert (any,
-                                            CORBA::Any::_tao_any_destructor,
-                                            CORBA::_tc_any,
-                                            a);
-}
-
-// Insertion of TypeCode - copying.
-void
-operator<<= (CORBA::Any &any, CORBA::TypeCode_ptr tc)
-{
-  CORBA::TypeCode_ptr dup = CORBA::TypeCode::_duplicate (tc);
-  any <<= &dup;
-}
-
-// Insertion of TypeCode - non-copying.
-void
-operator<<= (CORBA::Any &any, CORBA::TypeCode_ptr * tc)
-{
-  TAO::Any_Impl_T<CORBA::TypeCode>::insert (
-      any,
-      CORBA::TypeCode::_tao_any_destructor,
-      CORBA::_tc_TypeCode,
-      *tc
-    );
-}
-
-// Insertion of CORBA object - copying.
-void
-operator<<= (CORBA::Any &any, const CORBA::Object_ptr obj)
-{
-  CORBA::Object_ptr dup = CORBA::Object::_duplicate (obj);
-  any <<= &dup;
-}
-
-// Insertion of CORBA object - non-copying.
-void
-operator<<= (CORBA::Any &any, CORBA::Object_ptr *objptr)
-{
-  TAO::Any_Impl_T<CORBA::Object>::insert (any,
-                                          CORBA::Object::_tao_any_destructor,
-                                          CORBA::_tc_Object,
-                                          *objptr);
-}
-
-// These are copying versions for unbounded (w)strings. They are not inlined,
-// to avoid use in Any.i before definition in ORB.i.
-
-void
-operator<<= (CORBA::Any &any, const char *s)
-{
-  TAO::Any_Special_Impl_T<
-      char,
-      CORBA::Any::from_string,
-      CORBA::Any::to_string
-    >::insert (any,
-               TAO::Any_Impl::_tao_any_string_destructor,
-               CORBA::_tc_string,
-               CORBA::string_dup (s),
-               0);
-}
-
-void
-operator<<= (CORBA::Any &any, const CORBA::WChar *ws)
-{
-  TAO::Any_Special_Impl_T<
-      CORBA::WChar,
-      CORBA::Any::from_wstring,
-      CORBA::Any::to_wstring
-    >::insert (any,
-               TAO::Any_Impl::_tao_any_wstring_destructor,
-               CORBA::_tc_wstring,
-               CORBA::wstring_dup (ws),
-               0);
-}
-
-// Extraction: these are safe and hence we have to check that the
-// typecode of the Any is equal to the one we are trying to extract
-// into.
-
-// Extraction into the special basic types.
-
-CORBA::Boolean
-CORBA::Any::operator>>= (CORBA::Any::to_boolean b) const
-{
-  return TAO::Any_Basic_Impl::extract (*this,
-                                       CORBA::_tc_boolean,
-                                       &b.ref_);
-}
-
-CORBA::Boolean
-CORBA::Any::operator>>= (CORBA::Any::to_octet o) const
-{
-  return TAO::Any_Basic_Impl::extract (*this,
-                                       CORBA::_tc_octet,
-                                       &o.ref_);
-}
-
-CORBA::Boolean
-CORBA::Any::operator>>= (CORBA::Any::to_char c) const
-{
-  return TAO::Any_Basic_Impl::extract (*this,
-                                       CORBA::_tc_char,
-                                       &c.ref_);
-}
-
-CORBA::Boolean
-CORBA::Any::operator>>= (CORBA::Any::to_wchar wc) const
-{
-  return TAO::Any_Basic_Impl::extract (*this,
-                                       CORBA::_tc_wchar,
-                                       &wc.ref_);
-}
-
-CORBA::Boolean
-CORBA::Any::operator>>= (CORBA::Any::to_string s) const
-{
-  return
-    TAO::Any_Special_Impl_T<
-        char,
-        CORBA::Any::from_string,
-        CORBA::Any::to_string
-      >::extract (*this,
-                  TAO::Any_Impl::_tao_any_string_destructor,
-                  CORBA::_tc_string,
-                  s.val_,
-                  s.bound_);
-}
-
-CORBA::Boolean
-CORBA::Any::operator>>= (CORBA::Any::to_wstring ws) const
-{
-  return
-    TAO::Any_Special_Impl_T<
-        CORBA::WChar,
-        CORBA::Any::from_wstring,
-        CORBA::Any::to_wstring
-      >::extract (*this,
-                  TAO::Any_Impl::_tao_any_wstring_destructor,
-                  CORBA::_tc_wstring,
-                  ws.val_,
-                  ws.bound_);
-}
-
-CORBA::Boolean
-CORBA::Any::operator>>= (CORBA::Any::to_object obj) const
-{
-  return this->checked_to_object (obj.ref_);
-}
-
-CORBA::Boolean
-CORBA::Any::operator>>= (CORBA::Any::to_abstract_base obj) const
-{
-  return this->checked_to_abstract_base (obj.ref_);
-}
-
-CORBA::Boolean
-CORBA::Any::operator>>= (CORBA::Any::to_value obj) const
-{
-  return this->checked_to_value (obj.ref_);
-}
-
-// Extraction into the other basic types.
-
-CORBA::Boolean
-operator>>= (const CORBA::Any &any, CORBA::Short &s)
-{
-  return TAO::Any_Basic_Impl::extract (any,
-                                       CORBA::_tc_short,
-                                       &s);
-}
-
-CORBA::Boolean
-operator>>= (const CORBA::Any &any, CORBA::UShort &us)
-{
-  return TAO::Any_Basic_Impl::extract (any,
-                                       CORBA::_tc_ushort,
-                                       &us);
-}
-
-CORBA::Boolean
-operator>>= (const CORBA::Any &any, CORBA::Long &l)
-{
-  return TAO::Any_Basic_Impl::extract (any,
-                                       CORBA::_tc_long,
-                                       &l);
-}
-
-CORBA::Boolean
-operator>>= (const CORBA::Any &any, CORBA::ULong &ul)
-{
-  return TAO::Any_Basic_Impl::extract (any,
-                                       CORBA::_tc_ulong,
-                                       &ul);
-}
-
-CORBA::Boolean
-operator>>= (const CORBA::Any &any, CORBA::LongLong &ll)
-{
-  return
-    TAO::Any_Basic_Impl::extract (any,
-                                  CORBA::_tc_longlong,
-                                  &ll);
-}
-
-CORBA::Boolean
-operator>>= (const CORBA::Any &any, CORBA::ULongLong &ull)
-{
-  return
-    TAO::Any_Basic_Impl::extract (any,
-                                  CORBA::_tc_ulonglong,
-                                  &ull);
-}
-
-CORBA::Boolean
-operator>>= (const CORBA::Any &any, CORBA::Float &f)
-{
-  return TAO::Any_Basic_Impl::extract (any,
-                                       CORBA::_tc_float,
-                                       &f);
-}
-
-CORBA::Boolean
-operator>>= (const CORBA::Any &any, CORBA::Double &d)
-{
-  return TAO::Any_Basic_Impl::extract (any,
-                                       CORBA::_tc_double,
-                                       &d);
-}
-
-CORBA::Boolean
-operator>>= (const CORBA::Any &any, CORBA::LongDouble &ld)
-{
-  return
-    TAO::Any_Basic_Impl::extract (any,
-                                  CORBA::_tc_longdouble,
-                                  &ld);
-}
-
-CORBA::Boolean
-operator>>= (const CORBA::Any &any, const CORBA::Any *&a)
-{
-  return TAO::Any_Dual_Impl_T<CORBA::Any>::extract (
-      any,
-      CORBA::Any::_tao_any_destructor,
-      CORBA::_tc_any,
-      a
-    );
-}
-
-CORBA::Boolean
-operator>>= (const CORBA::Any &any, const CORBA::Char *&s)
-{
-  return
-    TAO::Any_Special_Impl_T<
-        char,
-        CORBA::Any::from_string,
-        CORBA::Any::to_string
-      >::extract (any,
-                  TAO::Any_Impl::_tao_any_string_destructor,
-                  CORBA::_tc_string,
-                  s,
-                  0);
-}
-
-CORBA::Boolean
-operator>>= (const CORBA::Any &any, const CORBA::WChar *&ws)
-{
-  return
-    TAO::Any_Special_Impl_T<
-        CORBA::WChar,
-        CORBA::Any::from_wstring,
-        CORBA::Any::to_wstring
-      >::extract (any,
-                  TAO::Any_Impl::_tao_any_wstring_destructor,
-                  CORBA::_tc_wstring,
-                  ws,
-                  0);
-}
-
-CORBA::Boolean
-operator>>= (const CORBA::Any &any, CORBA::TypeCode_ptr &tc)
-{
-  return TAO::Any_Impl_T<CORBA::TypeCode>::extract (
-      any,
-      CORBA::TypeCode::_tao_any_destructor,
-      CORBA::_tc_TypeCode,
-      tc
-    );
-}
-
-// ================================================================
-// Any_Impl_T template specializations.
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::Object>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return 1;
-  }
-}
-
-// ================================================================
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class TAO::Any_Special_Impl_T<
-      char,
-      CORBA::Any::from_string,
-      CORBA::Any::to_string
-    >;
-
-template class TAO::Any_Special_Impl_T<
-      CORBA::WChar,
-      CORBA::Any::from_wstring,
-      CORBA::Any::to_wstring
-    >;
-
-template class TAO::Any_Dual_Impl_T<CORBA::Any>;
-template class TAO::Any_Impl_T<CORBA::TypeCode>;
-
-template class TAO::Any_Impl_T<char>;
-template class TAO::Any_Impl_T<CORBA::WChar>;
-template class TAO::Any_Impl_T<CORBA::Object>;
-
-template class TAO::Arg_Traits<CORBA::Any>;
-template class TAO::Var_Size_Arg_Traits_T<CORBA::Any,
-                                          CORBA::Any_var,
-                                          CORBA::Any_out>;
-
-template class TAO::In_Var_Size_Argument_T<CORBA::Any>;
-template class TAO::Out_Var_Size_Argument_T<CORBA::Any, CORBA::Any_out>;
-template class TAO::Inout_Var_Size_Argument_T<CORBA::Any>;
-template class TAO::Ret_Var_Size_Argument_T<CORBA::Any, CORBA::Any_var>;
-
-#if 0
-// Needed in the future..
-template class TAO::SArg_Traits<CORBA::Any>;
-template class TAO::Var_Size_SArg_Traits_T<CORBA::Any,
-                                           CORBA::Any_var,
-                                           CORBA::Any_out>;
-template class TAO::In_Var_Size_SArgument_T<CORBA::Any>;
-template class TAO::Inout_Var_Size_SArgument_T<CORBA::Any>;
-template class TAO::Out_Var_Size_SArgument_T<CORBA::Any,
-                                             CORBA::Any_var>;
-template class TAO::Ret_Var_Size_SArgument_T<CORBA::Any,
-                                             CORBA::Any_var>;
-#endif /*if 0*/
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate TAO::Any_Special_Impl_T< \
-      char, \
-      CORBA::Any::from_string, \
-      CORBA::Any::to_string \
-    >
-
-#pragma instantiate TAO::Any_Special_Impl_T< \
-      CORBA::WChar, \
-      CORBA::Any::from_wstring, \
-      CORBA::Any::to_wstring \
-    >
-
-#pragma instantiate TAO::Any_Dual_Impl_T<CORBA::Any>
-#pragma instantiate TAO::Any_Impl_T<CORBA::TypeCode>
-
-#pragma instantiate TAO::Any_Impl_T<char>
-#pragma instantiate TAO::Any_Impl_T<CORBA::WChar>
-#pragma instantiate TAO::Any_Impl_T<CORBA::Object>
-
-#pragma instantiate TAO::Arg_Traits<CORBA::Any>
-#pragma instantiate TAO::Var_Size_Arg_Traits_T<CORBA::Any, \
-                                               CORBA::Any_var, \
-                                               CORBA::Any_out>
-#pragma instantiate TAO::Var_Size_Arg_Traits_T<CORBA::Any, \
-                                          CORBA::Any_var, \
-                                          CORBA::Any_out>
-#pragma instantiate TAO::In_Var_Size_Argument_T<CORBA::Any>
-#pragma instantiate TAO::Inout_Var_Size_Argument_T<CORBA::Any>
-#pragma instantiate TAO::Out_Var_Size_Argument_T<CORBA::Any, \
-                                            CORBA::Any_out>
-#pragma instantiate TAO::Ret_Var_Size_Argument_T<CORBA::Any, \
-                                            CORBA::Any_var>
-
-#pragma instantiate TAO::SArg_Traits<CORBA::Any>
-#pragma instantiate TAO::Var_Size_SArg_Traits_T<CORBA::Any, \
-                                           CORBA::Any_var, \
-                                           CORBA::Any_out>
-#pragma instantiate TAO::In_Var_Size_SArgument_T<CORBA::Any>
-#pragma instantiate TAO::Inout_Var_Size_SArgument_T<CORBA::Any>
-#pragma instantiate TAO::Out_Var_Size_SArgument_T<CORBA::Any, \
-                                             CORBA::Any_var>
-#pragma instantiate TAO::Ret_Var_Size_SArgument_T<CORBA::Any, \
-                                             CORBA::Any_var>
-
-#pragma instantiate TAO::In_Var_Size_Argument_T<CORBA::Any>
-
-#pragma instantiate TAO::Out_Var_Size_Argument_T<CORBA::Any,  \
-                                                 CORBA::Any_out>
-#pragma instantiate TAO::Inout_Var_Size_Argument_T<CORBA::Any>
-#pragma instantiate TAO::Ret_Var_Size_Argument_T<CORBA::Any, \
-                                                 CORBA::Any_var>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/Any.h b/TAO/tao/Any.h
deleted file mode 100644
index 347ac965473..00000000000
--- a/TAO/tao/Any.h
+++ /dev/null
@@ -1,403 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Any.h
- *
- *  $Id$
- *
- *  @author Carlos O'Ryan
- *  @author Jeff Parsons
- */
-//=============================================================================
-
-#ifndef TAO_ANY_H
-#define TAO_ANY_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/CORBA_methods.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Pseudo_VarOut_T.h"
-#include "tao/Arg_Traits_T.h"
-
-#include "ace/CDR_Stream.h"
-#include "ace/CORBA_macros.h"
-
-namespace TAO
-{
-  class Any_Impl;
-}
-
-namespace CORBA
-{
-  class Any;
-  typedef Any *Any_ptr;
-  class Any_var;
-
-  class TypeCode;
-  typedef TypeCode *TypeCode_ptr;
-
-  class Object;
-  typedef Object *Object_ptr;
-  typedef TAO_Pseudo_Var_T<Object> Object_var;
-  typedef TAO_Pseudo_Out_T<Object, Object_var> Object_out;
-
-  class AbstractBase;
-  typedef AbstractBase *AbstractBase_ptr;
-
-  class ValueBase;
-  class Exception;
-
-  /**
-   * @class Any
-   *
-   * @brief Generic container for IDL types.
-   *
-   * This is the top-level class of the Any implementation. It exposes the
-   * spec-required functionality, but is mostly a wrapper for one of the
-   * template classes below.
-   */
-  class TAO_Export Any
-  {
-  public:
-    typedef Any_ptr _ptr_type;
-    typedef Any_var _var_type;
-
-    Any (void);
-    Any (const Any &);
-
-    ~Any (void);
-
-    Any &operator= (const Any &);
-    TAO::Any_Impl *impl (void) const;
-
-    /// Used in our destruction if we ourselves are stored in an Any.
-    static void _tao_any_destructor (void *);
-
-    /// These are needed for insertion and extraction of booleans,
-    /// octets, chars, and bounded strings. CORBA spec requires
-    /// that they be here, we just typedef to the already-defined
-    /// ACE_OutputCDR types.
-
-    typedef ACE_OutputCDR::from_boolean from_boolean;
-    typedef ACE_OutputCDR::from_octet from_octet;
-    typedef ACE_OutputCDR::from_char from_char;
-    typedef ACE_OutputCDR::from_wchar from_wchar;
-    typedef ACE_OutputCDR::from_string from_string;
-    typedef ACE_OutputCDR::from_wstring from_wstring;
-
-    /// Insertion of the special types.
-
-    void operator<<= (from_boolean);
-    void operator<<= (from_char);
-    void operator<<= (from_wchar);
-    void operator<<= (from_octet);
-    void operator<<= (from_string);
-    void operator<<= (from_wstring);
-
-    /// These extract octets, chars, booleans, bounded strings, and
-    /// object references. All these are defined in ACE_InputCDR.
-
-    typedef ACE_InputCDR::to_boolean to_boolean;
-    typedef ACE_InputCDR::to_char to_char;
-    typedef ACE_InputCDR::to_wchar to_wchar;
-    typedef ACE_InputCDR::to_octet to_octet;
-    typedef ACE_InputCDR::to_string to_string;
-    typedef ACE_InputCDR::to_wstring to_wstring;
-
-    /// These are not in ACE.
-
-    struct TAO_Export to_object
-    {
-      // This signature reflects the change set out in
-      // issue 154 of the 1.3 RTF.
-      explicit to_object (Object_out obj);
-      Object_ptr &ref_;
-    };
-
-    struct TAO_Export to_abstract_base
-    {
-      explicit to_abstract_base (AbstractBase_ptr &obj);
-      AbstractBase_ptr &ref_;
-    };
-
-    struct TAO_Export to_value
-    {
-      explicit to_value (ValueBase *&base);
-      ValueBase *&ref_;
-    };
-
-    /// Extraction of the special types.
-
-    Boolean operator>>= (to_boolean) const;
-    Boolean operator>>= (to_octet) const;
-    Boolean operator>>= (to_char) const;
-    Boolean operator>>= (to_wchar) const;
-    Boolean operator>>= (to_string) const;
-    Boolean operator>>= (to_wstring) const;
-    Boolean operator>>= (to_object) const;
-    Boolean operator>>= (to_abstract_base) const;
-    Boolean operator>>= (to_value) const;
-
-    /// TAO-specific signature.
-    void replace (TAO::Any_Impl *);
-
-    /// Return TypeCode of the element stored in the Any.
-    TypeCode_ptr type (void) const;
-
-    /// For use along with <<= of a value of aliased type when the alias must
-    /// be preserved.
-    void type (TypeCode_ptr
-               ACE_ENV_ARG_DECL);
-
-    /// TAO extension, does not return a duplicate.
-    CORBA::TypeCode_ptr _tao_get_typecode (void) const;
-
-    /// TAO extension.
-    void _tao_set_typecode (const CORBA::TypeCode_ptr);
-
-    int _tao_byte_order (void) const;
-
-    /// @deprecated
-    /// Deprecated by the OMG. This no longer appears in
-    /// the C++ mapping. It is here only for backward
-    /// compatibility. It is no longer (as of 5/26/04)
-    /// used anywhere in TAO.
-    const void *value (void) const;
-
-  private:
-    CORBA::Boolean checked_to_object (CORBA::Object_ptr &) const;
-    CORBA::Boolean checked_to_value (CORBA::ValueBase *&) const;
-    CORBA::Boolean checked_to_abstract_base (CORBA::AbstractBase_ptr &) const;
-
-    // Unimplemented - hides unsigned char insert/extract.
-    void operator<<= (unsigned char);
-    CORBA::Boolean operator>>= (unsigned char&) const;
-
-  private:
-    TAO::Any_Impl *impl_;
-
-    friend class TAO_Marshal_Any;
-  };
-
-  /**
-   * @class CORBA::Any_var
-   *
-   * @brief Provide for automatic storage deallocation on going out of
-   * scope.
-   */
-  class TAO_Export Any_var
-  {
-  public:
-    Any_var (void);
-    Any_var (Any *a);
-    Any_var (const Any_var &);
-    ~Any_var (void);
-
-    Any_var &operator= (Any *);
-
-    /**
-     * Assignment from an Any_var
-     * This operation requires memory allocation.
-     * If the allocation fails, *this is returned
-     * unmodified.
-     */
-    Any_var &operator= (const Any_var &);
-
-    /// Arrow operator (smart pointer).
-    Any *operator-> (void);
-
-    /// Cast.
-    operator const Any *() const;
-
-    /// Cast.
-    operator Any *&();
-
-    /// For in Any parameter.
-    const Any &in (void) const;
-
-    /// For inout Any parameter.
-    Any &inout (void);
-
-    /// For out Any parameter.
-    Any *&out (void);
-
-    /// For Any return type.
-    Any *_retn (void);
-
-    /// TAO specific extension
-    Any *ptr (void) const;
-  private:
-    /// Holds the Any.
-    Any *ptr_;
-  };
-
-  /**
-   * @class CORBA::Any_out
-   *
-   * @brief CORBA::Any_out
-   *
-   * The _out class for CORBA::Any. This is used to help in
-   * managing the out parameters.
-   */
-  class TAO_Export Any_out
-  {
-  public:
-    Any_out (Any *&);
-    Any_out (Any_var &);
-    Any_out (const Any_out &);
-
-    /// Assignment from a Any_out.
-    Any_out &operator= (const Any_out &s);
-
-    /// Assignment from a Any.
-    Any_out &operator= (Any *);
-
-    /// Cast.
-    operator Any *&();
-
-    /// Return underlying instance.
-    Any *& ptr (void);
-
-    Any *operator-> (void);
-
-  private:
-    /// Assignment from _var disallowed.
-    void operator= (const Any_var &);
-
-  private:
-    /// Instance.
-    Any *&ptr_;
-  };
-}
-
-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::Any &);
-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::Any &);
-
-/// Typesafe insertion.
-
-TAO_Export void operator<<= (CORBA::Any &, CORBA::Short);
-TAO_Export void operator<<= (CORBA::Any &, CORBA::UShort);
-TAO_Export void operator<<= (CORBA::Any &, CORBA::Long);
-TAO_Export void operator<<= (CORBA::Any &, CORBA::ULong);
-TAO_Export void operator<<= (CORBA::Any &, CORBA::LongLong);
-TAO_Export void operator<<= (CORBA::Any &, CORBA::ULongLong);
-TAO_Export void operator<<= (CORBA::Any &, CORBA::Float);
-TAO_Export void operator<<= (CORBA::Any &, CORBA::Double);
-TAO_Export void operator<<= (CORBA::Any &, CORBA::LongDouble);
-TAO_Export void operator<<= (CORBA::Any &, const CORBA::Any &);
-TAO_Export void operator<<= (CORBA::Any &, CORBA::Any *);
-TAO_Export void operator<<= (CORBA::Any &, const char *);
-TAO_Export void operator<<= (CORBA::Any &, const CORBA::WChar *);
-TAO_Export void operator<<= (CORBA::Any &, CORBA::TypeCode_ptr);
-TAO_Export void operator<<= (CORBA::Any &, CORBA::TypeCode_ptr *);
-TAO_Export void operator<<= (CORBA::Any &, const CORBA::Object_ptr);
-TAO_Export void operator<<= (CORBA::Any &, CORBA::Object_ptr *);
-
-/// Typesafe extraction.
-
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &,
-                                       CORBA::Short &);
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &,
-                                       CORBA::UShort &);
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &,
-                                       CORBA::Long &);
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &,
-                                       CORBA::ULong &);
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &,
-                                       CORBA::LongLong &);
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &,
-                                       CORBA::ULongLong &);
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &,
-                                       CORBA::Float &);
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &,
-                                       CORBA::Double &);
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &,
-                                       CORBA::LongDouble &);
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &,
-                                       const CORBA::Any *&);
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &,
-                                       CORBA::TypeCode_ptr &);
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &,
-                                       const CORBA::Char *&);
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &,
-                                       const CORBA::WChar *&);
-
-#if defined (__ACE_INLINE__)
-# include "tao/Any.i"
-#else
-
-/// Copying versions of insertion operators for basic types
-/// must also be defined for CORBA::Any_var.
-
-TAO_Export void operator<<= (CORBA::Any_var &, CORBA::Short);
-TAO_Export void operator<<= (CORBA::Any_var &, CORBA::UShort);
-TAO_Export void operator<<= (CORBA::Any_var &, CORBA::Long);
-TAO_Export void operator<<= (CORBA::Any_var &, CORBA::ULong);
-TAO_Export void operator<<= (CORBA::Any_var &, CORBA::LongLong);
-TAO_Export void operator<<= (CORBA::Any_var &, CORBA::ULongLong);
-TAO_Export void operator<<= (CORBA::Any_var &, CORBA::Float);
-TAO_Export void operator<<= (CORBA::Any_var &, CORBA::Double);
-TAO_Export void operator<<= (CORBA::Any_var &, const CORBA::Any *&);
-TAO_Export void operator<<= (CORBA::Any_var &, const char *);
-TAO_Export void operator<<= (CORBA::Any_var &, CORBA::TypeCode_ptr);
-TAO_Export void operator<<= (CORBA::Any_var &, const CORBA::Object_ptr);
-TAO_Export void operator<<= (CORBA::Any_var &, CORBA::Any::from_boolean);
-TAO_Export void operator<<= (CORBA::Any_var &, CORBA::Any::from_char);
-TAO_Export void operator<<= (CORBA::Any_var &, CORBA::Any::from_wchar);
-TAO_Export void operator<<= (CORBA::Any_var &, CORBA::Any::from_octet);
-TAO_Export void operator<<= (CORBA::Any_var &, CORBA::Any::from_string);
-TAO_Export void operator<<= (CORBA::Any_var &, CORBA::Any::from_wstring);
-
-/// These are not required by the spec, but will make users
-/// of other ORBs that are used to them more comfortable.
-
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any_var &,
-                                       CORBA::Short &);
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any_var &,
-                                       CORBA::UShort &);
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any_var &,
-                                       CORBA::Long &);
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any_var &,
-                                       CORBA::ULong &);
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any_var &,
-                                       CORBA::LongLong &);
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any_var &,
-                                       CORBA::ULongLong &);
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any_var &,
-                                       CORBA::Float &);
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any_var &,
-                                       CORBA::Double &);
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any_var &,
-                                       CORBA::Any &);
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any_var &,
-                                       CORBA::TypeCode_ptr &);
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any_var &,
-                                       const char *&);
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any_var &,
-                                       const CORBA::WChar *&);
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any_var &,
-                                       CORBA::Any::to_boolean);
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any_var &,
-                                       CORBA::Any::to_octet);
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any_var &,
-                                       CORBA::Any::to_char);
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any_var &,
-                                       CORBA::Any::to_wchar);
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any_var &,
-                                       CORBA::Any::to_string);
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any_var &,
-                                       CORBA::Any::to_wstring);
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any_var &,
-                                       CORBA::Any::to_object);
-
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_ANY_H */
diff --git a/TAO/tao/Any.i b/TAO/tao/Any.i
deleted file mode 100644
index 3e700c0bca1..00000000000
--- a/TAO/tao/Any.i
+++ /dev/null
@@ -1,368 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-ACE_INLINE TAO::Any_Impl *
-CORBA::Any::impl (void) const
-{
-  return this->impl_;
-}
-
-// *************************************************************
-// Inline operations for class CORBA::Any_var
-// *************************************************************
-
-ACE_INLINE
-CORBA::Any_var::Any_var (void)
-  : ptr_ (0)
-{
-}
-
-ACE_INLINE
-CORBA::Any_var::Any_var (CORBA::Any *p)
-  : ptr_ (p)
-{
-}
-
-ACE_INLINE
-CORBA::Any_var::~Any_var (void)
-{
-  delete this->ptr_;
-}
-
-ACE_INLINE
-CORBA::Any_var::operator CORBA::Any *&()
-{
-  return this->ptr_;
-}
-
-ACE_INLINE
-CORBA::Any_var::operator const CORBA::Any *() const
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::Any *
-CORBA::Any_var::operator-> (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE const CORBA::Any &
-CORBA::Any_var::in (void) const
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE CORBA::Any &
-CORBA::Any_var::inout (void)
-{
-  return *this->ptr_;
-}
-
-ACE_INLINE CORBA::Any *&
-CORBA::Any_var::out (void)
-{
-  delete this->ptr_;
-  this->ptr_ = 0;
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::Any *
-CORBA::Any_var::_retn (void)
-{
-  CORBA::Any *temp = this->ptr_;
-  this->ptr_ = 0;
-  return temp;
-}
-
-ACE_INLINE CORBA::Any *
-CORBA::Any_var::ptr (void) const
-{
-  return this->ptr_;
-}
-
-// *************************************************************
-// CORBA::Any_var insertion operators
-// *************************************************************
-
-ACE_INLINE void
-operator <<= (CORBA::Any_var &lhs, CORBA::Short rhs)
-{
-  lhs.inout () <<= rhs;
-}
-
-ACE_INLINE void
-operator <<= (CORBA::Any_var &lhs, CORBA::UShort rhs)
-{
-  lhs.inout () <<= rhs;
-}
-
-ACE_INLINE void
-operator <<= (CORBA::Any_var &lhs, CORBA::Long rhs)
-{
-  lhs.inout () <<= rhs;
-}
-
-ACE_INLINE void
-operator <<= (CORBA::Any_var &lhs, CORBA::ULong rhs)
-{
-  lhs.inout () <<= rhs;
-}
-
-ACE_INLINE void
-operator <<= (CORBA::Any_var &lhs, CORBA::LongLong rhs)
-{
-  lhs.inout () <<= rhs;
-}
-
-ACE_INLINE void
-operator <<= (CORBA::Any_var &lhs, CORBA::ULongLong rhs)
-{
-  lhs.inout () <<= rhs;
-}
-
-ACE_INLINE void
-operator <<= (CORBA::Any_var &lhs, CORBA::Float rhs)
-{
-  lhs.inout () <<= rhs;
-}
-
-ACE_INLINE void
-operator <<= (CORBA::Any_var &lhs, CORBA::Double rhs)
-{
-  lhs.inout () <<= rhs;
-}
-
-ACE_INLINE void
-operator <<= (CORBA::Any_var &lhs, const CORBA::Any& rhs)
-{
-  lhs.inout () <<= rhs;
-}
-
-ACE_INLINE void
-operator <<= (CORBA::Any_var &lhs, const char* rhs)
-{
-  lhs.inout () <<= rhs;
-}
-
-ACE_INLINE void
-operator <<= (CORBA::Any_var &lhs, CORBA::TypeCode_ptr rhs)
-{
-  lhs.inout () <<= rhs;
-}
-
-ACE_INLINE void
-operator <<= (CORBA::Any_var &lhs, const CORBA::Object_ptr rhs)
-{
-  lhs.inout () <<= rhs;
-}
-
-ACE_INLINE void
-operator <<= (CORBA::Any_var &lhs, CORBA::Any::from_boolean rhs)
-{
-  lhs.inout () <<= rhs;
-}
-
-ACE_INLINE void
-operator <<= (CORBA::Any_var &lhs, CORBA::Any::from_char rhs)
-{
-  lhs.inout () <<= rhs;
-}
-
-ACE_INLINE void
-operator <<= (CORBA::Any_var &lhs, CORBA::Any::from_wchar rhs)
-{
-  lhs.inout () <<= rhs;
-}
-
-ACE_INLINE void
-operator <<= (CORBA::Any_var &lhs, CORBA::Any::from_octet rhs)
-{
-  lhs.inout () <<= rhs;
-}
-
-ACE_INLINE void
-operator <<= (CORBA::Any_var &lhs, CORBA::Any::from_string rhs)
-{
-  lhs.inout () <<= rhs;
-}
-
-ACE_INLINE void
-operator <<= (CORBA::Any_var &lhs, CORBA::Any::from_wstring rhs)
-{
-  lhs.inout () <<= rhs;
-}
-
-// *************************************************************
-// CORBA::Any_var extraction operators
-// *************************************************************
-
-ACE_INLINE CORBA::Boolean
-operator >>= (const CORBA::Any_var &lhs, CORBA::Short &rhs)
-{
-  return lhs.in () >>= rhs;
-}
-
-ACE_INLINE CORBA::Boolean
-operator >>= (const CORBA::Any_var &lhs, CORBA::UShort &rhs)
-{
-  return lhs.in () >>= rhs;
-}
-
-ACE_INLINE CORBA::Boolean
-operator >>= (const CORBA::Any_var &lhs, CORBA::Long &rhs)
-{
-  return lhs.in () >>= rhs;
-}
-
-ACE_INLINE CORBA::Boolean
-operator >>= (const CORBA::Any_var &lhs, CORBA::ULong &rhs)
-{
-  return lhs.in () >>= rhs;
-}
-
-ACE_INLINE CORBA::Boolean
-operator >>= (const CORBA::Any_var &lhs, CORBA::LongLong &rhs)
-{
-  return lhs.in () >>= rhs;
-}
-
-ACE_INLINE CORBA::Boolean
-operator >>= (const CORBA::Any_var &lhs, CORBA::ULongLong &rhs)
-{
-  return lhs.in () >>= rhs;
-}
-
-ACE_INLINE CORBA::Boolean
-operator >>= (const CORBA::Any_var &lhs, CORBA::Float &rhs)
-{
-  return lhs.in () >>= rhs;
-}
-
-ACE_INLINE CORBA::Boolean
-operator >>= (const CORBA::Any_var &lhs, CORBA::Double &rhs)
-{
-  return lhs.in () >>= rhs;
-}
-
-ACE_INLINE CORBA::Boolean
-operator >>= (const CORBA::Any_var &lhs, const CORBA::Any *&rhs)
-{
-  return lhs.in () >>= rhs;
-}
-
-ACE_INLINE CORBA::Boolean
-operator >>= (const CORBA::Any_var &lhs, CORBA::TypeCode_ptr &rhs)
-{
-  return lhs.in () >>= rhs;
-}
-
-ACE_INLINE CORBA::Boolean
-operator >>= (const CORBA::Any_var &lhs, const char *&rhs)
-{
-  return lhs.in () >>= rhs;
-}
-
-ACE_INLINE CORBA::Boolean
-operator >>= (const CORBA::Any_var &lhs, const CORBA::WChar *&rhs)
-{
-  return lhs.in () >>= rhs;
-}
-
-ACE_INLINE CORBA::Boolean
-operator >>= (const CORBA::Any_var &lhs, CORBA::Any::to_boolean rhs)
-{
-  return lhs.in () >>= rhs;
-}
-
-ACE_INLINE CORBA::Boolean
-operator >>= (const CORBA::Any_var &lhs, CORBA::Any::to_octet rhs)
-{
-  return lhs.in () >>= rhs;
-}
-
-ACE_INLINE CORBA::Boolean
-operator >>= (const CORBA::Any_var &lhs, CORBA::Any::to_char rhs)
-{
-  return lhs.in () >>= rhs;
-}
-
-ACE_INLINE CORBA::Boolean
-operator >>= (const CORBA::Any_var &lhs, CORBA::Any::to_wchar rhs)
-{
-  return lhs.in () >>= rhs;
-}
-
-ACE_INLINE CORBA::Boolean
-operator >>= (const CORBA::Any_var &lhs, CORBA::Any::to_string rhs)
-{
-  return lhs.in () >>= rhs;
-}
-
-ACE_INLINE CORBA::Boolean
-operator >>= (const CORBA::Any_var &lhs, CORBA::Any::to_wstring rhs)
-{
-  return lhs.in () >>= rhs;
-}
-
-ACE_INLINE CORBA::Boolean
-operator >>= (const CORBA::Any_var &lhs, CORBA::Any::to_object rhs)
-{
-  return lhs.in () >>= rhs;
-}
-
-// *************************************************************
-// Inline operations for class CORBA::Any_out
-// *************************************************************
-
-ACE_INLINE
-CORBA::Any_out::Any_out (CORBA::Any *&s)
-  : ptr_ (s)
-{
-  this->ptr_ = 0;
-}
-
-ACE_INLINE
-CORBA::Any_out::Any_out (CORBA::Any_var &s)
-  : ptr_ (s.out ())
-{
-}
-
-ACE_INLINE
-CORBA::Any_out::Any_out (const CORBA::Any_out &s)
-  : ptr_ (s.ptr_)
-{
-}
-
-ACE_INLINE CORBA::Any_out &
-CORBA::Any_out::operator= (const CORBA::Any_out &s)
-{
-  this->ptr_ = s.ptr_;
-  return *this;
-}
-
-ACE_INLINE CORBA::Any_out &
-CORBA::Any_out::operator= (CORBA::Any *s)
-{
-  this->ptr_ = s;
-  return *this;
-}
-
-ACE_INLINE
-CORBA::Any_out::operator CORBA::Any *&()
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::Any *&
-CORBA::Any_out::ptr (void)
-{
-  return this->ptr_;
-}
-
-ACE_INLINE CORBA::Any *
-CORBA::Any_out::operator-> (void)
-{
-  return this->ptr_;
-}
diff --git a/TAO/tao/AnySeq.pidl b/TAO/tao/AnySeq.pidl
deleted file mode 100644
index fb3a570b657..00000000000
--- a/TAO/tao/AnySeq.pidl
+++ /dev/null
@@ -1,31 +0,0 @@
-// -*- IDL -*-
-//
-// $Id$
-
-// ================================================================
-/**
- * This file was used to generate the code in AnySeq*.*
- * The command used to generate code is:
- *
- *     tao_idl
- *        -o orig -Ge 1 -Sc -GA -SS -Sci
- *          -Wb,export_macro=TAO_Export
- *          -Wb,export_include="tao/TAO_Export.h"
- *          -Wb,pre_include="ace/pre.h"
- *          -Wb,post_include="ace/post.h"
- *          AnySeq.pidl
- *
- */
-// ================================================================
-
-#ifndef TAO_CORBA_ANY_SEQ_IDL
-#define TAO_CORBA_ANY_SEQ_IDL
-
-#pragma prefix "omg.org"
-
-module CORBA
-{
-  typedef sequence<any> AnySeq;
-};
-
-#endif  /* TAO_CORBA_ANY_SEQ_IDL */
diff --git a/TAO/tao/AnySeqA.cpp b/TAO/tao/AnySeqA.cpp
deleted file mode 100644
index 55b9e326af5..00000000000
--- a/TAO/tao/AnySeqA.cpp
+++ /dev/null
@@ -1,142 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "AnySeqC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Sequence_TypeCode_Static.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Dual_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:937
-
-
-#ifndef _TAO_TYPECODE_CORBA_AnySeq_GUARD
-#define _TAO_TYPECODE_CORBA_AnySeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_AnySeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_any,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_AnySeq_0 =
-      &CORBA_AnySeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_AnySeq_GUARD */
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_AnySeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/AnySeq:1.0",
-    "AnySeq",
-    &TAO::TypeCode::tc_CORBA_AnySeq_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_AnySeq =
-    &_tao_tc_CORBA_AnySeq;
-}
-
-
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::AnySeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::AnySeq>::insert_copy (
-      _tao_any,
-      CORBA::AnySeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_AnySeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::AnySeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::AnySeq>::insert (
-      _tao_any,
-      CORBA::AnySeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_AnySeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::AnySeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::AnySeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::AnySeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::AnySeq>::extract (
-        _tao_any,
-        CORBA::AnySeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_AnySeq_0,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/AnySeqC.cpp b/TAO/tao/AnySeqC.cpp
deleted file mode 100644
index f04c69e6e47..00000000000
--- a/TAO/tao/AnySeqC.cpp
+++ /dev/null
@@ -1,171 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:291
-
-
-#include "AnySeqC.h"
-#include "tao/CDR.h"
-
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:70
-
-// Arg traits specializations.
-namespace TAO
-{
-}
-
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/sequence_cs.cpp:65
-
-#if !defined (_CORBA_ANYSEQ_CS_)
-#define _CORBA_ANYSEQ_CS_
-
-CORBA::AnySeq::AnySeq (void)
-{}
-
-CORBA::AnySeq::AnySeq (
-    CORBA::ULong max
-  )
-  : TAO_Unbounded_Sequence<
-        CORBA::Any
-      >
-    (max)
-{}
-
-CORBA::AnySeq::AnySeq (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    CORBA::Any * buffer,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Sequence<
-        CORBA::Any
-      >
-    (max, length, buffer, release)
-{}
-
-CORBA::AnySeq::AnySeq (
-    const AnySeq &seq
-  )
-  : TAO_Unbounded_Sequence<
-        CORBA::Any
-      >
-    (seq)
-{}
-
-CORBA::AnySeq::~AnySeq (void)
-{}
-
-void CORBA::AnySeq::_tao_any_destructor (
-    void * _tao_void_pointer
-  )
-{
-  AnySeq * _tao_tmp_pointer =
-    static_cast<AnySeq *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_cs.cpp:96
-
-#if !defined _TAO_CDR_OP_CORBA_AnySeq_CPP_
-#define _TAO_CDR_OP_CORBA_AnySeq_CPP_
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::AnySeq &_tao_sequence
-  )
-{
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm << _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
-  return false;
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    CORBA::AnySeq &_tao_sequence
-  )
-{
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm >> _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    
-    }
-  
-  return false;
-}
-
-#endif /* _TAO_CDR_OP_CORBA_AnySeq_CPP_ */
diff --git a/TAO/tao/AnySeqC.h b/TAO/tao/AnySeqC.h
deleted file mode 100644
index 18803cc7ac3..00000000000
--- a/TAO/tao/AnySeqC.h
+++ /dev/null
@@ -1,179 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:153
-
-#ifndef _TAO_IDL_ORIG_ANYSEQC_H_
-#define _TAO_IDL_ORIG_ANYSEQC_H_
-
-#include /**/ "ace/pre.h"
-
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TAO_Export.h"
-#include "tao/ORB.h"
-#include "tao/Environment.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Any.h"
-#include "tao/TypeCode.h"
-#include "tao/Sequence_T.h"
-#include "tao/Seq_Var_T.h"
-#include "tao/Seq_Out_T.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_Export
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
-
-namespace CORBA
-{
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_sequence/sequence_ch.cpp:101
-
-#if !defined (_CORBA_ANYSEQ_CH_)
-#define _CORBA_ANYSEQ_CH_
-  
-  class AnySeq;
-  
-  typedef
-    TAO_VarSeq_Var_T<
-        AnySeq,
-        CORBA::Any
-      >
-    AnySeq_var;
-  
-  typedef
-    TAO_Seq_Out_T<
-        AnySeq,
-        AnySeq_var,
-        CORBA::Any
-      >
-    AnySeq_out;
-  
-  class TAO_Export AnySeq
-    : public
-        TAO_Unbounded_Sequence<
-            CORBA::Any
-          >
-  {
-  public:
-    AnySeq (void);
-    AnySeq (CORBA::ULong max);
-    AnySeq (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        CORBA::Any* buffer, 
-        CORBA::Boolean release = 0
-      );
-    AnySeq (const AnySeq &);
-    ~AnySeq (void);
-    
-    static void _tao_any_destructor (void *);
-    
-    typedef AnySeq_var _var_type;
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_AnySeq;
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
-
-} // module CORBA
-
-// TAO_IDL - Generated from
-// be\be_visitor_traits.cpp:61
-
-// Traits specializations.
-namespace TAO
-{
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const CORBA::AnySeq &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, CORBA::AnySeq*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::AnySeq *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::AnySeq *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_ch.cpp:71
-
-#if !defined _TAO_CDR_OP_CORBA_AnySeq_H_
-#define _TAO_CDR_OP_CORBA_AnySeq_H_
-
-TAO_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const CORBA::AnySeq &
-  );
-TAO_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    CORBA::AnySeq &
-  );
-
-#endif /* _TAO_CDR_OP_CORBA_AnySeq_H_ */
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
-
diff --git a/TAO/tao/AnyTypeCode.mpc b/TAO/tao/AnyTypeCode.mpc
new file mode 100644
index 00000000000..528ca5b12be
--- /dev/null
+++ b/TAO/tao/AnyTypeCode.mpc
@@ -0,0 +1,117 @@
+//$Id$
+project : taolib, core {
+  sharedname   = TAO_AnyTypeCode
+  dynamicflags = TAO_ANYTYPECODE_BUILD_DLL
+
+  Source_Files {
+    AnyTypeCode/Alias_TypeCode_Static.cpp
+    AnyTypeCode/Any.cpp
+    AnyTypeCode/AnySeqA.cpp
+    AnyTypeCode/AnySeqC.cpp
+    AnyTypeCode/Any_Basic_Impl.cpp
+    AnyTypeCode/Any_Impl.cpp
+    AnyTypeCode/Any_SystemException.cpp
+    AnyTypeCode/Any_Unknown_IDL_Type.cpp
+    AnyTypeCode/AnyTypeCode_Adapter_Impl.cpp
+    AnyTypeCode/append.cpp
+    AnyTypeCode/BooleanSeqA.cpp
+    AnyTypeCode/BoundsA.cpp
+    AnyTypeCode/BoundsC.cpp
+    AnyTypeCode/CharSeqA.cpp
+    AnyTypeCode/CONV_FRAMEA.cpp
+    AnyTypeCode/CurrentA.cpp
+    AnyTypeCode/DomainA.cpp
+    AnyTypeCode/DoubleSeqA.cpp
+    AnyTypeCode/DynamicA.cpp
+    AnyTypeCode/DynamicC.cpp
+    AnyTypeCode/Dynamic_ParameterA.cpp
+    AnyTypeCode/Dynamic_ParameterC.cpp
+    AnyTypeCode/Empty_Param_TypeCode.cpp
+    AnyTypeCode/Enum_TypeCode_Static.cpp
+    AnyTypeCode/ExceptionA.cpp
+    AnyTypeCode/FloatSeqA.cpp
+    AnyTypeCode/GIOPA.cpp
+    AnyTypeCode/IIOPA.cpp
+    AnyTypeCode/IIOP_EndpointsA.cpp
+    AnyTypeCode/IOP_IORA.cpp
+    AnyTypeCode/LongDoubleSeqA.cpp
+    AnyTypeCode/LongLongSeqA.cpp
+    AnyTypeCode/LongSeqA.cpp
+    AnyTypeCode/Marshal.cpp
+    AnyTypeCode/Messaging_PolicyValueA.cpp
+    AnyTypeCode/NVList.cpp
+    AnyTypeCode/NVList_Adapter_Impl.cpp
+    AnyTypeCode/ObjectIdListA.cpp
+    AnyTypeCode/Objref_TypeCode_Static.cpp
+    AnyTypeCode/OctetSeqA.cpp
+    AnyTypeCode/orb_typesA.cpp
+    AnyTypeCode/ParameterModeA.cpp
+    AnyTypeCode/PI_ForwardA.cpp
+    AnyTypeCode/PolicyA.cpp
+    AnyTypeCode/Policy_ForwardA.cpp
+    AnyTypeCode/PortableInterceptorA.cpp
+    AnyTypeCode/Sequence_TypeCode_Static.cpp
+    AnyTypeCode/ServicesA.cpp
+    AnyTypeCode/ShortSeqA.cpp
+    AnyTypeCode/skip.cpp
+    AnyTypeCode/StringSeqA.cpp
+    AnyTypeCode/String_TypeCode_Static.cpp
+    AnyTypeCode/Struct_TypeCode_Static.cpp
+    AnyTypeCode/SystemExceptionA.cpp
+    AnyTypeCode/TAOA.cpp
+    AnyTypeCode/TimeBaseA.cpp
+    AnyTypeCode/True_RefCount_Policy.cpp
+    AnyTypeCode/TypeCode.cpp
+    AnyTypeCode/TypeCodeA.cpp
+    AnyTypeCode/TypeCode_CDR_Extraction.cpp
+    AnyTypeCode/TypeCode_Constants.cpp
+    AnyTypeCode/ULongLongSeqA.cpp
+    AnyTypeCode/ULongSeqA.cpp
+    AnyTypeCode/Union_TypeCode_Static.cpp
+    AnyTypeCode/UShortSeqA.cpp
+    AnyTypeCode/Value_TypeCode_Static.cpp
+    AnyTypeCode/ValueModifierC.cpp
+    AnyTypeCode/ValueModifierA.cpp
+    AnyTypeCode/VisibilityA.cpp
+    AnyTypeCode/VisibilityC.cpp
+    AnyTypeCode/WCharSeqA.cpp
+    AnyTypeCode/WrongTransactionA.cpp
+    AnyTypeCode/WStringSeqA.cpp
+  }
+
+  Header_Files {
+    AnyTypeCode/*.h
+  }
+
+  Inline_Files {
+    AnyTypeCode/*.inl
+  }
+
+
+  Template_Files {
+    AnyTypeCode/*_T.cpp
+    AnyTypeCode/Alias_TypeCode.cpp
+    AnyTypecode/Enum_TypeCode.cpp
+    AnyTypecode/Fixed_TypeCode.cpp
+    AnyTypecode/Objref_TypeCode.cpp
+    AnyTypecode/Recursive_Type_TypeCode.cpp
+    AnyTypecode/Sequence_TypeCode.cpp
+    AnyTypecode/String_TypeCode.cpp
+    AnyTypecode/Struct_TypeCode.cpp
+    AnyTypecode/TypeCode_Base_Attributes.cpp
+    AnyTypecode/TypeCode_Case.cpp
+    AnyTypecode/Union_TypeCode.cpp
+    AnyTypecode/Value_TypeCode.cpp
+  }
+
+  Resource_Files {
+    AnyTypeCode
+  }
+
+  PIDL_Files {
+  }
+
+  Pkgconfig_Files {
+    AnyTypeCode/TAO_AnyTypeCode.pc.in
+  }
+}
diff --git a/TAO/tao/AnyTypeCode_Adapter.cpp b/TAO/tao/AnyTypeCode_Adapter.cpp
new file mode 100644
index 00000000000..ef7e0adf569
--- /dev/null
+++ b/TAO/tao/AnyTypeCode_Adapter.cpp
@@ -0,0 +1,12 @@
+// @(#) $Id$
+
+#include "tao/AnyTypeCode_Adapter.h"
+
+ACE_RCSID (tao,
+           TAO_AnyTypeCode_Adapter,
+           "$Id$")
+
+TAO_AnyTypeCode_Adapter::~TAO_AnyTypeCode_Adapter (void)
+{
+}
+
diff --git a/TAO/tao/AnyTypeCode_Adapter.h b/TAO/tao/AnyTypeCode_Adapter.h
new file mode 100644
index 00000000000..5050a148c32
--- /dev/null
+++ b/TAO/tao/AnyTypeCode_Adapter.h
@@ -0,0 +1,126 @@
+// -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    AnyTypeCode_Adapter.h
+ *
+ *  $Id$
+ *
+ *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
+ */
+//=============================================================================
+
+
+#ifndef TAO_ANYTYPECODE_ADAPTER
+#define TAO_ANYTYPECODE_ADAPTER
+
+#include /**/ "ace/pre.h"
+
+#include "tao/TAO_Export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "ace/Service_Object.h"
+#include "ace/CDR_Stream.h"
+
+#include "tao/Basic_Types.h"
+
+namespace CORBA
+{
+  class TypeCode;
+  typedef TypeCode *TypeCode_ptr;
+
+  class Any;
+
+  class Policy;
+  typedef Policy *Policy_ptr;
+}
+
+
+/**
+ * @class TAO_AnyTypeCode_Adapter
+ */
+class TAO_Export TAO_AnyTypeCode_Adapter
+  : public ACE_Service_Object
+{
+public:
+  virtual ~TAO_AnyTypeCode_Adapter (void);
+
+#define ANYTYPECODE__EXCEPTION_LIST \
+    TAO_SYSTEM_EXCEPTION (UNKNOWN) \
+    TAO_SYSTEM_EXCEPTION (BAD_PARAM) \
+    TAO_SYSTEM_EXCEPTION (NO_MEMORY) \
+    TAO_SYSTEM_EXCEPTION (IMP_LIMIT) \
+    TAO_SYSTEM_EXCEPTION (COMM_FAILURE) \
+    TAO_SYSTEM_EXCEPTION (INV_OBJREF) \
+    TAO_SYSTEM_EXCEPTION (OBJECT_NOT_EXIST) \
+    TAO_SYSTEM_EXCEPTION (NO_PERMISSION) \
+    TAO_SYSTEM_EXCEPTION (INTERNAL) \
+    TAO_SYSTEM_EXCEPTION (MARSHAL) \
+    TAO_SYSTEM_EXCEPTION (INITIALIZE) \
+    TAO_SYSTEM_EXCEPTION (NO_IMPLEMENT) \
+    TAO_SYSTEM_EXCEPTION (BAD_TYPECODE) \
+    TAO_SYSTEM_EXCEPTION (BAD_OPERATION) \
+    TAO_SYSTEM_EXCEPTION (NO_RESOURCES) \
+    TAO_SYSTEM_EXCEPTION (NO_RESPONSE) \
+    TAO_SYSTEM_EXCEPTION (PERSIST_STORE) \
+    TAO_SYSTEM_EXCEPTION (BAD_INV_ORDER) \
+    TAO_SYSTEM_EXCEPTION (TRANSIENT) \
+    TAO_SYSTEM_EXCEPTION (FREE_MEM) \
+    TAO_SYSTEM_EXCEPTION (INV_IDENT) \
+    TAO_SYSTEM_EXCEPTION (INV_FLAG) \
+    TAO_SYSTEM_EXCEPTION (INTF_REPOS) \
+    TAO_SYSTEM_EXCEPTION (BAD_CONTEXT) \
+    TAO_SYSTEM_EXCEPTION (OBJ_ADAPTER) \
+    TAO_SYSTEM_EXCEPTION (DATA_CONVERSION) \
+    TAO_SYSTEM_EXCEPTION (INV_POLICY) \
+    TAO_SYSTEM_EXCEPTION (REBIND) \
+    TAO_SYSTEM_EXCEPTION (TIMEOUT) \
+    TAO_SYSTEM_EXCEPTION (TRANSACTION_UNAVAILABLE) \
+    TAO_SYSTEM_EXCEPTION (TRANSACTION_MODE) \
+    TAO_SYSTEM_EXCEPTION (TRANSACTION_REQUIRED) \
+    TAO_SYSTEM_EXCEPTION (TRANSACTION_ROLLEDBACK) \
+    TAO_SYSTEM_EXCEPTION (INVALID_TRANSACTION) \
+    TAO_SYSTEM_EXCEPTION (CODESET_INCOMPATIBLE) \
+    TAO_SYSTEM_EXCEPTION (BAD_QOS) \
+    TAO_SYSTEM_EXCEPTION (INVALID_ACTIVITY) \
+    TAO_SYSTEM_EXCEPTION (ACTIVITY_COMPLETED) \
+    TAO_SYSTEM_EXCEPTION (ACTIVITY_REQUIRED) \
+    TAO_SYSTEM_EXCEPTION (THREAD_CANCELLED) \
+    TAO_SYSTEM_EXCEPTION (WrongTransaction) \
+    TAO_SYSTEM_EXCEPTION (PolicyError) \
+    TAO_SYSTEM_EXCEPTION (InvalidPolicies)
+
+#define TAO_SYSTEM_EXCEPTION(name) \
+  virtual CORBA::TypeCode_ptr _tao_type_ ## name (void) const = 0;
+
+ANYTYPECODE__EXCEPTION_LIST
+#undef  TAO_SYSTEM_EXCEPTION
+
+  virtual void insert_into_any (CORBA::Any * any, CORBA::Char const * mychar) = 0;
+
+  virtual void insert_into_any (CORBA::Any * any, CORBA::WChar const * mywchar) = 0;
+
+  virtual void insert_into_any (CORBA::Any * any, CORBA::Policy_ptr policy) = 0;
+
+  virtual void insert_into_any (CORBA::Any * any, CORBA::Policy_ptr * policy) = 0;
+
+  virtual void insert_into_any (CORBA::Any * any, CORBA::ULong value) = 0;
+
+  virtual void insert_into_any (CORBA::Any * any, CORBA::Long value) = 0;
+
+  virtual void insert_into_any (CORBA::Any * any, CORBA::Short value) = 0;
+
+  virtual void insert_into_any (CORBA::Any * any, ACE_OutputCDR::from_wchar value) = 0;
+
+  virtual void insert_into_any (CORBA::Any * any, ACE_OutputCDR::from_char value) = 0;
+
+  virtual void insert_into_any (CORBA::Any * any, ACE_OutputCDR::from_octet value) = 0;
+
+  virtual void insert_into_any (CORBA::Any * any, ACE_OutputCDR::from_boolean value) = 0;
+};
+
+#include /**/ "ace/post.h"
+#endif /* TAO_ANYTYPECODE_ADAPTER */
diff --git a/TAO/tao/Any_Arg_Traits.h b/TAO/tao/Any_Arg_Traits.h
deleted file mode 100644
index 5cbf50e0558..00000000000
--- a/TAO/tao/Any_Arg_Traits.h
+++ /dev/null
@@ -1,51 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Any_Arg_Traits.h
- *
- *  $Id$
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
-
-#ifndef TAO_ANY_ARG_TRAITS_H
-#define TAO_ANY_ARG_TRAITS_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/TAO_Export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Var_Size_Argument_T.h"
-#include "tao/Arg_Traits_T.h"
-
-namespace CORBA
-{
-  class Any;
-  class Any_var;
-  class Any_out;
-}
-
-namespace TAO
-{
-  template<>
-  class TAO_Export Arg_Traits<CORBA::Any>
-    : public
-        Var_Size_Arg_Traits_T<
-            CORBA::Any,
-            CORBA::Any_var,
-            CORBA::Any_out
-          >
-  {
-  };
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_ANY_ARG_TRAITS_H */
diff --git a/TAO/tao/Any_Array_Impl_T.cpp b/TAO/tao/Any_Array_Impl_T.cpp
deleted file mode 100644
index de648b9cd5e..00000000000
--- a/TAO/tao/Any_Array_Impl_T.cpp
+++ /dev/null
@@ -1,162 +0,0 @@
-// $Id$
-
-#ifndef TAO_ANY_ARRAY_IMPL_T_C
-#define TAO_ANY_ARRAY_IMPL_T_C
-
-#include "tao/Any_Array_Impl_T.h"
-#include "tao/Any_Unknown_IDL_Type.h"
-#include "tao/Marshal.h"
-#include "tao/debug.h"
-#include "tao/CDR.h"
-#include "tao/SystemException.h"
-
-#include "ace/CORBA_macros.h"
-#include "ace/Auto_Ptr.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tao/Any_Array_Impl_T.inl"
-#endif /* ! __ACE_INLINE__ */
-
-ACE_RCSID (tao,
-           Any_Array_Impl_T,
-           "$Id$")
-
-template<typename T_slice, typename T_forany>
-TAO::Any_Array_Impl_T<T_slice, T_forany>::Any_Array_Impl_T (
-    _tao_destructor destructor,
-    CORBA::TypeCode_ptr tc,
-    T_slice * const val
-  )
-  : Any_Impl (destructor,
-              tc),
-    value_ (val)
-{
-}
-
-template<typename T_slice, typename T_forany>
-TAO::Any_Array_Impl_T<T_slice, T_forany>::~Any_Array_Impl_T (void)
-{
-}
-
-template<typename T_slice, typename T_forany>
-void
-TAO::Any_Array_Impl_T<T_slice, T_forany>::insert (CORBA::Any & any,
-                                                  _tao_destructor destructor,
-                                                  CORBA::TypeCode_ptr tc,
-                                                  T_slice * const value)
-{
-  TAO::Any_Array_Impl_T<T_slice, T_forany> *new_impl = 0;
-  typedef TAO::Any_Array_Impl_T<T_slice, T_forany> ARRAY_ANY_IMPL;
-  ACE_NEW (new_impl,
-           ARRAY_ANY_IMPL (destructor,
-                           tc,
-                           value));
-  any.replace (new_impl);
-}
-
-template<typename T_slice, typename T_forany>
-CORBA::Boolean
-TAO::Any_Array_Impl_T<T_slice, T_forany>::extract (const CORBA::Any & any,
-                                                   _tao_destructor destructor,
-                                                   CORBA::TypeCode_ptr tc,
-                                                   T_slice *& _tao_elem)
-{
-  _tao_elem = 0;
-
-  ACE_TRY_NEW_ENV
-    {
-      CORBA::TypeCode_ptr any_tc = any._tao_get_typecode ();
-      const CORBA::Boolean _tao_equiv =
-        any_tc->equivalent (tc
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (_tao_equiv == 0)
-        {
-          return 0;
-        }
-
-      TAO::Any_Impl *impl = any.impl ();
-
-      if (!impl->encoded ())
-        {
-          TAO::Any_Array_Impl_T<T_slice, T_forany> *narrow_impl =
-            dynamic_cast <TAO::Any_Array_Impl_T <T_slice, T_forany> *> (impl);
-
-          if (narrow_impl == 0)
-            {
-              return 0;
-            }
-
-          _tao_elem = reinterpret_cast <T_slice*> (narrow_impl->value_);
-          return 1;
-        }
-
-      TAO::Any_Array_Impl_T<T_slice, T_forany> *replacement = 0;
-      typedef TAO::Any_Array_Impl_T<T_slice, T_forany> ARRAY_ANY_IMPL;
-      ACE_NEW_RETURN (replacement,
-                      ARRAY_ANY_IMPL (destructor,
-                                      any_tc,
-                                      T_forany::tao_alloc ()),
-                      0);
-
-      auto_ptr<TAO::Any_Array_Impl_T<T_slice, T_forany> > replacement_safety (
-          replacement
-        );
-
-      // We know this will work since the unencoded case is covered above.  
-      TAO::Unknown_IDL_Type *unk =
-        dynamic_cast<TAO::Unknown_IDL_Type *> (impl);
-
-      // We don't want the rd_ptr of unk to move, in case it is
-      // shared by another Any. This copies the state, not the buffer.
-      TAO_InputCDR for_reading (unk->_tao_get_cdr ());
-
-      CORBA::Boolean good_decode =
-        replacement->demarshal_value (for_reading);
-
-      if (good_decode)
-        {
-          _tao_elem = reinterpret_cast <T_slice*> (replacement->value_);
-          const_cast<CORBA::Any &> (any).replace (replacement);
-          replacement_safety.release ();
-          return 1;
-        }
-
-      // Duplicated by Any_Impl base class constructor.
-      CORBA::release (any_tc);
-    }
-  ACE_CATCHANY
-    {
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
-
-template<typename T_slice, typename T_forany>
-void
-TAO::Any_Array_Impl_T<T_slice, T_forany>::free_value (void)
-{
-  if (this->value_destructor_ != 0)
-    {
-      (*this->value_destructor_) (this->value_);
-      this->value_destructor_ = 0;
-    }
-
-  this->value_ = 0;
-  CORBA::release (this->type_);
-}
-
-template<typename T_slice, typename T_forany>
-void
-TAO::Any_Array_Impl_T<T_slice, T_forany>::_tao_decode (TAO_InputCDR &cdr
-                                                       ACE_ENV_ARG_DECL)
-{
-  if (! this->demarshal_value (cdr))
-    {
-      ACE_THROW (CORBA::MARSHAL ());
-    }
-}
-
-#endif /* TAO_ANY_ARRAY_IMPL_T_C */
diff --git a/TAO/tao/Any_Array_Impl_T.h b/TAO/tao/Any_Array_Impl_T.h
deleted file mode 100644
index e594b6c2142..00000000000
--- a/TAO/tao/Any_Array_Impl_T.h
+++ /dev/null
@@ -1,85 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Any_Array_Impl_T.h
- *
- *  $Id$
- *
- *  @authors  Carlos O'Ryan and Jeff Parsons
- */
-//=============================================================================
-
-
-#ifndef TAO_ANY_ARRAY_IMPL_T_H
-#define TAO_ANY_ARRAY_IMPL_T_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/Any_Impl.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-namespace TAO
-{
-  /**
-   * @class Any_Array_Impl_T
-   *
-   * @brief Template Any class for array types.
-   *
-   * Used for arrays
-   */
-  template<typename T_slice, typename T_forany>
-  class Any_Array_Impl_T : public Any_Impl
-  {
-  public:
-    Any_Array_Impl_T (_tao_destructor destructor,
-                      CORBA::TypeCode_ptr,
-                      T_slice * const);
-    virtual ~Any_Array_Impl_T (void);
-
-    static void insert (CORBA::Any &,
-                        _tao_destructor destructor,
-                        CORBA::TypeCode_ptr,
-                        T_slice * const);
-    static CORBA::Boolean extract (const CORBA::Any &,
-                                   _tao_destructor,
-                                   CORBA::TypeCode_ptr,
-                                   T_slice *&);
-
-    virtual CORBA::Boolean marshal_value (TAO_OutputCDR &);
-    CORBA::Boolean demarshal_value (TAO_InputCDR &);
-    virtual void _tao_decode (TAO_InputCDR &
-                              ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    virtual const void *value (void) const;
-    virtual void free_value (void);
-
-  private:
-    T_slice * value_;
-  };
-}
-
-#if defined (__ACE_INLINE__)
-# include "tao/Any_Array_Impl_T.inl"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#endif /* __ACE_INLINE__ */
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "tao/Any_Array_Impl_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Any_Array_Impl_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_ANY_ARRAY_IMPL_T_H */
-
diff --git a/TAO/tao/Any_Array_Impl_T.inl b/TAO/tao/Any_Array_Impl_T.inl
deleted file mode 100644
index 876b658d0ae..00000000000
--- a/TAO/tao/Any_Array_Impl_T.inl
+++ /dev/null
@@ -1,28 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-template<typename T_slice, typename T_forany>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Array_Impl_T<T_slice, T_forany>::marshal_value (TAO_OutputCDR &cdr)
-{
-  return (cdr << T_forany (this->value_));
-}
-
-template<typename T_slice, typename T_forany>
-ACE_INLINE
-CORBA::Boolean
-TAO::Any_Array_Impl_T<T_slice, T_forany>::demarshal_value (TAO_InputCDR &cdr)
-{
-  T_forany tmp (this->value_);
-  return (cdr >> tmp);
-}
-
-template<typename T_slice, typename T_forany>
-ACE_INLINE
-const void *
-TAO::Any_Array_Impl_T<T_slice, T_forany>::value (void) const
-{
-  return this->value_;
-}
diff --git a/TAO/tao/Any_Basic_Impl.cpp b/TAO/tao/Any_Basic_Impl.cpp
deleted file mode 100644
index 3d333d66b8e..00000000000
--- a/TAO/tao/Any_Basic_Impl.cpp
+++ /dev/null
@@ -1,382 +0,0 @@
-// $Id$
-
-#include "tao/Any_Basic_Impl.h"
-#include "tao/Any_Unknown_IDL_Type.h"
-#include "tao/Any.h"
-#include "tao/TypeCode.h"
-#include "tao/CDR.h"
-#include "tao/SystemException.h"
-
-#include "ace/Auto_Ptr.h"
-#include "ace/OS_NS_string.h"
-
-ACE_RCSID (tao,
-           Any_Basic_Impl,
-           "$Id$")
-
-namespace TAO
-{
-  Any_Basic_Impl::Any_Basic_Impl (CORBA::TypeCode_ptr tc,
-                                  void *value)
-    : Any_Impl (0, tc),
-      kind_ (CORBA::tk_null)
-  {
-    ACE_DECLARE_NEW_CORBA_ENV;
-    this->kind_ = TAO::unaliased_kind (tc
-                                       ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK;
-
-    switch (this->kind_)
-    {
-      case CORBA::tk_short:
-        this->u_.s = *static_cast<CORBA::Short *> (value);
-        break;
-      case CORBA::tk_ushort:
-        this->u_.us = *static_cast<CORBA::UShort *> (value);
-        break;
-      case CORBA::tk_long:
-        this->u_.l = *static_cast<CORBA::Long *> (value);
-        break;
-      case CORBA::tk_ulong:
-         this->u_.ul = *static_cast<CORBA::ULong *> (value);
-        break;
-      case CORBA::tk_float:
-        this->u_.f = *static_cast<CORBA::Float *> (value);
-        break;
-      case CORBA::tk_double:
-        this->u_.d = *static_cast<CORBA::Double *> (value);
-        break;
-      case CORBA::tk_boolean:
-        this->u_.b = *static_cast<CORBA::Boolean *> (value);
-        break;
-      case CORBA::tk_char:
-        this->u_.c = *static_cast<CORBA::Char *> (value);
-        break;
-      case CORBA::tk_octet:
-        this->u_.o = *static_cast<CORBA::Octet *> (value);
-        break;
-      case CORBA::tk_longlong:
-        this->u_.ll = *static_cast<CORBA::LongLong *> (value);
-        break;
-#if !defined (ACE_LACKS_LONGLONG_T)
-      case CORBA::tk_ulonglong:
-  #if !defined (ACE_LACKS_UNSIGNEDLONGLONG_T)
-        this->u_.ull = *static_cast<CORBA::ULongLong *> (value);
-  #else
-        this->u_.ull = *static_cast<CORBA::LongLong *> (value);
-  #endif
-        break;
-#endif
-      case CORBA::tk_longdouble:
-        this->u_.ld = *static_cast<CORBA::LongDouble *> (value);
-        break;
-      case CORBA::tk_wchar:
-        this->u_.wc = *static_cast<CORBA::WChar *> (value);
-        break;
-      default:
-        break;
-    }
-  }
-
-  Any_Basic_Impl::~Any_Basic_Impl (void)
-  {
-  }
-
-  void
-  Any_Basic_Impl::insert (CORBA::Any &any,
-                          CORBA::TypeCode_ptr tc,
-                          const void *value)
-  {
-    Any_Basic_Impl *new_impl = 0;
-    ACE_NEW (new_impl,
-             Any_Basic_Impl (tc,
-                             const_cast<void *> (value)));
-    any.replace (new_impl);
-  }
-
-  CORBA::Boolean
-  Any_Basic_Impl::extract (const CORBA::Any &any,
-                           CORBA::TypeCode_ptr tc,
-                           void *_tao_elem)
-  {
-    ACE_TRY_NEW_ENV
-      {
-        CORBA::TypeCode_ptr any_tc = any._tao_get_typecode ();
-        CORBA::Boolean _tao_equiv =
-          any_tc->equivalent (tc
-                              ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-
-        if (_tao_equiv == 0)
-          {
-            return 0;
-          }
-
-        TAO::Any_Impl *impl = any.impl ();
-
-        if (!impl->encoded ())
-          {
-            TAO::Any_Basic_Impl *narrow_impl =
-              dynamic_cast<TAO::Any_Basic_Impl *> (impl);
-
-            if (narrow_impl == 0)
-              {
-                return 0;
-              }
-
-            Any_Basic_Impl::assign_value (_tao_elem,
-                                          narrow_impl);
-            return 1;
-          }
-
-        TAO::Any_Basic_Impl *replacement =
-          TAO::Any_Basic_Impl::create_empty (any_tc);
-
-        auto_ptr<TAO::Any_Basic_Impl> replacement_safety (replacement);
-
-        // We know this will work since the unencoded case is covered above.
-        TAO::Unknown_IDL_Type *unk =
-          dynamic_cast<TAO::Unknown_IDL_Type *> (impl);
-
-        // Get the kind of the type where we are extracting in ie. the
-        // aliased  type if there are any. Passing the aliased kind
-        // will not help.
-        CORBA::TCKind const tck = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-
-        // We don't want the rd_ptr of unk to move, in case it is
-        // shared by another Any. This copies the state, not the buffer.
-        TAO_InputCDR for_reading (unk->_tao_get_cdr ());
-
-        CORBA::Boolean good_decode =
-          replacement->demarshal_value (for_reading,
-                                        static_cast<CORBA::Long> (tck));
-
-        if (good_decode)
-          {
-            Any_Basic_Impl::assign_value (_tao_elem,
-                                          replacement,
-                                          tck);
-            const_cast<CORBA::Any &> (any).replace (replacement);
-            replacement_safety.release ();
-            return 1;
-          }
-
-        // Duplicated by Any_Impl base class constructor.
-        CORBA::release (any_tc);
-      }
-    ACE_CATCHANY
-      {
-      }
-    ACE_ENDTRY;
-
-    return 0;
-  }
-
-  CORBA::Boolean
-  Any_Basic_Impl::marshal_value (TAO_OutputCDR &cdr)
-  {
-    CORBA::TCKind tckind = static_cast<CORBA::TCKind> (this->kind_);
-
-    switch (tckind)
-    {
-      case CORBA::tk_short:
-        return cdr << this->u_.s;
-      case CORBA::tk_ushort:
-        return cdr << this->u_.us;
-      case CORBA::tk_long:
-        return cdr << this->u_.l;
-      case CORBA::tk_ulong:
-        return cdr << this->u_.ul;
-      case CORBA::tk_float:
-        return cdr << this->u_.f;
-      case CORBA::tk_double:
-        return cdr << this->u_.d;
-      case CORBA::tk_boolean:
-        return cdr << CORBA::Any::from_boolean (this->u_.b);
-      case CORBA::tk_char:
-        return cdr << CORBA::Any::from_char (this->u_.c);
-      case CORBA::tk_octet:
-        return cdr << CORBA::Any::from_octet (this->u_.o);
-      case CORBA::tk_longlong:
-        return cdr << this->u_.ll;
-#if !defined (ACE_LACKS_LONGLONG_T)
-      case CORBA::tk_ulonglong:
-        return cdr << this->u_.ull;
-#endif
-      case CORBA::tk_longdouble:
-        return cdr << this->u_.ld;
-      case CORBA::tk_wchar:
-        return cdr << CORBA::Any::from_wchar (this->u_.wc);
-      default:
-        return 0;
-    }
-  }
-
-  CORBA::Boolean
-  Any_Basic_Impl::demarshal_value (TAO_InputCDR &cdr)
-  {
-    return this->demarshal_value (cdr,
-                                  this->kind_);
-  }
-
-  CORBA::Boolean
-  Any_Basic_Impl::demarshal_value (TAO_InputCDR &cdr,
-                                   CORBA::Long tck)
-  {
-    CORBA::TCKind const tckind = static_cast<CORBA::TCKind> (tck);
-    switch (tckind)
-    {
-      case CORBA::tk_short:
-        return cdr >> this->u_.s;
-      case CORBA::tk_ushort:
-        return cdr >> this->u_.us;
-      case CORBA::tk_long:
-        return cdr >> this->u_.l;
-      case CORBA::tk_ulong:
-        return cdr >> this->u_.ul;
-      case CORBA::tk_float:
-        return cdr >> this->u_.f;
-      case CORBA::tk_double:
-        return cdr >> this->u_.d;
-      case CORBA::tk_boolean:
-        return cdr >> CORBA::Any::to_boolean (this->u_.b);
-      case CORBA::tk_char:
-        return cdr >> CORBA::Any::to_char (this->u_.c);
-      case CORBA::tk_octet:
-        return cdr >> CORBA::Any::to_octet (this->u_.o);
-      case CORBA::tk_longlong:
-        return cdr >> this->u_.ll;
-#if !defined (ACE_LACKS_LONGLONG_T)
-      case CORBA::tk_ulonglong:
-        return cdr >> this->u_.ull;
-#endif
-      case CORBA::tk_longdouble:
-        return cdr >> this->u_.ld;
-      case CORBA::tk_wchar:
-        return cdr >> CORBA::Any::to_wchar (this->u_.wc);
-      default:
-        return 0;
-    }
-  }
-
-  void
-  Any_Basic_Impl::_tao_decode (TAO_InputCDR &cdr
-                               ACE_ENV_ARG_DECL)
-  {
-    if (! this->demarshal_value (cdr))
-      {
-        ACE_THROW (CORBA::MARSHAL ());
-      }
-  }
-
-  Any_Basic_Impl *
-  Any_Basic_Impl::create_empty (CORBA::TypeCode_ptr tc)
-  {
-    ACE_DECLARE_NEW_CORBA_ENV;
-    CORBA::TCKind const kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK_RETURN (0);
-
-    TAO::Any_Basic_Impl * retval = 0;
-
-    switch (kind)
-    {
-      case CORBA::tk_longlong:
-        {
-          CORBA::LongLong tmp = ACE_CDR_LONGLONG_INITIALIZER;
-          ACE_NEW_RETURN (retval,
-                          TAO::Any_Basic_Impl (tc, &tmp),
-                          0);
-        }
-
-        break;
-      case CORBA::tk_longdouble:
-        {
-          CORBA::LongDouble tmp = ACE_CDR_LONG_DOUBLE_INITIALIZER;
-          ACE_NEW_RETURN (retval,
-                          TAO::Any_Basic_Impl (tc, &tmp),
-                          0);
-        }
-
-        break;
-      default:
-        {
-          CORBA::ULongLong tmp = 0;
-          ACE_NEW_RETURN (retval,
-                          TAO::Any_Basic_Impl (tc, &tmp),
-                          0);
-        }
-
-        break;
-    }
-
-    return retval;
-  }
-
-  void
-  Any_Basic_Impl::assign_value (void *dest, Any_Basic_Impl *src)
-  {
-    Any_Basic_Impl::assign_value (dest,
-                                  src,
-                                  src->kind_);
-  }
-
-  void
-  Any_Basic_Impl::assign_value (void *dest,
-                                Any_Basic_Impl *src,
-                                CORBA::Long tck)
-  {
-    CORBA::TCKind const kind = static_cast<CORBA::TCKind> (tck);
-
-    switch (kind)
-      {
-      case CORBA::tk_short:
-        *static_cast<CORBA::Short *> (dest) = src->u_.s;
-        break;
-      case CORBA::tk_ushort:
-        *static_cast<CORBA::UShort *> (dest) = src->u_.us;
-        break;
-      case CORBA::tk_long:
-        *static_cast<CORBA::Long *> (dest) = src->u_.l;
-        break;
-      case CORBA::tk_ulong:
-        *static_cast<CORBA::ULong *> (dest) = src->u_.ul;
-        break;
-      case CORBA::tk_float:
-        *static_cast<CORBA::Float *> (dest) = src->u_.f;
-        break;
-      case CORBA::tk_double:
-        *static_cast<CORBA::Double *> (dest) = src->u_.d;
-        break;
-      case CORBA::tk_boolean:
-        *static_cast<CORBA::Boolean *> (dest) = src->u_.b;
-        break;
-      case CORBA::tk_char:
-        *static_cast<CORBA::Char *> (dest) = src->u_.c;
-        break;
-      case CORBA::tk_octet:
-        *static_cast<CORBA::Octet *> (dest) = src->u_.o;
-        break;
-      case CORBA::tk_longlong:
-        *static_cast<CORBA::LongLong *> (dest) = src->u_.ll;
-        break;
-#if !defined (ACE_LACKS_LONGLONG_T)
-      case CORBA::tk_ulonglong:
-  #if !defined (ACE_LACKS_UNSIGNEDLONGLONG_T)
-        *static_cast<CORBA::ULongLong *> (dest) = src->u_.ull;
-        break;
-  #else
-        *static_cast<CORBA::LongLong *> (dest) = src->u_.ull;
-  #endif
-#endif
-      case CORBA::tk_longdouble:
-        *static_cast<CORBA::LongDouble *> (dest) = src->u_.ld;
-        break;
-      case CORBA::tk_wchar:
-        *static_cast<CORBA::WChar *> (dest) = src->u_.wc;
-        break;
-      default:
-        break;
-      }
-  }
-}
diff --git a/TAO/tao/Any_Basic_Impl.h b/TAO/tao/Any_Basic_Impl.h
deleted file mode 100644
index 600b11ef69a..00000000000
--- a/TAO/tao/Any_Basic_Impl.h
+++ /dev/null
@@ -1,97 +0,0 @@
-// -*- C++ -*-
-//=============================================================================
-/**
- *  @file    Any_Basic_Impl.h
- *
- *  $Id$
- *
- *  @authors  Carlos O'Ryan and Jeff Parsons
- */
-//=============================================================================
-
-#ifndef TAO_ANY_BASIC_IMPL_H
-#define TAO_ANY_BASIC_IMPL_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/Any_Impl.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-namespace CORBA
-{
-  class Any;
-}
-
-namespace TAO
-{
-  /**
-   * @class Any_Basic_Impl
-   *
-   * @brief Non-template class for all the basic types.
-   *
-   */
-  class TAO_Export Any_Basic_Impl : public Any_Impl
-  {
-  public:
-    Any_Basic_Impl (CORBA::TypeCode_ptr,
-                    void *value);
-
-    virtual ~Any_Basic_Impl (void);
-
-    static void insert (CORBA::Any &,
-                        CORBA::TypeCode_ptr,
-                        const void *);
-    static CORBA::Boolean extract (const CORBA::Any &,
-                                   CORBA::TypeCode_ptr,
-                                   void *);
-
-    virtual CORBA::Boolean marshal_value (TAO_OutputCDR &);
-
-    CORBA::Boolean demarshal_value (TAO_InputCDR &);
-    CORBA::Boolean demarshal_value (TAO_InputCDR &,
-                                    CORBA::Long);
-
-    virtual void _tao_decode (TAO_InputCDR &
-                              ACE_ENV_ARG_DECL);
-
-    static Any_Basic_Impl *create_empty (CORBA::TypeCode_ptr);
-
-  private:
-    static void assign_value (void *, Any_Basic_Impl *);
-
-    static void assign_value (void *,
-                              Any_Basic_Impl *,
-                              CORBA::Long tck);
-  private:
-    CORBA::Long kind_;
-    union
-    {
-      CORBA::Short s;
-      CORBA::UShort us;
-      CORBA::Long l;
-      CORBA::ULong ul;
-      CORBA::Float f;
-      CORBA::Double d;
-      CORBA::Boolean b;
-      CORBA::Char c;
-      CORBA::Octet o;
-      CORBA::LongLong ll;
-#if !defined (ACE_LACKS_LONGLONG_T) && !defined (ACE_LACKS_UNSIGNEDLONGLONG_T)
-      CORBA::ULongLong ull;
-#elif defined (ACE_LACKS_UNSIGNEDLONGLONG_T)
-      // Platform has signed long long but not unsigned long long.
-      // Use signed long long as the container.
-      CORBA::LongLong ull;
-#endif
-      CORBA::LongDouble ld;
-      CORBA::WChar wc;
-    }u_;
-  };
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_ANY_BASIC_IMPL_H */
diff --git a/TAO/tao/Any_Basic_Impl_T.cpp b/TAO/tao/Any_Basic_Impl_T.cpp
deleted file mode 100644
index 79bb6a1896b..00000000000
--- a/TAO/tao/Any_Basic_Impl_T.cpp
+++ /dev/null
@@ -1,144 +0,0 @@
-// $Id$
-
-#ifndef TAO_ANY_BASIC_IMPL_T_C
-#define TAO_ANY_BASIC_IMPL_T_C
-
-#include "tao/Any_Basic_Impl_T.h"
-#include "tao/Any_Unknown_IDL_Type.h"
-#include "tao/Marshal.h"
-#include "tao/Environment.h"
-#include "tao/SystemException.h"
-#include "tao/CDR.h"
-
-#include "ace/CORBA_macros.h"
-#include "ace/Auto_Ptr.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tao/Any_Basic_Impl_T.inl"
-#endif /* ! __ACE_INLINE__ */
-
-ACE_RCSID (tao,
-           Any_Basic_Impl_T,
-           "$Id$")
-
-
-template<typename T>
-TAO::Any_Basic_Impl_T<T>::Any_Basic_Impl_T (CORBA::TypeCode_ptr tc,
-                                            const T & val)
-  : Any_Impl (0,
-              tc),
-    value_ (val)
-{
-}
-
-template<typename T>
-TAO::Any_Basic_Impl_T<T>::~Any_Basic_Impl_T (void)
-{
-}
-
-template<typename T>
-void
-TAO::Any_Basic_Impl_T<T>::insert (CORBA::Any & any,
-                                  CORBA::TypeCode_ptr tc,
-                                  const T & value)
-{
-  Any_Basic_Impl_T<T> *new_impl = 0;
-  ACE_NEW (new_impl,
-           Any_Basic_Impl_T (tc,
-                             value));
-  any.replace (new_impl);
-}
-
-template<typename T>
-CORBA::Boolean
-TAO::Any_Basic_Impl_T<T>::extract (const CORBA::Any & any,
-                                   CORBA::TypeCode_ptr tc,
-                                   T & _tao_elem)
-{
-  ACE_TRY_NEW_ENV
-    {
-      CORBA::TypeCode_ptr any_tc = any._tao_get_typecode ();
-      CORBA::Boolean _tao_equiv = any_tc->equivalent (tc
-                                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (_tao_equiv == 0)
-        {
-          return 0;
-        }
-
-      TAO::Any_Impl *impl = any.impl ();
-
-      if (!impl->encoded ())
-        {
-          TAO::Any_Basic_Impl_T<T> *narrow_impl =
-            dynamic_cast <TAO::Any_Basic_Impl_T<T> *> (impl);
-
-          if (narrow_impl == 0)
-            {
-              return 0;
-            }
-
-          _tao_elem = narrow_impl->value_;
-          return 1;
-        }
-
-      TAO::Any_Basic_Impl_T<T> *replacement =
-        TAO::Any_Basic_Impl_T<T>::create_empty (any_tc);
-
-      auto_ptr<TAO::Any_Basic_Impl_T<T> > replacement_safety (replacement);
-
-      // We know this will work since the unencoded case is covered above.  
-      TAO::Unknown_IDL_Type *unk =
-        dynamic_cast<TAO::Unknown_IDL_Type *> (impl);
-
-      // We don't want the rd_ptr of unk to move, in case it is
-      // shared by another Any. This copies the state, not the buffer.
-      TAO_InputCDR for_reading (unk->_tao_get_cdr ());
-
-      CORBA::Boolean good_decode =
-        replacement->demarshal_value (for_reading);
-
-      if (good_decode)
-        {
-          _tao_elem = replacement->value_;
-          const_cast<CORBA::Any &> (any).replace (replacement);
-          replacement_safety.release ();
-          return 1;
-        }
-
-      // Duplicated by Any_Impl base class constructor.
-      CORBA::release (any_tc);
-    }
-  ACE_CATCHANY
-    {
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
-
-template<typename T>
-TAO::Any_Basic_Impl_T<T> *
-TAO::Any_Basic_Impl_T<T>::create_empty (CORBA::TypeCode_ptr tc)
-{
-  TAO::Any_Basic_Impl_T<T> * retval = 0;
-  ACE_NEW_RETURN (retval,
-                  TAO::Any_Basic_Impl_T<T> (tc,
-                                            static_cast<T> (0)),
-                  0);
-  return retval;
-}
-
-template<typename T>
-void
-TAO::Any_Basic_Impl_T<T>::_tao_decode (TAO_InputCDR &cdr
-                                       ACE_ENV_ARG_DECL)
-{
-  if (! this->demarshal_value (cdr))
-    {
-      ACE_THROW (CORBA::MARSHAL ());
-    }
-}
-
-#endif /* TAO_ANY_BASIC_IMPL_T_C */
diff --git a/TAO/tao/Any_Basic_Impl_T.h b/TAO/tao/Any_Basic_Impl_T.h
deleted file mode 100644
index 7c9c3f697c1..00000000000
--- a/TAO/tao/Any_Basic_Impl_T.h
+++ /dev/null
@@ -1,82 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Any_Basic_Impl_T.h
- *
- *  $Id$
- *
- *  @authors  Carlos O'Ryan and Jeff Parsons
- */
-//=============================================================================
-
-
-#ifndef TAO_ANY_BASIC_IMPL_T_H
-#define TAO_ANY_BASIC_IMPL_T_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/Any_Impl.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-namespace TAO
-{
-  /**
-   * @class Any_Basic_Impl_T
-   *
-   * @brief Template Any class for basic types.
-   *
-   * Used for all basic IDL types except bounded (w)strings.
-   */
-  template<typename T>
-  class Any_Basic_Impl_T : public Any_Impl
-  {
-  public:
-    Any_Basic_Impl_T (CORBA::TypeCode_ptr,
-                      const T & val);
-    virtual ~Any_Basic_Impl_T (void);
-
-    static void insert (CORBA::Any &,
-                        CORBA::TypeCode_ptr,
-                        const T &);
-    static CORBA::Boolean extract (const CORBA::Any &,
-                                   CORBA::TypeCode_ptr,
-                                   T &);
-
-    virtual CORBA::Boolean marshal_value (TAO_OutputCDR &);
-    CORBA::Boolean demarshal_value (TAO_InputCDR &);
-    virtual void _tao_decode (TAO_InputCDR &
-                              ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    virtual const void *value (void) const;
-    static Any_Basic_Impl_T<T> *create_empty (CORBA::TypeCode_ptr);
-
-  private:
-    T value_;
-  };
-}
-
-#if defined (__ACE_INLINE__)
-# include "tao/Any_Basic_Impl_T.inl"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#endif /* __ACE_INLINE__ */
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "tao/Any_Basic_Impl_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Any_Basic_Impl_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_ANY_BASIC_IMPL_T_H */
-
diff --git a/TAO/tao/Any_Basic_Impl_T.inl b/TAO/tao/Any_Basic_Impl_T.inl
deleted file mode 100644
index 4250b5f4f88..00000000000
--- a/TAO/tao/Any_Basic_Impl_T.inl
+++ /dev/null
@@ -1,26 +0,0 @@
-// $Id$
-
-template<typename T> 
-ACE_INLINE 
-CORBA::Boolean
-TAO::Any_Basic_Impl_T<T>::marshal_value (TAO_OutputCDR &cdr)
-{
-  return (cdr << this->value_);
-}
-
-template<typename T> 
-ACE_INLINE 
-CORBA::Boolean
-TAO::Any_Basic_Impl_T<T>::demarshal_value (TAO_InputCDR &cdr)
-{
-  return (cdr >> this->value_);
-}
-
-template<typename T> 
-ACE_INLINE 
-const void *
-TAO::Any_Basic_Impl_T<T>::value (void) const
-{
-  return &this->value_;
-}
-
diff --git a/TAO/tao/Any_Dual_Impl_T.cpp b/TAO/tao/Any_Dual_Impl_T.cpp
deleted file mode 100644
index 30bc144035c..00000000000
--- a/TAO/tao/Any_Dual_Impl_T.cpp
+++ /dev/null
@@ -1,202 +0,0 @@
-// $Id$
-
-#ifndef TAO_ANY_DUAL_IMPL_T_CPP
-#define TAO_ANY_DUAL_IMPL_T_CPP
-
-#include "tao/Any_Dual_Impl_T.h"
-#include "tao/Any.h"
-#include "tao/Any_Unknown_IDL_Type.h"
-#include "tao/Marshal.h"
-#include "tao/CORBA_String.h"
-#include "tao/Environment.h"
-#include "tao/SystemException.h"
-#include "tao/CDR.h"
-#include "tao/TypeCode.h"
-
-#include "ace/CORBA_macros.h"
-#include "ace/Auto_Ptr.h"
-#include "ace/OS_Memory.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tao/Any_Dual_Impl_T.inl"
-#endif /* ! __ACE_INLINE__ */
-
-ACE_RCSID (tao,
-           Any_Dual_Impl_T,
-           "$Id$")
-
-template<typename T>
-TAO::Any_Dual_Impl_T<T>::Any_Dual_Impl_T (_tao_destructor destructor,
-                                          CORBA::TypeCode_ptr tc,
-                                          T * const val)
-  : Any_Impl (destructor,
-              tc),
-    value_ (val)
-{
-}
-
-template<typename T> void
-TAO::Any_Dual_Impl_T<T>::value (const T & val)
-{
-  ACE_NEW (this->value_,
-           T (val));
-}
-
-template<typename T>
-TAO::Any_Dual_Impl_T<T>::Any_Dual_Impl_T (_tao_destructor destructor,
-                                          CORBA::TypeCode_ptr tc,
-                                          const T & val)
-  : Any_Impl (destructor,
-              tc)
-{
-  this->value (val);
-}
-
-template<typename T>
-TAO::Any_Dual_Impl_T<T>::Any_Dual_Impl_T (CORBA::TypeCode_ptr tc)
-  : Any_Impl (0,
-              tc)
-{
-}
-
-template<typename T>
-TAO::Any_Dual_Impl_T<T>::~Any_Dual_Impl_T (void)
-{
-}
-
-template<typename T>
-void
-TAO::Any_Dual_Impl_T<T>::insert (CORBA::Any & any,
-                                 _tao_destructor destructor,
-                                 CORBA::TypeCode_ptr tc,
-                                 T * const value)
-{
-  Any_Dual_Impl_T<T> *new_impl = 0;
-  ACE_NEW (new_impl,
-           Any_Dual_Impl_T (destructor,
-                            tc,
-                            value));
-  any.replace (new_impl);
-}
-
-template<typename T>
-void
-TAO::Any_Dual_Impl_T<T>::insert_copy (CORBA::Any & any,
-                                      _tao_destructor destructor,
-                                      CORBA::TypeCode_ptr tc,
-                                      const T & value)
-{
-  Any_Dual_Impl_T<T> *new_impl = 0;
-  ACE_NEW (new_impl,
-           Any_Dual_Impl_T (destructor,
-                            tc,
-                            value));
-  any.replace (new_impl);
-}
-
-template<typename T>
-CORBA::Boolean
-TAO::Any_Dual_Impl_T<T>::extract (const CORBA::Any & any,
-                                  _tao_destructor destructor,
-                                  CORBA::TypeCode_ptr tc,
-                                  const T *& _tao_elem)
-{
-  _tao_elem = 0;
-
-  ACE_TRY_NEW_ENV
-    {
-      CORBA::TypeCode_ptr any_tc = any._tao_get_typecode ();
-      CORBA::Boolean _tao_equiv = any_tc->equivalent (tc
-                                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (_tao_equiv == 0)
-        {
-          return 0;
-        }
-
-      TAO::Any_Impl *impl = any.impl ();
-
-      if (!impl->encoded ())
-        {
-          TAO::Any_Dual_Impl_T<T> *narrow_impl =
-            dynamic_cast <TAO::Any_Dual_Impl_T<T> *> (impl);
-
-          if (narrow_impl == 0)
-            {
-              return 0;
-            }
-
-          _tao_elem = narrow_impl->value_;
-          return 1;
-        }
-
-      T *empty_value = 0;
-      ACE_NEW_RETURN (empty_value,
-                      T,
-                      0);
-      TAO::Any_Dual_Impl_T<T> *replacement = 0;
-      ACE_NEW_RETURN (replacement,
-                      TAO::Any_Dual_Impl_T<T> (destructor,
-                                               any_tc,
-                                               empty_value),
-                      0);
-
-      auto_ptr<TAO::Any_Dual_Impl_T<T> > replacement_safety (replacement);
-
-      // We know this will work since the unencoded case is covered above.  
-      TAO::Unknown_IDL_Type *unk =
-        dynamic_cast<TAO::Unknown_IDL_Type *> (impl);
-
-      // We don't want the rd_ptr of unk to move, in case it is
-      // shared by another Any. This copies the state, not the buffer.
-      TAO_InputCDR for_reading (unk->_tao_get_cdr ());
-
-      CORBA::Boolean good_decode =
-        replacement->demarshal_value (for_reading);
-
-      if (good_decode)
-        {
-          _tao_elem = replacement->value_;
-          const_cast<CORBA::Any &> (any).replace (replacement);
-          replacement_safety.release ();
-          return 1;
-        }
-
-      // Duplicated by Any_Impl base class constructor.
-      CORBA::release (any_tc);
-    }
-  ACE_CATCHANY
-    {
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
-
-template<typename T>
-void
-TAO::Any_Dual_Impl_T<T>::free_value (void)
-{
-  if (this->value_destructor_ != 0)
-    {
-      (*this->value_destructor_) (this->value_);
-      this->value_destructor_ = 0;
-    }
-
-  CORBA::release (this->type_);
-  this->value_ = 0;
-}
-
-template<typename T>
-void
-TAO::Any_Dual_Impl_T<T>::_tao_decode (TAO_InputCDR &cdr
-                                      ACE_ENV_ARG_DECL)
-{
-  if (! this->demarshal_value (cdr))
-    {
-      ACE_THROW (CORBA::MARSHAL ());
-    }
-}
-
-#endif /* TAO_ANY_DUAL_IMPL_T_CPP */
diff --git a/TAO/tao/Any_Dual_Impl_T.h b/TAO/tao/Any_Dual_Impl_T.h
deleted file mode 100644
index 18cec8ec7b6..00000000000
--- a/TAO/tao/Any_Dual_Impl_T.h
+++ /dev/null
@@ -1,97 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Any_Dual_Impl_T.h
- *
- *  $Id$
- *
- *  @authors  Carlos O'Ryan and Jeff Parsons
- */
-//=============================================================================
-
-
-#ifndef TAO_ANY_DUAL_IMPL_T_H
-#define TAO_ANY_DUAL_IMPL_T_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/Any_Impl.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-namespace TAO
-{
-  /**
-   * @class Any_Dual_Impl_T
-   *
-   * @brief Template Any class for IDL types with 2 modes of insertion
-   *
-   * Used for the IDL types that have copying and non-copying insertion,
-   * but which are not (de)marshaled as pointers - struct, union, sequence,
-   * and exception.
-   */
-  template<typename T>
-  class Any_Dual_Impl_T : public Any_Impl
-  {
-  public:
-    Any_Dual_Impl_T (_tao_destructor destructor,
-                     CORBA::TypeCode_ptr,
-                     T * const);
-    Any_Dual_Impl_T (_tao_destructor destructor,
-                     CORBA::TypeCode_ptr,
-                     const T &);
-    Any_Dual_Impl_T (CORBA::TypeCode_ptr);
-    virtual ~Any_Dual_Impl_T (void);
-
-    static void insert (CORBA::Any &,
-                        _tao_destructor,
-                        CORBA::TypeCode_ptr,
-                        T * const);
-    static void insert_copy (CORBA::Any &,
-                             _tao_destructor destructor,
-                             CORBA::TypeCode_ptr,
-                             const T &);
-    static CORBA::Boolean extract (const CORBA::Any &,
-                                   _tao_destructor,
-                                   CORBA::TypeCode_ptr,
-                                   const T *&);
-
-    virtual CORBA::Boolean marshal_value (TAO_OutputCDR &);
-    CORBA::Boolean demarshal_value (TAO_InputCDR &);
-    virtual void _tao_decode (TAO_InputCDR &
-                              ACE_ENV_ARG_DECL);
-
-    virtual const void *value (void) const;
-    virtual void free_value (void);
-
-  protected:
-    void value (const T &);
-
-    T * value_;
-  };
-}
-
-#if defined (__ACE_INLINE__)
-# include "tao/Any_Dual_Impl_T.inl"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#endif /* __ACE_INLINE__ */
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "tao/Any_Dual_Impl_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Any_Dual_Impl_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_ANY_DUAL_IMPL_T_H */
-
diff --git a/TAO/tao/Any_Dual_Impl_T.inl b/TAO/tao/Any_Dual_Impl_T.inl
deleted file mode 100644
index bf3ecd90e33..00000000000
--- a/TAO/tao/Any_Dual_Impl_T.inl
+++ /dev/null
@@ -1,26 +0,0 @@
-// $Id$
-
-template<typename T> 
-ACE_INLINE 
-CORBA::Boolean
-TAO::Any_Dual_Impl_T<T>::marshal_value (TAO_OutputCDR &cdr)
-{
-  return (cdr << *this->value_);
-}
-
-template<typename T> 
-ACE_INLINE 
-CORBA::Boolean
-TAO::Any_Dual_Impl_T<T>::demarshal_value (TAO_InputCDR &cdr)
-{
-  return (cdr >> *this->value_);
-}
-
-template<typename T> 
-ACE_INLINE 
-const void *
-TAO::Any_Dual_Impl_T<T>::value (void) const
-{
-  return this->value_;
-}
-
diff --git a/TAO/tao/Any_Impl.cpp b/TAO/tao/Any_Impl.cpp
deleted file mode 100644
index 7d9586241e0..00000000000
--- a/TAO/tao/Any_Impl.cpp
+++ /dev/null
@@ -1,145 +0,0 @@
-// $Id$
-
-#include "Any_Impl.h"
-#include "Marshal.h"
-#include "CORBA_String.h"
-#include "SystemException.h"
-#include "TypeCode.h"
-
-
-#include "ace/Guard_T.h"
-
-
-ACE_RCSID (tao,
-           Any_Impl,
-           "$Id$")
-
-
-TAO::Any_Impl::Any_Impl (_tao_destructor destructor,
-                         CORBA::TypeCode_ptr tc,
-                         bool encoded)
-  : value_destructor_ (destructor)
-  , type_ (CORBA::TypeCode::_duplicate (tc))
-  , encoded_ (encoded)
-  , refcount_ (1)
-{
-}
-
-TAO::Any_Impl::~Any_Impl (void)
-{
-}
-
-CORBA::Boolean
-TAO::Any_Impl::marshal (TAO_OutputCDR &cdr)
-{
-  if ((cdr << this->type_) == 0)
-    {
-      return 0;
-    }
-
-  return this->marshal_value (cdr);
-}
-
-// Deprecated by the OMG.
-const void *
-TAO::Any_Impl::value (void) const
-{
-  return 0;
-}
-
-void
-TAO::Any_Impl::free_value (void)
-{
-  // We always have to do this.
-  CORBA::release (this->type_);
-}
-
-CORBA::TypeCode_ptr
-TAO::Any_Impl::type (void) const
-{
-  return CORBA::TypeCode::_duplicate (this->type_);
-}
-
-CORBA::TypeCode_ptr
-TAO::Any_Impl::_tao_get_typecode (void) const
-{
-  return this->type_;
-}
-
-void
-TAO::Any_Impl::type (CORBA::TypeCode_ptr tc)
-{
-  CORBA::release (this->type_);
-  this->type_ = CORBA::TypeCode::_duplicate (tc);
-}
-
-int
-TAO::Any_Impl::_tao_byte_order (void) const
-{
-  return TAO_ENCAP_BYTE_ORDER;
-}
-
-void
-TAO::Any_Impl::_tao_any_string_destructor (void *x)
-{
-  char *tmp = static_cast<char *> (x);
-  CORBA::string_free (tmp);
-}
-
-void
-TAO::Any_Impl::_tao_any_wstring_destructor (void *x)
-{
-  CORBA::WChar *tmp = static_cast<CORBA::WChar *> (x);
-  CORBA::wstring_free (tmp);
-}
-
-void
-TAO::Any_Impl::_add_ref (void)
-{
-  ++this->refcount_;
-}
-
-void
-TAO::Any_Impl::_remove_ref (void)
-{
-  const CORBA::ULong new_count = --this->refcount_;
-
-  if (new_count != 0)
-    return;
-
-  this->free_value ();
-
-  delete this;
-}
-
-void
-TAO::Any_Impl::_tao_decode (TAO_InputCDR &
-                            ACE_ENV_ARG_DECL)
-{
-  ACE_THROW (CORBA::NO_IMPLEMENT ());
-}
-
-CORBA::Boolean
-TAO::Any_Impl::to_object (CORBA::Object_ptr &) const
-{
-  return 0;
-}
-
-CORBA::Boolean
-TAO::Any_Impl::to_value (CORBA::ValueBase *&) const
-{
-  return 0;
-}
-
-CORBA::Boolean
-TAO::Any_Impl::to_abstract_base (CORBA::AbstractBase_ptr &) const
-{
-  return 0;
-}
-
-bool
-TAO::Any_Impl::encoded (void) const
-{
-  return this->encoded_;
-}
-
diff --git a/TAO/tao/Any_Impl.h b/TAO/tao/Any_Impl.h
deleted file mode 100644
index f3365631728..00000000000
--- a/TAO/tao/Any_Impl.h
+++ /dev/null
@@ -1,117 +0,0 @@
-// -*- C++ -*-
-//=============================================================================
-/**
- *  @file    Any_Impl.h
- *
- *  $Id$
- *
- *  @authors  Carlos O'Ryan and Jeff Parsons
- */
-//=============================================================================
-
-#ifndef TAO_ANY_IMPL_H
-#define TAO_ANY_IMPL_H
-
-#include /**/ "ace/pre.h"
-#include "ace/CORBA_macros.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Basic_Types.h"
-#include "tao/TAO_Export.h"
-#include "tao/orbconf.h"
-#include "ace/Synch_Traits.h"
-#include "ace/Null_Mutex.h"
-#include "ace/Thread_Mutex.h"
-#include "ace/Atomic_Op.h"
-
-class TAO_OutputCDR;
-class TAO_InputCDR;
-class ACE_Message_Block;
-
-namespace CORBA
-{
-  class TypeCode;
-  typedef TypeCode *TypeCode_ptr;
-
-  class Object;
-  typedef Object *Object_ptr;
-
-  class ValueBase;
-  class AbstractBase;
-  typedef AbstractBase *AbstractBase_ptr;
-
-  class Environment;
-}
-
-namespace TAO
-{
-  /**
-   * @class Any_Impl
-   *
-   * @brief Base class for the Any template subclasses.
-   *
-   * Contains common functionality and some pure virtual methods.
-   */
-  class TAO_Export Any_Impl
-  {
-  public:
-    /// Generated data types define a 'destructor' function that
-    /// correctly destroys an object stored in an Any.
-    typedef void (*_tao_destructor)(void *);
-
-    CORBA::Boolean marshal (TAO_OutputCDR &);
-    virtual CORBA::Boolean marshal_value (TAO_OutputCDR &) = 0;
-
-    /// @deprecated
-    /// Deprecated by the OMG. This no longer appears in
-    /// the C++ mapping. It is here only for backward
-    /// compatibility. It is no longer (as of 5/26/04)
-    /// used anywhere in TAO.
-    virtual const void *value (void) const;
-
-    virtual void free_value (void);
-
-    CORBA::TypeCode_ptr type (void) const;
-    CORBA::TypeCode_ptr _tao_get_typecode (void) const;
-    void type (CORBA::TypeCode_ptr);
-
-    virtual int _tao_byte_order (void) const;
-
-    virtual void _add_ref (void);
-    virtual void _remove_ref (void);
-
-    /// Used to release these CORBA basic types.
-    static void _tao_any_string_destructor (void *);
-    static void _tao_any_wstring_destructor (void *);
-
-    virtual void _tao_decode (TAO_InputCDR &
-                              ACE_ENV_ARG_DECL);
-
-    virtual CORBA::Boolean to_object (CORBA::Object_ptr &) const;
-    virtual CORBA::Boolean to_value (CORBA::ValueBase *&) const;
-    virtual CORBA::Boolean to_abstract_base (CORBA::AbstractBase_ptr &) const;
-
-    bool encoded (void) const;
-
-  protected:
-    Any_Impl (_tao_destructor,
-              CORBA::TypeCode_ptr,
-              bool encoded = false);
-    virtual ~Any_Impl (void);
-
-    TAO::Any_Impl::_tao_destructor value_destructor_;
-    CORBA::TypeCode_ptr type_;
-    bool encoded_;
-
-  private:
-    /// Reference counter.
-    ACE_Atomic_Op<TAO_SYNCH_MUTEX, CORBA::ULong> refcount_;
-  };
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_ANY_IMPL_H */
diff --git a/TAO/tao/Any_Impl_T.cpp b/TAO/tao/Any_Impl_T.cpp
deleted file mode 100644
index 5a06163cfa5..00000000000
--- a/TAO/tao/Any_Impl_T.cpp
+++ /dev/null
@@ -1,157 +0,0 @@
-// $Id$
-
-#ifndef TAO_ANY_IMPL_T_C
-#define TAO_ANY_IMPL_T_C
-
-#include "tao/Any_Impl_T.h"
-#include "tao/Any_Unknown_IDL_Type.h"
-#include "tao/Marshal.h"
-#include "tao/CDR.h"
-#include "tao/Environment.h"
-#include "tao/SystemException.h"
-#include "tao/TypeCode.h"
-
-#include "ace/CORBA_macros.h"
-#include "ace/Auto_Ptr.h"
-#include "ace/OS_Memory.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tao/Any_Impl_T.inl"
-#endif /* ! __ACE_INLINE__ */
-
-ACE_RCSID (tao,
-           Any_Impl_T,
-           "$Id$")
-
-template<typename T>
-TAO::Any_Impl_T<T>::Any_Impl_T (_tao_destructor destructor,
-                                CORBA::TypeCode_ptr tc,
-                                T * const val)
-  : Any_Impl (destructor,
-              tc),
-    value_ (val)
-{
-}
-
-template<typename T>
-TAO::Any_Impl_T<T>::~Any_Impl_T (void)
-{
-}
-
-template<typename T>
-void
-TAO::Any_Impl_T<T>::insert (CORBA::Any & any,
-                            _tao_destructor destructor,
-                            CORBA::TypeCode_ptr tc,
-                            T * const value)
-{
-  TAO::Any_Impl_T<T> *new_impl = 0;
-  ACE_NEW (new_impl,
-           TAO::Any_Impl_T<T> (destructor,
-                               tc,
-                               value));
-  any.replace (new_impl);
-}
-
-template<typename T>
-CORBA::Boolean
-TAO::Any_Impl_T<T>::extract (const CORBA::Any & any,
-                             _tao_destructor destructor,
-                             CORBA::TypeCode_ptr tc,
-                             T *& _tao_elem)
-{
-  _tao_elem = 0;
-
-  ACE_TRY_NEW_ENV
-    {
-      CORBA::TypeCode_ptr any_tc = any._tao_get_typecode ();
-      CORBA::Boolean _tao_equiv = any_tc->equivalent (tc
-                                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (_tao_equiv == 0)
-        {
-          return 0;
-        }
-
-      TAO::Any_Impl *impl = any.impl ();
-
-      if (!impl->encoded ())
-        {
-          TAO::Any_Impl_T<T> *narrow_impl =
-            dynamic_cast <TAO::Any_Impl_T<T> *> (impl);
-
-          if (narrow_impl == 0)
-            {
-              return 0;
-            }
-
-          _tao_elem = (T *) narrow_impl->value_;
-          return 1;
-        }
-
-      TAO::Any_Impl_T<T> *replacement = 0;
-      ACE_NEW_RETURN (replacement,
-                      TAO::Any_Impl_T<T> (destructor,
-                                          any_tc,
-                                          0),
-                      0);
-
-      auto_ptr<TAO::Any_Impl_T<T> > replacement_safety (replacement);
-
-      // We know this will work since the unencoded case is covered above.  
-      TAO::Unknown_IDL_Type *unk =
-        dynamic_cast<TAO::Unknown_IDL_Type *> (impl);
-
-      // We don't want the rd_ptr of unk to move, in case it is
-      // shared by another Any. This copies the state, not the buffer.
-      TAO_InputCDR for_reading (unk->_tao_get_cdr ());
-
-      CORBA::Boolean good_decode =
-        replacement->demarshal_value (for_reading);
-
-      if (good_decode)
-        {
-          _tao_elem = const_cast<T *> (replacement->value_);
-          const_cast<CORBA::Any &> (any).replace (replacement);
-          replacement_safety.release ();
-          return 1;
-        }
-
-      // Duplicated by Any_Impl base class constructor.
-      CORBA::release (any_tc);
-    }
-  ACE_CATCHANY
-    {
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
-
-template<typename T>
-void
-TAO::Any_Impl_T<T>::free_value (void)
-{
-  if (this->value_destructor_ != 0)
-    {
-      (*this->value_destructor_) (this->value_);
-      this->value_destructor_ = 0;
-    }
-
-  CORBA::release (this->type_);
-  this->value_ = 0;
-}
-
-template<typename T>
-void
-TAO::Any_Impl_T<T>::_tao_decode (TAO_InputCDR &cdr
-                                 ACE_ENV_ARG_DECL)
-{
-  if (! this->demarshal_value (cdr))
-    {
-      ACE_THROW (CORBA::MARSHAL ());
-    }
-}
-
-#endif /* TAO_ANY_IMPL_T_C */
diff --git a/TAO/tao/Any_Impl_T.h b/TAO/tao/Any_Impl_T.h
deleted file mode 100644
index ab715e94303..00000000000
--- a/TAO/tao/Any_Impl_T.h
+++ /dev/null
@@ -1,92 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Any_Impl_T.h
- *
- *  $Id$
- *
- *  @authors  Carlos O'Ryan and Jeff Parsons
- */
-//=============================================================================
-
-
-#ifndef TAO_ANY_IMPL_T_H
-#define TAO_ANY_IMPL_T_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/Any_Impl.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-namespace CORBA
-{
-  class Any;
-  class Environment;
-}
-
-namespace TAO
-{
-  /**
-   * @class Any_Impl_T
-   *
-   * @brief Template Any class for pointer types.
-   *
-   * Used for interfaces and typecodes
-   */
-  template<typename T>
-  class Any_Impl_T : public Any_Impl
-  {
-  public:
-    Any_Impl_T (_tao_destructor destructor,
-                CORBA::TypeCode_ptr,
-                T * const);
-    virtual ~Any_Impl_T (void);
-
-    static void insert (CORBA::Any &,
-                        _tao_destructor destructor,
-                        CORBA::TypeCode_ptr,
-                        T * const);
-    static CORBA::Boolean extract (const CORBA::Any &,
-                                   _tao_destructor,
-                                   CORBA::TypeCode_ptr,
-                                   T *&);
-
-    virtual CORBA::Boolean to_object (CORBA::Object_ptr &) const;
-    virtual CORBA::Boolean to_value (CORBA::ValueBase *&) const;
-    virtual CORBA::Boolean to_abstract_base (CORBA::AbstractBase_ptr &) const;
-
-    virtual CORBA::Boolean marshal_value (TAO_OutputCDR &);
-    CORBA::Boolean demarshal_value (TAO_InputCDR &);
-    virtual void _tao_decode (TAO_InputCDR &  ACE_ENV_ARG_DECL);
-    virtual const void *value (void) const;
-    virtual void free_value (void);
-
-  private:
-    T * value_;
-  };
-}
-
-#if defined (__ACE_INLINE__)
-# include "tao/Any_Impl_T.inl"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#endif /* __ACE_INLINE__ */
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "tao/Any_Impl_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Any_Impl_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_ANY_IMPL_T_H */
diff --git a/TAO/tao/Any_Impl_T.inl b/TAO/tao/Any_Impl_T.inl
deleted file mode 100644
index 1bbeebeea78..00000000000
--- a/TAO/tao/Any_Impl_T.inl
+++ /dev/null
@@ -1,53 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-// $Id$
-
-// These three are overridden in generated code where appropriate.
-
-template<typename T> 
-ACE_INLINE 
-CORBA::Boolean
-TAO::Any_Impl_T<T>::to_object (CORBA::Object_ptr &) const
-{
-  return 0;
-}
-
-template<typename T> 
-ACE_INLINE 
-CORBA::Boolean
-TAO::Any_Impl_T<T>::to_value (CORBA::ValueBase *&) const
-{
-  return 0;
-}
-
-template<typename T> 
-ACE_INLINE 
-CORBA::Boolean
-TAO::Any_Impl_T<T>::to_abstract_base (CORBA::AbstractBase_ptr &) const
-{
-  return 0;
-}
-
-template<typename T> 
-ACE_INLINE 
-CORBA::Boolean
-TAO::Any_Impl_T<T>::marshal_value (TAO_OutputCDR &cdr)
-{
-  return (cdr << this->value_);
-}
-
-template<typename T> 
-ACE_INLINE 
-CORBA::Boolean
-TAO::Any_Impl_T<T>::demarshal_value (TAO_InputCDR &cdr)
-{
-  return (cdr >> this->value_);
-}
-
-template<typename T> 
-ACE_INLINE 
-const void *
-TAO::Any_Impl_T<T>::value (void) const
-{
-  return this->value_;
-}
-
diff --git a/TAO/tao/Any_Insert_Policy_T.h b/TAO/tao/Any_Insert_Policy_T.h
new file mode 100644
index 00000000000..d2a695673bd
--- /dev/null
+++ b/TAO/tao/Any_Insert_Policy_T.h
@@ -0,0 +1,109 @@
+// This may look like C, but it's really -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    Any_Insert_Policy_T.h
+ *
+ *  $Id$
+ *
+ *  @author Johnny Willemsen  <jwillemsen@remedy.nl>
+ */
+//=============================================================================
+
+#ifndef TAO_ANY_INSERT_POLICY_H
+#define TAO_ANY_INSERT_POLICY_H
+
+#include /**/ "ace/pre.h"
+
+#include "tao/UB_String_Argument_T.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "tao/Arg_Traits_T.h"
+#include "tao/Argument.h"
+#include "tao/AnyTypeCode_Adapter.h"
+
+#include "ace/Dynamic_Service.h"
+#include "tao/debug.h"
+#include "tao/IFR_Client_Adapter.h"
+
+namespace TAO
+{
+  template <typename S>
+  class Any_Insert_Policy_Stream
+  {
+    public:
+      virtual void any_insert (CORBA::Any* p, S const & x) const
+      {
+        (*p) <<= x;
+      }
+  };
+
+  template <typename S>
+  class Any_Insert_Policy_AnyTypeCode_Adapter
+  {
+    public:
+      virtual void any_insert (CORBA::Any* p, S const & x) const
+      {
+        TAO_AnyTypeCode_Adapter *adapter =
+          ACE_Dynamic_Service<TAO_AnyTypeCode_Adapter>::instance (
+              "AnyTypeCode_Adapter"
+          );
+
+        if (adapter)
+          {
+            adapter->insert_into_any (p, x);
+          }
+        else
+          {
+            ACE_ERROR ((LM_ERROR,
+                        ACE_TEXT ("(%P|%t) %p\n"),
+                        ACE_TEXT ("ERROR: unable to find AnyTypeCode Adapter ")));
+          }
+      }
+  };
+
+  template <typename S>
+  class Any_Insert_Policy_IFR_Client_Adapter
+  {
+    public:
+      virtual void any_insert (CORBA::Any* p, S const & x) const
+      {
+        TAO_IFR_Client_Adapter *adapter =
+          ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
+              TAO_ORB_Core::ifr_client_adapter_name ()
+            );
+
+        adapter->interfacedef_any_insert (p, x);
+      }
+  };
+
+  template <typename S>
+  class Any_Insert_Policy_Noop
+  {
+    public:
+      virtual void any_insert (CORBA::Any* , S const &) const
+      {
+      }
+  };
+
+  template <typename S>
+  class Any_Insert_Policy_CORBA_Object
+  {
+    public:
+      virtual void any_insert (CORBA::Any* , S const &) const
+      {
+        if (TAO_debug_level > 2)
+          {
+            ACE_DEBUG ((LM_DEBUG,
+                        "TAO (%P|%t) - Cannot insert a vanilla CORBA Object"
+                        " into an Any for returning the return argument \n"));
+          }
+      }
+  };
+}
+
+#include /**/ "ace/post.h"
+#endif /* TAO_ANY_INSERT_POLICY_H */
diff --git a/TAO/tao/Any_Special_Impl_T.cpp b/TAO/tao/Any_Special_Impl_T.cpp
deleted file mode 100644
index 949300f4f12..00000000000
--- a/TAO/tao/Any_Special_Impl_T.cpp
+++ /dev/null
@@ -1,208 +0,0 @@
-// $Id$
-
-#ifndef TAO_ANY_SPECIAL_IMPL_T_C
-#define TAO_ANY_SPECIAL_IMPL_T_C
-
-#include "tao/Any_Special_Impl_T.h"
-#include "tao/Any_Unknown_IDL_Type.h"
-#include "tao/Marshal.h"
-#include "tao/Environment.h"
-#include "tao/String_TypeCode_Traits.h"
-
-#include "ace/CORBA_macros.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tao/Any_Special_Impl_T.inl"
-#endif /* ! __ACE_INLINE__ */
-
-ACE_RCSID (tao,
-           Any_Special_Impl_T,
-           "$Id$")
-
-template<typename T, typename from_T, typename to_T>
-TAO::Any_Special_Impl_T<T, from_T, to_T>::Any_Special_Impl_T (
-    _tao_destructor destructor,
-    CORBA::TypeCode_ptr tc,
-    T * const val,
-    CORBA::ULong bound
-  )
-  : Any_Impl (destructor,
-              tc),
-    value_ (val),
-    bound_ (bound)
-{
-}
-
-template<typename T, typename from_T, typename to_T>
-TAO::Any_Special_Impl_T<T, from_T, to_T>::~Any_Special_Impl_T (void)
-{
-}
-
-template<typename T, typename from_T, typename to_T>
-void
-TAO::Any_Special_Impl_T<T, from_T, to_T>::insert (CORBA::Any & any,
-                                                  _tao_destructor destructor,
-                                                  CORBA::TypeCode_ptr tc,
-                                                  T * const value,
-                                                  CORBA::ULong bound
-  )
-{
-  CORBA::TypeCode_var bounded_tc;
-
-  if (bound > 0)
-    {
-      ACE_DECLARE_NEW_CORBA_ENV;
-      CORBA::TCKind const kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK;
-
-      bounded_tc =
-        TAO::TypeCodeFactory::String_Traits<from_T>::create_typecode (kind,
-                                                                      bound);
-    }
-  else
-    {
-      bounded_tc = CORBA::TypeCode::_duplicate (tc);
-    }
-
-  if (CORBA::is_nil (bounded_tc.in ()))
-    return;
-
-  Any_Special_Impl_T<T, from_T, to_T> * new_impl;
-  ACE_NEW (new_impl,
-           Any_Special_Impl_T (destructor,
-                               bounded_tc.in (),
-                               value,
-                               bound));
-
-  any.replace (new_impl);
-}
-
-template<typename T, typename from_T, typename to_T>
-CORBA::Boolean
-TAO::Any_Special_Impl_T<T, from_T, to_T>::extract (const CORBA::Any & any,
-                                                   _tao_destructor destructor,
-                                                   CORBA::TypeCode_ptr tc,
-                                                   const T *& _tao_elem,
-                                                   CORBA::ULong bound
-  )
-{
-  _tao_elem = 0;
-
-  ACE_TRY_NEW_ENV
-    {
-      CORBA::TypeCode_ptr any_type = any._tao_get_typecode ();
-      CORBA::TypeCode_var unaliased_any_type =
-        TAO::unaliased_typecode (any_type
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::TCKind any_kind =
-        unaliased_any_type->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::TCKind try_kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (any_kind != try_kind)
-        {
-          return 0;
-        }
-
-      CORBA::ULong length =
-        unaliased_any_type->length (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (length != bound)
-        {
-          return 0;
-        }
-
-      TAO::Any_Impl *impl = any.impl ();
-
-      typedef TAO::Any_Special_Impl_T<T, from_T, to_T>
-        BOUNDED_TSTRING_ANY_IMPL;
-
-      if (!impl->encoded ())
-        {
-          TAO::Any_Special_Impl_T<T, from_T, to_T> *narrow_impl =
-            dynamic_cast <BOUNDED_TSTRING_ANY_IMPL *> (impl);
-
-          if (narrow_impl == 0)
-            {
-              return 0;
-            }
-
-          _tao_elem = (T *) narrow_impl->value_;
-          return 1;
-        }
-
-      TAO::Any_Special_Impl_T<T, from_T, to_T> *replacement = 0;
-      ACE_NEW_RETURN (replacement,
-                      BOUNDED_TSTRING_ANY_IMPL (destructor,
-                                                tc,
-                                                0,
-                                                bound),
-                      0);
-
-      auto_ptr<TAO::Any_Special_Impl_T<T, from_T, to_T> > replacement_safety (
-          replacement
-        );
-
-      // We know this will work since the unencoded case is covered above.
-      TAO::Unknown_IDL_Type *unk =
-        dynamic_cast<TAO::Unknown_IDL_Type *> (impl);
-
-      // We don't want the rd_ptr of unk to move, in case it is
-      // shared by another Any. This copies the state, not the buffer.
-      TAO_InputCDR for_reading (unk->_tao_get_cdr ());
-
-      CORBA::Boolean good_decode =
-        replacement->demarshal_value (for_reading);
-
-      if (good_decode)
-        {
-          _tao_elem = replacement->value_;
-          const_cast<CORBA::Any &> (any).replace (replacement);
-          replacement_safety.release ();
-          return 1;
-        }
-
-      // Duplicated by Any_Impl base class constructor.
-      CORBA::release (tc);
-    }
-  ACE_CATCHANY
-    {
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
-
-template<typename T, typename from_T, typename to_T>
-void
-TAO::Any_Special_Impl_T<T, from_T, to_T>::free_value (void)
-{
-  if (this->value_destructor_ != 0)
-    {
-      (*this->value_destructor_) (this->value_);
-      this->value_destructor_ = 0;
-    }
-
-  CORBA::release (this->type_);
-  this->value_ = 0;
-}
-
-template<typename T, typename from_T, typename to_T>
-void
-TAO::Any_Special_Impl_T<T, from_T, to_T>::_tao_decode (
-    TAO_InputCDR &cdr
-    ACE_ENV_ARG_DECL
-  )
-{
-  if (! this->demarshal_value (cdr))
-    {
-      ACE_THROW (CORBA::MARSHAL ());
-    }
-}
-
-#endif /* TAO_ANY_T_C */
diff --git a/TAO/tao/Any_Special_Impl_T.h b/TAO/tao/Any_Special_Impl_T.h
deleted file mode 100644
index 3760521a480..00000000000
--- a/TAO/tao/Any_Special_Impl_T.h
+++ /dev/null
@@ -1,87 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Any_Special_Impl_T.h
- *
- *  $Id$
- *
- *  @author  Carlos O'Ryan and Jeff Parsons
- */
-//=============================================================================
-
-
-#ifndef TAO_ANY_SPECIAL_IMPL_T_H
-#define TAO_ANY_SPECIAL_IMPL_T_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/Any_Impl.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-namespace TAO
-{
-  /**
-   * @class Any_Special_Impl_T
-   *
-   * @brief Template Any class for bounded IDL (w)strings.
-   */
-  template<typename T, typename from_T, typename to_T>
-  class Any_Special_Impl_T : public Any_Impl
-  {
-  public:
-    Any_Special_Impl_T (_tao_destructor destructor,
-                        CORBA::TypeCode_ptr,
-                        T * const,
-                        CORBA::ULong bound);
-    virtual ~Any_Special_Impl_T (void);
-
-    static void insert (CORBA::Any &,
-                        _tao_destructor destructor,
-                        CORBA::TypeCode_ptr,
-                        T * const,
-                        CORBA::ULong bound);
-    static CORBA::Boolean extract (const CORBA::Any &,
-                                   _tao_destructor,
-                                   CORBA::TypeCode_ptr,
-                                   const T *&,
-                                   CORBA::ULong bound);
-
-    virtual CORBA::Boolean marshal_value (TAO_OutputCDR &);
-    CORBA::Boolean demarshal_value (TAO_InputCDR &);
-    virtual void _tao_decode (TAO_InputCDR &
-                              ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    virtual const void *value (void) const;
-    virtual void free_value (void);
-
-  private:
-    T * value_;
-    CORBA::ULong bound_;
-  };
-}
-
-#if defined (__ACE_INLINE__)
-# include "tao/Any_Special_Impl_T.inl"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#endif /* __ACE_INLINE__ */
-
-#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)
-#include "tao/Any_Special_Impl_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)
-#pragma implementation ("Any_Special_Impl_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_ANY_SPECIAL_IMPL_T_H */
-
diff --git a/TAO/tao/Any_Special_Impl_T.inl b/TAO/tao/Any_Special_Impl_T.inl
deleted file mode 100644
index bc8715b083f..00000000000
--- a/TAO/tao/Any_Special_Impl_T.inl
+++ /dev/null
@@ -1,30 +0,0 @@
-// $Id$
-
-template<typename T, typename from_T, typename to_T> 
-ACE_INLINE 
-CORBA::Boolean
-TAO::Any_Special_Impl_T<T, from_T, to_T>::marshal_value (
-    TAO_OutputCDR &cdr
-  )
-{
-  return (cdr << from_T (this->value_, this->bound_));
-}
-
-template<typename T, typename from_T, typename to_T> 
-ACE_INLINE 
-CORBA::Boolean
-TAO::Any_Special_Impl_T<T, from_T, to_T>::demarshal_value (
-    TAO_InputCDR &cdr
-  )
-{
-  return (cdr >> to_T (this->value_, this->bound_));
-}
-
-template<typename T, typename from_T, typename to_T> 
-ACE_INLINE 
-const void *
-TAO::Any_Special_Impl_T<T, from_T, to_T>::value (void) const
-{
-  return this->value_;
-}
-
diff --git a/TAO/tao/Any_SystemException.cpp b/TAO/tao/Any_SystemException.cpp
deleted file mode 100644
index 84d3444f252..00000000000
--- a/TAO/tao/Any_SystemException.cpp
+++ /dev/null
@@ -1,206 +0,0 @@
-// $Id$
-
-#include "Any_SystemException.h"
-#include "Any.h"
-#include "Any_Unknown_IDL_Type.h"
-#include "CDR.h"
-#include "Exception.h"
-#include "Environment.h"
-#include "Marshal.h"
-#include "CORBA_String.h"
-#include "SystemException.h"
-#include "TypeCode.h"
-
-#include "ace/Auto_Ptr.h"
-#include "ace/CORBA_macros.h"
-#include "ace/Auto_Ptr.h"
-
-
-ACE_RCSID (tao,
-           Any_SystemException,
-           "$Id$")
-
-
-TAO::Any_SystemException::Any_SystemException (_tao_destructor destructor,
-                                               CORBA::TypeCode_ptr tc,
-                                               CORBA::SystemException * const val)
-  : Any_Impl (destructor,
-              tc),
-    value_ (val)
-{
-}
-
-TAO::Any_SystemException::Any_SystemException (_tao_destructor destructor,
-                                               CORBA::TypeCode_ptr tc,
-                                               const CORBA::SystemException & val)
-  : Any_Impl (destructor,
-              tc)
-{
- this->value_ =
-   dynamic_cast <CORBA::SystemException *> (val._tao_duplicate ());
-}
-
-TAO::Any_SystemException::Any_SystemException (CORBA::TypeCode_ptr tc)
-  : Any_Impl (0,
-              tc)
-{
-}
-
-TAO::Any_SystemException::~Any_SystemException (void)
-{
-}
-
-void
-TAO::Any_SystemException::insert (CORBA::Any & any,
-                                  _tao_destructor destructor,
-                                  CORBA::TypeCode_ptr tc,
-                                  CORBA::SystemException * const value)
-{
-  Any_SystemException *new_impl = 0;
-  ACE_NEW (new_impl,
-           Any_SystemException (destructor,
-                                tc,
-                                value));
-  any.replace (new_impl);
-}
-
-void
-TAO::Any_SystemException::insert_copy (CORBA::Any & any,
-                                       _tao_destructor destructor,
-                                       CORBA::TypeCode_ptr tc,
-                                       const CORBA::SystemException & value)
-{
-  Any_SystemException *new_impl = 0;
-  ACE_NEW (new_impl,
-           Any_SystemException (destructor,
-                                tc,
-                                value));
-  any.replace (new_impl);
-}
-
-CORBA::Boolean
-TAO::Any_SystemException::extract (const CORBA::Any & any,
-                                   _tao_destructor destructor,
-                                   CORBA::TypeCode_ptr tc,
-                                   const CORBA::SystemException *& _tao_elem,
-                                   TAO::excp_factory f)
-{
-  _tao_elem = 0;
-
-  ACE_TRY_NEW_ENV
-    {
-      CORBA::TypeCode_ptr any_tc = any._tao_get_typecode ();
-      CORBA::Boolean _tao_equiv = any_tc->equivalent (tc
-                                                      ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (_tao_equiv == 0)
-        {
-          return 0;
-        }
-
-      TAO::Any_Impl *impl = any.impl ();
-
-      if (!impl->encoded ())
-        {
-          TAO::Any_SystemException *narrow_impl =
-            dynamic_cast <TAO::Any_SystemException *> (impl);
-
-          if (narrow_impl == 0)
-            {
-              return 0;
-            }
-
-          _tao_elem = narrow_impl->value_;
-          return 1;
-        }
-
-      CORBA::SystemException *empty_value =  (*f) ();
-
-      TAO::Any_SystemException *replacement = 0;
-      ACE_NEW_RETURN (replacement,
-                      TAO::Any_SystemException (destructor,
-                                                any_tc,
-                                                empty_value),
-                      0);
-
-      auto_ptr<TAO::Any_SystemException > replacement_safety (replacement);
-
-      // We know this will work since the unencoded case is covered above.  
-      TAO::Unknown_IDL_Type *unk =
-        dynamic_cast<TAO::Unknown_IDL_Type *> (impl);
-
-      // We don't want the rd_ptr of unk to move, in case it is
-      // shared by another Any. This copies the state, not the buffer.
-      TAO_InputCDR for_reading (unk->_tao_get_cdr ());
-
-      CORBA::Boolean good_decode =
-        replacement->demarshal_value (for_reading);
-
-      if (good_decode)
-        {
-          _tao_elem = replacement->value_;
-          const_cast<CORBA::Any &> (any).replace (replacement);
-          replacement_safety.release ();
-          return 1;
-        }
-    }
-  ACE_CATCHANY
-    {
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
-
-void
-TAO::Any_SystemException::free_value (void)
-{
-  if (this->value_destructor_ != 0)
-    {
-      (*this->value_destructor_) (this->value_);
-      this->value_destructor_ = 0;
-    }
-
-  this->value_ = 0;
-}
-
-const void *
-TAO::Any_SystemException::value (void) const
-{
-  return this->value_;
-}
-
-CORBA::Boolean
-TAO::Any_SystemException::marshal_value (TAO_OutputCDR &cdr)
-{
-  ACE_TRY_NEW_ENV
-    {
-      this->value_->_tao_encode (cdr
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      return 1;
-    }
-  ACE_CATCHANY
-    {
-    }
-  ACE_ENDTRY;
-  return 0;
-}
-
-CORBA::Boolean
-TAO::Any_SystemException::demarshal_value (TAO_InputCDR &cdr)
-{
-  ACE_TRY_NEW_ENV
-    {
-      this->value_->_tao_decode (cdr
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-      return 1;
-    }
-  ACE_CATCHANY
-    {
-    }
-  ACE_ENDTRY;
-  return 0;
-}
diff --git a/TAO/tao/Any_SystemException.h b/TAO/tao/Any_SystemException.h
deleted file mode 100644
index 971e22d6a5f..00000000000
--- a/TAO/tao/Any_SystemException.h
+++ /dev/null
@@ -1,85 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Any_SystemException.h
- *
- *  $Id$
- *
- *  @authors  Carlos O'Ryan and Jeff Parsons
- */
-//=============================================================================
-#ifndef TAO_ANY_SYSTEMEXCEPTION_H
-#define TAO_ANY_SYSTEMEXCEPTION_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/Any_Impl.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-namespace CORBA
-{
-  class SystemException;
-  class Any;
-}
-
-namespace TAO
-{
-  typedef CORBA::SystemException* (*excp_factory)(void);
-
-  /**
-   * @class Any_Exception
-   *
-   * @brief Template Any class for IDL types with 2 modes of insertion
-   *
-   * Used for the IDL types that have copying and non-copying insertion,
-   * but which are not (de)marshaled as pointers - struct, union, sequence,
-   * and exception.
-   */
-  class Any_SystemException : public Any_Impl
-  {
-  public:
-    Any_SystemException (_tao_destructor destructor,
-                         CORBA::TypeCode_ptr,
-                         CORBA::SystemException* const);
-
-    Any_SystemException (_tao_destructor destructor,
-                         CORBA::TypeCode_ptr,
-                         const CORBA::SystemException &);
-
-    Any_SystemException (CORBA::TypeCode_ptr);
-
-    virtual ~Any_SystemException (void);
-
-    static void insert (CORBA::Any &,
-                        _tao_destructor,
-                        CORBA::TypeCode_ptr,
-                        CORBA::SystemException * const);
-
-    static void insert_copy (CORBA::Any &,
-                             _tao_destructor destructor,
-                             CORBA::TypeCode_ptr,
-                             const CORBA::SystemException &);
-
-    static CORBA::Boolean extract (const CORBA::Any &,
-                                   _tao_destructor,
-                                   CORBA::TypeCode_ptr,
-                                   const CORBA::SystemException *&,
-                                   excp_factory f);
-
-    virtual CORBA::Boolean marshal_value (TAO_OutputCDR &);
-    CORBA::Boolean demarshal_value (TAO_InputCDR &);
-
-    virtual const void *value (void) const;
-    virtual void free_value (void);
-
-  protected:
-    CORBA::SystemException *value_;
-  };
-}
-
-#include /**/ "ace/post.h"
-#endif /*TAO_ANY_SYSTEMEXCEPTION_H*/
diff --git a/TAO/tao/Any_Unknown_IDL_Type.cpp b/TAO/tao/Any_Unknown_IDL_Type.cpp
deleted file mode 100644
index b7b78214719..00000000000
--- a/TAO/tao/Any_Unknown_IDL_Type.cpp
+++ /dev/null
@@ -1,288 +0,0 @@
-// $Id$
-
-#include "tao/Any_Unknown_IDL_Type.h"
-#include "tao/Valuetype_Adapter.h"
-#include "tao/ORB_Core.h"
-#include "tao/SystemException.h"
-#include "tao/Marshal.h"
-#include "tao/TypeCode.h"
-#include "tao/CDR.h"
-
-#include "ace/Dynamic_Service.h"
-#include "ace/OS_NS_string.h"
-
-
-ACE_RCSID (tao,
-           Any_Unknown_IDL_Type,
-           "$Id$")
-           
-
-TAO::Unknown_IDL_Type::Unknown_IDL_Type (
-    CORBA::TypeCode_ptr tc,
-    TAO_InputCDR &cdr
-  )
-  : TAO::Any_Impl (0, tc, true),
-    cdr_ (static_cast<ACE_Message_Block *> (0))
-{
-  ACE_TRY_NEW_ENV
-    {
-      this->_tao_decode (cdr ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-    }
-  ACE_CATCH (CORBA::Exception, ex)
-    {
-    }
-  ACE_ENDTRY;
-}
-
-TAO::Unknown_IDL_Type::Unknown_IDL_Type (
-    CORBA::TypeCode_ptr tc
-  )
-  : TAO::Any_Impl (0, tc, true),
-    cdr_ (static_cast<ACE_Message_Block *> (0))
-{
-}
-
-TAO::Unknown_IDL_Type::~Unknown_IDL_Type (void)
-{
-}
-
-CORBA::Boolean
-TAO::Unknown_IDL_Type::marshal_value (TAO_OutputCDR &cdr)
-{
-  ACE_TRY_NEW_ENV
-    {
-      // We don't want the rd_ptr to move, in case we are shared by
-      // another Any, so we use this to copy the state, not the buffer.
-      TAO_InputCDR for_reading (this->cdr_);
-    
-      TAO::traverse_status status =
-        TAO_Marshal_Object::perform_append (this->type_,
-                                            &for_reading,
-                                            &cdr
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      if (status != TAO::TRAVERSE_CONTINUE)
-        {
-          return 0;
-        }
-    }
-  ACE_CATCH (CORBA::Exception, ex)
-    {
-      return 0;
-    }
-  ACE_ENDTRY;
-
-  return 1;
-}
-
-const void *
-TAO::Unknown_IDL_Type::value (void) const
-{
-  return this->cdr_.start ();
-}
-
-void
-TAO::Unknown_IDL_Type::free_value (void)
-{
-  CORBA::release (this->type_);
-}
-
-TAO_InputCDR &
-TAO::Unknown_IDL_Type::_tao_get_cdr (void)
-{
-  return this->cdr_;
-}
-
-int
-TAO::Unknown_IDL_Type::_tao_byte_order (void) const
-{
-  return this->cdr_.byte_order ();
-}
-void
-TAO::Unknown_IDL_Type::_tao_decode (TAO_InputCDR &cdr
-                                    ACE_ENV_ARG_DECL)
-{
-  // @@ (JP) The following code depends on the fact that
-  //         TAO_InputCDR does not contain chained message blocks,
-  //         otherwise <begin> and <end> could be part of
-  //         different buffers!
-
-  // This will be the start of a new message block.
-  char *begin = cdr.rd_ptr ();
-
-  // Skip over the next argument.
-  TAO::traverse_status status =
-    TAO_Marshal_Object::perform_skip (this->type_,
-                                      &cdr
-                                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK;
-
-  if (status != TAO::TRAVERSE_CONTINUE)
-    {
-      ACE_THROW (CORBA::MARSHAL ());
-    }
-
-  // This will be the end of the new message block.
-  char *end = cdr.rd_ptr ();
-
-  // The ACE_CDR::mb_align() call can shift the rd_ptr by up to
-  // ACE_CDR::MAX_ALIGNMENT - 1 bytes. Similarly, the offset adjustment
-  // can move the rd_ptr by up to the same amount. We accommodate
-  // this by including 2 * ACE_CDR::MAX_ALIGNMENT bytes of additional
-  // space in the message block.
-  size_t size = end - begin;
-
-  ACE_Message_Block new_mb (size + 2 * ACE_CDR::MAX_ALIGNMENT);
-
-  ACE_CDR::mb_align (&new_mb);
-  ptrdiff_t offset = ptrdiff_t (begin) % ACE_CDR::MAX_ALIGNMENT;
-
-  if (offset < 0)
-    {
-      offset += ACE_CDR::MAX_ALIGNMENT;
-    }
-
-  new_mb.rd_ptr (offset);
-  new_mb.wr_ptr (offset + size);
-
-  ACE_OS::memcpy (new_mb.rd_ptr (),
-                  begin,
-                  size);
-
-  this->cdr_.reset (&new_mb, cdr.byte_order ());
-  this->cdr_.char_translator (cdr.char_translator ());
-  this->cdr_.wchar_translator (cdr.wchar_translator ());
-}
-
-CORBA::Boolean
-TAO::Unknown_IDL_Type::to_object (CORBA::Object_ptr &obj) const
-{
-  ACE_TRY_NEW_ENV
-    {
-      CORBA::ULong kind =
-        this->type_->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::TypeCode_var tcvar =
-        CORBA::TypeCode::_duplicate (this->type_);
-
-      while (kind == CORBA::tk_alias)
-        {
-          tcvar = tcvar->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-
-          kind = tcvar->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-
-      if (kind != CORBA::tk_objref)
-        {
-          return 0;
-        }
-
-      return this->cdr_ >> obj;
-    }
-  ACE_CATCH (CORBA::Exception, ex)
-    {
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
-
-CORBA::Boolean
-TAO::Unknown_IDL_Type::to_value (CORBA::ValueBase *&val) const
-{
-  ACE_TRY_NEW_ENV
-    {
-      CORBA::ULong kind =
-        this->type_->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::TypeCode_var tcvar =
-        CORBA::TypeCode::_duplicate (this->type_);
-
-      while (kind == CORBA::tk_alias)
-        {
-          tcvar = tcvar->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-
-          kind = tcvar->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-
-      if (kind != CORBA::tk_value)
-        {
-          return 0;
-        }
-
-      TAO_Valuetype_Adapter *adapter =
-        ACE_Dynamic_Service<TAO_Valuetype_Adapter>::instance (
-            TAO_ORB_Core::valuetype_adapter_name ()
-          );
-
-      if (adapter == 0)
-        {
-          ACE_THROW_RETURN (CORBA::INTERNAL (),
-                            0);
-        }
-
-      return adapter->stream_to_value (this->cdr_, val);
-    }
-  ACE_CATCH (CORBA::Exception, ex)
-    {
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
-
-CORBA::Boolean
-TAO::Unknown_IDL_Type::to_abstract_base (CORBA::AbstractBase_ptr &obj) const
-{
-  ACE_TRY_NEW_ENV
-    {
-      CORBA::ULong kind =
-        this->type_->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_TRY_CHECK;
-
-      CORBA::TypeCode_var tcvar =
-        CORBA::TypeCode::_duplicate (this->type_);
-
-      while (kind == CORBA::tk_alias)
-        {
-          tcvar = tcvar->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-
-          kind = tcvar->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_TRY_CHECK;
-        }
-
-      if (kind != CORBA::tk_value)
-        {
-          return 0;
-        }
-
-      TAO_Valuetype_Adapter *adapter =
-        ACE_Dynamic_Service<TAO_Valuetype_Adapter>::instance (
-            TAO_ORB_Core::valuetype_adapter_name ()
-          );
-
-      if (adapter == 0)
-        {
-          ACE_THROW_RETURN (CORBA::INTERNAL (),
-                            0);
-        }
-
-      return adapter->stream_to_abstract_base (this->cdr_,
-                                               obj);
-    }
-  ACE_CATCH (CORBA::Exception, ex)
-    {
-    }
-  ACE_ENDTRY;
-
-  return 0;
-}
diff --git a/TAO/tao/Any_Unknown_IDL_Type.h b/TAO/tao/Any_Unknown_IDL_Type.h
deleted file mode 100644
index c764dc367e0..00000000000
--- a/TAO/tao/Any_Unknown_IDL_Type.h
+++ /dev/null
@@ -1,67 +0,0 @@
-// -*- C++ -*-
-//=============================================================================
-/**
- *  @file    Any_Unknown_IDL_Type.h
- *
- *  $Id$
- *
- *  @authors  Carlos O'Ryan and Jeff Parsons
- */
-//=============================================================================
-
-#ifndef TAO_ANY_UNKNOWN_IDL_TYPE_H
-#define TAO_ANY_UNKNOWN_IDL_TYPE_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/Any_Impl.h"
-#include "tao/CDR.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-class ACE_Char_Codeset_Translator;
-class ACE_WChar_Codeset_Translator;
-
-namespace TAO
-{
-  /**
-   * @class Unknown_IDL_Type
-   *
-   * @brief CDR-based Any impl class.
-   *
-   * Used when demarshaling an Any, and with DII/DSI, and Dynamic Anys.
-   */
-  class TAO_Export Unknown_IDL_Type : public Any_Impl
-  {
-  public:
-    Unknown_IDL_Type (CORBA::TypeCode_ptr,
-                      TAO_InputCDR &cdr);
-                  
-    Unknown_IDL_Type (CORBA::TypeCode_ptr);
-                      
-    virtual ~Unknown_IDL_Type (void);
-
-    virtual CORBA::Boolean marshal_value (TAO_OutputCDR &);
-    virtual const void *value (void) const;
-    virtual void free_value (void);
-
-    virtual TAO_InputCDR &_tao_get_cdr (void);
-    virtual int _tao_byte_order (void) const;
-
-    virtual void _tao_decode (TAO_InputCDR &
-                              ACE_ENV_ARG_DECL);
-
-    virtual CORBA::Boolean to_object (CORBA::Object_ptr &) const;
-    virtual CORBA::Boolean to_value (CORBA::ValueBase *&) const;
-    virtual CORBA::Boolean to_abstract_base (CORBA::AbstractBase_ptr &) const;
-
-  private:
-    mutable TAO_InputCDR cdr_;
-  };
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_ANY_UNKNOWN_IDL_TYPE_H */
diff --git a/TAO/tao/Arg_Traits_T.h b/TAO/tao/Arg_Traits_T.h
index b4a86c197c3..e384db4a2ad 100644
--- a/TAO/tao/Arg_Traits_T.h
+++ b/TAO/tao/Arg_Traits_T.h
@@ -10,7 +10,6 @@
  */
 //=============================================================================
 
-
 #ifndef TAO_ARG_TRAITS_T_H
 #define TAO_ARG_TRAITS_T_H
 
@@ -31,16 +30,6 @@ namespace TAO
   class Arg_Traits
   {
   };
-
-  /**
-   *
-   * @brief Base class for all skeleton arg traits specializations.
-   *
-   */
-  template<typename T>
-  class SArg_Traits
-  {
-  };
 }
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/Argument.cpp b/TAO/tao/Argument.cpp
index e038eeec2d7..98e0861d980 100644
--- a/TAO/tao/Argument.cpp
+++ b/TAO/tao/Argument.cpp
@@ -10,26 +10,46 @@ TAO::Argument::~Argument (void)
 CORBA::Boolean
 TAO::Argument::marshal (TAO_OutputCDR &)
 {
-  return 1;
+  return true;
 }
 
 CORBA::Boolean
 TAO::Argument::demarshal (TAO_InputCDR &)
 {
-  return 1;
+  return true;
 }
 
 #if TAO_HAS_INTERCEPTORS == 1
 
 void
-TAO::Argument::interceptor_param (Dynamic::Parameter &)
+TAO::Argument::interceptor_value (CORBA::Any *) const
 {
 }
 
-void
-TAO::Argument::interceptor_result (CORBA::Any *)
+CORBA::ParameterMode
+TAO::InArgument::mode (void) const
+{
+  return CORBA::PARAM_IN;
+}
+
+CORBA::ParameterMode
+TAO::InoutArgument::mode (void) const
 {
+  return CORBA::PARAM_INOUT;
+}
+
+CORBA::ParameterMode
+TAO::OutArgument::mode (void) const
+{
+  return CORBA::PARAM_OUT;
+}
+
+CORBA::ParameterMode
+TAO::RetArgument::mode (void) const
+{
+  return CORBA::PARAM_OUT;
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
+
diff --git a/TAO/tao/Argument.h b/TAO/tao/Argument.h
index 0a42a2a7064..edad3568278 100644
--- a/TAO/tao/Argument.h
+++ b/TAO/tao/Argument.h
@@ -24,11 +24,7 @@
 
 #include "tao/orbconf.h"
 #include "tao/TAO_Export.h"
-
-namespace Dynamic
-{
-  struct Parameter;
-}
+#include "tao/ParameterModeC.h"
 
 namespace CORBA
 {
@@ -61,7 +57,7 @@ namespace TAO
     /**
      * @note The default implementation simply returns @c true.
      */
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
 
     /// Demarshal the argument from the given CDR input stream.
     /**
@@ -80,23 +76,51 @@ namespace TAO
      * value, if either or both exist.
      */
     //@{
-    /// Populate the given @a Dynamic::Parameter argument.
-    /**
-     * @note The default implementation is a no-op.
-     */
-    virtual void interceptor_param (Dynamic::Parameter &);
-
     /// Populate the given @a CORBA::Any result argument.
     /**
      * @note The default implementation is a no-op.
      */
-    virtual void interceptor_result (CORBA::Any *);
+    virtual void interceptor_value (CORBA::Any *) const;
+
+    /// Get the parameter mode of this argument
+    virtual CORBA::ParameterMode mode (void) const = 0;
     //@}
 
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
 
   };
 
+  class TAO_Export InArgument : public Argument
+  {
+  public:
+#if TAO_HAS_INTERCEPTORS == 1
+    virtual CORBA::ParameterMode mode (void) const;
+#endif
+  };
+
+  class TAO_Export InoutArgument : public Argument
+  {
+  public:
+#if TAO_HAS_INTERCEPTORS == 1
+    virtual CORBA::ParameterMode mode (void) const;
+#endif
+  };
+
+  class TAO_Export OutArgument : public Argument
+  {
+  public:
+#if TAO_HAS_INTERCEPTORS == 1
+    virtual CORBA::ParameterMode mode (void) const;
+#endif
+  };
+
+  class TAO_Export RetArgument : public Argument
+  {
+  public:
+#if TAO_HAS_INTERCEPTORS == 1
+    virtual CORBA::ParameterMode mode (void) const;
+#endif
+  };
 }
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/Array_VarOut_T.h b/TAO/tao/Array_VarOut_T.h
index f2e07430c24..45b0acd196c 100644
--- a/TAO/tao/Array_VarOut_T.h
+++ b/TAO/tao/Array_VarOut_T.h
@@ -169,7 +169,7 @@ class TAO_Array_Forany_T
 {
 public:
   TAO_Array_Forany_T (void);
-  TAO_Array_Forany_T (T_slice *,
+  TAO_Array_Forany_T (const T_slice *,
                       CORBA::Boolean nocopy = 0);
   TAO_Array_Forany_T (const TAO_Array_Forany_T<T,T_slice,TAG> &);
   ~TAO_Array_Forany_T (void);
diff --git a/TAO/tao/Array_VarOut_T.inl b/TAO/tao/Array_VarOut_T.inl
index b65c4145304..5eda36c3566 100644
--- a/TAO/tao/Array_VarOut_T.inl
+++ b/TAO/tao/Array_VarOut_T.inl
@@ -58,7 +58,7 @@ ACE_INLINE
 const T_slice *
 TAO_Array_Var_Base_T<T,T_slice,TAG>::in (void) const
 {
-  return (const T_slice *) this->ptr_;
+  return const_cast <const T_slice *> (this->ptr_);
 }
 
 template<typename T, typename T_slice, typename TAG>
@@ -247,10 +247,10 @@ TAO_Array_Forany_T<T,T_slice,TAG>::TAO_Array_Forany_T (void)
 template<typename T, typename T_slice, typename TAG>
 ACE_INLINE
 TAO_Array_Forany_T<T,T_slice,TAG>::TAO_Array_Forany_T (
-    T_slice * p,
+    const T_slice * p,
     CORBA::Boolean nocopy
   )
-  : ptr_ (p),
+  : ptr_ (const_cast <T_slice *>(p)),
     nocopy_ (nocopy)
 {}
 
diff --git a/TAO/tao/Asynch_Queued_Message.h b/TAO/tao/Asynch_Queued_Message.h
index 7319edacba1..f6225a48b45 100644
--- a/TAO/tao/Asynch_Queued_Message.h
+++ b/TAO/tao/Asynch_Queued_Message.h
@@ -50,7 +50,8 @@ public:
   /// Destructor
   virtual ~TAO_Asynch_Queued_Message (void);
 
-  /** Implement the Template Methods from TAO_Queued_Message
+  /**
+   * @name Implement the Template Methods from TAO_Queued_Message
    */
   //@{
   virtual size_t message_length (void) const;
diff --git a/TAO/tao/BD_String_Argument_T.cpp b/TAO/tao/BD_String_Argument_T.cpp
index cd1625d1ced..2734394a30f 100644
--- a/TAO/tao/BD_String_Argument_T.cpp
+++ b/TAO/tao/BD_String_Argument_T.cpp
@@ -4,7 +4,6 @@
 #define TAO_BD_STRING_ARGUMENT_T_C
 
 #include "tao/BD_String_Argument_T.h"
-#include "tao/Dynamic_ParameterC.h"
 
 #if !defined (__ACE_INLINE__)
 #include "tao/BD_String_Argument_T.inl"
@@ -14,9 +13,13 @@ ACE_RCSID (tao,
            BD_String_Argument_T,
            "$Id$")
 
-template<typename S, typename to_S, typename from_S, size_t BOUND>
+template<typename S,
+         typename to_S,
+         typename from_S,
+         size_t BOUND,
+         typename Insert_Policy>
 CORBA::Boolean
-TAO::In_BD_String_Argument_T<S,to_S,from_S,BOUND>::marshal (
+TAO::In_BD_String_Argument_T<S,to_S,from_S,BOUND,Insert_Policy>::marshal (
     TAO_OutputCDR & cdr
   )
 {
@@ -25,32 +28,42 @@ TAO::In_BD_String_Argument_T<S,to_S,from_S,BOUND>::marshal (
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S, typename to_S, typename from_S, size_t BOUND>
+template<typename S,
+         typename to_S,
+         typename from_S,
+         size_t BOUND,
+         typename Insert_Policy>
 void
-TAO::In_BD_String_Argument_T<S,to_S,from_S,BOUND>::interceptor_param (
-    Dynamic::Parameter & p
-  )
+TAO::In_BD_String_Argument_T<S,to_S,from_S,BOUND,Insert_Policy>::interceptor_value (
+  CORBA::Any *any) const
 {
-  p.argument <<= from_S (this->x_, BOUND);
-  p.mode = CORBA::PARAM_IN;
+  this->Insert_Policy::any_insert (any, from_S (this->x_, BOUND));
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // ===========================================================
 
-template<typename S, typename to_S, typename from_S, size_t BOUND>
+template<typename S,
+         typename to_S,
+         typename from_S,
+         size_t BOUND,
+         typename Insert_Policy>
 CORBA::Boolean
-TAO::Inout_BD_String_Argument_T<S,to_S,from_S,BOUND>::marshal (
+TAO::Inout_BD_String_Argument_T<S,to_S,from_S,BOUND,Insert_Policy>::marshal (
     TAO_OutputCDR & cdr
   )
 {
   return cdr << from_S (this->x_, BOUND);
 }
 
-template<typename S, typename to_S, typename from_S, size_t BOUND>
+template<typename S,
+         typename to_S,
+         typename from_S,
+         size_t BOUND,
+         typename Insert_Policy>
 CORBA::Boolean
-TAO::Inout_BD_String_Argument_T<S,to_S,from_S,BOUND>::demarshal (
+TAO::Inout_BD_String_Argument_T<S,to_S,from_S,BOUND,Insert_Policy>::demarshal (
     TAO_InputCDR & cdr
   )
 {
@@ -60,27 +73,30 @@ TAO::Inout_BD_String_Argument_T<S,to_S,from_S,BOUND>::demarshal (
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S, typename to_S, typename from_S, size_t BOUND>
+template<typename S,
+         typename to_S,
+         typename from_S,
+         size_t BOUND,
+         typename Insert_Policy>
 void
-TAO::Inout_BD_String_Argument_T<S,to_S,from_S,BOUND>::interceptor_param (
-    Dynamic::Parameter & p
-  )
+TAO::Inout_BD_String_Argument_T<S,to_S,from_S,BOUND,Insert_Policy>::interceptor_value (
+  CORBA::Any *any) const
 {
-  p.argument <<= from_S (this->x_, BOUND);
-  p.mode = CORBA::PARAM_INOUT;
+  this->Insert_Policy::any_insert (any, from_S (this->x_, BOUND));
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // ==============================================================
 
-template<typename S, 
-         typename S_out, 
-         typename to_S, 
-         typename from_S, 
-         size_t BOUND>
+template<typename S,
+         typename S_out,
+         typename to_S,
+         typename from_S,
+         size_t BOUND,
+         typename Insert_Policy>
 CORBA::Boolean
-TAO::Out_BD_String_Argument_T<S,S_out,to_S,from_S,BOUND>::demarshal (
+TAO::Out_BD_String_Argument_T<S,S_out,to_S,from_S,BOUND,Insert_Policy>::demarshal (
     TAO_InputCDR & cdr
   )
 {
@@ -89,31 +105,31 @@ TAO::Out_BD_String_Argument_T<S,S_out,to_S,from_S,BOUND>::demarshal (
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S, 
-         typename S_out, 
-         typename to_S, 
-         typename from_S, 
-         size_t BOUND>
+template<typename S,
+         typename S_out,
+         typename to_S,
+         typename from_S,
+         size_t BOUND,
+         typename Insert_Policy>
 void
-TAO::Out_BD_String_Argument_T<S,S_out,to_S,from_S,BOUND>::interceptor_param (
-    Dynamic::Parameter & p
-  )
+TAO::Out_BD_String_Argument_T<S,S_out,to_S,from_S,BOUND,Insert_Policy>::interceptor_value (
+  CORBA::Any *any) const
 {
-  p.argument <<= from_S (this->x_, BOUND);
-  p.mode = CORBA::PARAM_OUT;
+  this->Insert_Policy::any_insert (any, from_S (this->x_, BOUND));
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // ============================================================
 
-template<typename S, 
-         typename S_var, 
-         typename to_S, 
-         typename from_S, 
-         size_t BOUND>
+template<typename S,
+         typename S_var,
+         typename to_S,
+         typename from_S,
+         size_t BOUND,
+         typename Insert_Policy>
 CORBA::Boolean
-TAO::Ret_BD_String_Argument_T<S,S_var,to_S,from_S,BOUND>::demarshal (
+TAO::Ret_BD_String_Argument_T<S,S_var,to_S,from_S,BOUND,Insert_Policy>::demarshal (
     TAO_InputCDR & cdr
   )
 {
@@ -122,17 +138,17 @@ TAO::Ret_BD_String_Argument_T<S,S_var,to_S,from_S,BOUND>::demarshal (
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S, 
-         typename S_var, 
-         typename to_S, 
-         typename from_S, 
-         size_t BOUND>
+template<typename S,
+         typename S_var,
+         typename to_S,
+         typename from_S,
+         size_t BOUND,
+         typename Insert_Policy>
 void
-TAO::Ret_BD_String_Argument_T<S,S_var,to_S,from_S,BOUND>::interceptor_result (
-    CORBA::Any * any
-  )
+TAO::Ret_BD_String_Argument_T<S,S_var,to_S,from_S,BOUND,Insert_Policy>::interceptor_value (
+  CORBA::Any *any) const
 {
-  (*any) <<= from_S (this->x_.in (), BOUND);
+  this->Insert_Policy::any_insert (any, from_S (this->x_.in (), BOUND));
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
diff --git a/TAO/tao/BD_String_Argument_T.h b/TAO/tao/BD_String_Argument_T.h
index 20a8e86e45b..7a2fdc4eddd 100644
--- a/TAO/tao/BD_String_Argument_T.h
+++ b/TAO/tao/BD_String_Argument_T.h
@@ -23,6 +23,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/Argument.h"
+#include "tao/Any_Insert_Policy_T.h"
 
 namespace TAO
 {
@@ -32,16 +33,20 @@ namespace TAO
    * @brief Template class for IN bounded (w)string argument.
    *
    */
-  template<typename S, typename to_S, typename from_S, size_t BOUND>
-  class In_BD_String_Argument_T : public Argument
+  template<typename S,
+           typename to_S,
+           typename from_S,
+           size_t BOUND,
+           typename Insert_Policy>
+  class In_BD_String_Argument_T : public InArgument, private Insert_Policy
   {
   public:
     In_BD_String_Argument_T (const S * x);
 
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
 
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
 
     S const * arg (void) const;
@@ -58,16 +63,20 @@ namespace TAO
    * @brief Template class for INOUT bounded (w)string argument.
    *
    */
-  template<typename S, typename to_S, typename from_S, size_t BOUND>
-  class Inout_BD_String_Argument_T : public Argument
+  template<typename S,
+           typename to_S,
+           typename from_S,
+           size_t BOUND,
+           typename Insert_Policy>
+  class Inout_BD_String_Argument_T : public InoutArgument, private Insert_Policy
   {
   public:
     Inout_BD_String_Argument_T (S *& x);
 
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S *& arg (void);
 
@@ -78,22 +87,23 @@ namespace TAO
   /**
    * @class Out_BD_String_Argument_T
    *
-   * @brief Template class for INOUT bounded (w)string argument.
+   * @brief Template class for OUT bounded (w)string argument.
    *
    */
   template<typename S,
            typename S_out,
            typename to_S,
            typename from_S,
-           size_t BOUND>
-  class Out_BD_String_Argument_T : public Argument
+           size_t BOUND,
+           typename Insert_Policy>
+  class Out_BD_String_Argument_T : public OutArgument, private Insert_Policy
   {
   public:
     Out_BD_String_Argument_T (S_out x);
 
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S *& arg (void);
 
@@ -111,15 +121,16 @@ namespace TAO
            typename S_var,
            typename to_S,
            typename from_S,
-           size_t BOUND>
-  class Ret_BD_String_Argument_T : public Argument
+           size_t BOUND,
+           typename Insert_Policy>
+  class Ret_BD_String_Argument_T : public RetArgument, private Insert_Policy
   {
   public:
     Ret_BD_String_Argument_T (void);
 
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_result (CORBA::Any *);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S *& arg (void);
 
@@ -151,7 +162,8 @@ namespace TAO
            typename T_out,
            typename to_T,
            typename from_T,
-           size_t BOUND>
+           size_t BOUND,
+           typename Insert_Policy>
   struct BD_String_Arg_Traits_T
   {
     typedef T *                                   ret_type;
@@ -162,52 +174,28 @@ namespace TAO
     typedef In_BD_String_Argument_T<T,
                                     to_T,
                                     from_T,
-                                    BOUND>        in_arg_val;
+                                    BOUND,
+                                    Insert_Policy>        in_arg_val;
     typedef Inout_BD_String_Argument_T<T,
                                        to_T,
                                        from_T,
-                                       BOUND>     inout_arg_val;
+                                       BOUND,
+                                       Insert_Policy>     inout_arg_val;
     typedef Out_BD_String_Argument_T<T,
                                      T_out,
                                      to_T,
                                      from_T,
-                                     BOUND>       out_arg_val;
+                                     BOUND,
+                                     Insert_Policy>       out_arg_val;
     typedef Ret_BD_String_Argument_T<T,
                                      T_var,
                                      to_T,
                                      from_T,
-                                     BOUND>       ret_val;
+                                     BOUND,
+                                     Insert_Policy>       ret_val;
 
     typedef BD_String_Tag                         idl_tag;
   };
-
-  /**
-   *
-   * @brief Specializations for bounded (w)strings
-   *
-   */
-
-  template<size_t BOUND>
-  class BD_String_Arg_Traits
-    : public BD_String_Arg_Traits_T<CORBA::Char,
-                                    CORBA::String_var,
-                                    CORBA::String_out,
-                                    ACE_InputCDR::to_string,
-                                    ACE_OutputCDR::from_string,
-                                    BOUND>
-  {
-  };
-
-  template<size_t BOUND>
-  class BD_WString_Arg_Traits
-    : public BD_String_Arg_Traits_T<CORBA::WChar,
-                                    CORBA::WString_var,
-                                    CORBA::WString_out,
-                                    ACE_InputCDR::to_wstring,
-                                    ACE_OutputCDR::from_wstring,
-                                    BOUND>
-  {
-  };
 }
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/tao/BD_String_Argument_T.inl b/TAO/tao/BD_String_Argument_T.inl
index c75c60911fc..a21a1e227b7 100644
--- a/TAO/tao/BD_String_Argument_T.inl
+++ b/TAO/tao/BD_String_Argument_T.inl
@@ -1,108 +1,130 @@
 // $Id$
 
-template<typename S, typename to_S, typename from_S, size_t BOUND>
+template<typename S,
+         typename to_S,
+         typename from_S,
+         size_t BOUND,
+         typename Insert_Policy>
 ACE_INLINE
-TAO::In_BD_String_Argument_T<S,to_S,from_S,BOUND>::In_BD_String_Argument_T (
+TAO::In_BD_String_Argument_T<S,to_S,from_S,BOUND,Insert_Policy>::In_BD_String_Argument_T (
     const S * x
   )
   : x_ (x)
 {}
 
-template<typename S, typename to_S, typename from_S, size_t BOUND>
+template<typename S,
+         typename to_S,
+         typename from_S,
+         size_t BOUND,
+         typename Insert_Policy>
 ACE_INLINE
 const S *
-TAO::In_BD_String_Argument_T<S,to_S,from_S,BOUND>::arg (void) const
+TAO::In_BD_String_Argument_T<S,to_S,from_S,BOUND,Insert_Policy>::arg (void) const
 {
   return this->x_;
 }
 
 // ==========================================================================
 
-template<typename S, typename to_S, typename from_S, size_t BOUND>
+template<typename S,
+         typename to_S,
+         typename from_S,
+         size_t BOUND,
+         typename Insert_Policy>
 ACE_INLINE
-TAO::Inout_BD_String_Argument_T<S,to_S,from_S,BOUND>::
+TAO::Inout_BD_String_Argument_T<S,to_S,from_S,BOUND,Insert_Policy>::
 Inout_BD_String_Argument_T (S *& x)
   : x_ (x)
 {}
 
-template<typename S, typename to_S, typename from_S, size_t BOUND>
+template<typename S,
+         typename to_S,
+         typename from_S,
+         size_t BOUND,
+         typename Insert_Policy>
 ACE_INLINE
 S *&
-TAO::Inout_BD_String_Argument_T<S,to_S,from_S,BOUND>::arg (void)
+TAO::Inout_BD_String_Argument_T<S,to_S,from_S,BOUND,Insert_Policy>::arg (void)
 {
   return this->x_;
 }
 
 // ==========================================================================
 
-template<typename S, 
-         typename S_out, 
-         typename to_S, 
-         typename from_S, 
-         size_t BOUND>
+template<typename S,
+         typename S_out,
+         typename to_S,
+         typename from_S,
+         size_t BOUND,
+         typename Insert_Policy>
 ACE_INLINE
-TAO::Out_BD_String_Argument_T<S,S_out,to_S,from_S,BOUND>::
+TAO::Out_BD_String_Argument_T<S,S_out,to_S,from_S,BOUND,Insert_Policy>::
 Out_BD_String_Argument_T (S_out x)
   : x_ (x.ptr ())
 {}
 
-template<typename S, 
-         typename S_out, 
-         typename to_S, 
-         typename from_S, 
-         size_t BOUND>
+template<typename S,
+         typename S_out,
+         typename to_S,
+         typename from_S,
+         size_t BOUND,
+         typename Insert_Policy>
 ACE_INLINE
 S *&
-TAO::Out_BD_String_Argument_T<S,S_out,to_S,from_S,BOUND>::arg (void)
+TAO::Out_BD_String_Argument_T<S,S_out,to_S,from_S,BOUND,Insert_Policy>::arg (void)
 {
   return this->x_;
 }
 
 // ==========================================================================
 
-template<typename S, 
-         typename S_var, 
-         typename to_S, 
-         typename from_S, 
-         size_t BOUND>
+template<typename S,
+         typename S_var,
+         typename to_S,
+         typename from_S,
+         size_t BOUND,
+         typename Insert_Policy>
 ACE_INLINE
-TAO::Ret_BD_String_Argument_T<S,S_var,to_S,from_S,BOUND>::
+TAO::Ret_BD_String_Argument_T<S,S_var,to_S,from_S,BOUND,Insert_Policy>::
 Ret_BD_String_Argument_T (void)
 {
 }
 
-template<typename S, 
-         typename S_var, 
-         typename to_S, 
-         typename from_S, 
-         size_t BOUND>
+template<typename S,
+         typename S_var,
+         typename to_S,
+         typename from_S,
+         size_t BOUND,
+         typename Insert_Policy>
 ACE_INLINE
 S *
-TAO::Ret_BD_String_Argument_T<S,S_var,to_S,from_S,BOUND>::excp (void)
+TAO::Ret_BD_String_Argument_T<S,S_var,to_S,from_S,BOUND,Insert_Policy>::excp (void)
 {
   return this->x_.ptr ();
 }
 
-template<typename S, 
-         typename S_var, 
-         typename to_S, 
-         typename from_S, 
-         size_t BOUND>
+template<typename S,
+         typename S_var,
+         typename to_S,
+         typename from_S,
+         size_t BOUND,
+         typename Insert_Policy>
 ACE_INLINE
 S *
-TAO::Ret_BD_String_Argument_T<S,S_var,to_S,from_S,BOUND>::retn (void)
+TAO::Ret_BD_String_Argument_T<S,S_var,to_S,from_S,BOUND,Insert_Policy>::retn (void)
 {
   return this->x_._retn ();
 }
 
-template<typename S, 
-         typename S_var, 
-         typename to_S, 
-         typename from_S, 
-         size_t BOUND>
+template<typename S,
+         typename S_var,
+         typename to_S,
+         typename from_S,
+         size_t BOUND,
+         typename Insert_Policy>
 ACE_INLINE
 S *&
-TAO::Ret_BD_String_Argument_T<S,S_var,to_S,from_S,BOUND>::arg (void)
+TAO::Ret_BD_String_Argument_T<S,S_var,to_S,from_S,BOUND,Insert_Policy>::arg (void)
 {
   return this->x_.out ();
 }
diff --git a/TAO/tao/Basic_Argument_T.cpp b/TAO/tao/Basic_Argument_T.cpp
index 353d125e7a8..f798eb09887 100644
--- a/TAO/tao/Basic_Argument_T.cpp
+++ b/TAO/tao/Basic_Argument_T.cpp
@@ -4,7 +4,6 @@
 #define TAO_BASIC_ARGUMENT_T_C
 
 #include "tao/Basic_Argument_T.h"
-#include "tao/Dynamic_ParameterC.h"
 
 #if !defined (__ACE_INLINE__)
 #include "tao/Basic_Argument_T.inl"
@@ -14,90 +13,87 @@ ACE_RCSID (tao,
            Basic_Argument_T,
            "$Id$")
 
-template<typename S>
+template<typename S, typename Insert_Policy>
 CORBA::Boolean
-TAO::In_Basic_Argument_T<S>::marshal (TAO_OutputCDR & cdr)
+TAO::In_Basic_Argument_T<S, Insert_Policy>::marshal (TAO_OutputCDR &cdr)
 {
   return cdr << this->x_;
 }
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S>
+template<typename S, typename Insert_Policy>
 void
-TAO::In_Basic_Argument_T<S>::interceptor_param (Dynamic::Parameter & p)
+TAO::In_Basic_Argument_T<S, Insert_Policy>::interceptor_value (CORBA::Any *any) const
 {
-  p.argument <<= this->x_;
-  p.mode = CORBA::PARAM_IN;
+  this->Insert_Policy::any_insert (any, this->x_);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // ===========================================================
 
-template<typename S>
+template<typename S, typename Insert_Policy>
 CORBA::Boolean
-TAO::Inout_Basic_Argument_T<S>::marshal (TAO_OutputCDR & cdr)
+TAO::Inout_Basic_Argument_T<S, Insert_Policy>::marshal (TAO_OutputCDR &cdr)
 {
   return cdr << this->x_;
 }
 
-template<typename S>
+template<typename S, typename Insert_Policy>
 CORBA::Boolean
-TAO::Inout_Basic_Argument_T<S>::demarshal (TAO_InputCDR & cdr)
+TAO::Inout_Basic_Argument_T<S, Insert_Policy>::demarshal (TAO_InputCDR & cdr)
 {
   return cdr >> this->x_;
 }
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S>
+template<typename S, typename Insert_Policy>
 void
-TAO::Inout_Basic_Argument_T<S>::interceptor_param (Dynamic::Parameter & p)
+TAO::Inout_Basic_Argument_T<S, Insert_Policy>::interceptor_value (CORBA::Any *any) const
 {
-  p.argument <<= this->x_;
-  p.mode = CORBA::PARAM_INOUT;
+  this->Insert_Policy::any_insert (any, this->x_);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // ==============================================================
 
-template<typename S>
+template<typename S, typename Insert_Policy>
 CORBA::Boolean
-TAO::Out_Basic_Argument_T<S>::demarshal (TAO_InputCDR & cdr)
+TAO::Out_Basic_Argument_T<S, Insert_Policy>::demarshal (TAO_InputCDR & cdr)
 {
   return cdr >> this->x_;
 }
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S>
+template<typename S, typename Insert_Policy>
 void
-TAO::Out_Basic_Argument_T<S>::interceptor_param (Dynamic::Parameter & p)
+TAO::Out_Basic_Argument_T<S, Insert_Policy>::interceptor_value (CORBA::Any *any) const
 {
-  p.argument <<= this->x_;
-  p.mode = CORBA::PARAM_OUT;
+  this->Insert_Policy::any_insert (any, this->x_);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // ============================================================
 
-template<typename S>
+template<typename S, typename Insert_Policy>
 CORBA::Boolean
-TAO::Ret_Basic_Argument_T<S>::demarshal (TAO_InputCDR & cdr)
+TAO::Ret_Basic_Argument_T<S, Insert_Policy>::demarshal (TAO_InputCDR & cdr)
 {
   return cdr >> this->x_;
 }
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S>
+template<typename S, typename Insert_Policy>
 void
-TAO::Ret_Basic_Argument_T<S>::interceptor_result (CORBA::Any * any)
+TAO::Ret_Basic_Argument_T<S, Insert_Policy>::interceptor_value (CORBA::Any *any) const
 {
-  (*any) <<= this->x_;
+  this->Insert_Policy::any_insert (any, this->x_);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
diff --git a/TAO/tao/Basic_Argument_T.h b/TAO/tao/Basic_Argument_T.h
index e1586de690a..cc7bcb388b3 100644
--- a/TAO/tao/Basic_Argument_T.h
+++ b/TAO/tao/Basic_Argument_T.h
@@ -29,16 +29,23 @@ namespace TAO
    *
    * @brief Template class for IN stub argument of basic IDL types.
    *
+   * @todo
+   * We really would have liked to write the code as following but MSVC6 chokes
+   * on this, so we can only do this after x.5.1 has been dropped.
+   *
+   * template <typename S, template <typename T> class Insert_Policy>
+   * class In_Basic_Argument_T : public InArgument, private Insert_Policy <S>
+   * { .. };
    */
-  template<typename S>
-  class In_Basic_Argument_T : public Argument
+  template<typename S, typename Insert_Policy>
+  class In_Basic_Argument_T : public InArgument, private Insert_Policy
   {
   public:
     In_Basic_Argument_T (S const & x);
 
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S arg (void) const;
 
@@ -52,16 +59,16 @@ namespace TAO
    * @brief Template class for INOUT stub argument of basic IDL types.
    *
    */
-  template<typename S>
-  class Inout_Basic_Argument_T : public Argument
+  template<typename S, typename Insert_Policy>
+  class Inout_Basic_Argument_T : public InoutArgument, private Insert_Policy
   {
   public:
     Inout_Basic_Argument_T (S & x);
 
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S & arg (void);
 
@@ -75,15 +82,15 @@ namespace TAO
    * @brief Template class for OUT stub argument of basic IDL types.
    *
    */
-  template<typename S>
-  class Out_Basic_Argument_T : public Argument
+  template<typename S, typename Insert_Policy>
+  class Out_Basic_Argument_T : public OutArgument, private Insert_Policy
   {
   public:
     Out_Basic_Argument_T (S & x);
 
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S & arg (void);
 
@@ -97,15 +104,15 @@ namespace TAO
    * @brief Template class for return stub value of basic IDL types.
    *
    */
-  template<typename S>
-  class Ret_Basic_Argument_T : public Argument
+  template<typename S, typename Insert_Policy>
+  class Ret_Basic_Argument_T : public RetArgument, private Insert_Policy
   {
   public:
     Ret_Basic_Argument_T (void);
 
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_result (CORBA::Any *);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S & arg (void);
 
@@ -130,20 +137,20 @@ namespace TAO
    * @brief Template class for stub argument traits of basic IDL types.
    *
    */
-  template<typename T>
+  template<typename T, typename Insert_Policy>
   struct Basic_Arg_Traits_T
   {
-    typedef T                           ret_type;
-    typedef T                           in_type;
-    typedef T &                         inout_type;
-    typedef T &                         out_type;
+    typedef T                                          ret_type;
+    typedef T                                          in_type;
+    typedef T &                                        inout_type;
+    typedef T &                                        out_type;
 
-    typedef In_Basic_Argument_T<T>      in_arg_val;
-    typedef Inout_Basic_Argument_T<T>   inout_arg_val;
-    typedef Out_Basic_Argument_T<T>     out_arg_val;
-    typedef Ret_Basic_Argument_T<T>     ret_val;
+    typedef In_Basic_Argument_T<T, Insert_Policy>      in_arg_val;
+    typedef Inout_Basic_Argument_T<T, Insert_Policy>   inout_arg_val;
+    typedef Out_Basic_Argument_T<T, Insert_Policy>     out_arg_val;
+    typedef Ret_Basic_Argument_T<T, Insert_Policy>     ret_val;
 
-    typedef Basic_Tag                   idl_tag;
+    typedef Basic_Tag                                  idl_tag;
   };
 }
 
diff --git a/TAO/tao/Basic_Argument_T.inl b/TAO/tao/Basic_Argument_T.inl
index 423792367a6..d11f01533bd 100644
--- a/TAO/tao/Basic_Argument_T.inl
+++ b/TAO/tao/Basic_Argument_T.inl
@@ -1,79 +1,79 @@
 // $Id$
 
-template<typename S>
+template<typename S, typename Insert_Policy>
 ACE_INLINE
-TAO::In_Basic_Argument_T<S>::In_Basic_Argument_T (S const & x)
+TAO::In_Basic_Argument_T<S, Insert_Policy>::In_Basic_Argument_T (S const & x)
   : x_ (x)
 {}
 
-template<typename S>
+template<typename S, typename Insert_Policy>
 ACE_INLINE
-S 
-TAO::In_Basic_Argument_T<S>::arg (void) const
+S
+TAO::In_Basic_Argument_T<S, Insert_Policy>::arg (void) const
 {
   return this->x_;
 }
 
 // ================================================================
 
-template<typename S>
+template<typename S, typename Insert_Policy>
 ACE_INLINE
-TAO::Inout_Basic_Argument_T<S>::Inout_Basic_Argument_T (S & x)
+TAO::Inout_Basic_Argument_T<S, Insert_Policy>::Inout_Basic_Argument_T (S & x)
   : x_ (x)
 {}
 
-template<typename S>
+template<typename S, typename Insert_Policy>
 ACE_INLINE
 S &
-TAO::Inout_Basic_Argument_T<S>::arg (void)
+TAO::Inout_Basic_Argument_T<S, Insert_Policy>::arg (void)
 {
   return this->x_;
 }
 
 // ================================================================
 
-template<typename S>
+template<typename S, typename Insert_Policy>
 ACE_INLINE
-TAO::Out_Basic_Argument_T<S>::Out_Basic_Argument_T (S & x)
+TAO::Out_Basic_Argument_T<S, Insert_Policy>::Out_Basic_Argument_T (S & x)
   : x_ (x)
 {}
 
-template<typename S>
+template<typename S, typename Insert_Policy>
 ACE_INLINE
 S &
-TAO::Out_Basic_Argument_T<S>::arg (void)
+TAO::Out_Basic_Argument_T<S, Insert_Policy>::arg (void)
 {
   return this->x_;
 }
 
 // ================================================================
 
-template<typename S>
+template<typename S, typename Insert_Policy>
 ACE_INLINE
-TAO::Ret_Basic_Argument_T<S>::Ret_Basic_Argument_T (void)
+TAO::Ret_Basic_Argument_T<S, Insert_Policy>::Ret_Basic_Argument_T (void)
 {
 }
 
-template<typename S>
+template<typename S, typename Insert_Policy>
 ACE_INLINE
 S &
-TAO::Ret_Basic_Argument_T<S>::arg (void)
+TAO::Ret_Basic_Argument_T<S, Insert_Policy>::arg (void)
 {
   return this->x_;
 }
 
-template<typename S>
+template<typename S, typename Insert_Policy>
 ACE_INLINE
 S
-TAO::Ret_Basic_Argument_T<S>::excp (void)
+TAO::Ret_Basic_Argument_T<S, Insert_Policy>::excp (void)
 {
   return this->x_;
 }
 
-template<typename S>
+template<typename S, typename Insert_Policy>
 ACE_INLINE
 S
-TAO::Ret_Basic_Argument_T<S>::retn (void)
+TAO::Ret_Basic_Argument_T<S, Insert_Policy>::retn (void)
 {
   return this->x_;
 }
diff --git a/TAO/tao/Basic_Arguments.h b/TAO/tao/Basic_Arguments.h
index 7b7a65cb305..155d66c651e 100644
--- a/TAO/tao/Basic_Arguments.h
+++ b/TAO/tao/Basic_Arguments.h
@@ -23,6 +23,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/Arg_Traits_T.h"
+#include "tao/Any_Insert_Policy_T.h"
 
 namespace TAO
 {
@@ -37,7 +38,7 @@ namespace TAO
     public:
     typedef void        ret_type;
 
-    typedef Argument    ret_val;
+    typedef RetArgument ret_val;
 
     typedef Basic_Tag   idl_tag;
   };
@@ -51,55 +52,57 @@ namespace TAO
 
   template<>
   class TAO_Export Arg_Traits<CORBA::Short>
-    : public Basic_Arg_Traits_T<CORBA::Short>
+    : public Basic_Arg_Traits_T<CORBA::Short, TAO::Any_Insert_Policy_AnyTypeCode_Adapter <CORBA::Short> >
   {
   };
 
   template<>
   class TAO_Export Arg_Traits<CORBA::Long>
-    : public Basic_Arg_Traits_T<CORBA::Long>
+    : public Basic_Arg_Traits_T<CORBA::Long, TAO::Any_Insert_Policy_AnyTypeCode_Adapter <CORBA::Long> >
   {
   };
 
   template<>
   class TAO_Export Arg_Traits<CORBA::UShort>
-    : public Basic_Arg_Traits_T<CORBA::UShort>
+    : public Basic_Arg_Traits_T<CORBA::UShort, TAO::Any_Insert_Policy_Stream <CORBA::UShort> >
   {
   };
 
   template<>
   class TAO_Export Arg_Traits<CORBA::ULong>
-    : public Basic_Arg_Traits_T<CORBA::ULong>
+    : public Basic_Arg_Traits_T<CORBA::ULong, TAO::Any_Insert_Policy_AnyTypeCode_Adapter <CORBA::ULong> >
   {
   };
 
   template<>
   class TAO_Export Arg_Traits<CORBA::Float>
-    : public Basic_Arg_Traits_T<CORBA::Float>
+    : public Basic_Arg_Traits_T<CORBA::Float, TAO::Any_Insert_Policy_Stream <CORBA::Float> >
   {
   };
 
   template<>
   class TAO_Export Arg_Traits<CORBA::Double>
-    : public Basic_Arg_Traits_T<CORBA::Double>
+    : public Basic_Arg_Traits_T<CORBA::Double, TAO::Any_Insert_Policy_Stream <CORBA::Double> >
   {
   };
 
   template<>
   class TAO_Export Arg_Traits<CORBA::LongLong>
-    : public Basic_Arg_Traits_T<CORBA::LongLong>
+    : public Basic_Arg_Traits_T<CORBA::LongLong, TAO::Any_Insert_Policy_Stream <CORBA::LongLong> >
   {
   };
 
   template<>
   class TAO_Export Arg_Traits<CORBA::ULongLong>
-    : public Basic_Arg_Traits_T<CORBA::ULongLong>
+    : public Basic_Arg_Traits_T<CORBA::ULongLong,
+                                TAO::Any_Insert_Policy_Stream <CORBA::ULongLong> >
   {
   };
 
   template<>
   class TAO_Export Arg_Traits<CORBA::LongDouble>
-    : public Basic_Arg_Traits_T<CORBA::LongDouble>
+    : public Basic_Arg_Traits_T<CORBA::LongDouble,
+                                TAO::Any_Insert_Policy_Stream <CORBA::LongDouble> >
   {
   };
 }
diff --git a/TAO/tao/BiDir_GIOP.mpc b/TAO/tao/BiDir_GIOP.mpc
index c503b33a21f..9e29e3b6e2b 100644
--- a/TAO/tao/BiDir_GIOP.mpc
+++ b/TAO/tao/BiDir_GIOP.mpc
@@ -27,6 +27,9 @@ project : taolib, core, pi {
     BiDir_GIOP
   }
 
+  IDL_Files {
+  }
+
   Pkgconfig_Files {
     BiDir_GIOP/TAO_BiDirGIOP.pc.in
   }
diff --git a/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.cpp b/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.cpp
index 65e88904bba..248691a541a 100644
--- a/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.cpp
+++ b/TAO/tao/BiDir_GIOP/BiDir_PolicyFactory.cpp
@@ -3,7 +3,7 @@
 #include "BiDir_Policy_i.h"
 
 #include "tao/ORB_Constants.h"
-#include "tao/Any.h"
+#include "tao/AnyTypeCode/Any.h"
 
 ACE_RCSID (BiDir_GIOP,
            BiDir_PolicyFactory,
diff --git a/TAO/tao/Block_Flushing_Strategy.h b/TAO/tao/Block_Flushing_Strategy.h
index dac5ac3f781..4c917bc2671 100644
--- a/TAO/tao/Block_Flushing_Strategy.h
+++ b/TAO/tao/Block_Flushing_Strategy.h
@@ -25,7 +25,7 @@
  *
  * @brief Implement a flushing strategy that blocks on write to flush
  */
-class TAO_Export TAO_Block_Flushing_Strategy : public TAO_Flushing_Strategy
+class TAO_Block_Flushing_Strategy : public TAO_Flushing_Strategy
 {
 public:
   virtual int schedule_output (TAO_Transport *transport);
diff --git a/TAO/tao/BooleanSeqA.cpp b/TAO/tao/BooleanSeqA.cpp
deleted file mode 100644
index 8cef36af73b..00000000000
--- a/TAO/tao/BooleanSeqA.cpp
+++ /dev/null
@@ -1,142 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "BooleanSeqC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Sequence_TypeCode_Static.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Dual_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:937
-
-
-#ifndef _TAO_TYPECODE_CORBA_BooleanSeq_GUARD
-#define _TAO_TYPECODE_CORBA_BooleanSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_BooleanSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_boolean,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_BooleanSeq_0 =
-      &CORBA_BooleanSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_BooleanSeq_GUARD */
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_BooleanSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/BooleanSeq:1.0",
-    "BooleanSeq",
-    &TAO::TypeCode::tc_CORBA_BooleanSeq_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_BooleanSeq =
-    &_tao_tc_CORBA_BooleanSeq;
-}
-
-
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::BooleanSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::BooleanSeq>::insert_copy (
-      _tao_any,
-      CORBA::BooleanSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_BooleanSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::BooleanSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::BooleanSeq>::insert (
-      _tao_any,
-      CORBA::BooleanSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_BooleanSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::BooleanSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::BooleanSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::BooleanSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::BooleanSeq>::extract (
-        _tao_any,
-        CORBA::BooleanSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_BooleanSeq_0,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/BooleanSeqC.cpp b/TAO/tao/BooleanSeqC.cpp
index 60a12b01952..1b7bfee2986 100644
--- a/TAO/tao/BooleanSeqC.cpp
+++ b/TAO/tao/BooleanSeqC.cpp
@@ -26,16 +26,12 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:291
+// be\be_codegen.cpp:277
 
 
 #include "BooleanSeqC.h"
 #include "tao/CDR.h"
 
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
diff --git a/TAO/tao/BooleanSeqC.h b/TAO/tao/BooleanSeqC.h
index 138394c2bf4..9f3714cabeb 100644
--- a/TAO/tao/BooleanSeqC.h
+++ b/TAO/tao/BooleanSeqC.h
@@ -26,10 +26,10 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:153
+// be\be_codegen.cpp:154
 
-#ifndef _TAO_IDL_ORIG_BOOLEANSEQC_H_
-#define _TAO_IDL_ORIG_BOOLEANSEQC_H_
+#ifndef _TAO_IDL_BOOLEANSEQC_H_
+#define _TAO_IDL_BOOLEANSEQC_H_
 
 #include /**/ "ace/pre.h"
 
@@ -52,17 +52,8 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_Export
 
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:49
 
 namespace CORBA
 {
@@ -114,14 +105,9 @@ namespace CORBA
   };
 
 #endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_BooleanSeq;
 
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:78
 
 } // module CORBA
 
@@ -134,14 +120,6 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const CORBA::BooleanSeq &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, CORBA::BooleanSeq*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::BooleanSeq *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::BooleanSeq *&);
-
-// TAO_IDL - Generated from
 // be\be_visitor_sequence/cdr_op_ch.cpp:71
 
 #if !defined _TAO_CDR_OP_CORBA_BooleanSeq_H_
@@ -159,15 +137,7 @@ TAO_Export CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_CORBA_BooleanSeq_H_ */
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
+// be\be_codegen.cpp:1028
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/tao/Bounds.pidl b/TAO/tao/Bounds.pidl
deleted file mode 100644
index c639e285fe5..00000000000
--- a/TAO/tao/Bounds.pidl
+++ /dev/null
@@ -1,43 +0,0 @@
-/**
- * @file Bounds.pidl
- *
- * $Id$
- *
- * @brief Pre-compiled IDL source for the CORBA::Bounds
- * exception.
- *
- * This file is used to generate BoundsC.{h,inl,cpp}, using the
- * following command:
- *
- *   tao_idl
- *        -o orig -Ge 1 -GA -Sc -Sci
- *        -Wb,export_macro=TAO_Export
- *        -Wb,export_include=TAO_Export.h
- *        -Wb,pre_include="ace/pre.h"
- *        -Wb,post_include="ace/post.h"
- *        Bounds.pidl
- *
- * and then:
- *
- * cp orig/BoundsC.{h,cpp} .
- *
- */
-#ifndef TAO_CORBA_BOUNDS_PIDL
-#define TAO_CORBA_BOUNDS_PIDL
-
-#pragma prefix "omg.org"
-
-module CORBA
-{
-  /**
-   * @exception Bounds
-   *
-   * @brief UserException for NVList::item()
-   *
-   * This exception is thrown on attempts to access 'out of bounds'
-   * items in an NVList.
-   */
-  exception Bounds {};
-};
-
-#endif /* TAO_CORBA_BOUNDS_PIDL */
diff --git a/TAO/tao/BoundsA.cpp b/TAO/tao/BoundsA.cpp
deleted file mode 100644
index ba6d1c0711d..00000000000
--- a/TAO/tao/BoundsA.cpp
+++ /dev/null
@@ -1,147 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "BoundsC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Struct_TypeCode_Static.h"
-#include "tao/TypeCode_Struct_Field.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Dual_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/struct_typecode.cpp:87
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const * const _tao_fields_CORBA_Bounds = 0;
-static TAO::TypeCode::Struct<char const *,
-                      CORBA::TypeCode_ptr const *,
-                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
-                      TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_Bounds (
-    CORBA::tk_except,
-    "IDL:omg.org/CORBA/Bounds:1.0",
-    "Bounds",
-    _tao_fields_CORBA_Bounds,
-    0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_Bounds =
-    &_tao_tc_CORBA_Bounds;
-}
-
-
-
-// TAO_IDL - Generated from 
-// be\be_visitor_exception/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Dual_Impl_T<CORBA::Bounds>::demarshal_value (
-      TAO_InputCDR & cdr
-    )
-  {
-    CORBA::String_var id;
-    
-    if (!(cdr >> id.out ()))
-      {
-        return false;
-      }
-    
-    ACE_TRY_NEW_ENV
-      {
-        this->value_->_tao_decode (cdr ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-      }
-    ACE_CATCHANY
-      {
-        return false;
-      }
-    ACE_ENDTRY;
-    
-    return true;
-  }
-}
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::Bounds &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::Bounds>::insert_copy (
-      _tao_any,
-      CORBA::Bounds::_tao_any_destructor,
-      CORBA::_tc_Bounds,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::Bounds *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::Bounds>::insert (
-      _tao_any,
-      CORBA::Bounds::_tao_any_destructor,
-      CORBA::_tc_Bounds,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::Bounds *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::Bounds *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::Bounds *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::Bounds>::extract (
-        _tao_any,
-        CORBA::Bounds::_tao_any_destructor,
-        CORBA::_tc_Bounds,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/BoundsC.cpp b/TAO/tao/BoundsC.cpp
deleted file mode 100644
index afc9e083f0d..00000000000
--- a/TAO/tao/BoundsC.cpp
+++ /dev/null
@@ -1,173 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:291
-
-
-#include "BoundsC.h"
-#include "tao/CDR.h"
-#include "tao/SystemException.h"
-#include "ace/OS_NS_string.h"
-
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:70
-
-// Arg traits specializations.
-namespace TAO
-{
-}
-
-
-// TAO_IDL - Generated from 
-// be\be_visitor_exception/exception_cs.cpp:63
-
-CORBA::Bounds::Bounds (void)
-  : CORBA::UserException (
-        "IDL:omg.org/CORBA/Bounds:1.0",
-        "Bounds"
-      )
-{
-}
-
-CORBA::Bounds::~Bounds (void)
-{
-}
-
-CORBA::Bounds::Bounds (const ::CORBA::Bounds &_tao_excp)
-  : CORBA::UserException (
-        _tao_excp._rep_id (),
-        _tao_excp._name ()
-      )
-{
-}
-
-CORBA::Bounds&
-CORBA::Bounds::operator= (const ::CORBA::Bounds &_tao_excp)
-{
-  this->ACE_NESTED_CLASS (CORBA, UserException)::operator= (_tao_excp);
-  return *this;
-}
-
-void CORBA::Bounds::_tao_any_destructor (void *_tao_void_pointer)
-{
-  Bounds *_tao_tmp_pointer =
-    static_cast<Bounds *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-CORBA::Bounds *
-CORBA::Bounds::_downcast (CORBA::Exception *_tao_excp)
-{
-  return dynamic_cast<Bounds *> (_tao_excp);
-}
-
-const CORBA::Bounds *
-CORBA::Bounds::_downcast (CORBA::Exception const *_tao_excp)
-{
-  return dynamic_cast<const Bounds *> (_tao_excp);
-}
-
-CORBA::Exception *CORBA::Bounds::_alloc (void)
-{
-  CORBA::Exception *retval = 0;
-  ACE_NEW_RETURN (retval, ::CORBA::Bounds, 0);
-  return retval;
-}
-
-CORBA::Exception *
-CORBA::Bounds::_tao_duplicate (void) const
-{
-  CORBA::Exception *result = 0;
-  ACE_NEW_RETURN (
-      result,
-      ::CORBA::Bounds (*this),
-      0
-    );
-  return result;
-}
-
-void CORBA::Bounds::_raise (void) const
-{
-  TAO_RAISE (*this);
-}
-
-void CORBA::Bounds::_tao_encode (
-    TAO_OutputCDR &cdr
-    ACE_ENV_ARG_DECL
-  ) const
-{
-  if (cdr << *this)
-    {
-      return;
-    }
-  
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-void CORBA::Bounds::_tao_decode (
-    TAO_InputCDR &cdr
-    ACE_ENV_ARG_DECL
-  )
-{
-  if (cdr >> *this)
-    {
-      return;
-    }
-  
-  ACE_THROW (CORBA::MARSHAL ());
-}
-
-// TAO extension - the virtual _type method.
-CORBA::TypeCode_ptr CORBA::Bounds::_tao_type (void) const
-{
-  return ::CORBA::_tc_Bounds;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_exception/cdr_op_cs.cpp:60
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const CORBA::Bounds &_tao_aggregate
-  )
-{
-  // Marshal the repository ID.
-  return (strm << _tao_aggregate._rep_id ());
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    CORBA::Bounds&
-  )
-{
-  return true;
-}
diff --git a/TAO/tao/BoundsC.h b/TAO/tao/BoundsC.h
deleted file mode 100644
index 25799fb8fa0..00000000000
--- a/TAO/tao/BoundsC.h
+++ /dev/null
@@ -1,159 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:153
-
-#ifndef _TAO_IDL_ORIG_BOUNDSC_H_
-#define _TAO_IDL_ORIG_BOUNDSC_H_
-
-#include /**/ "ace/pre.h"
-
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TAO_Export.h"
-#include "tao/ORB.h"
-#include "tao/Environment.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_Export
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
-
-namespace CORBA
-{
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_exception/exception_ch.cpp:53
-
-#if !defined (_CORBA_BOUNDS_CH_)
-#define _CORBA_BOUNDS_CH_
-  
-  class TAO_Export Bounds : public CORBA::UserException
-  {
-  public:
-    
-    Bounds (void);
-    Bounds (const Bounds &);
-    ~Bounds (void);
-
-    Bounds &operator= (const Bounds &);
-    
-    static void _tao_any_destructor (void *);
-    
-    static Bounds *_downcast (CORBA::Exception *);
-    static const Bounds *_downcast (CORBA::Exception const *);
-    
-    static CORBA::Exception *_alloc (void);
-    
-    virtual CORBA::Exception *_tao_duplicate (void) const;
-
-    virtual void _raise (void) const;
-
-    virtual void _tao_encode (
-        TAO_OutputCDR &
-        ACE_ENV_ARG_DECL
-      ) const;
-    
-    virtual void _tao_decode (
-        TAO_InputCDR &
-        ACE_ENV_ARG_DECL
-      );
-    
-    // TAO_IDL - Generated from
-    // be\be_visitor_exception/exception_ch.cpp:129
-    
-    virtual CORBA::TypeCode_ptr _tao_type (void) const;
-  };
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_Bounds;
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
-
-} // module CORBA
-
-// TAO_IDL - Generated from
-// be\be_visitor_traits.cpp:61
-
-// Traits specializations.
-namespace TAO
-{
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_exception/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const CORBA::Bounds &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, CORBA::Bounds*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Bounds *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::Bounds *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_exception/cdr_op_ch.cpp:52
-
-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::Bounds &);
-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::Bounds &);
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
-
diff --git a/TAO/tao/Buffering_Constraint_Policy.cpp b/TAO/tao/Buffering_Constraint_Policy.cpp
index dc11eeedd16..f3e97bfc0d3 100644
--- a/TAO/tao/Buffering_Constraint_Policy.cpp
+++ b/TAO/tao/Buffering_Constraint_Policy.cpp
@@ -1,6 +1,5 @@
 // $Id$
 
-
 #include "tao/Buffering_Constraint_Policy.h"
 
 #if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1)
@@ -45,24 +44,6 @@ TAO_Buffering_Constraint_Policy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   return TAO::BUFFERING_CONSTRAINT_POLICY_TYPE;
 }
 
-CORBA::Policy_ptr
-TAO_Buffering_Constraint_Policy::create (const CORBA::Any& val
-                                         ACE_ENV_ARG_DECL)
-{
-  TAO::BufferingConstraint *buffering_constraint;
-  if ((val >>= buffering_constraint) == 0)
-    ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_VALUE),
-                      CORBA::Policy::_nil ());
-
-  TAO_Buffering_Constraint_Policy *servant = 0;
-  ACE_NEW_THROW_EX (servant,
-                    TAO_Buffering_Constraint_Policy (*buffering_constraint),
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
-
-  return servant;
-}
-
 TAO_Buffering_Constraint_Policy *
 TAO_Buffering_Constraint_Policy::clone (void) const
 {
@@ -105,10 +86,4 @@ TAO_Buffering_Constraint_Policy::_tao_cached_type (void) const
   return TAO_CACHED_POLICY_BUFFERING_CONSTRAINT;
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-#elif defined(ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
 #endif /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */
diff --git a/TAO/tao/Buffering_Constraint_Policy.h b/TAO/tao/Buffering_Constraint_Policy.h
index 3dd23fc37a2..d94271eeca4 100644
--- a/TAO/tao/Buffering_Constraint_Policy.h
+++ b/TAO/tao/Buffering_Constraint_Policy.h
@@ -48,10 +48,6 @@ public:
   /// Copy constructor.
   TAO_Buffering_Constraint_Policy (const TAO_Buffering_Constraint_Policy &rhs);
 
-  /// Helper method for the implementation of CORBA::ORB::create_policy.
-  static CORBA::Policy_ptr create (const CORBA::Any& val
-                                   ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
   /// Returns a copy of <this>.
   virtual TAO_Buffering_Constraint_Policy *clone (void) const;
 
diff --git a/TAO/tao/CONV_FRAMEA.cpp b/TAO/tao/CONV_FRAMEA.cpp
deleted file mode 100644
index 48998fffc69..00000000000
--- a/TAO/tao/CONV_FRAMEA.cpp
+++ /dev/null
@@ -1,428 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "CONV_FRAMEC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Sequence_TypeCode_Static.h"
-#include "tao/Struct_TypeCode_Static.h"
-#include "tao/TypeCode_Struct_Field.h"
-#include "tao/Recursive_Type_TypeCode.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Dual_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CONV_FRAME_CodeSetId (
-    CORBA::tk_alias,
-    "IDL:omg.org/CONV_FRAME/CodeSetId:1.0",
-    "CodeSetId",
-    &CORBA::_tc_ulong);
-  
-namespace CONV_FRAME
-{
-  ::CORBA::TypeCode_ptr const _tc_CodeSetId =
-    &_tao_tc_CONV_FRAME_CodeSetId;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:937
-
-
-#ifndef _TAO_TYPECODE_CONV_FRAME_CodeSetIdSeq_GUARD
-#define _TAO_TYPECODE_CONV_FRAME_CodeSetIdSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CONV_FRAME_CodeSetIdSeq_0 (
-        CORBA::tk_sequence,
-        &CONV_FRAME::_tc_CodeSetId,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CONV_FRAME_CodeSetIdSeq_0 =
-      &CONV_FRAME_CodeSetIdSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CONV_FRAME_CodeSetIdSeq_GUARD */
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CONV_FRAME_CodeSetIdSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CONV_FRAME/CodeSetIdSeq:1.0",
-    "CodeSetIdSeq",
-    &TAO::TypeCode::tc_CONV_FRAME_CodeSetIdSeq_0);
-  
-namespace CONV_FRAME
-{
-  ::CORBA::TypeCode_ptr const _tc_CodeSetIdSeq =
-    &_tao_tc_CONV_FRAME_CodeSetIdSeq;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/struct_typecode.cpp:87
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:937
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CONV_FRAME_CodeSetComponent[] =
-  {
-    { "native_code_set", &CONV_FRAME::_tc_CodeSetId },
-    { "conversion_code_sets", &CONV_FRAME::_tc_CodeSetIdSeq }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                      CORBA::TypeCode_ptr const *,
-                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
-                      TAO::Null_RefCount_Policy>
-  _tao_tc_CONV_FRAME_CodeSetComponent (
-    CORBA::tk_struct,
-    "IDL:omg.org/CONV_FRAME/CodeSetComponent:1.0",
-    "CodeSetComponent",
-    _tao_fields_CONV_FRAME_CodeSetComponent,
-    2);
-  
-namespace CONV_FRAME
-{
-  ::CORBA::TypeCode_ptr const _tc_CodeSetComponent =
-    &_tao_tc_CONV_FRAME_CodeSetComponent;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/struct_typecode.cpp:87
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CONV_FRAME_CodeSetComponentInfo[] =
-  {
-    { "ForCharData", &CONV_FRAME::_tc_CodeSetComponent },
-    { "ForWcharData", &CONV_FRAME::_tc_CodeSetComponent }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                      CORBA::TypeCode_ptr const *,
-                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
-                      TAO::Null_RefCount_Policy>
-  _tao_tc_CONV_FRAME_CodeSetComponentInfo (
-    CORBA::tk_struct,
-    "IDL:omg.org/CONV_FRAME/CodeSetComponentInfo:1.0",
-    "CodeSetComponentInfo",
-    _tao_fields_CONV_FRAME_CodeSetComponentInfo,
-    2);
-  
-namespace CONV_FRAME
-{
-  ::CORBA::TypeCode_ptr const _tc_CodeSetComponentInfo =
-    &_tao_tc_CONV_FRAME_CodeSetComponentInfo;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/struct_typecode.cpp:87
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CONV_FRAME_CodeSetContext[] =
-  {
-    { "char_data", &CONV_FRAME::_tc_CodeSetId },
-    { "wchar_data", &CONV_FRAME::_tc_CodeSetId }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                      CORBA::TypeCode_ptr const *,
-                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
-                      TAO::Null_RefCount_Policy>
-  _tao_tc_CONV_FRAME_CodeSetContext (
-    CORBA::tk_struct,
-    "IDL:omg.org/CONV_FRAME/CodeSetContext:1.0",
-    "CodeSetContext",
-    _tao_fields_CONV_FRAME_CodeSetContext,
-    2);
-  
-namespace CONV_FRAME
-{
-  ::CORBA::TypeCode_ptr const _tc_CodeSetContext =
-    &_tao_tc_CONV_FRAME_CodeSetContext;
-}
-
-
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CONV_FRAME::CodeSetIdSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CONV_FRAME::CodeSetIdSeq>::insert_copy (
-      _tao_any,
-      CONV_FRAME::CodeSetIdSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CONV_FRAME_CodeSetIdSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CONV_FRAME::CodeSetIdSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CONV_FRAME::CodeSetIdSeq>::insert (
-      _tao_any,
-      CONV_FRAME::CodeSetIdSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CONV_FRAME_CodeSetIdSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CONV_FRAME::CodeSetIdSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CONV_FRAME::CodeSetIdSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CONV_FRAME::CodeSetIdSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CONV_FRAME::CodeSetIdSeq>::extract (
-        _tao_any,
-        CONV_FRAME::CodeSetIdSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CONV_FRAME_CodeSetIdSeq_0,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CONV_FRAME::CodeSetComponent &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CONV_FRAME::CodeSetComponent>::insert_copy (
-      _tao_any,
-      CONV_FRAME::CodeSetComponent::_tao_any_destructor,
-      CONV_FRAME::_tc_CodeSetComponent,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CONV_FRAME::CodeSetComponent *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CONV_FRAME::CodeSetComponent>::insert (
-      _tao_any,
-      CONV_FRAME::CodeSetComponent::_tao_any_destructor,
-      CONV_FRAME::_tc_CodeSetComponent,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CONV_FRAME::CodeSetComponent *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CONV_FRAME::CodeSetComponent *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CONV_FRAME::CodeSetComponent *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CONV_FRAME::CodeSetComponent>::extract (
-        _tao_any,
-        CONV_FRAME::CodeSetComponent::_tao_any_destructor,
-        CONV_FRAME::_tc_CodeSetComponent,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CONV_FRAME::CodeSetComponentInfo &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CONV_FRAME::CodeSetComponentInfo>::insert_copy (
-      _tao_any,
-      CONV_FRAME::CodeSetComponentInfo::_tao_any_destructor,
-      CONV_FRAME::_tc_CodeSetComponentInfo,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CONV_FRAME::CodeSetComponentInfo *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CONV_FRAME::CodeSetComponentInfo>::insert (
-      _tao_any,
-      CONV_FRAME::CodeSetComponentInfo::_tao_any_destructor,
-      CONV_FRAME::_tc_CodeSetComponentInfo,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CONV_FRAME::CodeSetComponentInfo *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CONV_FRAME::CodeSetComponentInfo *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CONV_FRAME::CodeSetComponentInfo *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CONV_FRAME::CodeSetComponentInfo>::extract (
-        _tao_any,
-        CONV_FRAME::CodeSetComponentInfo::_tao_any_destructor,
-        CONV_FRAME::_tc_CodeSetComponentInfo,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CONV_FRAME::CodeSetContext &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CONV_FRAME::CodeSetContext>::insert_copy (
-      _tao_any,
-      CONV_FRAME::CodeSetContext::_tao_any_destructor,
-      CONV_FRAME::_tc_CodeSetContext,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CONV_FRAME::CodeSetContext *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CONV_FRAME::CodeSetContext>::insert (
-      _tao_any,
-      CONV_FRAME::CodeSetContext::_tao_any_destructor,
-      CONV_FRAME::_tc_CodeSetContext,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CONV_FRAME::CodeSetContext *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CONV_FRAME::CodeSetContext *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CONV_FRAME::CodeSetContext *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CONV_FRAME::CodeSetContext>::extract (
-        _tao_any,
-        CONV_FRAME::CodeSetContext::_tao_any_destructor,
-        CONV_FRAME::_tc_CodeSetContext,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/CONV_FRAMEC.cpp b/TAO/tao/CONV_FRAMEC.cpp
index 883637c6b40..11d54fd3b16 100644
--- a/TAO/tao/CONV_FRAMEC.cpp
+++ b/TAO/tao/CONV_FRAMEC.cpp
@@ -26,16 +26,12 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:291
+// be\be_codegen.cpp:288
 
 
 #include "CONV_FRAMEC.h"
 #include "tao/CDR.h"
 
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
@@ -58,7 +54,7 @@ CONV_FRAME::CodeSetIdSeq::CodeSetIdSeq (
     CORBA::ULong max
   )
   : TAO_Unbounded_Sequence<
-        CONV_FRAME::CodeSetId
+        CodeSetId
       >
     (max)
 {}
@@ -70,7 +66,7 @@ CONV_FRAME::CodeSetIdSeq::CodeSetIdSeq (
     CORBA::Boolean release
   )
   : TAO_Unbounded_Sequence<
-        CONV_FRAME::CodeSetId
+        CodeSetId
       >
     (max, length, buffer, release)
 {}
@@ -79,7 +75,7 @@ CONV_FRAME::CodeSetIdSeq::CodeSetIdSeq (
     const CodeSetIdSeq &seq
   )
   : TAO_Unbounded_Sequence<
-        CONV_FRAME::CodeSetId
+        CodeSetId
       >
     (seq)
 {}
diff --git a/TAO/tao/CONV_FRAMEC.h b/TAO/tao/CONV_FRAMEC.h
index 670a6aa3237..798e0fa4261 100644
--- a/TAO/tao/CONV_FRAMEC.h
+++ b/TAO/tao/CONV_FRAMEC.h
@@ -26,10 +26,10 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:153
+// be\be_codegen.cpp:154
 
-#ifndef _TAO_IDL_ORIG_CONV_FRAMEC_H_
-#define _TAO_IDL_ORIG_CONV_FRAMEC_H_
+#ifndef _TAO_IDL_CONV_FRAMEC_H_
+#define _TAO_IDL_CONV_FRAMEC_H_
 
 #include /**/ "ace/pre.h"
 
@@ -58,12 +58,8 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:49
 
 namespace CONV_FRAME
 {
@@ -75,11 +71,6 @@ namespace CONV_FRAME
   typedef CORBA::ULong_out CodeSetId_out;
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_CodeSetId;
-  
-  // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CONV_FRAME_CODESETIDSEQ_CH_)
@@ -128,11 +119,6 @@ namespace CONV_FRAME
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_CodeSetIdSeq;
-  
-  // TAO_IDL - Generated from
   // be\be_type.cpp:258
   
   struct CodeSetComponent;
@@ -151,7 +137,7 @@ namespace CONV_FRAME
     CodeSetComponent_out;
   
   // TAO_IDL - Generated from
-  // be\be_visitor_structure/structure_ch.cpp:52
+  // be\be_visitor_structure/structure_ch.cpp:57
   
   struct TAO_Export CodeSetComponent
   {
@@ -163,11 +149,6 @@ namespace CONV_FRAME
   };
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_CodeSetComponent;
-  
-  // TAO_IDL - Generated from
   // be\be_type.cpp:258
   
   struct CodeSetComponentInfo;
@@ -186,7 +167,7 @@ namespace CONV_FRAME
     CodeSetComponentInfo_out;
   
   // TAO_IDL - Generated from
-  // be\be_visitor_structure/structure_ch.cpp:52
+  // be\be_visitor_structure/structure_ch.cpp:57
   
   struct TAO_Export CodeSetComponentInfo
   {
@@ -198,11 +179,6 @@ namespace CONV_FRAME
   };
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_CodeSetComponentInfo;
-  
-  // TAO_IDL - Generated from
   // be\be_type.cpp:258
   
   struct CodeSetContext;
@@ -218,7 +194,7 @@ namespace CONV_FRAME
     CodeSetContext_out;
   
   // TAO_IDL - Generated from
-  // be\be_visitor_structure/structure_ch.cpp:52
+  // be\be_visitor_structure/structure_ch.cpp:57
   
   struct TAO_Export CodeSetContext
   {
@@ -228,14 +204,9 @@ namespace CONV_FRAME
     CONV_FRAME::CodeSetId char_data;
     CONV_FRAME::CodeSetId wchar_data;
   };
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_CodeSetContext;
 
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:78
 
 } // module CONV_FRAME
 
@@ -248,38 +219,6 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const CONV_FRAME::CodeSetIdSeq &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, CONV_FRAME::CodeSetIdSeq*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CONV_FRAME::CodeSetIdSeq *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CONV_FRAME::CodeSetIdSeq *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const CONV_FRAME::CodeSetComponent &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, CONV_FRAME::CodeSetComponent*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CONV_FRAME::CodeSetComponent *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CONV_FRAME::CodeSetComponent *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const CONV_FRAME::CodeSetComponentInfo &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, CONV_FRAME::CodeSetComponentInfo*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CONV_FRAME::CodeSetComponentInfo *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CONV_FRAME::CodeSetComponentInfo *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const CONV_FRAME::CodeSetContext &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, CONV_FRAME::CodeSetContext*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CONV_FRAME::CodeSetContext *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CONV_FRAME::CodeSetContext *&);
-
-// TAO_IDL - Generated from
 // be\be_visitor_sequence/cdr_op_ch.cpp:71
 
 #if !defined _TAO_CDR_OP_CONV_FRAME_CodeSetIdSeq_H_
@@ -315,16 +254,12 @@ TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CONV_FRAME::CodeSet
 TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CONV_FRAME::CodeSetContext &);
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:955
+// be\be_codegen.cpp:1062
 
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
diff --git a/TAO/tao/CORBANAME_Parser.cpp b/TAO/tao/CORBANAME_Parser.cpp
index 57f56cc723a..649edfb1408 100644
--- a/TAO/tao/CORBANAME_Parser.cpp
+++ b/TAO/tao/CORBANAME_Parser.cpp
@@ -168,8 +168,3 @@ ACE_STATIC_SVC_DEFINE (TAO_CORBANAME_Parser,
 
 ACE_FACTORY_DEFINE (TAO, TAO_CORBANAME_Parser)
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/CORBA_methods.h b/TAO/tao/CORBA_methods.h
index df252c7cba5..038f912b6e2 100644
--- a/TAO/tao/CORBA_methods.h
+++ b/TAO/tao/CORBA_methods.h
@@ -38,21 +38,12 @@ namespace CORBA
   class Environment;
   typedef Environment *Environment_ptr;
 
-  class NamedValue;
-  typedef NamedValue *NamedValue_ptr;
-
-  class NVList;
-  typedef NVList *NVList_ptr;
-
   class Object;
   typedef Object *Object_ptr;
 
   class Principal;
   typedef Principal *Principal_ptr;
 
-  class TypeCode;
-  typedef TypeCode *TypeCode_ptr;
-
   class OperationDef;
   typedef OperationDef *OperationDef_ptr;
 
@@ -76,12 +67,6 @@ namespace CORBA
   TAO_NAMESPACE_INLINE_FUNCTION Boolean is_nil (Environment_ptr);
   TAO_NAMESPACE_INLINE_FUNCTION void release (Environment_ptr);
 
-  TAO_NAMESPACE_INLINE_FUNCTION Boolean is_nil (NamedValue_ptr);
-  TAO_NAMESPACE_INLINE_FUNCTION void release (NamedValue_ptr);
-
-  TAO_NAMESPACE_INLINE_FUNCTION Boolean is_nil (NVList_ptr);
-  TAO_NAMESPACE_INLINE_FUNCTION void release (NVList_ptr);
-
   TAO_NAMESPACE_INLINE_FUNCTION Boolean is_nil (ORB_ptr);
   TAO_NAMESPACE_INLINE_FUNCTION void release (ORB_ptr);
 
@@ -90,9 +75,6 @@ namespace CORBA
 
   TAO_NAMESPACE_INLINE_FUNCTION Boolean is_nil (Principal_ptr);
   TAO_NAMESPACE_INLINE_FUNCTION void release (Principal_ptr);
-
-  TAO_NAMESPACE_INLINE_FUNCTION Boolean is_nil (TypeCode_ptr);
-  TAO_NAMESPACE_INLINE_FUNCTION void release (TypeCode_ptr);
 }
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/Cache_Entries.h b/TAO/tao/Cache_Entries.h
index 7987f7def4f..eea2967b2fc 100644
--- a/TAO/tao/Cache_Entries.h
+++ b/TAO/tao/Cache_Entries.h
@@ -165,11 +165,8 @@ namespace TAO
     /// Make a deep copy of the underlying pointer
     void duplicate (void);
 
-    //@{
     /// Return the index value
-    CORBA::ULong index (void);
     CORBA::ULong index (void) const;
-    //@}
 
     /// Set the index value. This calls should not be used by any users
     /// but for the TAO_Transport_Cache_Manager class.
diff --git a/TAO/tao/Cache_Entries.inl b/TAO/tao/Cache_Entries.inl
index 0b34beb193a..711f635b20e 100644
--- a/TAO/tao/Cache_Entries.inl
+++ b/TAO/tao/Cache_Entries.inl
@@ -164,12 +164,6 @@ namespace TAO
 
 
   ACE_INLINE CORBA::ULong
-  Cache_ExtId::index (void)
-  {
-    return this->index_;
-  }
-
-  ACE_INLINE CORBA::ULong
   Cache_ExtId::index (void) const
   {
     return this->index_;
diff --git a/TAO/tao/CharSeqA.cpp b/TAO/tao/CharSeqA.cpp
deleted file mode 100644
index 734fda6bb86..00000000000
--- a/TAO/tao/CharSeqA.cpp
+++ /dev/null
@@ -1,142 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "CharSeqC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Sequence_TypeCode_Static.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Dual_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:937
-
-
-#ifndef _TAO_TYPECODE_CORBA_CharSeq_GUARD
-#define _TAO_TYPECODE_CORBA_CharSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_CharSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_char,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_CharSeq_0 =
-      &CORBA_CharSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_CharSeq_GUARD */
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_CharSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/CharSeq:1.0",
-    "CharSeq",
-    &TAO::TypeCode::tc_CORBA_CharSeq_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_CharSeq =
-    &_tao_tc_CORBA_CharSeq;
-}
-
-
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::CharSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::CharSeq>::insert_copy (
-      _tao_any,
-      CORBA::CharSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_CharSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::CharSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::CharSeq>::insert (
-      _tao_any,
-      CORBA::CharSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_CharSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::CharSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::CharSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::CharSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::CharSeq>::extract (
-        _tao_any,
-        CORBA::CharSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_CharSeq_0,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/CharSeqC.h b/TAO/tao/CharSeqC.h
index dc9b8949bbb..092e235c744 100644
--- a/TAO/tao/CharSeqC.h
+++ b/TAO/tao/CharSeqC.h
@@ -66,22 +66,22 @@
 
 namespace CORBA
 {
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_CHARSEQ_CH_)
 #define _CORBA_CHARSEQ_CH_
-  
+
   class CharSeq;
-  
+
   typedef
     TAO_FixedSeq_Var_T<
         CharSeq,
         CORBA::Char
       >
     CharSeq_var;
-  
+
   typedef
     TAO_Seq_Out_T<
         CharSeq,
@@ -89,7 +89,7 @@ namespace CORBA
         CORBA::Char
       >
     CharSeq_out;
-  
+
   class TAO_Export CharSeq
     : public
         TAO_Unbounded_Sequence<
@@ -102,23 +102,18 @@ namespace CORBA
     CharSeq (
         CORBA::ULong max,
         CORBA::ULong length,
-        CORBA::Char* buffer, 
+        CORBA::Char* buffer,
         CORBA::Boolean release = 0
       );
     CharSeq (const CharSeq &);
     ~CharSeq (void);
-    
+
     static void _tao_any_destructor (void *);
-    
+
     typedef CharSeq_var _var_type;
   };
 
 #endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_CharSeq;
 
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:66
@@ -134,14 +129,6 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const CORBA::CharSeq &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, CORBA::CharSeq*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::CharSeq *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::CharSeq *&);
-
-// TAO_IDL - Generated from
 // be\be_visitor_sequence/cdr_op_ch.cpp:71
 
 #if !defined _TAO_CDR_OP_CORBA_CharSeq_H_
diff --git a/TAO/tao/CodecFactory.mpc b/TAO/tao/CodecFactory.mpc
index 0a9575ce991..2b7ba3dec89 100644
--- a/TAO/tao/CodecFactory.mpc
+++ b/TAO/tao/CodecFactory.mpc
@@ -1,5 +1,5 @@
 //$Id$
-project : taolib, core {
+project : taolib, core, anytypecode {
   sharedname    = TAO_CodecFactory
   dynamicflags  = TAO_CODECFACTORY_BUILD_DLL
 
@@ -27,6 +27,9 @@ project : taolib, core {
     CodecFactory
   }
 
+  IDL_Files {
+  }
+
   Pkgconfig_Files {
     CodecFactory/TAO_CodecFactory.pc.in
   }
diff --git a/TAO/tao/CodecFactory/CDR_Encaps_Codec.cpp b/TAO/tao/CodecFactory/CDR_Encaps_Codec.cpp
index 35905f4fbe5..fbe180bde84 100644
--- a/TAO/tao/CodecFactory/CDR_Encaps_Codec.cpp
+++ b/TAO/tao/CodecFactory/CDR_Encaps_Codec.cpp
@@ -6,14 +6,14 @@
 
 #include "tao/CDR.h"
 #include "tao/OctetSeqC.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl.h"
-#include "tao/TypeCode.h"
-#include "tao/Marshal.h"
-#include "tao/Any_Unknown_IDL_Type.h"
+#include "tao/AnyTypeCode/Any.h"
+#include "tao/AnyTypeCode/Any_Impl.h"
+#include "tao/AnyTypeCode/TypeCode.h"
+#include "tao/AnyTypeCode/Marshal.h"
+#include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h"
 #include "tao/SystemException.h"
 #include "tao/ORB_Constants.h"
-#include "tao/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
 
 #include "ace/Auto_Ptr.h"
 #include "ace/OS_NS_string.h"
diff --git a/TAO/tao/CodecFactory/IOP_CodecA.cpp b/TAO/tao/CodecFactory/IOP_CodecA.cpp
index 5c5a791f7e2..2e54165d86c 100644
--- a/TAO/tao/CodecFactory/IOP_CodecA.cpp
+++ b/TAO/tao/CodecFactory/IOP_CodecA.cpp
@@ -26,17 +26,17 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "CodecFactory.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
-#include "tao/Struct_TypeCode_Static.h"
-#include "tao/TypeCode_Struct_Field.h"
-#include "tao/Recursive_Type_TypeCode.h"
+#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Struct_TypeCode_Static.h"
+#include "tao/AnyTypeCode/TypeCode_Struct_Field.h"
+#include "tao/AnyTypeCode/Recursive_Type_TypeCode.h"
 #include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
-#include "tao/Any_Dual_Impl_T.h"
+#include "tao/AnyTypeCode/Any.h"
+#include "tao/AnyTypeCode/Any_Impl_T.h"
+#include "tao/AnyTypeCode/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/struct_typecode.cpp:87
@@ -52,7 +52,7 @@ static TAO::TypeCode::Struct<char const *,
     "InvalidTypeForEncoding",
     _tao_fields_IOP_Codec_InvalidTypeForEncoding,
     0);
-  
+
 ::CORBA::TypeCode_ptr const IOP::Codec::_tc_InvalidTypeForEncoding =
   &_tao_tc_IOP_Codec_InvalidTypeForEncoding;
 
@@ -70,7 +70,7 @@ static TAO::TypeCode::Struct<char const *,
     "FormatMismatch",
     _tao_fields_IOP_Codec_FormatMismatch,
     0);
-  
+
 ::CORBA::TypeCode_ptr const IOP::Codec::_tc_FormatMismatch =
   &_tao_tc_IOP_Codec_FormatMismatch;
 
@@ -88,7 +88,7 @@ static TAO::TypeCode::Struct<char const *,
     "TypeMismatch",
     _tao_fields_IOP_Codec_TypeMismatch,
     0);
-  
+
 ::CORBA::TypeCode_ptr const IOP::Codec::_tc_TypeMismatch =
   &_tao_tc_IOP_Codec_TypeMismatch;
 
@@ -101,7 +101,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:omg.org/IOP/Codec:1.0",
     "Codec");
-  
+
 namespace IOP
 {
   ::CORBA::TypeCode_ptr const _tc_Codec =
@@ -121,7 +121,7 @@ static TAO::TypeCode::Alias<char const *,
     "IDL:omg.org/IOP/EncodingFormat:1.0",
     "EncodingFormat",
     &CORBA::_tc_short);
-  
+
 namespace IOP
 {
   ::CORBA::TypeCode_ptr const _tc_EncodingFormat =
@@ -138,7 +138,7 @@ static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> co
     { "format", &IOP::_tc_EncodingFormat },
     { "major_version", &CORBA::_tc_octet },
     { "minor_version", &CORBA::_tc_octet }
-    
+
   };
 static TAO::TypeCode::Struct<char const *,
                       CORBA::TypeCode_ptr const *,
@@ -150,7 +150,7 @@ static TAO::TypeCode::Struct<char const *,
     "Encoding",
     _tao_fields_IOP_Encoding,
     3);
-  
+
 namespace IOP
 {
   ::CORBA::TypeCode_ptr const _tc_Encoding =
@@ -173,7 +173,7 @@ static TAO::TypeCode::Struct<char const *,
     "UnknownEncoding",
     _tao_fields_IOP_CodecFactory_UnknownEncoding,
     0);
-  
+
 ::CORBA::TypeCode_ptr const IOP::CodecFactory::_tc_UnknownEncoding =
   &_tao_tc_IOP_CodecFactory_UnknownEncoding;
 
@@ -186,7 +186,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:omg.org/IOP/CodecFactory:1.0",
     "CodecFactory");
-  
+
 namespace IOP
 {
   ::CORBA::TypeCode_ptr const _tc_CodecFactory =
@@ -219,7 +219,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Impl_T<IOP::Codec>::demarshal_value (TAO_InputCDR &)
@@ -270,7 +270,7 @@ operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_exception/any_op_cs.cpp:50
 
 namespace TAO
@@ -281,7 +281,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Dual_Impl_T<IOP::Codec::InvalidTypeForEncoding>::demarshal_value (TAO_InputCDR &)
@@ -345,7 +345,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_exception/any_op_cs.cpp:50
 
 namespace TAO
@@ -356,7 +356,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Dual_Impl_T<IOP::Codec::FormatMismatch>::demarshal_value (TAO_InputCDR &)
@@ -420,7 +420,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_exception/any_op_cs.cpp:50
 
 namespace TAO
@@ -431,7 +431,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Dual_Impl_T<IOP::Codec::TypeMismatch>::demarshal_value (TAO_InputCDR &)
@@ -495,7 +495,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -577,7 +577,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Impl_T<IOP::CodecFactory>::demarshal_value (TAO_InputCDR &)
@@ -628,7 +628,7 @@ operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_exception/any_op_cs.cpp:50
 
 namespace TAO
@@ -639,7 +639,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Dual_Impl_T<IOP::CodecFactory::UnknownEncoding>::demarshal_value (TAO_InputCDR &)
diff --git a/TAO/tao/CodecFactory/IOP_CodecC.h b/TAO/tao/CodecFactory/IOP_CodecC.h
index d17987c45bf..b0e6e594507 100644
--- a/TAO/tao/CodecFactory/IOP_CodecC.h
+++ b/TAO/tao/CodecFactory/IOP_CodecC.h
@@ -48,10 +48,10 @@
 #include "tao/SystemException.h"
 #include "tao/Environment.h"
 #include "tao/Object.h"
-#include "tao/TypeCode.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Any.h"
-#include "tao/TypeCode.h"
+#include "tao/AnyTypeCode/TypeCode.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Any.h"
+#include "tao/AnyTypeCode/TypeCode.h"
 #include "tao/Objref_VarOut_T.h"
 #include "tao/VarOut_T.h"
 
@@ -201,14 +201,14 @@ namespace IOP
       ~FormatMismatch (void);
 
       FormatMismatch &operator= (const FormatMismatch &);
-      
+
       static void _tao_any_destructor (void *);
-      
+
       static FormatMismatch *_downcast (CORBA::Exception *);
       static const FormatMismatch *_downcast (CORBA::Exception const *);
-      
+
       static CORBA::Exception *_alloc (void);
-      
+
       virtual CORBA::Exception *_tao_duplicate (void) const;
 
       virtual void _raise (void) const;
@@ -217,48 +217,48 @@ namespace IOP
           TAO_OutputCDR &
           ACE_ENV_ARG_DECL
         ) const;
-      
+
       virtual void _tao_decode (
           TAO_InputCDR &
           ACE_ENV_ARG_DECL
         );
-      
+
       // TAO_IDL - Generated from
       // be\be_visitor_exception/exception_ch.cpp:127
-      
+
       virtual CORBA::TypeCode_ptr _tao_type (void) const;
     };
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_typecode/typecode_decl.cpp:44
-    
+
     static ::CORBA::TypeCode_ptr const _tc_FormatMismatch;
 
 #endif /* end #if !defined */
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_IOP_CODEC_TYPEMISMATCH_CH_)
 #define _IOP_CODEC_TYPEMISMATCH_CH_
-    
+
     class TAO_CodecFactory_Export TypeMismatch : public CORBA::UserException
     {
     public:
-      
+
       TypeMismatch (void);
       TypeMismatch (const TypeMismatch &);
       ~TypeMismatch (void);
 
       TypeMismatch &operator= (const TypeMismatch &);
-      
+
       static void _tao_any_destructor (void *);
-      
+
       static TypeMismatch *_downcast (CORBA::Exception *);
       static const TypeMismatch *_downcast (CORBA::Exception const *);
-      
+
       static CORBA::Exception *_alloc (void);
-      
+
       virtual CORBA::Exception *_tao_duplicate (void) const;
 
       virtual void _raise (void) const;
@@ -267,28 +267,28 @@ namespace IOP
           TAO_OutputCDR &
           ACE_ENV_ARG_DECL
         ) const;
-      
+
       virtual void _tao_decode (
           TAO_InputCDR &
           ACE_ENV_ARG_DECL
         );
-      
+
       // TAO_IDL - Generated from
       // be\be_visitor_exception/exception_ch.cpp:127
-      
+
       virtual CORBA::TypeCode_ptr _tao_type (void) const;
     };
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_typecode/typecode_decl.cpp:44
-    
+
     static ::CORBA::TypeCode_ptr const _tc_TypeMismatch;
 
 #endif /* end #if !defined */
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::OctetSeq * encode (
         const ::CORBA::Any & data
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -297,10 +297,10 @@ namespace IOP
         CORBA::SystemException,
         ::IOP::Codec::InvalidTypeForEncoding
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::Any * decode (
         const ::CORBA::OctetSeq & data
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -309,10 +309,10 @@ namespace IOP
         CORBA::SystemException,
         ::IOP::Codec::FormatMismatch
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::OctetSeq * encode_value (
         const ::CORBA::Any & data
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -321,10 +321,10 @@ namespace IOP
         CORBA::SystemException,
         ::IOP::Codec::InvalidTypeForEncoding
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::Any * decode_value (
         const ::CORBA::OctetSeq & data,
         ::CORBA::TypeCode_ptr tc
@@ -335,102 +335,102 @@ namespace IOP
         ::IOP::Codec::FormatMismatch,
         ::IOP::Codec::TypeMismatch
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
-    
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
+
   protected:
     // Abstract or local interface only.
     Codec (void);
-    
+
     virtual ~Codec (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     Codec (const Codec &);
-    
+
     void operator= (const Codec &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   extern TAO_CodecFactory_Export ::CORBA::TypeCode_ptr const _tc_Codec;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typedef/typedef_ch.cpp:379
-  
+
   typedef CORBA::Short EncodingFormat;
   typedef CORBA::Short_out EncodingFormat_out;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   extern TAO_CodecFactory_Export ::CORBA::TypeCode_ptr const _tc_EncodingFormat;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-  
+
   const IOP::EncodingFormat ENCODING_CDR_ENCAPS = 0;
-  
+
   // TAO_IDL - Generated from
   // be\be_type.cpp:258
-  
+
   struct Encoding;
-  
+
   typedef
     TAO_Fixed_Var_T<
         Encoding
       >
     Encoding_var;
-  
+
   typedef
     Encoding &
     Encoding_out;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_structure/structure_ch.cpp:52
-  
+
   struct TAO_CodecFactory_Export Encoding
   {
     typedef Encoding_var _var_type;
-    
+
     static void _tao_any_destructor (void *);
     IOP::EncodingFormat format;
     CORBA::Octet major_version;
     CORBA::Octet minor_version;
   };
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   extern TAO_CodecFactory_Export ::CORBA::TypeCode_ptr const _tc_Encoding;
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_IOP_CODECFACTORY__VAR_OUT_CH_)
 #define _IOP_CODECFACTORY__VAR_OUT_CH_
-  
+
   class CodecFactory;
   typedef CodecFactory *CodecFactory_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         CodecFactory
       >
     CodecFactory_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         CodecFactory
@@ -438,65 +438,65 @@ namespace IOP
     CodecFactory_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_IOP_CODECFACTORY_CH_)
 #define _IOP_CODECFACTORY_CH_
-  
+
   class TAO_CodecFactory_Export CodecFactory
     : public virtual CORBA::Object
   {
   public:
     typedef CodecFactory_ptr _ptr_type;
     typedef CodecFactory_var _var_type;
-    
+
     // The static operations.
     static CodecFactory_ptr _duplicate (CodecFactory_ptr obj);
-    
+
     static void _tao_release (CodecFactory_ptr obj);
-    
+
     static CodecFactory_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static CodecFactory_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static CodecFactory_ptr _nil (void)
     {
       return static_cast<CodecFactory_ptr> (0);
     }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_IOP_CODECFACTORY_UNKNOWNENCODING_CH_)
 #define _IOP_CODECFACTORY_UNKNOWNENCODING_CH_
-    
+
     class TAO_CodecFactory_Export UnknownEncoding : public CORBA::UserException
     {
     public:
-      
+
       UnknownEncoding (void);
       UnknownEncoding (const UnknownEncoding &);
       ~UnknownEncoding (void);
 
       UnknownEncoding &operator= (const UnknownEncoding &);
-      
+
       static void _tao_any_destructor (void *);
-      
+
       static UnknownEncoding *_downcast (CORBA::Exception *);
       static const UnknownEncoding *_downcast (CORBA::Exception const *);
-      
+
       static CORBA::Exception *_alloc (void);
-      
+
       virtual CORBA::Exception *_tao_duplicate (void) const;
 
       virtual void _raise (void) const;
@@ -505,28 +505,28 @@ namespace IOP
           TAO_OutputCDR &
           ACE_ENV_ARG_DECL
         ) const;
-      
+
       virtual void _tao_decode (
           TAO_InputCDR &
           ACE_ENV_ARG_DECL
         );
-      
+
       // TAO_IDL - Generated from
       // be\be_visitor_exception/exception_ch.cpp:127
-      
+
       virtual CORBA::TypeCode_ptr _tao_type (void) const;
     };
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_typecode/typecode_decl.cpp:44
-    
+
     static ::CORBA::TypeCode_ptr const _tc_UnknownEncoding;
 
 #endif /* end #if !defined */
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::IOP::Codec_ptr create_codec (
         const ::IOP::Encoding & enc
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -535,36 +535,36 @@ namespace IOP
         CORBA::SystemException,
         ::IOP::CodecFactory::UnknownEncoding
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
-    
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
+
   protected:
     // Abstract or local interface only.
     CodecFactory (void);
-    
+
     virtual ~CodecFactory (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     CodecFactory (const CodecFactory &);
-    
+
     void operator= (const CodecFactory &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   extern TAO_CodecFactory_Export ::CORBA::TypeCode_ptr const _tc_CodecFactory;
 
 // TAO_IDL - Generated from
@@ -581,7 +581,7 @@ namespace TAO
 
 #if !defined (_IOP_CODEC__TRAITS_CH_)
 #define _IOP_CODEC__TRAITS_CH_
-  
+
   template<>
   struct TAO_CodecFactory_Export Objref_Traits< ::IOP::Codec>
   {
@@ -602,7 +602,7 @@ namespace TAO
 
 #if !defined (_IOP_CODECFACTORY__TRAITS_CH_)
 #define _IOP_CODECFACTORY__TRAITS_CH_
-  
+
   template<>
   struct TAO_CodecFactory_Export Objref_Traits< ::IOP::CodecFactory>
   {
diff --git a/TAO/tao/CurrentA.cpp b/TAO/tao/CurrentA.cpp
deleted file mode 100644
index 1ae19a03c5c..00000000000
--- a/TAO/tao/CurrentA.cpp
+++ /dev/null
@@ -1,128 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "CurrentC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_Current (
-    CORBA::tk_local_interface,
-    "IDL:omg.org/CORBA/Current:1.0",
-    "Current");
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_Current =
-    &_tao_tc_CORBA_Current;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::Current>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::Current>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-  
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::Current>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::Current_ptr _tao_elem
-  )
-{
-  CORBA::Current_ptr _tao_objptr =
-    CORBA::Current::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::Current_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::Current>::insert (
-      _tao_any,
-      CORBA::Current::_tao_any_destructor,
-      CORBA::_tc_Current,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::Current_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::Current>::extract (
-        _tao_any,
-        CORBA::Current::_tao_any_destructor,
-        CORBA::_tc_Current,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/CurrentC.cpp b/TAO/tao/CurrentC.cpp
index 80539961bd3..5b38d3dae99 100644
--- a/TAO/tao/CurrentC.cpp
+++ b/TAO/tao/CurrentC.cpp
@@ -26,17 +26,13 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:291
+// be\be_codegen.cpp:288
 
 
 #include "CurrentC.h"
 #include "tao/CDR.h"
 #include "ace/OS_NS_string.h"
 
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
@@ -88,14 +84,6 @@ CORBA::Current::Current (void)
 CORBA::Current::~Current (void)
 {}
 
-void 
-CORBA::Current::_tao_any_destructor (void *_tao_void_pointer)
-{
-  Current *_tao_tmp_pointer =
-    static_cast<Current *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
 CORBA::Current_ptr
 CORBA::Current::_narrow (
     CORBA::Object_ptr _tao_objref
diff --git a/TAO/tao/CurrentC.h b/TAO/tao/CurrentC.h
index d2d3a7e2364..e23843d6261 100644
--- a/TAO/tao/CurrentC.h
+++ b/TAO/tao/CurrentC.h
@@ -26,10 +26,10 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:153
+// be\be_codegen.cpp:154
 
-#ifndef _TAO_IDL_ORIG_CURRENTC_H_
-#define _TAO_IDL_ORIG_CURRENTC_H_
+#ifndef _TAO_IDL_CURRENTC_H_
+#define _TAO_IDL_CURRENTC_H_
 
 #include /**/ "ace/pre.h"
 
@@ -56,12 +56,8 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:49
 
 namespace CORBA
 {
@@ -122,7 +118,7 @@ namespace CORBA
       return static_cast<Current_ptr> (0);
     }
     
-    static void _tao_any_destructor (void *);
+    
     
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
@@ -149,14 +145,9 @@ namespace CORBA
   };
 
 #endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_Current;
 
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:78
 
 } // module CORBA
 
@@ -167,8 +158,8 @@ namespace CORBA
 namespace TAO
 {
 
-#if !defined (_CORBA_CURRENT__TRAITS_CH_)
-#define _CORBA_CURRENT__TRAITS_CH_
+#if !defined (_CORBA_CURRENT__TRAITS_)
+#define _CORBA_CURRENT__TRAITS_
   
   template<>
   struct TAO_Export Objref_Traits< ::CORBA::Current>
@@ -190,23 +181,12 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, CORBA::Current_ptr); // copying
-TAO_Export void operator<<= (CORBA::Any &, CORBA::Current_ptr *); // non-copying
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Current_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:955
+// be\be_codegen.cpp:1062
 
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
diff --git a/TAO/tao/Domain.mpc b/TAO/tao/Domain.mpc
index 6669d7e1877..d3f79463993 100644
--- a/TAO/tao/Domain.mpc
+++ b/TAO/tao/Domain.mpc
@@ -26,6 +26,9 @@ project : taolib, core, ifr_client, portableserver {
   PIDL_Files {
   }
 
+  IDL_Files {
+  }
+
   Pkgconfig_Files {
     Domain/TAO_Domain.pc.in
   }
diff --git a/TAO/tao/Domain/DomainS.cpp b/TAO/tao/Domain/DomainS.cpp
index 9135cbf5c47..cf23376b5ce 100644
--- a/TAO/tao/Domain/DomainS.cpp
+++ b/TAO/tao/Domain/DomainS.cpp
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_codegen.cpp:599
 
 #ifndef _TAO_IDL_ORIG_DOMAINS_CPP_
@@ -53,8 +53,8 @@
 #include "tao/Stub.h"
 #include "tao/IFR_Client_Adapter.h"
 #include "tao/Object_T.h"
-#include "tao/TypeCode.h"
-#include "tao/DynamicC.h"
+#include "tao/AnyTypeCode/TypeCode.h"
+#include "tao/AnyTypeCode/DynamicC.h"
 #include "tao/CDR.h"
 #include "tao/operation_details.h"
 #include "tao/PortableInterceptor.h"
@@ -81,14 +81,15 @@ namespace TAO
 
 #if !defined (_CORBA_POLICY__SARG_TRAITS_SS_)
 #define _CORBA_POLICY__SARG_TRAITS_SS_
-  
+
   template<>
   class  SArg_Traits<CORBA::Policy>
     : public
         Object_SArg_Traits_T<
             CORBA::Policy_ptr,
             CORBA::Policy_var,
-            CORBA::Policy_out
+            CORBA::Policy_out,
+            TAO::Any_Insert_Policy_AnyTypeCode_Adapter <CORBA::Policy_ptr>
           >
   {
   };
@@ -97,14 +98,15 @@ namespace TAO
 
 #if !defined (_CORBA_INTERFACEDEF__SARG_TRAITS_SS_)
 #define _CORBA_INTERFACEDEF__SARG_TRAITS_SS_
-  
+
   template<>
   class  SArg_Traits<CORBA::InterfaceDef>
     : public
         Object_SArg_Traits_T<
             CORBA::InterfaceDef_ptr,
             CORBA::InterfaceDef_var,
-            CORBA::InterfaceDef_out
+            CORBA::InterfaceDef_out,
+            TAO::Any_Insert_Policy_IFR_Client_Adapter <CORBA::InterfaceDef_ptr>
           >
   {
   };
@@ -122,7 +124,7 @@ namespace TAO
 
 #if !defined (_CORBA_POLICY__ARG_TRAITS_SS_)
 #define _CORBA_POLICY__ARG_TRAITS_SS_
-  
+
   template<>
   class  Arg_Traits<CORBA::Policy>
     : public
@@ -130,7 +132,8 @@ namespace TAO
             CORBA::Policy_ptr,
             CORBA::Policy_var,
             CORBA::Policy_out,
-            TAO::Objref_Traits<CORBA::Policy>
+            TAO::Objref_Traits<CORBA::Policy>,
+            TAO::Any_Insert_Policy_Stream <CORBA::Policy_ptr>
           >
   {
   };
@@ -139,7 +142,7 @@ namespace TAO
 
 #if !defined (_CORBA_INTERFACEDEF__ARG_TRAITS_SS_)
 #define _CORBA_INTERFACEDEF__ARG_TRAITS_SS_
-  
+
   template<>
   class  Arg_Traits<CORBA::InterfaceDef>
     : public
@@ -147,7 +150,8 @@ namespace TAO
             CORBA::InterfaceDef_ptr,
             CORBA::InterfaceDef_var,
             CORBA::InterfaceDef_out,
-            TAO::Objref_Traits<CORBA::InterfaceDef>
+            TAO::Objref_Traits<CORBA::InterfaceDef>,
+            TAO::Any_Insert_Policy_Stream <CORBA::InterfaceDef_ptr>
           >
   {
   };
@@ -280,7 +284,7 @@ POA_CORBA::_TAO_DomainManager_Strategized_Proxy_Broker::the_TAO_DomainManager_St
 {
   static POA_CORBA::_TAO_DomainManager_Strategized_Proxy_Broker
   strategized_proxy_broker;
-  
+
   return &strategized_proxy_broker;
 }
 
@@ -302,7 +306,7 @@ POA_CORBA::_TAO_DomainManager_Strategized_Proxy_Broker::get_strategy (
   TAO::Collocation_Strategy strategy =
     TAO_ORB_Core::collocation_strategy (obj ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (TAO::TAO_CS_REMOTE_STRATEGY);
-  
+
   return strategy;
 }
 
@@ -321,13 +325,13 @@ POA_CORBA::_TAO_DomainManager_Strategized_Proxy_Broker::dispatch (
 {
   TAO::Direct_Collocation_Upcall_Wrapper collocation_upcall_wrapper;
   collocation_upcall_wrapper.upcall (
-    obj, 
-    forward_obj, 
-    args, 
-    num_args, 
-    op, 
-    op_len, 
-    strategy 
+    obj,
+    forward_obj,
+    args,
+    num_args,
+    op,
+    op_len,
+    strategy
     ACE_ENV_ARG_PARAMETER);
 }
 
@@ -348,9 +352,9 @@ CORBA__TAO_DomainManager_Proxy_Broker_Factory_function (CORBA::Object_ptr)
 int
 CORBA__TAO_DomainManager_Proxy_Broker_Factory_Initializer (size_t)
 {
-  CORBA__TAO_DomainManager_Proxy_Broker_Factory_function_pointer = 
+  CORBA__TAO_DomainManager_Proxy_Broker_Factory_function_pointer =
     CORBA__TAO_DomainManager_Proxy_Broker_Factory_function;
-  
+
   return 0;
 }
 
@@ -369,14 +373,14 @@ CORBA__TAO_DomainManager_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
 POA_CORBA::_TAO_DomainManager_Direct_Proxy_Impl::_TAO_DomainManager_Direct_Proxy_Impl (void)
 {}
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
 
 void
 POA_CORBA::_TAO_DomainManager_Direct_Proxy_Impl::get_domain_policy (
     TAO_Abstract_ServantBase  *servant,
     TAO::Argument ** args,
-    int 
+    int
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -398,7 +402,7 @@ POA_CORBA::_TAO_DomainManager_Direct_Proxy_Impl::get_domain_policy (
 //           End Direct Proxy Implementation
 ///////////////////////////////////////////////////////////////////////
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:103
 
 POA_CORBA::DomainManager::DomainManager (void)
@@ -418,11 +422,11 @@ POA_CORBA::DomainManager::~DomainManager (void)
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class get_domain_policy_DomainManager
     : public TAO::Upcall_Command
   {
@@ -436,38 +440,38 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< CORBA::Policy>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< CORBA::Policy, TAO::SArg_Traits< CORBA::Policy>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::PolicyType>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::PolicyType, TAO::SArg_Traits< ::CORBA::PolicyType>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
-        
-      
+
+
       retval =
         this->servant_->get_domain_policy (
           arg_1
           ACE_ENV_ARG_PARAMETER);
-        
+
     }
-  
+
   private:
     POA_CORBA::DomainManager * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::DomainManager::get_domain_policy_skel (
@@ -477,24 +481,24 @@ void POA_CORBA::DomainManager::get_domain_policy_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static CORBA::TypeCode_ptr const * const exceptions = 0;
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< CORBA::Policy>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::PolicyType>::in_arg_val _tao_policy_type;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_policy_type
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::DomainManager * const impl =
     static_cast<POA_CORBA::DomainManager *> (servant);
 
@@ -502,7 +506,7 @@ void POA_CORBA::DomainManager::get_domain_policy_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -515,19 +519,19 @@ void POA_CORBA::DomainManager::get_domain_policy_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:169
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _is_a_DomainManager_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -541,68 +545,68 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< CORBA::Char *>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< CORBA::Char *, TAO::SArg_Traits< CORBA::Char *>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
-        
-      
+
+
       retval =
         this->servant_-> _is_a (
           arg_1
           ACE_ENV_ARG_PARAMETER);
-        
+
     }
-  
+
   private:
     POA_CORBA::DomainManager * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::DomainManager::_is_a_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static CORBA::TypeCode_ptr const * const exceptions = 0;
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
   TAO::SArg_Traits< CORBA::Char *>::in_arg_val _tao_repository_id;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_repository_id
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::DomainManager * const impl =
     static_cast<POA_CORBA::DomainManager *> (servant);
-  
+
   _is_a_DomainManager_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -615,16 +619,16 @@ void POA_CORBA::DomainManager::_is_a_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _non_existent_DomainManager_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -638,59 +642,59 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
-      
+
+
       retval =
         this->servant_-> _non_existent (
           ACE_ENV_SINGLE_ARG_PARAMETER);
-        
+
     }
-  
+
   private:
     POA_CORBA::DomainManager * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::DomainManager::_non_existent_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static CORBA::TypeCode_ptr const * const exceptions = 0;
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::DomainManager * const impl =
     static_cast<POA_CORBA::DomainManager *> (servant);
-  
+
   _non_existent_DomainManager_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -703,18 +707,18 @@ void POA_CORBA::DomainManager::_non_existent_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:393
 
 
 
 void POA_CORBA::DomainManager::_interface_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
     ACE_ENV_ARG_DECL
@@ -724,30 +728,30 @@ void POA_CORBA::DomainManager::_interface_skel (
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-    
+
   if (_tao_adapter == 0)
     {
       ACE_THROW (CORBA::INTF_REPOS (CORBA::OMGVMCID | 1,
                                     CORBA::COMPLETED_NO));
     }
-  
+
   POA_CORBA::DomainManager * const impl =
     static_cast<POA_CORBA::DomainManager *> (servant);
-  CORBA::InterfaceDef_ptr _tao_retval = 
+  CORBA::InterfaceDef_ptr _tao_retval =
     impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   server_request.init_reply ();
   TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-  
+
   CORBA::Boolean const _tao_result =
     _tao_adapter->interfacedef_cdr_insert (
         _tao_out,
         _tao_retval
       );
-  
+
   _tao_adapter->dispose (_tao_retval);
-  
+
   if (_tao_result == 0)
     {
       ACE_THROW (CORBA::MARSHAL ());
@@ -756,11 +760,11 @@ void POA_CORBA::DomainManager::_interface_skel (
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_component_DomainManager_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -774,59 +778,59 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Object, TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
-      
+
+
       retval =
         this->servant_-> _get_component (
           ACE_ENV_SINGLE_ARG_PARAMETER);
-        
+
     }
-  
+
   private:
     POA_CORBA::DomainManager * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::DomainManager::_component_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static CORBA::TypeCode_ptr const * const exceptions = 0;
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::DomainManager * const impl =
     static_cast<POA_CORBA::DomainManager *> (servant);
-  
+
   _get_component_DomainManager_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -839,7 +843,7 @@ void POA_CORBA::DomainManager::_component_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 CORBA::Boolean POA_CORBA::DomainManager::_is_a (
@@ -888,22 +892,22 @@ POA_CORBA::DomainManager::_this (ACE_ENV_SINGLE_ARG_DECL)
 {
   TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   TAO_Stub_Auto_Ptr safe_stub (stub);
   CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-  
+
   CORBA::Boolean _tao_opt_colloc =
     stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-  
+
   ACE_NEW_RETURN (
       tmp,
       CORBA::Object (stub, _tao_opt_colloc, this),
       0
     );
-  
+
   CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
-  
+
   typedef ::CORBA::DomainManager STUB_SCOPED_NAME;
   return
     TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -1041,7 +1045,7 @@ POA_CORBA::_TAO_ConstructionPolicy_Strategized_Proxy_Broker::the_TAO_Constructio
 {
   static POA_CORBA::_TAO_ConstructionPolicy_Strategized_Proxy_Broker
   strategized_proxy_broker;
-  
+
   return &strategized_proxy_broker;
 }
 
@@ -1063,7 +1067,7 @@ POA_CORBA::_TAO_ConstructionPolicy_Strategized_Proxy_Broker::get_strategy (
   TAO::Collocation_Strategy strategy =
     TAO_ORB_Core::collocation_strategy (obj ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (TAO::TAO_CS_REMOTE_STRATEGY);
-  
+
   return strategy;
 }
 
@@ -1082,13 +1086,13 @@ POA_CORBA::_TAO_ConstructionPolicy_Strategized_Proxy_Broker::dispatch (
 {
   TAO::Direct_Collocation_Upcall_Wrapper collocation_upcall_wrapper;
   collocation_upcall_wrapper.upcall (
-    obj, 
-    forward_obj, 
-    args, 
-    num_args, 
-    op, 
-    op_len, 
-    strategy 
+    obj,
+    forward_obj,
+    args,
+    num_args,
+    op,
+    op_len,
+    strategy
     ACE_ENV_ARG_PARAMETER);
 }
 
@@ -1109,9 +1113,9 @@ CORBA__TAO_ConstructionPolicy_Proxy_Broker_Factory_function (CORBA::Object_ptr)
 int
 CORBA__TAO_ConstructionPolicy_Proxy_Broker_Factory_Initializer (size_t)
 {
-  CORBA__TAO_ConstructionPolicy_Proxy_Broker_Factory_function_pointer = 
+  CORBA__TAO_ConstructionPolicy_Proxy_Broker_Factory_function_pointer =
     CORBA__TAO_ConstructionPolicy_Proxy_Broker_Factory_function;
-  
+
   return 0;
 }
 
@@ -1130,14 +1134,14 @@ CORBA__TAO_ConstructionPolicy_Proxy_Broker_Stub_Factory_Initializer_Scarecrow =
 POA_CORBA::_TAO_ConstructionPolicy_Direct_Proxy_Impl::_TAO_ConstructionPolicy_Direct_Proxy_Impl (void)
 {}
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
 
 void
 POA_CORBA::_TAO_ConstructionPolicy_Direct_Proxy_Impl::make_domain_manager (
     TAO_Abstract_ServantBase  *servant,
     TAO::Argument ** args,
-    int 
+    int
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -1159,7 +1163,7 @@ POA_CORBA::_TAO_ConstructionPolicy_Direct_Proxy_Impl::make_domain_manager (
 //           End Direct Proxy Implementation
 ///////////////////////////////////////////////////////////////////////
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:103
 
 POA_CORBA::ConstructionPolicy::ConstructionPolicy (void)
@@ -1180,11 +1184,11 @@ POA_CORBA::ConstructionPolicy::~ConstructionPolicy (void)
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class make_domain_manager_ConstructionPolicy
     : public TAO::Upcall_Command
   {
@@ -1198,7 +1202,7 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< CORBA::InterfaceDef>::in_arg_type arg_1 =
@@ -1206,30 +1210,30 @@ namespace POA_CORBA
           this->operation_details_,
           this->args_,
           1);
-        
+
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_type arg_2 =
         TAO::Portable_Server::get_in_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_type> (
           this->operation_details_,
           this->args_,
           2);
-        
+
       this->servant_->make_domain_manager (
         arg_1
         , arg_2
         ACE_ENV_ARG_PARAMETER);
-      
+
     }
-  
+
   private:
     POA_CORBA::ConstructionPolicy * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::ConstructionPolicy::make_domain_manager_skel (
@@ -1239,26 +1243,26 @@ void POA_CORBA::ConstructionPolicy::make_domain_manager_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static CORBA::TypeCode_ptr const * const exceptions = 0;
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< CORBA::InterfaceDef>::in_arg_val _tao_object_type;
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_constr_policy;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_object_type,
       &_tao_constr_policy
     };
-  
+
   static size_t const nargs = 3;
-  
+
   POA_CORBA::ConstructionPolicy * const impl =
     static_cast<POA_CORBA::ConstructionPolicy *> (servant);
 
@@ -1266,7 +1270,7 @@ void POA_CORBA::ConstructionPolicy::make_domain_manager_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -1279,19 +1283,19 @@ void POA_CORBA::ConstructionPolicy::make_domain_manager_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:169
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _is_a_ConstructionPolicy_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -1305,68 +1309,68 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< CORBA::Char *>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< CORBA::Char *, TAO::SArg_Traits< CORBA::Char *>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
-        
-      
+
+
       retval =
         this->servant_-> _is_a (
           arg_1
           ACE_ENV_ARG_PARAMETER);
-        
+
     }
-  
+
   private:
     POA_CORBA::ConstructionPolicy * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::ConstructionPolicy::_is_a_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static CORBA::TypeCode_ptr const * const exceptions = 0;
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
   TAO::SArg_Traits< CORBA::Char *>::in_arg_val _tao_repository_id;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_repository_id
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::ConstructionPolicy * const impl =
     static_cast<POA_CORBA::ConstructionPolicy *> (servant);
-  
+
   _is_a_ConstructionPolicy_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -1379,16 +1383,16 @@ void POA_CORBA::ConstructionPolicy::_is_a_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _non_existent_ConstructionPolicy_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -1402,59 +1406,59 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
-      
+
+
       retval =
         this->servant_-> _non_existent (
           ACE_ENV_SINGLE_ARG_PARAMETER);
-        
+
     }
-  
+
   private:
     POA_CORBA::ConstructionPolicy * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::ConstructionPolicy::_non_existent_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static CORBA::TypeCode_ptr const * const exceptions = 0;
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ConstructionPolicy * const impl =
     static_cast<POA_CORBA::ConstructionPolicy *> (servant);
-  
+
   _non_existent_ConstructionPolicy_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -1467,18 +1471,18 @@ void POA_CORBA::ConstructionPolicy::_non_existent_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:393
 
 
 
 void POA_CORBA::ConstructionPolicy::_interface_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
     ACE_ENV_ARG_DECL
@@ -1488,30 +1492,30 @@ void POA_CORBA::ConstructionPolicy::_interface_skel (
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-    
+
   if (_tao_adapter == 0)
     {
       ACE_THROW (CORBA::INTF_REPOS (CORBA::OMGVMCID | 1,
                                     CORBA::COMPLETED_NO));
     }
-  
+
   POA_CORBA::ConstructionPolicy * const impl =
     static_cast<POA_CORBA::ConstructionPolicy *> (servant);
-  CORBA::InterfaceDef_ptr _tao_retval = 
+  CORBA::InterfaceDef_ptr _tao_retval =
     impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   server_request.init_reply ();
   TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-  
+
   CORBA::Boolean const _tao_result =
     _tao_adapter->interfacedef_cdr_insert (
         _tao_out,
         _tao_retval
       );
-  
+
   _tao_adapter->dispose (_tao_retval);
-  
+
   if (_tao_result == 0)
     {
       ACE_THROW (CORBA::MARSHAL ());
@@ -1520,11 +1524,11 @@ void POA_CORBA::ConstructionPolicy::_interface_skel (
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_component_ConstructionPolicy_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -1538,59 +1542,59 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Object, TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
-      
+
+
       retval =
         this->servant_-> _get_component (
           ACE_ENV_SINGLE_ARG_PARAMETER);
-        
+
     }
-  
+
   private:
     POA_CORBA::ConstructionPolicy * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::ConstructionPolicy::_component_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static CORBA::TypeCode_ptr const * const exceptions = 0;
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::ConstructionPolicy * const impl =
     static_cast<POA_CORBA::ConstructionPolicy *> (servant);
-  
+
   _get_component_ConstructionPolicy_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -1603,7 +1607,7 @@ void POA_CORBA::ConstructionPolicy::_component_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 CORBA::Boolean POA_CORBA::ConstructionPolicy::_is_a (
@@ -1656,22 +1660,22 @@ POA_CORBA::ConstructionPolicy::_this (ACE_ENV_SINGLE_ARG_DECL)
 {
   TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   TAO_Stub_Auto_Ptr safe_stub (stub);
   CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-  
+
   CORBA::Boolean _tao_opt_colloc =
     stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-  
+
   ACE_NEW_RETURN (
       tmp,
       CORBA::Object (stub, _tao_opt_colloc, this),
       0
     );
-  
+
   CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
-  
+
   typedef ::CORBA::ConstructionPolicy STUB_SCOPED_NAME;
   return
     TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
diff --git a/TAO/tao/DomainA.cpp b/TAO/tao/DomainA.cpp
deleted file mode 100644
index 56760c9c277..00000000000
--- a/TAO/tao/DomainA.cpp
+++ /dev/null
@@ -1,296 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "DomainC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
-#include "tao/Sequence_TypeCode_Static.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
-#include "tao/Any_Dual_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_DomainManager (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/DomainManager:1.0",
-    "DomainManager");
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_DomainManager =
-    &_tao_tc_CORBA_DomainManager;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ConstructionPolicy (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/ConstructionPolicy:1.0",
-    "ConstructionPolicy");
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ConstructionPolicy =
-    &_tao_tc_CORBA_ConstructionPolicy;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:937
-
-
-#ifndef _TAO_TYPECODE_CORBA_DomainManagerList_GUARD
-#define _TAO_TYPECODE_CORBA_DomainManagerList_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_DomainManagerList_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_DomainManager,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_DomainManagerList_0 =
-      &CORBA_DomainManagerList_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_DomainManagerList_GUARD */
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_DomainManagerList (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/DomainManagerList:1.0",
-    "DomainManagerList",
-    &TAO::TypeCode::tc_CORBA_DomainManagerList_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_DomainManagerList =
-    &_tao_tc_CORBA_DomainManagerList;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::DomainManager>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::DomainManager_ptr _tao_elem
-  )
-{
-  CORBA::DomainManager_ptr _tao_objptr =
-    CORBA::DomainManager::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::DomainManager_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::DomainManager>::insert (
-      _tao_any,
-      CORBA::DomainManager::_tao_any_destructor,
-      CORBA::_tc_DomainManager,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::DomainManager_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::DomainManager>::extract (
-        _tao_any,
-        CORBA::DomainManager::_tao_any_destructor,
-        CORBA::_tc_DomainManager,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::ConstructionPolicy>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ConstructionPolicy_ptr _tao_elem
-  )
-{
-  CORBA::ConstructionPolicy_ptr _tao_objptr =
-    CORBA::ConstructionPolicy::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ConstructionPolicy_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::ConstructionPolicy>::insert (
-      _tao_any,
-      CORBA::ConstructionPolicy::_tao_any_destructor,
-      CORBA::_tc_ConstructionPolicy,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ConstructionPolicy_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::ConstructionPolicy>::extract (
-        _tao_any,
-        CORBA::ConstructionPolicy::_tao_any_destructor,
-        CORBA::_tc_ConstructionPolicy,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::DomainManagerList &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::DomainManagerList>::insert_copy (
-      _tao_any,
-      CORBA::DomainManagerList::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_DomainManagerList_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::DomainManagerList *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::DomainManagerList>::insert (
-      _tao_any,
-      CORBA::DomainManagerList::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_DomainManagerList_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::DomainManagerList *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::DomainManagerList *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::DomainManagerList *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::DomainManagerList>::extract (
-        _tao_any,
-        CORBA::DomainManagerList::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_DomainManagerList_0,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/DomainC.cpp b/TAO/tao/DomainC.cpp
index a87836007e5..edc3ef28c7c 100644
--- a/TAO/tao/DomainC.cpp
+++ b/TAO/tao/DomainC.cpp
@@ -31,7 +31,6 @@
 
 #include "DomainC.h"
 #include "tao/CDR.h"
-#include "tao/Exception_Data.h"
 #include "tao/Invocation_Adapter.h"
 #include "tao/Object_T.h"
 #include "tao/Basic_Arguments.h"
@@ -41,6 +40,7 @@
 
 #include "tao/ORB_Core.h"
 #include "tao/IFR_Client_Adapter.h"
+#include "tao/Any_Insert_Policy_T.h"
 #include "ace/Dynamic_Service.h"
 
 #if defined (__BORLANDC__)
@@ -68,24 +68,12 @@ namespace TAO
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-  template<>
-  void
-  In_Object_Argument_T<CORBA::InterfaceDef_ptr>::interceptor_param (Dynamic::Parameter & p)
-  {
-    TAO_IFR_Client_Adapter *adapter =
-      ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
-          TAO_ORB_Core::ifr_client_adapter_name ()
-        );
-
-    adapter->interfacedef_any_insert (p.argument, this->x_);
-    p.mode = CORBA::PARAM_IN;
-  }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
   template<>
   CORBA::Boolean
-  In_Object_Argument_T<CORBA::InterfaceDef_ptr>::marshal (TAO_OutputCDR & cdr)
+  In_Object_Argument_T<CORBA::InterfaceDef_ptr, TAO::Any_Insert_Policy_IFR_Client_Adapter <CORBA::InterfaceDef_ptr> >::marshal (TAO_OutputCDR &cdr)
   {
     TAO_IFR_Client_Adapter *adapter =
       ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
@@ -102,7 +90,7 @@ namespace TAO
 
 #if !defined (_CORBA_POLICY__ARG_TRAITS_CS_)
 #define _CORBA_POLICY__ARG_TRAITS_CS_
-  
+
   template<>
   class  Arg_Traits<CORBA::Policy>
     : public
@@ -110,7 +98,8 @@ namespace TAO
             CORBA::Policy_ptr,
             CORBA::Policy_var,
             CORBA::Policy_out,
-            TAO::Objref_Traits<CORBA::Policy>
+            TAO::Objref_Traits<CORBA::Policy>,
+            TAO::Any_Insert_Policy_AnyTypeCode_Adapter <CORBA::Policy_ptr>
           >
   {
   };
@@ -119,7 +108,7 @@ namespace TAO
 
 #if !defined (_CORBA_INTERFACEDEF__ARG_TRAITS_CS_)
 #define _CORBA_INTERFACEDEF__ARG_TRAITS_CS_
-  
+
   template<>
   class  Arg_Traits<CORBA::InterfaceDef>
     : public
@@ -127,7 +116,8 @@ namespace TAO
             CORBA::InterfaceDef_ptr,
             CORBA::InterfaceDef_var,
             CORBA::InterfaceDef_out,
-            TAO::Objref_Traits<CORBA::InterfaceDef>
+            TAO::Objref_Traits<CORBA::InterfaceDef>,
+            TAO::Any_Insert_Policy_IFR_Client_Adapter <CORBA::InterfaceDef_ptr>
           >
   {
   };
@@ -173,7 +163,7 @@ TAO::Objref_Traits<CORBA::DomainManager>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
+TAO::Collocation_Proxy_Broker *
 (*CORBA__TAO_DomainManager_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -193,21 +183,21 @@ TAO::Collocation_Proxy_Broker *
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_DomainManager_Proxy_Broker_ == 0)
     {
       CORBA_DomainManager_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< ::CORBA::Policy>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::PolicyType>::in_arg_val _tao_policy_type (policy_type);
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_policy_type
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -216,10 +206,10 @@ TAO::Collocation_Proxy_Broker *
       17,
       this->the_TAO_DomainManager_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -242,7 +232,7 @@ CORBA::DomainManager::CORBA_DomainManager_setup_collocation ()
 CORBA::DomainManager::~DomainManager (void)
 {}
 
-void 
+void
 CORBA::DomainManager::_tao_any_destructor (void *_tao_void_pointer)
 {
   DomainManager *_tao_tmp_pointer =
@@ -287,7 +277,7 @@ CORBA::DomainManager::_duplicate (DomainManager_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -373,7 +363,7 @@ TAO::Objref_Traits<CORBA::ConstructionPolicy>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
+TAO::Collocation_Proxy_Broker *
 (*CORBA__TAO_ConstructionPolicy_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -394,23 +384,23 @@ void CORBA::ConstructionPolicy::make_domain_manager (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_ConstructionPolicy_Proxy_Broker_ == 0)
     {
       CORBA_ConstructionPolicy_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< void>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::InterfaceDef>::in_arg_val _tao_object_type (object_type);
   TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_constr_policy (constr_policy);
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_object_type,
       &_tao_constr_policy
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -419,7 +409,7 @@ void CORBA::ConstructionPolicy::make_domain_manager (
       19,
       this->the_TAO_ConstructionPolicy_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
@@ -438,14 +428,14 @@ CORBA::ConstructionPolicy::CORBA_ConstructionPolicy_setup_collocation ()
       this->the_TAO_ConstructionPolicy_Proxy_Broker_ =
         ::CORBA__TAO_ConstructionPolicy_Proxy_Broker_Factory_function_pointer (this);
     }
-  
+
   this->CORBA_Policy_setup_collocation ();
 }
 
 CORBA::ConstructionPolicy::~ConstructionPolicy (void)
 {}
 
-void 
+void
 CORBA::ConstructionPolicy::_tao_any_destructor (void *_tao_void_pointer)
 {
   ConstructionPolicy *_tao_tmp_pointer =
@@ -490,7 +480,7 @@ CORBA::ConstructionPolicy::_duplicate (ConstructionPolicy_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -543,7 +533,7 @@ CORBA::ConstructionPolicy::marshal (TAO_OutputCDR &cdr)
   return (cdr << this);
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_CORBA_DOMAINMANAGERLIST_CS_)
@@ -617,21 +607,21 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::Object_var obj;
-  
+
   if (!(strm >> obj.inout ()))
     {
       return false;
     }
-  
+
   typedef ::CORBA::DomainManager RHS_SCOPED_NAME;
-  
+
   // Narrow to the right type.
   _tao_objref =
     TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
         obj.in (),
         CORBA__TAO_DomainManager_Proxy_Broker_Factory_function_pointer
       );
-    
+
   return 1;
 }
 
@@ -653,21 +643,21 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::Object_var obj;
-  
+
   if (!(strm >> obj.inout ()))
     {
       return false;
     }
-  
+
   typedef ::CORBA::ConstructionPolicy RHS_SCOPED_NAME;
-  
+
   // Narrow to the right type.
   _tao_objref =
     TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
         obj.in (),
         CORBA__TAO_ConstructionPolicy_Proxy_Broker_Factory_function_pointer
       );
-    
+
   return 1;
 }
 
@@ -683,12 +673,12 @@ CORBA::Boolean operator<< (
   )
 {
   const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
+
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
       CORBA::Boolean _tao_marshal_flag = true;
-      
+
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag =
@@ -696,10 +686,10 @@ CORBA::Boolean operator<< (
                 _tao_sequence[i].in (), strm
               );
         }
-      
+
       return _tao_marshal_flag;
     }
-  
+
   return false;
 }
 
@@ -709,7 +699,7 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
-  
+
   if (strm >> _tao_seq_len)
     {
       // Add a check to the length of the sequence
@@ -719,28 +709,28 @@ CORBA::Boolean operator>> (
         {
           return false;
         }
-      
+
       // Set the length of the sequence.
       _tao_sequence.length (_tao_seq_len);
-      
+
       // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
+      if (0 >= _tao_seq_len)
         {
           return true;
         }
-      
+
       // Retrieve all the elements.
       CORBA::Boolean _tao_marshal_flag = true;
-      
+
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
         }
-      
+
       return _tao_marshal_flag;
-    
+
     }
-  
+
   return false;
 }
 
diff --git a/TAO/tao/DomainC.h b/TAO/tao/DomainC.h
index f9ec80e94ca..5a4683f1b2a 100644
--- a/TAO/tao/DomainC.h
+++ b/TAO/tao/DomainC.h
@@ -66,7 +66,7 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_root/root_ch.cpp:62
 
 namespace TAO
@@ -80,22 +80,22 @@ namespace TAO
 
 namespace CORBA
 {
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_CORBA_DOMAINMANAGER__VAR_OUT_CH_)
 #define _CORBA_DOMAINMANAGER__VAR_OUT_CH_
-  
+
   class DomainManager;
   typedef DomainManager *DomainManager_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         DomainManager
       >
     DomainManager_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         DomainManager
@@ -103,13 +103,13 @@ namespace CORBA
     DomainManager_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_DOMAINMANAGER_CH_)
 #define _CORBA_DOMAINMANAGER_CH_
-  
+
   class TAO_Export DomainManager
     : public virtual CORBA::Object
   {
@@ -117,32 +117,32 @@ namespace CORBA
     friend class TAO::Narrow_Utils<DomainManager>;
     typedef DomainManager_ptr _ptr_type;
     typedef DomainManager_var _var_type;
-    
+
     // The static operations.
     static DomainManager_ptr _duplicate (DomainManager_ptr obj);
-    
+
     static void _tao_release (DomainManager_ptr obj);
-    
+
     static DomainManager_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static DomainManager_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static DomainManager_ptr _nil (void)
     {
       return static_cast<DomainManager_ptr> (0);
     }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::Policy_ptr get_domain_policy (
         ::CORBA::PolicyType policy_type
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -150,34 +150,34 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
-    
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     TAO::Collocation_Proxy_Broker *the_TAO_DomainManager_Proxy_Broker_;
-  
+
   protected:
     // Concrete interface only.
     DomainManager (void);
-    
+
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void CORBA_DomainManager_setup_collocation (void);
-    
+
     // Concrete non-local interface only.
     DomainManager (
         IOP::IOR *ior,
         TAO_ORB_Core *orb_core = 0
       );
-    
+
     // Non-local interface only.
     DomainManager (
         TAO_Stub *objref,
@@ -185,43 +185,38 @@ namespace CORBA
         TAO_Abstract_ServantBase *servant = 0,
         TAO_ORB_Core *orb_core = 0
       );
-    
+
     virtual ~DomainManager (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     DomainManager (const DomainManager &);
-    
+
     void operator= (const DomainManager &);
   };
 
 #endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_DomainManager;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-  
+
   const CORBA::PolicyType SecConstruction = 11U;
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_CORBA_CONSTRUCTIONPOLICY__VAR_OUT_CH_)
 #define _CORBA_CONSTRUCTIONPOLICY__VAR_OUT_CH_
-  
+
   class ConstructionPolicy;
   typedef ConstructionPolicy *ConstructionPolicy_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         ConstructionPolicy
       >
     ConstructionPolicy_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         ConstructionPolicy
@@ -229,13 +224,13 @@ namespace CORBA
     ConstructionPolicy_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_CONSTRUCTIONPOLICY_CH_)
 #define _CORBA_CONSTRUCTIONPOLICY_CH_
-  
+
   class TAO_Export ConstructionPolicy
     : public virtual ::CORBA::Policy
   {
@@ -243,32 +238,32 @@ namespace CORBA
     friend class TAO::Narrow_Utils<ConstructionPolicy>;
     typedef ConstructionPolicy_ptr _ptr_type;
     typedef ConstructionPolicy_var _var_type;
-    
+
     // The static operations.
     static ConstructionPolicy_ptr _duplicate (ConstructionPolicy_ptr obj);
-    
+
     static void _tao_release (ConstructionPolicy_ptr obj);
-    
+
     static ConstructionPolicy_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static ConstructionPolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static ConstructionPolicy_ptr _nil (void)
     {
       return static_cast<ConstructionPolicy_ptr> (0);
     }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void make_domain_manager (
         ::CORBA::InterfaceDef_ptr object_type,
         ::CORBA::Boolean constr_policy
@@ -277,34 +272,34 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
-    
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     TAO::Collocation_Proxy_Broker *the_TAO_ConstructionPolicy_Proxy_Broker_;
-  
+
   protected:
     // Concrete interface only.
     ConstructionPolicy (void);
-    
+
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void CORBA_ConstructionPolicy_setup_collocation (void);
-    
+
     // Concrete non-local interface only.
     ConstructionPolicy (
         IOP::IOR *ior,
         TAO_ORB_Core *orb_core = 0
       );
-    
+
     // Non-local interface only.
     ConstructionPolicy (
         TAO_Stub *objref,
@@ -312,31 +307,26 @@ namespace CORBA
         TAO_Abstract_ServantBase *servant = 0,
         TAO_ORB_Core *orb_core = 0
       );
-    
+
     virtual ~ConstructionPolicy (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     ConstructionPolicy (const ConstructionPolicy &);
-    
+
     void operator= (const ConstructionPolicy &);
   };
 
 #endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ConstructionPolicy;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_DOMAINMANAGERLIST_CH_)
 #define _CORBA_DOMAINMANAGERLIST_CH_
-  
+
   class DomainManagerList;
-  
+
   typedef
     TAO_MngSeq_Var_T<
         DomainManagerList,
@@ -346,7 +336,7 @@ namespace CORBA
           >
       >
     DomainManagerList_var;
-  
+
   typedef
     TAO_MngSeq_Out_T<
         DomainManagerList,
@@ -357,7 +347,7 @@ namespace CORBA
           >
       >
     DomainManagerList_out;
-  
+
   class TAO_Export DomainManagerList
     : public
         TAO_Unbounded_Object_Sequence<
@@ -371,23 +361,18 @@ namespace CORBA
     DomainManagerList (
         CORBA::ULong max,
         CORBA::ULong length,
-        DomainManager_ptr* buffer, 
+        DomainManager_ptr* buffer,
         CORBA::Boolean release = 0
       );
     DomainManagerList (const DomainManagerList &);
     ~DomainManagerList (void);
-    
+
     static void _tao_any_destructor (void *);
-    
+
     typedef DomainManagerList_var _var_type;
   };
 
 #endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_DomainManagerList;
 
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:66
@@ -420,7 +405,7 @@ namespace TAO
 
 #if !defined (_CORBA_DOMAINMANAGER__TRAITS_CH_)
 #define _CORBA_DOMAINMANAGER__TRAITS_CH_
-  
+
   template<>
   struct TAO_Export Objref_Traits< ::CORBA::DomainManager>
   {
@@ -441,7 +426,7 @@ namespace TAO
 
 #if !defined (_CORBA_CONSTRUCTIONPOLICY__TRAITS_CH_)
 #define _CORBA_CONSTRUCTIONPOLICY__TRAITS_CH_
-  
+
   template<>
   struct TAO_Export Objref_Traits< ::CORBA::ConstructionPolicy>
   {
@@ -462,28 +447,6 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, CORBA::DomainManager_ptr); // copying
-TAO_Export void operator<<= (CORBA::Any &, CORBA::DomainManager_ptr *); // non-copying
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::DomainManager_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, CORBA::ConstructionPolicy_ptr); // copying
-TAO_Export void operator<<= (CORBA::Any &, CORBA::ConstructionPolicy_ptr *); // non-copying
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ConstructionPolicy_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const CORBA::DomainManagerList &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, CORBA::DomainManagerList*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::DomainManagerList *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::DomainManagerList *&);
-
-// TAO_IDL - Generated from
 // be\be_visitor_interface/cdr_op_ch.cpp:55
 
 TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::DomainManager_ptr );
diff --git a/TAO/tao/DoubleSeqA.cpp b/TAO/tao/DoubleSeqA.cpp
deleted file mode 100644
index a8a2fa37ff6..00000000000
--- a/TAO/tao/DoubleSeqA.cpp
+++ /dev/null
@@ -1,142 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "DoubleSeqC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Sequence_TypeCode_Static.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Dual_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:937
-
-
-#ifndef _TAO_TYPECODE_CORBA_DoubleSeq_GUARD
-#define _TAO_TYPECODE_CORBA_DoubleSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_DoubleSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_double,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_DoubleSeq_0 =
-      &CORBA_DoubleSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_DoubleSeq_GUARD */
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_DoubleSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/DoubleSeq:1.0",
-    "DoubleSeq",
-    &TAO::TypeCode::tc_CORBA_DoubleSeq_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_DoubleSeq =
-    &_tao_tc_CORBA_DoubleSeq;
-}
-
-
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::DoubleSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::DoubleSeq>::insert_copy (
-      _tao_any,
-      CORBA::DoubleSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_DoubleSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::DoubleSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::DoubleSeq>::insert (
-      _tao_any,
-      CORBA::DoubleSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_DoubleSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::DoubleSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::DoubleSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::DoubleSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::DoubleSeq>::extract (
-        _tao_any,
-        CORBA::DoubleSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_DoubleSeq_0,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/DoubleSeqC.h b/TAO/tao/DoubleSeqC.h
index f80935d8347..a4fca3750b7 100644
--- a/TAO/tao/DoubleSeqC.h
+++ b/TAO/tao/DoubleSeqC.h
@@ -66,22 +66,22 @@
 
 namespace CORBA
 {
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_DOUBLESEQ_CH_)
 #define _CORBA_DOUBLESEQ_CH_
-  
+
   class DoubleSeq;
-  
+
   typedef
     TAO_FixedSeq_Var_T<
         DoubleSeq,
         CORBA::Double
       >
     DoubleSeq_var;
-  
+
   typedef
     TAO_Seq_Out_T<
         DoubleSeq,
@@ -89,7 +89,7 @@ namespace CORBA
         CORBA::Double
       >
     DoubleSeq_out;
-  
+
   class TAO_Export DoubleSeq
     : public
         TAO_Unbounded_Sequence<
@@ -102,23 +102,18 @@ namespace CORBA
     DoubleSeq (
         CORBA::ULong max,
         CORBA::ULong length,
-        CORBA::Double* buffer, 
+        CORBA::Double* buffer,
         CORBA::Boolean release = 0
       );
     DoubleSeq (const DoubleSeq &);
     ~DoubleSeq (void);
-    
+
     static void _tao_any_destructor (void *);
-    
+
     typedef DoubleSeq_var _var_type;
   };
 
 #endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_DoubleSeq;
 
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:66
@@ -134,14 +129,6 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const CORBA::DoubleSeq &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, CORBA::DoubleSeq*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::DoubleSeq *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::DoubleSeq *&);
-
-// TAO_IDL - Generated from
 // be\be_visitor_sequence/cdr_op_ch.cpp:71
 
 #if !defined _TAO_CDR_OP_CORBA_DoubleSeq_H_
diff --git a/TAO/tao/Dynamic.pidl b/TAO/tao/Dynamic.pidl
deleted file mode 100644
index 2ef06f278df..00000000000
--- a/TAO/tao/Dynamic.pidl
+++ /dev/null
@@ -1,46 +0,0 @@
-// -*- IDL -*-
-
-// ================================================================
-/**
- *  @file   Dynamic.pidl
- *
- * $Id$
- *
- *   This file was used to generate the code in DynamicC.* The command
- *   used to generate code is:
- *
- *     tao_idl
- *        -o orig -Ge 1 -GA -Sc -SS -Sci
- *          -Wb,export_macro=TAO_Export
- *          -Wb,export_include="tao/TAO_Export.h"
- *          -Wb,pre_include="ace/pre.h"
- *          -Wb,post_include="ace/post.h"
- *          Dynamic.pidl
- *
- */
-// ================================================================
-
-// File: Dynamic.idl
-// Used primarily for Interceptors
-
-#include "Dynamic_Parameter.pidl"
-#include "StringSeq.pidl"
-#include "Typecode_types.pidl"
-
-#ifndef _DYNAMIC_IDL_
-#define _DYNAMIC_IDL_
-
-module Dynamic
-{
-  typeprefix Dynamic "omg.org";
-
-  typedef sequence<Parameter> ParameterList;
-
-  typedef CORBA::StringSeq ContextList;
-
-  typedef sequence<CORBA::TypeCode> ExceptionList;
-
-  typedef CORBA::StringSeq RequestContext;
-};
-
-#endif // _DYNAMIC_IDL_
diff --git a/TAO/tao/DynamicA.cpp b/TAO/tao/DynamicA.cpp
deleted file mode 100644
index f1cbfa9bc5b..00000000000
--- a/TAO/tao/DynamicA.cpp
+++ /dev/null
@@ -1,290 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "DynamicC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Sequence_TypeCode_Static.h"
-#include "tao/String_TypeCode_Static.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Dual_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:937
-
-
-#ifndef _TAO_TYPECODE_Dynamic_ParameterList_GUARD
-#define _TAO_TYPECODE_Dynamic_ParameterList_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      Dynamic_ParameterList_0 (
-        CORBA::tk_sequence,
-        &Dynamic::_tc_Parameter,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_Dynamic_ParameterList_0 =
-      &Dynamic_ParameterList_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_Dynamic_ParameterList_GUARD */
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_Dynamic_ParameterList (
-    CORBA::tk_alias,
-    "IDL:omg.org/Dynamic/ParameterList:1.0",
-    "ParameterList",
-    &TAO::TypeCode::tc_Dynamic_ParameterList_0);
-  
-namespace Dynamic
-{
-  ::CORBA::TypeCode_ptr const _tc_ParameterList =
-    &_tao_tc_Dynamic_ParameterList;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_Dynamic_ContextList (
-    CORBA::tk_alias,
-    "IDL:omg.org/Dynamic/ContextList:1.0",
-    "ContextList",
-    &CORBA::_tc_StringSeq);
-  
-namespace Dynamic
-{
-  ::CORBA::TypeCode_ptr const _tc_ContextList =
-    &_tao_tc_Dynamic_ContextList;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:937
-
-
-#ifndef _TAO_TYPECODE_Dynamic_ExceptionList_GUARD
-#define _TAO_TYPECODE_Dynamic_ExceptionList_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      Dynamic_ExceptionList_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_TypeCode,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_Dynamic_ExceptionList_0 =
-      &Dynamic_ExceptionList_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_Dynamic_ExceptionList_GUARD */
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_Dynamic_ExceptionList (
-    CORBA::tk_alias,
-    "IDL:omg.org/Dynamic/ExceptionList:1.0",
-    "ExceptionList",
-    &TAO::TypeCode::tc_Dynamic_ExceptionList_0);
-  
-namespace Dynamic
-{
-  ::CORBA::TypeCode_ptr const _tc_ExceptionList =
-    &_tao_tc_Dynamic_ExceptionList;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_Dynamic_RequestContext (
-    CORBA::tk_alias,
-    "IDL:omg.org/Dynamic/RequestContext:1.0",
-    "RequestContext",
-    &CORBA::_tc_StringSeq);
-  
-namespace Dynamic
-{
-  ::CORBA::TypeCode_ptr const _tc_RequestContext =
-    &_tao_tc_Dynamic_RequestContext;
-}
-
-
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const Dynamic::ParameterList &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<Dynamic::ParameterList>::insert_copy (
-      _tao_any,
-      Dynamic::ParameterList::_tao_any_destructor,
-      TAO::TypeCode::tc_Dynamic_ParameterList_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    Dynamic::ParameterList *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<Dynamic::ParameterList>::insert (
-      _tao_any,
-      Dynamic::ParameterList::_tao_any_destructor,
-      TAO::TypeCode::tc_Dynamic_ParameterList_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    Dynamic::ParameterList *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const Dynamic::ParameterList *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const Dynamic::ParameterList *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<Dynamic::ParameterList>::extract (
-        _tao_any,
-        Dynamic::ParameterList::_tao_any_destructor,
-        TAO::TypeCode::tc_Dynamic_ParameterList_0,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const Dynamic::ExceptionList &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<Dynamic::ExceptionList>::insert_copy (
-      _tao_any,
-      Dynamic::ExceptionList::_tao_any_destructor,
-      TAO::TypeCode::tc_Dynamic_ExceptionList_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    Dynamic::ExceptionList *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<Dynamic::ExceptionList>::insert (
-      _tao_any,
-      Dynamic::ExceptionList::_tao_any_destructor,
-      TAO::TypeCode::tc_Dynamic_ExceptionList_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    Dynamic::ExceptionList *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const Dynamic::ExceptionList *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const Dynamic::ExceptionList *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<Dynamic::ExceptionList>::extract (
-        _tao_any,
-        Dynamic::ExceptionList::_tao_any_destructor,
-        TAO::TypeCode::tc_Dynamic_ExceptionList_0,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/DynamicAny.mpc b/TAO/tao/DynamicAny.mpc
index a064db9ca07..fae92577a06 100644
--- a/TAO/tao/DynamicAny.mpc
+++ b/TAO/tao/DynamicAny.mpc
@@ -1,5 +1,5 @@
 //$Id$
-project : taolib, core {
+project : taolib, core, anytypecode {
   sharedname    = TAO_DynamicAny
   dynamicflags  = TAO_DYNAMICANY_BUILD_DLL
 
@@ -27,6 +27,9 @@ project : taolib, core {
     DynamicAny
   }
 
+  IDL_Files {
+  }
+
   Pkgconfig_Files {
     DynamicAny/TAO_DynamicAny.pc.in
   }
diff --git a/TAO/tao/DynamicAny/DynAny_i.cpp b/TAO/tao/DynamicAny/DynAny_i.cpp
index b8562e2af63..76c6b18c3b5 100644
--- a/TAO/tao/DynamicAny/DynAny_i.cpp
+++ b/TAO/tao/DynamicAny/DynAny_i.cpp
@@ -3,7 +3,7 @@
 
 #include "DynAny_i.h"
 #include "DynAnyFactory.h"
-#include "tao/Any_Unknown_IDL_Type.h"
+#include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h"
 #include "tao/CDR.h"
 #include "ace/OS_NS_wchar.h"
 #include "ace/OS_NS_string.h"
diff --git a/TAO/tao/DynamicAny/DynArray_i.cpp b/TAO/tao/DynamicAny/DynArray_i.cpp
index 371fb0467b4..e7dc61d55c5 100644
--- a/TAO/tao/DynamicAny/DynArray_i.cpp
+++ b/TAO/tao/DynamicAny/DynArray_i.cpp
@@ -3,8 +3,8 @@
 
 #include "DynArray_i.h"
 #include "DynAnyFactory.h"
-#include "tao/Marshal.h"
-#include "tao/Any_Unknown_IDL_Type.h"
+#include "tao/AnyTypeCode/Marshal.h"
+#include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h"
 #include "tao/CDR.h"
 
 ACE_RCSID (DynamicAny,
@@ -65,7 +65,7 @@ TAO_DynArray_i::init (const CORBA::Any & any
     {
       TAO::Unknown_IDL_Type *unk =
         dynamic_cast<TAO::Unknown_IDL_Type *> (impl);
-        
+
       cdr = unk->_tao_get_cdr ();
     }
   else
@@ -268,7 +268,7 @@ TAO_DynArray_i::set_elements (const DynamicAny::AnySeq & value
     }
 
   CORBA::TypeCode_var value_tc;
-  CORBA::TypeCode_var element_type = 
+  CORBA::TypeCode_var element_type =
     this->get_element_type (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
@@ -276,7 +276,7 @@ TAO_DynArray_i::set_elements (const DynamicAny::AnySeq & value
     {
       // Check each arg element for type match.
       value_tc = value[i].type ();
-      CORBA::Boolean equivalent = 
+      CORBA::Boolean equivalent =
         value_tc->equivalent (element_type.in ()
                               ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
@@ -359,7 +359,7 @@ TAO_DynArray_i::set_elements_as_dyn_any (
       ACE_THROW (DynamicAny::DynAny::InvalidValue ());
     }
 
-  CORBA::TypeCode_var element_type = 
+  CORBA::TypeCode_var element_type =
     this->get_element_type (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
@@ -378,7 +378,7 @@ TAO_DynArray_i::set_elements_as_dyn_any (
 
       if (equivalent)
         {
-          this->da_members_[i] = 
+          this->da_members_[i] =
             values[i]->copy (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
         }
@@ -406,7 +406,7 @@ TAO_DynArray_i::from_any (const CORBA::Any& any
     }
 
   CORBA::TypeCode_var tc = any.type ();
-  CORBA::Boolean equivalent = 
+  CORBA::Boolean equivalent =
     this->type_.in ()->equivalent (tc.in ()
                                    ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
@@ -422,7 +422,7 @@ TAO_DynArray_i::from_any (const CORBA::Any& any
         {
           TAO::Unknown_IDL_Type *unk =
             dynamic_cast<TAO::Unknown_IDL_Type *> (impl);
-            
+
           cdr = unk->_tao_get_cdr ();
         }
       else
@@ -442,7 +442,7 @@ TAO_DynArray_i::from_any (const CORBA::Any& any
           ACE_THROW (DynamicAny::DynAny::TypeMismatch ());
         }
 
-      CORBA::TypeCode_var field_tc = 
+      CORBA::TypeCode_var field_tc =
         this->get_element_type (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
@@ -491,7 +491,7 @@ TAO_DynArray_i::to_any (ACE_ENV_SINGLE_ARG_DECL)
                         0);
     }
 
-  CORBA::TypeCode_var field_tc = 
+  CORBA::TypeCode_var field_tc =
     this->get_element_type (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
@@ -502,7 +502,7 @@ TAO_DynArray_i::to_any (ACE_ENV_SINGLE_ARG_DECL)
   for (size_t i = 0; i < length; ++i)
     {
       // Recursive step.
-      field_any = 
+      field_any =
         this->da_members_[i]->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
@@ -514,7 +514,7 @@ TAO_DynArray_i::to_any (ACE_ENV_SINGLE_ARG_DECL)
         {
           TAO::Unknown_IDL_Type *field_unk =
             dynamic_cast<TAO::Unknown_IDL_Type *> (field_impl);
-            
+
           field_cdr = field_unk->_tao_get_cdr ();
         }
       else
diff --git a/TAO/tao/DynamicAny/DynCommon.cpp b/TAO/tao/DynamicAny/DynCommon.cpp
index 039093b5baa..9c8b7a6be49 100644
--- a/TAO/tao/DynamicAny/DynCommon.cpp
+++ b/TAO/tao/DynamicAny/DynCommon.cpp
@@ -9,7 +9,7 @@
 #include "DynSequence_i.h"
 #include "DynStruct_i.h"
 #include "DynUnion_i.h"
-#include "tao/Any_Unknown_IDL_Type.h"
+#include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h"
 #include "tao/CDR.h"
 #include "ace/OS_NS_wchar.h"
 #include "ace/OS_NS_string.h"
diff --git a/TAO/tao/DynamicAny/DynEnum_i.cpp b/TAO/tao/DynamicAny/DynEnum_i.cpp
index 8e2b7314d18..7db76b721af 100644
--- a/TAO/tao/DynamicAny/DynEnum_i.cpp
+++ b/TAO/tao/DynamicAny/DynEnum_i.cpp
@@ -2,7 +2,7 @@
 
 #include "DynEnum_i.h"
 #include "DynAnyFactory.h"
-#include "tao/Any_Unknown_IDL_Type.h"
+#include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h"
 #include "tao/CDR.h"
 
 #include "ace/OS_NS_string.h"
@@ -56,7 +56,7 @@ TAO_DynEnum_i::init (const CORBA::Any &any
     {
       TAO::Unknown_IDL_Type *unk =
         dynamic_cast<TAO::Unknown_IDL_Type *> (impl);
-        
+
       // We don't want unk's rd_ptr to move, in case we are shared by
       // another Any, so we use this to copy the state, not the buffer.
       TAO_InputCDR for_reading (unk->_tao_get_cdr ());
@@ -217,7 +217,7 @@ TAO_DynEnum_i::from_any (const CORBA::Any& any
         {
           TAO::Unknown_IDL_Type *unk =
             dynamic_cast<TAO::Unknown_IDL_Type *> (impl);
-            
+
           // We don't want unk's rd_ptr to move, in case we are shared by
           // another Any, so we use this to copy the state, not the buffer.
           TAO_InputCDR for_reading (unk->_tao_get_cdr ());
@@ -294,7 +294,7 @@ TAO_DynEnum_i::equal (DynamicAny::DynAny_ptr rhs
     {
       TAO::Unknown_IDL_Type *unk =
         dynamic_cast<TAO::Unknown_IDL_Type *> (impl);
-        
+
       // We don't want unk's rd_ptr to move, in case we are shared by
       // another Any, so we use this to copy the state, not the buffer.
       TAO_InputCDR for_reading (unk->_tao_get_cdr ());
diff --git a/TAO/tao/DynamicAny/DynSequence_i.cpp b/TAO/tao/DynamicAny/DynSequence_i.cpp
index f3307fc080a..2e9d1b7c352 100644
--- a/TAO/tao/DynamicAny/DynSequence_i.cpp
+++ b/TAO/tao/DynamicAny/DynSequence_i.cpp
@@ -3,8 +3,8 @@
 
 #include "DynSequence_i.h"
 #include "DynAnyFactory.h"
-#include "tao/Marshal.h"
-#include "tao/Any_Unknown_IDL_Type.h"
+#include "tao/AnyTypeCode/Marshal.h"
+#include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h"
 #include "tao/CDR.h"
 
 ACE_RCSID (DynamicAny,
@@ -59,7 +59,7 @@ TAO_DynSequence_i::init (const CORBA::Any& any
     {
       TAO::Unknown_IDL_Type *unk =
         dynamic_cast<TAO::Unknown_IDL_Type *> (impl);
-        
+
       cdr = unk->_tao_get_cdr ();
     }
   else
@@ -480,7 +480,7 @@ TAO_DynSequence_i::set_elements_as_dyn_any (
       this->da_members_.size (length);
     }
 
-  CORBA::TypeCode_var element_type = 
+  CORBA::TypeCode_var element_type =
     this->get_element_type (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
@@ -506,7 +506,7 @@ TAO_DynSequence_i::set_elements_as_dyn_any (
               ACE_CHECK;
             }
 
-          this->da_members_[i] = 
+          this->da_members_[i] =
             values[i]->copy (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
         }
@@ -550,7 +550,7 @@ TAO_DynSequence_i::from_any (const CORBA::Any & any
     }
 
   CORBA::TypeCode_var tc = any.type ();
-  CORBA::Boolean equivalent = 
+  CORBA::Boolean equivalent =
     this->type_.in ()->equivalent (tc.in ()
                                    ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
@@ -566,7 +566,7 @@ TAO_DynSequence_i::from_any (const CORBA::Any & any
         {
           TAO::Unknown_IDL_Type *unk =
             dynamic_cast<TAO::Unknown_IDL_Type *> (impl);
-            
+
           cdr = unk->_tao_get_cdr ();
         }
       else
@@ -679,7 +679,7 @@ TAO_DynSequence_i::to_any (ACE_ENV_SINGLE_ARG_DECL)
         {
           TAO::Unknown_IDL_Type *field_unk =
             dynamic_cast<TAO::Unknown_IDL_Type *> (field_impl);
-            
+
           field_cdr = field_unk->_tao_get_cdr ();
         }
       else
diff --git a/TAO/tao/DynamicAny/DynStruct_i.cpp b/TAO/tao/DynamicAny/DynStruct_i.cpp
index 4519b46fbb8..96bff70c7ef 100644
--- a/TAO/tao/DynamicAny/DynStruct_i.cpp
+++ b/TAO/tao/DynamicAny/DynStruct_i.cpp
@@ -3,8 +3,8 @@
 
 #include "DynStruct_i.h"
 #include "DynAnyFactory.h"
-#include "tao/Marshal.h"
-#include "tao/Any_Unknown_IDL_Type.h"
+#include "tao/AnyTypeCode/Marshal.h"
+#include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h"
 #include "tao/CDR.h"
 
 ACE_RCSID (DynamicAny,
diff --git a/TAO/tao/DynamicAny/DynUnion_i.cpp b/TAO/tao/DynamicAny/DynUnion_i.cpp
index 1e762006c60..59d6bfe352a 100644
--- a/TAO/tao/DynamicAny/DynUnion_i.cpp
+++ b/TAO/tao/DynamicAny/DynUnion_i.cpp
@@ -3,8 +3,8 @@
 
 #include "DynUnion_i.h"
 #include "DynAnyFactory.h"
-#include "tao/Marshal.h"
-#include "tao/Any_Unknown_IDL_Type.h"
+#include "tao/AnyTypeCode/Marshal.h"
+#include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h"
 #include "tao/CDR.h"
 
 ACE_RCSID (DynamicAny,
@@ -154,7 +154,7 @@ TAO_DynUnion_i::set_from_any (const CORBA::Any & any,
     {
       TAO::Unknown_IDL_Type *tmp =
         dynamic_cast<TAO::Unknown_IDL_Type *> (impl);
-    
+
       in = tmp->_tao_get_cdr ();
     }
   else
@@ -163,7 +163,7 @@ TAO_DynUnion_i::set_from_any (const CORBA::Any & any,
       TAO_InputCDR tmp_in (out);
       in = tmp_in;
     }
-    
+
   TAO_InputCDR unk_in (in);
   ACE_NEW (unk,
            TAO::Unknown_IDL_Type (disc_tc.in (),
@@ -229,7 +229,7 @@ TAO_DynUnion_i::set_from_any (const CORBA::Any & any,
 
   if (match)
     {
-      CORBA::TypeCode_var member_tc = 
+      CORBA::TypeCode_var member_tc =
         tc->member_type (i
                          ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
@@ -259,7 +259,7 @@ TAO_DynUnion_i::set_from_any (const CORBA::Any & any,
                                         ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
-      CORBA::Long default_index = 
+      CORBA::Long default_index =
         unaliased_tc->default_index (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
@@ -271,7 +271,7 @@ TAO_DynUnion_i::set_from_any (const CORBA::Any & any,
         {
           CORBA::ULong index = static_cast<CORBA::ULong> (default_index);
 
-          CORBA::TypeCode_var default_tc = 
+          CORBA::TypeCode_var default_tc =
             tc->member_type (index
                              ACE_ENV_ARG_PARAMETER);
           ACE_CHECK;
@@ -332,7 +332,7 @@ TAO_DynUnion_i::set_discriminator (DynamicAny::DynAny_ptr value
   CORBA::TypeCode_var tc = value->type (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  CORBA::TypeCode_var disc_tc = 
+  CORBA::TypeCode_var disc_tc =
     this->discriminator_->type (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
@@ -348,7 +348,7 @@ TAO_DynUnion_i::set_discriminator (DynamicAny::DynAny_ptr value
   CORBA::Any_var value_any = value->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  CORBA::ULong length = 
+  CORBA::ULong length =
     this->type_->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
@@ -404,7 +404,7 @@ TAO_DynUnion_i::set_discriminator (DynamicAny::DynAny_ptr value
       ACE_CHECK;
 
       // Initialize member to default value.
-      this->member_ = 
+      this->member_ =
         TAO_DynAnyFactory::make_dyn_any (member_tc.in ()
                                          ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
@@ -424,7 +424,7 @@ TAO_DynUnion_i::set_discriminator (DynamicAny::DynAny_ptr value
       ACE_CHECK;
 
       // If no match, either the default member or no member is active.
-      CORBA::Long default_index = 
+      CORBA::Long default_index =
         unaliased_tc->default_index (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
@@ -471,7 +471,7 @@ TAO_DynUnion_i::set_to_default_member (ACE_ENV_SINGLE_ARG_DECL)
                                     ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  CORBA::Long default_index = 
+  CORBA::Long default_index =
     unaliased_tc->default_index (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
@@ -492,7 +492,7 @@ TAO_DynUnion_i::set_to_default_member (ACE_ENV_SINGLE_ARG_DECL)
       this->member_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
-      this->member_ = 
+      this->member_ =
         TAO_DynAnyFactory::make_dyn_any (default_tc.in ()
                                          ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
@@ -523,7 +523,7 @@ TAO_DynUnion_i::set_to_no_active_member (ACE_ENV_SINGLE_ARG_DECL)
                                     ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  CORBA::Long default_index = 
+  CORBA::Long default_index =
     unaliased_tc->default_index (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
@@ -535,22 +535,22 @@ TAO_DynUnion_i::set_to_no_active_member (ACE_ENV_SINGLE_ARG_DECL)
     }
   else
     {
-      CORBA::TypeCode_var disc_tc = 
+      CORBA::TypeCode_var disc_tc =
         this->discriminator_->type (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
-      CORBA::TCKind kind = 
+      CORBA::TCKind kind =
         TAO_DynAnyFactory::unalias (disc_tc.in ()
                                     ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       if (kind == CORBA::tk_enum)
         {
-          CORBA::ULong member_count = 
+          CORBA::ULong member_count =
             this->type_->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
 
-          CORBA::ULong label_count = 
+          CORBA::ULong label_count =
             disc_tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
 
@@ -595,7 +595,7 @@ TAO_DynUnion_i::discriminator_kind (ACE_ENV_SINGLE_ARG_DECL)
                         CORBA::tk_null);
     }
 
-  CORBA::TypeCode_var tc = 
+  CORBA::TypeCode_var tc =
     this->discriminator_->type (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::tk_null);
 
@@ -692,7 +692,7 @@ TAO_DynUnion_i::member_kind (ACE_ENV_SINGLE_ARG_DECL)
                         CORBA::tk_null);
     }
 
-  CORBA::TypeCode_var tc = 
+  CORBA::TypeCode_var tc =
     this->member_->type (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::tk_null);
 
@@ -720,7 +720,7 @@ TAO_DynUnion_i::from_any (const CORBA::Any& any
     }
 
   CORBA::TypeCode_var tc = any.type ();
-  CORBA::Boolean equivalent = 
+  CORBA::Boolean equivalent =
     this->type_.in ()->equivalent (tc.in ()
                                    ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
@@ -762,11 +762,11 @@ TAO_DynUnion_i::to_any (ACE_ENV_SINGLE_ARG_DECL)
 
   // Add the discriminator to the CDR stream.
 
-  CORBA::TypeCode_var disc_tc = 
+  CORBA::TypeCode_var disc_tc =
     this->discriminator_->type (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  CORBA::Any_var disc_any = 
+  CORBA::Any_var disc_any =
     this->discriminator_->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
@@ -778,7 +778,7 @@ TAO_DynUnion_i::to_any (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::Unknown_IDL_Type *disc_unk =
         dynamic_cast<TAO::Unknown_IDL_Type *> (disc_any_impl);
-        
+
       disc_in_cdr = disc_unk->_tao_get_cdr ();
     }
   else
@@ -797,14 +797,14 @@ TAO_DynUnion_i::to_any (ACE_ENV_SINGLE_ARG_DECL)
   // Add the member to the CDR stream unless it has no active member.
   if (this->has_no_active_member () == 0)
     {
-      CORBA::TypeCode_var member_tc = 
+      CORBA::TypeCode_var member_tc =
         this->member_->type (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
-     
-      CORBA::Any_var member_any = 
+
+      CORBA::Any_var member_any =
         this->member_->to_any (ACE_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
-     
+
       TAO::Any_Impl *member_any_impl = member_any->impl ();
       TAO_OutputCDR member_out_cdr;
       TAO_InputCDR member_in_cdr (static_cast<ACE_Message_Block *> (0));
@@ -813,7 +813,7 @@ TAO_DynUnion_i::to_any (ACE_ENV_SINGLE_ARG_DECL)
         {
           TAO::Unknown_IDL_Type *member_unk =
             dynamic_cast<TAO::Unknown_IDL_Type *> (member_any_impl);
-            
+
           member_in_cdr = member_unk->_tao_get_cdr ();
         }
       else
@@ -822,14 +822,14 @@ TAO_DynUnion_i::to_any (ACE_ENV_SINGLE_ARG_DECL)
           TAO_InputCDR member_tmp_in_cdr (member_out_cdr);
           member_in_cdr = member_tmp_in_cdr;
         }
-     
+
       (void) TAO_Marshal_Object::perform_append (member_tc.in (),
                                                 &member_in_cdr,
                                                 &out_cdr
                                                 ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
     }
-  
+
   // Make the Any.
   TAO_InputCDR in_cdr (out_cdr);
 
@@ -872,7 +872,7 @@ TAO_DynUnion_i::equal (DynamicAny::DynAny_ptr rhs
       return 0;
     }
 
-  CORBA::Boolean equivalent = 
+  CORBA::Boolean equivalent =
     this->type_->equivalent (impl->type_.in ()
                              ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
@@ -882,7 +882,7 @@ TAO_DynUnion_i::equal (DynamicAny::DynAny_ptr rhs
       return 0;
     }
 
-  CORBA::Boolean member_equal = 
+  CORBA::Boolean member_equal =
     this->member_->equal (impl->member_.in ()
                           ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
@@ -1070,14 +1070,14 @@ TAO_DynUnion_i::label_match (const CORBA::Any &my_any,
       {
         CORBA::ULong my_val;
         CORBA::ULong other_val;
-        
+
         TAO::Any_Impl *my_impl = my_any.impl ();
 
         if (my_impl->encoded ())
           {
             TAO::Unknown_IDL_Type *my_unk =
               dynamic_cast<TAO::Unknown_IDL_Type *> (my_impl);
-              
+
             // We don't want unk's rd_ptr to move, in case we are shared by
             // another Any, so we use this to copy the state, not the buffer.
             TAO_InputCDR for_reading (my_unk->_tao_get_cdr ());
@@ -1092,12 +1092,12 @@ TAO_DynUnion_i::label_match (const CORBA::Any &my_any,
           }
 
         TAO::Any_Impl *other_impl = other_any.impl ();
-        
+
         if (other_impl->encoded ())
           {
             TAO::Unknown_IDL_Type *other_unk =
               dynamic_cast<TAO::Unknown_IDL_Type *> (other_impl);
-              
+
             // We don't want unk's rd_ptr to move, in case we are shared by
             // another Any, so we use this to copy the state, not the buffer.
             TAO_InputCDR for_reading (other_unk->_tao_get_cdr ());
@@ -1110,7 +1110,7 @@ TAO_DynUnion_i::label_match (const CORBA::Any &my_any,
             TAO_InputCDR other_in (other_out);
             other_in.read_ulong (other_val);
           }
-          
+
         return my_val == other_val;
       }
     // Cannot happen - we've covered all the legal discriminator types.
diff --git a/TAO/tao/DynamicAny/DynamicAnyC.h b/TAO/tao/DynamicAny/DynamicAnyC.h
index 38d2c82257e..9d8b9c916d8 100644
--- a/TAO/tao/DynamicAny/DynamicAnyC.h
+++ b/TAO/tao/DynamicAny/DynamicAnyC.h
@@ -49,9 +49,9 @@
 #include "tao/SystemException.h"
 #include "tao/Environment.h"
 #include "tao/Object.h"
-#include "tao/TypeCode.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Any.h"
+#include "tao/AnyTypeCode/TypeCode.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Any.h"
 #include "tao/Sequence_T.h"
 #include "tao/Objref_VarOut_T.h"
 #include "tao/Seq_Var_T.h"
@@ -79,22 +79,22 @@
 
 namespace DynamicAny
 {
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_DYNAMICANY_DYNANY__VAR_OUT_CH_)
 #define _DYNAMICANY_DYNANY__VAR_OUT_CH_
-  
+
   class DynAny;
   typedef DynAny *DynAny_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         DynAny
       >
     DynAny_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         DynAny
@@ -102,63 +102,63 @@ namespace DynamicAny
     DynAny_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_DYNAMICANY_DYNANY_CH_)
 #define _DYNAMICANY_DYNANY_CH_
-  
+
   class TAO_DynamicAny_Export DynAny
     : public virtual CORBA::Object
   {
   public:
     typedef DynAny_ptr _ptr_type;
     typedef DynAny_var _var_type;
-    
+
     // The static operations.
     static DynAny_ptr _duplicate (DynAny_ptr obj);
-    
+
     static void _tao_release (DynAny_ptr obj);
-    
+
     static DynAny_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static DynAny_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static DynAny_ptr _nil (void)
     {
       return static_cast<DynAny_ptr> (0);
     }
-    
-    
-    
+
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_DYNAMICANY_DYNANY_INVALIDVALUE_CH_)
 #define _DYNAMICANY_DYNANY_INVALIDVALUE_CH_
-    
+
     class TAO_DynamicAny_Export InvalidValue : public CORBA::UserException
     {
     public:
-      
+
       InvalidValue (void);
       InvalidValue (const InvalidValue &);
       ~InvalidValue (void);
 
       InvalidValue &operator= (const InvalidValue &);
-      
+
       static InvalidValue *_downcast (CORBA::Exception *);
       static const InvalidValue *_downcast (CORBA::Exception const *);
-      
+
       static CORBA::Exception *_alloc (void);
-      
+
       virtual CORBA::Exception *_tao_duplicate (void) const;
 
       virtual void _raise (void) const;
@@ -167,39 +167,39 @@ namespace DynamicAny
           TAO_OutputCDR &
           ACE_ENV_ARG_DECL
         ) const;
-      
+
       virtual void _tao_decode (
           TAO_InputCDR &
           ACE_ENV_ARG_DECL
         );
-      
+
       // TAO_IDL - Generated from
       // be\be_visitor_exception/exception_ch.cpp:127
     };
 
 #endif /* end #if !defined */
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_DYNAMICANY_DYNANY_TYPEMISMATCH_CH_)
 #define _DYNAMICANY_DYNANY_TYPEMISMATCH_CH_
-    
+
     class TAO_DynamicAny_Export TypeMismatch : public CORBA::UserException
     {
     public:
-      
+
       TypeMismatch (void);
       TypeMismatch (const TypeMismatch &);
       ~TypeMismatch (void);
 
       TypeMismatch &operator= (const TypeMismatch &);
-      
+
       static TypeMismatch *_downcast (CORBA::Exception *);
       static const TypeMismatch *_downcast (CORBA::Exception const *);
-      
+
       static CORBA::Exception *_alloc (void);
-      
+
       virtual CORBA::Exception *_tao_duplicate (void) const;
 
       virtual void _raise (void) const;
@@ -208,31 +208,31 @@ namespace DynamicAny
           TAO_OutputCDR &
           ACE_ENV_ARG_DECL
         ) const;
-      
+
       virtual void _tao_decode (
           TAO_InputCDR &
           ACE_ENV_ARG_DECL
         );
-      
+
       // TAO_IDL - Generated from
       // be\be_visitor_exception/exception_ch.cpp:127
     };
 
 #endif /* end #if !defined */
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::TypeCode_ptr type (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void assign (
         ::DynamicAny::DynAny_ptr dyn_any
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -241,10 +241,10 @@ namespace DynamicAny
         CORBA::SystemException,
         ::DynamicAny::DynAny::TypeMismatch
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void from_any (
         const ::CORBA::Any & value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -254,20 +254,20 @@ namespace DynamicAny
         ::DynamicAny::DynAny::TypeMismatch,
         ::DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::Any * to_any (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::Boolean equal (
         ::DynamicAny::DynAny_ptr dyn_any
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -275,30 +275,30 @@ namespace DynamicAny
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void destroy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::DynamicAny::DynAny_ptr copy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void insert_boolean (
         ::CORBA::Boolean value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -308,10 +308,10 @@ namespace DynamicAny
         ::DynamicAny::DynAny::TypeMismatch,
         ::DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void insert_octet (
         ::CORBA::Octet value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -321,10 +321,10 @@ namespace DynamicAny
         ::DynamicAny::DynAny::TypeMismatch,
         ::DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void insert_char (
         ::CORBA::Char value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -334,10 +334,10 @@ namespace DynamicAny
         ::DynamicAny::DynAny::TypeMismatch,
         ::DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void insert_short (
         ::CORBA::Short value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -347,10 +347,10 @@ namespace DynamicAny
         ::DynamicAny::DynAny::TypeMismatch,
         ::DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void insert_ushort (
         ::CORBA::UShort value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -360,10 +360,10 @@ namespace DynamicAny
         ::DynamicAny::DynAny::TypeMismatch,
         ::DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void insert_long (
         ::CORBA::Long value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -373,10 +373,10 @@ namespace DynamicAny
         ::DynamicAny::DynAny::TypeMismatch,
         ::DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void insert_ulong (
         ::CORBA::ULong value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -386,10 +386,10 @@ namespace DynamicAny
         ::DynamicAny::DynAny::TypeMismatch,
         ::DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void insert_float (
         ::CORBA::Float value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -399,10 +399,10 @@ namespace DynamicAny
         ::DynamicAny::DynAny::TypeMismatch,
         ::DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void insert_double (
         ::CORBA::Double value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -412,10 +412,10 @@ namespace DynamicAny
         ::DynamicAny::DynAny::TypeMismatch,
         ::DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void insert_string (
         const char * value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -425,10 +425,10 @@ namespace DynamicAny
         ::DynamicAny::DynAny::TypeMismatch,
         ::DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void insert_reference (
         ::CORBA::Object_ptr value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -438,10 +438,10 @@ namespace DynamicAny
         ::DynamicAny::DynAny::TypeMismatch,
         ::DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void insert_typecode (
         ::CORBA::TypeCode_ptr value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -451,10 +451,10 @@ namespace DynamicAny
         ::DynamicAny::DynAny::TypeMismatch,
         ::DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void insert_longlong (
         ::CORBA::LongLong value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -464,10 +464,10 @@ namespace DynamicAny
         ::DynamicAny::DynAny::TypeMismatch,
         ::DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void insert_ulonglong (
         ::CORBA::ULongLong value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -477,10 +477,10 @@ namespace DynamicAny
         ::DynamicAny::DynAny::TypeMismatch,
         ::DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void insert_longdouble (
         ::CORBA::LongDouble value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -490,10 +490,10 @@ namespace DynamicAny
         ::DynamicAny::DynAny::TypeMismatch,
         ::DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void insert_wchar (
         ::CORBA::WChar value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -503,10 +503,10 @@ namespace DynamicAny
         ::DynamicAny::DynAny::TypeMismatch,
         ::DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void insert_wstring (
         const CORBA::WChar * value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -516,10 +516,10 @@ namespace DynamicAny
         ::DynamicAny::DynAny::TypeMismatch,
         ::DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void insert_any (
         const ::CORBA::Any & value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -529,10 +529,10 @@ namespace DynamicAny
         ::DynamicAny::DynAny::TypeMismatch,
         ::DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void insert_dyn_any (
         ::DynamicAny::DynAny_ptr value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -542,10 +542,10 @@ namespace DynamicAny
         ::DynamicAny::DynAny::TypeMismatch,
         ::DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void insert_val (
         ::CORBA::ValueBase * value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -555,10 +555,10 @@ namespace DynamicAny
         ::DynamicAny::DynAny::TypeMismatch,
         ::DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::Boolean get_boolean (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
@@ -567,10 +567,10 @@ namespace DynamicAny
         ::DynamicAny::DynAny::TypeMismatch,
         ::DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::Octet get_octet (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
@@ -579,10 +579,10 @@ namespace DynamicAny
         ::DynamicAny::DynAny::TypeMismatch,
         ::DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::Char get_char (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
@@ -591,10 +591,10 @@ namespace DynamicAny
         ::DynamicAny::DynAny::TypeMismatch,
         ::DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::Short get_short (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
@@ -603,10 +603,10 @@ namespace DynamicAny
         ::DynamicAny::DynAny::TypeMismatch,
         ::DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::UShort get_ushort (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
@@ -615,10 +615,10 @@ namespace DynamicAny
         ::DynamicAny::DynAny::TypeMismatch,
         ::DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::Long get_long (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
@@ -627,10 +627,10 @@ namespace DynamicAny
         ::DynamicAny::DynAny::TypeMismatch,
         ::DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::ULong get_ulong (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
@@ -639,10 +639,10 @@ namespace DynamicAny
         ::DynamicAny::DynAny::TypeMismatch,
         ::DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::Float get_float (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
@@ -651,10 +651,10 @@ namespace DynamicAny
         ::DynamicAny::DynAny::TypeMismatch,
         ::DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::Double get_double (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
@@ -663,10 +663,10 @@ namespace DynamicAny
         ::DynamicAny::DynAny::TypeMismatch,
         ::DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual char * get_string (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
@@ -675,10 +675,10 @@ namespace DynamicAny
         ::DynamicAny::DynAny::TypeMismatch,
         ::DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::Object_ptr get_reference (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
@@ -687,10 +687,10 @@ namespace DynamicAny
         ::DynamicAny::DynAny::TypeMismatch,
         ::DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::TypeCode_ptr get_typecode (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
@@ -699,10 +699,10 @@ namespace DynamicAny
         ::DynamicAny::DynAny::TypeMismatch,
         ::DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::LongLong get_longlong (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
@@ -711,10 +711,10 @@ namespace DynamicAny
         ::DynamicAny::DynAny::TypeMismatch,
         ::DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::ULongLong get_ulonglong (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
@@ -723,10 +723,10 @@ namespace DynamicAny
         ::DynamicAny::DynAny::TypeMismatch,
         ::DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::LongDouble get_longdouble (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
@@ -735,10 +735,10 @@ namespace DynamicAny
         ::DynamicAny::DynAny::TypeMismatch,
         ::DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::WChar get_wchar (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
@@ -747,10 +747,10 @@ namespace DynamicAny
         ::DynamicAny::DynAny::TypeMismatch,
         ::DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::WChar * get_wstring (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
@@ -759,10 +759,10 @@ namespace DynamicAny
         ::DynamicAny::DynAny::TypeMismatch,
         ::DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::Any * get_any (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
@@ -771,10 +771,10 @@ namespace DynamicAny
         ::DynamicAny::DynAny::TypeMismatch,
         ::DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::DynamicAny::DynAny_ptr get_dyn_any (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
@@ -783,10 +783,10 @@ namespace DynamicAny
         ::DynamicAny::DynAny::TypeMismatch,
         ::DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::ValueBase * get_val (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
@@ -795,10 +795,10 @@ namespace DynamicAny
         ::DynamicAny::DynAny::TypeMismatch,
         ::DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::Boolean seek (
         ::CORBA::Long index
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -806,40 +806,40 @@ namespace DynamicAny
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void rewind (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::Boolean next (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::ULong component_count (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::DynamicAny::DynAny_ptr current_component (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
@@ -847,48 +847,48 @@ namespace DynamicAny
         CORBA::SystemException,
         ::DynamicAny::DynAny::TypeMismatch
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
-    
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
+
   protected:
     // Abstract or local interface only.
     DynAny (void);
-    
+
     virtual ~DynAny (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     DynAny (const DynAny &);
-    
+
     void operator= (const DynAny &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_DYNAMICANY_DYNFIXED__VAR_OUT_CH_)
 #define _DYNAMICANY_DYNFIXED__VAR_OUT_CH_
-  
+
   class DynFixed;
   typedef DynFixed *DynFixed_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         DynFixed
       >
     DynFixed_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         DynFixed
@@ -896,55 +896,55 @@ namespace DynamicAny
     DynFixed_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_DYNAMICANY_DYNFIXED_CH_)
 #define _DYNAMICANY_DYNFIXED_CH_
-  
+
   class TAO_DynamicAny_Export DynFixed
     : public virtual ::DynamicAny::DynAny
   {
   public:
     typedef DynFixed_ptr _ptr_type;
     typedef DynFixed_var _var_type;
-    
+
     // The static operations.
     static DynFixed_ptr _duplicate (DynFixed_ptr obj);
-    
+
     static void _tao_release (DynFixed_ptr obj);
-    
+
     static DynFixed_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static DynFixed_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static DynFixed_ptr _nil (void)
     {
       return static_cast<DynFixed_ptr> (0);
     }
-    
-    
-    
+
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual char * get_value (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::Boolean set_value (
         const char * val
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -954,48 +954,48 @@ namespace DynamicAny
         ::DynamicAny::DynAny::TypeMismatch,
         ::DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
-    
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
+
   protected:
     // Abstract or local interface only.
     DynFixed (void);
-    
+
     virtual ~DynFixed (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     DynFixed (const DynFixed &);
-    
+
     void operator= (const DynFixed &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_DYNAMICANY_DYNENUM__VAR_OUT_CH_)
 #define _DYNAMICANY_DYNENUM__VAR_OUT_CH_
-  
+
   class DynEnum;
   typedef DynEnum *DynEnum_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         DynEnum
       >
     DynEnum_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         DynEnum
@@ -1003,55 +1003,55 @@ namespace DynamicAny
     DynEnum_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_DYNAMICANY_DYNENUM_CH_)
 #define _DYNAMICANY_DYNENUM_CH_
-  
+
   class TAO_DynamicAny_Export DynEnum
     : public virtual ::DynamicAny::DynAny
   {
   public:
     typedef DynEnum_ptr _ptr_type;
     typedef DynEnum_var _var_type;
-    
+
     // The static operations.
     static DynEnum_ptr _duplicate (DynEnum_ptr obj);
-    
+
     static void _tao_release (DynEnum_ptr obj);
-    
+
     static DynEnum_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static DynEnum_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static DynEnum_ptr _nil (void)
     {
       return static_cast<DynEnum_ptr> (0);
     }
-    
-    
-    
+
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual char * get_as_string (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void set_as_string (
         const char * value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1060,20 +1060,20 @@ namespace DynamicAny
         CORBA::SystemException,
         ::DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::ULong get_as_ulong (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void set_as_ulong (
         ::CORBA::ULong value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1082,85 +1082,85 @@ namespace DynamicAny
         CORBA::SystemException,
         ::DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
-    
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
+
   protected:
     // Abstract or local interface only.
     DynEnum (void);
-    
+
     virtual ~DynEnum (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     DynEnum (const DynEnum &);
-    
+
     void operator= (const DynEnum &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typedef/typedef_ch.cpp:413
-  
+
   typedef char * FieldName;
   typedef CORBA::String_var FieldName_var;
   typedef CORBA::String_out FieldName_out;
-  
+
   // TAO_IDL - Generated from
   // be\be_type.cpp:258
-  
+
   struct NameValuePair;
-  
+
   typedef
     TAO_Var_Var_T<
         NameValuePair
       >
     NameValuePair_var;
-  
+
   typedef
     TAO_Out_T<
         NameValuePair,
         NameValuePair_var
       >
     NameValuePair_out;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_structure/structure_ch.cpp:52
-  
+
   struct TAO_DynamicAny_Export NameValuePair
   {
     typedef NameValuePair_var _var_type;
-    
-    
+
+
     TAO_String_Manager id;
     CORBA::Any value;
   };
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_DYNAMICANY_NAMEVALUEPAIRSEQ_CH_)
 #define _DYNAMICANY_NAMEVALUEPAIRSEQ_CH_
-  
+
   class NameValuePairSeq;
-  
+
   typedef
     TAO_VarSeq_Var_T<
         NameValuePairSeq,
         NameValuePair
       >
     NameValuePairSeq_var;
-  
+
   typedef
     TAO_Seq_Out_T<
         NameValuePairSeq,
@@ -1168,7 +1168,7 @@ namespace DynamicAny
         NameValuePair
       >
     NameValuePairSeq_out;
-  
+
   class TAO_DynamicAny_Export NameValuePairSeq
     : public
         TAO_Unbounded_Sequence<
@@ -1181,62 +1181,62 @@ namespace DynamicAny
     NameValuePairSeq (
         CORBA::ULong max,
         CORBA::ULong length,
-        NameValuePair* buffer, 
+        NameValuePair* buffer,
         CORBA::Boolean release = 0
       );
     NameValuePairSeq (const NameValuePairSeq &);
     ~NameValuePairSeq (void);
-    
+
     typedef NameValuePairSeq_var _var_type;
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_type.cpp:258
-  
+
   struct NameDynAnyPair;
-  
+
   typedef
     TAO_Var_Var_T<
         NameDynAnyPair
       >
     NameDynAnyPair_var;
-  
+
   typedef
     TAO_Out_T<
         NameDynAnyPair,
         NameDynAnyPair_var
       >
     NameDynAnyPair_out;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_structure/structure_ch.cpp:52
-  
+
   struct TAO_DynamicAny_Export NameDynAnyPair
   {
     typedef NameDynAnyPair_var _var_type;
-    
-    
+
+
     TAO_String_Manager id;
     DynamicAny::DynAny_var value;
   };
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_DYNAMICANY_NAMEDYNANYPAIRSEQ_CH_)
 #define _DYNAMICANY_NAMEDYNANYPAIRSEQ_CH_
-  
+
   class NameDynAnyPairSeq;
-  
+
   typedef
     TAO_VarSeq_Var_T<
         NameDynAnyPairSeq,
         NameDynAnyPair
       >
     NameDynAnyPairSeq_var;
-  
+
   typedef
     TAO_Seq_Out_T<
         NameDynAnyPairSeq,
@@ -1244,7 +1244,7 @@ namespace DynamicAny
         NameDynAnyPair
       >
     NameDynAnyPairSeq_out;
-  
+
   class TAO_DynamicAny_Export NameDynAnyPairSeq
     : public
         TAO_Unbounded_Sequence<
@@ -1257,32 +1257,32 @@ namespace DynamicAny
     NameDynAnyPairSeq (
         CORBA::ULong max,
         CORBA::ULong length,
-        NameDynAnyPair* buffer, 
+        NameDynAnyPair* buffer,
         CORBA::Boolean release = 0
       );
     NameDynAnyPairSeq (const NameDynAnyPairSeq &);
     ~NameDynAnyPairSeq (void);
-    
+
     typedef NameDynAnyPairSeq_var _var_type;
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_DYNAMICANY_DYNSTRUCT__VAR_OUT_CH_)
 #define _DYNAMICANY_DYNSTRUCT__VAR_OUT_CH_
-  
+
   class DynStruct;
   typedef DynStruct *DynStruct_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         DynStruct
       >
     DynStruct_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         DynStruct
@@ -1290,45 +1290,45 @@ namespace DynamicAny
     DynStruct_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_DYNAMICANY_DYNSTRUCT_CH_)
 #define _DYNAMICANY_DYNSTRUCT_CH_
-  
+
   class TAO_DynamicAny_Export DynStruct
     : public virtual ::DynamicAny::DynAny
   {
   public:
     typedef DynStruct_ptr _ptr_type;
     typedef DynStruct_var _var_type;
-    
+
     // The static operations.
     static DynStruct_ptr _duplicate (DynStruct_ptr obj);
-    
+
     static void _tao_release (DynStruct_ptr obj);
-    
+
     static DynStruct_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static DynStruct_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static DynStruct_ptr _nil (void)
     {
       return static_cast<DynStruct_ptr> (0);
     }
-    
-    
-    
+
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual char * current_member_name (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
@@ -1337,10 +1337,10 @@ namespace DynamicAny
         ::DynamicAny::DynAny::TypeMismatch,
         ::DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::TCKind current_member_kind (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
@@ -1349,20 +1349,20 @@ namespace DynamicAny
         ::DynamicAny::DynAny::TypeMismatch,
         ::DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::DynamicAny::NameValuePairSeq * get_members (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void set_members (
         const ::DynamicAny::NameValuePairSeq & value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1372,20 +1372,20 @@ namespace DynamicAny
         ::DynamicAny::DynAny::TypeMismatch,
         ::DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::DynamicAny::NameDynAnyPairSeq * get_members_as_dyn_any (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void set_members_as_dyn_any (
         const ::DynamicAny::NameDynAnyPairSeq & value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1395,48 +1395,48 @@ namespace DynamicAny
         ::DynamicAny::DynAny::TypeMismatch,
         ::DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
-    
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
+
   protected:
     // Abstract or local interface only.
     DynStruct (void);
-    
+
     virtual ~DynStruct (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     DynStruct (const DynStruct &);
-    
+
     void operator= (const DynStruct &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_DYNAMICANY_DYNUNION__VAR_OUT_CH_)
 #define _DYNAMICANY_DYNUNION__VAR_OUT_CH_
-  
+
   class DynUnion;
   typedef DynUnion *DynUnion_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         DynUnion
       >
     DynUnion_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         DynUnion
@@ -1444,55 +1444,55 @@ namespace DynamicAny
     DynUnion_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_DYNAMICANY_DYNUNION_CH_)
 #define _DYNAMICANY_DYNUNION_CH_
-  
+
   class TAO_DynamicAny_Export DynUnion
     : public virtual ::DynamicAny::DynAny
   {
   public:
     typedef DynUnion_ptr _ptr_type;
     typedef DynUnion_var _var_type;
-    
+
     // The static operations.
     static DynUnion_ptr _duplicate (DynUnion_ptr obj);
-    
+
     static void _tao_release (DynUnion_ptr obj);
-    
+
     static DynUnion_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static DynUnion_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static DynUnion_ptr _nil (void)
     {
       return static_cast<DynUnion_ptr> (0);
     }
-    
-    
-    
+
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::DynamicAny::DynAny_ptr get_discriminator (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void set_discriminator (
         ::DynamicAny::DynAny_ptr d
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1501,10 +1501,10 @@ namespace DynamicAny
         CORBA::SystemException,
         ::DynamicAny::DynAny::TypeMismatch
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void set_to_default_member (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
@@ -1512,10 +1512,10 @@ namespace DynamicAny
         CORBA::SystemException,
         ::DynamicAny::DynAny::TypeMismatch
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void set_to_no_active_member (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
@@ -1523,30 +1523,30 @@ namespace DynamicAny
         CORBA::SystemException,
         ::DynamicAny::DynAny::TypeMismatch
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::Boolean has_no_active_member (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::TCKind discriminator_kind (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::DynamicAny::DynAny_ptr member (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
@@ -1554,10 +1554,10 @@ namespace DynamicAny
         CORBA::SystemException,
         ::DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual char * member_name (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
@@ -1565,10 +1565,10 @@ namespace DynamicAny
         CORBA::SystemException,
         ::DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::TCKind member_kind (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
@@ -1576,48 +1576,48 @@ namespace DynamicAny
         CORBA::SystemException,
         ::DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
-    
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
+
   protected:
     // Abstract or local interface only.
     DynUnion (void);
-    
+
     virtual ~DynUnion (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     DynUnion (const DynUnion &);
-    
+
     void operator= (const DynUnion &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_DYNAMICANY_ANYSEQ_CH_)
 #define _DYNAMICANY_ANYSEQ_CH_
-  
+
   class AnySeq;
-  
+
   typedef
     TAO_VarSeq_Var_T<
         AnySeq,
         CORBA::Any
       >
     AnySeq_var;
-  
+
   typedef
     TAO_Seq_Out_T<
         AnySeq,
@@ -1625,7 +1625,7 @@ namespace DynamicAny
         CORBA::Any
       >
     AnySeq_out;
-  
+
   class TAO_DynamicAny_Export AnySeq
     : public
         TAO_Unbounded_Sequence<
@@ -1638,25 +1638,25 @@ namespace DynamicAny
     AnySeq (
         CORBA::ULong max,
         CORBA::ULong length,
-        CORBA::Any* buffer, 
+        CORBA::Any* buffer,
         CORBA::Boolean release = 0
       );
     AnySeq (const AnySeq &);
     ~AnySeq (void);
-    
+
     typedef AnySeq_var _var_type;
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_DYNAMICANY_DYNANYSEQ_CH_)
 #define _DYNAMICANY_DYNANYSEQ_CH_
-  
+
   class DynAnySeq;
-  
+
   typedef
     TAO_MngSeq_Var_T<
         DynAnySeq,
@@ -1666,7 +1666,7 @@ namespace DynamicAny
           >
       >
     DynAnySeq_var;
-  
+
   typedef
     TAO_MngSeq_Out_T<
         DynAnySeq,
@@ -1677,7 +1677,7 @@ namespace DynamicAny
           >
       >
     DynAnySeq_out;
-  
+
   class TAO_DynamicAny_Export DynAnySeq
     : public
         TAO_Unbounded_Object_Sequence<
@@ -1691,32 +1691,32 @@ namespace DynamicAny
     DynAnySeq (
         CORBA::ULong max,
         CORBA::ULong length,
-        DynAny_ptr* buffer, 
+        DynAny_ptr* buffer,
         CORBA::Boolean release = 0
       );
     DynAnySeq (const DynAnySeq &);
     ~DynAnySeq (void);
-    
+
     typedef DynAnySeq_var _var_type;
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_DYNAMICANY_DYNSEQUENCE__VAR_OUT_CH_)
 #define _DYNAMICANY_DYNSEQUENCE__VAR_OUT_CH_
-  
+
   class DynSequence;
   typedef DynSequence *DynSequence_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         DynSequence
       >
     DynSequence_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         DynSequence
@@ -1724,55 +1724,55 @@ namespace DynamicAny
     DynSequence_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_DYNAMICANY_DYNSEQUENCE_CH_)
 #define _DYNAMICANY_DYNSEQUENCE_CH_
-  
+
   class TAO_DynamicAny_Export DynSequence
     : public virtual ::DynamicAny::DynAny
   {
   public:
     typedef DynSequence_ptr _ptr_type;
     typedef DynSequence_var _var_type;
-    
+
     // The static operations.
     static DynSequence_ptr _duplicate (DynSequence_ptr obj);
-    
+
     static void _tao_release (DynSequence_ptr obj);
-    
+
     static DynSequence_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static DynSequence_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static DynSequence_ptr _nil (void)
     {
       return static_cast<DynSequence_ptr> (0);
     }
-    
-    
-    
+
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::ULong get_length (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void set_length (
         ::CORBA::ULong len
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1781,20 +1781,20 @@ namespace DynamicAny
         CORBA::SystemException,
         ::DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::DynamicAny::AnySeq * get_elements (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void set_elements (
         const ::DynamicAny::AnySeq & value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1804,20 +1804,20 @@ namespace DynamicAny
         ::DynamicAny::DynAny::TypeMismatch,
         ::DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::DynamicAny::DynAnySeq * get_elements_as_dyn_any (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void set_elements_as_dyn_any (
         const ::DynamicAny::DynAnySeq & value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1827,48 +1827,48 @@ namespace DynamicAny
         ::DynamicAny::DynAny::TypeMismatch,
         ::DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
-    
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
+
   protected:
     // Abstract or local interface only.
     DynSequence (void);
-    
+
     virtual ~DynSequence (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     DynSequence (const DynSequence &);
-    
+
     void operator= (const DynSequence &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_DYNAMICANY_DYNARRAY__VAR_OUT_CH_)
 #define _DYNAMICANY_DYNARRAY__VAR_OUT_CH_
-  
+
   class DynArray;
   typedef DynArray *DynArray_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         DynArray
       >
     DynArray_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         DynArray
@@ -1876,55 +1876,55 @@ namespace DynamicAny
     DynArray_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_DYNAMICANY_DYNARRAY_CH_)
 #define _DYNAMICANY_DYNARRAY_CH_
-  
+
   class TAO_DynamicAny_Export DynArray
     : public virtual ::DynamicAny::DynAny
   {
   public:
     typedef DynArray_ptr _ptr_type;
     typedef DynArray_var _var_type;
-    
+
     // The static operations.
     static DynArray_ptr _duplicate (DynArray_ptr obj);
-    
+
     static void _tao_release (DynArray_ptr obj);
-    
+
     static DynArray_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static DynArray_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static DynArray_ptr _nil (void)
     {
       return static_cast<DynArray_ptr> (0);
     }
-    
-    
-    
+
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::DynamicAny::AnySeq * get_elements (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void set_elements (
         const ::DynamicAny::AnySeq & value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1934,20 +1934,20 @@ namespace DynamicAny
         ::DynamicAny::DynAny::TypeMismatch,
         ::DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::DynamicAny::DynAnySeq * get_elements_as_dyn_any (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void set_elements_as_dyn_any (
         const ::DynamicAny::DynAnySeq & value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1957,48 +1957,48 @@ namespace DynamicAny
         ::DynamicAny::DynAny::TypeMismatch,
         ::DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
-    
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
+
   protected:
     // Abstract or local interface only.
     DynArray (void);
-    
+
     virtual ~DynArray (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     DynArray (const DynArray &);
-    
+
     void operator= (const DynArray &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_DYNAMICANY_DYNVALUE__VAR_OUT_CH_)
 #define _DYNAMICANY_DYNVALUE__VAR_OUT_CH_
-  
+
   class DynValue;
   typedef DynValue *DynValue_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         DynValue
       >
     DynValue_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         DynValue
@@ -2006,45 +2006,45 @@ namespace DynamicAny
     DynValue_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_DYNAMICANY_DYNVALUE_CH_)
 #define _DYNAMICANY_DYNVALUE_CH_
-  
+
   class TAO_DynamicAny_Export DynValue
     : public virtual ::DynamicAny::DynAny
   {
   public:
     typedef DynValue_ptr _ptr_type;
     typedef DynValue_var _var_type;
-    
+
     // The static operations.
     static DynValue_ptr _duplicate (DynValue_ptr obj);
-    
+
     static void _tao_release (DynValue_ptr obj);
-    
+
     static DynValue_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static DynValue_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static DynValue_ptr _nil (void)
     {
       return static_cast<DynValue_ptr> (0);
     }
-    
-    
-    
+
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual char * current_member_name (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
@@ -2053,10 +2053,10 @@ namespace DynamicAny
         ::DynamicAny::DynAny::TypeMismatch,
         ::DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::TCKind current_member_kind (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
@@ -2065,20 +2065,20 @@ namespace DynamicAny
         ::DynamicAny::DynAny::TypeMismatch,
         ::DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::DynamicAny::NameValuePairSeq * get_members (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void set_members (
         const ::DynamicAny::NameValuePairSeq & value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2088,20 +2088,20 @@ namespace DynamicAny
         ::DynamicAny::DynAny::TypeMismatch,
         ::DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::DynamicAny::NameDynAnyPairSeq * get_members_as_dyn_any (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void set_members_as_dyn_any (
         const ::DynamicAny::NameDynAnyPairSeq & value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2111,48 +2111,48 @@ namespace DynamicAny
         ::DynamicAny::DynAny::TypeMismatch,
         ::DynamicAny::DynAny::InvalidValue
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
-    
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
+
   protected:
     // Abstract or local interface only.
     DynValue (void);
-    
+
     virtual ~DynValue (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     DynValue (const DynValue &);
-    
+
     void operator= (const DynValue &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_DYNAMICANY_DYNANYFACTORY__VAR_OUT_CH_)
 #define _DYNAMICANY_DYNANYFACTORY__VAR_OUT_CH_
-  
+
   class DynAnyFactory;
   typedef DynAnyFactory *DynAnyFactory_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         DynAnyFactory
       >
     DynAnyFactory_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         DynAnyFactory
@@ -2160,63 +2160,63 @@ namespace DynamicAny
     DynAnyFactory_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_DYNAMICANY_DYNANYFACTORY_CH_)
 #define _DYNAMICANY_DYNANYFACTORY_CH_
-  
+
   class TAO_DynamicAny_Export DynAnyFactory
     : public virtual CORBA::Object
   {
   public:
     typedef DynAnyFactory_ptr _ptr_type;
     typedef DynAnyFactory_var _var_type;
-    
+
     // The static operations.
     static DynAnyFactory_ptr _duplicate (DynAnyFactory_ptr obj);
-    
+
     static void _tao_release (DynAnyFactory_ptr obj);
-    
+
     static DynAnyFactory_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static DynAnyFactory_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static DynAnyFactory_ptr _nil (void)
     {
       return static_cast<DynAnyFactory_ptr> (0);
     }
-    
-    
-    
+
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_exception/exception_ch.cpp:51
 
 #if !defined (_DYNAMICANY_DYNANYFACTORY_INCONSISTENTTYPECODE_CH_)
 #define _DYNAMICANY_DYNANYFACTORY_INCONSISTENTTYPECODE_CH_
-    
+
     class TAO_DynamicAny_Export InconsistentTypeCode : public CORBA::UserException
     {
     public:
-      
+
       InconsistentTypeCode (void);
       InconsistentTypeCode (const InconsistentTypeCode &);
       ~InconsistentTypeCode (void);
 
       InconsistentTypeCode &operator= (const InconsistentTypeCode &);
-      
+
       static InconsistentTypeCode *_downcast (CORBA::Exception *);
       static const InconsistentTypeCode *_downcast (CORBA::Exception const *);
-      
+
       static CORBA::Exception *_alloc (void);
-      
+
       virtual CORBA::Exception *_tao_duplicate (void) const;
 
       virtual void _raise (void) const;
@@ -2225,21 +2225,21 @@ namespace DynamicAny
           TAO_OutputCDR &
           ACE_ENV_ARG_DECL
         ) const;
-      
+
       virtual void _tao_decode (
           TAO_InputCDR &
           ACE_ENV_ARG_DECL
         );
-      
+
       // TAO_IDL - Generated from
       // be\be_visitor_exception/exception_ch.cpp:127
     };
 
 #endif /* end #if !defined */
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::DynamicAny::DynAny_ptr create_dyn_any (
         const ::CORBA::Any & value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2248,10 +2248,10 @@ namespace DynamicAny
         CORBA::SystemException,
         ::DynamicAny::DynAnyFactory::InconsistentTypeCode
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::DynamicAny::DynAny_ptr create_dyn_any_from_type_code (
         ::CORBA::TypeCode_ptr type
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2260,28 +2260,28 @@ namespace DynamicAny
         CORBA::SystemException,
         ::DynamicAny::DynAnyFactory::InconsistentTypeCode
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
-    
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
+
   protected:
     // Abstract or local interface only.
     DynAnyFactory (void);
-    
+
     virtual ~DynAnyFactory (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     DynAnyFactory (const DynAnyFactory &);
-    
+
     void operator= (const DynAnyFactory &);
   };
 
@@ -2301,7 +2301,7 @@ namespace TAO
 
 #if !defined (_DYNAMICANY_DYNANY__TRAITS_CH_)
 #define _DYNAMICANY_DYNANY__TRAITS_CH_
-  
+
   template<>
   struct TAO_DynamicAny_Export Objref_Traits< ::DynamicAny::DynAny>
   {
@@ -2322,7 +2322,7 @@ namespace TAO
 
 #if !defined (_DYNAMICANY_DYNFIXED__TRAITS_CH_)
 #define _DYNAMICANY_DYNFIXED__TRAITS_CH_
-  
+
   template<>
   struct TAO_DynamicAny_Export Objref_Traits< ::DynamicAny::DynFixed>
   {
@@ -2343,7 +2343,7 @@ namespace TAO
 
 #if !defined (_DYNAMICANY_DYNENUM__TRAITS_CH_)
 #define _DYNAMICANY_DYNENUM__TRAITS_CH_
-  
+
   template<>
   struct TAO_DynamicAny_Export Objref_Traits< ::DynamicAny::DynEnum>
   {
@@ -2364,7 +2364,7 @@ namespace TAO
 
 #if !defined (_DYNAMICANY_DYNSTRUCT__TRAITS_CH_)
 #define _DYNAMICANY_DYNSTRUCT__TRAITS_CH_
-  
+
   template<>
   struct TAO_DynamicAny_Export Objref_Traits< ::DynamicAny::DynStruct>
   {
@@ -2385,7 +2385,7 @@ namespace TAO
 
 #if !defined (_DYNAMICANY_DYNUNION__TRAITS_CH_)
 #define _DYNAMICANY_DYNUNION__TRAITS_CH_
-  
+
   template<>
   struct TAO_DynamicAny_Export Objref_Traits< ::DynamicAny::DynUnion>
   {
@@ -2406,7 +2406,7 @@ namespace TAO
 
 #if !defined (_DYNAMICANY_DYNSEQUENCE__TRAITS_CH_)
 #define _DYNAMICANY_DYNSEQUENCE__TRAITS_CH_
-  
+
   template<>
   struct TAO_DynamicAny_Export Objref_Traits< ::DynamicAny::DynSequence>
   {
@@ -2427,7 +2427,7 @@ namespace TAO
 
 #if !defined (_DYNAMICANY_DYNARRAY__TRAITS_CH_)
 #define _DYNAMICANY_DYNARRAY__TRAITS_CH_
-  
+
   template<>
   struct TAO_DynamicAny_Export Objref_Traits< ::DynamicAny::DynArray>
   {
@@ -2448,7 +2448,7 @@ namespace TAO
 
 #if !defined (_DYNAMICANY_DYNVALUE__TRAITS_CH_)
 #define _DYNAMICANY_DYNVALUE__TRAITS_CH_
-  
+
   template<>
   struct TAO_DynamicAny_Export Objref_Traits< ::DynamicAny::DynValue>
   {
@@ -2469,7 +2469,7 @@ namespace TAO
 
 #if !defined (_DYNAMICANY_DYNANYFACTORY__TRAITS_CH_)
 #define _DYNAMICANY_DYNANYFACTORY__TRAITS_CH_
-  
+
   template<>
   struct TAO_DynamicAny_Export Objref_Traits< ::DynamicAny::DynAnyFactory>
   {
diff --git a/TAO/tao/DynamicC.cpp b/TAO/tao/DynamicC.cpp
deleted file mode 100644
index 30656ccf787..00000000000
--- a/TAO/tao/DynamicC.cpp
+++ /dev/null
@@ -1,296 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:291
-
-
-#include "DynamicC.h"
-#include "tao/CDR.h"
-
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:70
-
-// Arg traits specializations.
-namespace TAO
-{
-}
-
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/sequence_cs.cpp:65
-
-#if !defined (_DYNAMIC_PARAMETERLIST_CS_)
-#define _DYNAMIC_PARAMETERLIST_CS_
-
-Dynamic::ParameterList::ParameterList (void)
-{}
-
-Dynamic::ParameterList::ParameterList (
-    CORBA::ULong max
-  )
-  : TAO_Unbounded_Sequence<
-        Dynamic::Parameter
-      >
-    (max)
-{}
-
-Dynamic::ParameterList::ParameterList (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    Dynamic::Parameter * buffer,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Sequence<
-        Dynamic::Parameter
-      >
-    (max, length, buffer, release)
-{}
-
-Dynamic::ParameterList::ParameterList (
-    const ParameterList &seq
-  )
-  : TAO_Unbounded_Sequence<
-        Dynamic::Parameter
-      >
-    (seq)
-{}
-
-Dynamic::ParameterList::~ParameterList (void)
-{}
-
-void Dynamic::ParameterList::_tao_any_destructor (
-    void * _tao_void_pointer
-  )
-{
-  ParameterList * _tao_tmp_pointer =
-    static_cast<ParameterList *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/sequence_cs.cpp:65
-
-#if !defined (_DYNAMIC_EXCEPTIONLIST_CS_)
-#define _DYNAMIC_EXCEPTIONLIST_CS_
-
-Dynamic::ExceptionList::ExceptionList (void)
-{}
-
-Dynamic::ExceptionList::ExceptionList (
-    CORBA::ULong max
-  )
-  : TAO_Unbounded_Pseudo_Sequence<
-        CORBA::TypeCode
-      >
-    (max)
-{}
-
-Dynamic::ExceptionList::ExceptionList (
-    CORBA::ULong max,
-    CORBA::ULong length,
-    CORBA::TypeCode_ptr * buffer,
-    CORBA::Boolean release
-  )
-  : TAO_Unbounded_Pseudo_Sequence<
-        CORBA::TypeCode
-      >
-    (max, length, buffer, release)
-{}
-
-Dynamic::ExceptionList::ExceptionList (
-    const ExceptionList &seq
-  )
-  : TAO_Unbounded_Pseudo_Sequence<
-        CORBA::TypeCode
-      >
-    (seq)
-{}
-
-Dynamic::ExceptionList::~ExceptionList (void)
-{}
-
-void Dynamic::ExceptionList::_tao_any_destructor (
-    void * _tao_void_pointer
-  )
-{
-  ExceptionList * _tao_tmp_pointer =
-    static_cast<ExceptionList *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-#endif /* end #if !defined */
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_cs.cpp:96
-
-#if !defined _TAO_CDR_OP_Dynamic_ParameterList_CPP_
-#define _TAO_CDR_OP_Dynamic_ParameterList_CPP_
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const Dynamic::ParameterList &_tao_sequence
-  )
-{
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm << _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
-  return false;
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    Dynamic::ParameterList &_tao_sequence
-  )
-{
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm >> _tao_sequence[i]);
-        }
-      
-      return _tao_marshal_flag;
-    
-    }
-  
-  return false;
-}
-
-#endif /* _TAO_CDR_OP_Dynamic_ParameterList_CPP_ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_cs.cpp:96
-
-#if !defined _TAO_CDR_OP_Dynamic_ExceptionList_CPP_
-#define _TAO_CDR_OP_Dynamic_ExceptionList_CPP_
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const Dynamic::ExceptionList &_tao_sequence
-  )
-{
-  const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
-  if (strm << _tao_seq_len)
-    {
-      // Encode all elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm << _tao_sequence[i].in ());
-        }
-      
-      return _tao_marshal_flag;
-    }
-  
-  return false;
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    Dynamic::ExceptionList &_tao_sequence
-  )
-{
-  CORBA::ULong _tao_seq_len;
-  
-  if (strm >> _tao_seq_len)
-    {
-      // Add a check to the length of the sequence
-      // to make sure it does not exceed the length
-      // of the stream. (See bug 58.)
-      if (_tao_seq_len > strm.length ())
-        {
-          return false;
-        }
-      
-      // Set the length of the sequence.
-      _tao_sequence.length (_tao_seq_len);
-      
-      // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
-        {
-          return true;
-        }
-      
-      // Retrieve all the elements.
-      CORBA::Boolean _tao_marshal_flag = true;
-      
-      for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
-        {
-          _tao_marshal_flag = (strm >> _tao_sequence[i].out ());
-        }
-      
-      return _tao_marshal_flag;
-    
-    }
-  
-  return false;
-}
-
-#endif /* _TAO_CDR_OP_Dynamic_ExceptionList_CPP_ */
diff --git a/TAO/tao/DynamicC.h b/TAO/tao/DynamicC.h
deleted file mode 100644
index c9e70f316ed..00000000000
--- a/TAO/tao/DynamicC.h
+++ /dev/null
@@ -1,288 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:153
-
-#ifndef _TAO_IDL_ORIG_DYNAMICC_H_
-#define _TAO_IDL_ORIG_DYNAMICC_H_
-
-#include /**/ "ace/pre.h"
-
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TAO_Export.h"
-#include "tao/ORB.h"
-#include "tao/Environment.h"
-#include "tao/TypeCode.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Sequence_T.h"
-#include "tao/Seq_Var_T.h"
-#include "tao/Seq_Out_T.h"
-
-#include "tao/Dynamic_ParameterC.h"
-#include "tao/StringSeqC.h"
-#include "tao/Typecode_typesC.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_Export
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
-
-namespace Dynamic
-{
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_sequence/sequence_ch.cpp:101
-
-#if !defined (_DYNAMIC_PARAMETERLIST_CH_)
-#define _DYNAMIC_PARAMETERLIST_CH_
-  
-  class ParameterList;
-  
-  typedef
-    TAO_VarSeq_Var_T<
-        ParameterList,
-        Parameter
-      >
-    ParameterList_var;
-  
-  typedef
-    TAO_Seq_Out_T<
-        ParameterList,
-        ParameterList_var,
-        Parameter
-      >
-    ParameterList_out;
-  
-  class TAO_Export ParameterList
-    : public
-        TAO_Unbounded_Sequence<
-            Parameter
-          >
-  {
-  public:
-    ParameterList (void);
-    ParameterList (CORBA::ULong max);
-    ParameterList (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        Parameter* buffer, 
-        CORBA::Boolean release = 0
-      );
-    ParameterList (const ParameterList &);
-    ~ParameterList (void);
-    
-    static void _tao_any_destructor (void *);
-    
-    typedef ParameterList_var _var_type;
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ParameterList;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typedef/typedef_ch.cpp:472
-  
-  typedef CORBA::StringSeq ContextList;
-  typedef CORBA::StringSeq_var ContextList_var;
-  typedef CORBA::StringSeq_out ContextList_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ContextList;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_sequence/sequence_ch.cpp:101
-
-#if !defined (_DYNAMIC_EXCEPTIONLIST_CH_)
-#define _DYNAMIC_EXCEPTIONLIST_CH_
-  
-  class ExceptionList;
-  
-  typedef
-    TAO_MngSeq_Var_T<
-        ExceptionList,
-        TAO_Pseudo_Object_Manager<
-            CORBA::TypeCode
-          >
-      >
-    ExceptionList_var;
-  
-  typedef
-    TAO_MngSeq_Out_T<
-        ExceptionList,
-        ExceptionList_var,
-        TAO_Pseudo_Object_Manager<
-            CORBA::TypeCode
-          >
-      >
-    ExceptionList_out;
-  
-  class TAO_Export ExceptionList
-    : public
-        TAO_Unbounded_Pseudo_Sequence<
-            CORBA::TypeCode
-          >
-  {
-  public:
-    ExceptionList (void);
-    ExceptionList (CORBA::ULong max);
-    ExceptionList (
-        CORBA::ULong max,
-        CORBA::ULong length,
-        CORBA::TypeCode_ptr* buffer, 
-        CORBA::Boolean release = 0
-      );
-    ExceptionList (const ExceptionList &);
-    ~ExceptionList (void);
-    
-    static void _tao_any_destructor (void *);
-    
-    typedef ExceptionList_var _var_type;
-  };
-
-#endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ExceptionList;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typedef/typedef_ch.cpp:472
-  
-  typedef CORBA::StringSeq RequestContext;
-  typedef CORBA::StringSeq_var RequestContext_var;
-  typedef CORBA::StringSeq_out RequestContext_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_RequestContext;
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
-
-} // module Dynamic
-
-// TAO_IDL - Generated from
-// be\be_visitor_traits.cpp:61
-
-// Traits specializations.
-namespace TAO
-{
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const Dynamic::ParameterList &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, Dynamic::ParameterList*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, Dynamic::ParameterList *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const Dynamic::ParameterList *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const Dynamic::ExceptionList &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, Dynamic::ExceptionList*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, Dynamic::ExceptionList *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const Dynamic::ExceptionList *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_ch.cpp:71
-
-#if !defined _TAO_CDR_OP_Dynamic_ParameterList_H_
-#define _TAO_CDR_OP_Dynamic_ParameterList_H_
-
-TAO_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const Dynamic::ParameterList &
-  );
-TAO_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    Dynamic::ParameterList &
-  );
-
-#endif /* _TAO_CDR_OP_Dynamic_ParameterList_H_ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/cdr_op_ch.cpp:71
-
-#if !defined _TAO_CDR_OP_Dynamic_ExceptionList_H_
-#define _TAO_CDR_OP_Dynamic_ExceptionList_H_
-
-TAO_Export CORBA::Boolean operator<< (
-    TAO_OutputCDR &,
-    const Dynamic::ExceptionList &
-  );
-TAO_Export CORBA::Boolean operator>> (
-    TAO_InputCDR &,
-    Dynamic::ExceptionList &
-  );
-
-#endif /* _TAO_CDR_OP_Dynamic_ExceptionList_H_ */
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
-
diff --git a/TAO/tao/DynamicInterface.mpc b/TAO/tao/DynamicInterface.mpc
index 3c5a4cd6488..ecb988813ac 100644
--- a/TAO/tao/DynamicInterface.mpc
+++ b/TAO/tao/DynamicInterface.mpc
@@ -8,7 +8,7 @@ project : taolib, core, messaging, minimum_corba {
   }
 
   Header_Files {
-    DynamicInterface 
+    DynamicInterface
   }
 
   Inline_Files {
@@ -26,6 +26,9 @@ project : taolib, core, messaging, minimum_corba {
   PIDL_Files {
   }
 
+  IDL_Files {
+  }
+
   Pkgconfig_Files {
     DynamicInterface/TAO_DynamicInterface.pc.in
   }
diff --git a/TAO/tao/DynamicInterface/Context.cpp b/TAO/tao/DynamicInterface/Context.cpp
index 96b5c1be43b..2e47f392f5f 100644
--- a/TAO/tao/DynamicInterface/Context.cpp
+++ b/TAO/tao/DynamicInterface/Context.cpp
@@ -4,7 +4,7 @@ ACE_RCSID (DynamicInterface,
            Context,
            "$Id$")
 
-#include "tao/TypeCode.h"
+#include "tao/AnyTypeCode/TypeCode.h"
 #include "tao/Environment.h"
 #include "tao/CORBA_String.h"
 #include "tao/SystemException.h"
diff --git a/TAO/tao/DynamicInterface/DII_Arguments.cpp b/TAO/tao/DynamicInterface/DII_Arguments.cpp
index f4f6941ad97..02b362ed53b 100644
--- a/TAO/tao/DynamicInterface/DII_Arguments.cpp
+++ b/TAO/tao/DynamicInterface/DII_Arguments.cpp
@@ -2,11 +2,11 @@
 
 #include "DII_Arguments.h"
 
-#include "tao/NVList.h"
-#include "tao/Any_Impl.h"
+#include "tao/AnyTypeCode/NVList.h"
+#include "tao/AnyTypeCode/Any_Impl.h"
 #include "tao/Exception.h"
 #include "tao/CDR.h"
-#include "tao/DynamicC.h"
+#include "tao/AnyTypeCode/DynamicC.h"
 
 ACE_RCSID (DynamicInterface,
            DII_Arguments,
@@ -44,7 +44,7 @@ namespace TAO
   }
 
   void
-  NamedValue_Argument::interceptor_result (CORBA::Any *any)
+  NamedValue_Argument::interceptor_value (CORBA::Any *any) const
   {
     (*any) <<= *this->x_->value ();
   }
diff --git a/TAO/tao/DynamicInterface/DII_Arguments.h b/TAO/tao/DynamicInterface/DII_Arguments.h
index b15ccca1a03..cf681244b44 100644
--- a/TAO/tao/DynamicInterface/DII_Arguments.h
+++ b/TAO/tao/DynamicInterface/DII_Arguments.h
@@ -42,14 +42,14 @@ namespace TAO
    *
    * @brief Class for the return value of a CORBA::(Server)Request.
    */
-  class NamedValue_Argument : public Argument
+  class NamedValue_Argument : public RetArgument
   {
   public:
     NamedValue_Argument (CORBA::NamedValue_ptr);
 
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 
-    virtual void interceptor_result (CORBA::Any *);
+    virtual void interceptor_value (CORBA::Any *any) const;
 
     int byte_order (void) const;
 
@@ -65,13 +65,13 @@ namespace TAO
    *
    * @brief Class for the argument list of a CORBA::(Server)Request.
    */
-  class NVList_Argument : public Argument
+  class NVList_Argument : public InArgument
   {
   public:
     NVList_Argument (CORBA::NVList_ptr,
                      bool lazy_eval);
 
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
 
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 
diff --git a/TAO/tao/DynamicInterface/DII_Invocation.cpp b/TAO/tao/DynamicInterface/DII_Invocation.cpp
index 794f3b95271..f07ff022182 100644
--- a/TAO/tao/DynamicInterface/DII_Invocation.cpp
+++ b/TAO/tao/DynamicInterface/DII_Invocation.cpp
@@ -7,18 +7,21 @@
 #include "Request.h"
 #include "DII_Reply_Dispatcher.h"
 
-#include "tao/DynamicC.h"
-#include "tao/TypeCode.h"
+#include "tao/AnyTypeCode/DynamicC.h"
+#include "tao/AnyTypeCode/TypeCode.h"
 #include "tao/operation_details.h"
-#include "tao/RequestInfo_Util.h"
 #include "tao/Invocation_Utils.h"
 #include "tao/debug.h"
-#include "tao/Any_Unknown_IDL_Type.h"
+#include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h"
 #include "tao/Profile_Transport_Resolver.h"
 #include "tao/ORB_Constants.h"
 
 #include "ace/OS_NS_string.h"
 
+#if TAO_HAS_INTERCEPTORS == 1
+# include "tao/PI/RequestInfo_Util.h"
+#endif
+
 ACE_RCSID (DynamicInterface,
            DII_Invocation,
            "$Id$")
diff --git a/TAO/tao/DynamicInterface/Dynamic_Implementation.cpp b/TAO/tao/DynamicInterface/Dynamic_Implementation.cpp
index fccf4777bde..e8fa30d8e3f 100644
--- a/TAO/tao/DynamicInterface/Dynamic_Implementation.cpp
+++ b/TAO/tao/DynamicInterface/Dynamic_Implementation.cpp
@@ -98,7 +98,7 @@ TAO_DynamicImplementation::_create_stub (ACE_ENV_SINGLE_ARG_DECL)
   // exception. See the CORBA C++ mapping, section 1.38.3.
   TAO::Portable_Server::POA_Current_Impl *poa_current_impl =
     static_cast <TAO::Portable_Server::POA_Current_Impl *>
-                     (TAO_TSS_RESOURCES::instance ()->poa_current_impl_);
+                     (TAO_TSS_Resources::instance ()->poa_current_impl_);
 
   if (poa_current_impl == 0
       || this != poa_current_impl->servant ())
@@ -199,7 +199,7 @@ TAO_DynamicImplementation::get_id_from_primary_interface (
   // exception. See the CORBA C++ mapping, section 1.38.3.
   TAO::Portable_Server::POA_Current_Impl *poa_current_impl =
     static_cast <TAO::Portable_Server::POA_Current_Impl *>
-                     (TAO_TSS_RESOURCES::instance ()->poa_current_impl_);
+                     (TAO_TSS_Resources::instance ()->poa_current_impl_);
 
   if (poa_current_impl == 0
       || this != poa_current_impl->servant ())
diff --git a/TAO/tao/DynamicInterface/Dynamic_Implementation.h b/TAO/tao/DynamicInterface/Dynamic_Implementation.h
index 9c50fc9ce95..7e7ed6c0c67 100644
--- a/TAO/tao/DynamicInterface/Dynamic_Implementation.h
+++ b/TAO/tao/DynamicInterface/Dynamic_Implementation.h
@@ -39,17 +39,19 @@ namespace CORBA
   typedef ServerRequest *ServerRequest_ptr;
 }
 
+/**
+ * @class TAO_DynamicImplementation
+ *
+ * @brief Base class for DSI.
+ *
+ * It is expected that the <invoke> and <_primary_interface>
+ * methods will be only invoked by the POA in the context of
+ * serving a CORBA request. Invoking this method in other
+ * circumstances may lead to unpredictable results.
+ */
 class TAO_DynamicInterface_Export TAO_DynamicImplementation
   : public virtual TAO_ServantBase
 {
-  // = TITLE
-  //    Base class for DSI.
-  //
-  // = DESCRIPTION
-  //    It is expected that the <invoke> and <_primary_interface>
-  //    methods will be only invoked by the POA in the context of
-  //    serving a CORBA request. Invoking this method in other
-  //    circumstances may lead to unpredictable results.
 public:
   /// The invoke() method receives requests issued to any CORBA object
   /// incarnated by the DSI servant and performs the processing
diff --git a/TAO/tao/DynamicInterface/ExceptionList.cpp b/TAO/tao/DynamicInterface/ExceptionList.cpp
index 34445946608..38b90ffec8f 100644
--- a/TAO/tao/DynamicInterface/ExceptionList.cpp
+++ b/TAO/tao/DynamicInterface/ExceptionList.cpp
@@ -4,7 +4,7 @@ ACE_RCSID (DynamicInterface,
            ExceptionList,
            "$Id$")
 
-#include "tao/TypeCode.h"
+#include "tao/AnyTypeCode/TypeCode.h"
 #include "tao/Environment.h"
 #include "tao/SystemException.h"
 
diff --git a/TAO/tao/DynamicInterface/Request.cpp b/TAO/tao/DynamicInterface/Request.cpp
index c51c7b0f4f3..5e57536a687 100644
--- a/TAO/tao/DynamicInterface/Request.cpp
+++ b/TAO/tao/DynamicInterface/Request.cpp
@@ -10,10 +10,10 @@ ACE_RCSID (DynamicInterface,
 #include "DII_Arguments.h"
 #include "Context.h"
 
-#include "tao/NVList.h"
+#include "tao/AnyTypeCode/NVList.h"
 #include "tao/Object.h"
 #include "tao/Pluggable_Messaging_Utils.h"
-#include "tao/Any_Unknown_IDL_Type.h"
+#include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h"
 
 #include "ace/Log_Msg.h"
 #include "ace/OS_NS_string.h"
diff --git a/TAO/tao/DynamicInterface/Request.h b/TAO/tao/DynamicInterface/Request.h
index 3dad44d123a..32cf720983b 100644
--- a/TAO/tao/DynamicInterface/Request.h
+++ b/TAO/tao/DynamicInterface/Request.h
@@ -35,7 +35,7 @@
 #include "tao/Environment.h"
 #include "tao/Sequence.h"
 #include "tao/CDR.h"
-#include "tao/NVList.h"
+#include "tao/AnyTypeCode/NVList.h"
 
 #include "ace/SString.h"
 
diff --git a/TAO/tao/DynamicInterface/Server_Request.cpp b/TAO/tao/DynamicInterface/Server_Request.cpp
index 6bd85a21e5e..3a142008626 100644
--- a/TAO/tao/DynamicInterface/Server_Request.cpp
+++ b/TAO/tao/DynamicInterface/Server_Request.cpp
@@ -8,11 +8,11 @@ ACE_RCSID (DynamicInterface,
            Server_Request,
            "$Id$")
 
-#include "tao/NVList.h"
+#include "tao/AnyTypeCode/NVList.h"
 #include "tao/GIOP_Utils.h"
-#include "tao/Marshal.h"
-#include "tao/TypeCode.h"
-#include "tao/Any_Impl.h"
+#include "tao/AnyTypeCode/Marshal.h"
+#include "tao/AnyTypeCode/TypeCode.h"
+#include "tao/AnyTypeCode/Any_Impl.h"
 #include "tao/SystemException.h"
 
 #if !defined (__ACE_INLINE__)
diff --git a/TAO/tao/DynamicInterface/Unknown_User_Exception.cpp b/TAO/tao/DynamicInterface/Unknown_User_Exception.cpp
index 57107224f2c..bcc01200d6a 100644
--- a/TAO/tao/DynamicInterface/Unknown_User_Exception.cpp
+++ b/TAO/tao/DynamicInterface/Unknown_User_Exception.cpp
@@ -2,12 +2,12 @@
 
 #include "Unknown_User_Exception.h"
 
-#include "tao/Any.h"
+#include "tao/AnyTypeCode/Any.h"
 #include "tao/Environment.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Struct_Field.h"
-#include "tao/Struct_TypeCode_Static.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
+#include "tao/AnyTypeCode/TypeCode_Struct_Field.h"
+#include "tao/AnyTypeCode/Struct_TypeCode_Static.h"
 #include "tao/SystemException.h"
 
 #include "ace/OS_NS_string.h"
@@ -55,16 +55,6 @@ CORBA::UnknownUserException::exception (void)
   return *this->exception_;
 }
 
-int
-CORBA::UnknownUserException::_is_a (const char *interface_id) const
-{
-  return
-    ((ACE_OS::strcmp (interface_id,
-                      "IDL:omg.org/CORBA/UnknownUserException:1.0")
-        == 0)
-      || UserException::_is_a (interface_id));
-}
-
 CORBA::UnknownUserException *
 CORBA::UnknownUserException::_downcast (CORBA::Exception *ex)
 {
diff --git a/TAO/tao/DynamicInterface/Unknown_User_Exception.h b/TAO/tao/DynamicInterface/Unknown_User_Exception.h
index 91d06d3e7a0..1976000db16 100644
--- a/TAO/tao/DynamicInterface/Unknown_User_Exception.h
+++ b/TAO/tao/DynamicInterface/Unknown_User_Exception.h
@@ -89,9 +89,6 @@ namespace CORBA
 
     // = TAO specific extension.
 
-    /// Helper method to implement _downcast.
-    virtual int _is_a (const char *type_id) const;
-
     /// This class has a specific typecode.
     virtual CORBA::TypeCode_ptr _tao_type (void) const;
 
diff --git a/TAO/tao/Dynamic_Adapter.cpp b/TAO/tao/Dynamic_Adapter.cpp
index 4db3657cee7..b51e0008ca8 100644
--- a/TAO/tao/Dynamic_Adapter.cpp
+++ b/TAO/tao/Dynamic_Adapter.cpp
@@ -1,23 +1,12 @@
 // @(#) $Id$
 
 #include "tao/Dynamic_Adapter.h"
-#include "tao/ORB_Core.h"
-#include "ace/Dynamic_Service.h"
 
-ACE_RCSID (tao, 
-           Dynamic_Adapter, 
+ACE_RCSID (tao,
+           Dynamic_Adapter,
            "$Id$")
 
 TAO_Dynamic_Adapter::~TAO_Dynamic_Adapter (void)
 {
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class ACE_Dynamic_Service<TAO_Dynamic_Adapter>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_Dynamic_Service<TAO_Dynamic_Adapter>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/Dynamic_Parameter.pidl b/TAO/tao/Dynamic_Parameter.pidl
deleted file mode 100644
index f82dd8ba366..00000000000
--- a/TAO/tao/Dynamic_Parameter.pidl
+++ /dev/null
@@ -1,41 +0,0 @@
-// -*- IDL -*-
-
-// ================================================================
-/**
- *  @file   Dynamic_Parameter.pidl
- *
- * $Id$
- *
- *   This file was used to generate the code in Dynamic_ParameterC.* The command
- *   used to generate code is:
- *
- *     tao_idl
- *        -o orig -Ge 1 -GA -Sc -Sci
- *          -Wb,export_macro=TAO_Export
- *          -Wb,export_include="tao/TAO_Export.h"
- *          -Wb,pre_include="ace/pre.h"
- *          -Wb,post_include="ace/post.h"
- *          Dynamic_Parameter.pidl
- *
- */
-// ================================================================
-
-// File: Dynamic_Parameter.idl
-// Piece of module Dynamic generated separately for use by
-// template argument helper classes.
-
-#ifndef _DYNAMIC_PARAMETER_IDL_
-#define _DYNAMIC_PARAMETER_IDL_
-
-#include <ParameterMode.pidl>
-
-module Dynamic
-{
-  struct Parameter
-  {
-    any argument;
-    CORBA::ParameterMode mode;
-  };
-};
-
-#endif // _DYNAMIC_PARAMETER_IDL_
diff --git a/TAO/tao/Dynamic_ParameterA.cpp b/TAO/tao/Dynamic_ParameterA.cpp
deleted file mode 100644
index 672a92e1ed7..00000000000
--- a/TAO/tao/Dynamic_ParameterA.cpp
+++ /dev/null
@@ -1,123 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "Dynamic_ParameterC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Struct_TypeCode_Static.h"
-#include "tao/TypeCode_Struct_Field.h"
-#include "tao/Recursive_Type_TypeCode.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Dual_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/struct_typecode.cpp:87
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_Dynamic_Parameter[] =
-  {
-    { "argument", &CORBA::_tc_any },
-    { "mode", &CORBA::_tc_ParameterMode }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                      CORBA::TypeCode_ptr const *,
-                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
-                      TAO::Null_RefCount_Policy>
-  _tao_tc_Dynamic_Parameter (
-    CORBA::tk_struct,
-    "IDL:Dynamic/Parameter:1.0",
-    "Parameter",
-    _tao_fields_Dynamic_Parameter,
-    2);
-  
-namespace Dynamic
-{
-  ::CORBA::TypeCode_ptr const _tc_Parameter =
-    &_tao_tc_Dynamic_Parameter;
-}
-
-
-
-// TAO_IDL - Generated from 
-// be\be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const Dynamic::Parameter &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<Dynamic::Parameter>::insert_copy (
-      _tao_any,
-      Dynamic::Parameter::_tao_any_destructor,
-      Dynamic::_tc_Parameter,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    Dynamic::Parameter *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<Dynamic::Parameter>::insert (
-      _tao_any,
-      Dynamic::Parameter::_tao_any_destructor,
-      Dynamic::_tc_Parameter,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    Dynamic::Parameter *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const Dynamic::Parameter *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const Dynamic::Parameter *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<Dynamic::Parameter>::extract (
-        _tao_any,
-        Dynamic::Parameter::_tao_any_destructor,
-        Dynamic::_tc_Parameter,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/Dynamic_ParameterC.cpp b/TAO/tao/Dynamic_ParameterC.cpp
deleted file mode 100644
index b681433ed5e..00000000000
--- a/TAO/tao/Dynamic_ParameterC.cpp
+++ /dev/null
@@ -1,82 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:291
-
-
-#include "Dynamic_ParameterC.h"
-#include "tao/CDR.h"
-
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:70
-
-// Arg traits specializations.
-namespace TAO
-{
-}
-
-
-// TAO_IDL - Generated from 
-// be\be_visitor_structure/structure_cs.cpp:66
-
-void 
-Dynamic::Parameter::_tao_any_destructor (
-    void *_tao_void_pointer
-  )
-{
-  Parameter *_tao_tmp_pointer =
-    static_cast<Parameter *> (_tao_void_pointer);
-  delete _tao_tmp_pointer;
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/cdr_op_cs.cpp:61
-
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const Dynamic::Parameter &_tao_aggregate
-  )
-{
-  return
-    (strm << _tao_aggregate.argument) &&
-    (strm << _tao_aggregate.mode);
-}
-
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    Dynamic::Parameter &_tao_aggregate
-  )
-{
-  return
-    (strm >> _tao_aggregate.argument) &&
-    (strm >> _tao_aggregate.mode);
-}
diff --git a/TAO/tao/Dynamic_ParameterC.h b/TAO/tao/Dynamic_ParameterC.h
deleted file mode 100644
index bf19a801e48..00000000000
--- a/TAO/tao/Dynamic_ParameterC.h
+++ /dev/null
@@ -1,149 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:153
-
-#ifndef _TAO_IDL_ORIG_DYNAMIC_PARAMETERC_H_
-#define _TAO_IDL_ORIG_DYNAMIC_PARAMETERC_H_
-
-#include /**/ "ace/pre.h"
-
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TAO_Export.h"
-#include "tao/ORB.h"
-#include "tao/Environment.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Any.h"
-#include "tao/VarOut_T.h"
-
-#include "tao/ParameterModeC.h"
-
-#if defined (TAO_EXPORT_MACRO)
-#undef TAO_EXPORT_MACRO
-#endif
-#define TAO_EXPORT_MACRO TAO_Export
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
-
-namespace Dynamic
-{
-
-  // TAO_IDL - Generated from
-  // be\be_type.cpp:258
-
-  struct Parameter;
-
-  typedef
-    TAO_Var_Var_T<
-        Parameter
-      >
-    Parameter_var;
-
-  typedef
-    TAO_Out_T<
-        Parameter,
-        Parameter_var
-      >
-    Parameter_out;
-
-  // TAO_IDL - Generated from
-  // be\be_visitor_structure/structure_ch.cpp:52
-
-  struct TAO_Export Parameter
-  {
-    typedef Parameter_var _var_type;
-
-    static void _tao_any_destructor (void *);
-    CORBA::Any argument;
-    CORBA::ParameterMode mode;
-  };
-
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_Parameter;
-
-// TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
-
-} // module Dynamic
-
-// TAO_IDL - Generated from
-// be\be_visitor_traits.cpp:61
-
-// Traits specializations.
-namespace TAO
-{
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const Dynamic::Parameter &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, Dynamic::Parameter*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, Dynamic::Parameter *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const Dynamic::Parameter *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/cdr_op_ch.cpp:54
-
-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const Dynamic::Parameter &);
-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, Dynamic::Parameter &);
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* ifndef */
-
-
diff --git a/TAO/tao/Empty_Param_TypeCode.cpp b/TAO/tao/Empty_Param_TypeCode.cpp
deleted file mode 100644
index 6f9f5589c15..00000000000
--- a/TAO/tao/Empty_Param_TypeCode.cpp
+++ /dev/null
@@ -1,83 +0,0 @@
-// $Id$
-
-#include "Empty_Param_TypeCode.h"
-
-#ifndef __ACE_INLINE__
-# include "Empty_Param_TypeCode.inl"
-#endif  /* !__ACE_INLINE__ */
-
-
-ACE_RCSID (tao,
-           Empty_Param_TypeCode,
-           "$Id$")
-
-
-bool
-TAO::TypeCode::Empty_Param::tao_marshal (TAO_OutputCDR &,
-                                         CORBA::ULong) const
-{
-  // Empty parameter list.  Nothing to marshal.
-
-  return true;
-}
-
-void
-TAO::TypeCode::Empty_Param::tao_duplicate (void)
-{
-  // No-op since empty parameter TypeCodes are never created
-  // dynamically, meaning there is no need to implement reference
-  // counting.
-}
-
-void
-TAO::TypeCode::Empty_Param::tao_release (void)
-{
-  // No-op since empty parameter TypeCodes are never created
-  // dynamically, meaning there is no need to implement reference
-  // counting.
-}
-
-CORBA::Boolean
-TAO::TypeCode::Empty_Param::equal_i (CORBA::TypeCode_ptr
-                                     ACE_ENV_ARG_DECL_NOT_USED) const
-{
-  // Equality has already been established in the
-  // CORBA::TypeCode base class.
-
-  return 1;
-}
-
-CORBA::Boolean
-TAO::TypeCode::Empty_Param::equivalent_i (CORBA::TypeCode_ptr tc
-                                          ACE_ENV_ARG_DECL) const
-{
-  // We could refactor this code to the CORBA::TypeCode::equivalent()
-  // method but doing so would force us to determine the unaliased
-  // kind of this TypeCode.  Since we already know the unaliased kind
-  // of this TypeCode, choose to optimize away the additional kind
-  // unaliasing operation rather than save space.
-
-  CORBA::TCKind const tc_kind =
-    TAO::unaliased_kind (tc
-                         ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (tc_kind != this->kind_)
-    return 0;
-
-  return 1;
-}
-
-CORBA::TypeCode_ptr
-TAO::TypeCode::Empty_Param::get_compact_typecode_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  // Already compact since parameter list is empty.
-
-  // Since empty parameter TypeCodes are never created
-  // dynamically, there is no need to manipulate a reference count.
-
-  static TAO::TypeCode::Empty_Param compact_typecode (this->kind_);
-
-  return &compact_typecode;
-}
diff --git a/TAO/tao/Empty_Param_TypeCode.h b/TAO/tao/Empty_Param_TypeCode.h
deleted file mode 100644
index a45f9bea94a..00000000000
--- a/TAO/tao/Empty_Param_TypeCode.h
+++ /dev/null
@@ -1,98 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Empty_Param_TypeCode.h
- *
- *  $Id$
- *
- *  Header file for @c CORBA::TypeCodes with empty parameter lists.
- *
- *  @author Ossama Othman <ossama@dre.vanderbilt.edu>
- */
-//=============================================================================
-
-#ifndef TAO_EMPTY_PARAM_TYPECODE_H
-#define TAO_EMPTY_PARAM_TYPECODE_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/TypeCode.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-namespace TAO
-{
-  namespace TypeCode
-  {
-
-    /**
-     * @class Empty_Param
-     *
-     * @brief @c CORBA::TypeCode implementation for OMG IDL types with
-     *        empty parameter lists.
-     *
-     * This class implements a @c CORBA::TypeCode for OMG IDL types
-     * with empty parameter lists.
-     *
-     * @note @c Empty_Param @c TypeCodes are not reference counted in
-     *       TAO since they are static, exist as constants for the
-     *       length of a given OS process, and cannot be created
-     *       through the @c CORBA::ORB or @c CORBA::TypeCodeFactory
-     *       interfaces.
-     */
-    class Empty_Param : public CORBA::TypeCode
-    {
-    public:
-
-      /// Constructor.
-      Empty_Param (CORBA::TCKind k);
-
-      /**
-       * @name TAO-specific @c CORBA::TypeCode Methods
-       *
-       * Methods required by TAO's implementation of the
-       * @c CORBA::TypeCode class.
-       *
-       * @see @c CORBA::TypeCode
-       */
-      //@{
-      virtual bool tao_marshal (TAO_OutputCDR & cdr,
-                                CORBA::ULong offset) const;
-      virtual void tao_duplicate (void);
-      virtual void tao_release (void);
-      //@}
-
-    protected:
-
-      /**
-       * @name @c TAO CORBA::TypeCode Template Methods
-       *
-       * @c CORBA::TypeCode template methods specific to @c TypeCodes
-       * with empty parameter lists.
-       *
-       * @see @c CORBA::TypeCode
-       */
-      //@{
-      virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc
-                                      ACE_ENV_ARG_DECL) const;
-      virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc
-                                           ACE_ENV_ARG_DECL) const;
-      virtual CORBA::TypeCode_ptr get_compact_typecode_i (
-        ACE_ENV_SINGLE_ARG_DECL) const;
-
-    };
-
-  }  // End namespace TypeCode
-}  // End namespace TAO
-
-
-#ifdef __ACE_INLINE__
-# include "tao/Empty_Param_TypeCode.inl"
-#endif  /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_EMPTY_PARAM_TYPECODE_H */
diff --git a/TAO/tao/Empty_Param_TypeCode.inl b/TAO/tao/Empty_Param_TypeCode.inl
deleted file mode 100644
index 85ec45fd029..00000000000
--- a/TAO/tao/Empty_Param_TypeCode.inl
+++ /dev/null
@@ -1,10 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-
-ACE_INLINE
-TAO::TypeCode::Empty_Param::Empty_Param (CORBA::TCKind k)
-  : CORBA::TypeCode (k)
-{
-}
diff --git a/TAO/tao/Enum_TypeCode.cpp b/TAO/tao/Enum_TypeCode.cpp
deleted file mode 100644
index d7c3cd7d92a..00000000000
--- a/TAO/tao/Enum_TypeCode.cpp
+++ /dev/null
@@ -1,221 +0,0 @@
-// $Id$
-
-#ifndef TAO_ENUM_TYPECODE_CPP
-#define TAO_ENUM_TYPECODE_CPP
-
-#include "tao/Enum_TypeCode.h"
-#include "tao/TypeCode_Traits.h"
-#include "tao/TypeCodeFactory_Adapter.h"
-#include "tao/ORB_Core.h"
-#include "tao/CDR.h"
-
-#include "ace/Dynamic_Service.h"
-
-#ifndef __ACE_INLINE__
-# include "tao/Enum_TypeCode.inl"
-#endif  /* !__ACE_INLINE__ */
-
-
-template <typename StringType, class EnumeratorArrayType, class RefCountPolicy>
-bool
-TAO::TypeCode::Enum<StringType,
-                    EnumeratorArrayType,
-                    RefCountPolicy>::tao_marshal (TAO_OutputCDR & cdr,
-                                                  CORBA::ULong) const
-{
-  // A tk_enum TypeCode has a "complex" parameter list type (see
-  // Table 15-2 in Section 15.3.5.1 "TypeCode" in the CDR section of
-  // the CORBA specification), meaning that it must be marshaled into
-  // a CDR encapsulation.
-
-  // Create a CDR encapsulation.
-  TAO_OutputCDR enc;
-
-  bool const success =
-    (enc << TAO_OutputCDR::from_boolean (TAO_ENCAP_BYTE_ORDER))
-    && (enc << TAO_OutputCDR::from_string (this->base_attributes_.id (), 0))
-    && (enc << TAO_OutputCDR::from_string (this->base_attributes_.name (), 0))
-    && (enc << this->nenumerators_);
-
-  if (!success)
-    return false;
-
-  StringType const * const begin = &this->enumerators_[0];
-  StringType const * const end   = begin + this->nenumerators_;
-
-  for (StringType const * i = begin; i != end; ++i)
-    {
-      StringType const & enumerator = *i;
-
-      if (!(enc << TAO_OutputCDR::from_string (
-              Traits<StringType>::get_string (enumerator), 0)))
-        return false;
-    }
-
-  return
-    cdr << static_cast<CORBA::ULong> (enc.total_length ())
-    && cdr.write_octet_array_mb (enc.begin ());
-}
-
-template <typename StringType, class EnumeratorArrayType, class RefCountPolicy>
-void
-TAO::TypeCode::Enum<StringType,
-                    EnumeratorArrayType,
-                    RefCountPolicy>::tao_duplicate (void)
-{
-  this->RefCountPolicy::add_ref ();
-}
-
-template <typename StringType, class EnumeratorArrayType, class RefCountPolicy>
-void
-TAO::TypeCode::Enum<StringType,
-                    EnumeratorArrayType,
-                    RefCountPolicy>::tao_release (void)
-{
-  this->RefCountPolicy::remove_ref ();
-}
-
-template <typename StringType, class EnumeratorArrayType, class RefCountPolicy>
-CORBA::Boolean
-TAO::TypeCode::Enum<StringType,
-                    EnumeratorArrayType,
-                    RefCountPolicy>::equal_i (
-  CORBA::TypeCode_ptr tc
-  ACE_ENV_ARG_DECL) const
-{
-  // This call shouldn't throw since CORBA::TypeCode::equal() verified
-  // that the TCKind is the same as our's prior to invoking this
-  // method, meaning that member_count() is supported.
-
-  CORBA::ULong const tc_nenumerators =
-    tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (tc_nenumerators != this->nenumerators_)
-    return 0;
-
-  for (CORBA::ULong i = 0; i < this->nenumerators_; ++i)
-    {
-      StringType const & lhs_enumerator = this->enumerators_[i];
-
-      char const * const lhs_name =
-        Traits<StringType>::get_string (lhs_enumerator);
-      char const * const rhs_name = tc->member_name (i
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      if (ACE_OS::strcmp (lhs_name, rhs_name) != 0)
-        return 0;
-    }
-
-  return 1;
-}
-
-template <typename StringType, class EnumeratorArrayType, class RefCountPolicy>
-CORBA::Boolean
-TAO::TypeCode::Enum<StringType,
-                    EnumeratorArrayType,
-                    RefCountPolicy>::equivalent_i (
-  CORBA::TypeCode_ptr tc
-  ACE_ENV_ARG_DECL) const
-{
-  // Perform a structural comparison, excluding the name() and
-  // member_name() operations.
-
-  CORBA::ULong const tc_nenumerators =
-    tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (tc_nenumerators != this->nenumerators_)
-    return 0;
-
-  return 1;
-}
-
-template <typename StringType, class EnumeratorArrayType, class RefCountPolicy>
-CORBA::TypeCode_ptr
-TAO::TypeCode::Enum<StringType,
-                    EnumeratorArrayType,
-                    RefCountPolicy>::get_compact_typecode_i (
-  ACE_ENV_SINGLE_ARG_DECL) const
-{
-  ACE_Array_Base<CORBA::String_var> tc_enumerators (this->nenumerators_);
-
-  // Dynamically construct a new array of enumerators stripped of
-  // member names.
-
-  static char const empty_name[] = "";
-
-  for (CORBA::ULong i = 0; i < this->nenumerators_; ++i)
-    {
-      // Member names will be stripped, i.e. not embedded within
-      // the compact TypeCode.
-
-      tc_enumerators[i] = empty_name;
-    }
-
-  TAO_TypeCodeFactory_Adapter * adapter =
-    ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
-      TAO_ORB_Core::typecodefactory_adapter_name ());
-
-  if (adapter == 0)
-    {
-      ACE_THROW_RETURN (CORBA::INTERNAL (),
-                        CORBA::TypeCode::_nil ());
-    }
-
-  return
-    adapter->create_enum_tc (this->base_attributes_.id (),
-                             ""  /* empty name */,
-                             tc_enumerators,
-                             this->nenumerators_
-                             ACE_ENV_ARG_PARAMETER);
-}
-
-template <typename StringType, class EnumeratorArrayType, class RefCountPolicy>
-char const *
-TAO::TypeCode::Enum<StringType, EnumeratorArrayType, RefCountPolicy>::id_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  // Ownership is retained by the TypeCode, as required by the C++
-  // mapping.
-  return this->base_attributes_.id ();
-}
-
-template <typename StringType, class EnumeratorArrayType, class RefCountPolicy>
-char const *
-TAO::TypeCode::Enum<StringType, EnumeratorArrayType, RefCountPolicy>::name_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  // Ownership is retained by the TypeCode, as required by the C++
-  // mapping.
-  return this->base_attributes_.name ();
-}
-
-template <typename StringType, class EnumeratorArrayType, class RefCountPolicy>
-CORBA::ULong
-TAO::TypeCode::Enum<StringType,
-                    EnumeratorArrayType,
-                    RefCountPolicy>::member_count_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  return this->nenumerators_;
-}
-
-template <typename StringType, class EnumeratorArrayType, class RefCountPolicy>
-char const *
-TAO::TypeCode::Enum<StringType,
-                    EnumeratorArrayType,
-                    RefCountPolicy>::member_name_i (
-  CORBA::ULong index
-  ACE_ENV_ARG_DECL) const
-{
-  // Ownership is retained by the TypeCode, as required by the C++
-  // mapping.
-  if (index >= this->nenumerators_)
-    ACE_THROW_RETURN (CORBA::TypeCode::Bounds (), 0);
-
-  return Traits<StringType>::get_string (this->enumerators_[index]);
-}
-
-#endif  /* TAO_ENUM_TYPECODE_CPP */
diff --git a/TAO/tao/Enum_TypeCode.h b/TAO/tao/Enum_TypeCode.h
deleted file mode 100644
index 3a4b30076bc..00000000000
--- a/TAO/tao/Enum_TypeCode.h
+++ /dev/null
@@ -1,141 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Enum_TypeCode.h
- *
- *  $Id$
- *
- *  Header file for a @c tk_enum CORBA::TypeCode.
- *
- *  @author Ossama Othman <ossama@dre.vanderbilt.edu>
- */
-//=============================================================================
-
-#ifndef TAO_ENUM_TYPECODE_H
-#define TAO_ENUM_TYPECODE_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/TypeCode.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TypeCode_Base_Attributes.h"
-
-
-namespace TAO
-{
-  namespace TypeCode
-  {
-    /**
-     * @class Enum
-     *
-     * @brief @c CORBA::TypeCode implementation for an OMG IDL
-     *        @c enum.
-     *
-     * This class implements a @c CORBA::TypeCode for an OMG IDL
-     * @c enum.
-     */
-    template <typename StringType,
-              class EnumeratorArrayType,
-              class RefCountPolicy>
-    class Enum
-      : public CORBA::TypeCode,
-        private RefCountPolicy
-    {
-    public:
-
-      /// Constructor.
-      Enum (char const * id,
-            char const * name,
-            EnumeratorArrayType const & enumerators,
-            CORBA::ULong nenumerators);
-
-      /**
-       * @name TAO-specific @c CORBA::TypeCode Methods
-       *
-       * Methods required by TAO's implementation of the
-       * @c CORBA::TypeCode class.
-       *
-       * @see @c CORBA::TypeCode
-       */
-      //@{
-      virtual bool tao_marshal (TAO_OutputCDR & cdr,
-                                CORBA::ULong offset) const;
-      virtual void tao_duplicate (void);
-      virtual void tao_release (void);
-      //@}
-
-    protected:
-
-      /**
-       * @name @c TAO CORBA::TypeCode Template Methods
-       *
-       * @c tk_enum @c CORBA::TypeCode -specific template methods.
-       *
-       * @see @c CORBA::TypeCode
-       */
-      //@{
-      virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc
-                                      ACE_ENV_ARG_DECL) const;
-      virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc
-                                           ACE_ENV_ARG_DECL) const;
-      virtual CORBA::TypeCode_ptr get_compact_typecode_i (
-        ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual char const * id_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual char const * name_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual CORBA::ULong member_count_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual char const * member_name_i (CORBA::ULong index
-                                          ACE_ENV_ARG_DECL) const;
-      //@}
-
-    private:
-
-      /**
-       * @c Enum Attributes
-       *
-       * Attributes representing the structure of an OMG IDL
-       * @c enum.
-       *
-       * @note These attributes are declared in the order in which
-       *       they are marshaled into a CDR stream in order to
-       *       increase cache hits by improving spatial locality.
-       */
-      //@{
-
-      /// Base attributes containing repository ID and name of
-      /// structure type.
-      Base_Attributes<StringType> base_attributes_;
-
-      /// The number of enumerators in the OMG IDL enumeration.
-      CORBA::ULong const nenumerators_;
-
-      /// Array of @c TAO::TypeCode enumerators representing
-      /// enumerators in the OMG IDL defined @c enum.
-      EnumeratorArrayType const enumerators_;
-
-    };
-
-  }  // End namespace TypeCode
-}  // End namespace TAO
-
-
-#ifdef __ACE_INLINE__
-# include "tao/Enum_TypeCode.inl"
-#endif  /* __ACE_INLINE__ */
-
-#ifdef ACE_TEMPLATES_REQUIRE_SOURCE
-# include "tao/Enum_TypeCode.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#ifdef ACE_TEMPLATES_REQUIRE_PRAGMA
-# pragma implementation ("Enum_TypeCode.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_ENUM_TYPECODE_H */
diff --git a/TAO/tao/Enum_TypeCode.inl b/TAO/tao/Enum_TypeCode.inl
deleted file mode 100644
index 8b8e04f8632..00000000000
--- a/TAO/tao/Enum_TypeCode.inl
+++ /dev/null
@@ -1,21 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-
-template <typename StringType,
-          class EnumeratorArrayType,
-          class RefCountPolicy>
-ACE_INLINE
-TAO::TypeCode::Enum<StringType, EnumeratorArrayType, RefCountPolicy>::Enum (
-  char const * id,
-  char const * name,
-  EnumeratorArrayType const & enumerators,
-  CORBA::ULong nenumerators)
-  : CORBA::TypeCode (CORBA::tk_enum)
-  , RefCountPolicy ()
-  , base_attributes_ (id, name)
-  , nenumerators_ (nenumerators)
-  , enumerators_ (enumerators)
-{
-}
diff --git a/TAO/tao/Enum_TypeCode_Static.cpp b/TAO/tao/Enum_TypeCode_Static.cpp
deleted file mode 100644
index adda05c5985..00000000000
--- a/TAO/tao/Enum_TypeCode_Static.cpp
+++ /dev/null
@@ -1,214 +0,0 @@
-// $Id$
-
-#include "tao/Enum_TypeCode_Static.h"
-#include "tao/TypeCode_Traits.h"
-#include "tao/TypeCodeFactory_Adapter.h"
-#include "tao/ORB_Core.h"
-#include "tao/CDR.h"
-
-#include "ace/Dynamic_Service.h"
-
-#ifndef __ACE_INLINE__
-# include "tao/Enum_TypeCode_Static.inl"
-#endif  /* !__ACE_INLINE__ */
-
-
-ACE_RCSID (tao,
-           Enum_TypeCode_Static,
-           "$Id$")
-
-
-bool
-TAO::TypeCode::Enum<char const *,
-                    char const * const *,
-                    TAO::Null_RefCount_Policy>::tao_marshal (
-  TAO_OutputCDR & cdr,
-  CORBA::ULong) const
-{
-  // A tk_enum TypeCode has a "complex" parameter list type (see
-  // Table 15-2 in Section 15.3.5.1 "TypeCode" in the CDR section of
-  // the CORBA specification), meaning that it must be marshaled into
-  // a CDR encapsulation.
-
-  // Create a CDR encapsulation.
-  TAO_OutputCDR enc;
-
-  bool const success =
-    (enc << TAO_OutputCDR::from_boolean (TAO_ENCAP_BYTE_ORDER))
-    && (enc << TAO_OutputCDR::from_string (this->base_attributes_.id (), 0))
-    && (enc << TAO_OutputCDR::from_string (this->base_attributes_.name (), 0))
-    && (enc << this->nenumerators_);
-
-  if (!success)
-    return false;
-
-  char const * const * const begin = &this->enumerators_[0];
-  char const * const * const end   = begin + this->nenumerators_;
-
-  for (char const * const * i = begin; i != end; ++i)
-    {
-      char const * const & enumerator = *i;
-
-      if (!(enc << TAO_OutputCDR::from_string (
-              Traits<char const *>::get_string (enumerator), 0)))
-        return false;
-    }
-
-  return
-    cdr << static_cast<CORBA::ULong> (enc.total_length ())
-    && cdr.write_octet_array_mb (enc.begin ());
-}
-
-void
-TAO::TypeCode::Enum<char const *,
-                    char const * const *,
-                    TAO::Null_RefCount_Policy>::tao_duplicate (void)
-{
-}
-
-void
-TAO::TypeCode::Enum<char const *,
-                    char const * const *,
-                    TAO::Null_RefCount_Policy>::tao_release (void)
-{
-}
-
-CORBA::Boolean
-TAO::TypeCode::Enum<char const *,
-                    char const * const *,
-                    TAO::Null_RefCount_Policy>::equal_i (
-  CORBA::TypeCode_ptr tc
-  ACE_ENV_ARG_DECL) const
-{
-  // This call shouldn't throw since CORBA::TypeCode::equal() verified
-  // that the TCKind is the same as our's prior to invoking this
-  // method, meaning that member_count() is supported.
-
-  CORBA::ULong const tc_nenumerators =
-    tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (tc_nenumerators != this->nenumerators_)
-    return 0;
-
-  for (CORBA::ULong i = 0; i < this->nenumerators_; ++i)
-    {
-      char const * const & lhs_enumerator = this->enumerators_[i];
-
-      char const * const lhs_name =
-        Traits<char const *>::get_string (lhs_enumerator);
-      char const * const rhs_name = tc->member_name (i
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      if (ACE_OS::strcmp (lhs_name, rhs_name) != 0)
-        return 0;
-    }
-
-  return 1;
-}
-
-CORBA::Boolean
-TAO::TypeCode::Enum<char const *,
-                    char const * const *,
-                    TAO::Null_RefCount_Policy>::equivalent_i (
-  CORBA::TypeCode_ptr tc
-  ACE_ENV_ARG_DECL) const
-{
-  // Perform a structural comparison, excluding the name() and
-  // member_name() operations.
-
-  CORBA::ULong const tc_nenumerators =
-    tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (tc_nenumerators != this->nenumerators_)
-    return 0;
-
-  return 1;
-}
-
-CORBA::TypeCode_ptr
-TAO::TypeCode::Enum<char const *,
-                    char const * const *,
-                    TAO::Null_RefCount_Policy>::get_compact_typecode_i (
-  ACE_ENV_SINGLE_ARG_DECL) const
-{
-  ACE_Array_Base<CORBA::String_var> tc_enumerators (this->nenumerators_);
-
-  // Dynamically construct a new array of enumerators stripped of
-  // member names.
-
-  static char const empty_name[] = "";
-
-  for (CORBA::ULong i = 0; i < this->nenumerators_; ++i)
-    {
-      // Member names will be stripped, i.e. not embedded within
-      // the compact TypeCode.
-
-      tc_enumerators[i] = empty_name;
-    }
-
-  TAO_TypeCodeFactory_Adapter * adapter =
-    ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
-      TAO_ORB_Core::typecodefactory_adapter_name ());
-
-  if (adapter == 0)
-    {
-      ACE_THROW_RETURN (CORBA::INTERNAL (),
-                        CORBA::TypeCode::_nil ());
-    }
-
-  return
-    adapter->create_enum_tc (this->base_attributes_.id (),
-                             ""  /* empty name */,
-                             tc_enumerators,
-                             this->nenumerators_
-                             ACE_ENV_ARG_PARAMETER);
-}
-
-char const *
-TAO::TypeCode::Enum<char const *,
-                    char const * const *,
-                    TAO::Null_RefCount_Policy>::id_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  // Ownership is retained by the TypeCode, as required by the C++
-  // mapping.
-  return this->base_attributes_.id ();
-}
-
-char const *
-TAO::TypeCode::Enum<char const *,
-                    char const * const *,
-                    TAO::Null_RefCount_Policy>::name_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  // Ownership is retained by the TypeCode, as required by the C++
-  // mapping.
-  return this->base_attributes_.name ();
-}
-
-CORBA::ULong
-TAO::TypeCode::Enum<char const *,
-                    char const * const *,
-                    TAO::Null_RefCount_Policy>::member_count_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  return this->nenumerators_;
-}
-
-char const *
-TAO::TypeCode::Enum<char const *,
-                    char const * const *,
-                    TAO::Null_RefCount_Policy>::member_name_i (
-  CORBA::ULong index
-  ACE_ENV_ARG_DECL) const
-{
-  // Ownership is retained by the TypeCode, as required by the C++
-  // mapping.
-  if (index >= this->nenumerators_)
-    ACE_THROW_RETURN (CORBA::TypeCode::Bounds (), 0);
-
-  return Traits<char const *>::get_string (this->enumerators_[index]);
-}
diff --git a/TAO/tao/Enum_TypeCode_Static.h b/TAO/tao/Enum_TypeCode_Static.h
deleted file mode 100644
index fd1bf6f579a..00000000000
--- a/TAO/tao/Enum_TypeCode_Static.h
+++ /dev/null
@@ -1,137 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Enum_TypeCode_Static.h
- *
- *  $Id$
- *
- *  Header file for a static @c tk_enum CORBA::TypeCode.
- *
- *  @author Ossama Othman <ossama@dre.vanderbilt.edu>
- */
-//=============================================================================
-
-#ifndef TAO_ENUM_TYPECODE_STATIC_H
-#define TAO_ENUM_TYPECODE_STATIC_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/TypeCode.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TypeCode_Base_Attributes.h"
-#include "tao/Null_RefCount_Policy.h"
-
-
-namespace TAO
-{
-  namespace TypeCode
-  {
-    template <typename StringType,
-              class EnumeratorArrayType,
-              class RefCountPolicy> class Enum;
-
-    /**
-     * @class Enum
-     *
-     * @brief @c CORBA::TypeCode implementation for an OMG IDL
-     *        @c enum.
-     *
-     * This class implements a @c CORBA::TypeCode for an OMG IDL
-     * @c enum.
-     */
-    template<>
-    class TAO_Export Enum<char const *,
-                          char const * const *,
-                          TAO::Null_RefCount_Policy>
-      : public CORBA::TypeCode,
-        private TAO::Null_RefCount_Policy
-    {
-    public:
-
-      /// Constructor.
-      Enum (char const * id,
-            char const * name,
-            char const * const * enumerators,
-            CORBA::ULong nenumerators);
-
-      /**
-       * @name TAO-specific @c CORBA::TypeCode Methods
-       *
-       * Methods required by TAO's implementation of the
-       * @c CORBA::TypeCode class.
-       *
-       * @see @c CORBA::TypeCode
-       */
-      //@{
-      virtual bool tao_marshal (TAO_OutputCDR & cdr,
-                                CORBA::ULong offset) const;
-      virtual void tao_duplicate (void);
-      virtual void tao_release (void);
-      //@}
-
-    protected:
-
-      /**
-       * @name @c TAO CORBA::TypeCode Template Methods
-       *
-       * @c tk_enum @c CORBA::TypeCode -specific template methods.
-       *
-       * @see @c CORBA::TypeCode
-       */
-      //@{
-      virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc
-                                      ACE_ENV_ARG_DECL) const;
-      virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc
-                                           ACE_ENV_ARG_DECL) const;
-      virtual CORBA::TypeCode_ptr get_compact_typecode_i (
-        ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual char const * id_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual char const * name_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual CORBA::ULong member_count_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual char const * member_name_i (CORBA::ULong index
-                                          ACE_ENV_ARG_DECL) const;
-      //@}
-
-    private:
-
-      /**
-       * @c Enum Attributes
-       *
-       * Attributes representing the structure of an OMG IDL
-       * @c enum.
-       *
-       * @note These attributes are declared in the order in which
-       *       they are marshaled into a CDR stream in order to
-       *       increase cache hits by improving spatial locality.
-       */
-      //@{
-
-      /// Base attributes containing repository ID and name of
-      /// structure type.
-      Base_Attributes<char const *> base_attributes_;
-
-      /// The number of enumerators in the OMG IDL enumeration.
-      CORBA::ULong const nenumerators_;
-
-      /// Array of @c TAO::TypeCode enumerators representing
-      /// enumerators in the OMG IDL defined @c enum.
-      char const * const * const enumerators_;
-
-    };
-
-  }  // End namespace TypeCode
-}  // End namespace TAO
-
-
-#ifdef __ACE_INLINE__
-# include "tao/Enum_TypeCode_Static.inl"
-#endif  /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_ENUM_TYPECODE_STATIC_H */
diff --git a/TAO/tao/Enum_TypeCode_Static.inl b/TAO/tao/Enum_TypeCode_Static.inl
deleted file mode 100644
index 1d2ab5ca8cb..00000000000
--- a/TAO/tao/Enum_TypeCode_Static.inl
+++ /dev/null
@@ -1,20 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-
-ACE_INLINE
-TAO::TypeCode::Enum<char const *,
-                    char const * const *,
-                    TAO::Null_RefCount_Policy>::Enum (
-  char const * id,
-  char const * name,
-  char const * const * enumerators,
-  CORBA::ULong nenumerators)
-  : CORBA::TypeCode (CORBA::tk_enum)
-  , ACE_NESTED_CLASS (TAO, Null_RefCount_Policy) ()
-  , base_attributes_ (id, name)
-  , nenumerators_ (nenumerators)
-  , enumerators_ (enumerators)
-{
-}
diff --git a/TAO/tao/Exception.cpp b/TAO/tao/Exception.cpp
index 1f88e3ff36d..04fb03d6ca8 100644
--- a/TAO/tao/Exception.cpp
+++ b/TAO/tao/Exception.cpp
@@ -3,11 +3,7 @@
 #include "Exception.h"
 #include "SystemException.h"
 #include "Environment.h"
-#include "Any_SystemException.h"
-#include "Any_Dual_Impl_T.h"
-#include "TypeCode.h"
 #include "ORB_Constants.h"
-#include "TypeCode_Constants.h"
 #include "CORBA_String.h"
 #include "CDR.h"
 #include "debug.h"
@@ -90,21 +86,6 @@ CORBA::Exception::_name (void) const
   return this->name_.in ();
 }
 
-CORBA::TypeCode_ptr
-CORBA::Exception::_tao_type (void) const
-{
-  return CORBA::TypeCode::_nil ();
-}
-
-int
-CORBA::Exception::_is_a (const char* repository_id) const
-{
-  return ACE_OS::strcmp (repository_id,
-                         "IDL:omg.org/CORBA/Exception:1.0") == 0;
-}
-
-
-
 void
 CORBA::Exception::_tao_print_exception (const char *user_provided_info,
                                         FILE *) const
@@ -158,113 +139,3 @@ namespace CORBA
 
 #endif /* (ACE_LACKS_IOSTREAM_TOTALLY) */
 
-
-#if defined (TAO_DONT_CATCH_DOT_DOT_DOT)
-TAO_DONT_CATCH::TAO_DONT_CATCH (void)
-{}
-#endif /* TAO_DONT_CATCH_DOT_DOT_DOT */
-
-// Specializations for CORBA::Exception Any operators.
-namespace TAO
-{
-  template<>
-  void
-  Any_Dual_Impl_T<CORBA::Exception>::value (
-      const CORBA::Exception & val
-    )
-  {
-    this->value_ = val._tao_duplicate ();
-  }
-
-  template<>
-  CORBA::Boolean
-  Any_Dual_Impl_T<CORBA::Exception>::marshal_value (TAO_OutputCDR &cdr)
-  {
-    ACE_TRY_NEW_ENV
-      {
-        this->value_->_tao_encode (cdr
-                                   ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-
-        return 1;
-      }
-    ACE_CATCHANY
-      {
-      }
-    ACE_ENDTRY;
-
-    return 0;
-  }
-
-  template<>
-  CORBA::Boolean
-  Any_Dual_Impl_T<CORBA::Exception>::demarshal_value (TAO_InputCDR &cdr)
-  {
-    ACE_TRY_NEW_ENV
-      {
-        this->value_->_tao_decode (cdr
-                                   ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-
-        return 1;
-      }
-    ACE_CATCHANY
-      {
-      }
-    ACE_ENDTRY;
-
-    return 0;
-  }
-
-  // This should never get called since we don't have extraction operators
-  // for CORBA::Exception, but it is here to sidestep the constructor call
-  // in the unspecialized version that causes a problem with compilers that
-  // require explicit instantiation
-  template<>
-  CORBA::Boolean
-  Any_Dual_Impl_T<CORBA::Exception>::extract (
-      const CORBA::Any &,
-      _tao_destructor,
-      CORBA::TypeCode_ptr,
-      const CORBA::Exception *&
-    )
-  {
-    return 0;
-  }
-}
-
-// =======================================================================
-
-// Insertion of CORBA::Exception - copying.
-void
-operator<<= (CORBA::Any &any, const CORBA::Exception &exception)
-{
-  TAO::Any_Dual_Impl_T<CORBA::Exception>::insert_copy (
-      any,
-      CORBA::Exception::_tao_any_destructor,
-      exception._tao_type (),
-      exception
-    );
-}
-
-// Insertion of CORBA::Exception - non-copying.
-void
-operator<<= (CORBA::Any &any, CORBA::Exception *exception)
-{
-  TAO::Any_Dual_Impl_T<CORBA::Exception>::insert (
-      any,
-      CORBA::Exception::_tao_any_destructor,
-      exception->_tao_type (),
-      exception
-    );
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class TAO::Any_Dual_Impl_T<CORBA::Exception>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate TAO::Any_Dual_Impl_T<CORBA::Exception>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/Exception.h b/TAO/tao/Exception.h
index b25c539335d..3eba5fe9a48 100644
--- a/TAO/tao/Exception.h
+++ b/TAO/tao/Exception.h
@@ -136,10 +136,7 @@ namespace CORBA
     // = These are TAO-specific extensions.
 
     /// Will be overridden in the concrete derived classes.
-    virtual CORBA::TypeCode_ptr _tao_type (void) const;
-
-    // = To implement the narrow method.
-    virtual int _is_a (const char* repository_id) const;
+    virtual CORBA::TypeCode_ptr _tao_type (void) const = 0;
 
     /// Print the exception to output determined by @a f.
     /**
@@ -150,6 +147,9 @@ namespace CORBA
 
 #if defined (ACE_USES_WCHAR)
     /// ACE_WCHAR_T version of _tao_print_exception.
+    /**
+     * @note This method is TAO-specific.
+     */
     void _tao_print_exception (const ACE_WCHAR_T *info,
                                FILE *f = stdout) const;
 #endif  // ACE_USES_WCHAR
@@ -159,9 +159,10 @@ namespace CORBA
     virtual ACE_CString _info (void) const = 0;
 
     virtual void _tao_encode (TAO_OutputCDR &cdr
-                              ACE_ENV_ARG_DECL_NOT_USED) const = 0;
+                              ACE_ENV_ARG_DECL) const = 0;
+
     virtual void _tao_decode (TAO_InputCDR &cdr
-                              ACE_ENV_ARG_DECL_NOT_USED) = 0;
+                              ACE_ENV_ARG_DECL) = 0;
 
     /// Used in the non-copying Any insertion operator.
     static void _tao_any_destructor (void *);
@@ -178,7 +179,13 @@ namespace CORBA
      * public:
      *   virtual CORBA::Exception *_tao_duplicate (void) const
      *   {
-     *     return new SomeException (*this);
+     *     CORBA::Exception *result = 0;
+     *     ACE_NEW_RETURN (
+     *         result,
+     *         SomeException (*this),
+     *         0
+     *       );
+     *     return result;
      *   }
      * };
      * </PRE>
@@ -223,32 +230,9 @@ class TAO_Export TAO_Exceptions
 public:
 
   /// Create a CORBA::SystemException given the interface repository ID.
-  static CORBA::SystemException *create_system_exception (
-      const char *id
-      ACE_ENV_ARG_DECL
-    );
-
+  static CORBA::SystemException *create_system_exception (const char *id);
 };
 
-#if defined (TAO_DONT_CATCH_DOT_DOT_DOT)
-/**
- * @class TAO_DONT_CATCH
- *
- * @brief This class is only used internally in TAO as an exception
- * that never gets thrown.  Never use this class anywhere.
- *
- * @internal
- */
-class TAO_Export TAO_DONT_CATCH
-{
-public:
-  TAO_DONT_CATCH (void);
-};
-#endif /* TAO_DONT_CATCH_DOT_DOT_DOT */
-
-TAO_Export void operator<<= (CORBA::Any &, const CORBA::Exception &);
-TAO_Export void operator<<= (CORBA::Any &, CORBA::Exception *);
-
 #if defined (__ACE_INLINE__)
 # include "tao/Exception.i"
 #endif /* __ACE_INLINE__ */
diff --git a/TAO/tao/Fixed_Array_Argument_T.cpp b/TAO/tao/Fixed_Array_Argument_T.cpp
index 4d02a03d3bf..022a61356eb 100644
--- a/TAO/tao/Fixed_Array_Argument_T.cpp
+++ b/TAO/tao/Fixed_Array_Argument_T.cpp
@@ -4,7 +4,6 @@
 #define TAO_FIXED_ARRAY_ARGUMENT_T_C
 
 #include "tao/Fixed_Array_Argument_T.h"
-#include "tao/Dynamic_ParameterC.h"
 
 #if !defined (__ACE_INLINE__)
 #include "tao/Fixed_Array_Argument_T.inl"
@@ -14,9 +13,12 @@ ACE_RCSID (tao,
            Fixed_Array_Argument_T,
            "$Id$")
 
-template<typename S, typename S_slice, typename S_forany>
+template<typename S,
+         typename S_slice,
+         typename S_forany,
+         typename Insert_Policy>
 CORBA::Boolean
-TAO::In_Fixed_Array_Argument_T<S,S_slice,S_forany>::marshal (
+TAO::In_Fixed_Array_Argument_T<S,S_slice,S_forany,Insert_Policy>::marshal (
     TAO_OutputCDR & cdr
   )
 {
@@ -25,32 +27,39 @@ TAO::In_Fixed_Array_Argument_T<S,S_slice,S_forany>::marshal (
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S, typename S_slice, typename S_forany>
+template<typename S,
+         typename S_slice,
+         typename S_forany,
+         typename Insert_Policy>
 void
-TAO::In_Fixed_Array_Argument_T<S,S_slice,S_forany>::interceptor_param (
-    Dynamic::Parameter & p
-  )
+TAO::In_Fixed_Array_Argument_T<S,S_slice,S_forany,Insert_Policy>::interceptor_value (
+  CORBA::Any *any) const
 {
-  p.argument <<= this->x_;
-  p.mode = CORBA::PARAM_IN;
+  this->Insert_Policy::any_insert (any, this->x_);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // ===========================================================
 
-template<typename S, typename S_slice, typename S_forany>
+template<typename S,
+         typename S_slice,
+         typename S_forany,
+         typename Insert_Policy>
 CORBA::Boolean
-TAO::Inout_Fixed_Array_Argument_T<S,S_slice,S_forany>::marshal (
+TAO::Inout_Fixed_Array_Argument_T<S,S_slice,S_forany,Insert_Policy>::marshal (
     TAO_OutputCDR & cdr
   )
 {
   return cdr << this->x_;
 }
 
-template<typename S, typename S_slice, typename S_forany>
+template<typename S,
+         typename S_slice,
+         typename S_forany,
+         typename Insert_Policy>
 CORBA::Boolean
-TAO::Inout_Fixed_Array_Argument_T<S,S_slice,S_forany>::demarshal (
+TAO::Inout_Fixed_Array_Argument_T<S,S_slice,S_forany,Insert_Policy>::demarshal (
     TAO_InputCDR & cdr
   )
 {
@@ -59,23 +68,27 @@ TAO::Inout_Fixed_Array_Argument_T<S,S_slice,S_forany>::demarshal (
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S, typename S_slice, typename S_forany>
+template<typename S,
+         typename S_slice,
+         typename S_forany,
+         typename Insert_Policy>
 void
-TAO::Inout_Fixed_Array_Argument_T<S,S_slice,S_forany>::interceptor_param (
-    Dynamic::Parameter & p
-  )
+TAO::Inout_Fixed_Array_Argument_T<S,S_slice,S_forany,Insert_Policy>::interceptor_value (
+  CORBA::Any *any) const
 {
-  p.argument <<= this->x_;
-  p.mode = CORBA::PARAM_INOUT;
+  this->Insert_Policy::any_insert (any, this->x_);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // ==============================================================
 
-template<typename S, typename S_slice, typename S_forany>
+template<typename S,
+         typename S_slice,
+         typename S_forany,
+         typename Insert_Policy>
 CORBA::Boolean
-TAO::Out_Fixed_Array_Argument_T<S,S_slice,S_forany>::demarshal (
+TAO::Out_Fixed_Array_Argument_T<S,S_slice,S_forany,Insert_Policy>::demarshal (
     TAO_InputCDR & cdr
   )
 {
@@ -84,14 +97,15 @@ TAO::Out_Fixed_Array_Argument_T<S,S_slice,S_forany>::demarshal (
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S, typename S_slice, typename S_forany>
+template<typename S,
+         typename S_slice,
+         typename S_forany,
+         typename Insert_Policy>
 void
-TAO::Out_Fixed_Array_Argument_T<S,S_slice,S_forany>::interceptor_param (
-    Dynamic::Parameter & p
-  )
+TAO::Out_Fixed_Array_Argument_T<S,S_slice,S_forany,Insert_Policy>::interceptor_value (
+  CORBA::Any *any) const
 {
-  p.argument <<= this->x_;
-  p.mode = CORBA::PARAM_OUT;
+  this->Insert_Policy::any_insert (any, this->x_);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -102,9 +116,10 @@ template<typename S,
          typename S_slice,
          typename S_var,
          typename S_forany,
-         typename S_tag>
+         typename S_tag,
+         typename Insert_Policy>
 CORBA::Boolean
-TAO::Ret_Fixed_Array_Argument_T<S,S_slice,S_var,S_forany,S_tag>::demarshal (
+TAO::Ret_Fixed_Array_Argument_T<S,S_slice,S_var,S_forany,S_tag,Insert_Policy>::demarshal (
     TAO_InputCDR & cdr
   )
 {
@@ -124,12 +139,13 @@ template<typename S,
          typename S_slice,
          typename S_var,
          typename S_forany,
-         typename S_tag>
+         typename S_tag,
+         typename Insert_Policy>
 void
-TAO::Ret_Fixed_Array_Argument_T<S,S_slice,S_var,S_forany,S_tag>::
-interceptor_result (CORBA::Any * any)
+TAO::Ret_Fixed_Array_Argument_T<S,S_slice,S_var,S_forany,S_tag,Insert_Policy>::
+interceptor_value (CORBA::Any *any) const
 {
-  (*any) <<= S_forany (this->x_.ptr ());
+  this->Insert_Policy::any_insert (any, S_forany (this->x_.ptr ()));
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
diff --git a/TAO/tao/Fixed_Array_Argument_T.h b/TAO/tao/Fixed_Array_Argument_T.h
index bf3522022e5..2ff2f43976b 100644
--- a/TAO/tao/Fixed_Array_Argument_T.h
+++ b/TAO/tao/Fixed_Array_Argument_T.h
@@ -29,15 +29,18 @@ namespace TAO
    * @brief IN stub argument of fixed size element array.
    *
    */
-  template<typename S, typename S_slice, typename S_forany>
-  class In_Fixed_Array_Argument_T : public Argument
+  template<typename S,
+           typename S_slice,
+           typename S_forany,
+           typename Insert_Policy>
+  class In_Fixed_Array_Argument_T : public InArgument, private Insert_Policy
   {
   public:
     In_Fixed_Array_Argument_T (const S_slice * x);
 
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S_slice const * arg (void) const;
 
@@ -51,16 +54,19 @@ namespace TAO
    * @brief INOUT stub argument of fixed size element array.
    *
    */
-  template<typename S, typename S_slice, typename S_forany>
-  class Inout_Fixed_Array_Argument_T : public Argument
+  template<typename S,
+           typename S_slice,
+           typename S_forany,
+           typename Insert_Policy>
+  class Inout_Fixed_Array_Argument_T : public InoutArgument, private Insert_Policy
   {
   public:
     Inout_Fixed_Array_Argument_T (S_slice *&x);
 
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S_slice * arg (void);
 
@@ -74,15 +80,18 @@ namespace TAO
    * @brief OUT stub argument of fixed size element array.
    *
    */
-  template<typename S, typename S_slice, typename S_forany>
-  class Out_Fixed_Array_Argument_T : public Argument
+  template<typename S,
+           typename S_slice,
+           typename S_forany,
+           typename Insert_Policy>
+  class Out_Fixed_Array_Argument_T : public OutArgument, private Insert_Policy
   {
   public:
     Out_Fixed_Array_Argument_T (S_slice *& x);
 
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S_slice *& arg (void);
 
@@ -100,15 +109,16 @@ namespace TAO
            typename S_slice,
            typename S_var,
            typename S_forany,
-           typename S_tag>
-  class Ret_Fixed_Array_Argument_T : public Argument
+           typename S_tag,
+           typename Insert_Policy>
+  class Ret_Fixed_Array_Argument_T : public RetArgument, private Insert_Policy
   {
   public:
     Ret_Fixed_Array_Argument_T (void);
 
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_result (CORBA::Any *);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S_slice *& arg (void);
 
@@ -137,7 +147,8 @@ namespace TAO
            typename T_slice,
            typename T_var,
            typename T_forany,
-           typename T_tag>
+           typename T_tag,
+           typename Insert_Policy>
   struct Fixed_Array_Arg_Traits_T
   {
     typedef T_slice *                                   ret_type;
@@ -147,20 +158,24 @@ namespace TAO
 
     typedef In_Fixed_Array_Argument_T<T,
                                       T_slice,
-                                      T_forany>         in_arg_val;
+                                      T_forany,
+                                      Insert_Policy>         in_arg_val;
     typedef Inout_Fixed_Array_Argument_T<T,
                                          T_slice,
-                                         T_forany>      inout_arg_val;
+                                         T_forany,
+                                         Insert_Policy>      inout_arg_val;
     typedef Out_Fixed_Array_Argument_T<T,
                                        T_slice,
-                                       T_forany>        out_arg_val;
+                                       T_forany,
+                                       Insert_Policy>        out_arg_val;
     typedef Ret_Fixed_Array_Argument_T<T,
                                        T_slice,
                                        T_var,
                                        T_forany,
-                                       T_tag>           ret_val;
+                                       T_tag,
+                                       Insert_Policy>        ret_val;
 
-    typedef Fixed_Array_Tag                             idl_tag;
+    typedef Fixed_Array_Tag                                  idl_tag;
   };
 }
 
diff --git a/TAO/tao/Fixed_Array_Argument_T.inl b/TAO/tao/Fixed_Array_Argument_T.inl
index 0df9d5cee7d..de891a44bcd 100644
--- a/TAO/tao/Fixed_Array_Argument_T.inl
+++ b/TAO/tao/Fixed_Array_Argument_T.inl
@@ -4,9 +4,10 @@
 
 template<typename S,
          typename S_slice,
-         typename S_forany>
+         typename S_forany,
+         typename Insert_Policy>
 ACE_INLINE
-TAO::In_Fixed_Array_Argument_T<S,S_slice,S_forany>::
+TAO::In_Fixed_Array_Argument_T<S,S_slice,S_forany,Insert_Policy>::
 In_Fixed_Array_Argument_T (const S_slice * x)
   : x_ (
 #if (defined (_MSC_VER) && _MSC_VER <= 1200) || (defined (__IBMCPP__) && (__IBMCPP__ <= 600))
@@ -26,10 +27,11 @@ In_Fixed_Array_Argument_T (const S_slice * x)
 
 template<typename S,
          typename S_slice,
-         typename S_forany>
+         typename S_forany,
+         typename Insert_Policy>
 ACE_INLINE
 const S_slice *
-TAO::In_Fixed_Array_Argument_T<S,S_slice,S_forany>::arg (void) const
+TAO::In_Fixed_Array_Argument_T<S,S_slice,S_forany,Insert_Policy>::arg (void) const
 {
   return this->x_.in ();
 }
@@ -38,19 +40,21 @@ TAO::In_Fixed_Array_Argument_T<S,S_slice,S_forany>::arg (void) const
 
 template<typename S,
          typename S_slice,
-         typename S_forany>
+         typename S_forany,
+         typename Insert_Policy>
 ACE_INLINE
-TAO::Inout_Fixed_Array_Argument_T<S,S_slice,S_forany>::
+TAO::Inout_Fixed_Array_Argument_T<S,S_slice,S_forany,Insert_Policy>::
 Inout_Fixed_Array_Argument_T (S_slice *& x)
   : x_ (x)
 {}
 
 template<typename S,
          typename S_slice,
-         typename S_forany>
+         typename S_forany,
+         typename Insert_Policy>
 ACE_INLINE
 S_slice *
-TAO::Inout_Fixed_Array_Argument_T<S,S_slice,S_forany>::arg (void)
+TAO::Inout_Fixed_Array_Argument_T<S,S_slice,S_forany,Insert_Policy>::arg (void)
 {
   return this->x_.inout ();
 }
@@ -59,18 +63,20 @@ TAO::Inout_Fixed_Array_Argument_T<S,S_slice,S_forany>::arg (void)
 
 template<typename S,
          typename S_slice,
-         typename S_forany>
+         typename S_forany,
+         typename Insert_Policy>
 ACE_INLINE
-TAO::Out_Fixed_Array_Argument_T<S,S_slice,S_forany>::Out_Fixed_Array_Argument_T (S_slice *&x)
+TAO::Out_Fixed_Array_Argument_T<S,S_slice,S_forany,Insert_Policy>::Out_Fixed_Array_Argument_T (S_slice *&x)
   : x_ (x)
 {}
 
 template<typename S,
          typename S_slice,
-         typename S_forany>
+         typename S_forany,
+         typename Insert_Policy>
 ACE_INLINE
 S_slice *&
-TAO::Out_Fixed_Array_Argument_T<S,S_slice,S_forany>::arg (void)
+TAO::Out_Fixed_Array_Argument_T<S,S_slice,S_forany,Insert_Policy>::arg (void)
 {
   return this->x_.out ();
 }
@@ -81,9 +87,10 @@ template<typename S,
          typename S_slice,
          typename S_var,
          typename S_forany,
-         typename S_tag>
+         typename S_tag,
+         typename Insert_Policy>
 ACE_INLINE
-TAO::Ret_Fixed_Array_Argument_T<S,S_slice,S_var,S_forany,S_tag>::
+TAO::Ret_Fixed_Array_Argument_T<S,S_slice,S_var,S_forany,S_tag,Insert_Policy>::
 Ret_Fixed_Array_Argument_T (void)
 {}
 
@@ -91,10 +98,11 @@ template<typename S,
          typename S_slice,
          typename S_var,
          typename S_forany,
-         typename S_tag>
+         typename S_tag,
+         typename Insert_Policy>
 ACE_INLINE
 S_slice *&
-TAO::Ret_Fixed_Array_Argument_T<S,S_slice,S_var,S_forany,S_tag>::arg (void)
+TAO::Ret_Fixed_Array_Argument_T<S,S_slice,S_var,S_forany,S_tag,Insert_Policy>::arg (void)
 {
   return this->x_._retn_arg ();
 }
@@ -103,10 +111,11 @@ template<typename S,
          typename S_slice,
          typename S_var,
          typename S_forany,
-         typename S_tag>
+         typename S_tag,
+         typename Insert_Policy>
 ACE_INLINE
 S_slice *
-TAO::Ret_Fixed_Array_Argument_T<S,S_slice,S_var,S_forany,S_tag>::excp (void)
+TAO::Ret_Fixed_Array_Argument_T<S,S_slice,S_var,S_forany,S_tag,Insert_Policy>::excp (void)
 {
   return this->x_.ptr ();
 }
@@ -115,10 +124,11 @@ template<typename S,
          typename S_slice,
          typename S_var,
          typename S_forany,
-         typename S_tag>
+         typename S_tag,
+         typename Insert_Policy>
 ACE_INLINE
 S_slice *
-TAO::Ret_Fixed_Array_Argument_T<S,S_slice,S_var,S_forany,S_tag>::retn (void)
+TAO::Ret_Fixed_Array_Argument_T<S,S_slice,S_var,S_forany,S_tag,Insert_Policy>::retn (void)
 {
   return this->x_._retn ();
 }
diff --git a/TAO/tao/Fixed_Size_Argument_T.cpp b/TAO/tao/Fixed_Size_Argument_T.cpp
index 0819eabf688..60a2fe74a63 100644
--- a/TAO/tao/Fixed_Size_Argument_T.cpp
+++ b/TAO/tao/Fixed_Size_Argument_T.cpp
@@ -4,7 +4,6 @@
 #define TAO_FIXED_SIZE_ARGUMENT_T_C
 
 #include "tao/Fixed_Size_Argument_T.h"
-#include "tao/Dynamic_ParameterC.h"
 
 #if !defined (__ACE_INLINE__)
 #include "tao/Fixed_Size_Argument_T.inl"
@@ -14,94 +13,97 @@ ACE_RCSID (tao,
            Fixed_Size_Argument_T,
            "$Id$")
 
-template<typename S>
+template<typename S,
+         typename Insert_Policy>
 CORBA::Boolean
-TAO::In_Fixed_Size_Argument_T<S>::marshal (TAO_OutputCDR & cdr)
+TAO::In_Fixed_Size_Argument_T<S,Insert_Policy>::marshal (TAO_OutputCDR &cdr)
 {
   return cdr << *this->x_;
 }
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S>
+template<typename S,
+         typename Insert_Policy>
 void
-TAO::In_Fixed_Size_Argument_T<S>::interceptor_param (Dynamic::Parameter & p)
+TAO::In_Fixed_Size_Argument_T<S,Insert_Policy>::interceptor_value (CORBA::Any *any) const
 {
-  p.argument <<= *this->x_;
-  p.mode = CORBA::PARAM_IN;
+  this->Insert_Policy::any_insert (any, *this->x_);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // ===========================================================
 
-template<typename S>
+template<typename S,
+         typename Insert_Policy>
 CORBA::Boolean
-TAO::Inout_Fixed_Size_Argument_T<S>::marshal (TAO_OutputCDR & cdr)
+TAO::Inout_Fixed_Size_Argument_T<S,Insert_Policy>::marshal (TAO_OutputCDR &cdr)
 {
   return cdr << *this->x_;
 }
 
-template<typename S>
+template<typename S,
+         typename Insert_Policy>
 CORBA::Boolean
-TAO::Inout_Fixed_Size_Argument_T<S>::demarshal (TAO_InputCDR & cdr)
+TAO::Inout_Fixed_Size_Argument_T<S,Insert_Policy>::demarshal (TAO_InputCDR & cdr)
 {
   return cdr >> *this->x_;
 }
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S>
+template<typename S,
+         typename Insert_Policy>
 void
-TAO::Inout_Fixed_Size_Argument_T<S>::interceptor_param (
-    Dynamic::Parameter & p
-  )
+TAO::Inout_Fixed_Size_Argument_T<S,Insert_Policy>::interceptor_value (CORBA::Any *any) const
 {
-  p.argument <<= *this->x_;
-  p.mode = CORBA::PARAM_INOUT;
+  this->Insert_Policy::any_insert (any, *this->x_);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // ==============================================================
 
-template<typename S>
+template<typename S,
+         typename Insert_Policy>
 CORBA::Boolean
-TAO::Out_Fixed_Size_Argument_T<S>::demarshal (TAO_InputCDR & cdr)
+TAO::Out_Fixed_Size_Argument_T<S,Insert_Policy>::demarshal (TAO_InputCDR & cdr)
 {
   return cdr >> this->x_;
 }
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S>
+template<typename S,
+         typename Insert_Policy>
 void
-TAO::Out_Fixed_Size_Argument_T<S>::interceptor_param (
-    Dynamic::Parameter & p
-  )
+TAO::Out_Fixed_Size_Argument_T<S,Insert_Policy>::interceptor_value (CORBA::Any *any) const
 {
-  p.argument <<= this->x_;
-  p.mode = CORBA::PARAM_OUT;
+  this->Insert_Policy::any_insert (any, this->x_);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // ============================================================
 
-template<typename S>
+template<typename S,
+         typename Insert_Policy>
 CORBA::Boolean
-TAO::Ret_Fixed_Size_Argument_T<S>::demarshal (TAO_InputCDR & cdr)
+TAO::Ret_Fixed_Size_Argument_T<S,Insert_Policy>::demarshal (TAO_InputCDR & cdr)
 {
   return cdr >> this->x_;
 }
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S>
+template<typename S,
+         typename Insert_Policy>
 void
-TAO::Ret_Fixed_Size_Argument_T<S>::interceptor_result (CORBA::Any * any)
+TAO::Ret_Fixed_Size_Argument_T<S,Insert_Policy>::
+interceptor_value (CORBA::Any *any) const
 {
-  (*any) <<= this->x_;
+  this->Insert_Policy::any_insert (any, this->x_);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
diff --git a/TAO/tao/Fixed_Size_Argument_T.h b/TAO/tao/Fixed_Size_Argument_T.h
index c71bf4047ba..e4bc7c3aa3b 100644
--- a/TAO/tao/Fixed_Size_Argument_T.h
+++ b/TAO/tao/Fixed_Size_Argument_T.h
@@ -29,15 +29,16 @@ namespace TAO
    * @brief Template class for IN stub argument of fixed size IDL types.
    *
    */
-  template<typename S>
-  class In_Fixed_Size_Argument_T : public Argument
+  template<typename S,
+           typename Insert_Policy>
+  class In_Fixed_Size_Argument_T : public InArgument, private Insert_Policy
   {
   public:
     In_Fixed_Size_Argument_T (S const & x);
 
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S const & arg (void) const;
 
@@ -51,16 +52,17 @@ namespace TAO
    * @brief Template class for INOUT stub argument of fixed size IDL types.
    *
    */
-  template<typename S>
-  class Inout_Fixed_Size_Argument_T : public Argument
+  template<typename S,
+           typename Insert_Policy>
+  class Inout_Fixed_Size_Argument_T : public InoutArgument, private Insert_Policy
   {
   public:
     Inout_Fixed_Size_Argument_T (S & x);
 
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S & arg (void);
 
@@ -74,15 +76,16 @@ namespace TAO
    * @brief Template class for OUT stub argument of fixed size IDL types.
    *
    */
-  template<typename S>
-  class Out_Fixed_Size_Argument_T : public Argument
+  template<typename S,
+           typename Insert_Policy>
+  class Out_Fixed_Size_Argument_T : public OutArgument, private Insert_Policy
   {
   public:
     Out_Fixed_Size_Argument_T (S & x);
 
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S & arg (void);
 
@@ -97,15 +100,16 @@ namespace TAO
    * @brief Template class for return stub value of fixed size IDL types.
    *
    */
-  template<typename S>
-  class Ret_Fixed_Size_Argument_T : public Argument
+  template<typename S,
+           typename Insert_Policy>
+  class Ret_Fixed_Size_Argument_T : public RetArgument, private Insert_Policy
   {
   public:
     Ret_Fixed_Size_Argument_T (void);
 
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_result (CORBA::Any *);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S & arg (void);
 
@@ -125,25 +129,26 @@ namespace TAO
   struct TAO_Export Fixed_Size_Tag {};
 
   /**
-   * @struct Basic_Arg_Traits_T
+   * @struct Fixed_Size_Arg_Traits_T
    *
    * @brief Template class for argument traits of fixed size IDL types.
    *
    */
-  template<typename T>
+  template<typename T,
+           typename Insert_Policy>
   struct Fixed_Size_Arg_Traits_T
   {
-    typedef T                                 ret_type;
-    typedef T const &                         in_type;
-    typedef T &                               inout_type;
-    typedef T &                               out_type;
+    typedef T                                            ret_type;
+    typedef T const &                                    in_type;
+    typedef T &                                          inout_type;
+    typedef T &                                          out_type;
 
-    typedef In_Fixed_Size_Argument_T<T>       in_arg_val;
-    typedef Inout_Fixed_Size_Argument_T<T>    inout_arg_val;
-    typedef Out_Fixed_Size_Argument_T<T>      out_arg_val;
-    typedef Ret_Fixed_Size_Argument_T<T>      ret_val;
+    typedef In_Fixed_Size_Argument_T<T,Insert_Policy>    in_arg_val;
+    typedef Inout_Fixed_Size_Argument_T<T,Insert_Policy> inout_arg_val;
+    typedef Out_Fixed_Size_Argument_T<T,Insert_Policy>   out_arg_val;
+    typedef Ret_Fixed_Size_Argument_T<T,Insert_Policy>   ret_val;
 
-    typedef Fixed_Size_Tag                    idl_tag;
+    typedef Fixed_Size_Tag                               idl_tag;
   };
 }
 
diff --git a/TAO/tao/Fixed_Size_Argument_T.inl b/TAO/tao/Fixed_Size_Argument_T.inl
index 2c057588662..bce99464476 100644
--- a/TAO/tao/Fixed_Size_Argument_T.inl
+++ b/TAO/tao/Fixed_Size_Argument_T.inl
@@ -1,78 +1,94 @@
 // $Id$
 
-template<typename S>
+template<typename S,
+         typename Insert_Policy>
 ACE_INLINE
-TAO::In_Fixed_Size_Argument_T<S>::In_Fixed_Size_Argument_T (S const & x)
+TAO::In_Fixed_Size_Argument_T<S,Insert_Policy>::
+In_Fixed_Size_Argument_T (S const & x)
   : x_ (&x)
 {}
 
-template<typename S>
+template<typename S,
+         typename Insert_Policy>
 ACE_INLINE
 const S &
-TAO::In_Fixed_Size_Argument_T<S>::arg (void) const
+TAO::In_Fixed_Size_Argument_T<S,Insert_Policy>::arg (void) const
 {
   return *this->x_;
 }
 
 // ==========================================================================
 
-template<typename S>
+template<typename S,
+         typename Insert_Policy>
 ACE_INLINE
-TAO::Inout_Fixed_Size_Argument_T<S>::Inout_Fixed_Size_Argument_T (S & x)
+TAO::Inout_Fixed_Size_Argument_T<S,Insert_Policy>::
+Inout_Fixed_Size_Argument_T (S & x)
   : x_ (&x)
 {}
 
-template<typename S>
+template<typename S,
+         typename Insert_Policy>
 ACE_INLINE
 S &
-TAO::Inout_Fixed_Size_Argument_T<S>::arg (void)
+TAO::Inout_Fixed_Size_Argument_T<S,Insert_Policy>::arg (void)
 {
   return *this->x_;
 }
 
 // ==========================================================================
 
-template<typename S>
+template<typename S,
+         typename Insert_Policy>
 ACE_INLINE
-TAO::Out_Fixed_Size_Argument_T<S>::Out_Fixed_Size_Argument_T (S & x)
+TAO::Out_Fixed_Size_Argument_T<S,Insert_Policy>::
+Out_Fixed_Size_Argument_T (S & x)
   : x_ (x)
-{}
+{
+}
 
-template<typename S>
+template<typename S,
+         typename Insert_Policy>
 ACE_INLINE
 S &
-TAO::Out_Fixed_Size_Argument_T<S>::arg (void)
+TAO::Out_Fixed_Size_Argument_T<S,Insert_Policy>::arg (void)
 {
   return this->x_;
 }
 
 // ==========================================================================
 
-template<typename S>
+template<typename S,
+         typename Insert_Policy>
 ACE_INLINE
-TAO::Ret_Fixed_Size_Argument_T<S>::Ret_Fixed_Size_Argument_T (void)
-{}
+TAO::Ret_Fixed_Size_Argument_T<S,Insert_Policy>::
+Ret_Fixed_Size_Argument_T (void)
+{
+}
 
-template<typename S>
+template<typename S,
+         typename Insert_Policy>
 ACE_INLINE
 S &
-TAO::Ret_Fixed_Size_Argument_T<S>::arg (void)
+TAO::Ret_Fixed_Size_Argument_T<S,Insert_Policy>::arg (void)
 {
   return this->x_;
 }
 
-template<typename S>
+template<typename S,
+         typename Insert_Policy>
 ACE_INLINE
 S
-TAO::Ret_Fixed_Size_Argument_T<S>::excp (void)
+TAO::Ret_Fixed_Size_Argument_T<S,Insert_Policy>::excp (void)
 {
   return this->x_;
 }
 
-template<typename S>
+template<typename S,
+         typename Insert_Policy>
 ACE_INLINE
 S
-TAO::Ret_Fixed_Size_Argument_T<S>::retn (void)
+TAO::Ret_Fixed_Size_Argument_T<S,Insert_Policy>::retn (void)
 {
   return this->x_;
 }
diff --git a/TAO/tao/Fixed_TypeCode.cpp b/TAO/tao/Fixed_TypeCode.cpp
deleted file mode 100644
index 7be6bfa5eb6..00000000000
--- a/TAO/tao/Fixed_TypeCode.cpp
+++ /dev/null
@@ -1,111 +0,0 @@
-// $Id$
-
-#ifndef TAO_FIXED_TYPECODE_CPP
-#define TAO_FIXED_TYPECODE_CPP
-
-#include "tao/Fixed_TypeCode.h"
-#include "tao/CDR.h"
-
-#ifndef __ACE_INLINE__
-# include "tao/Fixed_TypeCode.inl"
-#endif  /* !__ACE_INLINE__ */
-
-
-template <class RefCountPolicy>
-bool
-TAO::TypeCode::Fixed<RefCountPolicy>::tao_marshal (TAO_OutputCDR & cdr,
-                                                   CORBA::ULong) const
-{
-  // A tk_fixed TypeCode has a "simple" parameter list type (see
-  // Table 15-2 in Section 15.3.5.1 "TypeCode" in the CDR section of
-  // the CORBA specification), meaning that its parameter(s) must be
-  // marshaled immediately following the TCKind.  No CDR encapsulation
-  // is to be created.
-
-  return (cdr << this->digits_) && (cdr << this->scale_);
-}
-
-template <class RefCountPolicy>
-void
-TAO::TypeCode::Fixed<RefCountPolicy>::tao_duplicate (void)
-{
-  this->RefCountPolicy::add_ref ();
-}
-
-template <class RefCountPolicy>
-void
-TAO::TypeCode::Fixed<RefCountPolicy>::tao_release (void)
-{
-  this->RefCountPolicy::remove_ref ();
-}
-
-template <class RefCountPolicy>
-CORBA::Boolean
-TAO::TypeCode::Fixed<RefCountPolicy>::equal_i (CORBA::TypeCode_ptr tc
-                                               ACE_ENV_ARG_DECL) const
-{
-  // The following call won't throw since CORBA::TypeCode::equal() has
-  // already established the kind of tc is the same as our kind.
-  CORBA::UShort const tc_digits =
-    tc->fixed_digits (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  CORBA::UShort const tc_scale =
-    tc->fixed_scale (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  return (this->digits_ == tc_digits
-          && this->scale_ == tc_scale);
-}
-
-template <class RefCountPolicy>
-CORBA::Boolean
-TAO::TypeCode::Fixed<RefCountPolicy>::equivalent_i (CORBA::TypeCode_ptr tc
-                                                    ACE_ENV_ARG_DECL) const
-{
-  // Since TCKind comparisons must be performed before equal_i() is
-  // called, we can also call it to determine equivalence of
-  // tk_fixed TypeCodes.
-  return this->equal_i (tc
-                        ACE_ENV_ARG_PARAMETER);
-}
-
-template <class RefCountPolicy>
-CORBA::TypeCode_ptr
-TAO::TypeCode::Fixed<RefCountPolicy>::get_compact_typecode_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  // Already compact since tk_fixed TypeCodes have no name or member
-  // names, meaning that we can simply call _duplicate() on this
-  // TypeCode.
-
-
-  // @@ There is a potential problem here if this TypeCode is a static
-  //    and const since it may have been placed in read-only memory by
-  //    the compiler.  A const_cast<> can return undefined results in
-  //    that case.
-
-  CORBA::TypeCode_ptr mutable_tc =
-    const_cast<TAO::TypeCode::Fixed<RefCountPolicy> *> (this);
-
-  return CORBA::TypeCode::_duplicate (mutable_tc);
-}
-
-template <class RefCountPolicy>
-CORBA::UShort
-TAO::TypeCode::Fixed<RefCountPolicy>::fixed_digits_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  return this->digits_;
-}
-
-template <class RefCountPolicy>
-CORBA::UShort
-TAO::TypeCode::Fixed<RefCountPolicy>::fixed_scale_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  return this->scale_;
-}
-
-
-#endif  /* TAO_FIXED_TYPECODE_CPP */
diff --git a/TAO/tao/Fixed_TypeCode.h b/TAO/tao/Fixed_TypeCode.h
deleted file mode 100644
index d2a41df5dc6..00000000000
--- a/TAO/tao/Fixed_TypeCode.h
+++ /dev/null
@@ -1,114 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Fixed_TypeCode.h
- *
- *  $Id$
- *
- *  Header file for @c CORBA::tk_fixed @c CORBA::TypeCodes.
- *
- *  @author Ossama Othman <ossama@dre.vanderbilt.edu>
- */
-//=============================================================================
-
-#ifndef TAO_FIXED_TYPECODE_H
-#define TAO_FIXED_TYPECODE_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/TypeCode.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-namespace TAO
-{
-  namespace TypeCode
-  {
-
-    /**
-     * @class Fixed
-     *
-     * @brief @c CORBA::TypeCode implementation for the OMG IDL @fixed
-     *        types.
-     *
-     * This class implements a @c CORBA::TypeCode for the OMG IDL @c
-     * fixed types.
-     */
-    template <class RefCountPolicy>
-    class Fixed
-      : public CORBA::TypeCode
-      , private RefCountPolicy
-    {
-    public:
-
-      /// Constructor.
-      Fixed (CORBA::UShort digits, CORBA::UShort scale);
-
-      /**
-       * @name TAO-specific @c CORBA::TypeCode Methods
-       *
-       * Methods required by TAO's implementation of the
-       * @c CORBA::TypeCode class.
-       *
-       * @see @c CORBA::TypeCode
-       */
-      //@{
-      virtual bool tao_marshal (TAO_OutputCDR & cdr,
-                                CORBA::ULong offset) const;
-      virtual void tao_duplicate (void);
-      virtual void tao_release (void);
-      //@}
-
-    protected:
-
-      /**
-       * @name @c TAO CORBA::TypeCode Template Methods
-       *
-       * @c CORBA::TypeCode template methods specific to @c tk_fixed
-       * @c TypeCodes.
-       *
-       * @see @c CORBA::TypeCode
-       */
-      //@{
-      virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc
-                                      ACE_ENV_ARG_DECL) const;
-      virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc
-                                           ACE_ENV_ARG_DECL) const;
-      virtual CORBA::TypeCode_ptr get_compact_typecode_i (
-        ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual CORBA::UShort fixed_digits_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual CORBA::UShort fixed_scale_i (ACE_ENV_SINGLE_ARG_DECL) const;
-
-    private:
-
-      /// The number of significant digits.
-      CORBA::UShort const digits_;
-
-      /// The scale factor.
-      CORBA::UShort const scale_;
-
-    };
-
-  }  // End namespace TypeCode
-}  // End namespace TAO
-
-
-#ifdef __ACE_INLINE__
-# include "tao/Fixed_TypeCode.inl"
-#endif  /* __ACE_INLINE__ */
-
-#ifdef ACE_TEMPLATES_REQUIRE_SOURCE
-# include "tao/Fixed_TypeCode.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#ifdef ACE_TEMPLATES_REQUIRE_PRAGMA
-# pragma implementation ("Fixed_TypeCode.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_FIXED_TYPECODE_H */
diff --git a/TAO/tao/Fixed_TypeCode.inl b/TAO/tao/Fixed_TypeCode.inl
deleted file mode 100644
index 9db9ca2b26d..00000000000
--- a/TAO/tao/Fixed_TypeCode.inl
+++ /dev/null
@@ -1,14 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-template <class RefCountPolicy>
-ACE_INLINE
-TAO::TypeCode::Fixed<RefCountPolicy>::Fixed (CORBA::UShort digits,
-                                             CORBA::UShort scale)
-  : CORBA::TypeCode (CORBA::tk_fixed)
-  , RefCountPolicy ()
-  , digits_ (digits)
-  , scale_ (scale)
-{
-}
diff --git a/TAO/tao/FloatSeqA.cpp b/TAO/tao/FloatSeqA.cpp
deleted file mode 100644
index c20ad0d02ba..00000000000
--- a/TAO/tao/FloatSeqA.cpp
+++ /dev/null
@@ -1,142 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "FloatSeqC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Sequence_TypeCode_Static.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Dual_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:937
-
-
-#ifndef _TAO_TYPECODE_CORBA_FloatSeq_GUARD
-#define _TAO_TYPECODE_CORBA_FloatSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_FloatSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_float,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_FloatSeq_0 =
-      &CORBA_FloatSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_FloatSeq_GUARD */
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_FloatSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/FloatSeq:1.0",
-    "FloatSeq",
-    &TAO::TypeCode::tc_CORBA_FloatSeq_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_FloatSeq =
-    &_tao_tc_CORBA_FloatSeq;
-}
-
-
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::FloatSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::FloatSeq>::insert_copy (
-      _tao_any,
-      CORBA::FloatSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_FloatSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::FloatSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::FloatSeq>::insert (
-      _tao_any,
-      CORBA::FloatSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_FloatSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::FloatSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::FloatSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::FloatSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::FloatSeq>::extract (
-        _tao_any,
-        CORBA::FloatSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_FloatSeq_0,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/FloatSeqC.cpp b/TAO/tao/FloatSeqC.cpp
index ed0f705f682..f2ded880a74 100644
--- a/TAO/tao/FloatSeqC.cpp
+++ b/TAO/tao/FloatSeqC.cpp
@@ -26,16 +26,12 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:291
+// be\be_codegen.cpp:288
 
 
 #include "FloatSeqC.h"
 #include "tao/CDR.h"
 
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
diff --git a/TAO/tao/FloatSeqC.h b/TAO/tao/FloatSeqC.h
index 84d50294951..4ddc3a0359e 100644
--- a/TAO/tao/FloatSeqC.h
+++ b/TAO/tao/FloatSeqC.h
@@ -26,10 +26,10 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:153
+// be\be_codegen.cpp:154
 
-#ifndef _TAO_IDL_ORIG_FLOATSEQC_H_
-#define _TAO_IDL_ORIG_FLOATSEQC_H_
+#ifndef _TAO_IDL_FLOATSEQC_H_
+#define _TAO_IDL_FLOATSEQC_H_
 
 #include /**/ "ace/pre.h"
 
@@ -57,12 +57,8 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:49
 
 namespace CORBA
 {
@@ -114,14 +110,9 @@ namespace CORBA
   };
 
 #endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_FloatSeq;
 
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:78
 
 } // module CORBA
 
@@ -134,14 +125,6 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const CORBA::FloatSeq &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, CORBA::FloatSeq*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::FloatSeq *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::FloatSeq *&);
-
-// TAO_IDL - Generated from
 // be\be_visitor_sequence/cdr_op_ch.cpp:71
 
 #if !defined _TAO_CDR_OP_CORBA_FloatSeq_H_
@@ -159,16 +142,12 @@ TAO_Export CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_CORBA_FloatSeq_H_ */
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:955
+// be\be_codegen.cpp:1062
 
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
diff --git a/TAO/tao/Flushing_Strategy.h b/TAO/tao/Flushing_Strategy.h
index 127fd743aee..4c2cf07d43f 100644
--- a/TAO/tao/Flushing_Strategy.h
+++ b/TAO/tao/Flushing_Strategy.h
@@ -15,7 +15,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "TAO_Export.h"
+#include "tao/orbconf.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -45,7 +45,7 @@ class TAO_Queued_Message;
  * no-op.
  *
  */
-class TAO_Export TAO_Flushing_Strategy
+class TAO_Flushing_Strategy
 {
 public:
   /// Destructor
diff --git a/TAO/tao/GIOPA.cpp b/TAO/tao/GIOPA.cpp
deleted file mode 100644
index 8f51194a1f5..00000000000
--- a/TAO/tao/GIOPA.cpp
+++ /dev/null
@@ -1,329 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "GIOPC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/String_TypeCode_Static.h"
-#include "tao/Struct_TypeCode_Static.h"
-#include "tao/TypeCode_Struct_Field.h"
-#include "tao/TypeCode_Case_T.h"
-#include "tao/Union_TypeCode_Static.h"
-#include "tao/Recursive_Type_TypeCode.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Dual_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_GIOP_AddressingDisposition (
-    CORBA::tk_alias,
-    "IDL:omg.org/GIOP/AddressingDisposition:1.0",
-    "AddressingDisposition",
-    &CORBA::_tc_short);
-  
-namespace GIOP
-{
-  ::CORBA::TypeCode_ptr const _tc_AddressingDisposition =
-    &_tao_tc_GIOP_AddressingDisposition;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/struct_typecode.cpp:87
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_GIOP_Version[] =
-  {
-    { "major", &CORBA::_tc_octet },
-    { "minor", &CORBA::_tc_octet }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                      CORBA::TypeCode_ptr const *,
-                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
-                      TAO::Null_RefCount_Policy>
-  _tao_tc_GIOP_Version (
-    CORBA::tk_struct,
-    "IDL:omg.org/GIOP/Version:1.0",
-    "Version",
-    _tao_fields_GIOP_Version,
-    2);
-  
-namespace GIOP
-{
-  ::CORBA::TypeCode_ptr const _tc_Version =
-    &_tao_tc_GIOP_Version;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/struct_typecode.cpp:87
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_GIOP_IORAddressingInfo[] =
-  {
-    { "selected_profile_index", &CORBA::_tc_ulong },
-    { "ior", &IOP::_tc_IOR }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                      CORBA::TypeCode_ptr const *,
-                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
-                      TAO::Null_RefCount_Policy>
-  _tao_tc_GIOP_IORAddressingInfo (
-    CORBA::tk_struct,
-    "IDL:omg.org/GIOP/IORAddressingInfo:1.0",
-    "IORAddressingInfo",
-    _tao_fields_GIOP_IORAddressingInfo,
-    2);
-  
-namespace GIOP
-{
-  ::CORBA::TypeCode_ptr const _tc_IORAddressingInfo =
-    &_tao_tc_GIOP_IORAddressingInfo;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/union_typecode.cpp:58
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:937
-
-static TAO::TypeCode::Case_T<CORBA::Short, char const *, CORBA::TypeCode_ptr const *> const _tao_cases_GIOP_TargetAddress_0 (0, "object_key", &CORBA::_tc_OctetSeq);
-static TAO::TypeCode::Case_T<CORBA::Short, char const *, CORBA::TypeCode_ptr const *> const _tao_cases_GIOP_TargetAddress_1 (1, "profile", &IOP::_tc_TaggedProfile);
-static TAO::TypeCode::Case_T<CORBA::Short, char const *, CORBA::TypeCode_ptr const *> const _tao_cases_GIOP_TargetAddress_2 (2, "ior", &GIOP::_tc_IORAddressingInfo);
-
-static TAO::TypeCode::Case<char const *, CORBA::TypeCode_ptr const *> const * const _tao_cases_GIOP_TargetAddress[] =
-  {
-    &_tao_cases_GIOP_TargetAddress_0,
-    &_tao_cases_GIOP_TargetAddress_1,
-    &_tao_cases_GIOP_TargetAddress_2
-    
-  };
-
-static TAO::TypeCode::Union<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::TypeCode::Case<char const *, CORBA::TypeCode_ptr const *> const * const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_GIOP_TargetAddress (
-    "IDL:omg.org/GIOP/TargetAddress:1.0",
-    "TargetAddress",
-    &CORBA::_tc_short,
-    _tao_cases_GIOP_TargetAddress,
-    3, -1);
-  
-namespace GIOP
-{
-  ::CORBA::TypeCode_ptr const _tc_TargetAddress =
-    &_tao_tc_GIOP_TargetAddress;
-}
-
-
-
-// TAO_IDL - Generated from 
-// be\be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const GIOP::Version &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<GIOP::Version>::insert_copy (
-      _tao_any,
-      GIOP::Version::_tao_any_destructor,
-      GIOP::_tc_Version,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    GIOP::Version *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<GIOP::Version>::insert (
-      _tao_any,
-      GIOP::Version::_tao_any_destructor,
-      GIOP::_tc_Version,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    GIOP::Version *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const GIOP::Version *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const GIOP::Version *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<GIOP::Version>::extract (
-        _tao_any,
-        GIOP::Version::_tao_any_destructor,
-        GIOP::_tc_Version,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const GIOP::IORAddressingInfo &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<GIOP::IORAddressingInfo>::insert_copy (
-      _tao_any,
-      GIOP::IORAddressingInfo::_tao_any_destructor,
-      GIOP::_tc_IORAddressingInfo,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    GIOP::IORAddressingInfo *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<GIOP::IORAddressingInfo>::insert (
-      _tao_any,
-      GIOP::IORAddressingInfo::_tao_any_destructor,
-      GIOP::_tc_IORAddressingInfo,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    GIOP::IORAddressingInfo *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const GIOP::IORAddressingInfo *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const GIOP::IORAddressingInfo *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<GIOP::IORAddressingInfo>::extract (
-        _tao_any,
-        GIOP::IORAddressingInfo::_tao_any_destructor,
-        GIOP::_tc_IORAddressingInfo,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_union/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const GIOP::TargetAddress &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<GIOP::TargetAddress>::insert_copy (
-      _tao_any,
-      GIOP::TargetAddress::_tao_any_destructor,
-      GIOP::_tc_TargetAddress,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    GIOP::TargetAddress *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<GIOP::TargetAddress>::insert (
-      _tao_any,
-      GIOP::TargetAddress::_tao_any_destructor,
-      GIOP::_tc_TargetAddress,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    GIOP::TargetAddress *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const GIOP::TargetAddress *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const GIOP::TargetAddress *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<GIOP::TargetAddress>::extract (
-        _tao_any,
-        GIOP::TargetAddress::_tao_any_destructor,
-        GIOP::_tc_TargetAddress,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/GIOPC.cpp b/TAO/tao/GIOPC.cpp
index da8775c8c5f..c969f09d9c0 100644
--- a/TAO/tao/GIOPC.cpp
+++ b/TAO/tao/GIOPC.cpp
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:291
+// be\be_codegen.cpp:288
 
 
 #include "GIOPC.h"
@@ -34,10 +34,6 @@
 #include "tao/ORB_Core.h"
 #include "ace/OS_NS_string.h"
 
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
 #if !defined (__ACE_INLINE__)
 #include "GIOPC.inl"
 #endif /* !defined INLINE */
@@ -51,10 +47,10 @@ namespace TAO
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_structure/structure_cs.cpp:66
 
-void 
+void
 GIOP::Version::_tao_any_destructor (
     void *_tao_void_pointer
   )
@@ -64,10 +60,10 @@ GIOP::Version::_tao_any_destructor (
   delete _tao_tmp_pointer;
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_structure/structure_cs.cpp:66
 
-void 
+void
 GIOP::IORAddressingInfo::_tao_any_destructor (
     void *_tao_void_pointer
   )
@@ -162,10 +158,10 @@ GIOP::TargetAddress::operator= (const ::GIOP::TargetAddress &u)
     {
       return *this;
     }
-  
+
   this->_reset (u.disc_, 0);
   this->disc_ = u.disc_;
-  
+
   switch (this->disc_)
   {
     case 0:
@@ -219,7 +215,7 @@ GIOP::TargetAddress::operator= (const ::GIOP::TargetAddress &u)
     default:
     break;
   }
-  
+
   return *this;
 }
 
@@ -228,7 +224,7 @@ void GIOP::TargetAddress::_reset (CORBA::Short, CORBA::Boolean /*finalize*/)
 {
   switch (this->disc_)
   {
-    
+
     case 0:
       delete this->u_.object_key_;
       this->u_.object_key_ = 0;
@@ -255,8 +251,8 @@ CORBA::Boolean operator<< (
   )
 {
   return
-    (strm << CORBA::Any::from_octet (_tao_aggregate.major)) &&
-    (strm << CORBA::Any::from_octet (_tao_aggregate.minor));
+    (strm << ACE_OutputCDR::from_octet (_tao_aggregate.major)) &&
+    (strm << ACE_OutputCDR::from_octet (_tao_aggregate.minor));
 }
 
 CORBA::Boolean operator>> (
@@ -265,8 +261,8 @@ CORBA::Boolean operator>> (
   )
 {
   return
-    (strm >> CORBA::Any::to_octet (_tao_aggregate.major)) &&
-    (strm >> CORBA::Any::to_octet (_tao_aggregate.minor));
+    (strm >> ACE_InputCDR::to_octet (_tao_aggregate.major)) &&
+    (strm >> ACE_InputCDR::to_octet (_tao_aggregate.minor));
 }
 
 // TAO_IDL - Generated from
@@ -304,9 +300,9 @@ CORBA::Boolean operator<< (
     {
       return false;
     }
-  
+
   CORBA::Boolean result = true;
-  
+
   switch (_tao_union._d ())
   {
     case 0:
@@ -327,7 +323,7 @@ CORBA::Boolean operator<< (
     default:
       break;
   }
-  
+
   return result;
 }
 
@@ -341,16 +337,16 @@ CORBA::Boolean operator>> (
     {
       return false;
     }
-  
+
   CORBA::Boolean result = true;
-  
+
   switch (_tao_discriminant)
   {
     case 0:
       {
         CORBA::OctetSeq _tao_union_tmp;
         result = strm >> _tao_union_tmp;
-        
+
         if (result)
           {
             _tao_union.object_key (_tao_union_tmp);
@@ -362,7 +358,7 @@ CORBA::Boolean operator>> (
       {
         IOP::TaggedProfile _tao_union_tmp;
         result = strm >> _tao_union_tmp;
-        
+
         if (result)
           {
             _tao_union.profile (_tao_union_tmp);
@@ -374,7 +370,7 @@ CORBA::Boolean operator>> (
       {
         GIOP::IORAddressingInfo _tao_union_tmp;
         result = strm >> _tao_union_tmp;
-        
+
         if (result)
           {
             _tao_union.ior (_tao_union_tmp);
@@ -386,6 +382,6 @@ CORBA::Boolean operator>> (
       _tao_union._d (_tao_discriminant);
       break;
   }
-  
+
   return result;
 }
diff --git a/TAO/tao/GIOPC.h b/TAO/tao/GIOPC.h
index a4881f49a50..e85e137e6c0 100644
--- a/TAO/tao/GIOPC.h
+++ b/TAO/tao/GIOPC.h
@@ -26,10 +26,10 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:153
+// be\be_codegen.cpp:154
 
-#ifndef _TAO_IDL_ORIG_GIOPC_H_
-#define _TAO_IDL_ORIG_GIOPC_H_
+#ifndef _TAO_IDL_GIOPC_H_
+#define _TAO_IDL_GIOPC_H_
 
 #include /**/ "ace/pre.h"
 
@@ -57,120 +57,101 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:49
 
 namespace GIOP
 {
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typedef/typedef_ch.cpp:379
-  
+
   typedef CORBA::Short AddressingDisposition;
   typedef CORBA::Short_out AddressingDisposition_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_AddressingDisposition;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-  
+
   const CORBA::Short KeyAddr = 0;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-  
+
   const CORBA::Short ProfileAddr = 1;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-  
+
   const CORBA::Short ReferenceAddr = 2;
-  
+
   // TAO_IDL - Generated from
   // be\be_type.cpp:258
-  
+
   struct Version;
-  
+
   typedef
     TAO_Fixed_Var_T<
         Version
       >
     Version_var;
-  
+
   typedef
     Version &
     Version_out;
-  
+
   // TAO_IDL - Generated from
-  // be\be_visitor_structure/structure_ch.cpp:52
-  
+  // be\be_visitor_structure/structure_ch.cpp:57
+
   struct TAO_Export Version
   {
     typedef Version_var _var_type;
-    
+
     static void _tao_any_destructor (void *);
     CORBA::Octet major;
     CORBA::Octet minor;
   };
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_Version;
-  
+
   // TAO_IDL - Generated from
   // be\be_type.cpp:258
-  
+
   struct IORAddressingInfo;
-  
+
   typedef
     TAO_Var_Var_T<
         IORAddressingInfo
       >
     IORAddressingInfo_var;
-  
+
   typedef
     TAO_Out_T<
         IORAddressingInfo,
         IORAddressingInfo_var
       >
     IORAddressingInfo_out;
-  
+
   // TAO_IDL - Generated from
-  // be\be_visitor_structure/structure_ch.cpp:52
-  
+  // be\be_visitor_structure/structure_ch.cpp:57
+
   struct TAO_Export IORAddressingInfo
   {
     typedef IORAddressingInfo_var _var_type;
-    
+
     static void _tao_any_destructor (void *);
     CORBA::ULong selected_profile_index;
     IOP::IOR ior;
   };
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_IORAddressingInfo;
-  
+
   // TAO_IDL - Generated from
   // be\be_type.cpp:258
-  
+
   class TargetAddress;
-  
+
   typedef
     TAO_Var_Var_T<
         TargetAddress
       >
     TargetAddress_var;
-  
+
   typedef
     TAO_Out_T<
         TargetAddress,
@@ -180,7 +161,7 @@ namespace GIOP
 
 #if !defined (_GIOP_TARGETADDRESS_CH_)
 #define _GIOP_TARGETADDRESS_CH_
-  
+
   class TAO_Export TargetAddress
   {
   public:
@@ -188,49 +169,49 @@ namespace GIOP
     TargetAddress (const TargetAddress &);
     ~TargetAddress (void);
     static void _tao_any_destructor (void*);
-    
+
     TargetAddress &operator= (const TargetAddress &);
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_union/discriminant_ch.cpp:114
-    
+
     void _d (CORBA::Short);
     CORBA::Short _d (void) const;
-    
+
     // TAO_IDL - Generated from
-    // be\be_visitor_union/union_ch.cpp:108
-    
+    // be\be_visitor_union/union_ch.cpp:113
+
     typedef TargetAddress_var _var_type;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_union_branch/public_ch.cpp:557
-    
+
     void object_key (const CORBA::OctetSeq &);
     const CORBA::OctetSeq &object_key (void) const;
     CORBA::OctetSeq &object_key (void);
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_union_branch/public_ch.cpp:665
-    
+
     void profile (const IOP::TaggedProfile &);
     const IOP::TaggedProfile &profile (void) const;
     IOP::TaggedProfile &profile (void);
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_union_branch/public_ch.cpp:665
-    
+
     void ior (const ACE_NESTED_CLASS (GIOP, IORAddressingInfo) &);
     const ACE_NESTED_CLASS (GIOP, IORAddressingInfo) &ior (void) const;
     ACE_NESTED_CLASS (GIOP, IORAddressingInfo) &ior (void);
-    
+
     // TAO_IDL - Generated from
-    // be\be_visitor_union/union_ch.cpp:142
-    
+    // be\be_visitor_union/union_ch.cpp:147
+
     void _default (void);
   private:
     CORBA::Short disc_;
     CORBA::Short holder_;
-    
+
     union
     {
       // TAO_IDL - Generated from
@@ -243,20 +224,15 @@ namespace GIOP
       // be\be_visitor_union_branch/private_ch.cpp:526
       ACE_NESTED_CLASS (GIOP, IORAddressingInfo) *ior_;
     } u_;
-    
+
     // TAO extension - frees any allocated storage.
     void _reset (CORBA::Short, CORBA::Boolean /* finalize */);
   };
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_TargetAddress;
 
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:78
 
 } // module GIOP
 
@@ -269,30 +245,6 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_structure/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const GIOP::Version &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, GIOP::Version*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, GIOP::Version *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const GIOP::Version *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const GIOP::IORAddressingInfo &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, GIOP::IORAddressingInfo*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, GIOP::IORAddressingInfo *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const GIOP::IORAddressingInfo *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_union/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const GIOP::TargetAddress &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, GIOP::TargetAddress*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, GIOP::TargetAddress *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const GIOP::TargetAddress *&);
-
-// TAO_IDL - Generated from
 // be\be_visitor_structure/cdr_op_ch.cpp:54
 
 TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const GIOP::Version &);
@@ -311,7 +263,7 @@ TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const GIOP::TargetAddress
 TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, GIOP::TargetAddress &);
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:955
+// be\be_codegen.cpp:1062
 
 #if defined (__ACE_INLINE__)
 #include "GIOPC.inl"
@@ -321,10 +273,6 @@ TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, GIOP::TargetAddress &);
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
diff --git a/TAO/tao/GIOP_Message_Generator_Parser_10.cpp b/TAO/tao/GIOP_Message_Generator_Parser_10.cpp
index c76d5b60b18..a78149c847a 100644
--- a/TAO/tao/GIOP_Message_Generator_Parser_10.cpp
+++ b/TAO/tao/GIOP_Message_Generator_Parser_10.cpp
@@ -34,11 +34,11 @@ TAO_GIOP_Message_Generator_Parser_10::write_request_header (
   // Write the response flags
   if (response_flags == TAO_TWOWAY_RESPONSE_FLAG)
     {
-      msg << CORBA::Any::from_octet (1);
+      msg << ACE_OutputCDR::from_octet (1);
     }
   else
     {
-      msg << CORBA::Any::from_octet (0);
+      msg << ACE_OutputCDR::from_octet (0);
     }
 
   // In this case we cannot recognise anything other than the Object
@@ -332,7 +332,7 @@ TAO_GIOP_Message_Generator_Parser_10::parse_request_header (
   CORBA::Boolean hdr_status =
     (CORBA::Boolean) input.good_bit ();
 
-  CORBA::ULong req_id;
+  CORBA::ULong req_id = 0;
 
   // Get the rest of the request header ...
   hdr_status = hdr_status && input.read_ulong (req_id);
diff --git a/TAO/tao/GIOP_Message_Generator_Parser_12.cpp b/TAO/tao/GIOP_Message_Generator_Parser_12.cpp
index 34673f5d4af..5296e870b67 100644
--- a/TAO/tao/GIOP_Message_Generator_Parser_12.cpp
+++ b/TAO/tao/GIOP_Message_Generator_Parser_12.cpp
@@ -33,6 +33,7 @@ TAO_GIOP_Message_Generator_Parser_12::write_request_header (
 
   const CORBA::Octet response_flags = opdetails.response_flags ();
 
+
   // Here are the Octet values for different policies
   // '00000000' for SYNC_NONE
   // '00000000' for SYNC_WITH_TRANSPORT
@@ -43,7 +44,7 @@ TAO_GIOP_Message_Generator_Parser_12::write_request_header (
   //
   // We have not implemented the policy INV_NO_RESPONSE for DII.
   if (response_flags == TAO_TWOWAY_RESPONSE_FLAG)
-    msg << CORBA::Any::from_octet (3);
+    msg << ACE_OutputCDR::from_octet (3);
   // Second the response flags
   // Sync scope - ignored by server if request is not oneway.
   else if (response_flags == CORBA::Octet (Messaging::SYNC_NONE)
@@ -51,15 +52,15 @@ TAO_GIOP_Message_Generator_Parser_12::write_request_header (
            || response_flags == CORBA::Octet (TAO::SYNC_EAGER_BUFFERING)
            || response_flags == CORBA::Octet (TAO::SYNC_DELAYED_BUFFERING))
     // No response required.
-    msg << CORBA::Any::from_octet (0);
+    msg << ACE_OutputCDR::from_octet (0);
 
   else if (response_flags == CORBA::Octet (Messaging::SYNC_WITH_SERVER))
     // Return before dispatching to the servant
-    msg << CORBA::Any::from_octet (1);
+    msg << ACE_OutputCDR::from_octet (1);
 
   else if (response_flags == CORBA::Octet (Messaging::SYNC_WITH_TARGET))
     // Return after dispatching servant.
-    msg << CORBA::Any::from_octet (3);
+    msg << ACE_OutputCDR::from_octet (3);
   else
     // Until more flags are defined by the OMG.
     return 0;
@@ -257,7 +258,7 @@ TAO_GIOP_Message_Generator_Parser_12::parse_request_header (
 
   CORBA::Boolean hdr_status = (CORBA::Boolean) input.good_bit ();
 
-  CORBA::ULong req_id;
+  CORBA::ULong req_id = 0;
   // Get the rest of the request header ...
   hdr_status = hdr_status && input.read_ulong (req_id);
 
diff --git a/TAO/tao/GIOP_Message_Lite.cpp b/TAO/tao/GIOP_Message_Lite.cpp
index b64d83e6940..25bed7f9928 100644
--- a/TAO/tao/GIOP_Message_Lite.cpp
+++ b/TAO/tao/GIOP_Message_Lite.cpp
@@ -1199,7 +1199,7 @@ TAO_GIOP_Message_Lite::write_request_header (
   // @@ (JP) Temporary hack until all of GIOP 1.2 is implemented.
   if (response_flags == TAO_TWOWAY_RESPONSE_FLAG)
     {
-      out_stream << CORBA::Any::from_octet (1);
+      out_stream << ACE_OutputCDR::from_octet (1);
     }
   // Sync scope - ignored by server if request is not oneway.
   else if (response_flags == CORBA::Octet (Messaging::SYNC_WITH_TRANSPORT)
@@ -1208,19 +1208,19 @@ TAO_GIOP_Message_Lite::write_request_header (
            || response_flags == CORBA::Octet (TAO::SYNC_DELAYED_BUFFERING))
     {
       // No response required.
-      out_stream << CORBA::Any::from_octet (0);
+      out_stream << ACE_OutputCDR::from_octet (0);
     }
   else if (response_flags == CORBA::Octet (Messaging::SYNC_WITH_SERVER))
     {
       // Return before dispatching servant.  We're also setting the high
       // bit here. This is a temporary fix until the rest of GIOP 1.2 is
       // implemented in TAO.
-      out_stream << CORBA::Any::from_octet (129);
+      out_stream << ACE_OutputCDR::from_octet (129);
     }
   else if (response_flags == CORBA::Octet (Messaging::SYNC_WITH_TARGET))
     {
       // Return after dispatching servant.
-      out_stream << CORBA::Any::from_octet (3);
+      out_stream << ACE_OutputCDR::from_octet (3);
     }
   else
     {
@@ -1301,7 +1301,7 @@ TAO_GIOP_Message_Lite::parse_request_header (TAO_ServerRequest &request)
 
   CORBA::Boolean hdr_status = (CORBA::Boolean) input.good_bit ();
 
-  CORBA::ULong req_id;
+  CORBA::ULong req_id = 0;
 
   // Get the rest of the request header ...
   hdr_status = hdr_status && input.read_ulong (req_id);
diff --git a/TAO/tao/IFR_Client.mpc b/TAO/tao/IFR_Client.mpc
index 308c3515373..e42a060b1ef 100644
--- a/TAO/tao/IFR_Client.mpc
+++ b/TAO/tao/IFR_Client.mpc
@@ -1,5 +1,5 @@
 //$Id$
-project : taolib, core {
+project : taolib, core, anytypecode {
   sharedname   = TAO_IFR_Client
   dynamicflags = TAO_IFR_CLIENT_BUILD_DLL
 
@@ -27,6 +27,9 @@ project : taolib, core {
     IFR_Client
   }
 
+  IDL_Files {
+  }
+
   Pkgconfig_Files {
     IFR_Client/TAO_IFR_Client.pc.in
   }
diff --git a/TAO/tao/IFR_Client/IFR_Base.pidl b/TAO/tao/IFR_Client/IFR_Base.pidl
index 5d20d202585..18cba35abea 100644
--- a/TAO/tao/IFR_Client/IFR_Base.pidl
+++ b/TAO/tao/IFR_Client/IFR_Base.pidl
@@ -14,7 +14,7 @@
  *
  * The command used to generate code from this IDL file is:
  *
- *   tao_idl -GA -Ge 1 -Sc -I../.. \
+ *   tao_idl -Ge 1 -Sc -I../.. \
  *        -Wb,export_macro=TAO_IFR_Client_Export \
  *        -Wb,export_include=ifr_client_export.h \
  *        -Wb,pre_include="ace/pre.h" \
diff --git a/TAO/tao/IFR_Client/IFR_BaseA.cpp b/TAO/tao/IFR_Client/IFR_BaseA.cpp
deleted file mode 100644
index 1ad270a8b88..00000000000
--- a/TAO/tao/IFR_Client/IFR_BaseA.cpp
+++ /dev/null
@@ -1,2979 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "IFR_BaseC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Enum_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
-#include "tao/Sequence_TypeCode_Static.h"
-#include "tao/String_TypeCode_Static.h"
-#include "tao/Struct_TypeCode_Static.h"
-#include "tao/TypeCode_Struct_Field.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
-#include "tao/Any_Dual_Impl_T.h"
-#include "tao/Any_Basic_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ScopedName (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/ScopedName:1.0",
-    "ScopedName",
-    &CORBA::_tc_string);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ScopedName =
-    &_tao_tc_CORBA_ScopedName;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/enum_typecode.cpp:34
-
-static char const * const _tao_enumerators_CORBA_DefinitionKind[] =
-  {
-    "dk_none",
-    "dk_all",
-    "dk_Attribute",
-    "dk_Constant",
-    "dk_Exception",
-    "dk_Interface",
-    "dk_Module",
-    "dk_Operation",
-    "dk_Typedef",
-    "dk_Alias",
-    "dk_Struct",
-    "dk_Union",
-    "dk_Enum",
-    "dk_Primitive",
-    "dk_String",
-    "dk_Sequence",
-    "dk_Array",
-    "dk_Repository",
-    "dk_Wstring",
-    "dk_Fixed",
-    "dk_Value",
-    "dk_ValueBox",
-    "dk_ValueMember",
-    "dk_Native",
-    "dk_AbstractInterface",
-    "dk_LocalInterface",
-    "dk_Component",
-    "dk_Home",
-    "dk_Factory",
-    "dk_Finder",
-    "dk_Emits",
-    "dk_Publishes",
-    "dk_Consumes",
-    "dk_Provides",
-    "dk_Uses",
-    "dk_Event"
-    
-  };
-
-static TAO::TypeCode::Enum<char const *,
-                           char const * const *,
-                           TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_DefinitionKind (
-    "IDL:omg.org/CORBA/DefinitionKind:1.0",
-    "DefinitionKind",
-    _tao_enumerators_CORBA_DefinitionKind,
-    36);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_DefinitionKind =
-    &_tao_tc_CORBA_DefinitionKind;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_IRObject (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/IRObject:1.0",
-    "IRObject");
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_IRObject =
-    &_tao_tc_CORBA_IRObject;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_VersionSpec (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/VersionSpec:1.0",
-    "VersionSpec",
-    &CORBA::_tc_string);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_VersionSpec =
-    &_tao_tc_CORBA_VersionSpec;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_Contained_Description[] =
-  {
-    { "kind", &CORBA::_tc_DefinitionKind },
-    { "value", &CORBA::_tc_any }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_Contained_Description (
-    CORBA::tk_struct,
-    "IDL:omg.org/CORBA/Contained/Description:1.0",
-    "Description",
-    _tao_fields_CORBA_Contained_Description,
-    2);
-  
-::CORBA::TypeCode_ptr const CORBA::Contained::_tc_Description =
-  &_tao_tc_CORBA_Contained_Description;
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_Contained (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/Contained:1.0",
-    "Contained");
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_Contained =
-    &_tao_tc_CORBA_Contained;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
-
-namespace CORBA
-{
-  extern ::CORBA::TypeCode_ptr const _tc_InterfaceDef;
-}
-
-
-#ifndef _TAO_TYPECODE_CORBA_InterfaceDefSeq_GUARD
-#define _TAO_TYPECODE_CORBA_InterfaceDefSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_InterfaceDefSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_InterfaceDef,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_InterfaceDefSeq_0 =
-      &CORBA_InterfaceDefSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_InterfaceDefSeq_GUARD */
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_InterfaceDefSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/InterfaceDefSeq:1.0",
-    "InterfaceDefSeq",
-    &TAO::TypeCode::tc_CORBA_InterfaceDefSeq_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_InterfaceDefSeq =
-    &_tao_tc_CORBA_InterfaceDefSeq;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
-
-namespace CORBA
-{
-  extern ::CORBA::TypeCode_ptr const _tc_ValueDef;
-}
-
-
-#ifndef _TAO_TYPECODE_CORBA_ValueDefSeq_GUARD
-#define _TAO_TYPECODE_CORBA_ValueDefSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_ValueDefSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_ValueDef,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_ValueDefSeq_0 =
-      &CORBA_ValueDefSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_ValueDefSeq_GUARD */
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ValueDefSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/ValueDefSeq:1.0",
-    "ValueDefSeq",
-    &TAO::TypeCode::tc_CORBA_ValueDefSeq_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ValueDefSeq =
-    &_tao_tc_CORBA_ValueDefSeq;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
-
-namespace CORBA
-{
-  extern ::CORBA::TypeCode_ptr const _tc_AbstractInterfaceDef;
-}
-
-
-#ifndef _TAO_TYPECODE_CORBA_AbstractInterfaceDefSeq_GUARD
-#define _TAO_TYPECODE_CORBA_AbstractInterfaceDefSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_AbstractInterfaceDefSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_AbstractInterfaceDef,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_AbstractInterfaceDefSeq_0 =
-      &CORBA_AbstractInterfaceDefSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_AbstractInterfaceDefSeq_GUARD */
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_AbstractInterfaceDefSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/AbstractInterfaceDefSeq:1.0",
-    "AbstractInterfaceDefSeq",
-    &TAO::TypeCode::tc_CORBA_AbstractInterfaceDefSeq_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_AbstractInterfaceDefSeq =
-    &_tao_tc_CORBA_AbstractInterfaceDefSeq;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
-
-namespace CORBA
-{
-  extern ::CORBA::TypeCode_ptr const _tc_LocalInterfaceDef;
-}
-
-
-#ifndef _TAO_TYPECODE_CORBA_LocalInterfaceDefSeq_GUARD
-#define _TAO_TYPECODE_CORBA_LocalInterfaceDefSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_LocalInterfaceDefSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_LocalInterfaceDef,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_LocalInterfaceDefSeq_0 =
-      &CORBA_LocalInterfaceDefSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_LocalInterfaceDefSeq_GUARD */
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_LocalInterfaceDefSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/LocalInterfaceDefSeq:1.0",
-    "LocalInterfaceDefSeq",
-    &TAO::TypeCode::tc_CORBA_LocalInterfaceDefSeq_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_LocalInterfaceDefSeq =
-    &_tao_tc_CORBA_LocalInterfaceDefSeq;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
-
-namespace CORBA
-{
-  extern ::CORBA::TypeCode_ptr const _tc_ExtInterfaceDef;
-}
-
-
-#ifndef _TAO_TYPECODE_CORBA_ExtInterfaceDefSeq_GUARD
-#define _TAO_TYPECODE_CORBA_ExtInterfaceDefSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_ExtInterfaceDefSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_ExtInterfaceDef,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_ExtInterfaceDefSeq_0 =
-      &CORBA_ExtInterfaceDefSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_ExtInterfaceDefSeq_GUARD */
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ExtInterfaceDefSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/ExtInterfaceDefSeq:1.0",
-    "ExtInterfaceDefSeq",
-    &TAO::TypeCode::tc_CORBA_ExtInterfaceDefSeq_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ExtInterfaceDefSeq =
-    &_tao_tc_CORBA_ExtInterfaceDefSeq;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
-
-namespace CORBA
-{
-  extern ::CORBA::TypeCode_ptr const _tc_ExtValueDef;
-}
-
-
-#ifndef _TAO_TYPECODE_CORBA_ExtValueDefSeq_GUARD
-#define _TAO_TYPECODE_CORBA_ExtValueDefSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_ExtValueDefSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_ExtValueDef,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_ExtValueDefSeq_0 =
-      &CORBA_ExtValueDefSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_ExtValueDefSeq_GUARD */
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ExtValueDefSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/ExtValueDefSeq:1.0",
-    "ExtValueDefSeq",
-    &TAO::TypeCode::tc_CORBA_ExtValueDefSeq_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ExtValueDefSeq =
-    &_tao_tc_CORBA_ExtValueDefSeq;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
-
-namespace CORBA
-{
-  extern ::CORBA::TypeCode_ptr const _tc_ExtAbstractInterfaceDef;
-}
-
-
-#ifndef _TAO_TYPECODE_CORBA_ExtAbstractInterfaceDefSeq_GUARD
-#define _TAO_TYPECODE_CORBA_ExtAbstractInterfaceDefSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_ExtAbstractInterfaceDefSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_ExtAbstractInterfaceDef,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_ExtAbstractInterfaceDefSeq_0 =
-      &CORBA_ExtAbstractInterfaceDefSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_ExtAbstractInterfaceDefSeq_GUARD */
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ExtAbstractInterfaceDefSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/ExtAbstractInterfaceDefSeq:1.0",
-    "ExtAbstractInterfaceDefSeq",
-    &TAO::TypeCode::tc_CORBA_ExtAbstractInterfaceDefSeq_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ExtAbstractInterfaceDefSeq =
-    &_tao_tc_CORBA_ExtAbstractInterfaceDefSeq;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
-
-namespace CORBA
-{
-  extern ::CORBA::TypeCode_ptr const _tc_ExtLocalInterfaceDef;
-}
-
-
-#ifndef _TAO_TYPECODE_CORBA_ExtLocalInterfaceDefSeq_GUARD
-#define _TAO_TYPECODE_CORBA_ExtLocalInterfaceDefSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_ExtLocalInterfaceDefSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_ExtLocalInterfaceDef,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_ExtLocalInterfaceDefSeq_0 =
-      &CORBA_ExtLocalInterfaceDefSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_ExtLocalInterfaceDefSeq_GUARD */
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ExtLocalInterfaceDefSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/ExtLocalInterfaceDefSeq:1.0",
-    "ExtLocalInterfaceDefSeq",
-    &TAO::TypeCode::tc_CORBA_ExtLocalInterfaceDefSeq_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ExtLocalInterfaceDefSeq =
-    &_tao_tc_CORBA_ExtLocalInterfaceDefSeq;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
-
-
-#ifndef _TAO_TYPECODE_CORBA_ContainedSeq_GUARD
-#define _TAO_TYPECODE_CORBA_ContainedSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_ContainedSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_Contained,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_ContainedSeq_0 =
-      &CORBA_ContainedSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_ContainedSeq_GUARD */
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ContainedSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/ContainedSeq:1.0",
-    "ContainedSeq",
-    &TAO::TypeCode::tc_CORBA_ContainedSeq_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ContainedSeq =
-    &_tao_tc_CORBA_ContainedSeq;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_StructMember[] =
-  {
-    { "name", &CORBA::_tc_Identifier },
-    { "type", &CORBA::_tc_TypeCode },
-    { "type_def", &CORBA::_tc_IDLType }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_StructMember (
-    CORBA::tk_struct,
-    "IDL:omg.org/CORBA/StructMember:1.0",
-    "StructMember",
-    _tao_fields_CORBA_StructMember,
-    3);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_StructMember =
-    &_tao_tc_CORBA_StructMember;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
-
-
-#ifndef _TAO_TYPECODE_CORBA_StructMemberSeq_GUARD
-#define _TAO_TYPECODE_CORBA_StructMemberSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_StructMemberSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_StructMember,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_StructMemberSeq_0 =
-      &CORBA_StructMemberSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_StructMemberSeq_GUARD */
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_StructMemberSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/StructMemberSeq:1.0",
-    "StructMemberSeq",
-    &TAO::TypeCode::tc_CORBA_StructMemberSeq_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_StructMemberSeq =
-    &_tao_tc_CORBA_StructMemberSeq;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_Initializer[] =
-  {
-    { "members", &CORBA::_tc_StructMemberSeq },
-    { "name", &CORBA::_tc_Identifier }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_Initializer (
-    CORBA::tk_struct,
-    "IDL:omg.org/CORBA/Initializer:1.0",
-    "Initializer",
-    _tao_fields_CORBA_Initializer,
-    2);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_Initializer =
-    &_tao_tc_CORBA_Initializer;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
-
-
-#ifndef _TAO_TYPECODE_CORBA_InitializerSeq_GUARD
-#define _TAO_TYPECODE_CORBA_InitializerSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_InitializerSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_Initializer,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_InitializerSeq_0 =
-      &CORBA_InitializerSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_InitializerSeq_GUARD */
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_InitializerSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/InitializerSeq:1.0",
-    "InitializerSeq",
-    &TAO::TypeCode::tc_CORBA_InitializerSeq_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_InitializerSeq =
-    &_tao_tc_CORBA_InitializerSeq;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_ExceptionDescription[] =
-  {
-    { "name", &CORBA::_tc_Identifier },
-    { "id", &CORBA::_tc_RepositoryId },
-    { "defined_in", &CORBA::_tc_RepositoryId },
-    { "version", &CORBA::_tc_VersionSpec },
-    { "type", &CORBA::_tc_TypeCode }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ExceptionDescription (
-    CORBA::tk_struct,
-    "IDL:omg.org/CORBA/ExceptionDescription:1.0",
-    "ExceptionDescription",
-    _tao_fields_CORBA_ExceptionDescription,
-    5);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ExceptionDescription =
-    &_tao_tc_CORBA_ExceptionDescription;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
-
-
-#ifndef _TAO_TYPECODE_CORBA_ExcDescriptionSeq_GUARD
-#define _TAO_TYPECODE_CORBA_ExcDescriptionSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_ExcDescriptionSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_ExceptionDescription,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_ExcDescriptionSeq_0 =
-      &CORBA_ExcDescriptionSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_ExcDescriptionSeq_GUARD */
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ExcDescriptionSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/ExcDescriptionSeq:1.0",
-    "ExcDescriptionSeq",
-    &TAO::TypeCode::tc_CORBA_ExcDescriptionSeq_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ExcDescriptionSeq =
-    &_tao_tc_CORBA_ExcDescriptionSeq;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_ExtInitializer[] =
-  {
-    { "members", &CORBA::_tc_StructMemberSeq },
-    { "exceptions", &CORBA::_tc_ExcDescriptionSeq },
-    { "name", &CORBA::_tc_Identifier }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ExtInitializer (
-    CORBA::tk_struct,
-    "IDL:omg.org/CORBA/ExtInitializer:1.0",
-    "ExtInitializer",
-    _tao_fields_CORBA_ExtInitializer,
-    3);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ExtInitializer =
-    &_tao_tc_CORBA_ExtInitializer;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
-
-
-#ifndef _TAO_TYPECODE_CORBA_ExtInitializerSeq_GUARD
-#define _TAO_TYPECODE_CORBA_ExtInitializerSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_ExtInitializerSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_ExtInitializer,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_ExtInitializerSeq_0 =
-      &CORBA_ExtInitializerSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_ExtInitializerSeq_GUARD */
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ExtInitializerSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/ExtInitializerSeq:1.0",
-    "ExtInitializerSeq",
-    &TAO::TypeCode::tc_CORBA_ExtInitializerSeq_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ExtInitializerSeq =
-    &_tao_tc_CORBA_ExtInitializerSeq;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_UnionMember[] =
-  {
-    { "name", &CORBA::_tc_Identifier },
-    { "label", &CORBA::_tc_any },
-    { "type", &CORBA::_tc_TypeCode },
-    { "type_def", &CORBA::_tc_IDLType }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_UnionMember (
-    CORBA::tk_struct,
-    "IDL:omg.org/CORBA/UnionMember:1.0",
-    "UnionMember",
-    _tao_fields_CORBA_UnionMember,
-    4);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_UnionMember =
-    &_tao_tc_CORBA_UnionMember;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
-
-
-#ifndef _TAO_TYPECODE_CORBA_UnionMemberSeq_GUARD
-#define _TAO_TYPECODE_CORBA_UnionMemberSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_UnionMemberSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_UnionMember,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_UnionMemberSeq_0 =
-      &CORBA_UnionMemberSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_UnionMemberSeq_GUARD */
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_UnionMemberSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/UnionMemberSeq:1.0",
-    "UnionMemberSeq",
-    &TAO::TypeCode::tc_CORBA_UnionMemberSeq_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_UnionMemberSeq =
-    &_tao_tc_CORBA_UnionMemberSeq;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
-
-
-#ifndef _TAO_TYPECODE_CORBA_EnumMemberSeq_GUARD
-#define _TAO_TYPECODE_CORBA_EnumMemberSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_EnumMemberSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_Identifier,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_EnumMemberSeq_0 =
-      &CORBA_EnumMemberSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_EnumMemberSeq_GUARD */
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_EnumMemberSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/EnumMemberSeq:1.0",
-    "EnumMemberSeq",
-    &TAO::TypeCode::tc_CORBA_EnumMemberSeq_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_EnumMemberSeq =
-    &_tao_tc_CORBA_EnumMemberSeq;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_Container_Description[] =
-  {
-    { "contained_object", &CORBA::_tc_Contained },
-    { "kind", &CORBA::_tc_DefinitionKind },
-    { "value", &CORBA::_tc_any }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_Container_Description (
-    CORBA::tk_struct,
-    "IDL:omg.org/CORBA/Container/Description:1.0",
-    "Description",
-    _tao_fields_CORBA_Container_Description,
-    3);
-  
-::CORBA::TypeCode_ptr const CORBA::Container::_tc_Description =
-  &_tao_tc_CORBA_Container_Description;
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
-
-
-#ifndef _TAO_TYPECODE_CORBA_Container_DescriptionSeq_GUARD
-#define _TAO_TYPECODE_CORBA_Container_DescriptionSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_Container_DescriptionSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::Container::_tc_Description,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_Container_DescriptionSeq_0 =
-      &CORBA_Container_DescriptionSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_Container_DescriptionSeq_GUARD */
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_Container_DescriptionSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/Container/DescriptionSeq:1.0",
-    "DescriptionSeq",
-    &TAO::TypeCode::tc_CORBA_Container_DescriptionSeq_0);
-  
-::CORBA::TypeCode_ptr const CORBA::Container::_tc_DescriptionSeq =
-  &_tao_tc_CORBA_Container_DescriptionSeq;
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_Container (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/Container:1.0",
-    "Container");
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_Container =
-    &_tao_tc_CORBA_Container;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_IDLType (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/IDLType:1.0",
-    "IDLType");
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_IDLType =
-    &_tao_tc_CORBA_IDLType;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_TypedefDef (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/TypedefDef:1.0",
-    "TypedefDef");
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_TypedefDef =
-    &_tao_tc_CORBA_TypedefDef;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_TypeDescription[] =
-  {
-    { "name", &CORBA::_tc_Identifier },
-    { "id", &CORBA::_tc_RepositoryId },
-    { "defined_in", &CORBA::_tc_RepositoryId },
-    { "version", &CORBA::_tc_VersionSpec },
-    { "type", &CORBA::_tc_TypeCode }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_TypeDescription (
-    CORBA::tk_struct,
-    "IDL:omg.org/CORBA/TypeDescription:1.0",
-    "TypeDescription",
-    _tao_fields_CORBA_TypeDescription,
-    5);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_TypeDescription =
-    &_tao_tc_CORBA_TypeDescription;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_enum/any_op_cs.cpp:52
-
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::DefinitionKind _tao_elem
-  )
-{
-  TAO::Any_Basic_Impl_T<CORBA::DefinitionKind>::insert (
-      _tao_any,
-      CORBA::_tc_DefinitionKind,
-      _tao_elem
-    );
-}
-
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::DefinitionKind &_tao_elem
-  )
-{
-  return
-    TAO::Any_Basic_Impl_T<CORBA::DefinitionKind>::extract (
-        _tao_any,
-        CORBA::_tc_DefinitionKind,
-        _tao_elem 
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::IRObject>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::IRObject_ptr _tao_elem
-  )
-{
-  CORBA::IRObject_ptr _tao_objptr =
-    CORBA::IRObject::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::IRObject_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::IRObject>::insert (
-      _tao_any,
-      CORBA::IRObject::_tao_any_destructor,
-      CORBA::_tc_IRObject,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::IRObject_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::IRObject>::extract (
-        _tao_any,
-        CORBA::IRObject::_tao_any_destructor,
-        CORBA::_tc_IRObject,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::Contained>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::Contained_ptr _tao_elem
-  )
-{
-  CORBA::Contained_ptr _tao_objptr =
-    CORBA::Contained::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::Contained_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::Contained>::insert (
-      _tao_any,
-      CORBA::Contained::_tao_any_destructor,
-      CORBA::_tc_Contained,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::Contained_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::Contained>::extract (
-        _tao_any,
-        CORBA::Contained::_tao_any_destructor,
-        CORBA::_tc_Contained,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::Contained::Description &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::Contained::Description>::insert_copy (
-      _tao_any,
-      CORBA::Contained::Description::_tao_any_destructor,
-      CORBA::Contained::_tc_Description,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::Contained::Description *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::Contained::Description>::insert (
-      _tao_any,
-      CORBA::Contained::Description::_tao_any_destructor,
-      CORBA::Contained::_tc_Description,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::Contained::Description *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::Contained::Description *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::Contained::Description *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::Contained::Description>::extract (
-        _tao_any,
-        CORBA::Contained::Description::_tao_any_destructor,
-        CORBA::Contained::_tc_Description,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::InterfaceDefSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::InterfaceDefSeq>::insert_copy (
-      _tao_any,
-      CORBA::InterfaceDefSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_InterfaceDefSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::InterfaceDefSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::InterfaceDefSeq>::insert (
-      _tao_any,
-      CORBA::InterfaceDefSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_InterfaceDefSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::InterfaceDefSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::InterfaceDefSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::InterfaceDefSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::InterfaceDefSeq>::extract (
-        _tao_any,
-        CORBA::InterfaceDefSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_InterfaceDefSeq_0,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::ValueDefSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ValueDefSeq>::insert_copy (
-      _tao_any,
-      CORBA::ValueDefSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_ValueDefSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ValueDefSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ValueDefSeq>::insert (
-      _tao_any,
-      CORBA::ValueDefSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_ValueDefSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ValueDefSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::ValueDefSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::ValueDefSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::ValueDefSeq>::extract (
-        _tao_any,
-        CORBA::ValueDefSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_ValueDefSeq_0,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::AbstractInterfaceDefSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::AbstractInterfaceDefSeq>::insert_copy (
-      _tao_any,
-      CORBA::AbstractInterfaceDefSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_AbstractInterfaceDefSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::AbstractInterfaceDefSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::AbstractInterfaceDefSeq>::insert (
-      _tao_any,
-      CORBA::AbstractInterfaceDefSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_AbstractInterfaceDefSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::AbstractInterfaceDefSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::AbstractInterfaceDefSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::AbstractInterfaceDefSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::AbstractInterfaceDefSeq>::extract (
-        _tao_any,
-        CORBA::AbstractInterfaceDefSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_AbstractInterfaceDefSeq_0,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::LocalInterfaceDefSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::LocalInterfaceDefSeq>::insert_copy (
-      _tao_any,
-      CORBA::LocalInterfaceDefSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_LocalInterfaceDefSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::LocalInterfaceDefSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::LocalInterfaceDefSeq>::insert (
-      _tao_any,
-      CORBA::LocalInterfaceDefSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_LocalInterfaceDefSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::LocalInterfaceDefSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::LocalInterfaceDefSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::LocalInterfaceDefSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::LocalInterfaceDefSeq>::extract (
-        _tao_any,
-        CORBA::LocalInterfaceDefSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_LocalInterfaceDefSeq_0,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::ExtInterfaceDefSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ExtInterfaceDefSeq>::insert_copy (
-      _tao_any,
-      CORBA::ExtInterfaceDefSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_ExtInterfaceDefSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ExtInterfaceDefSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ExtInterfaceDefSeq>::insert (
-      _tao_any,
-      CORBA::ExtInterfaceDefSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_ExtInterfaceDefSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ExtInterfaceDefSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::ExtInterfaceDefSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::ExtInterfaceDefSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::ExtInterfaceDefSeq>::extract (
-        _tao_any,
-        CORBA::ExtInterfaceDefSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_ExtInterfaceDefSeq_0,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::ExtValueDefSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ExtValueDefSeq>::insert_copy (
-      _tao_any,
-      CORBA::ExtValueDefSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_ExtValueDefSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ExtValueDefSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ExtValueDefSeq>::insert (
-      _tao_any,
-      CORBA::ExtValueDefSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_ExtValueDefSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ExtValueDefSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::ExtValueDefSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::ExtValueDefSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::ExtValueDefSeq>::extract (
-        _tao_any,
-        CORBA::ExtValueDefSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_ExtValueDefSeq_0,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::ExtAbstractInterfaceDefSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ExtAbstractInterfaceDefSeq>::insert_copy (
-      _tao_any,
-      CORBA::ExtAbstractInterfaceDefSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_ExtAbstractInterfaceDefSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ExtAbstractInterfaceDefSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ExtAbstractInterfaceDefSeq>::insert (
-      _tao_any,
-      CORBA::ExtAbstractInterfaceDefSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_ExtAbstractInterfaceDefSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ExtAbstractInterfaceDefSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::ExtAbstractInterfaceDefSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::ExtAbstractInterfaceDefSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::ExtAbstractInterfaceDefSeq>::extract (
-        _tao_any,
-        CORBA::ExtAbstractInterfaceDefSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_ExtAbstractInterfaceDefSeq_0,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::ExtLocalInterfaceDefSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ExtLocalInterfaceDefSeq>::insert_copy (
-      _tao_any,
-      CORBA::ExtLocalInterfaceDefSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_ExtLocalInterfaceDefSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ExtLocalInterfaceDefSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ExtLocalInterfaceDefSeq>::insert (
-      _tao_any,
-      CORBA::ExtLocalInterfaceDefSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_ExtLocalInterfaceDefSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ExtLocalInterfaceDefSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::ExtLocalInterfaceDefSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::ExtLocalInterfaceDefSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::ExtLocalInterfaceDefSeq>::extract (
-        _tao_any,
-        CORBA::ExtLocalInterfaceDefSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_ExtLocalInterfaceDefSeq_0,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::ContainedSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ContainedSeq>::insert_copy (
-      _tao_any,
-      CORBA::ContainedSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_ContainedSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ContainedSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ContainedSeq>::insert (
-      _tao_any,
-      CORBA::ContainedSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_ContainedSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ContainedSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::ContainedSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::ContainedSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::ContainedSeq>::extract (
-        _tao_any,
-        CORBA::ContainedSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_ContainedSeq_0,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::StructMember &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::StructMember>::insert_copy (
-      _tao_any,
-      CORBA::StructMember::_tao_any_destructor,
-      CORBA::_tc_StructMember,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::StructMember *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::StructMember>::insert (
-      _tao_any,
-      CORBA::StructMember::_tao_any_destructor,
-      CORBA::_tc_StructMember,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::StructMember *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::StructMember *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::StructMember *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::StructMember>::extract (
-        _tao_any,
-        CORBA::StructMember::_tao_any_destructor,
-        CORBA::_tc_StructMember,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::StructMemberSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::StructMemberSeq>::insert_copy (
-      _tao_any,
-      CORBA::StructMemberSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_StructMemberSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::StructMemberSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::StructMemberSeq>::insert (
-      _tao_any,
-      CORBA::StructMemberSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_StructMemberSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::StructMemberSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::StructMemberSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::StructMemberSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::StructMemberSeq>::extract (
-        _tao_any,
-        CORBA::StructMemberSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_StructMemberSeq_0,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::Initializer &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::Initializer>::insert_copy (
-      _tao_any,
-      CORBA::Initializer::_tao_any_destructor,
-      CORBA::_tc_Initializer,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::Initializer *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::Initializer>::insert (
-      _tao_any,
-      CORBA::Initializer::_tao_any_destructor,
-      CORBA::_tc_Initializer,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::Initializer *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::Initializer *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::Initializer *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::Initializer>::extract (
-        _tao_any,
-        CORBA::Initializer::_tao_any_destructor,
-        CORBA::_tc_Initializer,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::InitializerSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::InitializerSeq>::insert_copy (
-      _tao_any,
-      CORBA::InitializerSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_InitializerSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::InitializerSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::InitializerSeq>::insert (
-      _tao_any,
-      CORBA::InitializerSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_InitializerSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::InitializerSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::InitializerSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::InitializerSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::InitializerSeq>::extract (
-        _tao_any,
-        CORBA::InitializerSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_InitializerSeq_0,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::ExceptionDescription &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ExceptionDescription>::insert_copy (
-      _tao_any,
-      CORBA::ExceptionDescription::_tao_any_destructor,
-      CORBA::_tc_ExceptionDescription,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ExceptionDescription *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ExceptionDescription>::insert (
-      _tao_any,
-      CORBA::ExceptionDescription::_tao_any_destructor,
-      CORBA::_tc_ExceptionDescription,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ExceptionDescription *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::ExceptionDescription *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::ExceptionDescription *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::ExceptionDescription>::extract (
-        _tao_any,
-        CORBA::ExceptionDescription::_tao_any_destructor,
-        CORBA::_tc_ExceptionDescription,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::ExcDescriptionSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ExcDescriptionSeq>::insert_copy (
-      _tao_any,
-      CORBA::ExcDescriptionSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_ExcDescriptionSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ExcDescriptionSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ExcDescriptionSeq>::insert (
-      _tao_any,
-      CORBA::ExcDescriptionSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_ExcDescriptionSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ExcDescriptionSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::ExcDescriptionSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::ExcDescriptionSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::ExcDescriptionSeq>::extract (
-        _tao_any,
-        CORBA::ExcDescriptionSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_ExcDescriptionSeq_0,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::ExtInitializer &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ExtInitializer>::insert_copy (
-      _tao_any,
-      CORBA::ExtInitializer::_tao_any_destructor,
-      CORBA::_tc_ExtInitializer,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ExtInitializer *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ExtInitializer>::insert (
-      _tao_any,
-      CORBA::ExtInitializer::_tao_any_destructor,
-      CORBA::_tc_ExtInitializer,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ExtInitializer *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::ExtInitializer *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::ExtInitializer *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::ExtInitializer>::extract (
-        _tao_any,
-        CORBA::ExtInitializer::_tao_any_destructor,
-        CORBA::_tc_ExtInitializer,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::ExtInitializerSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ExtInitializerSeq>::insert_copy (
-      _tao_any,
-      CORBA::ExtInitializerSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_ExtInitializerSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ExtInitializerSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ExtInitializerSeq>::insert (
-      _tao_any,
-      CORBA::ExtInitializerSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_ExtInitializerSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ExtInitializerSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::ExtInitializerSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::ExtInitializerSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::ExtInitializerSeq>::extract (
-        _tao_any,
-        CORBA::ExtInitializerSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_ExtInitializerSeq_0,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::UnionMember &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::UnionMember>::insert_copy (
-      _tao_any,
-      CORBA::UnionMember::_tao_any_destructor,
-      CORBA::_tc_UnionMember,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::UnionMember *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::UnionMember>::insert (
-      _tao_any,
-      CORBA::UnionMember::_tao_any_destructor,
-      CORBA::_tc_UnionMember,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::UnionMember *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::UnionMember *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::UnionMember *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::UnionMember>::extract (
-        _tao_any,
-        CORBA::UnionMember::_tao_any_destructor,
-        CORBA::_tc_UnionMember,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::UnionMemberSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::UnionMemberSeq>::insert_copy (
-      _tao_any,
-      CORBA::UnionMemberSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_UnionMemberSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::UnionMemberSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::UnionMemberSeq>::insert (
-      _tao_any,
-      CORBA::UnionMemberSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_UnionMemberSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::UnionMemberSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::UnionMemberSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::UnionMemberSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::UnionMemberSeq>::extract (
-        _tao_any,
-        CORBA::UnionMemberSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_UnionMemberSeq_0,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::EnumMemberSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::EnumMemberSeq>::insert_copy (
-      _tao_any,
-      CORBA::EnumMemberSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_EnumMemberSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::EnumMemberSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::EnumMemberSeq>::insert (
-      _tao_any,
-      CORBA::EnumMemberSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_EnumMemberSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::EnumMemberSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::EnumMemberSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::EnumMemberSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::EnumMemberSeq>::extract (
-        _tao_any,
-        CORBA::EnumMemberSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_EnumMemberSeq_0,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::Container>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::Container_ptr _tao_elem
-  )
-{
-  CORBA::Container_ptr _tao_objptr =
-    CORBA::Container::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::Container_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::Container>::insert (
-      _tao_any,
-      CORBA::Container::_tao_any_destructor,
-      CORBA::_tc_Container,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::Container_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::Container>::extract (
-        _tao_any,
-        CORBA::Container::_tao_any_destructor,
-        CORBA::_tc_Container,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::Container::Description &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::Container::Description>::insert_copy (
-      _tao_any,
-      CORBA::Container::Description::_tao_any_destructor,
-      CORBA::Container::_tc_Description,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::Container::Description *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::Container::Description>::insert (
-      _tao_any,
-      CORBA::Container::Description::_tao_any_destructor,
-      CORBA::Container::_tc_Description,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::Container::Description *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::Container::Description *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::Container::Description *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::Container::Description>::extract (
-        _tao_any,
-        CORBA::Container::Description::_tao_any_destructor,
-        CORBA::Container::_tc_Description,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::Container::DescriptionSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::Container::DescriptionSeq>::insert_copy (
-      _tao_any,
-      CORBA::Container::DescriptionSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_Container_DescriptionSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::Container::DescriptionSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::Container::DescriptionSeq>::insert (
-      _tao_any,
-      CORBA::Container::DescriptionSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_Container_DescriptionSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::Container::DescriptionSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::Container::DescriptionSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::Container::DescriptionSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::Container::DescriptionSeq>::extract (
-        _tao_any,
-        CORBA::Container::DescriptionSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_Container_DescriptionSeq_0,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::IDLType>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::IDLType_ptr _tao_elem
-  )
-{
-  CORBA::IDLType_ptr _tao_objptr =
-    CORBA::IDLType::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::IDLType_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::IDLType>::insert (
-      _tao_any,
-      CORBA::IDLType::_tao_any_destructor,
-      CORBA::_tc_IDLType,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::IDLType_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::IDLType>::extract (
-        _tao_any,
-        CORBA::IDLType::_tao_any_destructor,
-        CORBA::_tc_IDLType,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::TypedefDef>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::TypedefDef_ptr _tao_elem
-  )
-{
-  CORBA::TypedefDef_ptr _tao_objptr =
-    CORBA::TypedefDef::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::TypedefDef_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::TypedefDef>::insert (
-      _tao_any,
-      CORBA::TypedefDef::_tao_any_destructor,
-      CORBA::_tc_TypedefDef,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::TypedefDef_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::TypedefDef>::extract (
-        _tao_any,
-        CORBA::TypedefDef::_tao_any_destructor,
-        CORBA::_tc_TypedefDef,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::TypeDescription &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::TypeDescription>::insert_copy (
-      _tao_any,
-      CORBA::TypeDescription::_tao_any_destructor,
-      CORBA::_tc_TypeDescription,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::TypeDescription *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::TypeDescription>::insert (
-      _tao_any,
-      CORBA::TypeDescription::_tao_any_destructor,
-      CORBA::_tc_TypeDescription,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::TypeDescription *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::TypeDescription *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::TypeDescription *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::TypeDescription>::extract (
-        _tao_any,
-        CORBA::TypeDescription::_tao_any_destructor,
-        CORBA::_tc_TypeDescription,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/ValueModifierC.cpp b/TAO/tao/IFR_Client/IFR_BaseA.h
index 76644c8b3c0..96586934203 100644
--- a/TAO/tao/ValueModifierC.cpp
+++ b/TAO/tao/IFR_Client/IFR_BaseA.h
@@ -26,21 +26,19 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:291
+// be\be_codegen.cpp:390
 
+#ifndef _TAO_IDL_ORIG_IFR_BASEA_H
+#define _TAO_IDL_ORIG_IFR_BASEA_H
 
-#include "ValueModifierC.h"
-#include "tao/CDR.h"
+#include /**/ "ace/pre.h"
 
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
+#include "tao/IFR_Client/IFR_BaseC.h"
 
-// TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:70
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
 
-// Arg traits specializations.
-namespace TAO
-{
-}
+#include /**/ "ace/post.h"
+#endif /* ifndef */
 
diff --git a/TAO/tao/IFR_Client/IFR_BaseC.cpp b/TAO/tao/IFR_Client/IFR_BaseC.cpp
index d33177a1829..339d9aea34e 100644
--- a/TAO/tao/IFR_Client/IFR_BaseC.cpp
+++ b/TAO/tao/IFR_Client/IFR_BaseC.cpp
@@ -26,20 +26,33 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:291
+// be\be_codegen.cpp:293
 
 
 #include "IFR_BaseC.h"
 #include "tao/CDR.h"
-#include "tao/Exception_Data.h"
+#include "tao/AnyTypeCode/orb_typesA.h"
+#include "tao/AnyTypeCode/Typecode_typesA.h"
 #include "tao/Invocation_Adapter.h"
 #include "tao/Object_T.h"
+#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Enum_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Sequence_TypeCode_Static.h"
+#include "tao/AnyTypeCode/String_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Struct_TypeCode_Static.h"
+#include "tao/AnyTypeCode/TypeCode_Struct_Field.h"
+#include "tao/AnyTypeCode/Any_Impl_T.h"
+#include "tao/AnyTypeCode/Any_Dual_Impl_T.h"
+#include "tao/AnyTypeCode/Any_Basic_Impl_T.h"
 #include "tao/Basic_Arguments.h"
 #include "tao/Object_Argument_T.h"
 #include "tao/Special_Basic_Arguments.h"
 #include "tao/UB_String_Arguments.h"
 #include "tao/Var_Size_Argument_T.h"
-#include "tao/Any_Arg_Traits.h"
+#include "tao/AnyTypeCode/Any_Arg_Traits.h"
 #include "ace/OS_NS_string.h"
 
 #if defined (__BORLANDC__)
@@ -51,31 +64,35 @@
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
+// be\be_visitor_arg_traits.cpp:70
 
 // Arg traits specializations.
 namespace TAO
 {
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:709
+  // be\be_visitor_arg_traits.cpp:786
 
-#if !defined (_CORBA_DEFINITIONKIND__ARG_TRAITS_CS_)
-#define _CORBA_DEFINITIONKIND__ARG_TRAITS_CS_
+#if !defined (_CORBA_DEFINITIONKIND__ARG_TRAITS_)
+#define _CORBA_DEFINITIONKIND__ARG_TRAITS_
   
   template<>
   class Arg_Traits<CORBA::DefinitionKind>
     : public
         Basic_Arg_Traits_T<
-            CORBA::DefinitionKind
+            CORBA::DefinitionKind,
+            TAO::Any_Insert_Policy_Stream <CORBA::DefinitionKind>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_CONTAINED__ARG_TRAITS_CS_)
-#define _CORBA_CONTAINED__ARG_TRAITS_CS_
+#if !defined (_CORBA_CONTAINED__ARG_TRAITS_)
+#define _CORBA_CONTAINED__ARG_TRAITS_
   
   template<>
   class  Arg_Traits<CORBA::Contained>
@@ -84,7 +101,8 @@ namespace TAO
             CORBA::Contained_ptr,
             CORBA::Contained_var,
             CORBA::Contained_out,
-            TAO::Objref_Traits<CORBA::Contained>
+            TAO::Objref_Traits<CORBA::Contained>,
+            TAO::Any_Insert_Policy_Stream <CORBA::Contained_ptr>
           >
   {
   };
@@ -92,10 +110,10 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:751
+  // be\be_visitor_arg_traits.cpp:828
 
-#if !defined (_CORBA_CONTAINED_DESCRIPTION__ARG_TRAITS_CS_)
-#define _CORBA_CONTAINED_DESCRIPTION__ARG_TRAITS_CS_
+#if !defined (_CORBA_CONTAINED_DESCRIPTION__ARG_TRAITS_)
+#define _CORBA_CONTAINED_DESCRIPTION__ARG_TRAITS_
   
   template<>
   class Arg_Traits<CORBA::Contained::Description>
@@ -103,15 +121,19 @@ namespace TAO
         Var_Size_Arg_Traits_T<
             CORBA::Contained::Description,
             CORBA::Contained::Description_var,
-            CORBA::Contained::Description_out
+            CORBA::Contained::Description_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::Contained::Description>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_REPOSITORY__ARG_TRAITS_CS_)
-#define _CORBA_REPOSITORY__ARG_TRAITS_CS_
+#if !defined (_CORBA_REPOSITORY__ARG_TRAITS_)
+#define _CORBA_REPOSITORY__ARG_TRAITS_
   
   template<>
   class  Arg_Traits<CORBA::Repository>
@@ -120,15 +142,19 @@ namespace TAO
             CORBA::Repository_ptr,
             CORBA::Repository_var,
             CORBA::Repository_out,
-            TAO::Objref_Traits<CORBA::Repository>
+            TAO::Objref_Traits<CORBA::Repository>,
+            TAO::Any_Insert_Policy_Stream <CORBA::Repository_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_CONTAINER__ARG_TRAITS_CS_)
-#define _CORBA_CONTAINER__ARG_TRAITS_CS_
+#if !defined (_CORBA_CONTAINER__ARG_TRAITS_)
+#define _CORBA_CONTAINER__ARG_TRAITS_
   
   template<>
   class  Arg_Traits<CORBA::Container>
@@ -137,7 +163,8 @@ namespace TAO
             CORBA::Container_ptr,
             CORBA::Container_var,
             CORBA::Container_out,
-            TAO::Objref_Traits<CORBA::Container>
+            TAO::Objref_Traits<CORBA::Container>,
+            TAO::Any_Insert_Policy_Stream <CORBA::Container_ptr>
           >
   {
   };
@@ -145,10 +172,10 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:496
+  // be\be_visitor_arg_traits.cpp:543
 
-#if !defined (_CORBA_CONTAINER_DESCRIPTIONSEQ__ARG_TRAITS_CS_)
-#define _CORBA_CONTAINER_DESCRIPTIONSEQ__ARG_TRAITS_CS_
+#if !defined (_CORBA_CONTAINER_DESCRIPTIONSEQ__ARG_TRAITS_)
+#define _CORBA_CONTAINER_DESCRIPTIONSEQ__ARG_TRAITS_
   
   template<>
   class Arg_Traits<CORBA::Container::DescriptionSeq>
@@ -156,15 +183,19 @@ namespace TAO
         Var_Size_Arg_Traits_T<
             CORBA::Container::DescriptionSeq,
             CORBA::Container::DescriptionSeq_var,
-            CORBA::Container::DescriptionSeq_out
+            CORBA::Container::DescriptionSeq_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::Container::DescriptionSeq>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_MODULEDEF__ARG_TRAITS_CS_)
-#define _CORBA_MODULEDEF__ARG_TRAITS_CS_
+#if !defined (_CORBA_MODULEDEF__ARG_TRAITS_)
+#define _CORBA_MODULEDEF__ARG_TRAITS_
   
   template<>
   class  Arg_Traits<CORBA::ModuleDef>
@@ -173,15 +204,19 @@ namespace TAO
             CORBA::ModuleDef_ptr,
             CORBA::ModuleDef_var,
             CORBA::ModuleDef_out,
-            TAO::Objref_Traits<CORBA::ModuleDef>
+            TAO::Objref_Traits<CORBA::ModuleDef>,
+            TAO::Any_Insert_Policy_Stream <CORBA::ModuleDef_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_CONSTANTDEF__ARG_TRAITS_CS_)
-#define _CORBA_CONSTANTDEF__ARG_TRAITS_CS_
+#if !defined (_CORBA_CONSTANTDEF__ARG_TRAITS_)
+#define _CORBA_CONSTANTDEF__ARG_TRAITS_
   
   template<>
   class  Arg_Traits<CORBA::ConstantDef>
@@ -190,15 +225,19 @@ namespace TAO
             CORBA::ConstantDef_ptr,
             CORBA::ConstantDef_var,
             CORBA::ConstantDef_out,
-            TAO::Objref_Traits<CORBA::ConstantDef>
+            TAO::Objref_Traits<CORBA::ConstantDef>,
+            TAO::Any_Insert_Policy_Stream <CORBA::ConstantDef_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_IDLTYPE__ARG_TRAITS_CS_)
-#define _CORBA_IDLTYPE__ARG_TRAITS_CS_
+#if !defined (_CORBA_IDLTYPE__ARG_TRAITS_)
+#define _CORBA_IDLTYPE__ARG_TRAITS_
   
   template<>
   class  Arg_Traits<CORBA::IDLType>
@@ -207,15 +246,19 @@ namespace TAO
             CORBA::IDLType_ptr,
             CORBA::IDLType_var,
             CORBA::IDLType_out,
-            TAO::Objref_Traits<CORBA::IDLType>
+            TAO::Objref_Traits<CORBA::IDLType>,
+            TAO::Any_Insert_Policy_Stream <CORBA::IDLType_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_STRUCTDEF__ARG_TRAITS_CS_)
-#define _CORBA_STRUCTDEF__ARG_TRAITS_CS_
+#if !defined (_CORBA_STRUCTDEF__ARG_TRAITS_)
+#define _CORBA_STRUCTDEF__ARG_TRAITS_
   
   template<>
   class  Arg_Traits<CORBA::StructDef>
@@ -224,15 +267,19 @@ namespace TAO
             CORBA::StructDef_ptr,
             CORBA::StructDef_var,
             CORBA::StructDef_out,
-            TAO::Objref_Traits<CORBA::StructDef>
+            TAO::Objref_Traits<CORBA::StructDef>,
+            TAO::Any_Insert_Policy_Stream <CORBA::StructDef_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_UNIONDEF__ARG_TRAITS_CS_)
-#define _CORBA_UNIONDEF__ARG_TRAITS_CS_
+#if !defined (_CORBA_UNIONDEF__ARG_TRAITS_)
+#define _CORBA_UNIONDEF__ARG_TRAITS_
   
   template<>
   class  Arg_Traits<CORBA::UnionDef>
@@ -241,15 +288,19 @@ namespace TAO
             CORBA::UnionDef_ptr,
             CORBA::UnionDef_var,
             CORBA::UnionDef_out,
-            TAO::Objref_Traits<CORBA::UnionDef>
+            TAO::Objref_Traits<CORBA::UnionDef>,
+            TAO::Any_Insert_Policy_Stream <CORBA::UnionDef_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_ENUMDEF__ARG_TRAITS_CS_)
-#define _CORBA_ENUMDEF__ARG_TRAITS_CS_
+#if !defined (_CORBA_ENUMDEF__ARG_TRAITS_)
+#define _CORBA_ENUMDEF__ARG_TRAITS_
   
   template<>
   class  Arg_Traits<CORBA::EnumDef>
@@ -258,15 +309,19 @@ namespace TAO
             CORBA::EnumDef_ptr,
             CORBA::EnumDef_var,
             CORBA::EnumDef_out,
-            TAO::Objref_Traits<CORBA::EnumDef>
+            TAO::Objref_Traits<CORBA::EnumDef>,
+            TAO::Any_Insert_Policy_Stream <CORBA::EnumDef_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_ALIASDEF__ARG_TRAITS_CS_)
-#define _CORBA_ALIASDEF__ARG_TRAITS_CS_
+#if !defined (_CORBA_ALIASDEF__ARG_TRAITS_)
+#define _CORBA_ALIASDEF__ARG_TRAITS_
   
   template<>
   class  Arg_Traits<CORBA::AliasDef>
@@ -275,15 +330,19 @@ namespace TAO
             CORBA::AliasDef_ptr,
             CORBA::AliasDef_var,
             CORBA::AliasDef_out,
-            TAO::Objref_Traits<CORBA::AliasDef>
+            TAO::Objref_Traits<CORBA::AliasDef>,
+            TAO::Any_Insert_Policy_Stream <CORBA::AliasDef_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_INTERFACEDEF__ARG_TRAITS_CS_)
-#define _CORBA_INTERFACEDEF__ARG_TRAITS_CS_
+#if !defined (_CORBA_INTERFACEDEF__ARG_TRAITS_)
+#define _CORBA_INTERFACEDEF__ARG_TRAITS_
   
   template<>
   class  Arg_Traits<CORBA::InterfaceDef>
@@ -292,7 +351,8 @@ namespace TAO
             CORBA::InterfaceDef_ptr,
             CORBA::InterfaceDef_var,
             CORBA::InterfaceDef_out,
-            TAO::Objref_Traits<CORBA::InterfaceDef>
+            TAO::Objref_Traits<CORBA::InterfaceDef>,
+            TAO::Any_Insert_Policy_Stream <CORBA::InterfaceDef_ptr>
           >
   {
   };
@@ -300,10 +360,10 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:496
+  // be\be_visitor_arg_traits.cpp:543
 
-#if !defined (_CORBA_INTERFACEDEFSEQ__ARG_TRAITS_CS_)
-#define _CORBA_INTERFACEDEFSEQ__ARG_TRAITS_CS_
+#if !defined (_CORBA_INTERFACEDEFSEQ__ARG_TRAITS_)
+#define _CORBA_INTERFACEDEFSEQ__ARG_TRAITS_
   
   template<>
   class Arg_Traits<CORBA::InterfaceDefSeq>
@@ -311,15 +371,19 @@ namespace TAO
         Var_Size_Arg_Traits_T<
             CORBA::InterfaceDefSeq,
             CORBA::InterfaceDefSeq_var,
-            CORBA::InterfaceDefSeq_out
+            CORBA::InterfaceDefSeq_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::InterfaceDefSeq>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_EXCEPTIONDEF__ARG_TRAITS_CS_)
-#define _CORBA_EXCEPTIONDEF__ARG_TRAITS_CS_
+#if !defined (_CORBA_EXCEPTIONDEF__ARG_TRAITS_)
+#define _CORBA_EXCEPTIONDEF__ARG_TRAITS_
   
   template<>
   class  Arg_Traits<CORBA::ExceptionDef>
@@ -328,15 +392,19 @@ namespace TAO
             CORBA::ExceptionDef_ptr,
             CORBA::ExceptionDef_var,
             CORBA::ExceptionDef_out,
-            TAO::Objref_Traits<CORBA::ExceptionDef>
+            TAO::Objref_Traits<CORBA::ExceptionDef>,
+            TAO::Any_Insert_Policy_Stream <CORBA::ExceptionDef_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_NATIVEDEF__ARG_TRAITS_CS_)
-#define _CORBA_NATIVEDEF__ARG_TRAITS_CS_
+#if !defined (_CORBA_NATIVEDEF__ARG_TRAITS_)
+#define _CORBA_NATIVEDEF__ARG_TRAITS_
   
   template<>
   class  Arg_Traits<CORBA::NativeDef>
@@ -345,15 +413,19 @@ namespace TAO
             CORBA::NativeDef_ptr,
             CORBA::NativeDef_var,
             CORBA::NativeDef_out,
-            TAO::Objref_Traits<CORBA::NativeDef>
+            TAO::Objref_Traits<CORBA::NativeDef>,
+            TAO::Any_Insert_Policy_Stream <CORBA::NativeDef_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_VALUEDEF__ARG_TRAITS_CS_)
-#define _CORBA_VALUEDEF__ARG_TRAITS_CS_
+#if !defined (_CORBA_VALUEDEF__ARG_TRAITS_)
+#define _CORBA_VALUEDEF__ARG_TRAITS_
   
   template<>
   class  Arg_Traits<CORBA::ValueDef>
@@ -362,7 +434,8 @@ namespace TAO
             CORBA::ValueDef_ptr,
             CORBA::ValueDef_var,
             CORBA::ValueDef_out,
-            TAO::Objref_Traits<CORBA::ValueDef>
+            TAO::Objref_Traits<CORBA::ValueDef>,
+            TAO::Any_Insert_Policy_Stream <CORBA::ValueDef_ptr>
           >
   {
   };
@@ -370,10 +443,10 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:496
+  // be\be_visitor_arg_traits.cpp:543
 
-#if !defined (_CORBA_VALUEDEFSEQ__ARG_TRAITS_CS_)
-#define _CORBA_VALUEDEFSEQ__ARG_TRAITS_CS_
+#if !defined (_CORBA_VALUEDEFSEQ__ARG_TRAITS_)
+#define _CORBA_VALUEDEFSEQ__ARG_TRAITS_
   
   template<>
   class Arg_Traits<CORBA::ValueDefSeq>
@@ -381,15 +454,19 @@ namespace TAO
         Var_Size_Arg_Traits_T<
             CORBA::ValueDefSeq,
             CORBA::ValueDefSeq_var,
-            CORBA::ValueDefSeq_out
+            CORBA::ValueDefSeq_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::ValueDefSeq>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_VALUEBOXDEF__ARG_TRAITS_CS_)
-#define _CORBA_VALUEBOXDEF__ARG_TRAITS_CS_
+#if !defined (_CORBA_VALUEBOXDEF__ARG_TRAITS_)
+#define _CORBA_VALUEBOXDEF__ARG_TRAITS_
   
   template<>
   class  Arg_Traits<CORBA::ValueBoxDef>
@@ -398,15 +475,19 @@ namespace TAO
             CORBA::ValueBoxDef_ptr,
             CORBA::ValueBoxDef_var,
             CORBA::ValueBoxDef_out,
-            TAO::Objref_Traits<CORBA::ValueBoxDef>
+            TAO::Objref_Traits<CORBA::ValueBoxDef>,
+            TAO::Any_Insert_Policy_Stream <CORBA::ValueBoxDef_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_ABSTRACTINTERFACEDEF__ARG_TRAITS_CS_)
-#define _CORBA_ABSTRACTINTERFACEDEF__ARG_TRAITS_CS_
+#if !defined (_CORBA_ABSTRACTINTERFACEDEF__ARG_TRAITS_)
+#define _CORBA_ABSTRACTINTERFACEDEF__ARG_TRAITS_
   
   template<>
   class  Arg_Traits<CORBA::AbstractInterfaceDef>
@@ -415,7 +496,8 @@ namespace TAO
             CORBA::AbstractInterfaceDef_ptr,
             CORBA::AbstractInterfaceDef_var,
             CORBA::AbstractInterfaceDef_out,
-            TAO::Objref_Traits<CORBA::AbstractInterfaceDef>
+            TAO::Objref_Traits<CORBA::AbstractInterfaceDef>,
+            TAO::Any_Insert_Policy_Stream <CORBA::AbstractInterfaceDef_ptr>
           >
   {
   };
@@ -423,10 +505,10 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:496
+  // be\be_visitor_arg_traits.cpp:543
 
-#if !defined (_CORBA_ABSTRACTINTERFACEDEFSEQ__ARG_TRAITS_CS_)
-#define _CORBA_ABSTRACTINTERFACEDEFSEQ__ARG_TRAITS_CS_
+#if !defined (_CORBA_ABSTRACTINTERFACEDEFSEQ__ARG_TRAITS_)
+#define _CORBA_ABSTRACTINTERFACEDEFSEQ__ARG_TRAITS_
   
   template<>
   class Arg_Traits<CORBA::AbstractInterfaceDefSeq>
@@ -434,15 +516,19 @@ namespace TAO
         Var_Size_Arg_Traits_T<
             CORBA::AbstractInterfaceDefSeq,
             CORBA::AbstractInterfaceDefSeq_var,
-            CORBA::AbstractInterfaceDefSeq_out
+            CORBA::AbstractInterfaceDefSeq_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::AbstractInterfaceDefSeq>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_LOCALINTERFACEDEF__ARG_TRAITS_CS_)
-#define _CORBA_LOCALINTERFACEDEF__ARG_TRAITS_CS_
+#if !defined (_CORBA_LOCALINTERFACEDEF__ARG_TRAITS_)
+#define _CORBA_LOCALINTERFACEDEF__ARG_TRAITS_
   
   template<>
   class  Arg_Traits<CORBA::LocalInterfaceDef>
@@ -451,15 +537,19 @@ namespace TAO
             CORBA::LocalInterfaceDef_ptr,
             CORBA::LocalInterfaceDef_var,
             CORBA::LocalInterfaceDef_out,
-            TAO::Objref_Traits<CORBA::LocalInterfaceDef>
+            TAO::Objref_Traits<CORBA::LocalInterfaceDef>,
+            TAO::Any_Insert_Policy_Stream <CORBA::LocalInterfaceDef_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_EXTVALUEDEF__ARG_TRAITS_CS_)
-#define _CORBA_EXTVALUEDEF__ARG_TRAITS_CS_
+#if !defined (_CORBA_EXTVALUEDEF__ARG_TRAITS_)
+#define _CORBA_EXTVALUEDEF__ARG_TRAITS_
   
   template<>
   class  Arg_Traits<CORBA::ExtValueDef>
@@ -468,7 +558,8 @@ namespace TAO
             CORBA::ExtValueDef_ptr,
             CORBA::ExtValueDef_var,
             CORBA::ExtValueDef_out,
-            TAO::Objref_Traits<CORBA::ExtValueDef>
+            TAO::Objref_Traits<CORBA::ExtValueDef>,
+            TAO::Any_Insert_Policy_Stream <CORBA::ExtValueDef_ptr>
           >
   {
   };
@@ -476,10 +567,10 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:496
+  // be\be_visitor_arg_traits.cpp:543
 
-#if !defined (_CORBA_CONTAINEDSEQ__ARG_TRAITS_CS_)
-#define _CORBA_CONTAINEDSEQ__ARG_TRAITS_CS_
+#if !defined (_CORBA_CONTAINEDSEQ__ARG_TRAITS_)
+#define _CORBA_CONTAINEDSEQ__ARG_TRAITS_
   
   template<>
   class Arg_Traits<CORBA::ContainedSeq>
@@ -487,7 +578,8 @@ namespace TAO
         Var_Size_Arg_Traits_T<
             CORBA::ContainedSeq,
             CORBA::ContainedSeq_var,
-            CORBA::ContainedSeq_out
+            CORBA::ContainedSeq_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::ContainedSeq>
           >
   {
   };
@@ -495,10 +587,10 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:496
+  // be\be_visitor_arg_traits.cpp:543
 
-#if !defined (_CORBA_STRUCTMEMBERSEQ__ARG_TRAITS_CS_)
-#define _CORBA_STRUCTMEMBERSEQ__ARG_TRAITS_CS_
+#if !defined (_CORBA_STRUCTMEMBERSEQ__ARG_TRAITS_)
+#define _CORBA_STRUCTMEMBERSEQ__ARG_TRAITS_
   
   template<>
   class Arg_Traits<CORBA::StructMemberSeq>
@@ -506,7 +598,8 @@ namespace TAO
         Var_Size_Arg_Traits_T<
             CORBA::StructMemberSeq,
             CORBA::StructMemberSeq_var,
-            CORBA::StructMemberSeq_out
+            CORBA::StructMemberSeq_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::StructMemberSeq>
           >
   {
   };
@@ -514,10 +607,10 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:496
+  // be\be_visitor_arg_traits.cpp:543
 
-#if !defined (_CORBA_INITIALIZERSEQ__ARG_TRAITS_CS_)
-#define _CORBA_INITIALIZERSEQ__ARG_TRAITS_CS_
+#if !defined (_CORBA_INITIALIZERSEQ__ARG_TRAITS_)
+#define _CORBA_INITIALIZERSEQ__ARG_TRAITS_
   
   template<>
   class Arg_Traits<CORBA::InitializerSeq>
@@ -525,7 +618,8 @@ namespace TAO
         Var_Size_Arg_Traits_T<
             CORBA::InitializerSeq,
             CORBA::InitializerSeq_var,
-            CORBA::InitializerSeq_out
+            CORBA::InitializerSeq_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::InitializerSeq>
           >
   {
   };
@@ -533,10 +627,10 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:496
+  // be\be_visitor_arg_traits.cpp:543
 
-#if !defined (_CORBA_EXTINITIALIZERSEQ__ARG_TRAITS_CS_)
-#define _CORBA_EXTINITIALIZERSEQ__ARG_TRAITS_CS_
+#if !defined (_CORBA_EXTINITIALIZERSEQ__ARG_TRAITS_)
+#define _CORBA_EXTINITIALIZERSEQ__ARG_TRAITS_
   
   template<>
   class Arg_Traits<CORBA::ExtInitializerSeq>
@@ -544,7 +638,8 @@ namespace TAO
         Var_Size_Arg_Traits_T<
             CORBA::ExtInitializerSeq,
             CORBA::ExtInitializerSeq_var,
-            CORBA::ExtInitializerSeq_out
+            CORBA::ExtInitializerSeq_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::ExtInitializerSeq>
           >
   {
   };
@@ -552,10 +647,10 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:496
+  // be\be_visitor_arg_traits.cpp:543
 
-#if !defined (_CORBA_UNIONMEMBERSEQ__ARG_TRAITS_CS_)
-#define _CORBA_UNIONMEMBERSEQ__ARG_TRAITS_CS_
+#if !defined (_CORBA_UNIONMEMBERSEQ__ARG_TRAITS_)
+#define _CORBA_UNIONMEMBERSEQ__ARG_TRAITS_
   
   template<>
   class Arg_Traits<CORBA::UnionMemberSeq>
@@ -563,7 +658,8 @@ namespace TAO
         Var_Size_Arg_Traits_T<
             CORBA::UnionMemberSeq,
             CORBA::UnionMemberSeq_var,
-            CORBA::UnionMemberSeq_out
+            CORBA::UnionMemberSeq_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::UnionMemberSeq>
           >
   {
   };
@@ -571,10 +667,10 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:496
+  // be\be_visitor_arg_traits.cpp:543
 
-#if !defined (_CORBA_ENUMMEMBERSEQ__ARG_TRAITS_CS_)
-#define _CORBA_ENUMMEMBERSEQ__ARG_TRAITS_CS_
+#if !defined (_CORBA_ENUMMEMBERSEQ__ARG_TRAITS_)
+#define _CORBA_ENUMMEMBERSEQ__ARG_TRAITS_
   
   template<>
   class Arg_Traits<CORBA::EnumMemberSeq>
@@ -582,7 +678,8 @@ namespace TAO
         Var_Size_Arg_Traits_T<
             CORBA::EnumMemberSeq,
             CORBA::EnumMemberSeq_var,
-            CORBA::EnumMemberSeq_out
+            CORBA::EnumMemberSeq_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::EnumMemberSeq>
           >
   {
   };
@@ -592,6 +689,87 @@ namespace TAO
 
 
 // TAO_IDL - Generated from
+// be\be_visitor_typecode/alias_typecode.cpp:50
+
+static TAO::TypeCode::Alias<char const *,
+                            CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ScopedName (
+    CORBA::tk_alias,
+    "IDL:omg.org/CORBA/ScopedName:1.0",
+    "ScopedName",
+    &CORBA::_tc_string);
+  
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_ScopedName =
+    &_tao_tc_CORBA_ScopedName;
+}
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/enum_typecode.cpp:34
+
+static char const * const _tao_enumerators_CORBA_DefinitionKind[] =
+  {
+    "dk_none",
+    "dk_all",
+    "dk_Attribute",
+    "dk_Constant",
+    "dk_Exception",
+    "dk_Interface",
+    "dk_Module",
+    "dk_Operation",
+    "dk_Typedef",
+    "dk_Alias",
+    "dk_Struct",
+    "dk_Union",
+    "dk_Enum",
+    "dk_Primitive",
+    "dk_String",
+    "dk_Sequence",
+    "dk_Array",
+    "dk_Repository",
+    "dk_Wstring",
+    "dk_Fixed",
+    "dk_Value",
+    "dk_ValueBox",
+    "dk_ValueMember",
+    "dk_Native",
+    "dk_AbstractInterface",
+    "dk_LocalInterface",
+    "dk_Component",
+    "dk_Home",
+    "dk_Factory",
+    "dk_Finder",
+    "dk_Emits",
+    "dk_Publishes",
+    "dk_Consumes",
+    "dk_Provides",
+    "dk_Uses",
+    "dk_Event"
+    
+  };
+
+static TAO::TypeCode::Enum<char const *,
+                           char const * const *,
+                           TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_DefinitionKind (
+    "IDL:omg.org/CORBA/DefinitionKind:1.0",
+    "DefinitionKind",
+    _tao_enumerators_CORBA_DefinitionKind,
+    36);
+  
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_DefinitionKind =
+    &_tao_tc_CORBA_DefinitionKind;
+}
+
+
+
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for CORBA::IRObject.
@@ -653,7 +831,7 @@ TAO::Collocation_Proxy_Broker *
       CORBA_IRObject_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::DefinitionKind>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::DefinitionKind>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -829,6 +1007,44 @@ CORBA::IRObject::marshal (TAO_OutputCDR &cdr)
 }
 
 // TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:76
+
+static TAO::TypeCode::Objref<char const *,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_IRObject (
+    CORBA::tk_objref,
+    "IDL:omg.org/CORBA/IRObject:1.0",
+    "IRObject");
+  
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_IRObject =
+    &_tao_tc_CORBA_IRObject;
+}
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/alias_typecode.cpp:50
+
+static TAO::TypeCode::Alias<char const *,
+                            CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_VersionSpec (
+    CORBA::tk_alias,
+    "IDL:omg.org/CORBA/VersionSpec:1.0",
+    "VersionSpec",
+    &CORBA::_tc_string);
+  
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_VersionSpec =
+    &_tao_tc_CORBA_VersionSpec;
+}
+
+
+
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for CORBA::Contained.
@@ -890,7 +1106,7 @@ char * CORBA::Contained::id (
       CORBA_Contained_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::RepositoryId>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::RepositoryId>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -934,7 +1150,7 @@ void CORBA::Contained::id (
     }
   
   TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
+  TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -975,7 +1191,7 @@ char * CORBA::Contained::name (
       CORBA_Contained_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::Identifier>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::Identifier>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -1019,7 +1235,7 @@ void CORBA::Contained::name (
     }
   
   TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
+  TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -1060,7 +1276,7 @@ char * CORBA::Contained::version (
       CORBA_Contained_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::VersionSpec>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::VersionSpec>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -1104,7 +1320,7 @@ void CORBA::Contained::version (
     }
   
   TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
+  TAO::Arg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version (version);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -1145,7 +1361,7 @@ void CORBA::Contained::version (
       CORBA_Contained_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::Container>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::Container>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -1187,7 +1403,7 @@ char * CORBA::Contained::absolute_name (
       CORBA_Contained_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::ScopedName>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::ScopedName>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -1229,7 +1445,7 @@ char * CORBA::Contained::absolute_name (
       CORBA_Contained_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::Repository>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::Repository>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -1251,6 +1467,29 @@ char * CORBA::Contained::absolute_name (
   return _tao_retval.retn ();
 }
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/struct_typecode.cpp:87
+
+static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_Contained_Description[] =
+  {
+    { "kind", &CORBA::_tc_DefinitionKind },
+    { "value", &CORBA::_tc_any }
+    
+  };
+static TAO::TypeCode::Struct<char const *,
+                      CORBA::TypeCode_ptr const *,
+                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
+                      TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_Contained_Description (
+    CORBA::tk_struct,
+    "IDL:omg.org/CORBA/Contained/Description:1.0",
+    "Description",
+    _tao_fields_CORBA_Contained_Description,
+    2);
+  
+::CORBA::TypeCode_ptr const CORBA::Contained::_tc_Description =
+  &_tao_tc_CORBA_Contained_Description;
+
 // TAO_IDL - Generated from 
 // be\be_visitor_structure/structure_cs.cpp:66
 
@@ -1284,7 +1523,7 @@ CORBA::Contained::Description::_tao_any_destructor (
       CORBA_Contained_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::Contained::Description>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::Contained::Description>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -1330,9 +1569,9 @@ void CORBA::Contained::move (
     }
   
   TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::Container>::in_arg_val _tao_new_container (new_container);
-  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_new_name (new_name);
-  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_new_version (new_version);
+  TAO::Arg_Traits< ::CORBA::Container>::in_arg_val _tao_new_container (new_container);
+  TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_new_name (new_name);
+  TAO::Arg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_new_version (new_version);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -1474,6 +1713,24 @@ CORBA::Contained::marshal (TAO_OutputCDR &cdr)
   return (cdr << this);
 }
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:76
+
+static TAO::TypeCode::Objref<char const *,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_Contained (
+    CORBA::tk_objref,
+    "IDL:omg.org/CORBA/Contained:1.0",
+    "Contained");
+  
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_Contained =
+    &_tao_tc_CORBA_Contained;
+}
+
+
+
 // TAO_IDL - Generated from 
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
@@ -1487,8 +1744,8 @@ CORBA::InterfaceDefSeq::InterfaceDefSeq (
     CORBA::ULong max
   )
   : TAO_Unbounded_Object_Sequence<
-        CORBA::InterfaceDef,
-        CORBA::InterfaceDef_var
+        InterfaceDef,
+        InterfaceDef_var
       >
     (max)
 {}
@@ -1500,8 +1757,8 @@ CORBA::InterfaceDefSeq::InterfaceDefSeq (
     CORBA::Boolean release
   )
   : TAO_Unbounded_Object_Sequence<
-        CORBA::InterfaceDef,
-        CORBA::InterfaceDef_var
+        InterfaceDef,
+        InterfaceDef_var
       >
     (max, length, buffer, release)
 {}
@@ -1510,8 +1767,8 @@ CORBA::InterfaceDefSeq::InterfaceDefSeq (
     const InterfaceDefSeq &seq
   )
   : TAO_Unbounded_Object_Sequence<
-        CORBA::InterfaceDef,
-        CORBA::InterfaceDef_var
+        InterfaceDef,
+        InterfaceDef_var
       >
     (seq)
 {}
@@ -1530,6 +1787,59 @@ void CORBA::InterfaceDefSeq::_tao_any_destructor (
 
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/alias_typecode.cpp:50
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+namespace CORBA
+{
+  extern ::CORBA::TypeCode_ptr const _tc_InterfaceDef;
+}
+
+
+#ifndef _TAO_TYPECODE_CORBA_InterfaceDefSeq_GUARD
+#define _TAO_TYPECODE_CORBA_InterfaceDefSeq_GUARD
+namespace TAO
+{
+  namespace TypeCode
+  {
+    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
+      CORBA_InterfaceDefSeq_0 (
+        CORBA::tk_sequence,
+        &CORBA::_tc_InterfaceDef,
+        0U);
+      
+    ::CORBA::TypeCode_ptr const tc_CORBA_InterfaceDefSeq_0 =
+      &CORBA_InterfaceDefSeq_0;
+    
+  }
+}
+
+
+#endif /* _TAO_TYPECODE_CORBA_InterfaceDefSeq_GUARD */
+
+static TAO::TypeCode::Alias<char const *,
+                            CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_InterfaceDefSeq (
+    CORBA::tk_alias,
+    "IDL:omg.org/CORBA/InterfaceDefSeq:1.0",
+    "InterfaceDefSeq",
+    &TAO::TypeCode::tc_CORBA_InterfaceDefSeq_0);
+  
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_InterfaceDefSeq =
+    &_tao_tc_CORBA_InterfaceDefSeq;
+}
+
+
+
 // TAO_IDL - Generated from 
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
@@ -1543,8 +1853,8 @@ CORBA::ValueDefSeq::ValueDefSeq (
     CORBA::ULong max
   )
   : TAO_Unbounded_Object_Sequence<
-        CORBA::ValueDef,
-        CORBA::ValueDef_var
+        ValueDef,
+        ValueDef_var
       >
     (max)
 {}
@@ -1556,8 +1866,8 @@ CORBA::ValueDefSeq::ValueDefSeq (
     CORBA::Boolean release
   )
   : TAO_Unbounded_Object_Sequence<
-        CORBA::ValueDef,
-        CORBA::ValueDef_var
+        ValueDef,
+        ValueDef_var
       >
     (max, length, buffer, release)
 {}
@@ -1566,8 +1876,8 @@ CORBA::ValueDefSeq::ValueDefSeq (
     const ValueDefSeq &seq
   )
   : TAO_Unbounded_Object_Sequence<
-        CORBA::ValueDef,
-        CORBA::ValueDef_var
+        ValueDef,
+        ValueDef_var
       >
     (seq)
 {}
@@ -1586,6 +1896,59 @@ void CORBA::ValueDefSeq::_tao_any_destructor (
 
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/alias_typecode.cpp:50
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+namespace CORBA
+{
+  extern ::CORBA::TypeCode_ptr const _tc_ValueDef;
+}
+
+
+#ifndef _TAO_TYPECODE_CORBA_ValueDefSeq_GUARD
+#define _TAO_TYPECODE_CORBA_ValueDefSeq_GUARD
+namespace TAO
+{
+  namespace TypeCode
+  {
+    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
+      CORBA_ValueDefSeq_0 (
+        CORBA::tk_sequence,
+        &CORBA::_tc_ValueDef,
+        0U);
+      
+    ::CORBA::TypeCode_ptr const tc_CORBA_ValueDefSeq_0 =
+      &CORBA_ValueDefSeq_0;
+    
+  }
+}
+
+
+#endif /* _TAO_TYPECODE_CORBA_ValueDefSeq_GUARD */
+
+static TAO::TypeCode::Alias<char const *,
+                            CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ValueDefSeq (
+    CORBA::tk_alias,
+    "IDL:omg.org/CORBA/ValueDefSeq:1.0",
+    "ValueDefSeq",
+    &TAO::TypeCode::tc_CORBA_ValueDefSeq_0);
+  
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_ValueDefSeq =
+    &_tao_tc_CORBA_ValueDefSeq;
+}
+
+
+
 // TAO_IDL - Generated from 
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
@@ -1599,8 +1962,8 @@ CORBA::AbstractInterfaceDefSeq::AbstractInterfaceDefSeq (
     CORBA::ULong max
   )
   : TAO_Unbounded_Object_Sequence<
-        CORBA::AbstractInterfaceDef,
-        CORBA::AbstractInterfaceDef_var
+        AbstractInterfaceDef,
+        AbstractInterfaceDef_var
       >
     (max)
 {}
@@ -1612,8 +1975,8 @@ CORBA::AbstractInterfaceDefSeq::AbstractInterfaceDefSeq (
     CORBA::Boolean release
   )
   : TAO_Unbounded_Object_Sequence<
-        CORBA::AbstractInterfaceDef,
-        CORBA::AbstractInterfaceDef_var
+        AbstractInterfaceDef,
+        AbstractInterfaceDef_var
       >
     (max, length, buffer, release)
 {}
@@ -1622,8 +1985,8 @@ CORBA::AbstractInterfaceDefSeq::AbstractInterfaceDefSeq (
     const AbstractInterfaceDefSeq &seq
   )
   : TAO_Unbounded_Object_Sequence<
-        CORBA::AbstractInterfaceDef,
-        CORBA::AbstractInterfaceDef_var
+        AbstractInterfaceDef,
+        AbstractInterfaceDef_var
       >
     (seq)
 {}
@@ -1642,6 +2005,59 @@ void CORBA::AbstractInterfaceDefSeq::_tao_any_destructor (
 
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/alias_typecode.cpp:50
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+namespace CORBA
+{
+  extern ::CORBA::TypeCode_ptr const _tc_AbstractInterfaceDef;
+}
+
+
+#ifndef _TAO_TYPECODE_CORBA_AbstractInterfaceDefSeq_GUARD
+#define _TAO_TYPECODE_CORBA_AbstractInterfaceDefSeq_GUARD
+namespace TAO
+{
+  namespace TypeCode
+  {
+    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
+      CORBA_AbstractInterfaceDefSeq_0 (
+        CORBA::tk_sequence,
+        &CORBA::_tc_AbstractInterfaceDef,
+        0U);
+      
+    ::CORBA::TypeCode_ptr const tc_CORBA_AbstractInterfaceDefSeq_0 =
+      &CORBA_AbstractInterfaceDefSeq_0;
+    
+  }
+}
+
+
+#endif /* _TAO_TYPECODE_CORBA_AbstractInterfaceDefSeq_GUARD */
+
+static TAO::TypeCode::Alias<char const *,
+                            CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_AbstractInterfaceDefSeq (
+    CORBA::tk_alias,
+    "IDL:omg.org/CORBA/AbstractInterfaceDefSeq:1.0",
+    "AbstractInterfaceDefSeq",
+    &TAO::TypeCode::tc_CORBA_AbstractInterfaceDefSeq_0);
+  
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_AbstractInterfaceDefSeq =
+    &_tao_tc_CORBA_AbstractInterfaceDefSeq;
+}
+
+
+
 // TAO_IDL - Generated from 
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
@@ -1655,8 +2071,8 @@ CORBA::LocalInterfaceDefSeq::LocalInterfaceDefSeq (
     CORBA::ULong max
   )
   : TAO_Unbounded_Object_Sequence<
-        CORBA::LocalInterfaceDef,
-        CORBA::LocalInterfaceDef_var
+        LocalInterfaceDef,
+        LocalInterfaceDef_var
       >
     (max)
 {}
@@ -1668,8 +2084,8 @@ CORBA::LocalInterfaceDefSeq::LocalInterfaceDefSeq (
     CORBA::Boolean release
   )
   : TAO_Unbounded_Object_Sequence<
-        CORBA::LocalInterfaceDef,
-        CORBA::LocalInterfaceDef_var
+        LocalInterfaceDef,
+        LocalInterfaceDef_var
       >
     (max, length, buffer, release)
 {}
@@ -1678,8 +2094,8 @@ CORBA::LocalInterfaceDefSeq::LocalInterfaceDefSeq (
     const LocalInterfaceDefSeq &seq
   )
   : TAO_Unbounded_Object_Sequence<
-        CORBA::LocalInterfaceDef,
-        CORBA::LocalInterfaceDef_var
+        LocalInterfaceDef,
+        LocalInterfaceDef_var
       >
     (seq)
 {}
@@ -1698,6 +2114,59 @@ void CORBA::LocalInterfaceDefSeq::_tao_any_destructor (
 
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/alias_typecode.cpp:50
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+namespace CORBA
+{
+  extern ::CORBA::TypeCode_ptr const _tc_LocalInterfaceDef;
+}
+
+
+#ifndef _TAO_TYPECODE_CORBA_LocalInterfaceDefSeq_GUARD
+#define _TAO_TYPECODE_CORBA_LocalInterfaceDefSeq_GUARD
+namespace TAO
+{
+  namespace TypeCode
+  {
+    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
+      CORBA_LocalInterfaceDefSeq_0 (
+        CORBA::tk_sequence,
+        &CORBA::_tc_LocalInterfaceDef,
+        0U);
+      
+    ::CORBA::TypeCode_ptr const tc_CORBA_LocalInterfaceDefSeq_0 =
+      &CORBA_LocalInterfaceDefSeq_0;
+    
+  }
+}
+
+
+#endif /* _TAO_TYPECODE_CORBA_LocalInterfaceDefSeq_GUARD */
+
+static TAO::TypeCode::Alias<char const *,
+                            CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_LocalInterfaceDefSeq (
+    CORBA::tk_alias,
+    "IDL:omg.org/CORBA/LocalInterfaceDefSeq:1.0",
+    "LocalInterfaceDefSeq",
+    &TAO::TypeCode::tc_CORBA_LocalInterfaceDefSeq_0);
+  
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_LocalInterfaceDefSeq =
+    &_tao_tc_CORBA_LocalInterfaceDefSeq;
+}
+
+
+
 // TAO_IDL - Generated from 
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
@@ -1711,8 +2180,8 @@ CORBA::ExtInterfaceDefSeq::ExtInterfaceDefSeq (
     CORBA::ULong max
   )
   : TAO_Unbounded_Object_Sequence<
-        CORBA::ExtInterfaceDef,
-        CORBA::ExtInterfaceDef_var
+        ExtInterfaceDef,
+        ExtInterfaceDef_var
       >
     (max)
 {}
@@ -1724,8 +2193,8 @@ CORBA::ExtInterfaceDefSeq::ExtInterfaceDefSeq (
     CORBA::Boolean release
   )
   : TAO_Unbounded_Object_Sequence<
-        CORBA::ExtInterfaceDef,
-        CORBA::ExtInterfaceDef_var
+        ExtInterfaceDef,
+        ExtInterfaceDef_var
       >
     (max, length, buffer, release)
 {}
@@ -1734,8 +2203,8 @@ CORBA::ExtInterfaceDefSeq::ExtInterfaceDefSeq (
     const ExtInterfaceDefSeq &seq
   )
   : TAO_Unbounded_Object_Sequence<
-        CORBA::ExtInterfaceDef,
-        CORBA::ExtInterfaceDef_var
+        ExtInterfaceDef,
+        ExtInterfaceDef_var
       >
     (seq)
 {}
@@ -1754,6 +2223,59 @@ void CORBA::ExtInterfaceDefSeq::_tao_any_destructor (
 
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/alias_typecode.cpp:50
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+namespace CORBA
+{
+  extern ::CORBA::TypeCode_ptr const _tc_ExtInterfaceDef;
+}
+
+
+#ifndef _TAO_TYPECODE_CORBA_ExtInterfaceDefSeq_GUARD
+#define _TAO_TYPECODE_CORBA_ExtInterfaceDefSeq_GUARD
+namespace TAO
+{
+  namespace TypeCode
+  {
+    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
+      CORBA_ExtInterfaceDefSeq_0 (
+        CORBA::tk_sequence,
+        &CORBA::_tc_ExtInterfaceDef,
+        0U);
+      
+    ::CORBA::TypeCode_ptr const tc_CORBA_ExtInterfaceDefSeq_0 =
+      &CORBA_ExtInterfaceDefSeq_0;
+    
+  }
+}
+
+
+#endif /* _TAO_TYPECODE_CORBA_ExtInterfaceDefSeq_GUARD */
+
+static TAO::TypeCode::Alias<char const *,
+                            CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ExtInterfaceDefSeq (
+    CORBA::tk_alias,
+    "IDL:omg.org/CORBA/ExtInterfaceDefSeq:1.0",
+    "ExtInterfaceDefSeq",
+    &TAO::TypeCode::tc_CORBA_ExtInterfaceDefSeq_0);
+  
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_ExtInterfaceDefSeq =
+    &_tao_tc_CORBA_ExtInterfaceDefSeq;
+}
+
+
+
 // TAO_IDL - Generated from 
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
@@ -1767,8 +2289,8 @@ CORBA::ExtValueDefSeq::ExtValueDefSeq (
     CORBA::ULong max
   )
   : TAO_Unbounded_Object_Sequence<
-        CORBA::ExtValueDef,
-        CORBA::ExtValueDef_var
+        ExtValueDef,
+        ExtValueDef_var
       >
     (max)
 {}
@@ -1780,8 +2302,8 @@ CORBA::ExtValueDefSeq::ExtValueDefSeq (
     CORBA::Boolean release
   )
   : TAO_Unbounded_Object_Sequence<
-        CORBA::ExtValueDef,
-        CORBA::ExtValueDef_var
+        ExtValueDef,
+        ExtValueDef_var
       >
     (max, length, buffer, release)
 {}
@@ -1790,8 +2312,8 @@ CORBA::ExtValueDefSeq::ExtValueDefSeq (
     const ExtValueDefSeq &seq
   )
   : TAO_Unbounded_Object_Sequence<
-        CORBA::ExtValueDef,
-        CORBA::ExtValueDef_var
+        ExtValueDef,
+        ExtValueDef_var
       >
     (seq)
 {}
@@ -1810,6 +2332,59 @@ void CORBA::ExtValueDefSeq::_tao_any_destructor (
 
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/alias_typecode.cpp:50
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+namespace CORBA
+{
+  extern ::CORBA::TypeCode_ptr const _tc_ExtValueDef;
+}
+
+
+#ifndef _TAO_TYPECODE_CORBA_ExtValueDefSeq_GUARD
+#define _TAO_TYPECODE_CORBA_ExtValueDefSeq_GUARD
+namespace TAO
+{
+  namespace TypeCode
+  {
+    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
+      CORBA_ExtValueDefSeq_0 (
+        CORBA::tk_sequence,
+        &CORBA::_tc_ExtValueDef,
+        0U);
+      
+    ::CORBA::TypeCode_ptr const tc_CORBA_ExtValueDefSeq_0 =
+      &CORBA_ExtValueDefSeq_0;
+    
+  }
+}
+
+
+#endif /* _TAO_TYPECODE_CORBA_ExtValueDefSeq_GUARD */
+
+static TAO::TypeCode::Alias<char const *,
+                            CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ExtValueDefSeq (
+    CORBA::tk_alias,
+    "IDL:omg.org/CORBA/ExtValueDefSeq:1.0",
+    "ExtValueDefSeq",
+    &TAO::TypeCode::tc_CORBA_ExtValueDefSeq_0);
+  
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_ExtValueDefSeq =
+    &_tao_tc_CORBA_ExtValueDefSeq;
+}
+
+
+
 // TAO_IDL - Generated from 
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
@@ -1823,8 +2398,8 @@ CORBA::ExtAbstractInterfaceDefSeq::ExtAbstractInterfaceDefSeq (
     CORBA::ULong max
   )
   : TAO_Unbounded_Object_Sequence<
-        CORBA::ExtAbstractInterfaceDef,
-        CORBA::ExtAbstractInterfaceDef_var
+        ExtAbstractInterfaceDef,
+        ExtAbstractInterfaceDef_var
       >
     (max)
 {}
@@ -1836,8 +2411,8 @@ CORBA::ExtAbstractInterfaceDefSeq::ExtAbstractInterfaceDefSeq (
     CORBA::Boolean release
   )
   : TAO_Unbounded_Object_Sequence<
-        CORBA::ExtAbstractInterfaceDef,
-        CORBA::ExtAbstractInterfaceDef_var
+        ExtAbstractInterfaceDef,
+        ExtAbstractInterfaceDef_var
       >
     (max, length, buffer, release)
 {}
@@ -1846,8 +2421,8 @@ CORBA::ExtAbstractInterfaceDefSeq::ExtAbstractInterfaceDefSeq (
     const ExtAbstractInterfaceDefSeq &seq
   )
   : TAO_Unbounded_Object_Sequence<
-        CORBA::ExtAbstractInterfaceDef,
-        CORBA::ExtAbstractInterfaceDef_var
+        ExtAbstractInterfaceDef,
+        ExtAbstractInterfaceDef_var
       >
     (seq)
 {}
@@ -1866,6 +2441,59 @@ void CORBA::ExtAbstractInterfaceDefSeq::_tao_any_destructor (
 
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/alias_typecode.cpp:50
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+namespace CORBA
+{
+  extern ::CORBA::TypeCode_ptr const _tc_ExtAbstractInterfaceDef;
+}
+
+
+#ifndef _TAO_TYPECODE_CORBA_ExtAbstractInterfaceDefSeq_GUARD
+#define _TAO_TYPECODE_CORBA_ExtAbstractInterfaceDefSeq_GUARD
+namespace TAO
+{
+  namespace TypeCode
+  {
+    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
+      CORBA_ExtAbstractInterfaceDefSeq_0 (
+        CORBA::tk_sequence,
+        &CORBA::_tc_ExtAbstractInterfaceDef,
+        0U);
+      
+    ::CORBA::TypeCode_ptr const tc_CORBA_ExtAbstractInterfaceDefSeq_0 =
+      &CORBA_ExtAbstractInterfaceDefSeq_0;
+    
+  }
+}
+
+
+#endif /* _TAO_TYPECODE_CORBA_ExtAbstractInterfaceDefSeq_GUARD */
+
+static TAO::TypeCode::Alias<char const *,
+                            CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ExtAbstractInterfaceDefSeq (
+    CORBA::tk_alias,
+    "IDL:omg.org/CORBA/ExtAbstractInterfaceDefSeq:1.0",
+    "ExtAbstractInterfaceDefSeq",
+    &TAO::TypeCode::tc_CORBA_ExtAbstractInterfaceDefSeq_0);
+  
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_ExtAbstractInterfaceDefSeq =
+    &_tao_tc_CORBA_ExtAbstractInterfaceDefSeq;
+}
+
+
+
 // TAO_IDL - Generated from 
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
@@ -1879,8 +2507,8 @@ CORBA::ExtLocalInterfaceDefSeq::ExtLocalInterfaceDefSeq (
     CORBA::ULong max
   )
   : TAO_Unbounded_Object_Sequence<
-        CORBA::ExtLocalInterfaceDef,
-        CORBA::ExtLocalInterfaceDef_var
+        ExtLocalInterfaceDef,
+        ExtLocalInterfaceDef_var
       >
     (max)
 {}
@@ -1892,8 +2520,8 @@ CORBA::ExtLocalInterfaceDefSeq::ExtLocalInterfaceDefSeq (
     CORBA::Boolean release
   )
   : TAO_Unbounded_Object_Sequence<
-        CORBA::ExtLocalInterfaceDef,
-        CORBA::ExtLocalInterfaceDef_var
+        ExtLocalInterfaceDef,
+        ExtLocalInterfaceDef_var
       >
     (max, length, buffer, release)
 {}
@@ -1902,8 +2530,8 @@ CORBA::ExtLocalInterfaceDefSeq::ExtLocalInterfaceDefSeq (
     const ExtLocalInterfaceDefSeq &seq
   )
   : TAO_Unbounded_Object_Sequence<
-        CORBA::ExtLocalInterfaceDef,
-        CORBA::ExtLocalInterfaceDef_var
+        ExtLocalInterfaceDef,
+        ExtLocalInterfaceDef_var
       >
     (seq)
 {}
@@ -1922,6 +2550,59 @@ void CORBA::ExtLocalInterfaceDefSeq::_tao_any_destructor (
 
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/alias_typecode.cpp:50
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+namespace CORBA
+{
+  extern ::CORBA::TypeCode_ptr const _tc_ExtLocalInterfaceDef;
+}
+
+
+#ifndef _TAO_TYPECODE_CORBA_ExtLocalInterfaceDefSeq_GUARD
+#define _TAO_TYPECODE_CORBA_ExtLocalInterfaceDefSeq_GUARD
+namespace TAO
+{
+  namespace TypeCode
+  {
+    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
+      CORBA_ExtLocalInterfaceDefSeq_0 (
+        CORBA::tk_sequence,
+        &CORBA::_tc_ExtLocalInterfaceDef,
+        0U);
+      
+    ::CORBA::TypeCode_ptr const tc_CORBA_ExtLocalInterfaceDefSeq_0 =
+      &CORBA_ExtLocalInterfaceDefSeq_0;
+    
+  }
+}
+
+
+#endif /* _TAO_TYPECODE_CORBA_ExtLocalInterfaceDefSeq_GUARD */
+
+static TAO::TypeCode::Alias<char const *,
+                            CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ExtLocalInterfaceDefSeq (
+    CORBA::tk_alias,
+    "IDL:omg.org/CORBA/ExtLocalInterfaceDefSeq:1.0",
+    "ExtLocalInterfaceDefSeq",
+    &TAO::TypeCode::tc_CORBA_ExtLocalInterfaceDefSeq_0);
+  
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_ExtLocalInterfaceDefSeq =
+    &_tao_tc_CORBA_ExtLocalInterfaceDefSeq;
+}
+
+
+
 // TAO_IDL - Generated from 
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
@@ -1935,8 +2616,8 @@ CORBA::ContainedSeq::ContainedSeq (
     CORBA::ULong max
   )
   : TAO_Unbounded_Object_Sequence<
-        CORBA::Contained,
-        CORBA::Contained_var
+        Contained,
+        Contained_var
       >
     (max)
 {}
@@ -1948,8 +2629,8 @@ CORBA::ContainedSeq::ContainedSeq (
     CORBA::Boolean release
   )
   : TAO_Unbounded_Object_Sequence<
-        CORBA::Contained,
-        CORBA::Contained_var
+        Contained,
+        Contained_var
       >
     (max, length, buffer, release)
 {}
@@ -1958,8 +2639,8 @@ CORBA::ContainedSeq::ContainedSeq (
     const ContainedSeq &seq
   )
   : TAO_Unbounded_Object_Sequence<
-        CORBA::Contained,
-        CORBA::Contained_var
+        Contained,
+        Contained_var
       >
     (seq)
 {}
@@ -1978,6 +2659,83 @@ void CORBA::ContainedSeq::_tao_any_destructor (
 
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/alias_typecode.cpp:50
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+
+#ifndef _TAO_TYPECODE_CORBA_ContainedSeq_GUARD
+#define _TAO_TYPECODE_CORBA_ContainedSeq_GUARD
+namespace TAO
+{
+  namespace TypeCode
+  {
+    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
+      CORBA_ContainedSeq_0 (
+        CORBA::tk_sequence,
+        &CORBA::_tc_Contained,
+        0U);
+      
+    ::CORBA::TypeCode_ptr const tc_CORBA_ContainedSeq_0 =
+      &CORBA_ContainedSeq_0;
+    
+  }
+}
+
+
+#endif /* _TAO_TYPECODE_CORBA_ContainedSeq_GUARD */
+
+static TAO::TypeCode::Alias<char const *,
+                            CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ContainedSeq (
+    CORBA::tk_alias,
+    "IDL:omg.org/CORBA/ContainedSeq:1.0",
+    "ContainedSeq",
+    &TAO::TypeCode::tc_CORBA_ContainedSeq_0);
+  
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_ContainedSeq =
+    &_tao_tc_CORBA_ContainedSeq;
+}
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/struct_typecode.cpp:87
+
+static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_StructMember[] =
+  {
+    { "name", &CORBA::_tc_Identifier },
+    { "type", &CORBA::_tc_TypeCode },
+    { "type_def", &CORBA::_tc_IDLType }
+    
+  };
+static TAO::TypeCode::Struct<char const *,
+                      CORBA::TypeCode_ptr const *,
+                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
+                      TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_StructMember (
+    CORBA::tk_struct,
+    "IDL:omg.org/CORBA/StructMember:1.0",
+    "StructMember",
+    _tao_fields_CORBA_StructMember,
+    3);
+  
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_StructMember =
+    &_tao_tc_CORBA_StructMember;
+}
+
+
+
 // TAO_IDL - Generated from 
 // be\be_visitor_structure/structure_cs.cpp:66
 
@@ -2004,7 +2762,7 @@ CORBA::StructMemberSeq::StructMemberSeq (
     CORBA::ULong max
   )
   : TAO_Unbounded_Sequence<
-        CORBA::StructMember
+        StructMember
       >
     (max)
 {}
@@ -2016,7 +2774,7 @@ CORBA::StructMemberSeq::StructMemberSeq (
     CORBA::Boolean release
   )
   : TAO_Unbounded_Sequence<
-        CORBA::StructMember
+        StructMember
       >
     (max, length, buffer, release)
 {}
@@ -2025,7 +2783,7 @@ CORBA::StructMemberSeq::StructMemberSeq (
     const StructMemberSeq &seq
   )
   : TAO_Unbounded_Sequence<
-        CORBA::StructMember
+        StructMember
       >
     (seq)
 {}
@@ -2044,6 +2802,87 @@ void CORBA::StructMemberSeq::_tao_any_destructor (
 
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/alias_typecode.cpp:50
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+
+#ifndef _TAO_TYPECODE_CORBA_StructMemberSeq_GUARD
+#define _TAO_TYPECODE_CORBA_StructMemberSeq_GUARD
+namespace TAO
+{
+  namespace TypeCode
+  {
+    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
+      CORBA_StructMemberSeq_0 (
+        CORBA::tk_sequence,
+        &CORBA::_tc_StructMember,
+        0U);
+      
+    ::CORBA::TypeCode_ptr const tc_CORBA_StructMemberSeq_0 =
+      &CORBA_StructMemberSeq_0;
+    
+  }
+}
+
+
+#endif /* _TAO_TYPECODE_CORBA_StructMemberSeq_GUARD */
+
+static TAO::TypeCode::Alias<char const *,
+                            CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_StructMemberSeq (
+    CORBA::tk_alias,
+    "IDL:omg.org/CORBA/StructMemberSeq:1.0",
+    "StructMemberSeq",
+    &TAO::TypeCode::tc_CORBA_StructMemberSeq_0);
+  
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_StructMemberSeq =
+    &_tao_tc_CORBA_StructMemberSeq;
+}
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/struct_typecode.cpp:87
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_Initializer[] =
+  {
+    { "members", &CORBA::_tc_StructMemberSeq },
+    { "name", &CORBA::_tc_Identifier }
+    
+  };
+static TAO::TypeCode::Struct<char const *,
+                      CORBA::TypeCode_ptr const *,
+                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
+                      TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_Initializer (
+    CORBA::tk_struct,
+    "IDL:omg.org/CORBA/Initializer:1.0",
+    "Initializer",
+    _tao_fields_CORBA_Initializer,
+    2);
+  
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_Initializer =
+    &_tao_tc_CORBA_Initializer;
+}
+
+
+
 // TAO_IDL - Generated from 
 // be\be_visitor_structure/structure_cs.cpp:66
 
@@ -2070,7 +2909,7 @@ CORBA::InitializerSeq::InitializerSeq (
     CORBA::ULong max
   )
   : TAO_Unbounded_Sequence<
-        CORBA::Initializer
+        Initializer
       >
     (max)
 {}
@@ -2082,7 +2921,7 @@ CORBA::InitializerSeq::InitializerSeq (
     CORBA::Boolean release
   )
   : TAO_Unbounded_Sequence<
-        CORBA::Initializer
+        Initializer
       >
     (max, length, buffer, release)
 {}
@@ -2091,7 +2930,7 @@ CORBA::InitializerSeq::InitializerSeq (
     const InitializerSeq &seq
   )
   : TAO_Unbounded_Sequence<
-        CORBA::Initializer
+        Initializer
       >
     (seq)
 {}
@@ -2110,6 +2949,85 @@ void CORBA::InitializerSeq::_tao_any_destructor (
 
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/alias_typecode.cpp:50
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+
+#ifndef _TAO_TYPECODE_CORBA_InitializerSeq_GUARD
+#define _TAO_TYPECODE_CORBA_InitializerSeq_GUARD
+namespace TAO
+{
+  namespace TypeCode
+  {
+    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
+      CORBA_InitializerSeq_0 (
+        CORBA::tk_sequence,
+        &CORBA::_tc_Initializer,
+        0U);
+      
+    ::CORBA::TypeCode_ptr const tc_CORBA_InitializerSeq_0 =
+      &CORBA_InitializerSeq_0;
+    
+  }
+}
+
+
+#endif /* _TAO_TYPECODE_CORBA_InitializerSeq_GUARD */
+
+static TAO::TypeCode::Alias<char const *,
+                            CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_InitializerSeq (
+    CORBA::tk_alias,
+    "IDL:omg.org/CORBA/InitializerSeq:1.0",
+    "InitializerSeq",
+    &TAO::TypeCode::tc_CORBA_InitializerSeq_0);
+  
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_InitializerSeq =
+    &_tao_tc_CORBA_InitializerSeq;
+}
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/struct_typecode.cpp:87
+
+static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_ExceptionDescription[] =
+  {
+    { "name", &CORBA::_tc_Identifier },
+    { "id", &CORBA::_tc_RepositoryId },
+    { "defined_in", &CORBA::_tc_RepositoryId },
+    { "version", &CORBA::_tc_VersionSpec },
+    { "type", &CORBA::_tc_TypeCode }
+    
+  };
+static TAO::TypeCode::Struct<char const *,
+                      CORBA::TypeCode_ptr const *,
+                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
+                      TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ExceptionDescription (
+    CORBA::tk_struct,
+    "IDL:omg.org/CORBA/ExceptionDescription:1.0",
+    "ExceptionDescription",
+    _tao_fields_CORBA_ExceptionDescription,
+    5);
+  
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_ExceptionDescription =
+    &_tao_tc_CORBA_ExceptionDescription;
+}
+
+
+
 // TAO_IDL - Generated from 
 // be\be_visitor_structure/structure_cs.cpp:66
 
@@ -2136,7 +3054,7 @@ CORBA::ExcDescriptionSeq::ExcDescriptionSeq (
     CORBA::ULong max
   )
   : TAO_Unbounded_Sequence<
-        CORBA::ExceptionDescription
+        ExceptionDescription
       >
     (max)
 {}
@@ -2148,7 +3066,7 @@ CORBA::ExcDescriptionSeq::ExcDescriptionSeq (
     CORBA::Boolean release
   )
   : TAO_Unbounded_Sequence<
-        CORBA::ExceptionDescription
+        ExceptionDescription
       >
     (max, length, buffer, release)
 {}
@@ -2157,7 +3075,7 @@ CORBA::ExcDescriptionSeq::ExcDescriptionSeq (
     const ExcDescriptionSeq &seq
   )
   : TAO_Unbounded_Sequence<
-        CORBA::ExceptionDescription
+        ExceptionDescription
       >
     (seq)
 {}
@@ -2176,6 +3094,93 @@ void CORBA::ExcDescriptionSeq::_tao_any_destructor (
 
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/alias_typecode.cpp:50
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+
+#ifndef _TAO_TYPECODE_CORBA_ExcDescriptionSeq_GUARD
+#define _TAO_TYPECODE_CORBA_ExcDescriptionSeq_GUARD
+namespace TAO
+{
+  namespace TypeCode
+  {
+    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
+      CORBA_ExcDescriptionSeq_0 (
+        CORBA::tk_sequence,
+        &CORBA::_tc_ExceptionDescription,
+        0U);
+      
+    ::CORBA::TypeCode_ptr const tc_CORBA_ExcDescriptionSeq_0 =
+      &CORBA_ExcDescriptionSeq_0;
+    
+  }
+}
+
+
+#endif /* _TAO_TYPECODE_CORBA_ExcDescriptionSeq_GUARD */
+
+static TAO::TypeCode::Alias<char const *,
+                            CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ExcDescriptionSeq (
+    CORBA::tk_alias,
+    "IDL:omg.org/CORBA/ExcDescriptionSeq:1.0",
+    "ExcDescriptionSeq",
+    &TAO::TypeCode::tc_CORBA_ExcDescriptionSeq_0);
+  
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_ExcDescriptionSeq =
+    &_tao_tc_CORBA_ExcDescriptionSeq;
+}
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/struct_typecode.cpp:87
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_ExtInitializer[] =
+  {
+    { "members", &CORBA::_tc_StructMemberSeq },
+    { "exceptions", &CORBA::_tc_ExcDescriptionSeq },
+    { "name", &CORBA::_tc_Identifier }
+    
+  };
+static TAO::TypeCode::Struct<char const *,
+                      CORBA::TypeCode_ptr const *,
+                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
+                      TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ExtInitializer (
+    CORBA::tk_struct,
+    "IDL:omg.org/CORBA/ExtInitializer:1.0",
+    "ExtInitializer",
+    _tao_fields_CORBA_ExtInitializer,
+    3);
+  
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_ExtInitializer =
+    &_tao_tc_CORBA_ExtInitializer;
+}
+
+
+
 // TAO_IDL - Generated from 
 // be\be_visitor_structure/structure_cs.cpp:66
 
@@ -2202,7 +3207,7 @@ CORBA::ExtInitializerSeq::ExtInitializerSeq (
     CORBA::ULong max
   )
   : TAO_Unbounded_Sequence<
-        CORBA::ExtInitializer
+        ExtInitializer
       >
     (max)
 {}
@@ -2214,7 +3219,7 @@ CORBA::ExtInitializerSeq::ExtInitializerSeq (
     CORBA::Boolean release
   )
   : TAO_Unbounded_Sequence<
-        CORBA::ExtInitializer
+        ExtInitializer
       >
     (max, length, buffer, release)
 {}
@@ -2223,7 +3228,7 @@ CORBA::ExtInitializerSeq::ExtInitializerSeq (
     const ExtInitializerSeq &seq
   )
   : TAO_Unbounded_Sequence<
-        CORBA::ExtInitializer
+        ExtInitializer
       >
     (seq)
 {}
@@ -2242,6 +3247,84 @@ void CORBA::ExtInitializerSeq::_tao_any_destructor (
 
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/alias_typecode.cpp:50
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+
+#ifndef _TAO_TYPECODE_CORBA_ExtInitializerSeq_GUARD
+#define _TAO_TYPECODE_CORBA_ExtInitializerSeq_GUARD
+namespace TAO
+{
+  namespace TypeCode
+  {
+    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
+      CORBA_ExtInitializerSeq_0 (
+        CORBA::tk_sequence,
+        &CORBA::_tc_ExtInitializer,
+        0U);
+      
+    ::CORBA::TypeCode_ptr const tc_CORBA_ExtInitializerSeq_0 =
+      &CORBA_ExtInitializerSeq_0;
+    
+  }
+}
+
+
+#endif /* _TAO_TYPECODE_CORBA_ExtInitializerSeq_GUARD */
+
+static TAO::TypeCode::Alias<char const *,
+                            CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ExtInitializerSeq (
+    CORBA::tk_alias,
+    "IDL:omg.org/CORBA/ExtInitializerSeq:1.0",
+    "ExtInitializerSeq",
+    &TAO::TypeCode::tc_CORBA_ExtInitializerSeq_0);
+  
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_ExtInitializerSeq =
+    &_tao_tc_CORBA_ExtInitializerSeq;
+}
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/struct_typecode.cpp:87
+
+static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_UnionMember[] =
+  {
+    { "name", &CORBA::_tc_Identifier },
+    { "label", &CORBA::_tc_any },
+    { "type", &CORBA::_tc_TypeCode },
+    { "type_def", &CORBA::_tc_IDLType }
+    
+  };
+static TAO::TypeCode::Struct<char const *,
+                      CORBA::TypeCode_ptr const *,
+                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
+                      TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_UnionMember (
+    CORBA::tk_struct,
+    "IDL:omg.org/CORBA/UnionMember:1.0",
+    "UnionMember",
+    _tao_fields_CORBA_UnionMember,
+    4);
+  
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_UnionMember =
+    &_tao_tc_CORBA_UnionMember;
+}
+
+
+
 // TAO_IDL - Generated from 
 // be\be_visitor_structure/structure_cs.cpp:66
 
@@ -2268,7 +3351,7 @@ CORBA::UnionMemberSeq::UnionMemberSeq (
     CORBA::ULong max
   )
   : TAO_Unbounded_Sequence<
-        CORBA::UnionMember
+        UnionMember
       >
     (max)
 {}
@@ -2280,7 +3363,7 @@ CORBA::UnionMemberSeq::UnionMemberSeq (
     CORBA::Boolean release
   )
   : TAO_Unbounded_Sequence<
-        CORBA::UnionMember
+        UnionMember
       >
     (max, length, buffer, release)
 {}
@@ -2289,7 +3372,7 @@ CORBA::UnionMemberSeq::UnionMemberSeq (
     const UnionMemberSeq &seq
   )
   : TAO_Unbounded_Sequence<
-        CORBA::UnionMember
+        UnionMember
       >
     (seq)
 {}
@@ -2308,6 +3391,54 @@ void CORBA::UnionMemberSeq::_tao_any_destructor (
 
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/alias_typecode.cpp:50
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+
+#ifndef _TAO_TYPECODE_CORBA_UnionMemberSeq_GUARD
+#define _TAO_TYPECODE_CORBA_UnionMemberSeq_GUARD
+namespace TAO
+{
+  namespace TypeCode
+  {
+    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
+      CORBA_UnionMemberSeq_0 (
+        CORBA::tk_sequence,
+        &CORBA::_tc_UnionMember,
+        0U);
+      
+    ::CORBA::TypeCode_ptr const tc_CORBA_UnionMemberSeq_0 =
+      &CORBA_UnionMemberSeq_0;
+    
+  }
+}
+
+
+#endif /* _TAO_TYPECODE_CORBA_UnionMemberSeq_GUARD */
+
+static TAO::TypeCode::Alias<char const *,
+                            CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_UnionMemberSeq (
+    CORBA::tk_alias,
+    "IDL:omg.org/CORBA/UnionMemberSeq:1.0",
+    "UnionMemberSeq",
+    &TAO::TypeCode::tc_CORBA_UnionMemberSeq_0);
+  
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_UnionMemberSeq =
+    &_tao_tc_CORBA_UnionMemberSeq;
+}
+
+
+
 // TAO_IDL - Generated from 
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
@@ -2356,6 +3487,54 @@ void CORBA::EnumMemberSeq::_tao_any_destructor (
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
+// be\be_visitor_typecode/alias_typecode.cpp:50
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+
+#ifndef _TAO_TYPECODE_CORBA_EnumMemberSeq_GUARD
+#define _TAO_TYPECODE_CORBA_EnumMemberSeq_GUARD
+namespace TAO
+{
+  namespace TypeCode
+  {
+    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
+      CORBA_EnumMemberSeq_0 (
+        CORBA::tk_sequence,
+        &CORBA::_tc_Identifier,
+        0U);
+      
+    ::CORBA::TypeCode_ptr const tc_CORBA_EnumMemberSeq_0 =
+      &CORBA_EnumMemberSeq_0;
+    
+  }
+}
+
+
+#endif /* _TAO_TYPECODE_CORBA_EnumMemberSeq_GUARD */
+
+static TAO::TypeCode::Alias<char const *,
+                            CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_EnumMemberSeq (
+    CORBA::tk_alias,
+    "IDL:omg.org/CORBA/EnumMemberSeq:1.0",
+    "EnumMemberSeq",
+    &TAO::TypeCode::tc_CORBA_EnumMemberSeq_0);
+  
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_EnumMemberSeq =
+    &_tao_tc_CORBA_EnumMemberSeq;
+}
+
+
+
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for CORBA::Container.
@@ -2418,8 +3597,8 @@ TAO::Collocation_Proxy_Broker *
       CORBA_Container_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::Contained>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::ScopedName>::in_arg_val _tao_search_name (search_name);
+  TAO::Arg_Traits< ::CORBA::Contained>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::ScopedName>::in_arg_val _tao_search_name (search_name);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -2464,8 +3643,8 @@ TAO::Collocation_Proxy_Broker *
       CORBA_Container_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::ContainedSeq>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::DefinitionKind>::in_arg_val _tao_limit_type (limit_type);
+  TAO::Arg_Traits< ::CORBA::ContainedSeq>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::DefinitionKind>::in_arg_val _tao_limit_type (limit_type);
   TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_exclude_inherited (exclude_inherited);
   
   TAO::Argument *_the_tao_operation_signature [] =
@@ -2514,10 +3693,10 @@ TAO::Collocation_Proxy_Broker *
       CORBA_Container_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::ContainedSeq>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_search_name (search_name);
+  TAO::Arg_Traits< ::CORBA::ContainedSeq>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_search_name (search_name);
   TAO::Arg_Traits< ::CORBA::Long>::in_arg_val _tao_levels_to_search (levels_to_search);
-  TAO::Arg_Traits< CORBA::DefinitionKind>::in_arg_val _tao_limit_type (limit_type);
+  TAO::Arg_Traits< ::CORBA::DefinitionKind>::in_arg_val _tao_limit_type (limit_type);
   TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_exclude_inherited (exclude_inherited);
   
   TAO::Argument *_the_tao_operation_signature [] =
@@ -2544,6 +3723,30 @@ TAO::Collocation_Proxy_Broker *
   return _tao_retval.retn ();
 }
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/struct_typecode.cpp:87
+
+static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_Container_Description[] =
+  {
+    { "contained_object", &CORBA::_tc_Contained },
+    { "kind", &CORBA::_tc_DefinitionKind },
+    { "value", &CORBA::_tc_any }
+    
+  };
+static TAO::TypeCode::Struct<char const *,
+                      CORBA::TypeCode_ptr const *,
+                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
+                      TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_Container_Description (
+    CORBA::tk_struct,
+    "IDL:omg.org/CORBA/Container/Description:1.0",
+    "Description",
+    _tao_fields_CORBA_Container_Description,
+    3);
+  
+::CORBA::TypeCode_ptr const CORBA::Container::_tc_Description =
+  &_tao_tc_CORBA_Container_Description;
+
 // TAO_IDL - Generated from 
 // be\be_visitor_structure/structure_cs.cpp:66
 
@@ -2570,7 +3773,7 @@ CORBA::Container::DescriptionSeq::DescriptionSeq (
     CORBA::ULong max
   )
   : TAO_Unbounded_Sequence<
-        CORBA::Container::Description
+        Description
       >
     (max)
 {}
@@ -2582,7 +3785,7 @@ CORBA::Container::DescriptionSeq::DescriptionSeq (
     CORBA::Boolean release
   )
   : TAO_Unbounded_Sequence<
-        CORBA::Container::Description
+        Description
       >
     (max, length, buffer, release)
 {}
@@ -2591,7 +3794,7 @@ CORBA::Container::DescriptionSeq::DescriptionSeq (
     const DescriptionSeq &seq
   )
   : TAO_Unbounded_Sequence<
-        CORBA::Container::Description
+        Description
       >
     (seq)
 {}
@@ -2611,6 +3814,49 @@ void CORBA::Container::DescriptionSeq::_tao_any_destructor (
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
+// be\be_visitor_typecode/alias_typecode.cpp:50
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+
+#ifndef _TAO_TYPECODE_CORBA_Container_DescriptionSeq_GUARD
+#define _TAO_TYPECODE_CORBA_Container_DescriptionSeq_GUARD
+namespace TAO
+{
+  namespace TypeCode
+  {
+    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
+      CORBA_Container_DescriptionSeq_0 (
+        CORBA::tk_sequence,
+        &CORBA::Container::_tc_Description,
+        0U);
+      
+    ::CORBA::TypeCode_ptr const tc_CORBA_Container_DescriptionSeq_0 =
+      &CORBA_Container_DescriptionSeq_0;
+    
+  }
+}
+
+
+#endif /* _TAO_TYPECODE_CORBA_Container_DescriptionSeq_GUARD */
+
+static TAO::TypeCode::Alias<char const *,
+                            CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_Container_DescriptionSeq (
+    CORBA::tk_alias,
+    "IDL:omg.org/CORBA/Container/DescriptionSeq:1.0",
+    "DescriptionSeq",
+    &TAO::TypeCode::tc_CORBA_Container_DescriptionSeq_0);
+  
+::CORBA::TypeCode_ptr const CORBA::Container::_tc_DescriptionSeq =
+  &_tao_tc_CORBA_Container_DescriptionSeq;
+
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_cs.cpp:78
 
 ::CORBA::Container::DescriptionSeq * CORBA::Container::describe_contents (
@@ -2633,8 +3879,8 @@ void CORBA::Container::DescriptionSeq::_tao_any_destructor (
       CORBA_Container_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::Container::DescriptionSeq>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::DefinitionKind>::in_arg_val _tao_limit_type (limit_type);
+  TAO::Arg_Traits< ::CORBA::Container::DescriptionSeq>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::DefinitionKind>::in_arg_val _tao_limit_type (limit_type);
   TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_exclude_inherited (exclude_inherited);
   TAO::Arg_Traits< ::CORBA::Long>::in_arg_val _tao_max_returned_objs (max_returned_objs);
   
@@ -2684,10 +3930,10 @@ void CORBA::Container::DescriptionSeq::_tao_any_destructor (
       CORBA_Container_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::ModuleDef>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
-  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
+  TAO::Arg_Traits< ::CORBA::ModuleDef>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id);
+  TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name);
+  TAO::Arg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version (version);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -2737,11 +3983,11 @@ void CORBA::Container::DescriptionSeq::_tao_any_destructor (
       CORBA_Container_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::ConstantDef>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
-  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
-  TAO::Arg_Traits< CORBA::IDLType>::in_arg_val _tao_type (type);
+  TAO::Arg_Traits< ::CORBA::ConstantDef>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id);
+  TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name);
+  TAO::Arg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version (version);
+  TAO::Arg_Traits< ::CORBA::IDLType>::in_arg_val _tao_type (type);
   TAO::Arg_Traits< ::CORBA::Any>::in_arg_val _tao_value (value);
   
   TAO::Argument *_the_tao_operation_signature [] =
@@ -2793,11 +4039,11 @@ void CORBA::Container::DescriptionSeq::_tao_any_destructor (
       CORBA_Container_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::StructDef>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
-  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
-  TAO::Arg_Traits< CORBA::StructMemberSeq>::in_arg_val _tao_members (members);
+  TAO::Arg_Traits< ::CORBA::StructDef>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id);
+  TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name);
+  TAO::Arg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version (version);
+  TAO::Arg_Traits< ::CORBA::StructMemberSeq>::in_arg_val _tao_members (members);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -2848,12 +4094,12 @@ void CORBA::Container::DescriptionSeq::_tao_any_destructor (
       CORBA_Container_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::UnionDef>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
-  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
-  TAO::Arg_Traits< CORBA::IDLType>::in_arg_val _tao_discriminator_type (discriminator_type);
-  TAO::Arg_Traits< CORBA::UnionMemberSeq>::in_arg_val _tao_members (members);
+  TAO::Arg_Traits< ::CORBA::UnionDef>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id);
+  TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name);
+  TAO::Arg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version (version);
+  TAO::Arg_Traits< ::CORBA::IDLType>::in_arg_val _tao_discriminator_type (discriminator_type);
+  TAO::Arg_Traits< ::CORBA::UnionMemberSeq>::in_arg_val _tao_members (members);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -2904,11 +4150,11 @@ void CORBA::Container::DescriptionSeq::_tao_any_destructor (
       CORBA_Container_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::EnumDef>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
-  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
-  TAO::Arg_Traits< CORBA::EnumMemberSeq>::in_arg_val _tao_members (members);
+  TAO::Arg_Traits< ::CORBA::EnumDef>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id);
+  TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name);
+  TAO::Arg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version (version);
+  TAO::Arg_Traits< ::CORBA::EnumMemberSeq>::in_arg_val _tao_members (members);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -2958,11 +4204,11 @@ void CORBA::Container::DescriptionSeq::_tao_any_destructor (
       CORBA_Container_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::AliasDef>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
-  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
-  TAO::Arg_Traits< CORBA::IDLType>::in_arg_val _tao_original_type (original_type);
+  TAO::Arg_Traits< ::CORBA::AliasDef>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id);
+  TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name);
+  TAO::Arg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version (version);
+  TAO::Arg_Traits< ::CORBA::IDLType>::in_arg_val _tao_original_type (original_type);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -3012,11 +4258,11 @@ void CORBA::Container::DescriptionSeq::_tao_any_destructor (
       CORBA_Container_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::InterfaceDef>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
-  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
-  TAO::Arg_Traits< CORBA::InterfaceDefSeq>::in_arg_val _tao_base_interfaces (base_interfaces);
+  TAO::Arg_Traits< ::CORBA::InterfaceDef>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id);
+  TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name);
+  TAO::Arg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version (version);
+  TAO::Arg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_val _tao_base_interfaces (base_interfaces);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -3072,17 +4318,17 @@ void CORBA::Container::DescriptionSeq::_tao_any_destructor (
       CORBA_Container_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::ValueDef>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
-  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
+  TAO::Arg_Traits< ::CORBA::ValueDef>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id);
+  TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name);
+  TAO::Arg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version (version);
   TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_is_custom (is_custom);
   TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_is_abstract (is_abstract);
-  TAO::Arg_Traits< CORBA::ValueDef>::in_arg_val _tao_base_value (base_value);
+  TAO::Arg_Traits< ::CORBA::ValueDef>::in_arg_val _tao_base_value (base_value);
   TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_is_truncatable (is_truncatable);
-  TAO::Arg_Traits< CORBA::ValueDefSeq>::in_arg_val _tao_abstract_base_values (abstract_base_values);
-  TAO::Arg_Traits< CORBA::InterfaceDefSeq>::in_arg_val _tao_supported_interfaces (supported_interfaces);
-  TAO::Arg_Traits< CORBA::InitializerSeq>::in_arg_val _tao_initializers (initializers);
+  TAO::Arg_Traits< ::CORBA::ValueDefSeq>::in_arg_val _tao_abstract_base_values (abstract_base_values);
+  TAO::Arg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_val _tao_supported_interfaces (supported_interfaces);
+  TAO::Arg_Traits< ::CORBA::InitializerSeq>::in_arg_val _tao_initializers (initializers);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -3138,11 +4384,11 @@ void CORBA::Container::DescriptionSeq::_tao_any_destructor (
       CORBA_Container_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::ValueBoxDef>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
-  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
-  TAO::Arg_Traits< CORBA::IDLType>::in_arg_val _tao_original_type_def (original_type_def);
+  TAO::Arg_Traits< ::CORBA::ValueBoxDef>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id);
+  TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name);
+  TAO::Arg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version (version);
+  TAO::Arg_Traits< ::CORBA::IDLType>::in_arg_val _tao_original_type_def (original_type_def);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -3192,11 +4438,11 @@ void CORBA::Container::DescriptionSeq::_tao_any_destructor (
       CORBA_Container_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::ExceptionDef>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
-  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
-  TAO::Arg_Traits< CORBA::StructMemberSeq>::in_arg_val _tao_members (members);
+  TAO::Arg_Traits< ::CORBA::ExceptionDef>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id);
+  TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name);
+  TAO::Arg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version (version);
+  TAO::Arg_Traits< ::CORBA::StructMemberSeq>::in_arg_val _tao_members (members);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -3245,10 +4491,10 @@ void CORBA::Container::DescriptionSeq::_tao_any_destructor (
       CORBA_Container_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::NativeDef>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
-  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
+  TAO::Arg_Traits< ::CORBA::NativeDef>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id);
+  TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name);
+  TAO::Arg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version (version);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -3297,11 +4543,11 @@ void CORBA::Container::DescriptionSeq::_tao_any_destructor (
       CORBA_Container_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::AbstractInterfaceDef>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
-  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
-  TAO::Arg_Traits< CORBA::AbstractInterfaceDefSeq>::in_arg_val _tao_base_interfaces (base_interfaces);
+  TAO::Arg_Traits< ::CORBA::AbstractInterfaceDef>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id);
+  TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name);
+  TAO::Arg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version (version);
+  TAO::Arg_Traits< ::CORBA::AbstractInterfaceDefSeq>::in_arg_val _tao_base_interfaces (base_interfaces);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -3351,11 +4597,11 @@ void CORBA::Container::DescriptionSeq::_tao_any_destructor (
       CORBA_Container_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::LocalInterfaceDef>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
-  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
-  TAO::Arg_Traits< CORBA::InterfaceDefSeq>::in_arg_val _tao_base_interfaces (base_interfaces);
+  TAO::Arg_Traits< ::CORBA::LocalInterfaceDef>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id);
+  TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name);
+  TAO::Arg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version (version);
+  TAO::Arg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_val _tao_base_interfaces (base_interfaces);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -3411,17 +4657,17 @@ void CORBA::Container::DescriptionSeq::_tao_any_destructor (
       CORBA_Container_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::ExtValueDef>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
-  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
+  TAO::Arg_Traits< ::CORBA::ExtValueDef>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id);
+  TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name);
+  TAO::Arg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version (version);
   TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_is_custom (is_custom);
   TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_is_abstract (is_abstract);
-  TAO::Arg_Traits< CORBA::ValueDef>::in_arg_val _tao_base_value (base_value);
+  TAO::Arg_Traits< ::CORBA::ValueDef>::in_arg_val _tao_base_value (base_value);
   TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_is_truncatable (is_truncatable);
-  TAO::Arg_Traits< CORBA::ValueDefSeq>::in_arg_val _tao_abstract_base_values (abstract_base_values);
-  TAO::Arg_Traits< CORBA::InterfaceDefSeq>::in_arg_val _tao_supported_interfaces (supported_interfaces);
-  TAO::Arg_Traits< CORBA::ExtInitializerSeq>::in_arg_val _tao_initializers (initializers);
+  TAO::Arg_Traits< ::CORBA::ValueDefSeq>::in_arg_val _tao_abstract_base_values (abstract_base_values);
+  TAO::Arg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_val _tao_supported_interfaces (supported_interfaces);
+  TAO::Arg_Traits< ::CORBA::ExtInitializerSeq>::in_arg_val _tao_initializers (initializers);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -3573,6 +4819,24 @@ CORBA::Container::marshal (TAO_OutputCDR &cdr)
 }
 
 // TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:76
+
+static TAO::TypeCode::Objref<char const *,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_Container (
+    CORBA::tk_objref,
+    "IDL:omg.org/CORBA/Container:1.0",
+    "Container");
+  
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_Container =
+    &_tao_tc_CORBA_Container;
+}
+
+
+
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for CORBA::IDLType.
@@ -3776,6 +5040,24 @@ CORBA::IDLType::marshal (TAO_OutputCDR &cdr)
 }
 
 // TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:76
+
+static TAO::TypeCode::Objref<char const *,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_IDLType (
+    CORBA::tk_objref,
+    "IDL:omg.org/CORBA/IDLType:1.0",
+    "IDLType");
+  
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_IDLType =
+    &_tao_tc_CORBA_IDLType;
+}
+
+
+
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for CORBA::TypedefDef.
@@ -3945,6 +5227,55 @@ CORBA::TypedefDef::marshal (TAO_OutputCDR &cdr)
   return (cdr << this);
 }
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:76
+
+static TAO::TypeCode::Objref<char const *,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_TypedefDef (
+    CORBA::tk_objref,
+    "IDL:omg.org/CORBA/TypedefDef:1.0",
+    "TypedefDef");
+  
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_TypedefDef =
+    &_tao_tc_CORBA_TypedefDef;
+}
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/struct_typecode.cpp:87
+
+static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_TypeDescription[] =
+  {
+    { "name", &CORBA::_tc_Identifier },
+    { "id", &CORBA::_tc_RepositoryId },
+    { "defined_in", &CORBA::_tc_RepositoryId },
+    { "version", &CORBA::_tc_VersionSpec },
+    { "type", &CORBA::_tc_TypeCode }
+    
+  };
+static TAO::TypeCode::Struct<char const *,
+                      CORBA::TypeCode_ptr const *,
+                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
+                      TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_TypeDescription (
+    CORBA::tk_struct,
+    "IDL:omg.org/CORBA/TypeDescription:1.0",
+    "TypeDescription",
+    _tao_fields_CORBA_TypeDescription,
+    5);
+  
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_TypeDescription =
+    &_tao_tc_CORBA_TypeDescription;
+}
+
+
+
 // TAO_IDL - Generated from 
 // be\be_visitor_structure/structure_cs.cpp:66
 
@@ -3959,6 +5290,1732 @@ CORBA::TypeDescription::_tao_any_destructor (
 }
 
 // TAO_IDL - Generated from
+// be\be_visitor_enum/any_op_cs.cpp:52
+
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::DefinitionKind _tao_elem
+  )
+{
+  TAO::Any_Basic_Impl_T<CORBA::DefinitionKind>::insert (
+      _tao_any,
+      CORBA::_tc_DefinitionKind,
+      _tao_elem
+    );
+}
+
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::DefinitionKind &_tao_elem
+  )
+{
+  return
+    TAO::Any_Basic_Impl_T<CORBA::DefinitionKind>::extract (
+        _tao_any,
+        CORBA::_tc_DefinitionKind,
+        _tao_elem 
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+namespace TAO
+{
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<CORBA::IRObject>::to_object (
+      CORBA::Object_ptr &_tao_elem
+    ) const
+  {
+    _tao_elem = CORBA::Object::_duplicate (this->value_);
+    return true;
+  }
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::IRObject_ptr _tao_elem
+  )
+{
+  CORBA::IRObject_ptr _tao_objptr =
+    CORBA::IRObject::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::IRObject_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<CORBA::IRObject>::insert (
+      _tao_any,
+      CORBA::IRObject::_tao_any_destructor,
+      CORBA::_tc_IRObject,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::IRObject_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<CORBA::IRObject>::extract (
+        _tao_any,
+        CORBA::IRObject::_tao_any_destructor,
+        CORBA::_tc_IRObject,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+namespace TAO
+{
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<CORBA::Contained>::to_object (
+      CORBA::Object_ptr &_tao_elem
+    ) const
+  {
+    _tao_elem = CORBA::Object::_duplicate (this->value_);
+    return true;
+  }
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::Contained_ptr _tao_elem
+  )
+{
+  CORBA::Contained_ptr _tao_objptr =
+    CORBA::Contained::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::Contained_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<CORBA::Contained>::insert (
+      _tao_any,
+      CORBA::Contained::_tao_any_destructor,
+      CORBA::_tc_Contained,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::Contained_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<CORBA::Contained>::extract (
+        _tao_any,
+        CORBA::Contained::_tao_any_destructor,
+        CORBA::_tc_Contained,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from 
+// be\be_visitor_structure/any_op_cs.cpp:54
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const CORBA::Contained::Description &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::Contained::Description>::insert_copy (
+      _tao_any,
+      CORBA::Contained::Description::_tao_any_destructor,
+      CORBA::Contained::_tc_Description,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::Contained::Description *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::Contained::Description>::insert (
+      _tao_any,
+      CORBA::Contained::Description::_tao_any_destructor,
+      CORBA::Contained::_tc_Description,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::Contained::Description *&_tao_elem
+  )
+{
+  return _tao_any >>= const_cast<
+      const CORBA::Contained::Description *&> (
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CORBA::Contained::Description *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<CORBA::Contained::Description>::extract (
+        _tao_any,
+        CORBA::Contained::Description::_tao_any_destructor,
+        CORBA::Contained::_tc_Description,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from 
+// be\be_visitor_sequence/any_op_cs.cpp:54
+
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const CORBA::InterfaceDefSeq &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::InterfaceDefSeq>::insert_copy (
+      _tao_any,
+      CORBA::InterfaceDefSeq::_tao_any_destructor,
+      TAO::TypeCode::tc_CORBA_InterfaceDefSeq_0,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::InterfaceDefSeq *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::InterfaceDefSeq>::insert (
+      _tao_any,
+      CORBA::InterfaceDefSeq::_tao_any_destructor,
+      TAO::TypeCode::tc_CORBA_InterfaceDefSeq_0,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::InterfaceDefSeq *&_tao_elem
+  )
+{
+  return _tao_any >>= const_cast<
+      const CORBA::InterfaceDefSeq *&> (
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CORBA::InterfaceDefSeq *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<CORBA::InterfaceDefSeq>::extract (
+        _tao_any,
+        CORBA::InterfaceDefSeq::_tao_any_destructor,
+        TAO::TypeCode::tc_CORBA_InterfaceDefSeq_0,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from 
+// be\be_visitor_sequence/any_op_cs.cpp:54
+
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const CORBA::ValueDefSeq &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::ValueDefSeq>::insert_copy (
+      _tao_any,
+      CORBA::ValueDefSeq::_tao_any_destructor,
+      TAO::TypeCode::tc_CORBA_ValueDefSeq_0,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ValueDefSeq *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::ValueDefSeq>::insert (
+      _tao_any,
+      CORBA::ValueDefSeq::_tao_any_destructor,
+      TAO::TypeCode::tc_CORBA_ValueDefSeq_0,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::ValueDefSeq *&_tao_elem
+  )
+{
+  return _tao_any >>= const_cast<
+      const CORBA::ValueDefSeq *&> (
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CORBA::ValueDefSeq *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<CORBA::ValueDefSeq>::extract (
+        _tao_any,
+        CORBA::ValueDefSeq::_tao_any_destructor,
+        TAO::TypeCode::tc_CORBA_ValueDefSeq_0,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from 
+// be\be_visitor_sequence/any_op_cs.cpp:54
+
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const CORBA::AbstractInterfaceDefSeq &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::AbstractInterfaceDefSeq>::insert_copy (
+      _tao_any,
+      CORBA::AbstractInterfaceDefSeq::_tao_any_destructor,
+      TAO::TypeCode::tc_CORBA_AbstractInterfaceDefSeq_0,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::AbstractInterfaceDefSeq *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::AbstractInterfaceDefSeq>::insert (
+      _tao_any,
+      CORBA::AbstractInterfaceDefSeq::_tao_any_destructor,
+      TAO::TypeCode::tc_CORBA_AbstractInterfaceDefSeq_0,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::AbstractInterfaceDefSeq *&_tao_elem
+  )
+{
+  return _tao_any >>= const_cast<
+      const CORBA::AbstractInterfaceDefSeq *&> (
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CORBA::AbstractInterfaceDefSeq *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<CORBA::AbstractInterfaceDefSeq>::extract (
+        _tao_any,
+        CORBA::AbstractInterfaceDefSeq::_tao_any_destructor,
+        TAO::TypeCode::tc_CORBA_AbstractInterfaceDefSeq_0,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from 
+// be\be_visitor_sequence/any_op_cs.cpp:54
+
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const CORBA::LocalInterfaceDefSeq &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::LocalInterfaceDefSeq>::insert_copy (
+      _tao_any,
+      CORBA::LocalInterfaceDefSeq::_tao_any_destructor,
+      TAO::TypeCode::tc_CORBA_LocalInterfaceDefSeq_0,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::LocalInterfaceDefSeq *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::LocalInterfaceDefSeq>::insert (
+      _tao_any,
+      CORBA::LocalInterfaceDefSeq::_tao_any_destructor,
+      TAO::TypeCode::tc_CORBA_LocalInterfaceDefSeq_0,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::LocalInterfaceDefSeq *&_tao_elem
+  )
+{
+  return _tao_any >>= const_cast<
+      const CORBA::LocalInterfaceDefSeq *&> (
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CORBA::LocalInterfaceDefSeq *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<CORBA::LocalInterfaceDefSeq>::extract (
+        _tao_any,
+        CORBA::LocalInterfaceDefSeq::_tao_any_destructor,
+        TAO::TypeCode::tc_CORBA_LocalInterfaceDefSeq_0,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from 
+// be\be_visitor_sequence/any_op_cs.cpp:54
+
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const CORBA::ExtInterfaceDefSeq &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::ExtInterfaceDefSeq>::insert_copy (
+      _tao_any,
+      CORBA::ExtInterfaceDefSeq::_tao_any_destructor,
+      TAO::TypeCode::tc_CORBA_ExtInterfaceDefSeq_0,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ExtInterfaceDefSeq *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::ExtInterfaceDefSeq>::insert (
+      _tao_any,
+      CORBA::ExtInterfaceDefSeq::_tao_any_destructor,
+      TAO::TypeCode::tc_CORBA_ExtInterfaceDefSeq_0,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::ExtInterfaceDefSeq *&_tao_elem
+  )
+{
+  return _tao_any >>= const_cast<
+      const CORBA::ExtInterfaceDefSeq *&> (
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CORBA::ExtInterfaceDefSeq *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<CORBA::ExtInterfaceDefSeq>::extract (
+        _tao_any,
+        CORBA::ExtInterfaceDefSeq::_tao_any_destructor,
+        TAO::TypeCode::tc_CORBA_ExtInterfaceDefSeq_0,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from 
+// be\be_visitor_sequence/any_op_cs.cpp:54
+
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const CORBA::ExtValueDefSeq &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::ExtValueDefSeq>::insert_copy (
+      _tao_any,
+      CORBA::ExtValueDefSeq::_tao_any_destructor,
+      TAO::TypeCode::tc_CORBA_ExtValueDefSeq_0,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ExtValueDefSeq *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::ExtValueDefSeq>::insert (
+      _tao_any,
+      CORBA::ExtValueDefSeq::_tao_any_destructor,
+      TAO::TypeCode::tc_CORBA_ExtValueDefSeq_0,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::ExtValueDefSeq *&_tao_elem
+  )
+{
+  return _tao_any >>= const_cast<
+      const CORBA::ExtValueDefSeq *&> (
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CORBA::ExtValueDefSeq *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<CORBA::ExtValueDefSeq>::extract (
+        _tao_any,
+        CORBA::ExtValueDefSeq::_tao_any_destructor,
+        TAO::TypeCode::tc_CORBA_ExtValueDefSeq_0,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from 
+// be\be_visitor_sequence/any_op_cs.cpp:54
+
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const CORBA::ExtAbstractInterfaceDefSeq &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::ExtAbstractInterfaceDefSeq>::insert_copy (
+      _tao_any,
+      CORBA::ExtAbstractInterfaceDefSeq::_tao_any_destructor,
+      TAO::TypeCode::tc_CORBA_ExtAbstractInterfaceDefSeq_0,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ExtAbstractInterfaceDefSeq *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::ExtAbstractInterfaceDefSeq>::insert (
+      _tao_any,
+      CORBA::ExtAbstractInterfaceDefSeq::_tao_any_destructor,
+      TAO::TypeCode::tc_CORBA_ExtAbstractInterfaceDefSeq_0,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::ExtAbstractInterfaceDefSeq *&_tao_elem
+  )
+{
+  return _tao_any >>= const_cast<
+      const CORBA::ExtAbstractInterfaceDefSeq *&> (
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CORBA::ExtAbstractInterfaceDefSeq *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<CORBA::ExtAbstractInterfaceDefSeq>::extract (
+        _tao_any,
+        CORBA::ExtAbstractInterfaceDefSeq::_tao_any_destructor,
+        TAO::TypeCode::tc_CORBA_ExtAbstractInterfaceDefSeq_0,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from 
+// be\be_visitor_sequence/any_op_cs.cpp:54
+
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const CORBA::ExtLocalInterfaceDefSeq &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::ExtLocalInterfaceDefSeq>::insert_copy (
+      _tao_any,
+      CORBA::ExtLocalInterfaceDefSeq::_tao_any_destructor,
+      TAO::TypeCode::tc_CORBA_ExtLocalInterfaceDefSeq_0,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ExtLocalInterfaceDefSeq *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::ExtLocalInterfaceDefSeq>::insert (
+      _tao_any,
+      CORBA::ExtLocalInterfaceDefSeq::_tao_any_destructor,
+      TAO::TypeCode::tc_CORBA_ExtLocalInterfaceDefSeq_0,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::ExtLocalInterfaceDefSeq *&_tao_elem
+  )
+{
+  return _tao_any >>= const_cast<
+      const CORBA::ExtLocalInterfaceDefSeq *&> (
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CORBA::ExtLocalInterfaceDefSeq *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<CORBA::ExtLocalInterfaceDefSeq>::extract (
+        _tao_any,
+        CORBA::ExtLocalInterfaceDefSeq::_tao_any_destructor,
+        TAO::TypeCode::tc_CORBA_ExtLocalInterfaceDefSeq_0,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from 
+// be\be_visitor_sequence/any_op_cs.cpp:54
+
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const CORBA::ContainedSeq &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::ContainedSeq>::insert_copy (
+      _tao_any,
+      CORBA::ContainedSeq::_tao_any_destructor,
+      TAO::TypeCode::tc_CORBA_ContainedSeq_0,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ContainedSeq *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::ContainedSeq>::insert (
+      _tao_any,
+      CORBA::ContainedSeq::_tao_any_destructor,
+      TAO::TypeCode::tc_CORBA_ContainedSeq_0,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::ContainedSeq *&_tao_elem
+  )
+{
+  return _tao_any >>= const_cast<
+      const CORBA::ContainedSeq *&> (
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CORBA::ContainedSeq *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<CORBA::ContainedSeq>::extract (
+        _tao_any,
+        CORBA::ContainedSeq::_tao_any_destructor,
+        TAO::TypeCode::tc_CORBA_ContainedSeq_0,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from 
+// be\be_visitor_structure/any_op_cs.cpp:54
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const CORBA::StructMember &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::StructMember>::insert_copy (
+      _tao_any,
+      CORBA::StructMember::_tao_any_destructor,
+      CORBA::_tc_StructMember,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::StructMember *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::StructMember>::insert (
+      _tao_any,
+      CORBA::StructMember::_tao_any_destructor,
+      CORBA::_tc_StructMember,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::StructMember *&_tao_elem
+  )
+{
+  return _tao_any >>= const_cast<
+      const CORBA::StructMember *&> (
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CORBA::StructMember *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<CORBA::StructMember>::extract (
+        _tao_any,
+        CORBA::StructMember::_tao_any_destructor,
+        CORBA::_tc_StructMember,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from 
+// be\be_visitor_sequence/any_op_cs.cpp:54
+
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const CORBA::StructMemberSeq &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::StructMemberSeq>::insert_copy (
+      _tao_any,
+      CORBA::StructMemberSeq::_tao_any_destructor,
+      TAO::TypeCode::tc_CORBA_StructMemberSeq_0,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::StructMemberSeq *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::StructMemberSeq>::insert (
+      _tao_any,
+      CORBA::StructMemberSeq::_tao_any_destructor,
+      TAO::TypeCode::tc_CORBA_StructMemberSeq_0,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::StructMemberSeq *&_tao_elem
+  )
+{
+  return _tao_any >>= const_cast<
+      const CORBA::StructMemberSeq *&> (
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CORBA::StructMemberSeq *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<CORBA::StructMemberSeq>::extract (
+        _tao_any,
+        CORBA::StructMemberSeq::_tao_any_destructor,
+        TAO::TypeCode::tc_CORBA_StructMemberSeq_0,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from 
+// be\be_visitor_structure/any_op_cs.cpp:54
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const CORBA::Initializer &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::Initializer>::insert_copy (
+      _tao_any,
+      CORBA::Initializer::_tao_any_destructor,
+      CORBA::_tc_Initializer,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::Initializer *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::Initializer>::insert (
+      _tao_any,
+      CORBA::Initializer::_tao_any_destructor,
+      CORBA::_tc_Initializer,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::Initializer *&_tao_elem
+  )
+{
+  return _tao_any >>= const_cast<
+      const CORBA::Initializer *&> (
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CORBA::Initializer *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<CORBA::Initializer>::extract (
+        _tao_any,
+        CORBA::Initializer::_tao_any_destructor,
+        CORBA::_tc_Initializer,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from 
+// be\be_visitor_sequence/any_op_cs.cpp:54
+
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const CORBA::InitializerSeq &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::InitializerSeq>::insert_copy (
+      _tao_any,
+      CORBA::InitializerSeq::_tao_any_destructor,
+      TAO::TypeCode::tc_CORBA_InitializerSeq_0,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::InitializerSeq *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::InitializerSeq>::insert (
+      _tao_any,
+      CORBA::InitializerSeq::_tao_any_destructor,
+      TAO::TypeCode::tc_CORBA_InitializerSeq_0,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::InitializerSeq *&_tao_elem
+  )
+{
+  return _tao_any >>= const_cast<
+      const CORBA::InitializerSeq *&> (
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CORBA::InitializerSeq *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<CORBA::InitializerSeq>::extract (
+        _tao_any,
+        CORBA::InitializerSeq::_tao_any_destructor,
+        TAO::TypeCode::tc_CORBA_InitializerSeq_0,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from 
+// be\be_visitor_structure/any_op_cs.cpp:54
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const CORBA::ExceptionDescription &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::ExceptionDescription>::insert_copy (
+      _tao_any,
+      CORBA::ExceptionDescription::_tao_any_destructor,
+      CORBA::_tc_ExceptionDescription,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ExceptionDescription *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::ExceptionDescription>::insert (
+      _tao_any,
+      CORBA::ExceptionDescription::_tao_any_destructor,
+      CORBA::_tc_ExceptionDescription,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::ExceptionDescription *&_tao_elem
+  )
+{
+  return _tao_any >>= const_cast<
+      const CORBA::ExceptionDescription *&> (
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CORBA::ExceptionDescription *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<CORBA::ExceptionDescription>::extract (
+        _tao_any,
+        CORBA::ExceptionDescription::_tao_any_destructor,
+        CORBA::_tc_ExceptionDescription,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from 
+// be\be_visitor_sequence/any_op_cs.cpp:54
+
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const CORBA::ExcDescriptionSeq &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::ExcDescriptionSeq>::insert_copy (
+      _tao_any,
+      CORBA::ExcDescriptionSeq::_tao_any_destructor,
+      TAO::TypeCode::tc_CORBA_ExcDescriptionSeq_0,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ExcDescriptionSeq *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::ExcDescriptionSeq>::insert (
+      _tao_any,
+      CORBA::ExcDescriptionSeq::_tao_any_destructor,
+      TAO::TypeCode::tc_CORBA_ExcDescriptionSeq_0,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::ExcDescriptionSeq *&_tao_elem
+  )
+{
+  return _tao_any >>= const_cast<
+      const CORBA::ExcDescriptionSeq *&> (
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CORBA::ExcDescriptionSeq *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<CORBA::ExcDescriptionSeq>::extract (
+        _tao_any,
+        CORBA::ExcDescriptionSeq::_tao_any_destructor,
+        TAO::TypeCode::tc_CORBA_ExcDescriptionSeq_0,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from 
+// be\be_visitor_structure/any_op_cs.cpp:54
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const CORBA::ExtInitializer &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::ExtInitializer>::insert_copy (
+      _tao_any,
+      CORBA::ExtInitializer::_tao_any_destructor,
+      CORBA::_tc_ExtInitializer,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ExtInitializer *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::ExtInitializer>::insert (
+      _tao_any,
+      CORBA::ExtInitializer::_tao_any_destructor,
+      CORBA::_tc_ExtInitializer,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::ExtInitializer *&_tao_elem
+  )
+{
+  return _tao_any >>= const_cast<
+      const CORBA::ExtInitializer *&> (
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CORBA::ExtInitializer *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<CORBA::ExtInitializer>::extract (
+        _tao_any,
+        CORBA::ExtInitializer::_tao_any_destructor,
+        CORBA::_tc_ExtInitializer,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from 
+// be\be_visitor_sequence/any_op_cs.cpp:54
+
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const CORBA::ExtInitializerSeq &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::ExtInitializerSeq>::insert_copy (
+      _tao_any,
+      CORBA::ExtInitializerSeq::_tao_any_destructor,
+      TAO::TypeCode::tc_CORBA_ExtInitializerSeq_0,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ExtInitializerSeq *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::ExtInitializerSeq>::insert (
+      _tao_any,
+      CORBA::ExtInitializerSeq::_tao_any_destructor,
+      TAO::TypeCode::tc_CORBA_ExtInitializerSeq_0,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::ExtInitializerSeq *&_tao_elem
+  )
+{
+  return _tao_any >>= const_cast<
+      const CORBA::ExtInitializerSeq *&> (
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CORBA::ExtInitializerSeq *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<CORBA::ExtInitializerSeq>::extract (
+        _tao_any,
+        CORBA::ExtInitializerSeq::_tao_any_destructor,
+        TAO::TypeCode::tc_CORBA_ExtInitializerSeq_0,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from 
+// be\be_visitor_structure/any_op_cs.cpp:54
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const CORBA::UnionMember &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::UnionMember>::insert_copy (
+      _tao_any,
+      CORBA::UnionMember::_tao_any_destructor,
+      CORBA::_tc_UnionMember,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::UnionMember *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::UnionMember>::insert (
+      _tao_any,
+      CORBA::UnionMember::_tao_any_destructor,
+      CORBA::_tc_UnionMember,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::UnionMember *&_tao_elem
+  )
+{
+  return _tao_any >>= const_cast<
+      const CORBA::UnionMember *&> (
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CORBA::UnionMember *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<CORBA::UnionMember>::extract (
+        _tao_any,
+        CORBA::UnionMember::_tao_any_destructor,
+        CORBA::_tc_UnionMember,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from 
+// be\be_visitor_sequence/any_op_cs.cpp:54
+
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const CORBA::UnionMemberSeq &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::UnionMemberSeq>::insert_copy (
+      _tao_any,
+      CORBA::UnionMemberSeq::_tao_any_destructor,
+      TAO::TypeCode::tc_CORBA_UnionMemberSeq_0,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::UnionMemberSeq *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::UnionMemberSeq>::insert (
+      _tao_any,
+      CORBA::UnionMemberSeq::_tao_any_destructor,
+      TAO::TypeCode::tc_CORBA_UnionMemberSeq_0,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::UnionMemberSeq *&_tao_elem
+  )
+{
+  return _tao_any >>= const_cast<
+      const CORBA::UnionMemberSeq *&> (
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CORBA::UnionMemberSeq *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<CORBA::UnionMemberSeq>::extract (
+        _tao_any,
+        CORBA::UnionMemberSeq::_tao_any_destructor,
+        TAO::TypeCode::tc_CORBA_UnionMemberSeq_0,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from 
+// be\be_visitor_sequence/any_op_cs.cpp:54
+
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const CORBA::EnumMemberSeq &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::EnumMemberSeq>::insert_copy (
+      _tao_any,
+      CORBA::EnumMemberSeq::_tao_any_destructor,
+      TAO::TypeCode::tc_CORBA_EnumMemberSeq_0,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::EnumMemberSeq *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::EnumMemberSeq>::insert (
+      _tao_any,
+      CORBA::EnumMemberSeq::_tao_any_destructor,
+      TAO::TypeCode::tc_CORBA_EnumMemberSeq_0,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::EnumMemberSeq *&_tao_elem
+  )
+{
+  return _tao_any >>= const_cast<
+      const CORBA::EnumMemberSeq *&> (
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CORBA::EnumMemberSeq *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<CORBA::EnumMemberSeq>::extract (
+        _tao_any,
+        CORBA::EnumMemberSeq::_tao_any_destructor,
+        TAO::TypeCode::tc_CORBA_EnumMemberSeq_0,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+namespace TAO
+{
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<CORBA::Container>::to_object (
+      CORBA::Object_ptr &_tao_elem
+    ) const
+  {
+    _tao_elem = CORBA::Object::_duplicate (this->value_);
+    return true;
+  }
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::Container_ptr _tao_elem
+  )
+{
+  CORBA::Container_ptr _tao_objptr =
+    CORBA::Container::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::Container_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<CORBA::Container>::insert (
+      _tao_any,
+      CORBA::Container::_tao_any_destructor,
+      CORBA::_tc_Container,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::Container_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<CORBA::Container>::extract (
+        _tao_any,
+        CORBA::Container::_tao_any_destructor,
+        CORBA::_tc_Container,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from 
+// be\be_visitor_structure/any_op_cs.cpp:54
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const CORBA::Container::Description &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::Container::Description>::insert_copy (
+      _tao_any,
+      CORBA::Container::Description::_tao_any_destructor,
+      CORBA::Container::_tc_Description,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::Container::Description *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::Container::Description>::insert (
+      _tao_any,
+      CORBA::Container::Description::_tao_any_destructor,
+      CORBA::Container::_tc_Description,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::Container::Description *&_tao_elem
+  )
+{
+  return _tao_any >>= const_cast<
+      const CORBA::Container::Description *&> (
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CORBA::Container::Description *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<CORBA::Container::Description>::extract (
+        _tao_any,
+        CORBA::Container::Description::_tao_any_destructor,
+        CORBA::Container::_tc_Description,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from 
+// be\be_visitor_sequence/any_op_cs.cpp:54
+
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const CORBA::Container::DescriptionSeq &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::Container::DescriptionSeq>::insert_copy (
+      _tao_any,
+      CORBA::Container::DescriptionSeq::_tao_any_destructor,
+      TAO::TypeCode::tc_CORBA_Container_DescriptionSeq_0,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::Container::DescriptionSeq *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::Container::DescriptionSeq>::insert (
+      _tao_any,
+      CORBA::Container::DescriptionSeq::_tao_any_destructor,
+      TAO::TypeCode::tc_CORBA_Container_DescriptionSeq_0,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::Container::DescriptionSeq *&_tao_elem
+  )
+{
+  return _tao_any >>= const_cast<
+      const CORBA::Container::DescriptionSeq *&> (
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CORBA::Container::DescriptionSeq *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<CORBA::Container::DescriptionSeq>::extract (
+        _tao_any,
+        CORBA::Container::DescriptionSeq::_tao_any_destructor,
+        TAO::TypeCode::tc_CORBA_Container_DescriptionSeq_0,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+namespace TAO
+{
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<CORBA::IDLType>::to_object (
+      CORBA::Object_ptr &_tao_elem
+    ) const
+  {
+    _tao_elem = CORBA::Object::_duplicate (this->value_);
+    return true;
+  }
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::IDLType_ptr _tao_elem
+  )
+{
+  CORBA::IDLType_ptr _tao_objptr =
+    CORBA::IDLType::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::IDLType_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<CORBA::IDLType>::insert (
+      _tao_any,
+      CORBA::IDLType::_tao_any_destructor,
+      CORBA::_tc_IDLType,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::IDLType_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<CORBA::IDLType>::extract (
+        _tao_any,
+        CORBA::IDLType::_tao_any_destructor,
+        CORBA::_tc_IDLType,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+namespace TAO
+{
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<CORBA::TypedefDef>::to_object (
+      CORBA::Object_ptr &_tao_elem
+    ) const
+  {
+    _tao_elem = CORBA::Object::_duplicate (this->value_);
+    return true;
+  }
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::TypedefDef_ptr _tao_elem
+  )
+{
+  CORBA::TypedefDef_ptr _tao_objptr =
+    CORBA::TypedefDef::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::TypedefDef_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<CORBA::TypedefDef>::insert (
+      _tao_any,
+      CORBA::TypedefDef::_tao_any_destructor,
+      CORBA::_tc_TypedefDef,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::TypedefDef_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<CORBA::TypedefDef>::extract (
+        _tao_any,
+        CORBA::TypedefDef::_tao_any_destructor,
+        CORBA::_tc_TypedefDef,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from 
+// be\be_visitor_structure/any_op_cs.cpp:54
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const CORBA::TypeDescription &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::TypeDescription>::insert_copy (
+      _tao_any,
+      CORBA::TypeDescription::_tao_any_destructor,
+      CORBA::_tc_TypeDescription,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::TypeDescription *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::TypeDescription>::insert (
+      _tao_any,
+      CORBA::TypeDescription::_tao_any_destructor,
+      CORBA::_tc_TypeDescription,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::TypeDescription *&_tao_elem
+  )
+{
+  return _tao_any >>= const_cast<
+      const CORBA::TypeDescription *&> (
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CORBA::TypeDescription *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<CORBA::TypeDescription>::extract (
+        _tao_any,
+        CORBA::TypeDescription::_tao_any_destructor,
+        CORBA::_tc_TypeDescription,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from
 // be\be_visitor_enum/cdr_op_cs.cpp:51
 
 CORBA::Boolean operator<< (TAO_OutputCDR & strm, CORBA::DefinitionKind _tao_enumerator)
diff --git a/TAO/tao/IFR_Client/IFR_BaseC.h b/TAO/tao/IFR_Client/IFR_BaseC.h
index 2b8edf46575..83817c8af4f 100644
--- a/TAO/tao/IFR_Client/IFR_BaseC.h
+++ b/TAO/tao/IFR_Client/IFR_BaseC.h
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:153
+// be\be_codegen.cpp:154
 
 #ifndef _TAO_IDL_ORIG_IFR_BASEC_H_
 #define _TAO_IDL_ORIG_IFR_BASEC_H_
@@ -45,9 +45,10 @@
 #include "tao/SystemException.h"
 #include "tao/Environment.h"
 #include "tao/Object.h"
-#include "tao/TypeCode.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Any.h"
+#include "tao/AnyTypeCode/TypeCode.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Any.h"
+#include "tao/AnyTypeCode/TypeCode.h"
 #include "tao/Sequence_T.h"
 #include "tao/Objref_VarOut_T.h"
 #include "tao/Seq_Var_T.h"
@@ -71,7 +72,7 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_root/root_ch.cpp:62
 
 namespace TAO
@@ -85,22 +86,22 @@ namespace TAO
 
 namespace CORBA
 {
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typedef/typedef_ch.cpp:413
-  
+
   typedef char * ScopedName;
   typedef CORBA::String_var ScopedName_var;
   typedef CORBA::String_out ScopedName_out;
-  
+
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ScopedName;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_enum/enum_ch.cpp:57
-  
+
   enum DefinitionKind
   {
     dk_none,
@@ -140,29 +141,29 @@ namespace CORBA
     dk_Uses,
     dk_Event
   };
-  
+
   typedef DefinitionKind &DefinitionKind_out;
-  
+
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_DefinitionKind;
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_CORBA_IROBJECT__VAR_OUT_CH_)
 #define _CORBA_IROBJECT__VAR_OUT_CH_
-  
+
   class IRObject;
   typedef IRObject *IRObject_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         IRObject
       >
     IRObject_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         IRObject
@@ -170,13 +171,13 @@ namespace CORBA
     IRObject_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_IROBJECT_CH_)
 #define _CORBA_IROBJECT_CH_
-  
+
   class TAO_IFR_Client_Export IRObject
     : public virtual CORBA::Object
   {
@@ -184,76 +185,76 @@ namespace CORBA
     friend class TAO::Narrow_Utils<IRObject>;
     typedef IRObject_ptr _ptr_type;
     typedef IRObject_var _var_type;
-    
+
     // The static operations.
     static IRObject_ptr _duplicate (IRObject_ptr obj);
-    
+
     static void _tao_release (IRObject_ptr obj);
-    
+
     static IRObject_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static IRObject_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static IRObject_ptr _nil (void)
     {
       return static_cast<IRObject_ptr> (0);
     }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::DefinitionKind def_kind (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void destroy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
-    
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     TAO::Collocation_Proxy_Broker *the_TAO_IRObject_Proxy_Broker_;
-  
+
   protected:
     // Concrete interface only.
     IRObject (void);
-    
+
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void CORBA_IRObject_setup_collocation (void);
-    
+
     // Concrete non-local interface only.
     IRObject (
         IOP::IOR *ior,
         TAO_ORB_Core *orb_core = 0
       );
-    
+
     // Non-local interface only.
     IRObject (
         TAO_Stub *objref,
@@ -261,50 +262,50 @@ namespace CORBA
         TAO_Abstract_ServantBase *servant = 0,
         TAO_ORB_Core *orb_core = 0
       );
-    
+
     virtual ~IRObject (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     IRObject (const IRObject &);
-    
+
     void operator= (const IRObject &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_IRObject;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typedef/typedef_ch.cpp:413
-  
+
   typedef char * VersionSpec;
   typedef CORBA::String_var VersionSpec_var;
   typedef CORBA::String_out VersionSpec_out;
-  
+
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_VersionSpec;
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_CORBA_CONTAINED__VAR_OUT_CH_)
 #define _CORBA_CONTAINED__VAR_OUT_CH_
-  
+
   class Contained;
   typedef Contained *Contained_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         Contained
       >
     Contained_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         Contained
@@ -312,22 +313,22 @@ namespace CORBA
     Contained_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_CORBA_REPOSITORY__VAR_OUT_CH_)
 #define _CORBA_REPOSITORY__VAR_OUT_CH_
-  
+
   class Repository;
   typedef Repository *Repository_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         Repository
       >
     Repository_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         Repository
@@ -335,22 +336,22 @@ namespace CORBA
     Repository_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_CORBA_CONTAINER__VAR_OUT_CH_)
 #define _CORBA_CONTAINER__VAR_OUT_CH_
-  
+
   class Container;
   typedef Container *Container_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         Container
       >
     Container_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         Container
@@ -358,13 +359,13 @@ namespace CORBA
     Container_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_CONTAINED_CH_)
 #define _CORBA_CONTAINED_CH_
-  
+
   class TAO_IFR_Client_Export Contained
     : public virtual ::CORBA::IRObject
   {
@@ -372,42 +373,42 @@ namespace CORBA
     friend class TAO::Narrow_Utils<Contained>;
     typedef Contained_ptr _ptr_type;
     typedef Contained_var _var_type;
-    
+
     // The static operations.
     static Contained_ptr _duplicate (Contained_ptr obj);
-    
+
     static void _tao_release (Contained_ptr obj);
-    
+
     static Contained_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static Contained_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static Contained_ptr _nil (void)
     {
       return static_cast<Contained_ptr> (0);
     }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual char * id (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void id (
         const char * id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -415,20 +416,20 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual char * name (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void name (
         const char * name
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -436,20 +437,20 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual char * version (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void version (
         const char * version
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -457,85 +458,85 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::Container_ptr defined_in (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual char * absolute_name (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::Repository_ptr containing_repository (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_type.cpp:258
-    
+
     struct Description;
-    
+
     typedef
       TAO_Var_Var_T<
           Description
         >
       Description_var;
-    
+
     typedef
       TAO_Out_T<
           Description,
           Description_var
         >
       Description_out;
-    
+
     // TAO_IDL - Generated from
-    // be\be_visitor_structure/structure_ch.cpp:52
-    
+    // be\be_visitor_structure/structure_ch.cpp:57
+
     struct TAO_IFR_Client_Export Description
     {
       typedef Description_var _var_type;
-      
+
       static void _tao_any_destructor (void *);
       ACE_NESTED_CLASS (CORBA, DefinitionKind) kind;
       CORBA::Any value;
     };
-    
+
     // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:44
-    
+    // be\be_visitor_typecode/typecode_decl.cpp:49
+
     static ::CORBA::TypeCode_ptr const _tc_Description;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::Contained::Description * describe (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void move (
         ::CORBA::Container_ptr new_container,
         const char * new_name,
@@ -545,34 +546,34 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
-    
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     TAO::Collocation_Proxy_Broker *the_TAO_Contained_Proxy_Broker_;
-  
+
   protected:
     // Concrete interface only.
     Contained (void);
-    
+
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void CORBA_Contained_setup_collocation (void);
-    
+
     // Concrete non-local interface only.
     Contained (
         IOP::IOR *ior,
         TAO_ORB_Core *orb_core = 0
       );
-    
+
     // Non-local interface only.
     Contained (
         TAO_Stub *objref,
@@ -580,38 +581,38 @@ namespace CORBA
         TAO_Abstract_ServantBase *servant = 0,
         TAO_ORB_Core *orb_core = 0
       );
-    
+
     virtual ~Contained (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     Contained (const Contained &);
-    
+
     void operator= (const Contained &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_Contained;
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_CORBA_MODULEDEF__VAR_OUT_CH_)
 #define _CORBA_MODULEDEF__VAR_OUT_CH_
-  
+
   class ModuleDef;
   typedef ModuleDef *ModuleDef_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         ModuleDef
       >
     ModuleDef_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         ModuleDef
@@ -619,22 +620,22 @@ namespace CORBA
     ModuleDef_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_CORBA_CONSTANTDEF__VAR_OUT_CH_)
 #define _CORBA_CONSTANTDEF__VAR_OUT_CH_
-  
+
   class ConstantDef;
   typedef ConstantDef *ConstantDef_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         ConstantDef
       >
     ConstantDef_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         ConstantDef
@@ -642,22 +643,22 @@ namespace CORBA
     ConstantDef_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_CORBA_IDLTYPE__VAR_OUT_CH_)
 #define _CORBA_IDLTYPE__VAR_OUT_CH_
-  
+
   class IDLType;
   typedef IDLType *IDLType_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         IDLType
       >
     IDLType_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         IDLType
@@ -665,22 +666,22 @@ namespace CORBA
     IDLType_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_CORBA_STRUCTDEF__VAR_OUT_CH_)
 #define _CORBA_STRUCTDEF__VAR_OUT_CH_
-  
+
   class StructDef;
   typedef StructDef *StructDef_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         StructDef
       >
     StructDef_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         StructDef
@@ -688,22 +689,22 @@ namespace CORBA
     StructDef_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_CORBA_UNIONDEF__VAR_OUT_CH_)
 #define _CORBA_UNIONDEF__VAR_OUT_CH_
-  
+
   class UnionDef;
   typedef UnionDef *UnionDef_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         UnionDef
       >
     UnionDef_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         UnionDef
@@ -711,22 +712,22 @@ namespace CORBA
     UnionDef_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_CORBA_ENUMDEF__VAR_OUT_CH_)
 #define _CORBA_ENUMDEF__VAR_OUT_CH_
-  
+
   class EnumDef;
   typedef EnumDef *EnumDef_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         EnumDef
       >
     EnumDef_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         EnumDef
@@ -734,22 +735,22 @@ namespace CORBA
     EnumDef_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_CORBA_ALIASDEF__VAR_OUT_CH_)
 #define _CORBA_ALIASDEF__VAR_OUT_CH_
-  
+
   class AliasDef;
   typedef AliasDef *AliasDef_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         AliasDef
       >
     AliasDef_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         AliasDef
@@ -757,22 +758,22 @@ namespace CORBA
     AliasDef_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_CORBA_INTERFACEDEF__VAR_OUT_CH_)
 #define _CORBA_INTERFACEDEF__VAR_OUT_CH_
-  
+
   class InterfaceDef;
   typedef InterfaceDef *InterfaceDef_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         InterfaceDef
       >
     InterfaceDef_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         InterfaceDef
@@ -780,15 +781,15 @@ namespace CORBA
     InterfaceDef_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_INTERFACEDEFSEQ_CH_)
 #define _CORBA_INTERFACEDEFSEQ_CH_
-  
+
   class InterfaceDefSeq;
-  
+
   typedef
     TAO_MngSeq_Var_T<
         InterfaceDefSeq,
@@ -798,7 +799,7 @@ namespace CORBA
           >
       >
     InterfaceDefSeq_var;
-  
+
   typedef
     TAO_MngSeq_Out_T<
         InterfaceDefSeq,
@@ -809,7 +810,7 @@ namespace CORBA
           >
       >
     InterfaceDefSeq_out;
-  
+
   class TAO_IFR_Client_Export InterfaceDefSeq
     : public
         TAO_Unbounded_Object_Sequence<
@@ -823,39 +824,39 @@ namespace CORBA
     InterfaceDefSeq (
         CORBA::ULong max,
         CORBA::ULong length,
-        InterfaceDef_ptr* buffer, 
+        InterfaceDef_ptr* buffer,
         CORBA::Boolean release = 0
       );
     InterfaceDefSeq (const InterfaceDefSeq &);
     ~InterfaceDefSeq (void);
-    
+
     static void _tao_any_destructor (void *);
-    
+
     typedef InterfaceDefSeq_var _var_type;
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_InterfaceDefSeq;
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_CORBA_EXCEPTIONDEF__VAR_OUT_CH_)
 #define _CORBA_EXCEPTIONDEF__VAR_OUT_CH_
-  
+
   class ExceptionDef;
   typedef ExceptionDef *ExceptionDef_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         ExceptionDef
       >
     ExceptionDef_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         ExceptionDef
@@ -863,22 +864,22 @@ namespace CORBA
     ExceptionDef_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_CORBA_NATIVEDEF__VAR_OUT_CH_)
 #define _CORBA_NATIVEDEF__VAR_OUT_CH_
-  
+
   class NativeDef;
   typedef NativeDef *NativeDef_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         NativeDef
       >
     NativeDef_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         NativeDef
@@ -886,22 +887,22 @@ namespace CORBA
     NativeDef_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_CORBA_VALUEDEF__VAR_OUT_CH_)
 #define _CORBA_VALUEDEF__VAR_OUT_CH_
-  
+
   class ValueDef;
   typedef ValueDef *ValueDef_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         ValueDef
       >
     ValueDef_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         ValueDef
@@ -909,15 +910,15 @@ namespace CORBA
     ValueDef_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_VALUEDEFSEQ_CH_)
 #define _CORBA_VALUEDEFSEQ_CH_
-  
+
   class ValueDefSeq;
-  
+
   typedef
     TAO_MngSeq_Var_T<
         ValueDefSeq,
@@ -927,7 +928,7 @@ namespace CORBA
           >
       >
     ValueDefSeq_var;
-  
+
   typedef
     TAO_MngSeq_Out_T<
         ValueDefSeq,
@@ -938,7 +939,7 @@ namespace CORBA
           >
       >
     ValueDefSeq_out;
-  
+
   class TAO_IFR_Client_Export ValueDefSeq
     : public
         TAO_Unbounded_Object_Sequence<
@@ -952,39 +953,39 @@ namespace CORBA
     ValueDefSeq (
         CORBA::ULong max,
         CORBA::ULong length,
-        ValueDef_ptr* buffer, 
+        ValueDef_ptr* buffer,
         CORBA::Boolean release = 0
       );
     ValueDefSeq (const ValueDefSeq &);
     ~ValueDefSeq (void);
-    
+
     static void _tao_any_destructor (void *);
-    
+
     typedef ValueDefSeq_var _var_type;
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ValueDefSeq;
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_CORBA_VALUEBOXDEF__VAR_OUT_CH_)
 #define _CORBA_VALUEBOXDEF__VAR_OUT_CH_
-  
+
   class ValueBoxDef;
   typedef ValueBoxDef *ValueBoxDef_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         ValueBoxDef
       >
     ValueBoxDef_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         ValueBoxDef
@@ -992,22 +993,22 @@ namespace CORBA
     ValueBoxDef_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_CORBA_ABSTRACTINTERFACEDEF__VAR_OUT_CH_)
 #define _CORBA_ABSTRACTINTERFACEDEF__VAR_OUT_CH_
-  
+
   class AbstractInterfaceDef;
   typedef AbstractInterfaceDef *AbstractInterfaceDef_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         AbstractInterfaceDef
       >
     AbstractInterfaceDef_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         AbstractInterfaceDef
@@ -1015,15 +1016,15 @@ namespace CORBA
     AbstractInterfaceDef_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_ABSTRACTINTERFACEDEFSEQ_CH_)
 #define _CORBA_ABSTRACTINTERFACEDEFSEQ_CH_
-  
+
   class AbstractInterfaceDefSeq;
-  
+
   typedef
     TAO_MngSeq_Var_T<
         AbstractInterfaceDefSeq,
@@ -1033,7 +1034,7 @@ namespace CORBA
           >
       >
     AbstractInterfaceDefSeq_var;
-  
+
   typedef
     TAO_MngSeq_Out_T<
         AbstractInterfaceDefSeq,
@@ -1044,7 +1045,7 @@ namespace CORBA
           >
       >
     AbstractInterfaceDefSeq_out;
-  
+
   class TAO_IFR_Client_Export AbstractInterfaceDefSeq
     : public
         TAO_Unbounded_Object_Sequence<
@@ -1058,39 +1059,39 @@ namespace CORBA
     AbstractInterfaceDefSeq (
         CORBA::ULong max,
         CORBA::ULong length,
-        AbstractInterfaceDef_ptr* buffer, 
+        AbstractInterfaceDef_ptr* buffer,
         CORBA::Boolean release = 0
       );
     AbstractInterfaceDefSeq (const AbstractInterfaceDefSeq &);
     ~AbstractInterfaceDefSeq (void);
-    
+
     static void _tao_any_destructor (void *);
-    
+
     typedef AbstractInterfaceDefSeq_var _var_type;
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_AbstractInterfaceDefSeq;
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_CORBA_LOCALINTERFACEDEF__VAR_OUT_CH_)
 #define _CORBA_LOCALINTERFACEDEF__VAR_OUT_CH_
-  
+
   class LocalInterfaceDef;
   typedef LocalInterfaceDef *LocalInterfaceDef_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         LocalInterfaceDef
       >
     LocalInterfaceDef_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         LocalInterfaceDef
@@ -1098,15 +1099,15 @@ namespace CORBA
     LocalInterfaceDef_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_LOCALINTERFACEDEFSEQ_CH_)
 #define _CORBA_LOCALINTERFACEDEFSEQ_CH_
-  
+
   class LocalInterfaceDefSeq;
-  
+
   typedef
     TAO_MngSeq_Var_T<
         LocalInterfaceDefSeq,
@@ -1116,7 +1117,7 @@ namespace CORBA
           >
       >
     LocalInterfaceDefSeq_var;
-  
+
   typedef
     TAO_MngSeq_Out_T<
         LocalInterfaceDefSeq,
@@ -1127,7 +1128,7 @@ namespace CORBA
           >
       >
     LocalInterfaceDefSeq_out;
-  
+
   class TAO_IFR_Client_Export LocalInterfaceDefSeq
     : public
         TAO_Unbounded_Object_Sequence<
@@ -1141,39 +1142,39 @@ namespace CORBA
     LocalInterfaceDefSeq (
         CORBA::ULong max,
         CORBA::ULong length,
-        LocalInterfaceDef_ptr* buffer, 
+        LocalInterfaceDef_ptr* buffer,
         CORBA::Boolean release = 0
       );
     LocalInterfaceDefSeq (const LocalInterfaceDefSeq &);
     ~LocalInterfaceDefSeq (void);
-    
+
     static void _tao_any_destructor (void *);
-    
+
     typedef LocalInterfaceDefSeq_var _var_type;
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_LocalInterfaceDefSeq;
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_CORBA_EXTINTERFACEDEF__VAR_OUT_CH_)
 #define _CORBA_EXTINTERFACEDEF__VAR_OUT_CH_
-  
+
   class ExtInterfaceDef;
   typedef ExtInterfaceDef *ExtInterfaceDef_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         ExtInterfaceDef
       >
     ExtInterfaceDef_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         ExtInterfaceDef
@@ -1181,15 +1182,15 @@ namespace CORBA
     ExtInterfaceDef_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_EXTINTERFACEDEFSEQ_CH_)
 #define _CORBA_EXTINTERFACEDEFSEQ_CH_
-  
+
   class ExtInterfaceDefSeq;
-  
+
   typedef
     TAO_MngSeq_Var_T<
         ExtInterfaceDefSeq,
@@ -1199,7 +1200,7 @@ namespace CORBA
           >
       >
     ExtInterfaceDefSeq_var;
-  
+
   typedef
     TAO_MngSeq_Out_T<
         ExtInterfaceDefSeq,
@@ -1210,7 +1211,7 @@ namespace CORBA
           >
       >
     ExtInterfaceDefSeq_out;
-  
+
   class TAO_IFR_Client_Export ExtInterfaceDefSeq
     : public
         TAO_Unbounded_Object_Sequence<
@@ -1224,39 +1225,39 @@ namespace CORBA
     ExtInterfaceDefSeq (
         CORBA::ULong max,
         CORBA::ULong length,
-        ExtInterfaceDef_ptr* buffer, 
+        ExtInterfaceDef_ptr* buffer,
         CORBA::Boolean release = 0
       );
     ExtInterfaceDefSeq (const ExtInterfaceDefSeq &);
     ~ExtInterfaceDefSeq (void);
-    
+
     static void _tao_any_destructor (void *);
-    
+
     typedef ExtInterfaceDefSeq_var _var_type;
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ExtInterfaceDefSeq;
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_CORBA_EXTVALUEDEF__VAR_OUT_CH_)
 #define _CORBA_EXTVALUEDEF__VAR_OUT_CH_
-  
+
   class ExtValueDef;
   typedef ExtValueDef *ExtValueDef_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         ExtValueDef
       >
     ExtValueDef_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         ExtValueDef
@@ -1264,15 +1265,15 @@ namespace CORBA
     ExtValueDef_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_EXTVALUEDEFSEQ_CH_)
 #define _CORBA_EXTVALUEDEFSEQ_CH_
-  
+
   class ExtValueDefSeq;
-  
+
   typedef
     TAO_MngSeq_Var_T<
         ExtValueDefSeq,
@@ -1282,7 +1283,7 @@ namespace CORBA
           >
       >
     ExtValueDefSeq_var;
-  
+
   typedef
     TAO_MngSeq_Out_T<
         ExtValueDefSeq,
@@ -1293,7 +1294,7 @@ namespace CORBA
           >
       >
     ExtValueDefSeq_out;
-  
+
   class TAO_IFR_Client_Export ExtValueDefSeq
     : public
         TAO_Unbounded_Object_Sequence<
@@ -1307,39 +1308,39 @@ namespace CORBA
     ExtValueDefSeq (
         CORBA::ULong max,
         CORBA::ULong length,
-        ExtValueDef_ptr* buffer, 
+        ExtValueDef_ptr* buffer,
         CORBA::Boolean release = 0
       );
     ExtValueDefSeq (const ExtValueDefSeq &);
     ~ExtValueDefSeq (void);
-    
+
     static void _tao_any_destructor (void *);
-    
+
     typedef ExtValueDefSeq_var _var_type;
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ExtValueDefSeq;
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_CORBA_EXTABSTRACTINTERFACEDEF__VAR_OUT_CH_)
 #define _CORBA_EXTABSTRACTINTERFACEDEF__VAR_OUT_CH_
-  
+
   class ExtAbstractInterfaceDef;
   typedef ExtAbstractInterfaceDef *ExtAbstractInterfaceDef_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         ExtAbstractInterfaceDef
       >
     ExtAbstractInterfaceDef_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         ExtAbstractInterfaceDef
@@ -1347,15 +1348,15 @@ namespace CORBA
     ExtAbstractInterfaceDef_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_EXTABSTRACTINTERFACEDEFSEQ_CH_)
 #define _CORBA_EXTABSTRACTINTERFACEDEFSEQ_CH_
-  
+
   class ExtAbstractInterfaceDefSeq;
-  
+
   typedef
     TAO_MngSeq_Var_T<
         ExtAbstractInterfaceDefSeq,
@@ -1365,7 +1366,7 @@ namespace CORBA
           >
       >
     ExtAbstractInterfaceDefSeq_var;
-  
+
   typedef
     TAO_MngSeq_Out_T<
         ExtAbstractInterfaceDefSeq,
@@ -1376,7 +1377,7 @@ namespace CORBA
           >
       >
     ExtAbstractInterfaceDefSeq_out;
-  
+
   class TAO_IFR_Client_Export ExtAbstractInterfaceDefSeq
     : public
         TAO_Unbounded_Object_Sequence<
@@ -1390,39 +1391,39 @@ namespace CORBA
     ExtAbstractInterfaceDefSeq (
         CORBA::ULong max,
         CORBA::ULong length,
-        ExtAbstractInterfaceDef_ptr* buffer, 
+        ExtAbstractInterfaceDef_ptr* buffer,
         CORBA::Boolean release = 0
       );
     ExtAbstractInterfaceDefSeq (const ExtAbstractInterfaceDefSeq &);
     ~ExtAbstractInterfaceDefSeq (void);
-    
+
     static void _tao_any_destructor (void *);
-    
+
     typedef ExtAbstractInterfaceDefSeq_var _var_type;
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ExtAbstractInterfaceDefSeq;
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_CORBA_EXTLOCALINTERFACEDEF__VAR_OUT_CH_)
 #define _CORBA_EXTLOCALINTERFACEDEF__VAR_OUT_CH_
-  
+
   class ExtLocalInterfaceDef;
   typedef ExtLocalInterfaceDef *ExtLocalInterfaceDef_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         ExtLocalInterfaceDef
       >
     ExtLocalInterfaceDef_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         ExtLocalInterfaceDef
@@ -1430,15 +1431,15 @@ namespace CORBA
     ExtLocalInterfaceDef_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_EXTLOCALINTERFACEDEFSEQ_CH_)
 #define _CORBA_EXTLOCALINTERFACEDEFSEQ_CH_
-  
+
   class ExtLocalInterfaceDefSeq;
-  
+
   typedef
     TAO_MngSeq_Var_T<
         ExtLocalInterfaceDefSeq,
@@ -1448,7 +1449,7 @@ namespace CORBA
           >
       >
     ExtLocalInterfaceDefSeq_var;
-  
+
   typedef
     TAO_MngSeq_Out_T<
         ExtLocalInterfaceDefSeq,
@@ -1459,7 +1460,7 @@ namespace CORBA
           >
       >
     ExtLocalInterfaceDefSeq_out;
-  
+
   class TAO_IFR_Client_Export ExtLocalInterfaceDefSeq
     : public
         TAO_Unbounded_Object_Sequence<
@@ -1473,32 +1474,32 @@ namespace CORBA
     ExtLocalInterfaceDefSeq (
         CORBA::ULong max,
         CORBA::ULong length,
-        ExtLocalInterfaceDef_ptr* buffer, 
+        ExtLocalInterfaceDef_ptr* buffer,
         CORBA::Boolean release = 0
       );
     ExtLocalInterfaceDefSeq (const ExtLocalInterfaceDefSeq &);
     ~ExtLocalInterfaceDefSeq (void);
-    
+
     static void _tao_any_destructor (void *);
-    
+
     typedef ExtLocalInterfaceDefSeq_var _var_type;
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ExtLocalInterfaceDefSeq;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_CONTAINEDSEQ_CH_)
 #define _CORBA_CONTAINEDSEQ_CH_
-  
+
   class ContainedSeq;
-  
+
   typedef
     TAO_MngSeq_Var_T<
         ContainedSeq,
@@ -1508,7 +1509,7 @@ namespace CORBA
           >
       >
     ContainedSeq_var;
-  
+
   typedef
     TAO_MngSeq_Out_T<
         ContainedSeq,
@@ -1519,7 +1520,7 @@ namespace CORBA
           >
       >
     ContainedSeq_out;
-  
+
   class TAO_IFR_Client_Export ContainedSeq
     : public
         TAO_Unbounded_Object_Sequence<
@@ -1533,75 +1534,75 @@ namespace CORBA
     ContainedSeq (
         CORBA::ULong max,
         CORBA::ULong length,
-        Contained_ptr* buffer, 
+        Contained_ptr* buffer,
         CORBA::Boolean release = 0
       );
     ContainedSeq (const ContainedSeq &);
     ~ContainedSeq (void);
-    
+
     static void _tao_any_destructor (void *);
-    
+
     typedef ContainedSeq_var _var_type;
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ContainedSeq;
-  
+
   // TAO_IDL - Generated from
   // be\be_type.cpp:258
-  
+
   struct StructMember;
-  
+
   typedef
     TAO_Var_Var_T<
         StructMember
       >
     StructMember_var;
-  
+
   typedef
     TAO_Out_T<
         StructMember,
         StructMember_var
       >
     StructMember_out;
-  
+
   // TAO_IDL - Generated from
-  // be\be_visitor_structure/structure_ch.cpp:52
-  
+  // be\be_visitor_structure/structure_ch.cpp:57
+
   struct TAO_IFR_Client_Export StructMember
   {
     typedef StructMember_var _var_type;
-    
+
     static void _tao_any_destructor (void *);
     TAO_String_Manager name;
     CORBA::TypeCode_var type;
     CORBA::IDLType_var type_def;
   };
-  
+
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_StructMember;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_STRUCTMEMBERSEQ_CH_)
 #define _CORBA_STRUCTMEMBERSEQ_CH_
-  
+
   class StructMemberSeq;
-  
+
   typedef
     TAO_VarSeq_Var_T<
         StructMemberSeq,
         StructMember
       >
     StructMemberSeq_var;
-  
+
   typedef
     TAO_Seq_Out_T<
         StructMemberSeq,
@@ -1609,7 +1610,7 @@ namespace CORBA
         StructMember
       >
     StructMemberSeq_out;
-  
+
   class TAO_IFR_Client_Export StructMemberSeq
     : public
         TAO_Unbounded_Sequence<
@@ -1622,74 +1623,74 @@ namespace CORBA
     StructMemberSeq (
         CORBA::ULong max,
         CORBA::ULong length,
-        StructMember* buffer, 
+        StructMember* buffer,
         CORBA::Boolean release = 0
       );
     StructMemberSeq (const StructMemberSeq &);
     ~StructMemberSeq (void);
-    
+
     static void _tao_any_destructor (void *);
-    
+
     typedef StructMemberSeq_var _var_type;
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_StructMemberSeq;
-  
+
   // TAO_IDL - Generated from
   // be\be_type.cpp:258
-  
+
   struct Initializer;
-  
+
   typedef
     TAO_Var_Var_T<
         Initializer
       >
     Initializer_var;
-  
+
   typedef
     TAO_Out_T<
         Initializer,
         Initializer_var
       >
     Initializer_out;
-  
+
   // TAO_IDL - Generated from
-  // be\be_visitor_structure/structure_ch.cpp:52
-  
+  // be\be_visitor_structure/structure_ch.cpp:57
+
   struct TAO_IFR_Client_Export Initializer
   {
     typedef Initializer_var _var_type;
-    
+
     static void _tao_any_destructor (void *);
     CORBA::StructMemberSeq members;
     TAO_String_Manager name;
   };
-  
+
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_Initializer;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_INITIALIZERSEQ_CH_)
 #define _CORBA_INITIALIZERSEQ_CH_
-  
+
   class InitializerSeq;
-  
+
   typedef
     TAO_VarSeq_Var_T<
         InitializerSeq,
         Initializer
       >
     InitializerSeq_var;
-  
+
   typedef
     TAO_Seq_Out_T<
         InitializerSeq,
@@ -1697,7 +1698,7 @@ namespace CORBA
         Initializer
       >
     InitializerSeq_out;
-  
+
   class TAO_IFR_Client_Export InitializerSeq
     : public
         TAO_Unbounded_Sequence<
@@ -1710,49 +1711,49 @@ namespace CORBA
     InitializerSeq (
         CORBA::ULong max,
         CORBA::ULong length,
-        Initializer* buffer, 
+        Initializer* buffer,
         CORBA::Boolean release = 0
       );
     InitializerSeq (const InitializerSeq &);
     ~InitializerSeq (void);
-    
+
     static void _tao_any_destructor (void *);
-    
+
     typedef InitializerSeq_var _var_type;
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_InitializerSeq;
-  
+
   // TAO_IDL - Generated from
   // be\be_type.cpp:258
-  
+
   struct ExceptionDescription;
-  
+
   typedef
     TAO_Var_Var_T<
         ExceptionDescription
       >
     ExceptionDescription_var;
-  
+
   typedef
     TAO_Out_T<
         ExceptionDescription,
         ExceptionDescription_var
       >
     ExceptionDescription_out;
-  
+
   // TAO_IDL - Generated from
-  // be\be_visitor_structure/structure_ch.cpp:52
-  
+  // be\be_visitor_structure/structure_ch.cpp:57
+
   struct TAO_IFR_Client_Export ExceptionDescription
   {
     typedef ExceptionDescription_var _var_type;
-    
+
     static void _tao_any_destructor (void *);
     TAO_String_Manager name;
     TAO_String_Manager id;
@@ -1760,27 +1761,27 @@ namespace CORBA
     TAO_String_Manager version;
     CORBA::TypeCode_var type;
   };
-  
+
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ExceptionDescription;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_EXCDESCRIPTIONSEQ_CH_)
 #define _CORBA_EXCDESCRIPTIONSEQ_CH_
-  
+
   class ExcDescriptionSeq;
-  
+
   typedef
     TAO_VarSeq_Var_T<
         ExcDescriptionSeq,
         ExceptionDescription
       >
     ExcDescriptionSeq_var;
-  
+
   typedef
     TAO_Seq_Out_T<
         ExcDescriptionSeq,
@@ -1788,7 +1789,7 @@ namespace CORBA
         ExceptionDescription
       >
     ExcDescriptionSeq_out;
-  
+
   class TAO_IFR_Client_Export ExcDescriptionSeq
     : public
         TAO_Unbounded_Sequence<
@@ -1801,75 +1802,75 @@ namespace CORBA
     ExcDescriptionSeq (
         CORBA::ULong max,
         CORBA::ULong length,
-        ExceptionDescription* buffer, 
+        ExceptionDescription* buffer,
         CORBA::Boolean release = 0
       );
     ExcDescriptionSeq (const ExcDescriptionSeq &);
     ~ExcDescriptionSeq (void);
-    
+
     static void _tao_any_destructor (void *);
-    
+
     typedef ExcDescriptionSeq_var _var_type;
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ExcDescriptionSeq;
-  
+
   // TAO_IDL - Generated from
   // be\be_type.cpp:258
-  
+
   struct ExtInitializer;
-  
+
   typedef
     TAO_Var_Var_T<
         ExtInitializer
       >
     ExtInitializer_var;
-  
+
   typedef
     TAO_Out_T<
         ExtInitializer,
         ExtInitializer_var
       >
     ExtInitializer_out;
-  
+
   // TAO_IDL - Generated from
-  // be\be_visitor_structure/structure_ch.cpp:52
-  
+  // be\be_visitor_structure/structure_ch.cpp:57
+
   struct TAO_IFR_Client_Export ExtInitializer
   {
     typedef ExtInitializer_var _var_type;
-    
+
     static void _tao_any_destructor (void *);
     CORBA::StructMemberSeq members;
     CORBA::ExcDescriptionSeq exceptions;
     TAO_String_Manager name;
   };
-  
+
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ExtInitializer;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_EXTINITIALIZERSEQ_CH_)
 #define _CORBA_EXTINITIALIZERSEQ_CH_
-  
+
   class ExtInitializerSeq;
-  
+
   typedef
     TAO_VarSeq_Var_T<
         ExtInitializerSeq,
         ExtInitializer
       >
     ExtInitializerSeq_var;
-  
+
   typedef
     TAO_Seq_Out_T<
         ExtInitializerSeq,
@@ -1877,7 +1878,7 @@ namespace CORBA
         ExtInitializer
       >
     ExtInitializerSeq_out;
-  
+
   class TAO_IFR_Client_Export ExtInitializerSeq
     : public
         TAO_Unbounded_Sequence<
@@ -1890,76 +1891,76 @@ namespace CORBA
     ExtInitializerSeq (
         CORBA::ULong max,
         CORBA::ULong length,
-        ExtInitializer* buffer, 
+        ExtInitializer* buffer,
         CORBA::Boolean release = 0
       );
     ExtInitializerSeq (const ExtInitializerSeq &);
     ~ExtInitializerSeq (void);
-    
+
     static void _tao_any_destructor (void *);
-    
+
     typedef ExtInitializerSeq_var _var_type;
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ExtInitializerSeq;
-  
+
   // TAO_IDL - Generated from
   // be\be_type.cpp:258
-  
+
   struct UnionMember;
-  
+
   typedef
     TAO_Var_Var_T<
         UnionMember
       >
     UnionMember_var;
-  
+
   typedef
     TAO_Out_T<
         UnionMember,
         UnionMember_var
       >
     UnionMember_out;
-  
+
   // TAO_IDL - Generated from
-  // be\be_visitor_structure/structure_ch.cpp:52
-  
+  // be\be_visitor_structure/structure_ch.cpp:57
+
   struct TAO_IFR_Client_Export UnionMember
   {
     typedef UnionMember_var _var_type;
-    
+
     static void _tao_any_destructor (void *);
     TAO_String_Manager name;
     CORBA::Any label;
     CORBA::TypeCode_var type;
     CORBA::IDLType_var type_def;
   };
-  
+
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_UnionMember;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_UNIONMEMBERSEQ_CH_)
 #define _CORBA_UNIONMEMBERSEQ_CH_
-  
+
   class UnionMemberSeq;
-  
+
   typedef
     TAO_VarSeq_Var_T<
         UnionMemberSeq,
         UnionMember
       >
     UnionMemberSeq_var;
-  
+
   typedef
     TAO_Seq_Out_T<
         UnionMemberSeq,
@@ -1967,7 +1968,7 @@ namespace CORBA
         UnionMember
       >
     UnionMemberSeq_out;
-  
+
   class TAO_IFR_Client_Export UnionMemberSeq
     : public
         TAO_Unbounded_Sequence<
@@ -1980,39 +1981,39 @@ namespace CORBA
     UnionMemberSeq (
         CORBA::ULong max,
         CORBA::ULong length,
-        UnionMember* buffer, 
+        UnionMember* buffer,
         CORBA::Boolean release = 0
       );
     UnionMemberSeq (const UnionMemberSeq &);
     ~UnionMemberSeq (void);
-    
+
     static void _tao_any_destructor (void *);
-    
+
     typedef UnionMemberSeq_var _var_type;
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_UnionMemberSeq;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_ENUMMEMBERSEQ_CH_)
 #define _CORBA_ENUMMEMBERSEQ_CH_
-  
+
   class EnumMemberSeq;
-  
+
   typedef
     TAO_MngSeq_Var_T<
         EnumMemberSeq,
         TAO_SeqElem_String_Manager
       >
     EnumMemberSeq_var;
-  
+
   typedef
     TAO_MngSeq_Out_T<
         EnumMemberSeq,
@@ -2020,7 +2021,7 @@ namespace CORBA
         TAO_SeqElem_String_Manager
       >
     EnumMemberSeq_out;
-  
+
   class TAO_IFR_Client_Export EnumMemberSeq
     : public
         TAO_Unbounded_String_Sequence
@@ -2031,30 +2032,30 @@ namespace CORBA
     EnumMemberSeq (
         CORBA::ULong max,
         CORBA::ULong length,
-        char ** buffer, 
+        char ** buffer,
         CORBA::Boolean release = 0
       );
     EnumMemberSeq (const EnumMemberSeq &);
     ~EnumMemberSeq (void);
-    
+
     static void _tao_any_destructor (void *);
-    
+
     typedef EnumMemberSeq_var _var_type;
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_EnumMemberSeq;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_CONTAINER_CH_)
 #define _CORBA_CONTAINER_CH_
-  
+
   class TAO_IFR_Client_Export Container
     : public virtual ::CORBA::IRObject
   {
@@ -2062,32 +2063,32 @@ namespace CORBA
     friend class TAO::Narrow_Utils<Container>;
     typedef Container_ptr _ptr_type;
     typedef Container_var _var_type;
-    
+
     // The static operations.
     static Container_ptr _duplicate (Container_ptr obj);
-    
+
     static void _tao_release (Container_ptr obj);
-    
+
     static Container_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static Container_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static Container_ptr _nil (void)
     {
       return static_cast<Container_ptr> (0);
     }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::Contained_ptr lookup (
         const char * search_name
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -2095,10 +2096,10 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::ContainedSeq * contents (
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited
@@ -2107,10 +2108,10 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::ContainedSeq * lookup_name (
         const char * search_name,
         ::CORBA::Long levels_to_search,
@@ -2121,58 +2122,58 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_type.cpp:258
-    
+
     struct Description;
-    
+
     typedef
       TAO_Var_Var_T<
           Description
         >
       Description_var;
-    
+
     typedef
       TAO_Out_T<
           Description,
           Description_var
         >
       Description_out;
-    
+
     // TAO_IDL - Generated from
-    // be\be_visitor_structure/structure_ch.cpp:52
-    
+    // be\be_visitor_structure/structure_ch.cpp:57
+
     struct TAO_IFR_Client_Export Description
     {
       typedef Description_var _var_type;
-      
+
       static void _tao_any_destructor (void *);
       ACE_NESTED_CLASS (CORBA, Contained_var) contained_object;
       ACE_NESTED_CLASS (CORBA, DefinitionKind) kind;
       CORBA::Any value;
     };
-    
+
     // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:44
-    
+    // be\be_visitor_typecode/typecode_decl.cpp:49
+
     static ::CORBA::TypeCode_ptr const _tc_Description;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_CONTAINER_DESCRIPTIONSEQ_CH_)
 #define _CORBA_CONTAINER_DESCRIPTIONSEQ_CH_
-    
+
     class DescriptionSeq;
-    
+
     typedef
       TAO_VarSeq_Var_T<
           DescriptionSeq,
           Description
         >
       DescriptionSeq_var;
-    
+
     typedef
       TAO_Seq_Out_T<
           DescriptionSeq,
@@ -2180,7 +2181,7 @@ namespace CORBA
           Description
         >
       DescriptionSeq_out;
-    
+
     class TAO_IFR_Client_Export DescriptionSeq
       : public
           TAO_Unbounded_Sequence<
@@ -2193,27 +2194,27 @@ namespace CORBA
       DescriptionSeq (
           CORBA::ULong max,
           CORBA::ULong length,
-          Description* buffer, 
+          Description* buffer,
           CORBA::Boolean release = 0
         );
       DescriptionSeq (const DescriptionSeq &);
       ~DescriptionSeq (void);
-      
+
       static void _tao_any_destructor (void *);
-      
+
       typedef DescriptionSeq_var _var_type;
     };
 
 #endif /* end #if !defined */
-    
+
     // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:44
-    
+    // be\be_visitor_typecode/typecode_decl.cpp:49
+
     static ::CORBA::TypeCode_ptr const _tc_DescriptionSeq;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::Container::DescriptionSeq * describe_contents (
         ::CORBA::DefinitionKind limit_type,
         ::CORBA::Boolean exclude_inherited,
@@ -2223,10 +2224,10 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::ModuleDef_ptr create_module (
         const char * id,
         const char * name,
@@ -2236,10 +2237,10 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::ConstantDef_ptr create_constant (
         const char * id,
         const char * name,
@@ -2251,10 +2252,10 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::StructDef_ptr create_struct (
         const char * id,
         const char * name,
@@ -2265,10 +2266,10 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::UnionDef_ptr create_union (
         const char * id,
         const char * name,
@@ -2280,10 +2281,10 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::EnumDef_ptr create_enum (
         const char * id,
         const char * name,
@@ -2294,10 +2295,10 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::AliasDef_ptr create_alias (
         const char * id,
         const char * name,
@@ -2308,10 +2309,10 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::InterfaceDef_ptr create_interface (
         const char * id,
         const char * name,
@@ -2322,10 +2323,10 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::ValueDef_ptr create_value (
         const char * id,
         const char * name,
@@ -2342,10 +2343,10 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::ValueBoxDef_ptr create_value_box (
         const char * id,
         const char * name,
@@ -2356,10 +2357,10 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::ExceptionDef_ptr create_exception (
         const char * id,
         const char * name,
@@ -2370,10 +2371,10 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::NativeDef_ptr create_native (
         const char * id,
         const char * name,
@@ -2383,10 +2384,10 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::AbstractInterfaceDef_ptr create_abstract_interface (
         const char * id,
         const char * name,
@@ -2397,10 +2398,10 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::LocalInterfaceDef_ptr create_local_interface (
         const char * id,
         const char * name,
@@ -2411,10 +2412,10 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::ExtValueDef_ptr create_ext_value (
         const char * id,
         const char * name,
@@ -2431,34 +2432,34 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
-    
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     TAO::Collocation_Proxy_Broker *the_TAO_Container_Proxy_Broker_;
-  
+
   protected:
     // Concrete interface only.
     Container (void);
-    
+
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void CORBA_Container_setup_collocation (void);
-    
+
     // Concrete non-local interface only.
     Container (
         IOP::IOR *ior,
         TAO_ORB_Core *orb_core = 0
       );
-    
+
     // Non-local interface only.
     Container (
         TAO_Stub *objref,
@@ -2466,29 +2467,29 @@ namespace CORBA
         TAO_Abstract_ServantBase *servant = 0,
         TAO_ORB_Core *orb_core = 0
       );
-    
+
     virtual ~Container (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     Container (const Container &);
-    
+
     void operator= (const Container &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_Container;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_IDLTYPE_CH_)
 #define _CORBA_IDLTYPE_CH_
-  
+
   class TAO_IFR_Client_Export IDLType
     : public virtual ::CORBA::IRObject
   {
@@ -2496,66 +2497,66 @@ namespace CORBA
     friend class TAO::Narrow_Utils<IDLType>;
     typedef IDLType_ptr _ptr_type;
     typedef IDLType_var _var_type;
-    
+
     // The static operations.
     static IDLType_ptr _duplicate (IDLType_ptr obj);
-    
+
     static void _tao_release (IDLType_ptr obj);
-    
+
     static IDLType_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static IDLType_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static IDLType_ptr _nil (void)
     {
       return static_cast<IDLType_ptr> (0);
     }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::TypeCode_ptr type (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
-    
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     TAO::Collocation_Proxy_Broker *the_TAO_IDLType_Proxy_Broker_;
-  
+
   protected:
     // Concrete interface only.
     IDLType (void);
-    
+
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void CORBA_IDLType_setup_collocation (void);
-    
+
     // Concrete non-local interface only.
     IDLType (
         IOP::IOR *ior,
         TAO_ORB_Core *orb_core = 0
       );
-    
+
     // Non-local interface only.
     IDLType (
         TAO_Stub *objref,
@@ -2563,38 +2564,38 @@ namespace CORBA
         TAO_Abstract_ServantBase *servant = 0,
         TAO_ORB_Core *orb_core = 0
       );
-    
+
     virtual ~IDLType (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     IDLType (const IDLType &);
-    
+
     void operator= (const IDLType &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_IDLType;
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_CORBA_TYPEDEFDEF__VAR_OUT_CH_)
 #define _CORBA_TYPEDEFDEF__VAR_OUT_CH_
-  
+
   class TypedefDef;
   typedef TypedefDef *TypedefDef_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         TypedefDef
       >
     TypedefDef_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         TypedefDef
@@ -2602,13 +2603,13 @@ namespace CORBA
     TypedefDef_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_TYPEDEFDEF_CH_)
 #define _CORBA_TYPEDEFDEF_CH_
-  
+
   class TAO_IFR_Client_Export TypedefDef
     : public virtual ::CORBA::Contained,
       public virtual ::CORBA::IDLType
@@ -2617,56 +2618,56 @@ namespace CORBA
     friend class TAO::Narrow_Utils<TypedefDef>;
     typedef TypedefDef_ptr _ptr_type;
     typedef TypedefDef_var _var_type;
-    
+
     // The static operations.
     static TypedefDef_ptr _duplicate (TypedefDef_ptr obj);
-    
+
     static void _tao_release (TypedefDef_ptr obj);
-    
+
     static TypedefDef_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static TypedefDef_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static TypedefDef_ptr _nil (void)
     {
       return static_cast<TypedefDef_ptr> (0);
     }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
-    
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
   private:
     TAO::Collocation_Proxy_Broker *the_TAO_TypedefDef_Proxy_Broker_;
-  
+
   protected:
     // Concrete interface only.
     TypedefDef (void);
-    
+
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void CORBA_TypedefDef_setup_collocation (void);
-    
+
     // Concrete non-local interface only.
     TypedefDef (
         IOP::IOR *ior,
         TAO_ORB_Core *orb_core = 0
       );
-    
+
     // Non-local interface only.
     TypedefDef (
         TAO_Stub *objref,
@@ -2674,48 +2675,48 @@ namespace CORBA
         TAO_Abstract_ServantBase *servant = 0,
         TAO_ORB_Core *orb_core = 0
       );
-    
+
     virtual ~TypedefDef (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     TypedefDef (const TypedefDef &);
-    
+
     void operator= (const TypedefDef &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_TypedefDef;
-  
+
   // TAO_IDL - Generated from
   // be\be_type.cpp:258
-  
+
   struct TypeDescription;
-  
+
   typedef
     TAO_Var_Var_T<
         TypeDescription
       >
     TypeDescription_var;
-  
+
   typedef
     TAO_Out_T<
         TypeDescription,
         TypeDescription_var
       >
     TypeDescription_out;
-  
+
   // TAO_IDL - Generated from
-  // be\be_visitor_structure/structure_ch.cpp:52
-  
+  // be\be_visitor_structure/structure_ch.cpp:57
+
   struct TAO_IFR_Client_Export TypeDescription
   {
     typedef TypeDescription_var _var_type;
-    
+
     static void _tao_any_destructor (void *);
     TAO_String_Manager name;
     TAO_String_Manager id;
@@ -2723,10 +2724,10 @@ namespace CORBA
     TAO_String_Manager version;
     CORBA::TypeCode_var type;
   };
-  
+
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_TypeDescription;
 
 // TAO_IDL - Generated from
@@ -2776,9 +2777,9 @@ TAO::Collocation_Proxy_Broker *
 namespace TAO
 {
 
-#if !defined (_CORBA_IROBJECT__TRAITS_CH_)
-#define _CORBA_IROBJECT__TRAITS_CH_
-  
+#if !defined (_CORBA_IROBJECT__TRAITS_)
+#define _CORBA_IROBJECT__TRAITS_
+
   template<>
   struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::IRObject>
   {
@@ -2797,9 +2798,30 @@ namespace TAO
 
 #endif /* end #if !defined */
 
-#if !defined (_CORBA_CONTAINED__TRAITS_CH_)
-#define _CORBA_CONTAINED__TRAITS_CH_
-  
+#if !defined (_CORBA_REPOSITORY__TRAITS_)
+#define _CORBA_REPOSITORY__TRAITS_
+
+  template<>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::Repository>
+  {
+    static ::CORBA::Repository_ptr duplicate (
+        ::CORBA::Repository_ptr
+      );
+    static void release (
+        ::CORBA::Repository_ptr
+      );
+    static ::CORBA::Repository_ptr nil (void);
+    static CORBA::Boolean marshal (
+        ::CORBA::Repository_ptr p,
+        TAO_OutputCDR & cdr
+      );
+  };
+
+#endif /* end #if !defined */
+
+#if !defined (_CORBA_CONTAINED__TRAITS_)
+#define _CORBA_CONTAINED__TRAITS_
+
   template<>
   struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::Contained>
   {
@@ -2818,9 +2840,366 @@ namespace TAO
 
 #endif /* end #if !defined */
 
-#if !defined (_CORBA_CONTAINER__TRAITS_CH_)
-#define _CORBA_CONTAINER__TRAITS_CH_
-  
+#if !defined (_CORBA_MODULEDEF__TRAITS_)
+#define _CORBA_MODULEDEF__TRAITS_
+
+  template<>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ModuleDef>
+  {
+    static ::CORBA::ModuleDef_ptr duplicate (
+        ::CORBA::ModuleDef_ptr
+      );
+    static void release (
+        ::CORBA::ModuleDef_ptr
+      );
+    static ::CORBA::ModuleDef_ptr nil (void);
+    static CORBA::Boolean marshal (
+        ::CORBA::ModuleDef_ptr p,
+        TAO_OutputCDR & cdr
+      );
+  };
+
+#endif /* end #if !defined */
+
+#if !defined (_CORBA_CONSTANTDEF__TRAITS_)
+#define _CORBA_CONSTANTDEF__TRAITS_
+
+  template<>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ConstantDef>
+  {
+    static ::CORBA::ConstantDef_ptr duplicate (
+        ::CORBA::ConstantDef_ptr
+      );
+    static void release (
+        ::CORBA::ConstantDef_ptr
+      );
+    static ::CORBA::ConstantDef_ptr nil (void);
+    static CORBA::Boolean marshal (
+        ::CORBA::ConstantDef_ptr p,
+        TAO_OutputCDR & cdr
+      );
+  };
+
+#endif /* end #if !defined */
+
+#if !defined (_CORBA_STRUCTDEF__TRAITS_)
+#define _CORBA_STRUCTDEF__TRAITS_
+
+  template<>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::StructDef>
+  {
+    static ::CORBA::StructDef_ptr duplicate (
+        ::CORBA::StructDef_ptr
+      );
+    static void release (
+        ::CORBA::StructDef_ptr
+      );
+    static ::CORBA::StructDef_ptr nil (void);
+    static CORBA::Boolean marshal (
+        ::CORBA::StructDef_ptr p,
+        TAO_OutputCDR & cdr
+      );
+  };
+
+#endif /* end #if !defined */
+
+#if !defined (_CORBA_UNIONDEF__TRAITS_)
+#define _CORBA_UNIONDEF__TRAITS_
+
+  template<>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::UnionDef>
+  {
+    static ::CORBA::UnionDef_ptr duplicate (
+        ::CORBA::UnionDef_ptr
+      );
+    static void release (
+        ::CORBA::UnionDef_ptr
+      );
+    static ::CORBA::UnionDef_ptr nil (void);
+    static CORBA::Boolean marshal (
+        ::CORBA::UnionDef_ptr p,
+        TAO_OutputCDR & cdr
+      );
+  };
+
+#endif /* end #if !defined */
+
+#if !defined (_CORBA_ENUMDEF__TRAITS_)
+#define _CORBA_ENUMDEF__TRAITS_
+
+  template<>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::EnumDef>
+  {
+    static ::CORBA::EnumDef_ptr duplicate (
+        ::CORBA::EnumDef_ptr
+      );
+    static void release (
+        ::CORBA::EnumDef_ptr
+      );
+    static ::CORBA::EnumDef_ptr nil (void);
+    static CORBA::Boolean marshal (
+        ::CORBA::EnumDef_ptr p,
+        TAO_OutputCDR & cdr
+      );
+  };
+
+#endif /* end #if !defined */
+
+#if !defined (_CORBA_ALIASDEF__TRAITS_)
+#define _CORBA_ALIASDEF__TRAITS_
+
+  template<>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::AliasDef>
+  {
+    static ::CORBA::AliasDef_ptr duplicate (
+        ::CORBA::AliasDef_ptr
+      );
+    static void release (
+        ::CORBA::AliasDef_ptr
+      );
+    static ::CORBA::AliasDef_ptr nil (void);
+    static CORBA::Boolean marshal (
+        ::CORBA::AliasDef_ptr p,
+        TAO_OutputCDR & cdr
+      );
+  };
+
+#endif /* end #if !defined */
+
+#if !defined (_CORBA_INTERFACEDEF__TRAITS_)
+#define _CORBA_INTERFACEDEF__TRAITS_
+
+  template<>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::InterfaceDef>
+  {
+    static ::CORBA::InterfaceDef_ptr duplicate (
+        ::CORBA::InterfaceDef_ptr
+      );
+    static void release (
+        ::CORBA::InterfaceDef_ptr
+      );
+    static ::CORBA::InterfaceDef_ptr nil (void);
+    static CORBA::Boolean marshal (
+        ::CORBA::InterfaceDef_ptr p,
+        TAO_OutputCDR & cdr
+      );
+  };
+
+#endif /* end #if !defined */
+
+#if !defined (_CORBA_EXCEPTIONDEF__TRAITS_)
+#define _CORBA_EXCEPTIONDEF__TRAITS_
+
+  template<>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ExceptionDef>
+  {
+    static ::CORBA::ExceptionDef_ptr duplicate (
+        ::CORBA::ExceptionDef_ptr
+      );
+    static void release (
+        ::CORBA::ExceptionDef_ptr
+      );
+    static ::CORBA::ExceptionDef_ptr nil (void);
+    static CORBA::Boolean marshal (
+        ::CORBA::ExceptionDef_ptr p,
+        TAO_OutputCDR & cdr
+      );
+  };
+
+#endif /* end #if !defined */
+
+#if !defined (_CORBA_NATIVEDEF__TRAITS_)
+#define _CORBA_NATIVEDEF__TRAITS_
+
+  template<>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::NativeDef>
+  {
+    static ::CORBA::NativeDef_ptr duplicate (
+        ::CORBA::NativeDef_ptr
+      );
+    static void release (
+        ::CORBA::NativeDef_ptr
+      );
+    static ::CORBA::NativeDef_ptr nil (void);
+    static CORBA::Boolean marshal (
+        ::CORBA::NativeDef_ptr p,
+        TAO_OutputCDR & cdr
+      );
+  };
+
+#endif /* end #if !defined */
+
+#if !defined (_CORBA_VALUEDEF__TRAITS_)
+#define _CORBA_VALUEDEF__TRAITS_
+
+  template<>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ValueDef>
+  {
+    static ::CORBA::ValueDef_ptr duplicate (
+        ::CORBA::ValueDef_ptr
+      );
+    static void release (
+        ::CORBA::ValueDef_ptr
+      );
+    static ::CORBA::ValueDef_ptr nil (void);
+    static CORBA::Boolean marshal (
+        ::CORBA::ValueDef_ptr p,
+        TAO_OutputCDR & cdr
+      );
+  };
+
+#endif /* end #if !defined */
+
+#if !defined (_CORBA_VALUEBOXDEF__TRAITS_)
+#define _CORBA_VALUEBOXDEF__TRAITS_
+
+  template<>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ValueBoxDef>
+  {
+    static ::CORBA::ValueBoxDef_ptr duplicate (
+        ::CORBA::ValueBoxDef_ptr
+      );
+    static void release (
+        ::CORBA::ValueBoxDef_ptr
+      );
+    static ::CORBA::ValueBoxDef_ptr nil (void);
+    static CORBA::Boolean marshal (
+        ::CORBA::ValueBoxDef_ptr p,
+        TAO_OutputCDR & cdr
+      );
+  };
+
+#endif /* end #if !defined */
+
+#if !defined (_CORBA_ABSTRACTINTERFACEDEF__TRAITS_)
+#define _CORBA_ABSTRACTINTERFACEDEF__TRAITS_
+
+  template<>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::AbstractInterfaceDef>
+  {
+    static ::CORBA::AbstractInterfaceDef_ptr duplicate (
+        ::CORBA::AbstractInterfaceDef_ptr
+      );
+    static void release (
+        ::CORBA::AbstractInterfaceDef_ptr
+      );
+    static ::CORBA::AbstractInterfaceDef_ptr nil (void);
+    static CORBA::Boolean marshal (
+        ::CORBA::AbstractInterfaceDef_ptr p,
+        TAO_OutputCDR & cdr
+      );
+  };
+
+#endif /* end #if !defined */
+
+#if !defined (_CORBA_LOCALINTERFACEDEF__TRAITS_)
+#define _CORBA_LOCALINTERFACEDEF__TRAITS_
+
+  template<>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::LocalInterfaceDef>
+  {
+    static ::CORBA::LocalInterfaceDef_ptr duplicate (
+        ::CORBA::LocalInterfaceDef_ptr
+      );
+    static void release (
+        ::CORBA::LocalInterfaceDef_ptr
+      );
+    static ::CORBA::LocalInterfaceDef_ptr nil (void);
+    static CORBA::Boolean marshal (
+        ::CORBA::LocalInterfaceDef_ptr p,
+        TAO_OutputCDR & cdr
+      );
+  };
+
+#endif /* end #if !defined */
+
+#if !defined (_CORBA_EXTINTERFACEDEF__TRAITS_)
+#define _CORBA_EXTINTERFACEDEF__TRAITS_
+
+  template<>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ExtInterfaceDef>
+  {
+    static ::CORBA::ExtInterfaceDef_ptr duplicate (
+        ::CORBA::ExtInterfaceDef_ptr
+      );
+    static void release (
+        ::CORBA::ExtInterfaceDef_ptr
+      );
+    static ::CORBA::ExtInterfaceDef_ptr nil (void);
+    static CORBA::Boolean marshal (
+        ::CORBA::ExtInterfaceDef_ptr p,
+        TAO_OutputCDR & cdr
+      );
+  };
+
+#endif /* end #if !defined */
+
+#if !defined (_CORBA_EXTVALUEDEF__TRAITS_)
+#define _CORBA_EXTVALUEDEF__TRAITS_
+
+  template<>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ExtValueDef>
+  {
+    static ::CORBA::ExtValueDef_ptr duplicate (
+        ::CORBA::ExtValueDef_ptr
+      );
+    static void release (
+        ::CORBA::ExtValueDef_ptr
+      );
+    static ::CORBA::ExtValueDef_ptr nil (void);
+    static CORBA::Boolean marshal (
+        ::CORBA::ExtValueDef_ptr p,
+        TAO_OutputCDR & cdr
+      );
+  };
+
+#endif /* end #if !defined */
+
+#if !defined (_CORBA_EXTABSTRACTINTERFACEDEF__TRAITS_)
+#define _CORBA_EXTABSTRACTINTERFACEDEF__TRAITS_
+
+  template<>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ExtAbstractInterfaceDef>
+  {
+    static ::CORBA::ExtAbstractInterfaceDef_ptr duplicate (
+        ::CORBA::ExtAbstractInterfaceDef_ptr
+      );
+    static void release (
+        ::CORBA::ExtAbstractInterfaceDef_ptr
+      );
+    static ::CORBA::ExtAbstractInterfaceDef_ptr nil (void);
+    static CORBA::Boolean marshal (
+        ::CORBA::ExtAbstractInterfaceDef_ptr p,
+        TAO_OutputCDR & cdr
+      );
+  };
+
+#endif /* end #if !defined */
+
+#if !defined (_CORBA_EXTLOCALINTERFACEDEF__TRAITS_)
+#define _CORBA_EXTLOCALINTERFACEDEF__TRAITS_
+
+  template<>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ExtLocalInterfaceDef>
+  {
+    static ::CORBA::ExtLocalInterfaceDef_ptr duplicate (
+        ::CORBA::ExtLocalInterfaceDef_ptr
+      );
+    static void release (
+        ::CORBA::ExtLocalInterfaceDef_ptr
+      );
+    static ::CORBA::ExtLocalInterfaceDef_ptr nil (void);
+    static CORBA::Boolean marshal (
+        ::CORBA::ExtLocalInterfaceDef_ptr p,
+        TAO_OutputCDR & cdr
+      );
+  };
+
+#endif /* end #if !defined */
+
+#if !defined (_CORBA_CONTAINER__TRAITS_)
+#define _CORBA_CONTAINER__TRAITS_
+
   template<>
   struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::Container>
   {
@@ -2839,9 +3218,9 @@ namespace TAO
 
 #endif /* end #if !defined */
 
-#if !defined (_CORBA_IDLTYPE__TRAITS_CH_)
-#define _CORBA_IDLTYPE__TRAITS_CH_
-  
+#if !defined (_CORBA_IDLTYPE__TRAITS_)
+#define _CORBA_IDLTYPE__TRAITS_
+
   template<>
   struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::IDLType>
   {
@@ -2860,9 +3239,9 @@ namespace TAO
 
 #endif /* end #if !defined */
 
-#if !defined (_CORBA_TYPEDEFDEF__TRAITS_CH_)
-#define _CORBA_TYPEDEFDEF__TRAITS_CH_
-  
+#if !defined (_CORBA_TYPEDEFDEF__TRAITS_)
+#define _CORBA_TYPEDEFDEF__TRAITS_
+
   template<>
   struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::TypedefDef>
   {
@@ -2883,13 +3262,13 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_enum/any_op_ch.cpp:51
+// be\be_visitor_enum/any_op_ch.cpp:52
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::DefinitionKind);
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::DefinitionKind &);
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
+// be\be_visitor_interface/any_op_ch.cpp:53
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::IRObject_ptr); // copying
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::IRObject_ptr *); // non-copying
@@ -2903,14 +3282,14 @@ TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::Repository_ptr *);
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Repository *&);
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
+// be\be_visitor_interface/any_op_ch.cpp:53
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::Contained_ptr); // copying
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::Contained_ptr *); // non-copying
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Contained_ptr &);
 
 // TAO_IDL - Generated from
-// be\be_visitor_structure/any_op_ch.cpp:52
+// be\be_visitor_structure/any_op_ch.cpp:53
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::Contained::Description &); // copying version
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::Contained::Description*); // noncopying version
@@ -2967,7 +3346,7 @@ TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::InterfaceDef_ptr *)
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::InterfaceDef *&);
 
 // TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
+// be\be_visitor_sequence/any_op_ch.cpp:53
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::InterfaceDefSeq &); // copying version
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::InterfaceDefSeq*); // noncopying version
@@ -2996,7 +3375,7 @@ TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ValueDef_ptr *); //
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ValueDef *&);
 
 // TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
+// be\be_visitor_sequence/any_op_ch.cpp:53
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::ValueDefSeq &); // copying version
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ValueDefSeq*); // noncopying version
@@ -3018,7 +3397,7 @@ TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::AbstractInterfaceDe
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::AbstractInterfaceDef *&);
 
 // TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
+// be\be_visitor_sequence/any_op_ch.cpp:53
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::AbstractInterfaceDefSeq &); // copying version
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::AbstractInterfaceDefSeq*); // noncopying version
@@ -3033,7 +3412,7 @@ TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::LocalInterfaceDef_p
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::LocalInterfaceDef *&);
 
 // TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
+// be\be_visitor_sequence/any_op_ch.cpp:53
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::LocalInterfaceDefSeq &); // copying version
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::LocalInterfaceDefSeq*); // noncopying version
@@ -3048,7 +3427,7 @@ TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ExtInterfaceDef_ptr
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ExtInterfaceDef *&);
 
 // TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
+// be\be_visitor_sequence/any_op_ch.cpp:53
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::ExtInterfaceDefSeq &); // copying version
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ExtInterfaceDefSeq*); // noncopying version
@@ -3063,7 +3442,7 @@ TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ExtValueDef_ptr *);
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ExtValueDef *&);
 
 // TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
+// be\be_visitor_sequence/any_op_ch.cpp:53
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::ExtValueDefSeq &); // copying version
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ExtValueDefSeq*); // noncopying version
@@ -3078,7 +3457,7 @@ TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ExtAbstractInterfac
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ExtAbstractInterfaceDef *&);
 
 // TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
+// be\be_visitor_sequence/any_op_ch.cpp:53
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::ExtAbstractInterfaceDefSeq &); // copying version
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ExtAbstractInterfaceDefSeq*); // noncopying version
@@ -3093,7 +3472,7 @@ TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ExtLocalInterfaceDe
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ExtLocalInterfaceDef *&);
 
 // TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
+// be\be_visitor_sequence/any_op_ch.cpp:53
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::ExtLocalInterfaceDefSeq &); // copying version
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ExtLocalInterfaceDefSeq*); // noncopying version
@@ -3101,7 +3480,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Ext
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ExtLocalInterfaceDefSeq *&);
 
 // TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
+// be\be_visitor_sequence/any_op_ch.cpp:53
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::ContainedSeq &); // copying version
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ContainedSeq*); // noncopying version
@@ -3109,7 +3488,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Con
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ContainedSeq *&);
 
 // TAO_IDL - Generated from
-// be\be_visitor_structure/any_op_ch.cpp:52
+// be\be_visitor_structure/any_op_ch.cpp:53
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::StructMember &); // copying version
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::StructMember*); // noncopying version
@@ -3117,7 +3496,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Str
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::StructMember *&);
 
 // TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
+// be\be_visitor_sequence/any_op_ch.cpp:53
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::StructMemberSeq &); // copying version
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::StructMemberSeq*); // noncopying version
@@ -3125,7 +3504,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Str
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::StructMemberSeq *&);
 
 // TAO_IDL - Generated from
-// be\be_visitor_structure/any_op_ch.cpp:52
+// be\be_visitor_structure/any_op_ch.cpp:53
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::Initializer &); // copying version
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::Initializer*); // noncopying version
@@ -3133,7 +3512,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Ini
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::Initializer *&);
 
 // TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
+// be\be_visitor_sequence/any_op_ch.cpp:53
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::InitializerSeq &); // copying version
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::InitializerSeq*); // noncopying version
@@ -3141,7 +3520,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Ini
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::InitializerSeq *&);
 
 // TAO_IDL - Generated from
-// be\be_visitor_structure/any_op_ch.cpp:52
+// be\be_visitor_structure/any_op_ch.cpp:53
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::ExceptionDescription &); // copying version
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ExceptionDescription*); // noncopying version
@@ -3149,7 +3528,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Exc
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ExceptionDescription *&);
 
 // TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
+// be\be_visitor_sequence/any_op_ch.cpp:53
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::ExcDescriptionSeq &); // copying version
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ExcDescriptionSeq*); // noncopying version
@@ -3157,7 +3536,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Exc
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ExcDescriptionSeq *&);
 
 // TAO_IDL - Generated from
-// be\be_visitor_structure/any_op_ch.cpp:52
+// be\be_visitor_structure/any_op_ch.cpp:53
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::ExtInitializer &); // copying version
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ExtInitializer*); // noncopying version
@@ -3165,7 +3544,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Ext
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ExtInitializer *&);
 
 // TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
+// be\be_visitor_sequence/any_op_ch.cpp:53
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::ExtInitializerSeq &); // copying version
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ExtInitializerSeq*); // noncopying version
@@ -3173,7 +3552,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Ext
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ExtInitializerSeq *&);
 
 // TAO_IDL - Generated from
-// be\be_visitor_structure/any_op_ch.cpp:52
+// be\be_visitor_structure/any_op_ch.cpp:53
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::UnionMember &); // copying version
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::UnionMember*); // noncopying version
@@ -3181,7 +3560,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Uni
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::UnionMember *&);
 
 // TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
+// be\be_visitor_sequence/any_op_ch.cpp:53
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::UnionMemberSeq &); // copying version
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::UnionMemberSeq*); // noncopying version
@@ -3189,7 +3568,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Uni
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::UnionMemberSeq *&);
 
 // TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
+// be\be_visitor_sequence/any_op_ch.cpp:53
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::EnumMemberSeq &); // copying version
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::EnumMemberSeq*); // noncopying version
@@ -3197,14 +3576,14 @@ TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Enu
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::EnumMemberSeq *&);
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
+// be\be_visitor_interface/any_op_ch.cpp:53
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::Container_ptr); // copying
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::Container_ptr *); // non-copying
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Container_ptr &);
 
 // TAO_IDL - Generated from
-// be\be_visitor_structure/any_op_ch.cpp:52
+// be\be_visitor_structure/any_op_ch.cpp:53
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::Container::Description &); // copying version
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::Container::Description*); // noncopying version
@@ -3212,7 +3591,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Con
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::Container::Description *&);
 
 // TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
+// be\be_visitor_sequence/any_op_ch.cpp:53
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::Container::DescriptionSeq &); // copying version
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::Container::DescriptionSeq*); // noncopying version
@@ -3220,21 +3599,21 @@ TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Con
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::Container::DescriptionSeq *&);
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
+// be\be_visitor_interface/any_op_ch.cpp:53
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::IDLType_ptr); // copying
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::IDLType_ptr *); // non-copying
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::IDLType_ptr &);
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
+// be\be_visitor_interface/any_op_ch.cpp:53
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::TypedefDef_ptr); // copying
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::TypedefDef_ptr *); // non-copying
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::TypedefDef_ptr &);
 
 // TAO_IDL - Generated from
-// be\be_visitor_structure/any_op_ch.cpp:52
+// be\be_visitor_structure/any_op_ch.cpp:53
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::TypeDescription &); // copying version
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::TypeDescription*); // noncopying version
@@ -3724,7 +4103,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::T
 TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::TypeDescription &);
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:955
+// be\be_codegen.cpp:1136
 
 #if defined (__ACE_INLINE__)
 #include "IFR_BaseC.inl"
diff --git a/TAO/tao/IFR_Client/IFR_BaseS.h b/TAO/tao/IFR_Client/IFR_BaseS.h
index 910bbfc9646..1fea87667c7 100644
--- a/TAO/tao/IFR_Client/IFR_BaseS.h
+++ b/TAO/tao/IFR_Client/IFR_BaseS.h
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be/be_codegen.cpp:398
+// be\be_codegen.cpp:393
 
 #ifndef _TAO_IDL_ORIG_IFR_BASES_H_
 #define _TAO_IDL_ORIG_IFR_BASES_H_
@@ -55,20 +55,20 @@
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// be/be_visitor_module/module_sh.cpp:49
+// be\be_visitor_module/module_sh.cpp:49
 
 namespace POA_CORBA
 {
 
 
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_sh.cpp:87
+  // be\be_visitor_interface/interface_sh.cpp:87
 
   class IRObject;
   typedef IRObject *IRObject_ptr;
 
 
-  class TAO_IFR_Client_Export IRObject
+  class  IRObject
     : public virtual PortableServer::ServantBase
   {
   protected:
@@ -116,6 +116,13 @@ namespace POA_CORBA
         ACE_ENV_ARG_DECL
       );
 
+    static void _repository_id_skel (
+        TAO_ServerRequest & req,
+        void * servant_upcall,
+        void * servant
+        ACE_ENV_ARG_DECL
+      );
+
     virtual void _dispatch (
         TAO_ServerRequest & req,
         void * servant_upcall
@@ -129,7 +136,7 @@ namespace POA_CORBA
     virtual const char* _interface_repository_id (void) const;
 
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::DefinitionKind def_kind (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -146,7 +153,7 @@ namespace POA_CORBA
       );
 
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual void destroy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -164,13 +171,13 @@ namespace POA_CORBA
   };
 
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_sh.cpp:87
+  // be\be_visitor_interface/interface_sh.cpp:87
 
   class Contained;
   typedef Contained *Contained_ptr;
 
 
-  class TAO_IFR_Client_Export Contained
+  class  Contained
     : public virtual POA_CORBA::IRObject
   {
   protected:
@@ -218,6 +225,13 @@ namespace POA_CORBA
         ACE_ENV_ARG_DECL
       );
 
+    static void _repository_id_skel (
+        TAO_ServerRequest & req,
+        void * servant_upcall,
+        void * servant
+        ACE_ENV_ARG_DECL
+      );
+
     virtual void _dispatch (
         TAO_ServerRequest & req,
         void * servant_upcall
@@ -231,7 +245,7 @@ namespace POA_CORBA
     virtual const char* _interface_repository_id (void) const;
 
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual char * id (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -248,7 +262,7 @@ namespace POA_CORBA
       );
 
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual void id (
         const char * id
@@ -266,7 +280,7 @@ namespace POA_CORBA
       );
 
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual char * name (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -283,7 +297,7 @@ namespace POA_CORBA
       );
 
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual void name (
         const char * name
@@ -301,7 +315,7 @@ namespace POA_CORBA
       );
 
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual char * version (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -318,7 +332,7 @@ namespace POA_CORBA
       );
 
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual void version (
         const char * version
@@ -336,7 +350,7 @@ namespace POA_CORBA
       );
 
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::Container_ptr defined_in (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -353,7 +367,7 @@ namespace POA_CORBA
       );
 
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual char * absolute_name (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -370,7 +384,7 @@ namespace POA_CORBA
       );
 
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::Repository_ptr containing_repository (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -387,7 +401,7 @@ namespace POA_CORBA
       );
 
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::Contained::Description * describe (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -404,7 +418,7 @@ namespace POA_CORBA
       );
 
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual void move (
         ::CORBA::Container_ptr new_container,
@@ -432,7 +446,7 @@ namespace POA_CORBA
       );
 
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1859
+    // be\be_interface.cpp:1869
 
     static void
     destroy_skel (
@@ -444,13 +458,13 @@ namespace POA_CORBA
   };
 
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_sh.cpp:87
+  // be\be_visitor_interface/interface_sh.cpp:87
 
   class Container;
   typedef Container *Container_ptr;
 
 
-  class TAO_IFR_Client_Export Container
+  class  Container
     : public virtual POA_CORBA::IRObject
   {
   protected:
@@ -498,6 +512,13 @@ namespace POA_CORBA
         ACE_ENV_ARG_DECL
       );
 
+    static void _repository_id_skel (
+        TAO_ServerRequest & req,
+        void * servant_upcall,
+        void * servant
+        ACE_ENV_ARG_DECL
+      );
+
     virtual void _dispatch (
         TAO_ServerRequest & req,
         void * servant_upcall
@@ -511,7 +532,7 @@ namespace POA_CORBA
     virtual const char* _interface_repository_id (void) const;
 
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::Contained_ptr lookup (
         const char * search_name
@@ -529,7 +550,7 @@ namespace POA_CORBA
       );
 
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::ContainedSeq * contents (
         ::CORBA::DefinitionKind limit_type,
@@ -548,7 +569,7 @@ namespace POA_CORBA
       );
 
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::ContainedSeq * lookup_name (
         const char * search_name,
@@ -569,7 +590,7 @@ namespace POA_CORBA
       );
 
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::Container::DescriptionSeq * describe_contents (
         ::CORBA::DefinitionKind limit_type,
@@ -589,7 +610,7 @@ namespace POA_CORBA
       );
 
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::ModuleDef_ptr create_module (
         const char * id,
@@ -609,7 +630,7 @@ namespace POA_CORBA
       );
 
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::ConstantDef_ptr create_constant (
         const char * id,
@@ -631,7 +652,7 @@ namespace POA_CORBA
       );
 
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::StructDef_ptr create_struct (
         const char * id,
@@ -652,7 +673,7 @@ namespace POA_CORBA
       );
 
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::UnionDef_ptr create_union (
         const char * id,
@@ -674,7 +695,7 @@ namespace POA_CORBA
       );
 
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::EnumDef_ptr create_enum (
         const char * id,
@@ -695,7 +716,7 @@ namespace POA_CORBA
       );
 
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::AliasDef_ptr create_alias (
         const char * id,
@@ -716,7 +737,7 @@ namespace POA_CORBA
       );
 
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::InterfaceDef_ptr create_interface (
         const char * id,
@@ -737,7 +758,7 @@ namespace POA_CORBA
       );
 
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::ValueDef_ptr create_value (
         const char * id,
@@ -764,7 +785,7 @@ namespace POA_CORBA
       );
 
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::ValueBoxDef_ptr create_value_box (
         const char * id,
@@ -785,7 +806,7 @@ namespace POA_CORBA
       );
 
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::ExceptionDef_ptr create_exception (
         const char * id,
@@ -806,7 +827,7 @@ namespace POA_CORBA
       );
 
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::NativeDef_ptr create_native (
         const char * id,
@@ -826,7 +847,7 @@ namespace POA_CORBA
       );
 
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::AbstractInterfaceDef_ptr create_abstract_interface (
         const char * id,
@@ -847,7 +868,7 @@ namespace POA_CORBA
       );
 
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::LocalInterfaceDef_ptr create_local_interface (
         const char * id,
@@ -868,7 +889,7 @@ namespace POA_CORBA
       );
 
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual ::CORBA::ExtValueDef_ptr create_ext_value (
         const char * id,
@@ -903,7 +924,7 @@ namespace POA_CORBA
       );
 
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1859
+    // be\be_interface.cpp:1869
 
     static void
     destroy_skel (
@@ -915,13 +936,13 @@ namespace POA_CORBA
   };
 
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_sh.cpp:87
+  // be\be_visitor_interface/interface_sh.cpp:87
 
   class IDLType;
   typedef IDLType *IDLType_ptr;
 
 
-  class TAO_IFR_Client_Export IDLType
+  class  IDLType
     : public virtual POA_CORBA::IRObject
   {
   protected:
@@ -969,6 +990,13 @@ namespace POA_CORBA
         ACE_ENV_ARG_DECL
       );
 
+    static void _repository_id_skel (
+        TAO_ServerRequest & req,
+        void * servant_upcall,
+        void * servant
+        ACE_ENV_ARG_DECL
+      );
+
     virtual void _dispatch (
         TAO_ServerRequest & req,
         void * servant_upcall
@@ -982,7 +1010,7 @@ namespace POA_CORBA
     virtual const char* _interface_repository_id (void) const;
 
     // TAO_IDL - Generated from
-    // be/be_visitor_operation/operation_sh.cpp:45
+    // be\be_visitor_operation/operation_sh.cpp:45
 
     virtual CORBA::TypeCode_ptr type (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1007,7 +1035,7 @@ namespace POA_CORBA
       );
 
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1859
+    // be\be_interface.cpp:1869
 
     static void
     destroy_skel (
@@ -1019,13 +1047,13 @@ namespace POA_CORBA
   };
 
   // TAO_IDL - Generated from
-  // be/be_visitor_interface/interface_sh.cpp:87
+  // be\be_visitor_interface/interface_sh.cpp:87
 
   class TypedefDef;
   typedef TypedefDef *TypedefDef_ptr;
 
 
-  class TAO_IFR_Client_Export TypedefDef
+  class  TypedefDef
     : public virtual POA_CORBA::Contained,
       public virtual POA_CORBA::IDLType
   {
@@ -1074,6 +1102,13 @@ namespace POA_CORBA
         ACE_ENV_ARG_DECL
       );
 
+    static void _repository_id_skel (
+        TAO_ServerRequest & req,
+        void * servant_upcall,
+        void * servant
+        ACE_ENV_ARG_DECL
+      );
+
     virtual void _dispatch (
         TAO_ServerRequest & req,
         void * servant_upcall
@@ -1095,7 +1130,7 @@ namespace POA_CORBA
       );
 
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1859
+    // be\be_interface.cpp:1869
 
     static void
     destroy_skel (
@@ -1178,7 +1213,7 @@ namespace POA_CORBA
       );
 
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1859
+    // be\be_interface.cpp:1869
 
     static void
     describe_skel (
@@ -1189,7 +1224,7 @@ namespace POA_CORBA
       );
 
     // TAO_IDL - Generated from
-    // be/be_interface.cpp:1859
+    // be\be_interface.cpp:1869
 
     static void
     move_skel (
@@ -1209,14 +1244,10 @@ namespace POA_CORBA
   };
 
 // TAO_IDL - Generated from
-// be/be_visitor_module/module_sh.cpp:80
+// be\be_visitor_module/module_sh.cpp:80
 
 } // module CORBA
 
-// TAO_IDL - Generated from
-// be/be_codegen.cpp:1005
-
-
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
diff --git a/TAO/tao/IFR_Client/IFR_Basic.pidl b/TAO/tao/IFR_Client/IFR_Basic.pidl
index 6eb0b37463e..fa156e72b2d 100644
--- a/TAO/tao/IFR_Client/IFR_Basic.pidl
+++ b/TAO/tao/IFR_Client/IFR_Basic.pidl
@@ -1,55 +1,49 @@
-//
-// $Id$
-//
-// ================================================================
-//
-// = LIBRARY
-//   TAO_IFR_Client
-//
-// = FILENAME
-//   IFR_Basic.pidl
-//
-// = DESCRIPTION
-//   This file was used to generate the code in IFR_BasicC.{h,i,cpp}.
-//   The original file Interface.idl was split into four pieces, to
-//   keep the generated files to a manageable size and reduce build
-//   time. This IDL file contains the concrete base interfaces of
-//   the IFR, except for fixed types, valuetypes and CORBA components.
-//
-//   The command used to generate code from this IDL file is:
-//
-//     tao_idl -Ge 1 -Sc -GA -I../.. \
-//          -Wb,export_macro=TAO_IFR_Client_Export \
-//          -Wb,export_include=ifr_client_export.h \
-//          -Wb,pre_include="ace/pre.h" \
-//          -Wb,post_include="ace/post.h" \
-//          IFR_Basic.pidl
-//
-//   Only the stub files are used in the TAO_IFR_Client library. The
-//   skeleton files can be deleted from this directory.
-//
-//   No patching of the generated stub files is necessary.
-//
-//   To generate the skeleton files for the IFR Service, the command is:
-//
-//     tao_idl -o ../../orbsvcs/orbsvcs/IFRService -Ge 1 \
-//          -Wb,pre_include="ace/pre.h" \
-//          -Wb,post_include="ace/post.h" \
-//          IFR_Basic.pidl
-//
-//   The only modification necessary to the skeleton files is to
-//   change
-//
-//   #include "IFR_BasicC.h"
-//
-//   to
-//
-//   #include "tao/IFR_Client/IFR_BasicC.h"
-//
-//   in IFR_BasicS.h. The stub files may be deleted from the IFRService
-//   directory.
-//
-// ================================================================
+ // -*- IDL -*-
+
+/**
+ * @file IFR_Basic.pidl
+ *
+ * $Id$
+ *
+ * This file was used to generate the code in IFR_BasicC.{h,inl,cpp}.
+ * The original file Interface.idl was split into four pieces, to
+ * keep the generated files to a manageable size and reduce build
+ * time. This IDL file contains the concrete base interfaces of
+ * the IFR, except for fixed types, valuetypes and CORBA components.
+ *
+ * The command used to generate code from this IDL file is:
+ *
+ *     tao_idl -Ge 1 -Sc -I../.. \
+ *          -Wb,export_macro=TAO_IFR_Client_Export \
+ *          -Wb,export_include=ifr_client_export.h \
+ *          -Wb,pre_include="ace/pre.h" \
+ *          -Wb,post_include="ace/post.h" \
+ *          IFR_Basic.pidl
+ *
+ *   Only the stub files are used in the TAO_IFR_Client library. The
+ *   skeleton files can be deleted from this directory.
+ *
+ *   No patching of the generated stub files is necessary.
+ *
+ *   To generate the skeleton files for the IFR Service, the command is:
+ *
+ *     tao_idl -o ../../orbsvcs/orbsvcs/IFRService -Ge 1 \
+ *          -Wb,pre_include="ace/pre.h" \
+ *          -Wb,post_include="ace/post.h" \
+ *          IFR_Basic.pidl
+ *
+ *   The only modification necessary to the skeleton files is to
+ *   change
+ *
+ *   #include "IFR_BasicC.h"
+ *
+ *   to
+ *
+ *   #include "tao/IFR_Client/IFR_BasicC.h"
+ *
+ *   in IFR_BasicS.h. The stub files may be deleted from the IFRService
+ *   directory.
+ */
 
 #ifndef _IFR_BASIC_IDL_
 #define _IFR_BASIC_IDL_
diff --git a/TAO/tao/IFR_Client/IFR_BasicA.cpp b/TAO/tao/IFR_Client/IFR_BasicA.cpp
deleted file mode 100644
index fb92aa67a5d..00000000000
--- a/TAO/tao/IFR_Client/IFR_BasicA.cpp
+++ /dev/null
@@ -1,3626 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "IFR_BasicC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Enum_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
-#include "tao/Sequence_TypeCode_Static.h"
-#include "tao/String_TypeCode_Static.h"
-#include "tao/Struct_TypeCode_Static.h"
-#include "tao/TypeCode_Struct_Field.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
-#include "tao/Any_Dual_Impl_T.h"
-#include "tao/Any_Basic_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/enum_typecode.cpp:34
-
-static char const * const _tao_enumerators_CORBA_PrimitiveKind[] =
-  {
-    "pk_null",
-    "pk_void",
-    "pk_short",
-    "pk_long",
-    "pk_ushort",
-    "pk_ulong",
-    "pk_float",
-    "pk_double",
-    "pk_boolean",
-    "pk_char",
-    "pk_octet",
-    "pk_any",
-    "pk_TypeCode",
-    "pk_Principal",
-    "pk_string",
-    "pk_objref",
-    "pk_longlong",
-    "pk_ulonglong",
-    "pk_longdouble",
-    "pk_wchar",
-    "pk_wstring",
-    "pk_value_base"
-    
-  };
-
-static TAO::TypeCode::Enum<char const *,
-                           char const * const *,
-                           TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_PrimitiveKind (
-    "IDL:omg.org/CORBA/PrimitiveKind:1.0",
-    "PrimitiveKind",
-    _tao_enumerators_CORBA_PrimitiveKind,
-    22);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_PrimitiveKind =
-    &_tao_tc_CORBA_PrimitiveKind;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_Repository (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/Repository:1.0",
-    "Repository");
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_Repository =
-    &_tao_tc_CORBA_Repository;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ModuleDef (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/ModuleDef:1.0",
-    "ModuleDef");
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ModuleDef =
-    &_tao_tc_CORBA_ModuleDef;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_ModuleDescription[] =
-  {
-    { "name", &CORBA::_tc_Identifier },
-    { "id", &CORBA::_tc_RepositoryId },
-    { "defined_in", &CORBA::_tc_RepositoryId },
-    { "version", &CORBA::_tc_VersionSpec }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ModuleDescription (
-    CORBA::tk_struct,
-    "IDL:omg.org/CORBA/ModuleDescription:1.0",
-    "ModuleDescription",
-    _tao_fields_CORBA_ModuleDescription,
-    4);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ModuleDescription =
-    &_tao_tc_CORBA_ModuleDescription;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ConstantDef (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/ConstantDef:1.0",
-    "ConstantDef");
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ConstantDef =
-    &_tao_tc_CORBA_ConstantDef;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_ConstantDescription[] =
-  {
-    { "name", &CORBA::_tc_Identifier },
-    { "id", &CORBA::_tc_RepositoryId },
-    { "defined_in", &CORBA::_tc_RepositoryId },
-    { "version", &CORBA::_tc_VersionSpec },
-    { "type", &CORBA::_tc_TypeCode },
-    { "value", &CORBA::_tc_any }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ConstantDescription (
-    CORBA::tk_struct,
-    "IDL:omg.org/CORBA/ConstantDescription:1.0",
-    "ConstantDescription",
-    _tao_fields_CORBA_ConstantDescription,
-    6);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ConstantDescription =
-    &_tao_tc_CORBA_ConstantDescription;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_StructDef (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/StructDef:1.0",
-    "StructDef");
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_StructDef =
-    &_tao_tc_CORBA_StructDef;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_UnionDef (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/UnionDef:1.0",
-    "UnionDef");
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_UnionDef =
-    &_tao_tc_CORBA_UnionDef;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_EnumDef (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/EnumDef:1.0",
-    "EnumDef");
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_EnumDef =
-    &_tao_tc_CORBA_EnumDef;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_AliasDef (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/AliasDef:1.0",
-    "AliasDef");
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_AliasDef =
-    &_tao_tc_CORBA_AliasDef;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_NativeDef (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/NativeDef:1.0",
-    "NativeDef");
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_NativeDef =
-    &_tao_tc_CORBA_NativeDef;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_PrimitiveDef (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/PrimitiveDef:1.0",
-    "PrimitiveDef");
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_PrimitiveDef =
-    &_tao_tc_CORBA_PrimitiveDef;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_StringDef (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/StringDef:1.0",
-    "StringDef");
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_StringDef =
-    &_tao_tc_CORBA_StringDef;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_WstringDef (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/WstringDef:1.0",
-    "WstringDef");
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_WstringDef =
-    &_tao_tc_CORBA_WstringDef;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_SequenceDef (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/SequenceDef:1.0",
-    "SequenceDef");
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_SequenceDef =
-    &_tao_tc_CORBA_SequenceDef;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ArrayDef (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/ArrayDef:1.0",
-    "ArrayDef");
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ArrayDef =
-    &_tao_tc_CORBA_ArrayDef;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ExceptionDef (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/ExceptionDef:1.0",
-    "ExceptionDef");
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ExceptionDef =
-    &_tao_tc_CORBA_ExceptionDef;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
-
-
-#ifndef _TAO_TYPECODE_CORBA_ExceptionDefSeq_GUARD
-#define _TAO_TYPECODE_CORBA_ExceptionDefSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_ExceptionDefSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_ExceptionDef,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_ExceptionDefSeq_0 =
-      &CORBA_ExceptionDefSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_ExceptionDefSeq_GUARD */
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ExceptionDefSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/ExceptionDefSeq:1.0",
-    "ExceptionDefSeq",
-    &TAO::TypeCode::tc_CORBA_ExceptionDefSeq_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ExceptionDefSeq =
-    &_tao_tc_CORBA_ExceptionDefSeq;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/enum_typecode.cpp:34
-
-static char const * const _tao_enumerators_CORBA_AttributeMode[] =
-  {
-    "ATTR_NORMAL",
-    "ATTR_READONLY"
-    
-  };
-
-static TAO::TypeCode::Enum<char const *,
-                           char const * const *,
-                           TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_AttributeMode (
-    "IDL:omg.org/CORBA/AttributeMode:1.0",
-    "AttributeMode",
-    _tao_enumerators_CORBA_AttributeMode,
-    2);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_AttributeMode =
-    &_tao_tc_CORBA_AttributeMode;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_AttributeDef (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/AttributeDef:1.0",
-    "AttributeDef");
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_AttributeDef =
-    &_tao_tc_CORBA_AttributeDef;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_AttributeDescription[] =
-  {
-    { "name", &CORBA::_tc_Identifier },
-    { "id", &CORBA::_tc_RepositoryId },
-    { "defined_in", &CORBA::_tc_RepositoryId },
-    { "version", &CORBA::_tc_VersionSpec },
-    { "type", &CORBA::_tc_TypeCode },
-    { "mode", &CORBA::_tc_AttributeMode }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_AttributeDescription (
-    CORBA::tk_struct,
-    "IDL:omg.org/CORBA/AttributeDescription:1.0",
-    "AttributeDescription",
-    _tao_fields_CORBA_AttributeDescription,
-    6);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_AttributeDescription =
-    &_tao_tc_CORBA_AttributeDescription;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_ExtAttributeDescription[] =
-  {
-    { "name", &CORBA::_tc_Identifier },
-    { "id", &CORBA::_tc_RepositoryId },
-    { "defined_in", &CORBA::_tc_RepositoryId },
-    { "version", &CORBA::_tc_VersionSpec },
-    { "type", &CORBA::_tc_TypeCode },
-    { "mode", &CORBA::_tc_AttributeMode },
-    { "get_exceptions", &CORBA::_tc_ExcDescriptionSeq },
-    { "put_exceptions", &CORBA::_tc_ExcDescriptionSeq }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ExtAttributeDescription (
-    CORBA::tk_struct,
-    "IDL:omg.org/CORBA/ExtAttributeDescription:1.0",
-    "ExtAttributeDescription",
-    _tao_fields_CORBA_ExtAttributeDescription,
-    8);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ExtAttributeDescription =
-    &_tao_tc_CORBA_ExtAttributeDescription;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ExtAttributeDef (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/ExtAttributeDef:1.0",
-    "ExtAttributeDef");
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ExtAttributeDef =
-    &_tao_tc_CORBA_ExtAttributeDef;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/enum_typecode.cpp:34
-
-static char const * const _tao_enumerators_CORBA_OperationMode[] =
-  {
-    "OP_NORMAL",
-    "OP_ONEWAY"
-    
-  };
-
-static TAO::TypeCode::Enum<char const *,
-                           char const * const *,
-                           TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_OperationMode (
-    "IDL:omg.org/CORBA/OperationMode:1.0",
-    "OperationMode",
-    _tao_enumerators_CORBA_OperationMode,
-    2);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_OperationMode =
-    &_tao_tc_CORBA_OperationMode;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_ParameterDescription[] =
-  {
-    { "name", &CORBA::_tc_Identifier },
-    { "type", &CORBA::_tc_TypeCode },
-    { "type_def", &CORBA::_tc_IDLType },
-    { "mode", &CORBA::_tc_ParameterMode }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ParameterDescription (
-    CORBA::tk_struct,
-    "IDL:omg.org/CORBA/ParameterDescription:1.0",
-    "ParameterDescription",
-    _tao_fields_CORBA_ParameterDescription,
-    4);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ParameterDescription =
-    &_tao_tc_CORBA_ParameterDescription;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
-
-
-#ifndef _TAO_TYPECODE_CORBA_ParDescriptionSeq_GUARD
-#define _TAO_TYPECODE_CORBA_ParDescriptionSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_ParDescriptionSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_ParameterDescription,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_ParDescriptionSeq_0 =
-      &CORBA_ParDescriptionSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_ParDescriptionSeq_GUARD */
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ParDescriptionSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/ParDescriptionSeq:1.0",
-    "ParDescriptionSeq",
-    &TAO::TypeCode::tc_CORBA_ParDescriptionSeq_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ParDescriptionSeq =
-    &_tao_tc_CORBA_ParDescriptionSeq;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ContextIdentifier (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/ContextIdentifier:1.0",
-    "ContextIdentifier",
-    &CORBA::_tc_Identifier);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ContextIdentifier =
-    &_tao_tc_CORBA_ContextIdentifier;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
-
-
-#ifndef _TAO_TYPECODE_CORBA_ContextIdSeq_GUARD
-#define _TAO_TYPECODE_CORBA_ContextIdSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_ContextIdSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_ContextIdentifier,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_ContextIdSeq_0 =
-      &CORBA_ContextIdSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_ContextIdSeq_GUARD */
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ContextIdSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/ContextIdSeq:1.0",
-    "ContextIdSeq",
-    &TAO::TypeCode::tc_CORBA_ContextIdSeq_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ContextIdSeq =
-    &_tao_tc_CORBA_ContextIdSeq;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_OperationDef (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/OperationDef:1.0",
-    "OperationDef");
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_OperationDef =
-    &_tao_tc_CORBA_OperationDef;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_OperationDescription[] =
-  {
-    { "name", &CORBA::_tc_Identifier },
-    { "id", &CORBA::_tc_RepositoryId },
-    { "defined_in", &CORBA::_tc_RepositoryId },
-    { "version", &CORBA::_tc_VersionSpec },
-    { "result", &CORBA::_tc_TypeCode },
-    { "mode", &CORBA::_tc_OperationMode },
-    { "contexts", &CORBA::_tc_ContextIdSeq },
-    { "parameters", &CORBA::_tc_ParDescriptionSeq },
-    { "exceptions", &CORBA::_tc_ExcDescriptionSeq }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_OperationDescription (
-    CORBA::tk_struct,
-    "IDL:omg.org/CORBA/OperationDescription:1.0",
-    "OperationDescription",
-    _tao_fields_CORBA_OperationDescription,
-    9);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_OperationDescription =
-    &_tao_tc_CORBA_OperationDescription;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
-
-
-#ifndef _TAO_TYPECODE_CORBA_RepositoryIdSeq_GUARD
-#define _TAO_TYPECODE_CORBA_RepositoryIdSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_RepositoryIdSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_RepositoryId,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_RepositoryIdSeq_0 =
-      &CORBA_RepositoryIdSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_RepositoryIdSeq_GUARD */
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_RepositoryIdSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/RepositoryIdSeq:1.0",
-    "RepositoryIdSeq",
-    &TAO::TypeCode::tc_CORBA_RepositoryIdSeq_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_RepositoryIdSeq =
-    &_tao_tc_CORBA_RepositoryIdSeq;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
-
-
-#ifndef _TAO_TYPECODE_CORBA_OpDescriptionSeq_GUARD
-#define _TAO_TYPECODE_CORBA_OpDescriptionSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_OpDescriptionSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_OperationDescription,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_OpDescriptionSeq_0 =
-      &CORBA_OpDescriptionSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_OpDescriptionSeq_GUARD */
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_OpDescriptionSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/OpDescriptionSeq:1.0",
-    "OpDescriptionSeq",
-    &TAO::TypeCode::tc_CORBA_OpDescriptionSeq_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_OpDescriptionSeq =
-    &_tao_tc_CORBA_OpDescriptionSeq;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
-
-
-#ifndef _TAO_TYPECODE_CORBA_AttrDescriptionSeq_GUARD
-#define _TAO_TYPECODE_CORBA_AttrDescriptionSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_AttrDescriptionSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_AttributeDescription,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_AttrDescriptionSeq_0 =
-      &CORBA_AttrDescriptionSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_AttrDescriptionSeq_GUARD */
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_AttrDescriptionSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/AttrDescriptionSeq:1.0",
-    "AttrDescriptionSeq",
-    &TAO::TypeCode::tc_CORBA_AttrDescriptionSeq_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_AttrDescriptionSeq =
-    &_tao_tc_CORBA_AttrDescriptionSeq;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
-
-
-#ifndef _TAO_TYPECODE_CORBA_ExtAttrDescriptionSeq_GUARD
-#define _TAO_TYPECODE_CORBA_ExtAttrDescriptionSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_ExtAttrDescriptionSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_ExtAttributeDescription,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_ExtAttrDescriptionSeq_0 =
-      &CORBA_ExtAttrDescriptionSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_ExtAttrDescriptionSeq_GUARD */
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ExtAttrDescriptionSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/ExtAttrDescriptionSeq:1.0",
-    "ExtAttrDescriptionSeq",
-    &TAO::TypeCode::tc_CORBA_ExtAttrDescriptionSeq_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ExtAttrDescriptionSeq =
-    &_tao_tc_CORBA_ExtAttrDescriptionSeq;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_InterfaceDef_FullInterfaceDescription[] =
-  {
-    { "name", &CORBA::_tc_Identifier },
-    { "id", &CORBA::_tc_RepositoryId },
-    { "defined_in", &CORBA::_tc_RepositoryId },
-    { "version", &CORBA::_tc_VersionSpec },
-    { "operations", &CORBA::_tc_OpDescriptionSeq },
-    { "attributes", &CORBA::_tc_AttrDescriptionSeq },
-    { "base_interfaces", &CORBA::_tc_RepositoryIdSeq },
-    { "type", &CORBA::_tc_TypeCode }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_InterfaceDef_FullInterfaceDescription (
-    CORBA::tk_struct,
-    "IDL:omg.org/CORBA/InterfaceDef/FullInterfaceDescription:1.0",
-    "FullInterfaceDescription",
-    _tao_fields_CORBA_InterfaceDef_FullInterfaceDescription,
-    8);
-  
-::CORBA::TypeCode_ptr const CORBA::InterfaceDef::_tc_FullInterfaceDescription =
-  &_tao_tc_CORBA_InterfaceDef_FullInterfaceDescription;
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_InterfaceDef (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/InterfaceDef:1.0",
-    "InterfaceDef");
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_InterfaceDef =
-    &_tao_tc_CORBA_InterfaceDef;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_InterfaceDescription[] =
-  {
-    { "name", &CORBA::_tc_Identifier },
-    { "id", &CORBA::_tc_RepositoryId },
-    { "defined_in", &CORBA::_tc_RepositoryId },
-    { "version", &CORBA::_tc_VersionSpec },
-    { "base_interfaces", &CORBA::_tc_RepositoryIdSeq }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_InterfaceDescription (
-    CORBA::tk_struct,
-    "IDL:omg.org/CORBA/InterfaceDescription:1.0",
-    "InterfaceDescription",
-    _tao_fields_CORBA_InterfaceDescription,
-    5);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_InterfaceDescription =
-    &_tao_tc_CORBA_InterfaceDescription;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_InterfaceAttrExtension_ExtFullInterfaceDescription[] =
-  {
-    { "name", &CORBA::_tc_Identifier },
-    { "id", &CORBA::_tc_RepositoryId },
-    { "defined_in", &CORBA::_tc_RepositoryId },
-    { "version", &CORBA::_tc_VersionSpec },
-    { "operations", &CORBA::_tc_OpDescriptionSeq },
-    { "attributes", &CORBA::_tc_ExtAttrDescriptionSeq },
-    { "base_interfaces", &CORBA::_tc_RepositoryIdSeq },
-    { "type", &CORBA::_tc_TypeCode }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_InterfaceAttrExtension_ExtFullInterfaceDescription (
-    CORBA::tk_struct,
-    "IDL:omg.org/CORBA/InterfaceAttrExtension/ExtFullInterfaceDescription:1.0",
-    "ExtFullInterfaceDescription",
-    _tao_fields_CORBA_InterfaceAttrExtension_ExtFullInterfaceDescription,
-    8);
-  
-::CORBA::TypeCode_ptr const CORBA::InterfaceAttrExtension::_tc_ExtFullInterfaceDescription =
-  &_tao_tc_CORBA_InterfaceAttrExtension_ExtFullInterfaceDescription;
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_InterfaceAttrExtension (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/InterfaceAttrExtension:1.0",
-    "InterfaceAttrExtension");
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_InterfaceAttrExtension =
-    &_tao_tc_CORBA_InterfaceAttrExtension;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ExtInterfaceDef (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/ExtInterfaceDef:1.0",
-    "ExtInterfaceDef");
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ExtInterfaceDef =
-    &_tao_tc_CORBA_ExtInterfaceDef;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_AbstractInterfaceDef (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/AbstractInterfaceDef:1.0",
-    "AbstractInterfaceDef");
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_AbstractInterfaceDef =
-    &_tao_tc_CORBA_AbstractInterfaceDef;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ExtAbstractInterfaceDef (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/ExtAbstractInterfaceDef:1.0",
-    "ExtAbstractInterfaceDef");
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ExtAbstractInterfaceDef =
-    &_tao_tc_CORBA_ExtAbstractInterfaceDef;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_LocalInterfaceDef (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/LocalInterfaceDef:1.0",
-    "LocalInterfaceDef");
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_LocalInterfaceDef =
-    &_tao_tc_CORBA_LocalInterfaceDef;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ExtLocalInterfaceDef (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/ExtLocalInterfaceDef:1.0",
-    "ExtLocalInterfaceDef");
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ExtLocalInterfaceDef =
-    &_tao_tc_CORBA_ExtLocalInterfaceDef;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_enum/any_op_cs.cpp:52
-
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::PrimitiveKind _tao_elem
-  )
-{
-  TAO::Any_Basic_Impl_T<CORBA::PrimitiveKind>::insert (
-      _tao_any,
-      CORBA::_tc_PrimitiveKind,
-      _tao_elem
-    );
-}
-
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::PrimitiveKind &_tao_elem
-  )
-{
-  return
-    TAO::Any_Basic_Impl_T<CORBA::PrimitiveKind>::extract (
-        _tao_any,
-        CORBA::_tc_PrimitiveKind,
-        _tao_elem 
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::Repository>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::Repository_ptr _tao_elem
-  )
-{
-  CORBA::Repository_ptr _tao_objptr =
-    CORBA::Repository::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::Repository_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::Repository>::insert (
-      _tao_any,
-      CORBA::Repository::_tao_any_destructor,
-      CORBA::_tc_Repository,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::Repository_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::Repository>::extract (
-        _tao_any,
-        CORBA::Repository::_tao_any_destructor,
-        CORBA::_tc_Repository,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::ModuleDef>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ModuleDef_ptr _tao_elem
-  )
-{
-  CORBA::ModuleDef_ptr _tao_objptr =
-    CORBA::ModuleDef::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ModuleDef_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::ModuleDef>::insert (
-      _tao_any,
-      CORBA::ModuleDef::_tao_any_destructor,
-      CORBA::_tc_ModuleDef,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ModuleDef_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::ModuleDef>::extract (
-        _tao_any,
-        CORBA::ModuleDef::_tao_any_destructor,
-        CORBA::_tc_ModuleDef,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::ModuleDescription &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ModuleDescription>::insert_copy (
-      _tao_any,
-      CORBA::ModuleDescription::_tao_any_destructor,
-      CORBA::_tc_ModuleDescription,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ModuleDescription *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ModuleDescription>::insert (
-      _tao_any,
-      CORBA::ModuleDescription::_tao_any_destructor,
-      CORBA::_tc_ModuleDescription,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ModuleDescription *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::ModuleDescription *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::ModuleDescription *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::ModuleDescription>::extract (
-        _tao_any,
-        CORBA::ModuleDescription::_tao_any_destructor,
-        CORBA::_tc_ModuleDescription,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::ConstantDef>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ConstantDef_ptr _tao_elem
-  )
-{
-  CORBA::ConstantDef_ptr _tao_objptr =
-    CORBA::ConstantDef::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ConstantDef_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::ConstantDef>::insert (
-      _tao_any,
-      CORBA::ConstantDef::_tao_any_destructor,
-      CORBA::_tc_ConstantDef,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ConstantDef_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::ConstantDef>::extract (
-        _tao_any,
-        CORBA::ConstantDef::_tao_any_destructor,
-        CORBA::_tc_ConstantDef,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::ConstantDescription &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ConstantDescription>::insert_copy (
-      _tao_any,
-      CORBA::ConstantDescription::_tao_any_destructor,
-      CORBA::_tc_ConstantDescription,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ConstantDescription *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ConstantDescription>::insert (
-      _tao_any,
-      CORBA::ConstantDescription::_tao_any_destructor,
-      CORBA::_tc_ConstantDescription,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ConstantDescription *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::ConstantDescription *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::ConstantDescription *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::ConstantDescription>::extract (
-        _tao_any,
-        CORBA::ConstantDescription::_tao_any_destructor,
-        CORBA::_tc_ConstantDescription,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::StructDef>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::StructDef_ptr _tao_elem
-  )
-{
-  CORBA::StructDef_ptr _tao_objptr =
-    CORBA::StructDef::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::StructDef_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::StructDef>::insert (
-      _tao_any,
-      CORBA::StructDef::_tao_any_destructor,
-      CORBA::_tc_StructDef,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::StructDef_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::StructDef>::extract (
-        _tao_any,
-        CORBA::StructDef::_tao_any_destructor,
-        CORBA::_tc_StructDef,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::UnionDef>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::UnionDef_ptr _tao_elem
-  )
-{
-  CORBA::UnionDef_ptr _tao_objptr =
-    CORBA::UnionDef::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::UnionDef_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::UnionDef>::insert (
-      _tao_any,
-      CORBA::UnionDef::_tao_any_destructor,
-      CORBA::_tc_UnionDef,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::UnionDef_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::UnionDef>::extract (
-        _tao_any,
-        CORBA::UnionDef::_tao_any_destructor,
-        CORBA::_tc_UnionDef,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::EnumDef>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::EnumDef_ptr _tao_elem
-  )
-{
-  CORBA::EnumDef_ptr _tao_objptr =
-    CORBA::EnumDef::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::EnumDef_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::EnumDef>::insert (
-      _tao_any,
-      CORBA::EnumDef::_tao_any_destructor,
-      CORBA::_tc_EnumDef,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::EnumDef_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::EnumDef>::extract (
-        _tao_any,
-        CORBA::EnumDef::_tao_any_destructor,
-        CORBA::_tc_EnumDef,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::AliasDef>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::AliasDef_ptr _tao_elem
-  )
-{
-  CORBA::AliasDef_ptr _tao_objptr =
-    CORBA::AliasDef::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::AliasDef_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::AliasDef>::insert (
-      _tao_any,
-      CORBA::AliasDef::_tao_any_destructor,
-      CORBA::_tc_AliasDef,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::AliasDef_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::AliasDef>::extract (
-        _tao_any,
-        CORBA::AliasDef::_tao_any_destructor,
-        CORBA::_tc_AliasDef,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::NativeDef>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::NativeDef_ptr _tao_elem
-  )
-{
-  CORBA::NativeDef_ptr _tao_objptr =
-    CORBA::NativeDef::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::NativeDef_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::NativeDef>::insert (
-      _tao_any,
-      CORBA::NativeDef::_tao_any_destructor,
-      CORBA::_tc_NativeDef,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::NativeDef_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::NativeDef>::extract (
-        _tao_any,
-        CORBA::NativeDef::_tao_any_destructor,
-        CORBA::_tc_NativeDef,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::PrimitiveDef>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::PrimitiveDef_ptr _tao_elem
-  )
-{
-  CORBA::PrimitiveDef_ptr _tao_objptr =
-    CORBA::PrimitiveDef::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::PrimitiveDef_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::PrimitiveDef>::insert (
-      _tao_any,
-      CORBA::PrimitiveDef::_tao_any_destructor,
-      CORBA::_tc_PrimitiveDef,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::PrimitiveDef_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::PrimitiveDef>::extract (
-        _tao_any,
-        CORBA::PrimitiveDef::_tao_any_destructor,
-        CORBA::_tc_PrimitiveDef,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::StringDef>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::StringDef_ptr _tao_elem
-  )
-{
-  CORBA::StringDef_ptr _tao_objptr =
-    CORBA::StringDef::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::StringDef_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::StringDef>::insert (
-      _tao_any,
-      CORBA::StringDef::_tao_any_destructor,
-      CORBA::_tc_StringDef,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::StringDef_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::StringDef>::extract (
-        _tao_any,
-        CORBA::StringDef::_tao_any_destructor,
-        CORBA::_tc_StringDef,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::WstringDef>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::WstringDef_ptr _tao_elem
-  )
-{
-  CORBA::WstringDef_ptr _tao_objptr =
-    CORBA::WstringDef::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::WstringDef_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::WstringDef>::insert (
-      _tao_any,
-      CORBA::WstringDef::_tao_any_destructor,
-      CORBA::_tc_WstringDef,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::WstringDef_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::WstringDef>::extract (
-        _tao_any,
-        CORBA::WstringDef::_tao_any_destructor,
-        CORBA::_tc_WstringDef,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::SequenceDef>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::SequenceDef_ptr _tao_elem
-  )
-{
-  CORBA::SequenceDef_ptr _tao_objptr =
-    CORBA::SequenceDef::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::SequenceDef_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::SequenceDef>::insert (
-      _tao_any,
-      CORBA::SequenceDef::_tao_any_destructor,
-      CORBA::_tc_SequenceDef,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::SequenceDef_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::SequenceDef>::extract (
-        _tao_any,
-        CORBA::SequenceDef::_tao_any_destructor,
-        CORBA::_tc_SequenceDef,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::ArrayDef>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ArrayDef_ptr _tao_elem
-  )
-{
-  CORBA::ArrayDef_ptr _tao_objptr =
-    CORBA::ArrayDef::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ArrayDef_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::ArrayDef>::insert (
-      _tao_any,
-      CORBA::ArrayDef::_tao_any_destructor,
-      CORBA::_tc_ArrayDef,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ArrayDef_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::ArrayDef>::extract (
-        _tao_any,
-        CORBA::ArrayDef::_tao_any_destructor,
-        CORBA::_tc_ArrayDef,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::ExceptionDef>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ExceptionDef_ptr _tao_elem
-  )
-{
-  CORBA::ExceptionDef_ptr _tao_objptr =
-    CORBA::ExceptionDef::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ExceptionDef_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::ExceptionDef>::insert (
-      _tao_any,
-      CORBA::ExceptionDef::_tao_any_destructor,
-      CORBA::_tc_ExceptionDef,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ExceptionDef_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::ExceptionDef>::extract (
-        _tao_any,
-        CORBA::ExceptionDef::_tao_any_destructor,
-        CORBA::_tc_ExceptionDef,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::ExceptionDefSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ExceptionDefSeq>::insert_copy (
-      _tao_any,
-      CORBA::ExceptionDefSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_ExceptionDefSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ExceptionDefSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ExceptionDefSeq>::insert (
-      _tao_any,
-      CORBA::ExceptionDefSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_ExceptionDefSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ExceptionDefSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::ExceptionDefSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::ExceptionDefSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::ExceptionDefSeq>::extract (
-        _tao_any,
-        CORBA::ExceptionDefSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_ExceptionDefSeq_0,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_enum/any_op_cs.cpp:52
-
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::AttributeMode _tao_elem
-  )
-{
-  TAO::Any_Basic_Impl_T<CORBA::AttributeMode>::insert (
-      _tao_any,
-      CORBA::_tc_AttributeMode,
-      _tao_elem
-    );
-}
-
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::AttributeMode &_tao_elem
-  )
-{
-  return
-    TAO::Any_Basic_Impl_T<CORBA::AttributeMode>::extract (
-        _tao_any,
-        CORBA::_tc_AttributeMode,
-        _tao_elem 
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::AttributeDef>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::AttributeDef_ptr _tao_elem
-  )
-{
-  CORBA::AttributeDef_ptr _tao_objptr =
-    CORBA::AttributeDef::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::AttributeDef_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::AttributeDef>::insert (
-      _tao_any,
-      CORBA::AttributeDef::_tao_any_destructor,
-      CORBA::_tc_AttributeDef,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::AttributeDef_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::AttributeDef>::extract (
-        _tao_any,
-        CORBA::AttributeDef::_tao_any_destructor,
-        CORBA::_tc_AttributeDef,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::AttributeDescription &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::AttributeDescription>::insert_copy (
-      _tao_any,
-      CORBA::AttributeDescription::_tao_any_destructor,
-      CORBA::_tc_AttributeDescription,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::AttributeDescription *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::AttributeDescription>::insert (
-      _tao_any,
-      CORBA::AttributeDescription::_tao_any_destructor,
-      CORBA::_tc_AttributeDescription,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::AttributeDescription *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::AttributeDescription *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::AttributeDescription *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::AttributeDescription>::extract (
-        _tao_any,
-        CORBA::AttributeDescription::_tao_any_destructor,
-        CORBA::_tc_AttributeDescription,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::ExtAttributeDescription &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ExtAttributeDescription>::insert_copy (
-      _tao_any,
-      CORBA::ExtAttributeDescription::_tao_any_destructor,
-      CORBA::_tc_ExtAttributeDescription,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ExtAttributeDescription *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ExtAttributeDescription>::insert (
-      _tao_any,
-      CORBA::ExtAttributeDescription::_tao_any_destructor,
-      CORBA::_tc_ExtAttributeDescription,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ExtAttributeDescription *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::ExtAttributeDescription *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::ExtAttributeDescription *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::ExtAttributeDescription>::extract (
-        _tao_any,
-        CORBA::ExtAttributeDescription::_tao_any_destructor,
-        CORBA::_tc_ExtAttributeDescription,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::ExtAttributeDef>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ExtAttributeDef_ptr _tao_elem
-  )
-{
-  CORBA::ExtAttributeDef_ptr _tao_objptr =
-    CORBA::ExtAttributeDef::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ExtAttributeDef_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::ExtAttributeDef>::insert (
-      _tao_any,
-      CORBA::ExtAttributeDef::_tao_any_destructor,
-      CORBA::_tc_ExtAttributeDef,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ExtAttributeDef_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::ExtAttributeDef>::extract (
-        _tao_any,
-        CORBA::ExtAttributeDef::_tao_any_destructor,
-        CORBA::_tc_ExtAttributeDef,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_enum/any_op_cs.cpp:52
-
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::OperationMode _tao_elem
-  )
-{
-  TAO::Any_Basic_Impl_T<CORBA::OperationMode>::insert (
-      _tao_any,
-      CORBA::_tc_OperationMode,
-      _tao_elem
-    );
-}
-
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::OperationMode &_tao_elem
-  )
-{
-  return
-    TAO::Any_Basic_Impl_T<CORBA::OperationMode>::extract (
-        _tao_any,
-        CORBA::_tc_OperationMode,
-        _tao_elem 
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::ParameterDescription &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ParameterDescription>::insert_copy (
-      _tao_any,
-      CORBA::ParameterDescription::_tao_any_destructor,
-      CORBA::_tc_ParameterDescription,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ParameterDescription *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ParameterDescription>::insert (
-      _tao_any,
-      CORBA::ParameterDescription::_tao_any_destructor,
-      CORBA::_tc_ParameterDescription,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ParameterDescription *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::ParameterDescription *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::ParameterDescription *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::ParameterDescription>::extract (
-        _tao_any,
-        CORBA::ParameterDescription::_tao_any_destructor,
-        CORBA::_tc_ParameterDescription,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::ParDescriptionSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ParDescriptionSeq>::insert_copy (
-      _tao_any,
-      CORBA::ParDescriptionSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_ParDescriptionSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ParDescriptionSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ParDescriptionSeq>::insert (
-      _tao_any,
-      CORBA::ParDescriptionSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_ParDescriptionSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ParDescriptionSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::ParDescriptionSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::ParDescriptionSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::ParDescriptionSeq>::extract (
-        _tao_any,
-        CORBA::ParDescriptionSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_ParDescriptionSeq_0,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::ContextIdSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ContextIdSeq>::insert_copy (
-      _tao_any,
-      CORBA::ContextIdSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_ContextIdSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ContextIdSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ContextIdSeq>::insert (
-      _tao_any,
-      CORBA::ContextIdSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_ContextIdSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ContextIdSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::ContextIdSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::ContextIdSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::ContextIdSeq>::extract (
-        _tao_any,
-        CORBA::ContextIdSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_ContextIdSeq_0,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::OperationDef>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::OperationDef_ptr _tao_elem
-  )
-{
-  CORBA::OperationDef_ptr _tao_objptr =
-    CORBA::OperationDef::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::OperationDef_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::OperationDef>::insert (
-      _tao_any,
-      CORBA::OperationDef::_tao_any_destructor,
-      CORBA::_tc_OperationDef,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::OperationDef_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::OperationDef>::extract (
-        _tao_any,
-        CORBA::OperationDef::_tao_any_destructor,
-        CORBA::_tc_OperationDef,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::OperationDescription &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::OperationDescription>::insert_copy (
-      _tao_any,
-      CORBA::OperationDescription::_tao_any_destructor,
-      CORBA::_tc_OperationDescription,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::OperationDescription *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::OperationDescription>::insert (
-      _tao_any,
-      CORBA::OperationDescription::_tao_any_destructor,
-      CORBA::_tc_OperationDescription,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::OperationDescription *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::OperationDescription *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::OperationDescription *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::OperationDescription>::extract (
-        _tao_any,
-        CORBA::OperationDescription::_tao_any_destructor,
-        CORBA::_tc_OperationDescription,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::RepositoryIdSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::RepositoryIdSeq>::insert_copy (
-      _tao_any,
-      CORBA::RepositoryIdSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_RepositoryIdSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::RepositoryIdSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::RepositoryIdSeq>::insert (
-      _tao_any,
-      CORBA::RepositoryIdSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_RepositoryIdSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::RepositoryIdSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::RepositoryIdSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::RepositoryIdSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::RepositoryIdSeq>::extract (
-        _tao_any,
-        CORBA::RepositoryIdSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_RepositoryIdSeq_0,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::OpDescriptionSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::OpDescriptionSeq>::insert_copy (
-      _tao_any,
-      CORBA::OpDescriptionSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_OpDescriptionSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::OpDescriptionSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::OpDescriptionSeq>::insert (
-      _tao_any,
-      CORBA::OpDescriptionSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_OpDescriptionSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::OpDescriptionSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::OpDescriptionSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::OpDescriptionSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::OpDescriptionSeq>::extract (
-        _tao_any,
-        CORBA::OpDescriptionSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_OpDescriptionSeq_0,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::AttrDescriptionSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::AttrDescriptionSeq>::insert_copy (
-      _tao_any,
-      CORBA::AttrDescriptionSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_AttrDescriptionSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::AttrDescriptionSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::AttrDescriptionSeq>::insert (
-      _tao_any,
-      CORBA::AttrDescriptionSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_AttrDescriptionSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::AttrDescriptionSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::AttrDescriptionSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::AttrDescriptionSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::AttrDescriptionSeq>::extract (
-        _tao_any,
-        CORBA::AttrDescriptionSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_AttrDescriptionSeq_0,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::ExtAttrDescriptionSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ExtAttrDescriptionSeq>::insert_copy (
-      _tao_any,
-      CORBA::ExtAttrDescriptionSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_ExtAttrDescriptionSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ExtAttrDescriptionSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ExtAttrDescriptionSeq>::insert (
-      _tao_any,
-      CORBA::ExtAttrDescriptionSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_ExtAttrDescriptionSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ExtAttrDescriptionSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::ExtAttrDescriptionSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::ExtAttrDescriptionSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::ExtAttrDescriptionSeq>::extract (
-        _tao_any,
-        CORBA::ExtAttrDescriptionSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_ExtAttrDescriptionSeq_0,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::InterfaceDef>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::InterfaceDef_ptr _tao_elem
-  )
-{
-  CORBA::InterfaceDef_ptr _tao_objptr =
-    CORBA::InterfaceDef::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::InterfaceDef_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::InterfaceDef>::insert (
-      _tao_any,
-      CORBA::InterfaceDef::_tao_any_destructor,
-      CORBA::_tc_InterfaceDef,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::InterfaceDef_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::InterfaceDef>::extract (
-        _tao_any,
-        CORBA::InterfaceDef::_tao_any_destructor,
-        CORBA::_tc_InterfaceDef,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::InterfaceDef::FullInterfaceDescription &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::InterfaceDef::FullInterfaceDescription>::insert_copy (
-      _tao_any,
-      CORBA::InterfaceDef::FullInterfaceDescription::_tao_any_destructor,
-      CORBA::InterfaceDef::_tc_FullInterfaceDescription,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::InterfaceDef::FullInterfaceDescription *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::InterfaceDef::FullInterfaceDescription>::insert (
-      _tao_any,
-      CORBA::InterfaceDef::FullInterfaceDescription::_tao_any_destructor,
-      CORBA::InterfaceDef::_tc_FullInterfaceDescription,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::InterfaceDef::FullInterfaceDescription *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::InterfaceDef::FullInterfaceDescription *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::InterfaceDef::FullInterfaceDescription *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::InterfaceDef::FullInterfaceDescription>::extract (
-        _tao_any,
-        CORBA::InterfaceDef::FullInterfaceDescription::_tao_any_destructor,
-        CORBA::InterfaceDef::_tc_FullInterfaceDescription,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::InterfaceDescription &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::InterfaceDescription>::insert_copy (
-      _tao_any,
-      CORBA::InterfaceDescription::_tao_any_destructor,
-      CORBA::_tc_InterfaceDescription,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::InterfaceDescription *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::InterfaceDescription>::insert (
-      _tao_any,
-      CORBA::InterfaceDescription::_tao_any_destructor,
-      CORBA::_tc_InterfaceDescription,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::InterfaceDescription *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::InterfaceDescription *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::InterfaceDescription *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::InterfaceDescription>::extract (
-        _tao_any,
-        CORBA::InterfaceDescription::_tao_any_destructor,
-        CORBA::_tc_InterfaceDescription,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::InterfaceAttrExtension>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::InterfaceAttrExtension_ptr _tao_elem
-  )
-{
-  CORBA::InterfaceAttrExtension_ptr _tao_objptr =
-    CORBA::InterfaceAttrExtension::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::InterfaceAttrExtension_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::InterfaceAttrExtension>::insert (
-      _tao_any,
-      CORBA::InterfaceAttrExtension::_tao_any_destructor,
-      CORBA::_tc_InterfaceAttrExtension,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::InterfaceAttrExtension_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::InterfaceAttrExtension>::extract (
-        _tao_any,
-        CORBA::InterfaceAttrExtension::_tao_any_destructor,
-        CORBA::_tc_InterfaceAttrExtension,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription>::insert_copy (
-      _tao_any,
-      CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription::_tao_any_destructor,
-      CORBA::InterfaceAttrExtension::_tc_ExtFullInterfaceDescription,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription>::insert (
-      _tao_any,
-      CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription::_tao_any_destructor,
-      CORBA::InterfaceAttrExtension::_tc_ExtFullInterfaceDescription,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription>::extract (
-        _tao_any,
-        CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription::_tao_any_destructor,
-        CORBA::InterfaceAttrExtension::_tc_ExtFullInterfaceDescription,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::ExtInterfaceDef>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ExtInterfaceDef_ptr _tao_elem
-  )
-{
-  CORBA::ExtInterfaceDef_ptr _tao_objptr =
-    CORBA::ExtInterfaceDef::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ExtInterfaceDef_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::ExtInterfaceDef>::insert (
-      _tao_any,
-      CORBA::ExtInterfaceDef::_tao_any_destructor,
-      CORBA::_tc_ExtInterfaceDef,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ExtInterfaceDef_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::ExtInterfaceDef>::extract (
-        _tao_any,
-        CORBA::ExtInterfaceDef::_tao_any_destructor,
-        CORBA::_tc_ExtInterfaceDef,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::AbstractInterfaceDef>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::AbstractInterfaceDef_ptr _tao_elem
-  )
-{
-  CORBA::AbstractInterfaceDef_ptr _tao_objptr =
-    CORBA::AbstractInterfaceDef::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::AbstractInterfaceDef_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::AbstractInterfaceDef>::insert (
-      _tao_any,
-      CORBA::AbstractInterfaceDef::_tao_any_destructor,
-      CORBA::_tc_AbstractInterfaceDef,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::AbstractInterfaceDef_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::AbstractInterfaceDef>::extract (
-        _tao_any,
-        CORBA::AbstractInterfaceDef::_tao_any_destructor,
-        CORBA::_tc_AbstractInterfaceDef,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::ExtAbstractInterfaceDef>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ExtAbstractInterfaceDef_ptr _tao_elem
-  )
-{
-  CORBA::ExtAbstractInterfaceDef_ptr _tao_objptr =
-    CORBA::ExtAbstractInterfaceDef::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ExtAbstractInterfaceDef_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::ExtAbstractInterfaceDef>::insert (
-      _tao_any,
-      CORBA::ExtAbstractInterfaceDef::_tao_any_destructor,
-      CORBA::_tc_ExtAbstractInterfaceDef,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ExtAbstractInterfaceDef_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::ExtAbstractInterfaceDef>::extract (
-        _tao_any,
-        CORBA::ExtAbstractInterfaceDef::_tao_any_destructor,
-        CORBA::_tc_ExtAbstractInterfaceDef,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::LocalInterfaceDef>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::LocalInterfaceDef_ptr _tao_elem
-  )
-{
-  CORBA::LocalInterfaceDef_ptr _tao_objptr =
-    CORBA::LocalInterfaceDef::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::LocalInterfaceDef_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::LocalInterfaceDef>::insert (
-      _tao_any,
-      CORBA::LocalInterfaceDef::_tao_any_destructor,
-      CORBA::_tc_LocalInterfaceDef,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::LocalInterfaceDef_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::LocalInterfaceDef>::extract (
-        _tao_any,
-        CORBA::LocalInterfaceDef::_tao_any_destructor,
-        CORBA::_tc_LocalInterfaceDef,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::ExtLocalInterfaceDef>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ExtLocalInterfaceDef_ptr _tao_elem
-  )
-{
-  CORBA::ExtLocalInterfaceDef_ptr _tao_objptr =
-    CORBA::ExtLocalInterfaceDef::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ExtLocalInterfaceDef_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::ExtLocalInterfaceDef>::insert (
-      _tao_any,
-      CORBA::ExtLocalInterfaceDef::_tao_any_destructor,
-      CORBA::_tc_ExtLocalInterfaceDef,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ExtLocalInterfaceDef_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::ExtLocalInterfaceDef>::extract (
-        _tao_any,
-        CORBA::ExtLocalInterfaceDef::_tao_any_destructor,
-        CORBA::_tc_ExtLocalInterfaceDef,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/IFR_Client/IFR_BasicA.h b/TAO/tao/IFR_Client/IFR_BasicA.h
new file mode 100644
index 00000000000..f79b2d40fc4
--- /dev/null
+++ b/TAO/tao/IFR_Client/IFR_BasicA.h
@@ -0,0 +1,44 @@
+// -*- C++ -*-
+//
+// $Id$
+
+// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       Irvine, CA
+//       USA
+//       http://doc.ece.uci.edu/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
+//
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
+
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:390
+
+#ifndef _TAO_IDL_ORIG_IFR_BASICA_H_
+#define _TAO_IDL_ORIG_IFR_BASICA_H_
+
+#include /**/ "ace/pre.h"
+
+#include "tao/IFR_Client/IFR_BasicC.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include /**/ "ace/post.h"
+#endif /* ifndef */
+
diff --git a/TAO/tao/IFR_Client/IFR_BasicC.cpp b/TAO/tao/IFR_Client/IFR_BasicC.cpp
index 30d2cbf70ba..e9b3916a962 100644
--- a/TAO/tao/IFR_Client/IFR_BasicC.cpp
+++ b/TAO/tao/IFR_Client/IFR_BasicC.cpp
@@ -26,20 +26,35 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:291
+// be\be_codegen.cpp:293
 
 
 #include "IFR_BasicC.h"
 #include "tao/CDR.h"
-#include "tao/Exception_Data.h"
+#include "tao/IFR_Client/IFR_BaseC.h"
+#include "tao/AnyTypeCode/orb_typesA.h"
+#include "tao/AnyTypeCode/ParameterModeA.h"
 #include "tao/Invocation_Adapter.h"
 #include "tao/Object_T.h"
+#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Enum_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Sequence_TypeCode_Static.h"
+#include "tao/AnyTypeCode/String_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Struct_TypeCode_Static.h"
+#include "tao/AnyTypeCode/TypeCode_Struct_Field.h"
+#include "tao/AnyTypeCode/Recursive_Type_TypeCode.h"
+#include "tao/AnyTypeCode/Any_Impl_T.h"
+#include "tao/AnyTypeCode/Any_Dual_Impl_T.h"
+#include "tao/AnyTypeCode/Any_Basic_Impl_T.h"
 #include "tao/Basic_Arguments.h"
 #include "tao/Object_Argument_T.h"
 #include "tao/Special_Basic_Arguments.h"
 #include "tao/UB_String_Arguments.h"
 #include "tao/Var_Size_Argument_T.h"
-#include "tao/Any_Arg_Traits.h"
+#include "tao/AnyTypeCode/Any_Arg_Traits.h"
 #include "ace/OS_NS_string.h"
 
 #if defined (__BORLANDC__)
@@ -51,15 +66,18 @@
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
+// be\be_visitor_arg_traits.cpp:70
 
 // Arg traits specializations.
 namespace TAO
 {
 
-#if !defined (_CORBA_CONTAINED__ARG_TRAITS_CS_)
-#define _CORBA_CONTAINED__ARG_TRAITS_CS_
-  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
+
+#if !defined (_CORBA_CONTAINED__ARG_TRAITS_)
+#define _CORBA_CONTAINED__ARG_TRAITS_
+
   template<>
   class  Arg_Traits<CORBA::Contained>
     : public
@@ -67,16 +85,20 @@ namespace TAO
             CORBA::Contained_ptr,
             CORBA::Contained_var,
             CORBA::Contained_out,
-            TAO::Objref_Traits<CORBA::Contained>
+            TAO::Objref_Traits<CORBA::Contained>,
+            TAO::Any_Insert_Policy_Stream <CORBA::Contained_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
 
-#if !defined (_CORBA_IDLTYPE__ARG_TRAITS_CS_)
-#define _CORBA_IDLTYPE__ARG_TRAITS_CS_
-  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
+
+#if !defined (_CORBA_IDLTYPE__ARG_TRAITS_)
+#define _CORBA_IDLTYPE__ARG_TRAITS_
+
   template<>
   class  Arg_Traits<CORBA::IDLType>
     : public
@@ -84,130 +106,140 @@ namespace TAO
             CORBA::IDLType_ptr,
             CORBA::IDLType_var,
             CORBA::IDLType_out,
-            TAO::Objref_Traits<CORBA::IDLType>
+            TAO::Objref_Traits<CORBA::IDLType>,
+            TAO::Any_Insert_Policy_Stream <CORBA::IDLType_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:751
+  // be\be_visitor_arg_traits.cpp:828
+
+#if !defined (_CORBA_INTERFACEDEF_FULLINTERFACEDESCRIPTION__ARG_TRAITS_)
+#define _CORBA_INTERFACEDEF_FULLINTERFACEDESCRIPTION__ARG_TRAITS_
 
-#if !defined (_CORBA_INTERFACEDEF_FULLINTERFACEDESCRIPTION__ARG_TRAITS_CS_)
-#define _CORBA_INTERFACEDEF_FULLINTERFACEDESCRIPTION__ARG_TRAITS_CS_
-  
   template<>
   class Arg_Traits<CORBA::InterfaceDef::FullInterfaceDescription>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::InterfaceDef::FullInterfaceDescription,
             CORBA::InterfaceDef::FullInterfaceDescription_var,
-            CORBA::InterfaceDef::FullInterfaceDescription_out
+            CORBA::InterfaceDef::FullInterfaceDescription_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::InterfaceDef::FullInterfaceDescription>
           >
   {
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:496
+  // be\be_visitor_arg_traits.cpp:543
+
+#if !defined (_CORBA_INTERFACEDEFSEQ__ARG_TRAITS_)
+#define _CORBA_INTERFACEDEFSEQ__ARG_TRAITS_
 
-#if !defined (_CORBA_INTERFACEDEFSEQ__ARG_TRAITS_CS_)
-#define _CORBA_INTERFACEDEFSEQ__ARG_TRAITS_CS_
-  
   template<>
   class Arg_Traits<CORBA::InterfaceDefSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::InterfaceDefSeq,
             CORBA::InterfaceDefSeq_var,
-            CORBA::InterfaceDefSeq_out
+            CORBA::InterfaceDefSeq_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::InterfaceDefSeq>
           >
   {
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:496
+  // be\be_visitor_arg_traits.cpp:543
+
+#if !defined (_CORBA_STRUCTMEMBERSEQ__ARG_TRAITS_)
+#define _CORBA_STRUCTMEMBERSEQ__ARG_TRAITS_
 
-#if !defined (_CORBA_STRUCTMEMBERSEQ__ARG_TRAITS_CS_)
-#define _CORBA_STRUCTMEMBERSEQ__ARG_TRAITS_CS_
-  
   template<>
   class Arg_Traits<CORBA::StructMemberSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::StructMemberSeq,
             CORBA::StructMemberSeq_var,
-            CORBA::StructMemberSeq_out
+            CORBA::StructMemberSeq_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::StructMemberSeq>
           >
   {
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:496
+  // be\be_visitor_arg_traits.cpp:543
+
+#if !defined (_CORBA_EXCDESCRIPTIONSEQ__ARG_TRAITS_)
+#define _CORBA_EXCDESCRIPTIONSEQ__ARG_TRAITS_
 
-#if !defined (_CORBA_EXCDESCRIPTIONSEQ__ARG_TRAITS_CS_)
-#define _CORBA_EXCDESCRIPTIONSEQ__ARG_TRAITS_CS_
-  
   template<>
   class Arg_Traits<CORBA::ExcDescriptionSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::ExcDescriptionSeq,
             CORBA::ExcDescriptionSeq_var,
-            CORBA::ExcDescriptionSeq_out
+            CORBA::ExcDescriptionSeq_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::ExcDescriptionSeq>
           >
   {
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:496
+  // be\be_visitor_arg_traits.cpp:543
+
+#if !defined (_CORBA_UNIONMEMBERSEQ__ARG_TRAITS_)
+#define _CORBA_UNIONMEMBERSEQ__ARG_TRAITS_
 
-#if !defined (_CORBA_UNIONMEMBERSEQ__ARG_TRAITS_CS_)
-#define _CORBA_UNIONMEMBERSEQ__ARG_TRAITS_CS_
-  
   template<>
   class Arg_Traits<CORBA::UnionMemberSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::UnionMemberSeq,
             CORBA::UnionMemberSeq_var,
-            CORBA::UnionMemberSeq_out
+            CORBA::UnionMemberSeq_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::UnionMemberSeq>
           >
   {
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:496
+  // be\be_visitor_arg_traits.cpp:543
+
+#if !defined (_CORBA_ENUMMEMBERSEQ__ARG_TRAITS_)
+#define _CORBA_ENUMMEMBERSEQ__ARG_TRAITS_
 
-#if !defined (_CORBA_ENUMMEMBERSEQ__ARG_TRAITS_CS_)
-#define _CORBA_ENUMMEMBERSEQ__ARG_TRAITS_CS_
-  
   template<>
   class Arg_Traits<CORBA::EnumMemberSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::EnumMemberSeq,
             CORBA::EnumMemberSeq_var,
-            CORBA::EnumMemberSeq_out
+            CORBA::EnumMemberSeq_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::EnumMemberSeq>
           >
   {
   };
 
 #endif /* end #if !defined */
 
-#if !defined (_CORBA_PRIMITIVEDEF__ARG_TRAITS_CS_)
-#define _CORBA_PRIMITIVEDEF__ARG_TRAITS_CS_
-  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
+
+#if !defined (_CORBA_PRIMITIVEDEF__ARG_TRAITS_)
+#define _CORBA_PRIMITIVEDEF__ARG_TRAITS_
+
   template<>
   class  Arg_Traits<CORBA::PrimitiveDef>
     : public
@@ -215,16 +247,20 @@ namespace TAO
             CORBA::PrimitiveDef_ptr,
             CORBA::PrimitiveDef_var,
             CORBA::PrimitiveDef_out,
-            TAO::Objref_Traits<CORBA::PrimitiveDef>
+            TAO::Objref_Traits<CORBA::PrimitiveDef>,
+            TAO::Any_Insert_Policy_Stream <CORBA::PrimitiveDef_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
 
-#if !defined (_CORBA_STRINGDEF__ARG_TRAITS_CS_)
-#define _CORBA_STRINGDEF__ARG_TRAITS_CS_
-  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
+
+#if !defined (_CORBA_STRINGDEF__ARG_TRAITS_)
+#define _CORBA_STRINGDEF__ARG_TRAITS_
+
   template<>
   class  Arg_Traits<CORBA::StringDef>
     : public
@@ -232,16 +268,20 @@ namespace TAO
             CORBA::StringDef_ptr,
             CORBA::StringDef_var,
             CORBA::StringDef_out,
-            TAO::Objref_Traits<CORBA::StringDef>
+            TAO::Objref_Traits<CORBA::StringDef>,
+            TAO::Any_Insert_Policy_Stream <CORBA::StringDef_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
 
-#if !defined (_CORBA_SEQUENCEDEF__ARG_TRAITS_CS_)
-#define _CORBA_SEQUENCEDEF__ARG_TRAITS_CS_
-  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
+
+#if !defined (_CORBA_SEQUENCEDEF__ARG_TRAITS_)
+#define _CORBA_SEQUENCEDEF__ARG_TRAITS_
+
   template<>
   class  Arg_Traits<CORBA::SequenceDef>
     : public
@@ -249,16 +289,20 @@ namespace TAO
             CORBA::SequenceDef_ptr,
             CORBA::SequenceDef_var,
             CORBA::SequenceDef_out,
-            TAO::Objref_Traits<CORBA::SequenceDef>
+            TAO::Objref_Traits<CORBA::SequenceDef>,
+            TAO::Any_Insert_Policy_Stream <CORBA::SequenceDef_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
 
-#if !defined (_CORBA_ARRAYDEF__ARG_TRAITS_CS_)
-#define _CORBA_ARRAYDEF__ARG_TRAITS_CS_
-  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
+
+#if !defined (_CORBA_ARRAYDEF__ARG_TRAITS_)
+#define _CORBA_ARRAYDEF__ARG_TRAITS_
+
   template<>
   class  Arg_Traits<CORBA::ArrayDef>
     : public
@@ -266,16 +310,20 @@ namespace TAO
             CORBA::ArrayDef_ptr,
             CORBA::ArrayDef_var,
             CORBA::ArrayDef_out,
-            TAO::Objref_Traits<CORBA::ArrayDef>
+            TAO::Objref_Traits<CORBA::ArrayDef>,
+            TAO::Any_Insert_Policy_Stream <CORBA::ArrayDef_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
 
-#if !defined (_CORBA_WSTRINGDEF__ARG_TRAITS_CS_)
-#define _CORBA_WSTRINGDEF__ARG_TRAITS_CS_
-  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
+
+#if !defined (_CORBA_WSTRINGDEF__ARG_TRAITS_)
+#define _CORBA_WSTRINGDEF__ARG_TRAITS_
+
   template<>
   class  Arg_Traits<CORBA::WstringDef>
     : public
@@ -283,16 +331,20 @@ namespace TAO
             CORBA::WstringDef_ptr,
             CORBA::WstringDef_var,
             CORBA::WstringDef_out,
-            TAO::Objref_Traits<CORBA::WstringDef>
+            TAO::Objref_Traits<CORBA::WstringDef>,
+            TAO::Any_Insert_Policy_Stream <CORBA::WstringDef_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
 
-#if !defined (_CORBA_FIXEDDEF__ARG_TRAITS_CS_)
-#define _CORBA_FIXEDDEF__ARG_TRAITS_CS_
-  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
+
+#if !defined (_CORBA_FIXEDDEF__ARG_TRAITS_)
+#define _CORBA_FIXEDDEF__ARG_TRAITS_
+
   template<>
   class  Arg_Traits<CORBA::FixedDef>
     : public
@@ -300,69 +352,76 @@ namespace TAO
             CORBA::FixedDef_ptr,
             CORBA::FixedDef_var,
             CORBA::FixedDef_out,
-            TAO::Objref_Traits<CORBA::FixedDef>
+            TAO::Objref_Traits<CORBA::FixedDef>,
+            TAO::Any_Insert_Policy_Stream <CORBA::FixedDef_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:709
+  // be\be_visitor_arg_traits.cpp:786
+
+#if !defined (_CORBA_PRIMITIVEKIND__ARG_TRAITS_)
+#define _CORBA_PRIMITIVEKIND__ARG_TRAITS_
 
-#if !defined (_CORBA_PRIMITIVEKIND__ARG_TRAITS_CS_)
-#define _CORBA_PRIMITIVEKIND__ARG_TRAITS_CS_
-  
   template<>
   class Arg_Traits<CORBA::PrimitiveKind>
     : public
         Basic_Arg_Traits_T<
-            CORBA::PrimitiveKind
+            CORBA::PrimitiveKind,
+            TAO::Any_Insert_Policy_Stream <CORBA::PrimitiveKind>
           >
   {
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:496
+  // be\be_visitor_arg_traits.cpp:543
+
+#if !defined (_CORBA_EXCEPTIONDEFSEQ__ARG_TRAITS_)
+#define _CORBA_EXCEPTIONDEFSEQ__ARG_TRAITS_
 
-#if !defined (_CORBA_EXCEPTIONDEFSEQ__ARG_TRAITS_CS_)
-#define _CORBA_EXCEPTIONDEFSEQ__ARG_TRAITS_CS_
-  
   template<>
   class Arg_Traits<CORBA::ExceptionDefSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::ExceptionDefSeq,
             CORBA::ExceptionDefSeq_var,
-            CORBA::ExceptionDefSeq_out
+            CORBA::ExceptionDefSeq_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::ExceptionDefSeq>
           >
   {
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:709
+  // be\be_visitor_arg_traits.cpp:786
+
+#if !defined (_CORBA_ATTRIBUTEMODE__ARG_TRAITS_)
+#define _CORBA_ATTRIBUTEMODE__ARG_TRAITS_
 
-#if !defined (_CORBA_ATTRIBUTEMODE__ARG_TRAITS_CS_)
-#define _CORBA_ATTRIBUTEMODE__ARG_TRAITS_CS_
-  
   template<>
   class Arg_Traits<CORBA::AttributeMode>
     : public
         Basic_Arg_Traits_T<
-            CORBA::AttributeMode
+            CORBA::AttributeMode,
+            TAO::Any_Insert_Policy_Stream <CORBA::AttributeMode>
           >
   {
   };
 
 #endif /* end #if !defined */
 
-#if !defined (_CORBA_ATTRIBUTEDEF__ARG_TRAITS_CS_)
-#define _CORBA_ATTRIBUTEDEF__ARG_TRAITS_CS_
-  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
+
+#if !defined (_CORBA_ATTRIBUTEDEF__ARG_TRAITS_)
+#define _CORBA_ATTRIBUTEDEF__ARG_TRAITS_
+
   template<>
   class  Arg_Traits<CORBA::AttributeDef>
     : public
@@ -370,35 +429,40 @@ namespace TAO
             CORBA::AttributeDef_ptr,
             CORBA::AttributeDef_var,
             CORBA::AttributeDef_out,
-            TAO::Objref_Traits<CORBA::AttributeDef>
+            TAO::Objref_Traits<CORBA::AttributeDef>,
+            TAO::Any_Insert_Policy_Stream <CORBA::AttributeDef_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:751
+  // be\be_visitor_arg_traits.cpp:828
+
+#if !defined (_CORBA_EXTATTRIBUTEDESCRIPTION__ARG_TRAITS_)
+#define _CORBA_EXTATTRIBUTEDESCRIPTION__ARG_TRAITS_
 
-#if !defined (_CORBA_EXTATTRIBUTEDESCRIPTION__ARG_TRAITS_CS_)
-#define _CORBA_EXTATTRIBUTEDESCRIPTION__ARG_TRAITS_CS_
-  
   template<>
   class Arg_Traits<CORBA::ExtAttributeDescription>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::ExtAttributeDescription,
             CORBA::ExtAttributeDescription_var,
-            CORBA::ExtAttributeDescription_out
+            CORBA::ExtAttributeDescription_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::ExtAttributeDescription>
           >
   {
   };
 
 #endif /* end #if !defined */
 
-#if !defined (_CORBA_EXTATTRIBUTEDEF__ARG_TRAITS_CS_)
-#define _CORBA_EXTATTRIBUTEDEF__ARG_TRAITS_CS_
-  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
+
+#if !defined (_CORBA_EXTATTRIBUTEDEF__ARG_TRAITS_)
+#define _CORBA_EXTATTRIBUTEDEF__ARG_TRAITS_
+
   template<>
   class  Arg_Traits<CORBA::ExtAttributeDef>
     : public
@@ -406,71 +470,78 @@ namespace TAO
             CORBA::ExtAttributeDef_ptr,
             CORBA::ExtAttributeDef_var,
             CORBA::ExtAttributeDef_out,
-            TAO::Objref_Traits<CORBA::ExtAttributeDef>
+            TAO::Objref_Traits<CORBA::ExtAttributeDef>,
+            TAO::Any_Insert_Policy_Stream <CORBA::ExtAttributeDef_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:709
+  // be\be_visitor_arg_traits.cpp:786
+
+#if !defined (_CORBA_OPERATIONMODE__ARG_TRAITS_)
+#define _CORBA_OPERATIONMODE__ARG_TRAITS_
 
-#if !defined (_CORBA_OPERATIONMODE__ARG_TRAITS_CS_)
-#define _CORBA_OPERATIONMODE__ARG_TRAITS_CS_
-  
   template<>
   class Arg_Traits<CORBA::OperationMode>
     : public
         Basic_Arg_Traits_T<
-            CORBA::OperationMode
+            CORBA::OperationMode,
+            TAO::Any_Insert_Policy_Stream <CORBA::OperationMode>
           >
   {
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:496
+  // be\be_visitor_arg_traits.cpp:543
+
+#if !defined (_CORBA_PARDESCRIPTIONSEQ__ARG_TRAITS_)
+#define _CORBA_PARDESCRIPTIONSEQ__ARG_TRAITS_
 
-#if !defined (_CORBA_PARDESCRIPTIONSEQ__ARG_TRAITS_CS_)
-#define _CORBA_PARDESCRIPTIONSEQ__ARG_TRAITS_CS_
-  
   template<>
   class Arg_Traits<CORBA::ParDescriptionSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::ParDescriptionSeq,
             CORBA::ParDescriptionSeq_var,
-            CORBA::ParDescriptionSeq_out
+            CORBA::ParDescriptionSeq_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::ParDescriptionSeq>
           >
   {
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:496
+  // be\be_visitor_arg_traits.cpp:543
+
+#if !defined (_CORBA_CONTEXTIDSEQ__ARG_TRAITS_)
+#define _CORBA_CONTEXTIDSEQ__ARG_TRAITS_
 
-#if !defined (_CORBA_CONTEXTIDSEQ__ARG_TRAITS_CS_)
-#define _CORBA_CONTEXTIDSEQ__ARG_TRAITS_CS_
-  
   template<>
   class Arg_Traits<CORBA::ContextIdSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::ContextIdSeq,
             CORBA::ContextIdSeq_var,
-            CORBA::ContextIdSeq_out
+            CORBA::ContextIdSeq_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::ContextIdSeq>
           >
   {
   };
 
 #endif /* end #if !defined */
 
-#if !defined (_CORBA_OPERATIONDEF__ARG_TRAITS_CS_)
-#define _CORBA_OPERATIONDEF__ARG_TRAITS_CS_
-  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
+
+#if !defined (_CORBA_OPERATIONDEF__ARG_TRAITS_)
+#define _CORBA_OPERATIONDEF__ARG_TRAITS_
+
   template<>
   class  Arg_Traits<CORBA::OperationDef>
     : public
@@ -478,26 +549,28 @@ namespace TAO
             CORBA::OperationDef_ptr,
             CORBA::OperationDef_var,
             CORBA::OperationDef_out,
-            TAO::Objref_Traits<CORBA::OperationDef>
+            TAO::Objref_Traits<CORBA::OperationDef>,
+            TAO::Any_Insert_Policy_Stream <CORBA::OperationDef_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:751
+  // be\be_visitor_arg_traits.cpp:828
+
+#if !defined (_CORBA_INTERFACEATTREXTENSION_EXTFULLINTERFACEDESCRIPTION__ARG_TRAITS_)
+#define _CORBA_INTERFACEATTREXTENSION_EXTFULLINTERFACEDESCRIPTION__ARG_TRAITS_
 
-#if !defined (_CORBA_INTERFACEATTREXTENSION_EXTFULLINTERFACEDESCRIPTION__ARG_TRAITS_CS_)
-#define _CORBA_INTERFACEATTREXTENSION_EXTFULLINTERFACEDESCRIPTION__ARG_TRAITS_CS_
-  
   template<>
   class Arg_Traits<CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription,
             CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription_var,
-            CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription_out
+            CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription>
           >
   {
   };
@@ -507,6 +580,53 @@ namespace TAO
 
 
 // TAO_IDL - Generated from
+// be\be_visitor_typecode/enum_typecode.cpp:34
+
+static char const * const _tao_enumerators_CORBA_PrimitiveKind[] =
+  {
+    "pk_null",
+    "pk_void",
+    "pk_short",
+    "pk_long",
+    "pk_ushort",
+    "pk_ulong",
+    "pk_float",
+    "pk_double",
+    "pk_boolean",
+    "pk_char",
+    "pk_octet",
+    "pk_any",
+    "pk_TypeCode",
+    "pk_Principal",
+    "pk_string",
+    "pk_objref",
+    "pk_longlong",
+    "pk_ulonglong",
+    "pk_longdouble",
+    "pk_wchar",
+    "pk_wstring",
+    "pk_value_base"
+
+  };
+
+static TAO::TypeCode::Enum<char const *,
+                           char const * const *,
+                           TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_PrimitiveKind (
+    "IDL:omg.org/CORBA/PrimitiveKind:1.0",
+    "PrimitiveKind",
+    _tao_enumerators_CORBA_PrimitiveKind,
+    22);
+
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_PrimitiveKind =
+    &_tao_tc_CORBA_PrimitiveKind;
+}
+
+
+
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for CORBA::Repository.
@@ -543,7 +663,7 @@ TAO::Objref_Traits<CORBA::Repository>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
+TAO::Collocation_Proxy_Broker *
 (*CORBA__TAO_Repository_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -563,21 +683,21 @@ TAO::Collocation_Proxy_Broker *
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_Repository_Proxy_Broker_ == 0)
     {
       CORBA_Repository_setup_collocation ();
     }
-  
-  TAO::Arg_Traits< CORBA::Contained>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_search_id (search_id);
-  
+
+  TAO::Arg_Traits< ::CORBA::Contained>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_search_id (search_id);
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_search_id
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -586,10 +706,10 @@ TAO::Collocation_Proxy_Broker *
       9,
       this->the_TAO_Repository_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -608,21 +728,21 @@ CORBA::TypeCode_ptr CORBA::Repository::get_canonical_typecode (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_Repository_Proxy_Broker_ == 0)
     {
       CORBA_Repository_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< ::CORBA::TypeCode>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::TypeCode>::in_arg_val _tao_tc (tc);
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_tc
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -631,10 +751,10 @@ CORBA::TypeCode_ptr CORBA::Repository::get_canonical_typecode (
       22,
       this->the_TAO_Repository_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -653,21 +773,21 @@ CORBA::TypeCode_ptr CORBA::Repository::get_canonical_typecode (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_Repository_Proxy_Broker_ == 0)
     {
       CORBA_Repository_setup_collocation ();
     }
-  
-  TAO::Arg_Traits< CORBA::PrimitiveDef>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::PrimitiveKind>::in_arg_val _tao_kind (kind);
-  
+
+  TAO::Arg_Traits< ::CORBA::PrimitiveDef>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::PrimitiveKind>::in_arg_val _tao_kind (kind);
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_kind
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -676,10 +796,10 @@ CORBA::TypeCode_ptr CORBA::Repository::get_canonical_typecode (
       13,
       this->the_TAO_Repository_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -698,21 +818,21 @@ CORBA::TypeCode_ptr CORBA::Repository::get_canonical_typecode (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_Repository_Proxy_Broker_ == 0)
     {
       CORBA_Repository_setup_collocation ();
     }
-  
-  TAO::Arg_Traits< CORBA::StringDef>::ret_val _tao_retval;
+
+  TAO::Arg_Traits< ::CORBA::StringDef>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::ULong>::in_arg_val _tao_bound (bound);
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_bound
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -721,10 +841,10 @@ CORBA::TypeCode_ptr CORBA::Repository::get_canonical_typecode (
       13,
       this->the_TAO_Repository_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -743,21 +863,21 @@ CORBA::TypeCode_ptr CORBA::Repository::get_canonical_typecode (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_Repository_Proxy_Broker_ == 0)
     {
       CORBA_Repository_setup_collocation ();
     }
-  
-  TAO::Arg_Traits< CORBA::WstringDef>::ret_val _tao_retval;
+
+  TAO::Arg_Traits< ::CORBA::WstringDef>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::ULong>::in_arg_val _tao_bound (bound);
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_bound
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -766,10 +886,10 @@ CORBA::TypeCode_ptr CORBA::Repository::get_canonical_typecode (
       14,
       this->the_TAO_Repository_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -789,23 +909,23 @@ CORBA::TypeCode_ptr CORBA::Repository::get_canonical_typecode (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_Repository_Proxy_Broker_ == 0)
     {
       CORBA_Repository_setup_collocation ();
     }
-  
-  TAO::Arg_Traits< CORBA::SequenceDef>::ret_val _tao_retval;
+
+  TAO::Arg_Traits< ::CORBA::SequenceDef>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::ULong>::in_arg_val _tao_bound (bound);
-  TAO::Arg_Traits< CORBA::IDLType>::in_arg_val _tao_element_type (element_type);
-  
+  TAO::Arg_Traits< ::CORBA::IDLType>::in_arg_val _tao_element_type (element_type);
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_bound,
       &_tao_element_type
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -814,10 +934,10 @@ CORBA::TypeCode_ptr CORBA::Repository::get_canonical_typecode (
       15,
       this->the_TAO_Repository_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -837,23 +957,23 @@ CORBA::TypeCode_ptr CORBA::Repository::get_canonical_typecode (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_Repository_Proxy_Broker_ == 0)
     {
       CORBA_Repository_setup_collocation ();
     }
-  
-  TAO::Arg_Traits< CORBA::ArrayDef>::ret_val _tao_retval;
+
+  TAO::Arg_Traits< ::CORBA::ArrayDef>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::ULong>::in_arg_val _tao_length (length);
-  TAO::Arg_Traits< CORBA::IDLType>::in_arg_val _tao_element_type (element_type);
-  
+  TAO::Arg_Traits< ::CORBA::IDLType>::in_arg_val _tao_element_type (element_type);
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_length,
       &_tao_element_type
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -862,10 +982,10 @@ CORBA::TypeCode_ptr CORBA::Repository::get_canonical_typecode (
       12,
       this->the_TAO_Repository_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -885,23 +1005,23 @@ CORBA::TypeCode_ptr CORBA::Repository::get_canonical_typecode (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_Repository_Proxy_Broker_ == 0)
     {
       CORBA_Repository_setup_collocation ();
     }
-  
-  TAO::Arg_Traits< CORBA::FixedDef>::ret_val _tao_retval;
+
+  TAO::Arg_Traits< ::CORBA::FixedDef>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::UShort>::in_arg_val _tao_digits (digits);
   TAO::Arg_Traits< ::CORBA::Short>::in_arg_val _tao_scale (scale);
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_digits,
       &_tao_scale
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -910,10 +1030,10 @@ CORBA::TypeCode_ptr CORBA::Repository::get_canonical_typecode (
       12,
       this->the_TAO_Repository_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -931,14 +1051,14 @@ CORBA::Repository::CORBA_Repository_setup_collocation ()
       this->the_TAO_Repository_Proxy_Broker_ =
         ::CORBA__TAO_Repository_Proxy_Broker_Factory_function_pointer (this);
     }
-  
+
   this->CORBA_Container_setup_collocation ();
 }
 
 CORBA::Repository::~Repository (void)
 {}
 
-void 
+void
 CORBA::Repository::_tao_any_destructor (void *_tao_void_pointer)
 {
   Repository *_tao_tmp_pointer =
@@ -983,7 +1103,7 @@ CORBA::Repository::_duplicate (Repository_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -1041,6 +1161,24 @@ CORBA::Repository::marshal (TAO_OutputCDR &cdr)
 }
 
 // TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:76
+
+static TAO::TypeCode::Objref<char const *,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_Repository (
+    CORBA::tk_objref,
+    "IDL:omg.org/CORBA/Repository:1.0",
+    "Repository");
+
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_Repository =
+    &_tao_tc_CORBA_Repository;
+}
+
+
+
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for CORBA::ModuleDef.
@@ -1077,7 +1215,7 @@ TAO::Objref_Traits<CORBA::ModuleDef>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
+TAO::Collocation_Proxy_Broker *
 (*CORBA__TAO_ModuleDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -1096,7 +1234,7 @@ CORBA::ModuleDef::CORBA_ModuleDef_setup_collocation ()
       this->the_TAO_ModuleDef_Proxy_Broker_ =
         ::CORBA__TAO_ModuleDef_Proxy_Broker_Factory_function_pointer (this);
     }
-  
+
   this->CORBA_Container_setup_collocation ();
   this->CORBA_Contained_setup_collocation ();
 }
@@ -1104,7 +1242,7 @@ CORBA::ModuleDef::CORBA_ModuleDef_setup_collocation ()
 CORBA::ModuleDef::~ModuleDef (void)
 {}
 
-void 
+void
 CORBA::ModuleDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   ModuleDef *_tao_tmp_pointer =
@@ -1149,7 +1287,7 @@ CORBA::ModuleDef::_duplicate (ModuleDef_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -1210,10 +1348,58 @@ CORBA::ModuleDef::marshal (TAO_OutputCDR &cdr)
   return (cdr << this);
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:76
+
+static TAO::TypeCode::Objref<char const *,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ModuleDef (
+    CORBA::tk_objref,
+    "IDL:omg.org/CORBA/ModuleDef:1.0",
+    "ModuleDef");
+
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_ModuleDef =
+    &_tao_tc_CORBA_ModuleDef;
+}
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/struct_typecode.cpp:87
+
+static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_ModuleDescription[] =
+  {
+    { "name", &CORBA::_tc_Identifier },
+    { "id", &CORBA::_tc_RepositoryId },
+    { "defined_in", &CORBA::_tc_RepositoryId },
+    { "version", &CORBA::_tc_VersionSpec }
+
+  };
+static TAO::TypeCode::Struct<char const *,
+                      CORBA::TypeCode_ptr const *,
+                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
+                      TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ModuleDescription (
+    CORBA::tk_struct,
+    "IDL:omg.org/CORBA/ModuleDescription:1.0",
+    "ModuleDescription",
+    _tao_fields_CORBA_ModuleDescription,
+    4);
+
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_ModuleDescription =
+    &_tao_tc_CORBA_ModuleDescription;
+}
+
+
+
+// TAO_IDL - Generated from
 // be\be_visitor_structure/structure_cs.cpp:66
 
-void 
+void
 CORBA::ModuleDescription::_tao_any_destructor (
     void *_tao_void_pointer
   )
@@ -1260,7 +1446,7 @@ TAO::Objref_Traits<CORBA::ConstantDef>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
+TAO::Collocation_Proxy_Broker *
 (*CORBA__TAO_ConstantDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -1279,19 +1465,19 @@ CORBA::TypeCode_ptr CORBA::ConstantDef::type (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_ConstantDef_Proxy_Broker_ == 0)
     {
       CORBA_ConstantDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< ::CORBA::TypeCode>::ret_val _tao_retval;
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -1300,10 +1486,10 @@ CORBA::TypeCode_ptr CORBA::ConstantDef::type (
       9,
       this->the_TAO_ConstantDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -1321,19 +1507,19 @@ CORBA::TypeCode_ptr CORBA::ConstantDef::type (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_ConstantDef_Proxy_Broker_ == 0)
     {
       CORBA_ConstantDef_setup_collocation ();
     }
-  
-  TAO::Arg_Traits< CORBA::IDLType>::ret_val _tao_retval;
-  
+
+  TAO::Arg_Traits< ::CORBA::IDLType>::ret_val _tao_retval;
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -1342,10 +1528,10 @@ CORBA::TypeCode_ptr CORBA::ConstantDef::type (
       13,
       this->the_TAO_ConstantDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -1364,21 +1550,21 @@ void CORBA::ConstantDef::type_def (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_ConstantDef_Proxy_Broker_ == 0)
     {
       CORBA_ConstantDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::IDLType>::in_arg_val _tao_type_def (type_def);
-  
+  TAO::Arg_Traits< ::CORBA::IDLType>::in_arg_val _tao_type_def (type_def);
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_type_def
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -1387,7 +1573,7 @@ void CORBA::ConstantDef::type_def (
       13,
       this->the_TAO_ConstantDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
@@ -1406,19 +1592,19 @@ CORBA::Any * CORBA::ConstantDef::value (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_ConstantDef_Proxy_Broker_ == 0)
     {
       CORBA_ConstantDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< ::CORBA::Any>::ret_val _tao_retval;
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -1427,10 +1613,10 @@ CORBA::Any * CORBA::ConstantDef::value (
       10,
       this->the_TAO_ConstantDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -1449,21 +1635,21 @@ void CORBA::ConstantDef::value (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_ConstantDef_Proxy_Broker_ == 0)
     {
       CORBA_ConstantDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< void>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::Any>::in_arg_val _tao_value (value);
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_value
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -1472,7 +1658,7 @@ void CORBA::ConstantDef::value (
       10,
       this->the_TAO_ConstantDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
@@ -1491,14 +1677,14 @@ CORBA::ConstantDef::CORBA_ConstantDef_setup_collocation ()
       this->the_TAO_ConstantDef_Proxy_Broker_ =
         ::CORBA__TAO_ConstantDef_Proxy_Broker_Factory_function_pointer (this);
     }
-  
+
   this->CORBA_Contained_setup_collocation ();
 }
 
 CORBA::ConstantDef::~ConstantDef (void)
 {}
 
-void 
+void
 CORBA::ConstantDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   ConstantDef *_tao_tmp_pointer =
@@ -1543,7 +1729,7 @@ CORBA::ConstantDef::_duplicate (ConstantDef_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -1600,10 +1786,60 @@ CORBA::ConstantDef::marshal (TAO_OutputCDR &cdr)
   return (cdr << this);
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:76
+
+static TAO::TypeCode::Objref<char const *,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ConstantDef (
+    CORBA::tk_objref,
+    "IDL:omg.org/CORBA/ConstantDef:1.0",
+    "ConstantDef");
+
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_ConstantDef =
+    &_tao_tc_CORBA_ConstantDef;
+}
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/struct_typecode.cpp:87
+
+static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_ConstantDescription[] =
+  {
+    { "name", &CORBA::_tc_Identifier },
+    { "id", &CORBA::_tc_RepositoryId },
+    { "defined_in", &CORBA::_tc_RepositoryId },
+    { "version", &CORBA::_tc_VersionSpec },
+    { "type", &CORBA::_tc_TypeCode },
+    { "value", &CORBA::_tc_any }
+
+  };
+static TAO::TypeCode::Struct<char const *,
+                      CORBA::TypeCode_ptr const *,
+                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
+                      TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ConstantDescription (
+    CORBA::tk_struct,
+    "IDL:omg.org/CORBA/ConstantDescription:1.0",
+    "ConstantDescription",
+    _tao_fields_CORBA_ConstantDescription,
+    6);
+
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_ConstantDescription =
+    &_tao_tc_CORBA_ConstantDescription;
+}
+
+
+
+// TAO_IDL - Generated from
 // be\be_visitor_structure/structure_cs.cpp:66
 
-void 
+void
 CORBA::ConstantDescription::_tao_any_destructor (
     void *_tao_void_pointer
   )
@@ -1650,7 +1886,7 @@ TAO::Objref_Traits<CORBA::StructDef>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
+TAO::Collocation_Proxy_Broker *
 (*CORBA__TAO_StructDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -1669,19 +1905,19 @@ TAO::Collocation_Proxy_Broker *
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_StructDef_Proxy_Broker_ == 0)
     {
       CORBA_StructDef_setup_collocation ();
     }
-  
-  TAO::Arg_Traits< CORBA::StructMemberSeq>::ret_val _tao_retval;
-  
+
+  TAO::Arg_Traits< ::CORBA::StructMemberSeq>::ret_val _tao_retval;
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -1690,10 +1926,10 @@ TAO::Collocation_Proxy_Broker *
       12,
       this->the_TAO_StructDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -1712,21 +1948,21 @@ void CORBA::StructDef::members (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_StructDef_Proxy_Broker_ == 0)
     {
       CORBA_StructDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::StructMemberSeq>::in_arg_val _tao_members (members);
-  
+  TAO::Arg_Traits< ::CORBA::StructMemberSeq>::in_arg_val _tao_members (members);
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_members
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -1735,7 +1971,7 @@ void CORBA::StructDef::members (
       12,
       this->the_TAO_StructDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
@@ -1754,7 +1990,7 @@ CORBA::StructDef::CORBA_StructDef_setup_collocation ()
       this->the_TAO_StructDef_Proxy_Broker_ =
         ::CORBA__TAO_StructDef_Proxy_Broker_Factory_function_pointer (this);
     }
-  
+
   this->CORBA_TypedefDef_setup_collocation ();
   this->CORBA_Container_setup_collocation ();
 }
@@ -1762,7 +1998,7 @@ CORBA::StructDef::CORBA_StructDef_setup_collocation ()
 CORBA::StructDef::~StructDef (void)
 {}
 
-void 
+void
 CORBA::StructDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   StructDef *_tao_tmp_pointer =
@@ -1807,7 +2043,7 @@ CORBA::StructDef::_duplicate (StructDef_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -1877,6 +2113,24 @@ CORBA::StructDef::marshal (TAO_OutputCDR &cdr)
 }
 
 // TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:76
+
+static TAO::TypeCode::Objref<char const *,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_StructDef (
+    CORBA::tk_objref,
+    "IDL:omg.org/CORBA/StructDef:1.0",
+    "StructDef");
+
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_StructDef =
+    &_tao_tc_CORBA_StructDef;
+}
+
+
+
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for CORBA::UnionDef.
@@ -1913,7 +2167,7 @@ TAO::Objref_Traits<CORBA::UnionDef>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
+TAO::Collocation_Proxy_Broker *
 (*CORBA__TAO_UnionDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -1932,19 +2186,19 @@ CORBA::TypeCode_ptr CORBA::UnionDef::discriminator_type (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_UnionDef_Proxy_Broker_ == 0)
     {
       CORBA_UnionDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< ::CORBA::TypeCode>::ret_val _tao_retval;
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -1953,10 +2207,10 @@ CORBA::TypeCode_ptr CORBA::UnionDef::discriminator_type (
       23,
       this->the_TAO_UnionDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -1974,19 +2228,19 @@ CORBA::TypeCode_ptr CORBA::UnionDef::discriminator_type (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_UnionDef_Proxy_Broker_ == 0)
     {
       CORBA_UnionDef_setup_collocation ();
     }
-  
-  TAO::Arg_Traits< CORBA::IDLType>::ret_val _tao_retval;
-  
+
+  TAO::Arg_Traits< ::CORBA::IDLType>::ret_val _tao_retval;
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -1995,10 +2249,10 @@ CORBA::TypeCode_ptr CORBA::UnionDef::discriminator_type (
       27,
       this->the_TAO_UnionDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -2017,21 +2271,21 @@ void CORBA::UnionDef::discriminator_type_def (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_UnionDef_Proxy_Broker_ == 0)
     {
       CORBA_UnionDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::IDLType>::in_arg_val _tao_discriminator_type_def (discriminator_type_def);
-  
+  TAO::Arg_Traits< ::CORBA::IDLType>::in_arg_val _tao_discriminator_type_def (discriminator_type_def);
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_discriminator_type_def
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -2040,7 +2294,7 @@ void CORBA::UnionDef::discriminator_type_def (
       27,
       this->the_TAO_UnionDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
@@ -2059,19 +2313,19 @@ void CORBA::UnionDef::discriminator_type_def (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_UnionDef_Proxy_Broker_ == 0)
     {
       CORBA_UnionDef_setup_collocation ();
     }
-  
-  TAO::Arg_Traits< CORBA::UnionMemberSeq>::ret_val _tao_retval;
-  
+
+  TAO::Arg_Traits< ::CORBA::UnionMemberSeq>::ret_val _tao_retval;
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -2080,10 +2334,10 @@ void CORBA::UnionDef::discriminator_type_def (
       12,
       this->the_TAO_UnionDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -2102,21 +2356,21 @@ void CORBA::UnionDef::members (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_UnionDef_Proxy_Broker_ == 0)
     {
       CORBA_UnionDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::UnionMemberSeq>::in_arg_val _tao_members (members);
-  
+  TAO::Arg_Traits< ::CORBA::UnionMemberSeq>::in_arg_val _tao_members (members);
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_members
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -2125,7 +2379,7 @@ void CORBA::UnionDef::members (
       12,
       this->the_TAO_UnionDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
@@ -2144,7 +2398,7 @@ CORBA::UnionDef::CORBA_UnionDef_setup_collocation ()
       this->the_TAO_UnionDef_Proxy_Broker_ =
         ::CORBA__TAO_UnionDef_Proxy_Broker_Factory_function_pointer (this);
     }
-  
+
   this->CORBA_TypedefDef_setup_collocation ();
   this->CORBA_Container_setup_collocation ();
 }
@@ -2152,7 +2406,7 @@ CORBA::UnionDef::CORBA_UnionDef_setup_collocation ()
 CORBA::UnionDef::~UnionDef (void)
 {}
 
-void 
+void
 CORBA::UnionDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   UnionDef *_tao_tmp_pointer =
@@ -2197,7 +2451,7 @@ CORBA::UnionDef::_duplicate (UnionDef_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -2267,6 +2521,24 @@ CORBA::UnionDef::marshal (TAO_OutputCDR &cdr)
 }
 
 // TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:76
+
+static TAO::TypeCode::Objref<char const *,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_UnionDef (
+    CORBA::tk_objref,
+    "IDL:omg.org/CORBA/UnionDef:1.0",
+    "UnionDef");
+
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_UnionDef =
+    &_tao_tc_CORBA_UnionDef;
+}
+
+
+
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for CORBA::EnumDef.
@@ -2303,7 +2575,7 @@ TAO::Objref_Traits<CORBA::EnumDef>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
+TAO::Collocation_Proxy_Broker *
 (*CORBA__TAO_EnumDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -2322,19 +2594,19 @@ TAO::Collocation_Proxy_Broker *
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_EnumDef_Proxy_Broker_ == 0)
     {
       CORBA_EnumDef_setup_collocation ();
     }
-  
-  TAO::Arg_Traits< CORBA::EnumMemberSeq>::ret_val _tao_retval;
-  
+
+  TAO::Arg_Traits< ::CORBA::EnumMemberSeq>::ret_val _tao_retval;
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -2343,10 +2615,10 @@ TAO::Collocation_Proxy_Broker *
       12,
       this->the_TAO_EnumDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -2365,21 +2637,21 @@ void CORBA::EnumDef::members (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_EnumDef_Proxy_Broker_ == 0)
     {
       CORBA_EnumDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::EnumMemberSeq>::in_arg_val _tao_members (members);
-  
+  TAO::Arg_Traits< ::CORBA::EnumMemberSeq>::in_arg_val _tao_members (members);
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_members
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -2388,7 +2660,7 @@ void CORBA::EnumDef::members (
       12,
       this->the_TAO_EnumDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
@@ -2407,14 +2679,14 @@ CORBA::EnumDef::CORBA_EnumDef_setup_collocation ()
       this->the_TAO_EnumDef_Proxy_Broker_ =
         ::CORBA__TAO_EnumDef_Proxy_Broker_Factory_function_pointer (this);
     }
-  
+
   this->CORBA_TypedefDef_setup_collocation ();
 }
 
 CORBA::EnumDef::~EnumDef (void)
 {}
 
-void 
+void
 CORBA::EnumDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   EnumDef *_tao_tmp_pointer =
@@ -2459,7 +2731,7 @@ CORBA::EnumDef::_duplicate (EnumDef_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -2525,6 +2797,24 @@ CORBA::EnumDef::marshal (TAO_OutputCDR &cdr)
 }
 
 // TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:76
+
+static TAO::TypeCode::Objref<char const *,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_EnumDef (
+    CORBA::tk_objref,
+    "IDL:omg.org/CORBA/EnumDef:1.0",
+    "EnumDef");
+
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_EnumDef =
+    &_tao_tc_CORBA_EnumDef;
+}
+
+
+
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for CORBA::AliasDef.
@@ -2561,7 +2851,7 @@ TAO::Objref_Traits<CORBA::AliasDef>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
+TAO::Collocation_Proxy_Broker *
 (*CORBA__TAO_AliasDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -2580,19 +2870,19 @@ TAO::Collocation_Proxy_Broker *
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_AliasDef_Proxy_Broker_ == 0)
     {
       CORBA_AliasDef_setup_collocation ();
     }
-  
-  TAO::Arg_Traits< CORBA::IDLType>::ret_val _tao_retval;
-  
+
+  TAO::Arg_Traits< ::CORBA::IDLType>::ret_val _tao_retval;
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -2601,10 +2891,10 @@ TAO::Collocation_Proxy_Broker *
       22,
       this->the_TAO_AliasDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -2623,21 +2913,21 @@ void CORBA::AliasDef::original_type_def (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_AliasDef_Proxy_Broker_ == 0)
     {
       CORBA_AliasDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::IDLType>::in_arg_val _tao_original_type_def (original_type_def);
-  
+  TAO::Arg_Traits< ::CORBA::IDLType>::in_arg_val _tao_original_type_def (original_type_def);
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_original_type_def
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -2646,7 +2936,7 @@ void CORBA::AliasDef::original_type_def (
       22,
       this->the_TAO_AliasDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
@@ -2665,14 +2955,14 @@ CORBA::AliasDef::CORBA_AliasDef_setup_collocation ()
       this->the_TAO_AliasDef_Proxy_Broker_ =
         ::CORBA__TAO_AliasDef_Proxy_Broker_Factory_function_pointer (this);
     }
-  
+
   this->CORBA_TypedefDef_setup_collocation ();
 }
 
 CORBA::AliasDef::~AliasDef (void)
 {}
 
-void 
+void
 CORBA::AliasDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   AliasDef *_tao_tmp_pointer =
@@ -2717,7 +3007,7 @@ CORBA::AliasDef::_duplicate (AliasDef_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -2783,6 +3073,24 @@ CORBA::AliasDef::marshal (TAO_OutputCDR &cdr)
 }
 
 // TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:76
+
+static TAO::TypeCode::Objref<char const *,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_AliasDef (
+    CORBA::tk_objref,
+    "IDL:omg.org/CORBA/AliasDef:1.0",
+    "AliasDef");
+
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_AliasDef =
+    &_tao_tc_CORBA_AliasDef;
+}
+
+
+
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for CORBA::NativeDef.
@@ -2819,7 +3127,7 @@ TAO::Objref_Traits<CORBA::NativeDef>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
+TAO::Collocation_Proxy_Broker *
 (*CORBA__TAO_NativeDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -2838,14 +3146,14 @@ CORBA::NativeDef::CORBA_NativeDef_setup_collocation ()
       this->the_TAO_NativeDef_Proxy_Broker_ =
         ::CORBA__TAO_NativeDef_Proxy_Broker_Factory_function_pointer (this);
     }
-  
+
   this->CORBA_TypedefDef_setup_collocation ();
 }
 
 CORBA::NativeDef::~NativeDef (void)
 {}
 
-void 
+void
 CORBA::NativeDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   NativeDef *_tao_tmp_pointer =
@@ -2890,7 +3198,7 @@ CORBA::NativeDef::_duplicate (NativeDef_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -2956,6 +3264,24 @@ CORBA::NativeDef::marshal (TAO_OutputCDR &cdr)
 }
 
 // TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:76
+
+static TAO::TypeCode::Objref<char const *,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_NativeDef (
+    CORBA::tk_objref,
+    "IDL:omg.org/CORBA/NativeDef:1.0",
+    "NativeDef");
+
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_NativeDef =
+    &_tao_tc_CORBA_NativeDef;
+}
+
+
+
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for CORBA::PrimitiveDef.
@@ -2992,7 +3318,7 @@ TAO::Objref_Traits<CORBA::PrimitiveDef>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
+TAO::Collocation_Proxy_Broker *
 (*CORBA__TAO_PrimitiveDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -3011,19 +3337,19 @@ TAO::Collocation_Proxy_Broker *
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_PrimitiveDef_Proxy_Broker_ == 0)
     {
       CORBA_PrimitiveDef_setup_collocation ();
     }
-  
-  TAO::Arg_Traits< CORBA::PrimitiveKind>::ret_val _tao_retval;
-  
+
+  TAO::Arg_Traits< ::CORBA::PrimitiveKind>::ret_val _tao_retval;
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -3032,10 +3358,10 @@ TAO::Collocation_Proxy_Broker *
       9,
       this->the_TAO_PrimitiveDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -3053,14 +3379,14 @@ CORBA::PrimitiveDef::CORBA_PrimitiveDef_setup_collocation ()
       this->the_TAO_PrimitiveDef_Proxy_Broker_ =
         ::CORBA__TAO_PrimitiveDef_Proxy_Broker_Factory_function_pointer (this);
     }
-  
+
   this->CORBA_IDLType_setup_collocation ();
 }
 
 CORBA::PrimitiveDef::~PrimitiveDef (void)
 {}
 
-void 
+void
 CORBA::PrimitiveDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   PrimitiveDef *_tao_tmp_pointer =
@@ -3105,7 +3431,7 @@ CORBA::PrimitiveDef::_duplicate (PrimitiveDef_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -3163,6 +3489,24 @@ CORBA::PrimitiveDef::marshal (TAO_OutputCDR &cdr)
 }
 
 // TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:76
+
+static TAO::TypeCode::Objref<char const *,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_PrimitiveDef (
+    CORBA::tk_objref,
+    "IDL:omg.org/CORBA/PrimitiveDef:1.0",
+    "PrimitiveDef");
+
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_PrimitiveDef =
+    &_tao_tc_CORBA_PrimitiveDef;
+}
+
+
+
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for CORBA::StringDef.
@@ -3199,7 +3543,7 @@ TAO::Objref_Traits<CORBA::StringDef>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
+TAO::Collocation_Proxy_Broker *
 (*CORBA__TAO_StringDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -3218,19 +3562,19 @@ CORBA::ULong CORBA::StringDef::bound (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_StringDef_Proxy_Broker_ == 0)
     {
       CORBA_StringDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< ::CORBA::ULong>::ret_val _tao_retval;
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -3239,10 +3583,10 @@ CORBA::ULong CORBA::StringDef::bound (
       10,
       this->the_TAO_StringDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -3261,21 +3605,21 @@ void CORBA::StringDef::bound (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_StringDef_Proxy_Broker_ == 0)
     {
       CORBA_StringDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< void>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::ULong>::in_arg_val _tao_bound (bound);
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_bound
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -3284,7 +3628,7 @@ void CORBA::StringDef::bound (
       10,
       this->the_TAO_StringDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
@@ -3303,14 +3647,14 @@ CORBA::StringDef::CORBA_StringDef_setup_collocation ()
       this->the_TAO_StringDef_Proxy_Broker_ =
         ::CORBA__TAO_StringDef_Proxy_Broker_Factory_function_pointer (this);
     }
-  
+
   this->CORBA_IDLType_setup_collocation ();
 }
 
 CORBA::StringDef::~StringDef (void)
 {}
 
-void 
+void
 CORBA::StringDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   StringDef *_tao_tmp_pointer =
@@ -3355,7 +3699,7 @@ CORBA::StringDef::_duplicate (StringDef_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -3413,6 +3757,24 @@ CORBA::StringDef::marshal (TAO_OutputCDR &cdr)
 }
 
 // TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:76
+
+static TAO::TypeCode::Objref<char const *,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_StringDef (
+    CORBA::tk_objref,
+    "IDL:omg.org/CORBA/StringDef:1.0",
+    "StringDef");
+
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_StringDef =
+    &_tao_tc_CORBA_StringDef;
+}
+
+
+
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for CORBA::WstringDef.
@@ -3449,7 +3811,7 @@ TAO::Objref_Traits<CORBA::WstringDef>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
+TAO::Collocation_Proxy_Broker *
 (*CORBA__TAO_WstringDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -3468,19 +3830,19 @@ CORBA::ULong CORBA::WstringDef::bound (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_WstringDef_Proxy_Broker_ == 0)
     {
       CORBA_WstringDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< ::CORBA::ULong>::ret_val _tao_retval;
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -3489,10 +3851,10 @@ CORBA::ULong CORBA::WstringDef::bound (
       10,
       this->the_TAO_WstringDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -3511,21 +3873,21 @@ void CORBA::WstringDef::bound (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_WstringDef_Proxy_Broker_ == 0)
     {
       CORBA_WstringDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< void>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::ULong>::in_arg_val _tao_bound (bound);
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_bound
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -3534,7 +3896,7 @@ void CORBA::WstringDef::bound (
       10,
       this->the_TAO_WstringDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
@@ -3553,14 +3915,14 @@ CORBA::WstringDef::CORBA_WstringDef_setup_collocation ()
       this->the_TAO_WstringDef_Proxy_Broker_ =
         ::CORBA__TAO_WstringDef_Proxy_Broker_Factory_function_pointer (this);
     }
-  
+
   this->CORBA_IDLType_setup_collocation ();
 }
 
 CORBA::WstringDef::~WstringDef (void)
 {}
 
-void 
+void
 CORBA::WstringDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   WstringDef *_tao_tmp_pointer =
@@ -3605,7 +3967,7 @@ CORBA::WstringDef::_duplicate (WstringDef_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -3663,6 +4025,24 @@ CORBA::WstringDef::marshal (TAO_OutputCDR &cdr)
 }
 
 // TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:76
+
+static TAO::TypeCode::Objref<char const *,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_WstringDef (
+    CORBA::tk_objref,
+    "IDL:omg.org/CORBA/WstringDef:1.0",
+    "WstringDef");
+
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_WstringDef =
+    &_tao_tc_CORBA_WstringDef;
+}
+
+
+
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for CORBA::SequenceDef.
@@ -3699,7 +4079,7 @@ TAO::Objref_Traits<CORBA::SequenceDef>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
+TAO::Collocation_Proxy_Broker *
 (*CORBA__TAO_SequenceDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -3718,19 +4098,19 @@ CORBA::ULong CORBA::SequenceDef::bound (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_SequenceDef_Proxy_Broker_ == 0)
     {
       CORBA_SequenceDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< ::CORBA::ULong>::ret_val _tao_retval;
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -3739,10 +4119,10 @@ CORBA::ULong CORBA::SequenceDef::bound (
       10,
       this->the_TAO_SequenceDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -3761,21 +4141,21 @@ void CORBA::SequenceDef::bound (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_SequenceDef_Proxy_Broker_ == 0)
     {
       CORBA_SequenceDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< void>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::ULong>::in_arg_val _tao_bound (bound);
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_bound
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -3784,7 +4164,7 @@ void CORBA::SequenceDef::bound (
       10,
       this->the_TAO_SequenceDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
@@ -3803,19 +4183,19 @@ CORBA::TypeCode_ptr CORBA::SequenceDef::element_type (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_SequenceDef_Proxy_Broker_ == 0)
     {
       CORBA_SequenceDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< ::CORBA::TypeCode>::ret_val _tao_retval;
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -3824,10 +4204,10 @@ CORBA::TypeCode_ptr CORBA::SequenceDef::element_type (
       17,
       this->the_TAO_SequenceDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -3845,19 +4225,19 @@ CORBA::TypeCode_ptr CORBA::SequenceDef::element_type (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_SequenceDef_Proxy_Broker_ == 0)
     {
       CORBA_SequenceDef_setup_collocation ();
     }
-  
-  TAO::Arg_Traits< CORBA::IDLType>::ret_val _tao_retval;
-  
+
+  TAO::Arg_Traits< ::CORBA::IDLType>::ret_val _tao_retval;
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -3866,10 +4246,10 @@ CORBA::TypeCode_ptr CORBA::SequenceDef::element_type (
       21,
       this->the_TAO_SequenceDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -3888,21 +4268,21 @@ void CORBA::SequenceDef::element_type_def (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_SequenceDef_Proxy_Broker_ == 0)
     {
       CORBA_SequenceDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::IDLType>::in_arg_val _tao_element_type_def (element_type_def);
-  
+  TAO::Arg_Traits< ::CORBA::IDLType>::in_arg_val _tao_element_type_def (element_type_def);
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_element_type_def
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -3911,7 +4291,7 @@ void CORBA::SequenceDef::element_type_def (
       21,
       this->the_TAO_SequenceDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
@@ -3930,14 +4310,14 @@ CORBA::SequenceDef::CORBA_SequenceDef_setup_collocation ()
       this->the_TAO_SequenceDef_Proxy_Broker_ =
         ::CORBA__TAO_SequenceDef_Proxy_Broker_Factory_function_pointer (this);
     }
-  
+
   this->CORBA_IDLType_setup_collocation ();
 }
 
 CORBA::SequenceDef::~SequenceDef (void)
 {}
 
-void 
+void
 CORBA::SequenceDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   SequenceDef *_tao_tmp_pointer =
@@ -3982,7 +4362,7 @@ CORBA::SequenceDef::_duplicate (SequenceDef_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -4040,6 +4420,24 @@ CORBA::SequenceDef::marshal (TAO_OutputCDR &cdr)
 }
 
 // TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:76
+
+static TAO::TypeCode::Objref<char const *,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_SequenceDef (
+    CORBA::tk_objref,
+    "IDL:omg.org/CORBA/SequenceDef:1.0",
+    "SequenceDef");
+
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_SequenceDef =
+    &_tao_tc_CORBA_SequenceDef;
+}
+
+
+
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for CORBA::ArrayDef.
@@ -4076,7 +4474,7 @@ TAO::Objref_Traits<CORBA::ArrayDef>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
+TAO::Collocation_Proxy_Broker *
 (*CORBA__TAO_ArrayDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -4095,19 +4493,19 @@ CORBA::ULong CORBA::ArrayDef::length (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_ArrayDef_Proxy_Broker_ == 0)
     {
       CORBA_ArrayDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< ::CORBA::ULong>::ret_val _tao_retval;
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -4116,10 +4514,10 @@ CORBA::ULong CORBA::ArrayDef::length (
       11,
       this->the_TAO_ArrayDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -4138,21 +4536,21 @@ void CORBA::ArrayDef::length (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_ArrayDef_Proxy_Broker_ == 0)
     {
       CORBA_ArrayDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< void>::ret_val _tao_retval;
   TAO::Arg_Traits< ::CORBA::ULong>::in_arg_val _tao_length (length);
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_length
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -4161,7 +4559,7 @@ void CORBA::ArrayDef::length (
       11,
       this->the_TAO_ArrayDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
@@ -4180,19 +4578,19 @@ CORBA::TypeCode_ptr CORBA::ArrayDef::element_type (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_ArrayDef_Proxy_Broker_ == 0)
     {
       CORBA_ArrayDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< ::CORBA::TypeCode>::ret_val _tao_retval;
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -4201,10 +4599,10 @@ CORBA::TypeCode_ptr CORBA::ArrayDef::element_type (
       17,
       this->the_TAO_ArrayDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -4222,19 +4620,19 @@ CORBA::TypeCode_ptr CORBA::ArrayDef::element_type (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_ArrayDef_Proxy_Broker_ == 0)
     {
       CORBA_ArrayDef_setup_collocation ();
     }
-  
-  TAO::Arg_Traits< CORBA::IDLType>::ret_val _tao_retval;
-  
+
+  TAO::Arg_Traits< ::CORBA::IDLType>::ret_val _tao_retval;
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -4243,10 +4641,10 @@ CORBA::TypeCode_ptr CORBA::ArrayDef::element_type (
       21,
       this->the_TAO_ArrayDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -4265,21 +4663,21 @@ void CORBA::ArrayDef::element_type_def (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_ArrayDef_Proxy_Broker_ == 0)
     {
       CORBA_ArrayDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::IDLType>::in_arg_val _tao_element_type_def (element_type_def);
-  
+  TAO::Arg_Traits< ::CORBA::IDLType>::in_arg_val _tao_element_type_def (element_type_def);
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_element_type_def
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -4288,7 +4686,7 @@ void CORBA::ArrayDef::element_type_def (
       21,
       this->the_TAO_ArrayDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
@@ -4307,14 +4705,14 @@ CORBA::ArrayDef::CORBA_ArrayDef_setup_collocation ()
       this->the_TAO_ArrayDef_Proxy_Broker_ =
         ::CORBA__TAO_ArrayDef_Proxy_Broker_Factory_function_pointer (this);
     }
-  
+
   this->CORBA_IDLType_setup_collocation ();
 }
 
 CORBA::ArrayDef::~ArrayDef (void)
 {}
 
-void 
+void
 CORBA::ArrayDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   ArrayDef *_tao_tmp_pointer =
@@ -4359,7 +4757,7 @@ CORBA::ArrayDef::_duplicate (ArrayDef_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -4417,6 +4815,24 @@ CORBA::ArrayDef::marshal (TAO_OutputCDR &cdr)
 }
 
 // TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:76
+
+static TAO::TypeCode::Objref<char const *,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ArrayDef (
+    CORBA::tk_objref,
+    "IDL:omg.org/CORBA/ArrayDef:1.0",
+    "ArrayDef");
+
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_ArrayDef =
+    &_tao_tc_CORBA_ArrayDef;
+}
+
+
+
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for CORBA::ExceptionDef.
@@ -4453,7 +4869,7 @@ TAO::Objref_Traits<CORBA::ExceptionDef>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
+TAO::Collocation_Proxy_Broker *
 (*CORBA__TAO_ExceptionDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -4472,19 +4888,19 @@ CORBA::TypeCode_ptr CORBA::ExceptionDef::type (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_ExceptionDef_Proxy_Broker_ == 0)
     {
       CORBA_ExceptionDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< ::CORBA::TypeCode>::ret_val _tao_retval;
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -4493,10 +4909,10 @@ CORBA::TypeCode_ptr CORBA::ExceptionDef::type (
       9,
       this->the_TAO_ExceptionDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -4514,19 +4930,19 @@ CORBA::TypeCode_ptr CORBA::ExceptionDef::type (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_ExceptionDef_Proxy_Broker_ == 0)
     {
       CORBA_ExceptionDef_setup_collocation ();
     }
-  
-  TAO::Arg_Traits< CORBA::StructMemberSeq>::ret_val _tao_retval;
-  
+
+  TAO::Arg_Traits< ::CORBA::StructMemberSeq>::ret_val _tao_retval;
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -4535,10 +4951,10 @@ CORBA::TypeCode_ptr CORBA::ExceptionDef::type (
       12,
       this->the_TAO_ExceptionDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -4557,21 +4973,21 @@ void CORBA::ExceptionDef::members (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_ExceptionDef_Proxy_Broker_ == 0)
     {
       CORBA_ExceptionDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::StructMemberSeq>::in_arg_val _tao_members (members);
-  
+  TAO::Arg_Traits< ::CORBA::StructMemberSeq>::in_arg_val _tao_members (members);
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_members
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -4580,7 +4996,7 @@ void CORBA::ExceptionDef::members (
       12,
       this->the_TAO_ExceptionDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
@@ -4599,7 +5015,7 @@ CORBA::ExceptionDef::CORBA_ExceptionDef_setup_collocation ()
       this->the_TAO_ExceptionDef_Proxy_Broker_ =
         ::CORBA__TAO_ExceptionDef_Proxy_Broker_Factory_function_pointer (this);
     }
-  
+
   this->CORBA_Contained_setup_collocation ();
   this->CORBA_Container_setup_collocation ();
 }
@@ -4607,7 +5023,7 @@ CORBA::ExceptionDef::CORBA_ExceptionDef_setup_collocation ()
 CORBA::ExceptionDef::~ExceptionDef (void)
 {}
 
-void 
+void
 CORBA::ExceptionDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   ExceptionDef *_tao_tmp_pointer =
@@ -4652,7 +5068,7 @@ CORBA::ExceptionDef::_duplicate (ExceptionDef_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -4713,7 +5129,25 @@ CORBA::ExceptionDef::marshal (TAO_OutputCDR &cdr)
   return (cdr << this);
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:76
+
+static TAO::TypeCode::Objref<char const *,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ExceptionDef (
+    CORBA::tk_objref,
+    "IDL:omg.org/CORBA/ExceptionDef:1.0",
+    "ExceptionDef");
+
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_ExceptionDef =
+    &_tao_tc_CORBA_ExceptionDef;
+}
+
+
+
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_CORBA_EXCEPTIONDEFSEQ_CS_)
@@ -4726,8 +5160,8 @@ CORBA::ExceptionDefSeq::ExceptionDefSeq (
     CORBA::ULong max
   )
   : TAO_Unbounded_Object_Sequence<
-        CORBA::ExceptionDef,
-        CORBA::ExceptionDef_var
+        ExceptionDef,
+        ExceptionDef_var
       >
     (max)
 {}
@@ -4739,8 +5173,8 @@ CORBA::ExceptionDefSeq::ExceptionDefSeq (
     CORBA::Boolean release
   )
   : TAO_Unbounded_Object_Sequence<
-        CORBA::ExceptionDef,
-        CORBA::ExceptionDef_var
+        ExceptionDef,
+        ExceptionDef_var
       >
     (max, length, buffer, release)
 {}
@@ -4749,8 +5183,8 @@ CORBA::ExceptionDefSeq::ExceptionDefSeq (
     const ExceptionDefSeq &seq
   )
   : TAO_Unbounded_Object_Sequence<
-        CORBA::ExceptionDef,
-        CORBA::ExceptionDef_var
+        ExceptionDef,
+        ExceptionDef_var
       >
     (seq)
 {}
@@ -4770,6 +5204,81 @@ void CORBA::ExceptionDefSeq::_tao_any_destructor (
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
+// be\be_visitor_typecode/alias_typecode.cpp:50
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+
+#ifndef _TAO_TYPECODE_CORBA_ExceptionDefSeq_GUARD
+#define _TAO_TYPECODE_CORBA_ExceptionDefSeq_GUARD
+namespace TAO
+{
+  namespace TypeCode
+  {
+    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
+      CORBA_ExceptionDefSeq_0 (
+        CORBA::tk_sequence,
+        &CORBA::_tc_ExceptionDef,
+        0U);
+
+    ::CORBA::TypeCode_ptr const tc_CORBA_ExceptionDefSeq_0 =
+      &CORBA_ExceptionDefSeq_0;
+
+  }
+}
+
+
+#endif /* _TAO_TYPECODE_CORBA_ExceptionDefSeq_GUARD */
+
+static TAO::TypeCode::Alias<char const *,
+                            CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ExceptionDefSeq (
+    CORBA::tk_alias,
+    "IDL:omg.org/CORBA/ExceptionDefSeq:1.0",
+    "ExceptionDefSeq",
+    &TAO::TypeCode::tc_CORBA_ExceptionDefSeq_0);
+
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_ExceptionDefSeq =
+    &_tao_tc_CORBA_ExceptionDefSeq;
+}
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/enum_typecode.cpp:34
+
+static char const * const _tao_enumerators_CORBA_AttributeMode[] =
+  {
+    "ATTR_NORMAL",
+    "ATTR_READONLY"
+
+  };
+
+static TAO::TypeCode::Enum<char const *,
+                           char const * const *,
+                           TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_AttributeMode (
+    "IDL:omg.org/CORBA/AttributeMode:1.0",
+    "AttributeMode",
+    _tao_enumerators_CORBA_AttributeMode,
+    2);
+
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_AttributeMode =
+    &_tao_tc_CORBA_AttributeMode;
+}
+
+
+
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for CORBA::AttributeDef.
@@ -4806,7 +5315,7 @@ TAO::Objref_Traits<CORBA::AttributeDef>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
+TAO::Collocation_Proxy_Broker *
 (*CORBA__TAO_AttributeDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -4825,19 +5334,19 @@ CORBA::TypeCode_ptr CORBA::AttributeDef::type (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_AttributeDef_Proxy_Broker_ == 0)
     {
       CORBA_AttributeDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< ::CORBA::TypeCode>::ret_val _tao_retval;
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -4846,10 +5355,10 @@ CORBA::TypeCode_ptr CORBA::AttributeDef::type (
       9,
       this->the_TAO_AttributeDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -4867,19 +5376,19 @@ CORBA::TypeCode_ptr CORBA::AttributeDef::type (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_AttributeDef_Proxy_Broker_ == 0)
     {
       CORBA_AttributeDef_setup_collocation ();
     }
-  
-  TAO::Arg_Traits< CORBA::IDLType>::ret_val _tao_retval;
-  
+
+  TAO::Arg_Traits< ::CORBA::IDLType>::ret_val _tao_retval;
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -4888,10 +5397,10 @@ CORBA::TypeCode_ptr CORBA::AttributeDef::type (
       13,
       this->the_TAO_AttributeDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -4910,21 +5419,21 @@ void CORBA::AttributeDef::type_def (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_AttributeDef_Proxy_Broker_ == 0)
     {
       CORBA_AttributeDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::IDLType>::in_arg_val _tao_type_def (type_def);
-  
+  TAO::Arg_Traits< ::CORBA::IDLType>::in_arg_val _tao_type_def (type_def);
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_type_def
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -4933,7 +5442,7 @@ void CORBA::AttributeDef::type_def (
       13,
       this->the_TAO_AttributeDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
@@ -4952,19 +5461,19 @@ void CORBA::AttributeDef::type_def (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_AttributeDef_Proxy_Broker_ == 0)
     {
       CORBA_AttributeDef_setup_collocation ();
     }
-  
-  TAO::Arg_Traits< CORBA::AttributeMode>::ret_val _tao_retval;
-  
+
+  TAO::Arg_Traits< ::CORBA::AttributeMode>::ret_val _tao_retval;
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -4973,10 +5482,10 @@ void CORBA::AttributeDef::type_def (
       9,
       this->the_TAO_AttributeDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -4995,21 +5504,21 @@ void CORBA::AttributeDef::mode (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_AttributeDef_Proxy_Broker_ == 0)
     {
       CORBA_AttributeDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::AttributeMode>::in_arg_val _tao_mode (mode);
-  
+  TAO::Arg_Traits< ::CORBA::AttributeMode>::in_arg_val _tao_mode (mode);
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_mode
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -5018,7 +5527,7 @@ void CORBA::AttributeDef::mode (
       9,
       this->the_TAO_AttributeDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
@@ -5037,14 +5546,14 @@ CORBA::AttributeDef::CORBA_AttributeDef_setup_collocation ()
       this->the_TAO_AttributeDef_Proxy_Broker_ =
         ::CORBA__TAO_AttributeDef_Proxy_Broker_Factory_function_pointer (this);
     }
-  
+
   this->CORBA_Contained_setup_collocation ();
 }
 
 CORBA::AttributeDef::~AttributeDef (void)
 {}
 
-void 
+void
 CORBA::AttributeDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   AttributeDef *_tao_tmp_pointer =
@@ -5089,7 +5598,7 @@ CORBA::AttributeDef::_duplicate (AttributeDef_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -5146,10 +5655,60 @@ CORBA::AttributeDef::marshal (TAO_OutputCDR &cdr)
   return (cdr << this);
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:76
+
+static TAO::TypeCode::Objref<char const *,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_AttributeDef (
+    CORBA::tk_objref,
+    "IDL:omg.org/CORBA/AttributeDef:1.0",
+    "AttributeDef");
+
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_AttributeDef =
+    &_tao_tc_CORBA_AttributeDef;
+}
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/struct_typecode.cpp:87
+
+static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_AttributeDescription[] =
+  {
+    { "name", &CORBA::_tc_Identifier },
+    { "id", &CORBA::_tc_RepositoryId },
+    { "defined_in", &CORBA::_tc_RepositoryId },
+    { "version", &CORBA::_tc_VersionSpec },
+    { "type", &CORBA::_tc_TypeCode },
+    { "mode", &CORBA::_tc_AttributeMode }
+
+  };
+static TAO::TypeCode::Struct<char const *,
+                      CORBA::TypeCode_ptr const *,
+                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
+                      TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_AttributeDescription (
+    CORBA::tk_struct,
+    "IDL:omg.org/CORBA/AttributeDescription:1.0",
+    "AttributeDescription",
+    _tao_fields_CORBA_AttributeDescription,
+    6);
+
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_AttributeDescription =
+    &_tao_tc_CORBA_AttributeDescription;
+}
+
+
+
+// TAO_IDL - Generated from
 // be\be_visitor_structure/structure_cs.cpp:66
 
-void 
+void
 CORBA::AttributeDescription::_tao_any_destructor (
     void *_tao_void_pointer
   )
@@ -5159,10 +5718,58 @@ CORBA::AttributeDescription::_tao_any_destructor (
   delete _tao_tmp_pointer;
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/struct_typecode.cpp:87
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_ExtAttributeDescription[] =
+  {
+    { "name", &CORBA::_tc_Identifier },
+    { "id", &CORBA::_tc_RepositoryId },
+    { "defined_in", &CORBA::_tc_RepositoryId },
+    { "version", &CORBA::_tc_VersionSpec },
+    { "type", &CORBA::_tc_TypeCode },
+    { "mode", &CORBA::_tc_AttributeMode },
+    { "get_exceptions", &CORBA::_tc_ExcDescriptionSeq },
+    { "put_exceptions", &CORBA::_tc_ExcDescriptionSeq }
+
+  };
+static TAO::TypeCode::Recursive_Type<
+  TAO::TypeCode::Struct<char const *,
+                        CORBA::TypeCode_ptr const *,
+                        TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
+                        TAO::Null_RefCount_Policy>,
+  CORBA::TypeCode_ptr const *,
+  TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const * >
+
+  _tao_tc_CORBA_ExtAttributeDescription (
+    CORBA::tk_struct,
+    "IDL:omg.org/CORBA/ExtAttributeDescription:1.0",
+    "ExtAttributeDescription",
+    _tao_fields_CORBA_ExtAttributeDescription,
+    8);
+
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_ExtAttributeDescription =
+    &_tao_tc_CORBA_ExtAttributeDescription;
+}
+
+
+
+// TAO_IDL - Generated from
 // be\be_visitor_structure/structure_cs.cpp:66
 
-void 
+void
 CORBA::ExtAttributeDescription::_tao_any_destructor (
     void *_tao_void_pointer
   )
@@ -5209,7 +5816,7 @@ TAO::Objref_Traits<CORBA::ExtAttributeDef>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
+TAO::Collocation_Proxy_Broker *
 (*CORBA__TAO_ExtAttributeDef_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -5228,19 +5835,19 @@ TAO::Collocation_Proxy_Broker *
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_ExtAttributeDef_Proxy_Broker_ == 0)
     {
       CORBA_ExtAttributeDef_setup_collocation ();
     }
-  
-  TAO::Arg_Traits< CORBA::ExcDescriptionSeq>::ret_val _tao_retval;
-  
+
+  TAO::Arg_Traits< ::CORBA::ExcDescriptionSeq>::ret_val _tao_retval;
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -5249,10 +5856,10 @@ TAO::Collocation_Proxy_Broker *
       19,
       this->the_TAO_ExtAttributeDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -5271,21 +5878,21 @@ void CORBA::ExtAttributeDef::get_exceptions (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_ExtAttributeDef_Proxy_Broker_ == 0)
     {
       CORBA_ExtAttributeDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::ExcDescriptionSeq>::in_arg_val _tao_get_exceptions (get_exceptions);
-  
+  TAO::Arg_Traits< ::CORBA::ExcDescriptionSeq>::in_arg_val _tao_get_exceptions (get_exceptions);
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_get_exceptions
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -5294,7 +5901,7 @@ void CORBA::ExtAttributeDef::get_exceptions (
       19,
       this->the_TAO_ExtAttributeDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
@@ -5313,19 +5920,19 @@ void CORBA::ExtAttributeDef::get_exceptions (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_ExtAttributeDef_Proxy_Broker_ == 0)
     {
       CORBA_ExtAttributeDef_setup_collocation ();
     }
-  
-  TAO::Arg_Traits< CORBA::ExcDescriptionSeq>::ret_val _tao_retval;
-  
+
+  TAO::Arg_Traits< ::CORBA::ExcDescriptionSeq>::ret_val _tao_retval;
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -5334,10 +5941,10 @@ void CORBA::ExtAttributeDef::get_exceptions (
       19,
       this->the_TAO_ExtAttributeDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -5356,21 +5963,21 @@ void CORBA::ExtAttributeDef::set_exceptions (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_ExtAttributeDef_Proxy_Broker_ == 0)
     {
       CORBA_ExtAttributeDef_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::ExcDescriptionSeq>::in_arg_val _tao_set_exceptions (set_exceptions);
-  
+  TAO::Arg_Traits< ::CORBA::ExcDescriptionSeq>::in_arg_val _tao_set_exceptions (set_exceptions);
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval,
       &_tao_set_exceptions
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -5379,7 +5986,7 @@ void CORBA::ExtAttributeDef::set_exceptions (
       19,
       this->the_TAO_ExtAttributeDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
@@ -5398,19 +6005,19 @@ void CORBA::ExtAttributeDef::set_exceptions (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_ExtAttributeDef_Proxy_Broker_ == 0)
     {
       CORBA_ExtAttributeDef_setup_collocation ();
     }
-  
-  TAO::Arg_Traits< CORBA::ExtAttributeDescription>::ret_val _tao_retval;
-  
+
+  TAO::Arg_Traits< ::CORBA::ExtAttributeDescription>::ret_val _tao_retval;
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -5419,10 +6026,10 @@ void CORBA::ExtAttributeDef::set_exceptions (
       18,
       this->the_TAO_ExtAttributeDef_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -5440,14 +6047,14 @@ CORBA::ExtAttributeDef::CORBA_ExtAttributeDef_setup_collocation ()
       this->the_TAO_ExtAttributeDef_Proxy_Broker_ =
         ::CORBA__TAO_ExtAttributeDef_Proxy_Broker_Factory_function_pointer (this);
     }
-  
+
   this->CORBA_AttributeDef_setup_collocation ();
 }
 
 CORBA::ExtAttributeDef::~ExtAttributeDef (void)
 {}
 
-void 
+void
 CORBA::ExtAttributeDef::_tao_any_destructor (void *_tao_void_pointer)
 {
   ExtAttributeDef *_tao_tmp_pointer =
@@ -5492,7 +6099,7 @@ CORBA::ExtAttributeDef::_duplicate (ExtAttributeDef_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -5553,10 +6160,85 @@ CORBA::ExtAttributeDef::marshal (TAO_OutputCDR &cdr)
   return (cdr << this);
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:76
+
+static TAO::TypeCode::Objref<char const *,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ExtAttributeDef (
+    CORBA::tk_objref,
+    "IDL:omg.org/CORBA/ExtAttributeDef:1.0",
+    "ExtAttributeDef");
+
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_ExtAttributeDef =
+    &_tao_tc_CORBA_ExtAttributeDef;
+}
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/enum_typecode.cpp:34
+
+static char const * const _tao_enumerators_CORBA_OperationMode[] =
+  {
+    "OP_NORMAL",
+    "OP_ONEWAY"
+
+  };
+
+static TAO::TypeCode::Enum<char const *,
+                           char const * const *,
+                           TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_OperationMode (
+    "IDL:omg.org/CORBA/OperationMode:1.0",
+    "OperationMode",
+    _tao_enumerators_CORBA_OperationMode,
+    2);
+
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_OperationMode =
+    &_tao_tc_CORBA_OperationMode;
+}
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/struct_typecode.cpp:87
+
+static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_ParameterDescription[] =
+  {
+    { "name", &CORBA::_tc_Identifier },
+    { "type", &CORBA::_tc_TypeCode },
+    { "type_def", &CORBA::_tc_IDLType },
+    { "mode", &CORBA::_tc_ParameterMode }
+
+  };
+static TAO::TypeCode::Struct<char const *,
+                      CORBA::TypeCode_ptr const *,
+                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
+                      TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ParameterDescription (
+    CORBA::tk_struct,
+    "IDL:omg.org/CORBA/ParameterDescription:1.0",
+    "ParameterDescription",
+    _tao_fields_CORBA_ParameterDescription,
+    4);
+
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_ParameterDescription =
+    &_tao_tc_CORBA_ParameterDescription;
+}
+
+
+
+// TAO_IDL - Generated from
 // be\be_visitor_structure/structure_cs.cpp:66
 
-void 
+void
 CORBA::ParameterDescription::_tao_any_destructor (
     void *_tao_void_pointer
   )
@@ -5579,7 +6261,7 @@ CORBA::ParDescriptionSeq::ParDescriptionSeq (
     CORBA::ULong max
   )
   : TAO_Unbounded_Sequence<
-        CORBA::ParameterDescription
+        ParameterDescription
       >
     (max)
 {}
@@ -5591,7 +6273,7 @@ CORBA::ParDescriptionSeq::ParDescriptionSeq (
     CORBA::Boolean release
   )
   : TAO_Unbounded_Sequence<
-        CORBA::ParameterDescription
+        ParameterDescription
       >
     (max, length, buffer, release)
 {}
@@ -5600,7 +6282,7 @@ CORBA::ParDescriptionSeq::ParDescriptionSeq (
     const ParDescriptionSeq &seq
   )
   : TAO_Unbounded_Sequence<
-        CORBA::ParameterDescription
+        ParameterDescription
       >
     (seq)
 {}
@@ -5619,6 +6301,74 @@ void CORBA::ParDescriptionSeq::_tao_any_destructor (
 
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/alias_typecode.cpp:50
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+
+#ifndef _TAO_TYPECODE_CORBA_ParDescriptionSeq_GUARD
+#define _TAO_TYPECODE_CORBA_ParDescriptionSeq_GUARD
+namespace TAO
+{
+  namespace TypeCode
+  {
+    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
+      CORBA_ParDescriptionSeq_0 (
+        CORBA::tk_sequence,
+        &CORBA::_tc_ParameterDescription,
+        0U);
+      
+    ::CORBA::TypeCode_ptr const tc_CORBA_ParDescriptionSeq_0 =
+      &CORBA_ParDescriptionSeq_0;
+    
+  }
+}
+
+
+#endif /* _TAO_TYPECODE_CORBA_ParDescriptionSeq_GUARD */
+
+static TAO::TypeCode::Alias<char const *,
+                            CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ParDescriptionSeq (
+    CORBA::tk_alias,
+    "IDL:omg.org/CORBA/ParDescriptionSeq:1.0",
+    "ParDescriptionSeq",
+    &TAO::TypeCode::tc_CORBA_ParDescriptionSeq_0);
+  
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_ParDescriptionSeq =
+    &_tao_tc_CORBA_ParDescriptionSeq;
+}
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/alias_typecode.cpp:50
+
+static TAO::TypeCode::Alias<char const *,
+                            CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ContextIdentifier (
+    CORBA::tk_alias,
+    "IDL:omg.org/CORBA/ContextIdentifier:1.0",
+    "ContextIdentifier",
+    &CORBA::_tc_Identifier);
+  
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_ContextIdentifier =
+    &_tao_tc_CORBA_ContextIdentifier;
+}
+
+
+
 // TAO_IDL - Generated from 
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
@@ -5667,6 +6417,54 @@ void CORBA::ContextIdSeq::_tao_any_destructor (
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
+// be\be_visitor_typecode/alias_typecode.cpp:50
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+
+#ifndef _TAO_TYPECODE_CORBA_ContextIdSeq_GUARD
+#define _TAO_TYPECODE_CORBA_ContextIdSeq_GUARD
+namespace TAO
+{
+  namespace TypeCode
+  {
+    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
+      CORBA_ContextIdSeq_0 (
+        CORBA::tk_sequence,
+        &CORBA::_tc_ContextIdentifier,
+        0U);
+      
+    ::CORBA::TypeCode_ptr const tc_CORBA_ContextIdSeq_0 =
+      &CORBA_ContextIdSeq_0;
+    
+  }
+}
+
+
+#endif /* _TAO_TYPECODE_CORBA_ContextIdSeq_GUARD */
+
+static TAO::TypeCode::Alias<char const *,
+                            CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ContextIdSeq (
+    CORBA::tk_alias,
+    "IDL:omg.org/CORBA/ContextIdSeq:1.0",
+    "ContextIdSeq",
+    &TAO::TypeCode::tc_CORBA_ContextIdSeq_0);
+  
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_ContextIdSeq =
+    &_tao_tc_CORBA_ContextIdSeq;
+}
+
+
+
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for CORBA::OperationDef.
@@ -5770,7 +6568,7 @@ CORBA::TypeCode_ptr CORBA::OperationDef::result (
       CORBA_OperationDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::IDLType>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::IDLType>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -5814,7 +6612,7 @@ void CORBA::OperationDef::result_def (
     }
   
   TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::IDLType>::in_arg_val _tao_result_def (result_def);
+  TAO::Arg_Traits< ::CORBA::IDLType>::in_arg_val _tao_result_def (result_def);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -5855,7 +6653,7 @@ void CORBA::OperationDef::result_def (
       CORBA_OperationDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::ParDescriptionSeq>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::ParDescriptionSeq>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -5899,7 +6697,7 @@ void CORBA::OperationDef::params (
     }
   
   TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::ParDescriptionSeq>::in_arg_val _tao_params (params);
+  TAO::Arg_Traits< ::CORBA::ParDescriptionSeq>::in_arg_val _tao_params (params);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -5940,7 +6738,7 @@ void CORBA::OperationDef::params (
       CORBA_OperationDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::OperationMode>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::OperationMode>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -5984,7 +6782,7 @@ void CORBA::OperationDef::mode (
     }
   
   TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::OperationMode>::in_arg_val _tao_mode (mode);
+  TAO::Arg_Traits< ::CORBA::OperationMode>::in_arg_val _tao_mode (mode);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -6025,7 +6823,7 @@ void CORBA::OperationDef::mode (
       CORBA_OperationDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::ContextIdSeq>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::ContextIdSeq>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -6069,7 +6867,7 @@ void CORBA::OperationDef::contexts (
     }
   
   TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::ContextIdSeq>::in_arg_val _tao_contexts (contexts);
+  TAO::Arg_Traits< ::CORBA::ContextIdSeq>::in_arg_val _tao_contexts (contexts);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -6110,7 +6908,7 @@ void CORBA::OperationDef::contexts (
       CORBA_OperationDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::ExceptionDefSeq>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::ExceptionDefSeq>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -6154,7 +6952,7 @@ void CORBA::OperationDef::exceptions (
     }
   
   TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::ExceptionDefSeq>::in_arg_val _tao_exceptions (exceptions);
+  TAO::Arg_Traits< ::CORBA::ExceptionDefSeq>::in_arg_val _tao_exceptions (exceptions);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -6298,6 +7096,74 @@ CORBA::OperationDef::marshal (TAO_OutputCDR &cdr)
   return (cdr << this);
 }
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:76
+
+static TAO::TypeCode::Objref<char const *,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_OperationDef (
+    CORBA::tk_objref,
+    "IDL:omg.org/CORBA/OperationDef:1.0",
+    "OperationDef");
+  
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_OperationDef =
+    &_tao_tc_CORBA_OperationDef;
+}
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/struct_typecode.cpp:87
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_OperationDescription[] =
+  {
+    { "name", &CORBA::_tc_Identifier },
+    { "id", &CORBA::_tc_RepositoryId },
+    { "defined_in", &CORBA::_tc_RepositoryId },
+    { "version", &CORBA::_tc_VersionSpec },
+    { "result", &CORBA::_tc_TypeCode },
+    { "mode", &CORBA::_tc_OperationMode },
+    { "contexts", &CORBA::_tc_ContextIdSeq },
+    { "parameters", &CORBA::_tc_ParDescriptionSeq },
+    { "exceptions", &CORBA::_tc_ExcDescriptionSeq }
+    
+  };
+static TAO::TypeCode::Struct<char const *,
+                      CORBA::TypeCode_ptr const *,
+                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
+                      TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_OperationDescription (
+    CORBA::tk_struct,
+    "IDL:omg.org/CORBA/OperationDescription:1.0",
+    "OperationDescription",
+    _tao_fields_CORBA_OperationDescription,
+    9);
+  
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_OperationDescription =
+    &_tao_tc_CORBA_OperationDescription;
+}
+
+
+
 // TAO_IDL - Generated from 
 // be\be_visitor_structure/structure_cs.cpp:66
 
@@ -6358,6 +7224,54 @@ void CORBA::RepositoryIdSeq::_tao_any_destructor (
 
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/alias_typecode.cpp:50
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+
+#ifndef _TAO_TYPECODE_CORBA_RepositoryIdSeq_GUARD
+#define _TAO_TYPECODE_CORBA_RepositoryIdSeq_GUARD
+namespace TAO
+{
+  namespace TypeCode
+  {
+    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
+      CORBA_RepositoryIdSeq_0 (
+        CORBA::tk_sequence,
+        &CORBA::_tc_RepositoryId,
+        0U);
+      
+    ::CORBA::TypeCode_ptr const tc_CORBA_RepositoryIdSeq_0 =
+      &CORBA_RepositoryIdSeq_0;
+    
+  }
+}
+
+
+#endif /* _TAO_TYPECODE_CORBA_RepositoryIdSeq_GUARD */
+
+static TAO::TypeCode::Alias<char const *,
+                            CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_RepositoryIdSeq (
+    CORBA::tk_alias,
+    "IDL:omg.org/CORBA/RepositoryIdSeq:1.0",
+    "RepositoryIdSeq",
+    &TAO::TypeCode::tc_CORBA_RepositoryIdSeq_0);
+  
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_RepositoryIdSeq =
+    &_tao_tc_CORBA_RepositoryIdSeq;
+}
+
+
+
 // TAO_IDL - Generated from 
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
@@ -6371,7 +7285,7 @@ CORBA::OpDescriptionSeq::OpDescriptionSeq (
     CORBA::ULong max
   )
   : TAO_Unbounded_Sequence<
-        CORBA::OperationDescription
+        OperationDescription
       >
     (max)
 {}
@@ -6383,7 +7297,7 @@ CORBA::OpDescriptionSeq::OpDescriptionSeq (
     CORBA::Boolean release
   )
   : TAO_Unbounded_Sequence<
-        CORBA::OperationDescription
+        OperationDescription
       >
     (max, length, buffer, release)
 {}
@@ -6392,7 +7306,7 @@ CORBA::OpDescriptionSeq::OpDescriptionSeq (
     const OpDescriptionSeq &seq
   )
   : TAO_Unbounded_Sequence<
-        CORBA::OperationDescription
+        OperationDescription
       >
     (seq)
 {}
@@ -6411,6 +7325,54 @@ void CORBA::OpDescriptionSeq::_tao_any_destructor (
 
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/alias_typecode.cpp:50
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+
+#ifndef _TAO_TYPECODE_CORBA_OpDescriptionSeq_GUARD
+#define _TAO_TYPECODE_CORBA_OpDescriptionSeq_GUARD
+namespace TAO
+{
+  namespace TypeCode
+  {
+    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
+      CORBA_OpDescriptionSeq_0 (
+        CORBA::tk_sequence,
+        &CORBA::_tc_OperationDescription,
+        0U);
+      
+    ::CORBA::TypeCode_ptr const tc_CORBA_OpDescriptionSeq_0 =
+      &CORBA_OpDescriptionSeq_0;
+    
+  }
+}
+
+
+#endif /* _TAO_TYPECODE_CORBA_OpDescriptionSeq_GUARD */
+
+static TAO::TypeCode::Alias<char const *,
+                            CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_OpDescriptionSeq (
+    CORBA::tk_alias,
+    "IDL:omg.org/CORBA/OpDescriptionSeq:1.0",
+    "OpDescriptionSeq",
+    &TAO::TypeCode::tc_CORBA_OpDescriptionSeq_0);
+  
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_OpDescriptionSeq =
+    &_tao_tc_CORBA_OpDescriptionSeq;
+}
+
+
+
 // TAO_IDL - Generated from 
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
@@ -6424,7 +7386,7 @@ CORBA::AttrDescriptionSeq::AttrDescriptionSeq (
     CORBA::ULong max
   )
   : TAO_Unbounded_Sequence<
-        CORBA::AttributeDescription
+        AttributeDescription
       >
     (max)
 {}
@@ -6436,7 +7398,7 @@ CORBA::AttrDescriptionSeq::AttrDescriptionSeq (
     CORBA::Boolean release
   )
   : TAO_Unbounded_Sequence<
-        CORBA::AttributeDescription
+        AttributeDescription
       >
     (max, length, buffer, release)
 {}
@@ -6445,7 +7407,7 @@ CORBA::AttrDescriptionSeq::AttrDescriptionSeq (
     const AttrDescriptionSeq &seq
   )
   : TAO_Unbounded_Sequence<
-        CORBA::AttributeDescription
+        AttributeDescription
       >
     (seq)
 {}
@@ -6464,6 +7426,54 @@ void CORBA::AttrDescriptionSeq::_tao_any_destructor (
 
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/alias_typecode.cpp:50
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+
+#ifndef _TAO_TYPECODE_CORBA_AttrDescriptionSeq_GUARD
+#define _TAO_TYPECODE_CORBA_AttrDescriptionSeq_GUARD
+namespace TAO
+{
+  namespace TypeCode
+  {
+    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
+      CORBA_AttrDescriptionSeq_0 (
+        CORBA::tk_sequence,
+        &CORBA::_tc_AttributeDescription,
+        0U);
+      
+    ::CORBA::TypeCode_ptr const tc_CORBA_AttrDescriptionSeq_0 =
+      &CORBA_AttrDescriptionSeq_0;
+    
+  }
+}
+
+
+#endif /* _TAO_TYPECODE_CORBA_AttrDescriptionSeq_GUARD */
+
+static TAO::TypeCode::Alias<char const *,
+                            CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_AttrDescriptionSeq (
+    CORBA::tk_alias,
+    "IDL:omg.org/CORBA/AttrDescriptionSeq:1.0",
+    "AttrDescriptionSeq",
+    &TAO::TypeCode::tc_CORBA_AttrDescriptionSeq_0);
+  
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_AttrDescriptionSeq =
+    &_tao_tc_CORBA_AttrDescriptionSeq;
+}
+
+
+
 // TAO_IDL - Generated from 
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
@@ -6477,7 +7487,7 @@ CORBA::ExtAttrDescriptionSeq::ExtAttrDescriptionSeq (
     CORBA::ULong max
   )
   : TAO_Unbounded_Sequence<
-        CORBA::ExtAttributeDescription
+        ExtAttributeDescription
       >
     (max)
 {}
@@ -6489,7 +7499,7 @@ CORBA::ExtAttrDescriptionSeq::ExtAttrDescriptionSeq (
     CORBA::Boolean release
   )
   : TAO_Unbounded_Sequence<
-        CORBA::ExtAttributeDescription
+        ExtAttributeDescription
       >
     (max, length, buffer, release)
 {}
@@ -6498,7 +7508,7 @@ CORBA::ExtAttrDescriptionSeq::ExtAttrDescriptionSeq (
     const ExtAttrDescriptionSeq &seq
   )
   : TAO_Unbounded_Sequence<
-        CORBA::ExtAttributeDescription
+        ExtAttributeDescription
       >
     (seq)
 {}
@@ -6518,6 +7528,54 @@ void CORBA::ExtAttrDescriptionSeq::_tao_any_destructor (
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
+// be\be_visitor_typecode/alias_typecode.cpp:50
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+
+#ifndef _TAO_TYPECODE_CORBA_ExtAttrDescriptionSeq_GUARD
+#define _TAO_TYPECODE_CORBA_ExtAttrDescriptionSeq_GUARD
+namespace TAO
+{
+  namespace TypeCode
+  {
+    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
+      CORBA_ExtAttrDescriptionSeq_0 (
+        CORBA::tk_sequence,
+        &CORBA::_tc_ExtAttributeDescription,
+        0U);
+      
+    ::CORBA::TypeCode_ptr const tc_CORBA_ExtAttrDescriptionSeq_0 =
+      &CORBA_ExtAttrDescriptionSeq_0;
+    
+  }
+}
+
+
+#endif /* _TAO_TYPECODE_CORBA_ExtAttrDescriptionSeq_GUARD */
+
+static TAO::TypeCode::Alias<char const *,
+                            CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ExtAttrDescriptionSeq (
+    CORBA::tk_alias,
+    "IDL:omg.org/CORBA/ExtAttrDescriptionSeq:1.0",
+    "ExtAttrDescriptionSeq",
+    &TAO::TypeCode::tc_CORBA_ExtAttrDescriptionSeq_0);
+  
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_ExtAttrDescriptionSeq =
+    &_tao_tc_CORBA_ExtAttrDescriptionSeq;
+}
+
+
+
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for CORBA::InterfaceDef.
@@ -6579,7 +7637,7 @@ TAO::Collocation_Proxy_Broker *
       CORBA_InterfaceDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::InterfaceDefSeq>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::InterfaceDefSeq>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -6623,7 +7681,7 @@ void CORBA::InterfaceDef::base_interfaces (
     }
   
   TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::InterfaceDefSeq>::in_arg_val _tao_base_interfaces (base_interfaces);
+  TAO::Arg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_val _tao_base_interfaces (base_interfaces);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -6666,7 +7724,7 @@ CORBA::Boolean CORBA::InterfaceDef::is_a (
     }
   
   TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_interface_id (interface_id);
+  TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_interface_id (interface_id);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -6689,6 +7747,50 @@ CORBA::Boolean CORBA::InterfaceDef::is_a (
   return _tao_retval.retn ();
 }
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/struct_typecode.cpp:87
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_InterfaceDef_FullInterfaceDescription[] =
+  {
+    { "name", &CORBA::_tc_Identifier },
+    { "id", &CORBA::_tc_RepositoryId },
+    { "defined_in", &CORBA::_tc_RepositoryId },
+    { "version", &CORBA::_tc_VersionSpec },
+    { "operations", &CORBA::_tc_OpDescriptionSeq },
+    { "attributes", &CORBA::_tc_AttrDescriptionSeq },
+    { "base_interfaces", &CORBA::_tc_RepositoryIdSeq },
+    { "type", &CORBA::_tc_TypeCode }
+    
+  };
+static TAO::TypeCode::Struct<char const *,
+                      CORBA::TypeCode_ptr const *,
+                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
+                      TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_InterfaceDef_FullInterfaceDescription (
+    CORBA::tk_struct,
+    "IDL:omg.org/CORBA/InterfaceDef/FullInterfaceDescription:1.0",
+    "FullInterfaceDescription",
+    _tao_fields_CORBA_InterfaceDef_FullInterfaceDescription,
+    8);
+  
+::CORBA::TypeCode_ptr const CORBA::InterfaceDef::_tc_FullInterfaceDescription =
+  &_tao_tc_CORBA_InterfaceDef_FullInterfaceDescription;
+
 // TAO_IDL - Generated from 
 // be\be_visitor_structure/structure_cs.cpp:66
 
@@ -6722,7 +7824,7 @@ CORBA::InterfaceDef::FullInterfaceDescription::_tao_any_destructor (
       CORBA_InterfaceDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::InterfaceDef::FullInterfaceDescription>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::InterfaceDef::FullInterfaceDescription>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -6769,12 +7871,12 @@ CORBA::InterfaceDef::FullInterfaceDescription::_tao_any_destructor (
       CORBA_InterfaceDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::AttributeDef>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
-  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
-  TAO::Arg_Traits< CORBA::IDLType>::in_arg_val _tao_type (type);
-  TAO::Arg_Traits< CORBA::AttributeMode>::in_arg_val _tao_mode (mode);
+  TAO::Arg_Traits< ::CORBA::AttributeDef>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id);
+  TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name);
+  TAO::Arg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version (version);
+  TAO::Arg_Traits< ::CORBA::IDLType>::in_arg_val _tao_type (type);
+  TAO::Arg_Traits< ::CORBA::AttributeMode>::in_arg_val _tao_mode (mode);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -6829,15 +7931,15 @@ CORBA::InterfaceDef::FullInterfaceDescription::_tao_any_destructor (
       CORBA_InterfaceDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::OperationDef>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
-  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
-  TAO::Arg_Traits< CORBA::IDLType>::in_arg_val _tao_result (result);
-  TAO::Arg_Traits< CORBA::OperationMode>::in_arg_val _tao_mode (mode);
-  TAO::Arg_Traits< CORBA::ParDescriptionSeq>::in_arg_val _tao_params (params);
-  TAO::Arg_Traits< CORBA::ExceptionDefSeq>::in_arg_val _tao_exceptions (exceptions);
-  TAO::Arg_Traits< CORBA::ContextIdSeq>::in_arg_val _tao_contexts (contexts);
+  TAO::Arg_Traits< ::CORBA::OperationDef>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id);
+  TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name);
+  TAO::Arg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version (version);
+  TAO::Arg_Traits< ::CORBA::IDLType>::in_arg_val _tao_result (result);
+  TAO::Arg_Traits< ::CORBA::OperationMode>::in_arg_val _tao_mode (mode);
+  TAO::Arg_Traits< ::CORBA::ParDescriptionSeq>::in_arg_val _tao_params (params);
+  TAO::Arg_Traits< ::CORBA::ExceptionDefSeq>::in_arg_val _tao_exceptions (exceptions);
+  TAO::Arg_Traits< ::CORBA::ContextIdSeq>::in_arg_val _tao_contexts (contexts);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -7000,6 +8102,60 @@ CORBA::InterfaceDef::marshal (TAO_OutputCDR &cdr)
   return (cdr << this);
 }
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:76
+
+static TAO::TypeCode::Objref<char const *,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_InterfaceDef (
+    CORBA::tk_objref,
+    "IDL:omg.org/CORBA/InterfaceDef:1.0",
+    "InterfaceDef");
+  
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_InterfaceDef =
+    &_tao_tc_CORBA_InterfaceDef;
+}
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/struct_typecode.cpp:87
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_InterfaceDescription[] =
+  {
+    { "name", &CORBA::_tc_Identifier },
+    { "id", &CORBA::_tc_RepositoryId },
+    { "defined_in", &CORBA::_tc_RepositoryId },
+    { "version", &CORBA::_tc_VersionSpec },
+    { "base_interfaces", &CORBA::_tc_RepositoryIdSeq }
+    
+  };
+static TAO::TypeCode::Struct<char const *,
+                      CORBA::TypeCode_ptr const *,
+                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
+                      TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_InterfaceDescription (
+    CORBA::tk_struct,
+    "IDL:omg.org/CORBA/InterfaceDescription:1.0",
+    "InterfaceDescription",
+    _tao_fields_CORBA_InterfaceDescription,
+    5);
+  
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_InterfaceDescription =
+    &_tao_tc_CORBA_InterfaceDescription;
+}
+
+
+
 // TAO_IDL - Generated from 
 // be\be_visitor_structure/structure_cs.cpp:66
 
@@ -7055,6 +8211,50 @@ TAO::Collocation_Proxy_Broker *
     CORBA::Object_ptr obj
   ) = 0;
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/struct_typecode.cpp:87
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_InterfaceAttrExtension_ExtFullInterfaceDescription[] =
+  {
+    { "name", &CORBA::_tc_Identifier },
+    { "id", &CORBA::_tc_RepositoryId },
+    { "defined_in", &CORBA::_tc_RepositoryId },
+    { "version", &CORBA::_tc_VersionSpec },
+    { "operations", &CORBA::_tc_OpDescriptionSeq },
+    { "attributes", &CORBA::_tc_ExtAttrDescriptionSeq },
+    { "base_interfaces", &CORBA::_tc_RepositoryIdSeq },
+    { "type", &CORBA::_tc_TypeCode }
+    
+  };
+static TAO::TypeCode::Struct<char const *,
+                      CORBA::TypeCode_ptr const *,
+                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
+                      TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_InterfaceAttrExtension_ExtFullInterfaceDescription (
+    CORBA::tk_struct,
+    "IDL:omg.org/CORBA/InterfaceAttrExtension/ExtFullInterfaceDescription:1.0",
+    "ExtFullInterfaceDescription",
+    _tao_fields_CORBA_InterfaceAttrExtension_ExtFullInterfaceDescription,
+    8);
+  
+::CORBA::TypeCode_ptr const CORBA::InterfaceAttrExtension::_tc_ExtFullInterfaceDescription =
+  &_tao_tc_CORBA_InterfaceAttrExtension_ExtFullInterfaceDescription;
+
 // TAO_IDL - Generated from 
 // be\be_visitor_structure/structure_cs.cpp:66
 
@@ -7088,7 +8288,7 @@ CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription::_tao_any_destructor
       CORBA_InterfaceAttrExtension_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -7137,14 +8337,14 @@ CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription::_tao_any_destructor
       CORBA_InterfaceAttrExtension_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::ExtAttributeDef>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
-  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
-  TAO::Arg_Traits< CORBA::IDLType>::in_arg_val _tao_type (type);
-  TAO::Arg_Traits< CORBA::AttributeMode>::in_arg_val _tao_mode (mode);
-  TAO::Arg_Traits< CORBA::ExceptionDefSeq>::in_arg_val _tao_get_exceptions (get_exceptions);
-  TAO::Arg_Traits< CORBA::ExceptionDefSeq>::in_arg_val _tao_set_exceptions (set_exceptions);
+  TAO::Arg_Traits< ::CORBA::ExtAttributeDef>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id);
+  TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name);
+  TAO::Arg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version (version);
+  TAO::Arg_Traits< ::CORBA::IDLType>::in_arg_val _tao_type (type);
+  TAO::Arg_Traits< ::CORBA::AttributeMode>::in_arg_val _tao_mode (mode);
+  TAO::Arg_Traits< ::CORBA::ExceptionDefSeq>::in_arg_val _tao_get_exceptions (get_exceptions);
+  TAO::Arg_Traits< ::CORBA::ExceptionDefSeq>::in_arg_val _tao_set_exceptions (set_exceptions);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -7287,6 +8487,24 @@ CORBA::InterfaceAttrExtension::marshal (TAO_OutputCDR &cdr)
 }
 
 // TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:76
+
+static TAO::TypeCode::Objref<char const *,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_InterfaceAttrExtension (
+    CORBA::tk_objref,
+    "IDL:omg.org/CORBA/InterfaceAttrExtension:1.0",
+    "InterfaceAttrExtension");
+  
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_InterfaceAttrExtension =
+    &_tao_tc_CORBA_InterfaceAttrExtension;
+}
+
+
+
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for CORBA::ExtInterfaceDef.
@@ -7469,6 +8687,24 @@ CORBA::ExtInterfaceDef::marshal (TAO_OutputCDR &cdr)
 }
 
 // TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:76
+
+static TAO::TypeCode::Objref<char const *,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ExtInterfaceDef (
+    CORBA::tk_objref,
+    "IDL:omg.org/CORBA/ExtInterfaceDef:1.0",
+    "ExtInterfaceDef");
+  
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_ExtInterfaceDef =
+    &_tao_tc_CORBA_ExtInterfaceDef;
+}
+
+
+
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for CORBA::AbstractInterfaceDef.
@@ -7646,6 +8882,24 @@ CORBA::AbstractInterfaceDef::marshal (TAO_OutputCDR &cdr)
 }
 
 // TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:76
+
+static TAO::TypeCode::Objref<char const *,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_AbstractInterfaceDef (
+    CORBA::tk_objref,
+    "IDL:omg.org/CORBA/AbstractInterfaceDef:1.0",
+    "AbstractInterfaceDef");
+  
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_AbstractInterfaceDef =
+    &_tao_tc_CORBA_AbstractInterfaceDef;
+}
+
+
+
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for CORBA::ExtAbstractInterfaceDef.
@@ -7832,6 +9086,24 @@ CORBA::ExtAbstractInterfaceDef::marshal (TAO_OutputCDR &cdr)
 }
 
 // TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:76
+
+static TAO::TypeCode::Objref<char const *,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ExtAbstractInterfaceDef (
+    CORBA::tk_objref,
+    "IDL:omg.org/CORBA/ExtAbstractInterfaceDef:1.0",
+    "ExtAbstractInterfaceDef");
+  
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_ExtAbstractInterfaceDef =
+    &_tao_tc_CORBA_ExtAbstractInterfaceDef;
+}
+
+
+
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for CORBA::LocalInterfaceDef.
@@ -8009,6 +9281,24 @@ CORBA::LocalInterfaceDef::marshal (TAO_OutputCDR &cdr)
 }
 
 // TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:76
+
+static TAO::TypeCode::Objref<char const *,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_LocalInterfaceDef (
+    CORBA::tk_objref,
+    "IDL:omg.org/CORBA/LocalInterfaceDef:1.0",
+    "LocalInterfaceDef");
+  
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_LocalInterfaceDef =
+    &_tao_tc_CORBA_LocalInterfaceDef;
+}
+
+
+
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for CORBA::ExtLocalInterfaceDef.
@@ -8195,6 +9485,2435 @@ CORBA::ExtLocalInterfaceDef::marshal (TAO_OutputCDR &cdr)
 }
 
 // TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:76
+
+static TAO::TypeCode::Objref<char const *,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ExtLocalInterfaceDef (
+    CORBA::tk_objref,
+    "IDL:omg.org/CORBA/ExtLocalInterfaceDef:1.0",
+    "ExtLocalInterfaceDef");
+  
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_ExtLocalInterfaceDef =
+    &_tao_tc_CORBA_ExtLocalInterfaceDef;
+}
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_enum/any_op_cs.cpp:52
+
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::PrimitiveKind _tao_elem
+  )
+{
+  TAO::Any_Basic_Impl_T<CORBA::PrimitiveKind>::insert (
+      _tao_any,
+      CORBA::_tc_PrimitiveKind,
+      _tao_elem
+    );
+}
+
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::PrimitiveKind &_tao_elem
+  )
+{
+  return
+    TAO::Any_Basic_Impl_T<CORBA::PrimitiveKind>::extract (
+        _tao_any,
+        CORBA::_tc_PrimitiveKind,
+        _tao_elem 
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+namespace TAO
+{
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<CORBA::Repository>::to_object (
+      CORBA::Object_ptr &_tao_elem
+    ) const
+  {
+    _tao_elem = CORBA::Object::_duplicate (this->value_);
+    return true;
+  }
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::Repository_ptr _tao_elem
+  )
+{
+  CORBA::Repository_ptr _tao_objptr =
+    CORBA::Repository::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::Repository_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<CORBA::Repository>::insert (
+      _tao_any,
+      CORBA::Repository::_tao_any_destructor,
+      CORBA::_tc_Repository,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::Repository_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<CORBA::Repository>::extract (
+        _tao_any,
+        CORBA::Repository::_tao_any_destructor,
+        CORBA::_tc_Repository,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+namespace TAO
+{
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<CORBA::ModuleDef>::to_object (
+      CORBA::Object_ptr &_tao_elem
+    ) const
+  {
+    _tao_elem = CORBA::Object::_duplicate (this->value_);
+    return true;
+  }
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ModuleDef_ptr _tao_elem
+  )
+{
+  CORBA::ModuleDef_ptr _tao_objptr =
+    CORBA::ModuleDef::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ModuleDef_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<CORBA::ModuleDef>::insert (
+      _tao_any,
+      CORBA::ModuleDef::_tao_any_destructor,
+      CORBA::_tc_ModuleDef,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::ModuleDef_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<CORBA::ModuleDef>::extract (
+        _tao_any,
+        CORBA::ModuleDef::_tao_any_destructor,
+        CORBA::_tc_ModuleDef,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from 
+// be\be_visitor_structure/any_op_cs.cpp:54
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const CORBA::ModuleDescription &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::ModuleDescription>::insert_copy (
+      _tao_any,
+      CORBA::ModuleDescription::_tao_any_destructor,
+      CORBA::_tc_ModuleDescription,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ModuleDescription *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::ModuleDescription>::insert (
+      _tao_any,
+      CORBA::ModuleDescription::_tao_any_destructor,
+      CORBA::_tc_ModuleDescription,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::ModuleDescription *&_tao_elem
+  )
+{
+  return _tao_any >>= const_cast<
+      const CORBA::ModuleDescription *&> (
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CORBA::ModuleDescription *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<CORBA::ModuleDescription>::extract (
+        _tao_any,
+        CORBA::ModuleDescription::_tao_any_destructor,
+        CORBA::_tc_ModuleDescription,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+namespace TAO
+{
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<CORBA::ConstantDef>::to_object (
+      CORBA::Object_ptr &_tao_elem
+    ) const
+  {
+    _tao_elem = CORBA::Object::_duplicate (this->value_);
+    return true;
+  }
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ConstantDef_ptr _tao_elem
+  )
+{
+  CORBA::ConstantDef_ptr _tao_objptr =
+    CORBA::ConstantDef::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ConstantDef_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<CORBA::ConstantDef>::insert (
+      _tao_any,
+      CORBA::ConstantDef::_tao_any_destructor,
+      CORBA::_tc_ConstantDef,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::ConstantDef_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<CORBA::ConstantDef>::extract (
+        _tao_any,
+        CORBA::ConstantDef::_tao_any_destructor,
+        CORBA::_tc_ConstantDef,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from 
+// be\be_visitor_structure/any_op_cs.cpp:54
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const CORBA::ConstantDescription &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::ConstantDescription>::insert_copy (
+      _tao_any,
+      CORBA::ConstantDescription::_tao_any_destructor,
+      CORBA::_tc_ConstantDescription,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ConstantDescription *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::ConstantDescription>::insert (
+      _tao_any,
+      CORBA::ConstantDescription::_tao_any_destructor,
+      CORBA::_tc_ConstantDescription,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::ConstantDescription *&_tao_elem
+  )
+{
+  return _tao_any >>= const_cast<
+      const CORBA::ConstantDescription *&> (
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CORBA::ConstantDescription *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<CORBA::ConstantDescription>::extract (
+        _tao_any,
+        CORBA::ConstantDescription::_tao_any_destructor,
+        CORBA::_tc_ConstantDescription,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+namespace TAO
+{
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<CORBA::StructDef>::to_object (
+      CORBA::Object_ptr &_tao_elem
+    ) const
+  {
+    _tao_elem = CORBA::Object::_duplicate (this->value_);
+    return true;
+  }
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::StructDef_ptr _tao_elem
+  )
+{
+  CORBA::StructDef_ptr _tao_objptr =
+    CORBA::StructDef::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::StructDef_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<CORBA::StructDef>::insert (
+      _tao_any,
+      CORBA::StructDef::_tao_any_destructor,
+      CORBA::_tc_StructDef,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::StructDef_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<CORBA::StructDef>::extract (
+        _tao_any,
+        CORBA::StructDef::_tao_any_destructor,
+        CORBA::_tc_StructDef,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+namespace TAO
+{
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<CORBA::UnionDef>::to_object (
+      CORBA::Object_ptr &_tao_elem
+    ) const
+  {
+    _tao_elem = CORBA::Object::_duplicate (this->value_);
+    return true;
+  }
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::UnionDef_ptr _tao_elem
+  )
+{
+  CORBA::UnionDef_ptr _tao_objptr =
+    CORBA::UnionDef::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::UnionDef_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<CORBA::UnionDef>::insert (
+      _tao_any,
+      CORBA::UnionDef::_tao_any_destructor,
+      CORBA::_tc_UnionDef,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::UnionDef_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<CORBA::UnionDef>::extract (
+        _tao_any,
+        CORBA::UnionDef::_tao_any_destructor,
+        CORBA::_tc_UnionDef,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+namespace TAO
+{
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<CORBA::EnumDef>::to_object (
+      CORBA::Object_ptr &_tao_elem
+    ) const
+  {
+    _tao_elem = CORBA::Object::_duplicate (this->value_);
+    return true;
+  }
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::EnumDef_ptr _tao_elem
+  )
+{
+  CORBA::EnumDef_ptr _tao_objptr =
+    CORBA::EnumDef::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::EnumDef_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<CORBA::EnumDef>::insert (
+      _tao_any,
+      CORBA::EnumDef::_tao_any_destructor,
+      CORBA::_tc_EnumDef,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::EnumDef_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<CORBA::EnumDef>::extract (
+        _tao_any,
+        CORBA::EnumDef::_tao_any_destructor,
+        CORBA::_tc_EnumDef,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+namespace TAO
+{
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<CORBA::AliasDef>::to_object (
+      CORBA::Object_ptr &_tao_elem
+    ) const
+  {
+    _tao_elem = CORBA::Object::_duplicate (this->value_);
+    return true;
+  }
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::AliasDef_ptr _tao_elem
+  )
+{
+  CORBA::AliasDef_ptr _tao_objptr =
+    CORBA::AliasDef::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::AliasDef_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<CORBA::AliasDef>::insert (
+      _tao_any,
+      CORBA::AliasDef::_tao_any_destructor,
+      CORBA::_tc_AliasDef,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::AliasDef_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<CORBA::AliasDef>::extract (
+        _tao_any,
+        CORBA::AliasDef::_tao_any_destructor,
+        CORBA::_tc_AliasDef,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+namespace TAO
+{
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<CORBA::NativeDef>::to_object (
+      CORBA::Object_ptr &_tao_elem
+    ) const
+  {
+    _tao_elem = CORBA::Object::_duplicate (this->value_);
+    return true;
+  }
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::NativeDef_ptr _tao_elem
+  )
+{
+  CORBA::NativeDef_ptr _tao_objptr =
+    CORBA::NativeDef::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::NativeDef_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<CORBA::NativeDef>::insert (
+      _tao_any,
+      CORBA::NativeDef::_tao_any_destructor,
+      CORBA::_tc_NativeDef,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::NativeDef_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<CORBA::NativeDef>::extract (
+        _tao_any,
+        CORBA::NativeDef::_tao_any_destructor,
+        CORBA::_tc_NativeDef,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+namespace TAO
+{
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<CORBA::PrimitiveDef>::to_object (
+      CORBA::Object_ptr &_tao_elem
+    ) const
+  {
+    _tao_elem = CORBA::Object::_duplicate (this->value_);
+    return true;
+  }
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::PrimitiveDef_ptr _tao_elem
+  )
+{
+  CORBA::PrimitiveDef_ptr _tao_objptr =
+    CORBA::PrimitiveDef::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::PrimitiveDef_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<CORBA::PrimitiveDef>::insert (
+      _tao_any,
+      CORBA::PrimitiveDef::_tao_any_destructor,
+      CORBA::_tc_PrimitiveDef,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::PrimitiveDef_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<CORBA::PrimitiveDef>::extract (
+        _tao_any,
+        CORBA::PrimitiveDef::_tao_any_destructor,
+        CORBA::_tc_PrimitiveDef,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+namespace TAO
+{
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<CORBA::StringDef>::to_object (
+      CORBA::Object_ptr &_tao_elem
+    ) const
+  {
+    _tao_elem = CORBA::Object::_duplicate (this->value_);
+    return true;
+  }
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::StringDef_ptr _tao_elem
+  )
+{
+  CORBA::StringDef_ptr _tao_objptr =
+    CORBA::StringDef::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::StringDef_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<CORBA::StringDef>::insert (
+      _tao_any,
+      CORBA::StringDef::_tao_any_destructor,
+      CORBA::_tc_StringDef,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::StringDef_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<CORBA::StringDef>::extract (
+        _tao_any,
+        CORBA::StringDef::_tao_any_destructor,
+        CORBA::_tc_StringDef,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+namespace TAO
+{
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<CORBA::WstringDef>::to_object (
+      CORBA::Object_ptr &_tao_elem
+    ) const
+  {
+    _tao_elem = CORBA::Object::_duplicate (this->value_);
+    return true;
+  }
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::WstringDef_ptr _tao_elem
+  )
+{
+  CORBA::WstringDef_ptr _tao_objptr =
+    CORBA::WstringDef::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::WstringDef_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<CORBA::WstringDef>::insert (
+      _tao_any,
+      CORBA::WstringDef::_tao_any_destructor,
+      CORBA::_tc_WstringDef,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::WstringDef_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<CORBA::WstringDef>::extract (
+        _tao_any,
+        CORBA::WstringDef::_tao_any_destructor,
+        CORBA::_tc_WstringDef,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+namespace TAO
+{
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<CORBA::SequenceDef>::to_object (
+      CORBA::Object_ptr &_tao_elem
+    ) const
+  {
+    _tao_elem = CORBA::Object::_duplicate (this->value_);
+    return true;
+  }
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::SequenceDef_ptr _tao_elem
+  )
+{
+  CORBA::SequenceDef_ptr _tao_objptr =
+    CORBA::SequenceDef::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::SequenceDef_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<CORBA::SequenceDef>::insert (
+      _tao_any,
+      CORBA::SequenceDef::_tao_any_destructor,
+      CORBA::_tc_SequenceDef,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::SequenceDef_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<CORBA::SequenceDef>::extract (
+        _tao_any,
+        CORBA::SequenceDef::_tao_any_destructor,
+        CORBA::_tc_SequenceDef,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+namespace TAO
+{
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<CORBA::ArrayDef>::to_object (
+      CORBA::Object_ptr &_tao_elem
+    ) const
+  {
+    _tao_elem = CORBA::Object::_duplicate (this->value_);
+    return true;
+  }
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ArrayDef_ptr _tao_elem
+  )
+{
+  CORBA::ArrayDef_ptr _tao_objptr =
+    CORBA::ArrayDef::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ArrayDef_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<CORBA::ArrayDef>::insert (
+      _tao_any,
+      CORBA::ArrayDef::_tao_any_destructor,
+      CORBA::_tc_ArrayDef,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::ArrayDef_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<CORBA::ArrayDef>::extract (
+        _tao_any,
+        CORBA::ArrayDef::_tao_any_destructor,
+        CORBA::_tc_ArrayDef,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+namespace TAO
+{
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<CORBA::ExceptionDef>::to_object (
+      CORBA::Object_ptr &_tao_elem
+    ) const
+  {
+    _tao_elem = CORBA::Object::_duplicate (this->value_);
+    return true;
+  }
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ExceptionDef_ptr _tao_elem
+  )
+{
+  CORBA::ExceptionDef_ptr _tao_objptr =
+    CORBA::ExceptionDef::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ExceptionDef_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<CORBA::ExceptionDef>::insert (
+      _tao_any,
+      CORBA::ExceptionDef::_tao_any_destructor,
+      CORBA::_tc_ExceptionDef,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::ExceptionDef_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<CORBA::ExceptionDef>::extract (
+        _tao_any,
+        CORBA::ExceptionDef::_tao_any_destructor,
+        CORBA::_tc_ExceptionDef,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from 
+// be\be_visitor_sequence/any_op_cs.cpp:54
+
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const CORBA::ExceptionDefSeq &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::ExceptionDefSeq>::insert_copy (
+      _tao_any,
+      CORBA::ExceptionDefSeq::_tao_any_destructor,
+      TAO::TypeCode::tc_CORBA_ExceptionDefSeq_0,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ExceptionDefSeq *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::ExceptionDefSeq>::insert (
+      _tao_any,
+      CORBA::ExceptionDefSeq::_tao_any_destructor,
+      TAO::TypeCode::tc_CORBA_ExceptionDefSeq_0,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::ExceptionDefSeq *&_tao_elem
+  )
+{
+  return _tao_any >>= const_cast<
+      const CORBA::ExceptionDefSeq *&> (
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CORBA::ExceptionDefSeq *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<CORBA::ExceptionDefSeq>::extract (
+        _tao_any,
+        CORBA::ExceptionDefSeq::_tao_any_destructor,
+        TAO::TypeCode::tc_CORBA_ExceptionDefSeq_0,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_enum/any_op_cs.cpp:52
+
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::AttributeMode _tao_elem
+  )
+{
+  TAO::Any_Basic_Impl_T<CORBA::AttributeMode>::insert (
+      _tao_any,
+      CORBA::_tc_AttributeMode,
+      _tao_elem
+    );
+}
+
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::AttributeMode &_tao_elem
+  )
+{
+  return
+    TAO::Any_Basic_Impl_T<CORBA::AttributeMode>::extract (
+        _tao_any,
+        CORBA::_tc_AttributeMode,
+        _tao_elem 
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+namespace TAO
+{
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<CORBA::AttributeDef>::to_object (
+      CORBA::Object_ptr &_tao_elem
+    ) const
+  {
+    _tao_elem = CORBA::Object::_duplicate (this->value_);
+    return true;
+  }
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::AttributeDef_ptr _tao_elem
+  )
+{
+  CORBA::AttributeDef_ptr _tao_objptr =
+    CORBA::AttributeDef::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::AttributeDef_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<CORBA::AttributeDef>::insert (
+      _tao_any,
+      CORBA::AttributeDef::_tao_any_destructor,
+      CORBA::_tc_AttributeDef,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::AttributeDef_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<CORBA::AttributeDef>::extract (
+        _tao_any,
+        CORBA::AttributeDef::_tao_any_destructor,
+        CORBA::_tc_AttributeDef,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from 
+// be\be_visitor_structure/any_op_cs.cpp:54
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const CORBA::AttributeDescription &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::AttributeDescription>::insert_copy (
+      _tao_any,
+      CORBA::AttributeDescription::_tao_any_destructor,
+      CORBA::_tc_AttributeDescription,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::AttributeDescription *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::AttributeDescription>::insert (
+      _tao_any,
+      CORBA::AttributeDescription::_tao_any_destructor,
+      CORBA::_tc_AttributeDescription,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::AttributeDescription *&_tao_elem
+  )
+{
+  return _tao_any >>= const_cast<
+      const CORBA::AttributeDescription *&> (
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CORBA::AttributeDescription *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<CORBA::AttributeDescription>::extract (
+        _tao_any,
+        CORBA::AttributeDescription::_tao_any_destructor,
+        CORBA::_tc_AttributeDescription,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from 
+// be\be_visitor_structure/any_op_cs.cpp:54
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const CORBA::ExtAttributeDescription &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::ExtAttributeDescription>::insert_copy (
+      _tao_any,
+      CORBA::ExtAttributeDescription::_tao_any_destructor,
+      CORBA::_tc_ExtAttributeDescription,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ExtAttributeDescription *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::ExtAttributeDescription>::insert (
+      _tao_any,
+      CORBA::ExtAttributeDescription::_tao_any_destructor,
+      CORBA::_tc_ExtAttributeDescription,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::ExtAttributeDescription *&_tao_elem
+  )
+{
+  return _tao_any >>= const_cast<
+      const CORBA::ExtAttributeDescription *&> (
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CORBA::ExtAttributeDescription *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<CORBA::ExtAttributeDescription>::extract (
+        _tao_any,
+        CORBA::ExtAttributeDescription::_tao_any_destructor,
+        CORBA::_tc_ExtAttributeDescription,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+namespace TAO
+{
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<CORBA::ExtAttributeDef>::to_object (
+      CORBA::Object_ptr &_tao_elem
+    ) const
+  {
+    _tao_elem = CORBA::Object::_duplicate (this->value_);
+    return true;
+  }
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ExtAttributeDef_ptr _tao_elem
+  )
+{
+  CORBA::ExtAttributeDef_ptr _tao_objptr =
+    CORBA::ExtAttributeDef::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ExtAttributeDef_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<CORBA::ExtAttributeDef>::insert (
+      _tao_any,
+      CORBA::ExtAttributeDef::_tao_any_destructor,
+      CORBA::_tc_ExtAttributeDef,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::ExtAttributeDef_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<CORBA::ExtAttributeDef>::extract (
+        _tao_any,
+        CORBA::ExtAttributeDef::_tao_any_destructor,
+        CORBA::_tc_ExtAttributeDef,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_enum/any_op_cs.cpp:52
+
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::OperationMode _tao_elem
+  )
+{
+  TAO::Any_Basic_Impl_T<CORBA::OperationMode>::insert (
+      _tao_any,
+      CORBA::_tc_OperationMode,
+      _tao_elem
+    );
+}
+
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::OperationMode &_tao_elem
+  )
+{
+  return
+    TAO::Any_Basic_Impl_T<CORBA::OperationMode>::extract (
+        _tao_any,
+        CORBA::_tc_OperationMode,
+        _tao_elem 
+      );
+}
+
+// TAO_IDL - Generated from 
+// be\be_visitor_structure/any_op_cs.cpp:54
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const CORBA::ParameterDescription &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::ParameterDescription>::insert_copy (
+      _tao_any,
+      CORBA::ParameterDescription::_tao_any_destructor,
+      CORBA::_tc_ParameterDescription,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ParameterDescription *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::ParameterDescription>::insert (
+      _tao_any,
+      CORBA::ParameterDescription::_tao_any_destructor,
+      CORBA::_tc_ParameterDescription,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::ParameterDescription *&_tao_elem
+  )
+{
+  return _tao_any >>= const_cast<
+      const CORBA::ParameterDescription *&> (
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CORBA::ParameterDescription *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<CORBA::ParameterDescription>::extract (
+        _tao_any,
+        CORBA::ParameterDescription::_tao_any_destructor,
+        CORBA::_tc_ParameterDescription,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from 
+// be\be_visitor_sequence/any_op_cs.cpp:54
+
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const CORBA::ParDescriptionSeq &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::ParDescriptionSeq>::insert_copy (
+      _tao_any,
+      CORBA::ParDescriptionSeq::_tao_any_destructor,
+      TAO::TypeCode::tc_CORBA_ParDescriptionSeq_0,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ParDescriptionSeq *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::ParDescriptionSeq>::insert (
+      _tao_any,
+      CORBA::ParDescriptionSeq::_tao_any_destructor,
+      TAO::TypeCode::tc_CORBA_ParDescriptionSeq_0,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::ParDescriptionSeq *&_tao_elem
+  )
+{
+  return _tao_any >>= const_cast<
+      const CORBA::ParDescriptionSeq *&> (
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CORBA::ParDescriptionSeq *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<CORBA::ParDescriptionSeq>::extract (
+        _tao_any,
+        CORBA::ParDescriptionSeq::_tao_any_destructor,
+        TAO::TypeCode::tc_CORBA_ParDescriptionSeq_0,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from 
+// be\be_visitor_sequence/any_op_cs.cpp:54
+
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const CORBA::ContextIdSeq &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::ContextIdSeq>::insert_copy (
+      _tao_any,
+      CORBA::ContextIdSeq::_tao_any_destructor,
+      TAO::TypeCode::tc_CORBA_ContextIdSeq_0,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ContextIdSeq *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::ContextIdSeq>::insert (
+      _tao_any,
+      CORBA::ContextIdSeq::_tao_any_destructor,
+      TAO::TypeCode::tc_CORBA_ContextIdSeq_0,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::ContextIdSeq *&_tao_elem
+  )
+{
+  return _tao_any >>= const_cast<
+      const CORBA::ContextIdSeq *&> (
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CORBA::ContextIdSeq *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<CORBA::ContextIdSeq>::extract (
+        _tao_any,
+        CORBA::ContextIdSeq::_tao_any_destructor,
+        TAO::TypeCode::tc_CORBA_ContextIdSeq_0,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+namespace TAO
+{
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<CORBA::OperationDef>::to_object (
+      CORBA::Object_ptr &_tao_elem
+    ) const
+  {
+    _tao_elem = CORBA::Object::_duplicate (this->value_);
+    return true;
+  }
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::OperationDef_ptr _tao_elem
+  )
+{
+  CORBA::OperationDef_ptr _tao_objptr =
+    CORBA::OperationDef::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::OperationDef_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<CORBA::OperationDef>::insert (
+      _tao_any,
+      CORBA::OperationDef::_tao_any_destructor,
+      CORBA::_tc_OperationDef,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::OperationDef_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<CORBA::OperationDef>::extract (
+        _tao_any,
+        CORBA::OperationDef::_tao_any_destructor,
+        CORBA::_tc_OperationDef,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from 
+// be\be_visitor_structure/any_op_cs.cpp:54
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const CORBA::OperationDescription &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::OperationDescription>::insert_copy (
+      _tao_any,
+      CORBA::OperationDescription::_tao_any_destructor,
+      CORBA::_tc_OperationDescription,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::OperationDescription *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::OperationDescription>::insert (
+      _tao_any,
+      CORBA::OperationDescription::_tao_any_destructor,
+      CORBA::_tc_OperationDescription,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::OperationDescription *&_tao_elem
+  )
+{
+  return _tao_any >>= const_cast<
+      const CORBA::OperationDescription *&> (
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CORBA::OperationDescription *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<CORBA::OperationDescription>::extract (
+        _tao_any,
+        CORBA::OperationDescription::_tao_any_destructor,
+        CORBA::_tc_OperationDescription,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from 
+// be\be_visitor_sequence/any_op_cs.cpp:54
+
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const CORBA::RepositoryIdSeq &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::RepositoryIdSeq>::insert_copy (
+      _tao_any,
+      CORBA::RepositoryIdSeq::_tao_any_destructor,
+      TAO::TypeCode::tc_CORBA_RepositoryIdSeq_0,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::RepositoryIdSeq *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::RepositoryIdSeq>::insert (
+      _tao_any,
+      CORBA::RepositoryIdSeq::_tao_any_destructor,
+      TAO::TypeCode::tc_CORBA_RepositoryIdSeq_0,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::RepositoryIdSeq *&_tao_elem
+  )
+{
+  return _tao_any >>= const_cast<
+      const CORBA::RepositoryIdSeq *&> (
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CORBA::RepositoryIdSeq *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<CORBA::RepositoryIdSeq>::extract (
+        _tao_any,
+        CORBA::RepositoryIdSeq::_tao_any_destructor,
+        TAO::TypeCode::tc_CORBA_RepositoryIdSeq_0,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from 
+// be\be_visitor_sequence/any_op_cs.cpp:54
+
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const CORBA::OpDescriptionSeq &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::OpDescriptionSeq>::insert_copy (
+      _tao_any,
+      CORBA::OpDescriptionSeq::_tao_any_destructor,
+      TAO::TypeCode::tc_CORBA_OpDescriptionSeq_0,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::OpDescriptionSeq *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::OpDescriptionSeq>::insert (
+      _tao_any,
+      CORBA::OpDescriptionSeq::_tao_any_destructor,
+      TAO::TypeCode::tc_CORBA_OpDescriptionSeq_0,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::OpDescriptionSeq *&_tao_elem
+  )
+{
+  return _tao_any >>= const_cast<
+      const CORBA::OpDescriptionSeq *&> (
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CORBA::OpDescriptionSeq *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<CORBA::OpDescriptionSeq>::extract (
+        _tao_any,
+        CORBA::OpDescriptionSeq::_tao_any_destructor,
+        TAO::TypeCode::tc_CORBA_OpDescriptionSeq_0,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from 
+// be\be_visitor_sequence/any_op_cs.cpp:54
+
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const CORBA::AttrDescriptionSeq &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::AttrDescriptionSeq>::insert_copy (
+      _tao_any,
+      CORBA::AttrDescriptionSeq::_tao_any_destructor,
+      TAO::TypeCode::tc_CORBA_AttrDescriptionSeq_0,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::AttrDescriptionSeq *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::AttrDescriptionSeq>::insert (
+      _tao_any,
+      CORBA::AttrDescriptionSeq::_tao_any_destructor,
+      TAO::TypeCode::tc_CORBA_AttrDescriptionSeq_0,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::AttrDescriptionSeq *&_tao_elem
+  )
+{
+  return _tao_any >>= const_cast<
+      const CORBA::AttrDescriptionSeq *&> (
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CORBA::AttrDescriptionSeq *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<CORBA::AttrDescriptionSeq>::extract (
+        _tao_any,
+        CORBA::AttrDescriptionSeq::_tao_any_destructor,
+        TAO::TypeCode::tc_CORBA_AttrDescriptionSeq_0,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from 
+// be\be_visitor_sequence/any_op_cs.cpp:54
+
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const CORBA::ExtAttrDescriptionSeq &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::ExtAttrDescriptionSeq>::insert_copy (
+      _tao_any,
+      CORBA::ExtAttrDescriptionSeq::_tao_any_destructor,
+      TAO::TypeCode::tc_CORBA_ExtAttrDescriptionSeq_0,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ExtAttrDescriptionSeq *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::ExtAttrDescriptionSeq>::insert (
+      _tao_any,
+      CORBA::ExtAttrDescriptionSeq::_tao_any_destructor,
+      TAO::TypeCode::tc_CORBA_ExtAttrDescriptionSeq_0,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::ExtAttrDescriptionSeq *&_tao_elem
+  )
+{
+  return _tao_any >>= const_cast<
+      const CORBA::ExtAttrDescriptionSeq *&> (
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CORBA::ExtAttrDescriptionSeq *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<CORBA::ExtAttrDescriptionSeq>::extract (
+        _tao_any,
+        CORBA::ExtAttrDescriptionSeq::_tao_any_destructor,
+        TAO::TypeCode::tc_CORBA_ExtAttrDescriptionSeq_0,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+namespace TAO
+{
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<CORBA::InterfaceDef>::to_object (
+      CORBA::Object_ptr &_tao_elem
+    ) const
+  {
+    _tao_elem = CORBA::Object::_duplicate (this->value_);
+    return true;
+  }
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::InterfaceDef_ptr _tao_elem
+  )
+{
+  CORBA::InterfaceDef_ptr _tao_objptr =
+    CORBA::InterfaceDef::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::InterfaceDef_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<CORBA::InterfaceDef>::insert (
+      _tao_any,
+      CORBA::InterfaceDef::_tao_any_destructor,
+      CORBA::_tc_InterfaceDef,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::InterfaceDef_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<CORBA::InterfaceDef>::extract (
+        _tao_any,
+        CORBA::InterfaceDef::_tao_any_destructor,
+        CORBA::_tc_InterfaceDef,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from 
+// be\be_visitor_structure/any_op_cs.cpp:54
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const CORBA::InterfaceDef::FullInterfaceDescription &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::InterfaceDef::FullInterfaceDescription>::insert_copy (
+      _tao_any,
+      CORBA::InterfaceDef::FullInterfaceDescription::_tao_any_destructor,
+      CORBA::InterfaceDef::_tc_FullInterfaceDescription,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::InterfaceDef::FullInterfaceDescription *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::InterfaceDef::FullInterfaceDescription>::insert (
+      _tao_any,
+      CORBA::InterfaceDef::FullInterfaceDescription::_tao_any_destructor,
+      CORBA::InterfaceDef::_tc_FullInterfaceDescription,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::InterfaceDef::FullInterfaceDescription *&_tao_elem
+  )
+{
+  return _tao_any >>= const_cast<
+      const CORBA::InterfaceDef::FullInterfaceDescription *&> (
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CORBA::InterfaceDef::FullInterfaceDescription *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<CORBA::InterfaceDef::FullInterfaceDescription>::extract (
+        _tao_any,
+        CORBA::InterfaceDef::FullInterfaceDescription::_tao_any_destructor,
+        CORBA::InterfaceDef::_tc_FullInterfaceDescription,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from 
+// be\be_visitor_structure/any_op_cs.cpp:54
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const CORBA::InterfaceDescription &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::InterfaceDescription>::insert_copy (
+      _tao_any,
+      CORBA::InterfaceDescription::_tao_any_destructor,
+      CORBA::_tc_InterfaceDescription,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::InterfaceDescription *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::InterfaceDescription>::insert (
+      _tao_any,
+      CORBA::InterfaceDescription::_tao_any_destructor,
+      CORBA::_tc_InterfaceDescription,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::InterfaceDescription *&_tao_elem
+  )
+{
+  return _tao_any >>= const_cast<
+      const CORBA::InterfaceDescription *&> (
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CORBA::InterfaceDescription *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<CORBA::InterfaceDescription>::extract (
+        _tao_any,
+        CORBA::InterfaceDescription::_tao_any_destructor,
+        CORBA::_tc_InterfaceDescription,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+namespace TAO
+{
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<CORBA::InterfaceAttrExtension>::to_object (
+      CORBA::Object_ptr &_tao_elem
+    ) const
+  {
+    _tao_elem = CORBA::Object::_duplicate (this->value_);
+    return true;
+  }
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::InterfaceAttrExtension_ptr _tao_elem
+  )
+{
+  CORBA::InterfaceAttrExtension_ptr _tao_objptr =
+    CORBA::InterfaceAttrExtension::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::InterfaceAttrExtension_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<CORBA::InterfaceAttrExtension>::insert (
+      _tao_any,
+      CORBA::InterfaceAttrExtension::_tao_any_destructor,
+      CORBA::_tc_InterfaceAttrExtension,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::InterfaceAttrExtension_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<CORBA::InterfaceAttrExtension>::extract (
+        _tao_any,
+        CORBA::InterfaceAttrExtension::_tao_any_destructor,
+        CORBA::_tc_InterfaceAttrExtension,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from 
+// be\be_visitor_structure/any_op_cs.cpp:54
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription>::insert_copy (
+      _tao_any,
+      CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription::_tao_any_destructor,
+      CORBA::InterfaceAttrExtension::_tc_ExtFullInterfaceDescription,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription>::insert (
+      _tao_any,
+      CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription::_tao_any_destructor,
+      CORBA::InterfaceAttrExtension::_tc_ExtFullInterfaceDescription,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription *&_tao_elem
+  )
+{
+  return _tao_any >>= const_cast<
+      const CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription *&> (
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription>::extract (
+        _tao_any,
+        CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription::_tao_any_destructor,
+        CORBA::InterfaceAttrExtension::_tc_ExtFullInterfaceDescription,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+namespace TAO
+{
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<CORBA::ExtInterfaceDef>::to_object (
+      CORBA::Object_ptr &_tao_elem
+    ) const
+  {
+    _tao_elem = CORBA::Object::_duplicate (this->value_);
+    return true;
+  }
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ExtInterfaceDef_ptr _tao_elem
+  )
+{
+  CORBA::ExtInterfaceDef_ptr _tao_objptr =
+    CORBA::ExtInterfaceDef::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ExtInterfaceDef_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<CORBA::ExtInterfaceDef>::insert (
+      _tao_any,
+      CORBA::ExtInterfaceDef::_tao_any_destructor,
+      CORBA::_tc_ExtInterfaceDef,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::ExtInterfaceDef_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<CORBA::ExtInterfaceDef>::extract (
+        _tao_any,
+        CORBA::ExtInterfaceDef::_tao_any_destructor,
+        CORBA::_tc_ExtInterfaceDef,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+namespace TAO
+{
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<CORBA::AbstractInterfaceDef>::to_object (
+      CORBA::Object_ptr &_tao_elem
+    ) const
+  {
+    _tao_elem = CORBA::Object::_duplicate (this->value_);
+    return true;
+  }
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::AbstractInterfaceDef_ptr _tao_elem
+  )
+{
+  CORBA::AbstractInterfaceDef_ptr _tao_objptr =
+    CORBA::AbstractInterfaceDef::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::AbstractInterfaceDef_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<CORBA::AbstractInterfaceDef>::insert (
+      _tao_any,
+      CORBA::AbstractInterfaceDef::_tao_any_destructor,
+      CORBA::_tc_AbstractInterfaceDef,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::AbstractInterfaceDef_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<CORBA::AbstractInterfaceDef>::extract (
+        _tao_any,
+        CORBA::AbstractInterfaceDef::_tao_any_destructor,
+        CORBA::_tc_AbstractInterfaceDef,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+namespace TAO
+{
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<CORBA::ExtAbstractInterfaceDef>::to_object (
+      CORBA::Object_ptr &_tao_elem
+    ) const
+  {
+    _tao_elem = CORBA::Object::_duplicate (this->value_);
+    return true;
+  }
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ExtAbstractInterfaceDef_ptr _tao_elem
+  )
+{
+  CORBA::ExtAbstractInterfaceDef_ptr _tao_objptr =
+    CORBA::ExtAbstractInterfaceDef::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ExtAbstractInterfaceDef_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<CORBA::ExtAbstractInterfaceDef>::insert (
+      _tao_any,
+      CORBA::ExtAbstractInterfaceDef::_tao_any_destructor,
+      CORBA::_tc_ExtAbstractInterfaceDef,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::ExtAbstractInterfaceDef_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<CORBA::ExtAbstractInterfaceDef>::extract (
+        _tao_any,
+        CORBA::ExtAbstractInterfaceDef::_tao_any_destructor,
+        CORBA::_tc_ExtAbstractInterfaceDef,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+namespace TAO
+{
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<CORBA::LocalInterfaceDef>::to_object (
+      CORBA::Object_ptr &_tao_elem
+    ) const
+  {
+    _tao_elem = CORBA::Object::_duplicate (this->value_);
+    return true;
+  }
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::LocalInterfaceDef_ptr _tao_elem
+  )
+{
+  CORBA::LocalInterfaceDef_ptr _tao_objptr =
+    CORBA::LocalInterfaceDef::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::LocalInterfaceDef_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<CORBA::LocalInterfaceDef>::insert (
+      _tao_any,
+      CORBA::LocalInterfaceDef::_tao_any_destructor,
+      CORBA::_tc_LocalInterfaceDef,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::LocalInterfaceDef_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<CORBA::LocalInterfaceDef>::extract (
+        _tao_any,
+        CORBA::LocalInterfaceDef::_tao_any_destructor,
+        CORBA::_tc_LocalInterfaceDef,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+namespace TAO
+{
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<CORBA::ExtLocalInterfaceDef>::to_object (
+      CORBA::Object_ptr &_tao_elem
+    ) const
+  {
+    _tao_elem = CORBA::Object::_duplicate (this->value_);
+    return true;
+  }
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ExtLocalInterfaceDef_ptr _tao_elem
+  )
+{
+  CORBA::ExtLocalInterfaceDef_ptr _tao_objptr =
+    CORBA::ExtLocalInterfaceDef::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ExtLocalInterfaceDef_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<CORBA::ExtLocalInterfaceDef>::insert (
+      _tao_any,
+      CORBA::ExtLocalInterfaceDef::_tao_any_destructor,
+      CORBA::_tc_ExtLocalInterfaceDef,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::ExtLocalInterfaceDef_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<CORBA::ExtLocalInterfaceDef>::extract (
+        _tao_any,
+        CORBA::ExtLocalInterfaceDef::_tao_any_destructor,
+        CORBA::_tc_ExtLocalInterfaceDef,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from
 // be\be_visitor_enum/cdr_op_cs.cpp:51
 
 CORBA::Boolean operator<< (TAO_OutputCDR & strm, CORBA::PrimitiveKind _tao_enumerator)
diff --git a/TAO/tao/IFR_Client/IFR_BasicC.h b/TAO/tao/IFR_Client/IFR_BasicC.h
index 31ebfd4e2c4..4284fac3152 100644
--- a/TAO/tao/IFR_Client/IFR_BasicC.h
+++ b/TAO/tao/IFR_Client/IFR_BasicC.h
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:153
+// be\be_codegen.cpp:154
 
 #ifndef _TAO_IDL_ORIG_IFR_BASICC_H_
 #define _TAO_IDL_ORIG_IFR_BASICC_H_
@@ -45,9 +45,10 @@
 #include "tao/SystemException.h"
 #include "tao/Environment.h"
 #include "tao/Object.h"
-#include "tao/TypeCode.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Any.h"
+#include "tao/AnyTypeCode/TypeCode.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Any.h"
+#include "tao/AnyTypeCode/TypeCode.h"
 #include "tao/Sequence_T.h"
 #include "tao/Objref_VarOut_T.h"
 #include "tao/Seq_Var_T.h"
@@ -256,7 +257,7 @@ namespace CORBA
   typedef PrimitiveKind &PrimitiveKind_out;
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:49
   
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_PrimitiveKind;
   
@@ -457,7 +458,7 @@ namespace CORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:49
   
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_Repository;
   
@@ -568,7 +569,7 @@ namespace CORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:49
   
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ModuleDef;
   
@@ -591,7 +592,7 @@ namespace CORBA
     ModuleDescription_out;
   
   // TAO_IDL - Generated from
-  // be\be_visitor_structure/structure_ch.cpp:52
+  // be\be_visitor_structure/structure_ch.cpp:57
   
   struct TAO_IFR_Client_Export ModuleDescription
   {
@@ -605,7 +606,7 @@ namespace CORBA
   };
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:49
   
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ModuleDescription;
   
@@ -767,7 +768,7 @@ namespace CORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:49
   
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ConstantDef;
   
@@ -790,7 +791,7 @@ namespace CORBA
     ConstantDescription_out;
   
   // TAO_IDL - Generated from
-  // be\be_visitor_structure/structure_ch.cpp:52
+  // be\be_visitor_structure/structure_ch.cpp:57
   
   struct TAO_IFR_Client_Export ConstantDescription
   {
@@ -806,7 +807,7 @@ namespace CORBA
   };
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:49
   
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ConstantDescription;
   
@@ -938,7 +939,7 @@ namespace CORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:49
   
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_StructDef;
   
@@ -1101,7 +1102,7 @@ namespace CORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:49
   
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_UnionDef;
   
@@ -1232,7 +1233,7 @@ namespace CORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:49
   
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_EnumDef;
   
@@ -1363,7 +1364,7 @@ namespace CORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:49
   
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_AliasDef;
   
@@ -1473,7 +1474,7 @@ namespace CORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:49
   
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_NativeDef;
   
@@ -1570,7 +1571,7 @@ namespace CORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:49
   
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_PrimitiveDef;
   
@@ -1678,7 +1679,7 @@ namespace CORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:49
   
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_StringDef;
   
@@ -1786,7 +1787,7 @@ namespace CORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:49
   
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_WstringDef;
   
@@ -1925,7 +1926,7 @@ namespace CORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:49
   
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_SequenceDef;
   
@@ -2064,7 +2065,7 @@ namespace CORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:49
   
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ArrayDef;
   
@@ -2206,7 +2207,7 @@ namespace CORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:49
   
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ExceptionDef;
   
@@ -2266,7 +2267,7 @@ namespace CORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:49
   
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ExceptionDefSeq;
   
@@ -2282,7 +2283,7 @@ namespace CORBA
   typedef AttributeMode &AttributeMode_out;
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:49
   
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_AttributeMode;
   
@@ -2444,7 +2445,7 @@ namespace CORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:49
   
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_AttributeDef;
   
@@ -2467,7 +2468,7 @@ namespace CORBA
     AttributeDescription_out;
   
   // TAO_IDL - Generated from
-  // be\be_visitor_structure/structure_ch.cpp:52
+  // be\be_visitor_structure/structure_ch.cpp:57
   
   struct TAO_IFR_Client_Export AttributeDescription
   {
@@ -2483,7 +2484,7 @@ namespace CORBA
   };
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:49
   
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_AttributeDescription;
   
@@ -2506,7 +2507,7 @@ namespace CORBA
     ExtAttributeDescription_out;
   
   // TAO_IDL - Generated from
-  // be\be_visitor_structure/structure_ch.cpp:52
+  // be\be_visitor_structure/structure_ch.cpp:57
   
   struct TAO_IFR_Client_Export ExtAttributeDescription
   {
@@ -2524,7 +2525,7 @@ namespace CORBA
   };
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:49
   
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ExtAttributeDescription;
   
@@ -2686,7 +2687,7 @@ namespace CORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:49
   
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ExtAttributeDef;
   
@@ -2702,7 +2703,7 @@ namespace CORBA
   typedef OperationMode &OperationMode_out;
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:49
   
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_OperationMode;
   
@@ -2725,7 +2726,7 @@ namespace CORBA
     ParameterDescription_out;
   
   // TAO_IDL - Generated from
-  // be\be_visitor_structure/structure_ch.cpp:52
+  // be\be_visitor_structure/structure_ch.cpp:57
   
   struct TAO_IFR_Client_Export ParameterDescription
   {
@@ -2739,7 +2740,7 @@ namespace CORBA
   };
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:49
   
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ParameterDescription;
   
@@ -2792,7 +2793,7 @@ namespace CORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:49
   
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ParDescriptionSeq;
   
@@ -2804,7 +2805,7 @@ namespace CORBA
   typedef CORBA::String_out ContextIdentifier_out;
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:49
   
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ContextIdentifier;
   
@@ -2855,7 +2856,7 @@ namespace CORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:49
   
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ContextIdSeq;
   
@@ -3080,7 +3081,7 @@ namespace CORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:49
   
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_OperationDef;
   
@@ -3103,7 +3104,7 @@ namespace CORBA
     OperationDescription_out;
   
   // TAO_IDL - Generated from
-  // be\be_visitor_structure/structure_ch.cpp:52
+  // be\be_visitor_structure/structure_ch.cpp:57
   
   struct TAO_IFR_Client_Export OperationDescription
   {
@@ -3122,7 +3123,7 @@ namespace CORBA
   };
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:49
   
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_OperationDescription;
   
@@ -3173,7 +3174,7 @@ namespace CORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:49
   
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_RepositoryIdSeq;
   
@@ -3226,7 +3227,7 @@ namespace CORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:49
   
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_OpDescriptionSeq;
   
@@ -3279,7 +3280,7 @@ namespace CORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:49
   
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_AttrDescriptionSeq;
   
@@ -3332,7 +3333,7 @@ namespace CORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:49
   
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ExtAttrDescriptionSeq;
   
@@ -3448,7 +3449,7 @@ namespace CORBA
       FullInterfaceDescription_out;
     
     // TAO_IDL - Generated from
-    // be\be_visitor_structure/structure_ch.cpp:52
+    // be\be_visitor_structure/structure_ch.cpp:57
     
     struct TAO_IFR_Client_Export FullInterfaceDescription
     {
@@ -3466,7 +3467,7 @@ namespace CORBA
     };
     
     // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:44
+    // be\be_visitor_typecode/typecode_decl.cpp:49
     
     static ::CORBA::TypeCode_ptr const _tc_FullInterfaceDescription;
     
@@ -3560,7 +3561,7 @@ namespace CORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:49
   
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_InterfaceDef;
   
@@ -3583,7 +3584,7 @@ namespace CORBA
     InterfaceDescription_out;
   
   // TAO_IDL - Generated from
-  // be\be_visitor_structure/structure_ch.cpp:52
+  // be\be_visitor_structure/structure_ch.cpp:57
   
   struct TAO_IFR_Client_Export InterfaceDescription
   {
@@ -3598,7 +3599,7 @@ namespace CORBA
   };
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:49
   
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_InterfaceDescription;
   
@@ -3680,7 +3681,7 @@ namespace CORBA
       ExtFullInterfaceDescription_out;
     
     // TAO_IDL - Generated from
-    // be\be_visitor_structure/structure_ch.cpp:52
+    // be\be_visitor_structure/structure_ch.cpp:57
     
     struct TAO_IFR_Client_Export ExtFullInterfaceDescription
     {
@@ -3698,7 +3699,7 @@ namespace CORBA
     };
     
     // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:44
+    // be\be_visitor_typecode/typecode_decl.cpp:49
     
     static ::CORBA::TypeCode_ptr const _tc_ExtFullInterfaceDescription;
     
@@ -3776,7 +3777,7 @@ namespace CORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:49
   
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_InterfaceAttrExtension;
   
@@ -3887,7 +3888,7 @@ namespace CORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:49
   
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ExtInterfaceDef;
   
@@ -3997,7 +3998,7 @@ namespace CORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:49
   
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_AbstractInterfaceDef;
   
@@ -4108,7 +4109,7 @@ namespace CORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:49
   
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ExtAbstractInterfaceDef;
   
@@ -4218,7 +4219,7 @@ namespace CORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:49
   
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_LocalInterfaceDef;
   
@@ -4329,7 +4330,7 @@ namespace CORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:49
   
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ExtLocalInterfaceDef;
 
@@ -4494,8 +4495,29 @@ TAO::Collocation_Proxy_Broker *
 namespace TAO
 {
 
-#if !defined (_CORBA_REPOSITORY__TRAITS_CH_)
-#define _CORBA_REPOSITORY__TRAITS_CH_
+#if !defined (_CORBA_FIXEDDEF__TRAITS_)
+#define _CORBA_FIXEDDEF__TRAITS_
+  
+  template<>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::FixedDef>
+  {
+    static ::CORBA::FixedDef_ptr duplicate (
+        ::CORBA::FixedDef_ptr
+      );
+    static void release (
+        ::CORBA::FixedDef_ptr
+      );
+    static ::CORBA::FixedDef_ptr nil (void);
+    static CORBA::Boolean marshal (
+        ::CORBA::FixedDef_ptr p,
+        TAO_OutputCDR & cdr
+      );
+  };
+
+#endif /* end #if !defined */
+
+#if !defined (_CORBA_REPOSITORY__TRAITS_)
+#define _CORBA_REPOSITORY__TRAITS_
   
   template<>
   struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::Repository>
@@ -4515,8 +4537,8 @@ namespace TAO
 
 #endif /* end #if !defined */
 
-#if !defined (_CORBA_MODULEDEF__TRAITS_CH_)
-#define _CORBA_MODULEDEF__TRAITS_CH_
+#if !defined (_CORBA_MODULEDEF__TRAITS_)
+#define _CORBA_MODULEDEF__TRAITS_
   
   template<>
   struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ModuleDef>
@@ -4536,8 +4558,8 @@ namespace TAO
 
 #endif /* end #if !defined */
 
-#if !defined (_CORBA_CONSTANTDEF__TRAITS_CH_)
-#define _CORBA_CONSTANTDEF__TRAITS_CH_
+#if !defined (_CORBA_CONSTANTDEF__TRAITS_)
+#define _CORBA_CONSTANTDEF__TRAITS_
   
   template<>
   struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ConstantDef>
@@ -4557,8 +4579,8 @@ namespace TAO
 
 #endif /* end #if !defined */
 
-#if !defined (_CORBA_STRUCTDEF__TRAITS_CH_)
-#define _CORBA_STRUCTDEF__TRAITS_CH_
+#if !defined (_CORBA_STRUCTDEF__TRAITS_)
+#define _CORBA_STRUCTDEF__TRAITS_
   
   template<>
   struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::StructDef>
@@ -4578,8 +4600,8 @@ namespace TAO
 
 #endif /* end #if !defined */
 
-#if !defined (_CORBA_UNIONDEF__TRAITS_CH_)
-#define _CORBA_UNIONDEF__TRAITS_CH_
+#if !defined (_CORBA_UNIONDEF__TRAITS_)
+#define _CORBA_UNIONDEF__TRAITS_
   
   template<>
   struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::UnionDef>
@@ -4599,8 +4621,8 @@ namespace TAO
 
 #endif /* end #if !defined */
 
-#if !defined (_CORBA_ENUMDEF__TRAITS_CH_)
-#define _CORBA_ENUMDEF__TRAITS_CH_
+#if !defined (_CORBA_ENUMDEF__TRAITS_)
+#define _CORBA_ENUMDEF__TRAITS_
   
   template<>
   struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::EnumDef>
@@ -4620,8 +4642,8 @@ namespace TAO
 
 #endif /* end #if !defined */
 
-#if !defined (_CORBA_ALIASDEF__TRAITS_CH_)
-#define _CORBA_ALIASDEF__TRAITS_CH_
+#if !defined (_CORBA_ALIASDEF__TRAITS_)
+#define _CORBA_ALIASDEF__TRAITS_
   
   template<>
   struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::AliasDef>
@@ -4641,357 +4663,357 @@ namespace TAO
 
 #endif /* end #if !defined */
 
-#if !defined (_CORBA_INTERFACEDEF__TRAITS_CH_)
-#define _CORBA_INTERFACEDEF__TRAITS_CH_
+#if !defined (_CORBA_NATIVEDEF__TRAITS_)
+#define _CORBA_NATIVEDEF__TRAITS_
   
   template<>
-  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::InterfaceDef>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::NativeDef>
   {
-    static ::CORBA::InterfaceDef_ptr duplicate (
-        ::CORBA::InterfaceDef_ptr
+    static ::CORBA::NativeDef_ptr duplicate (
+        ::CORBA::NativeDef_ptr
       );
     static void release (
-        ::CORBA::InterfaceDef_ptr
+        ::CORBA::NativeDef_ptr
       );
-    static ::CORBA::InterfaceDef_ptr nil (void);
+    static ::CORBA::NativeDef_ptr nil (void);
     static CORBA::Boolean marshal (
-        ::CORBA::InterfaceDef_ptr p,
+        ::CORBA::NativeDef_ptr p,
         TAO_OutputCDR & cdr
       );
   };
 
 #endif /* end #if !defined */
 
-#if !defined (_CORBA_EXCEPTIONDEF__TRAITS_CH_)
-#define _CORBA_EXCEPTIONDEF__TRAITS_CH_
+#if !defined (_CORBA_PRIMITIVEDEF__TRAITS_)
+#define _CORBA_PRIMITIVEDEF__TRAITS_
   
   template<>
-  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ExceptionDef>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::PrimitiveDef>
   {
-    static ::CORBA::ExceptionDef_ptr duplicate (
-        ::CORBA::ExceptionDef_ptr
+    static ::CORBA::PrimitiveDef_ptr duplicate (
+        ::CORBA::PrimitiveDef_ptr
       );
     static void release (
-        ::CORBA::ExceptionDef_ptr
+        ::CORBA::PrimitiveDef_ptr
       );
-    static ::CORBA::ExceptionDef_ptr nil (void);
+    static ::CORBA::PrimitiveDef_ptr nil (void);
     static CORBA::Boolean marshal (
-        ::CORBA::ExceptionDef_ptr p,
+        ::CORBA::PrimitiveDef_ptr p,
         TAO_OutputCDR & cdr
       );
   };
 
 #endif /* end #if !defined */
 
-#if !defined (_CORBA_NATIVEDEF__TRAITS_CH_)
-#define _CORBA_NATIVEDEF__TRAITS_CH_
+#if !defined (_CORBA_STRINGDEF__TRAITS_)
+#define _CORBA_STRINGDEF__TRAITS_
   
   template<>
-  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::NativeDef>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::StringDef>
   {
-    static ::CORBA::NativeDef_ptr duplicate (
-        ::CORBA::NativeDef_ptr
+    static ::CORBA::StringDef_ptr duplicate (
+        ::CORBA::StringDef_ptr
       );
     static void release (
-        ::CORBA::NativeDef_ptr
+        ::CORBA::StringDef_ptr
       );
-    static ::CORBA::NativeDef_ptr nil (void);
+    static ::CORBA::StringDef_ptr nil (void);
     static CORBA::Boolean marshal (
-        ::CORBA::NativeDef_ptr p,
+        ::CORBA::StringDef_ptr p,
         TAO_OutputCDR & cdr
       );
   };
 
 #endif /* end #if !defined */
 
-#if !defined (_CORBA_ABSTRACTINTERFACEDEF__TRAITS_CH_)
-#define _CORBA_ABSTRACTINTERFACEDEF__TRAITS_CH_
+#if !defined (_CORBA_WSTRINGDEF__TRAITS_)
+#define _CORBA_WSTRINGDEF__TRAITS_
   
   template<>
-  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::AbstractInterfaceDef>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::WstringDef>
   {
-    static ::CORBA::AbstractInterfaceDef_ptr duplicate (
-        ::CORBA::AbstractInterfaceDef_ptr
+    static ::CORBA::WstringDef_ptr duplicate (
+        ::CORBA::WstringDef_ptr
       );
     static void release (
-        ::CORBA::AbstractInterfaceDef_ptr
+        ::CORBA::WstringDef_ptr
       );
-    static ::CORBA::AbstractInterfaceDef_ptr nil (void);
+    static ::CORBA::WstringDef_ptr nil (void);
     static CORBA::Boolean marshal (
-        ::CORBA::AbstractInterfaceDef_ptr p,
+        ::CORBA::WstringDef_ptr p,
         TAO_OutputCDR & cdr
       );
   };
 
 #endif /* end #if !defined */
 
-#if !defined (_CORBA_LOCALINTERFACEDEF__TRAITS_CH_)
-#define _CORBA_LOCALINTERFACEDEF__TRAITS_CH_
+#if !defined (_CORBA_SEQUENCEDEF__TRAITS_)
+#define _CORBA_SEQUENCEDEF__TRAITS_
   
   template<>
-  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::LocalInterfaceDef>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::SequenceDef>
   {
-    static ::CORBA::LocalInterfaceDef_ptr duplicate (
-        ::CORBA::LocalInterfaceDef_ptr
+    static ::CORBA::SequenceDef_ptr duplicate (
+        ::CORBA::SequenceDef_ptr
       );
     static void release (
-        ::CORBA::LocalInterfaceDef_ptr
+        ::CORBA::SequenceDef_ptr
       );
-    static ::CORBA::LocalInterfaceDef_ptr nil (void);
+    static ::CORBA::SequenceDef_ptr nil (void);
     static CORBA::Boolean marshal (
-        ::CORBA::LocalInterfaceDef_ptr p,
+        ::CORBA::SequenceDef_ptr p,
         TAO_OutputCDR & cdr
       );
   };
 
 #endif /* end #if !defined */
 
-#if !defined (_CORBA_EXTINTERFACEDEF__TRAITS_CH_)
-#define _CORBA_EXTINTERFACEDEF__TRAITS_CH_
+#if !defined (_CORBA_ARRAYDEF__TRAITS_)
+#define _CORBA_ARRAYDEF__TRAITS_
   
   template<>
-  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ExtInterfaceDef>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ArrayDef>
   {
-    static ::CORBA::ExtInterfaceDef_ptr duplicate (
-        ::CORBA::ExtInterfaceDef_ptr
+    static ::CORBA::ArrayDef_ptr duplicate (
+        ::CORBA::ArrayDef_ptr
       );
     static void release (
-        ::CORBA::ExtInterfaceDef_ptr
+        ::CORBA::ArrayDef_ptr
       );
-    static ::CORBA::ExtInterfaceDef_ptr nil (void);
+    static ::CORBA::ArrayDef_ptr nil (void);
     static CORBA::Boolean marshal (
-        ::CORBA::ExtInterfaceDef_ptr p,
+        ::CORBA::ArrayDef_ptr p,
         TAO_OutputCDR & cdr
       );
   };
 
 #endif /* end #if !defined */
 
-#if !defined (_CORBA_EXTABSTRACTINTERFACEDEF__TRAITS_CH_)
-#define _CORBA_EXTABSTRACTINTERFACEDEF__TRAITS_CH_
+#if !defined (_CORBA_EXCEPTIONDEF__TRAITS_)
+#define _CORBA_EXCEPTIONDEF__TRAITS_
   
   template<>
-  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ExtAbstractInterfaceDef>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ExceptionDef>
   {
-    static ::CORBA::ExtAbstractInterfaceDef_ptr duplicate (
-        ::CORBA::ExtAbstractInterfaceDef_ptr
+    static ::CORBA::ExceptionDef_ptr duplicate (
+        ::CORBA::ExceptionDef_ptr
       );
     static void release (
-        ::CORBA::ExtAbstractInterfaceDef_ptr
+        ::CORBA::ExceptionDef_ptr
       );
-    static ::CORBA::ExtAbstractInterfaceDef_ptr nil (void);
+    static ::CORBA::ExceptionDef_ptr nil (void);
     static CORBA::Boolean marshal (
-        ::CORBA::ExtAbstractInterfaceDef_ptr p,
+        ::CORBA::ExceptionDef_ptr p,
         TAO_OutputCDR & cdr
       );
   };
 
 #endif /* end #if !defined */
 
-#if !defined (_CORBA_EXTLOCALINTERFACEDEF__TRAITS_CH_)
-#define _CORBA_EXTLOCALINTERFACEDEF__TRAITS_CH_
+#if !defined (_CORBA_ATTRIBUTEDEF__TRAITS_)
+#define _CORBA_ATTRIBUTEDEF__TRAITS_
   
   template<>
-  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ExtLocalInterfaceDef>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::AttributeDef>
   {
-    static ::CORBA::ExtLocalInterfaceDef_ptr duplicate (
-        ::CORBA::ExtLocalInterfaceDef_ptr
+    static ::CORBA::AttributeDef_ptr duplicate (
+        ::CORBA::AttributeDef_ptr
       );
     static void release (
-        ::CORBA::ExtLocalInterfaceDef_ptr
+        ::CORBA::AttributeDef_ptr
       );
-    static ::CORBA::ExtLocalInterfaceDef_ptr nil (void);
+    static ::CORBA::AttributeDef_ptr nil (void);
     static CORBA::Boolean marshal (
-        ::CORBA::ExtLocalInterfaceDef_ptr p,
+        ::CORBA::AttributeDef_ptr p,
         TAO_OutputCDR & cdr
       );
   };
 
 #endif /* end #if !defined */
 
-#if !defined (_CORBA_PRIMITIVEDEF__TRAITS_CH_)
-#define _CORBA_PRIMITIVEDEF__TRAITS_CH_
+#if !defined (_CORBA_EXTATTRIBUTEDEF__TRAITS_)
+#define _CORBA_EXTATTRIBUTEDEF__TRAITS_
   
   template<>
-  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::PrimitiveDef>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ExtAttributeDef>
   {
-    static ::CORBA::PrimitiveDef_ptr duplicate (
-        ::CORBA::PrimitiveDef_ptr
+    static ::CORBA::ExtAttributeDef_ptr duplicate (
+        ::CORBA::ExtAttributeDef_ptr
       );
     static void release (
-        ::CORBA::PrimitiveDef_ptr
+        ::CORBA::ExtAttributeDef_ptr
       );
-    static ::CORBA::PrimitiveDef_ptr nil (void);
+    static ::CORBA::ExtAttributeDef_ptr nil (void);
     static CORBA::Boolean marshal (
-        ::CORBA::PrimitiveDef_ptr p,
+        ::CORBA::ExtAttributeDef_ptr p,
         TAO_OutputCDR & cdr
       );
   };
 
 #endif /* end #if !defined */
 
-#if !defined (_CORBA_STRINGDEF__TRAITS_CH_)
-#define _CORBA_STRINGDEF__TRAITS_CH_
+#if !defined (_CORBA_OPERATIONDEF__TRAITS_)
+#define _CORBA_OPERATIONDEF__TRAITS_
   
   template<>
-  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::StringDef>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::OperationDef>
   {
-    static ::CORBA::StringDef_ptr duplicate (
-        ::CORBA::StringDef_ptr
+    static ::CORBA::OperationDef_ptr duplicate (
+        ::CORBA::OperationDef_ptr
       );
     static void release (
-        ::CORBA::StringDef_ptr
+        ::CORBA::OperationDef_ptr
       );
-    static ::CORBA::StringDef_ptr nil (void);
+    static ::CORBA::OperationDef_ptr nil (void);
     static CORBA::Boolean marshal (
-        ::CORBA::StringDef_ptr p,
+        ::CORBA::OperationDef_ptr p,
         TAO_OutputCDR & cdr
       );
   };
 
 #endif /* end #if !defined */
 
-#if !defined (_CORBA_SEQUENCEDEF__TRAITS_CH_)
-#define _CORBA_SEQUENCEDEF__TRAITS_CH_
+#if !defined (_CORBA_INTERFACEDEF__TRAITS_)
+#define _CORBA_INTERFACEDEF__TRAITS_
   
   template<>
-  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::SequenceDef>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::InterfaceDef>
   {
-    static ::CORBA::SequenceDef_ptr duplicate (
-        ::CORBA::SequenceDef_ptr
+    static ::CORBA::InterfaceDef_ptr duplicate (
+        ::CORBA::InterfaceDef_ptr
       );
     static void release (
-        ::CORBA::SequenceDef_ptr
+        ::CORBA::InterfaceDef_ptr
       );
-    static ::CORBA::SequenceDef_ptr nil (void);
+    static ::CORBA::InterfaceDef_ptr nil (void);
     static CORBA::Boolean marshal (
-        ::CORBA::SequenceDef_ptr p,
+        ::CORBA::InterfaceDef_ptr p,
         TAO_OutputCDR & cdr
       );
   };
 
 #endif /* end #if !defined */
 
-#if !defined (_CORBA_ARRAYDEF__TRAITS_CH_)
-#define _CORBA_ARRAYDEF__TRAITS_CH_
+#if !defined (_CORBA_INTERFACEATTREXTENSION__TRAITS_)
+#define _CORBA_INTERFACEATTREXTENSION__TRAITS_
   
   template<>
-  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ArrayDef>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::InterfaceAttrExtension>
   {
-    static ::CORBA::ArrayDef_ptr duplicate (
-        ::CORBA::ArrayDef_ptr
+    static ::CORBA::InterfaceAttrExtension_ptr duplicate (
+        ::CORBA::InterfaceAttrExtension_ptr
       );
     static void release (
-        ::CORBA::ArrayDef_ptr
+        ::CORBA::InterfaceAttrExtension_ptr
       );
-    static ::CORBA::ArrayDef_ptr nil (void);
+    static ::CORBA::InterfaceAttrExtension_ptr nil (void);
     static CORBA::Boolean marshal (
-        ::CORBA::ArrayDef_ptr p,
+        ::CORBA::InterfaceAttrExtension_ptr p,
         TAO_OutputCDR & cdr
       );
   };
 
 #endif /* end #if !defined */
 
-#if !defined (_CORBA_WSTRINGDEF__TRAITS_CH_)
-#define _CORBA_WSTRINGDEF__TRAITS_CH_
+#if !defined (_CORBA_EXTINTERFACEDEF__TRAITS_)
+#define _CORBA_EXTINTERFACEDEF__TRAITS_
   
   template<>
-  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::WstringDef>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ExtInterfaceDef>
   {
-    static ::CORBA::WstringDef_ptr duplicate (
-        ::CORBA::WstringDef_ptr
+    static ::CORBA::ExtInterfaceDef_ptr duplicate (
+        ::CORBA::ExtInterfaceDef_ptr
       );
     static void release (
-        ::CORBA::WstringDef_ptr
+        ::CORBA::ExtInterfaceDef_ptr
       );
-    static ::CORBA::WstringDef_ptr nil (void);
+    static ::CORBA::ExtInterfaceDef_ptr nil (void);
     static CORBA::Boolean marshal (
-        ::CORBA::WstringDef_ptr p,
+        ::CORBA::ExtInterfaceDef_ptr p,
         TAO_OutputCDR & cdr
       );
   };
 
 #endif /* end #if !defined */
 
-#if !defined (_CORBA_ATTRIBUTEDEF__TRAITS_CH_)
-#define _CORBA_ATTRIBUTEDEF__TRAITS_CH_
+#if !defined (_CORBA_ABSTRACTINTERFACEDEF__TRAITS_)
+#define _CORBA_ABSTRACTINTERFACEDEF__TRAITS_
   
   template<>
-  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::AttributeDef>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::AbstractInterfaceDef>
   {
-    static ::CORBA::AttributeDef_ptr duplicate (
-        ::CORBA::AttributeDef_ptr
+    static ::CORBA::AbstractInterfaceDef_ptr duplicate (
+        ::CORBA::AbstractInterfaceDef_ptr
       );
     static void release (
-        ::CORBA::AttributeDef_ptr
+        ::CORBA::AbstractInterfaceDef_ptr
       );
-    static ::CORBA::AttributeDef_ptr nil (void);
+    static ::CORBA::AbstractInterfaceDef_ptr nil (void);
     static CORBA::Boolean marshal (
-        ::CORBA::AttributeDef_ptr p,
+        ::CORBA::AbstractInterfaceDef_ptr p,
         TAO_OutputCDR & cdr
       );
   };
 
 #endif /* end #if !defined */
 
-#if !defined (_CORBA_EXTATTRIBUTEDEF__TRAITS_CH_)
-#define _CORBA_EXTATTRIBUTEDEF__TRAITS_CH_
+#if !defined (_CORBA_EXTABSTRACTINTERFACEDEF__TRAITS_)
+#define _CORBA_EXTABSTRACTINTERFACEDEF__TRAITS_
   
   template<>
-  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ExtAttributeDef>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ExtAbstractInterfaceDef>
   {
-    static ::CORBA::ExtAttributeDef_ptr duplicate (
-        ::CORBA::ExtAttributeDef_ptr
+    static ::CORBA::ExtAbstractInterfaceDef_ptr duplicate (
+        ::CORBA::ExtAbstractInterfaceDef_ptr
       );
     static void release (
-        ::CORBA::ExtAttributeDef_ptr
+        ::CORBA::ExtAbstractInterfaceDef_ptr
       );
-    static ::CORBA::ExtAttributeDef_ptr nil (void);
+    static ::CORBA::ExtAbstractInterfaceDef_ptr nil (void);
     static CORBA::Boolean marshal (
-        ::CORBA::ExtAttributeDef_ptr p,
+        ::CORBA::ExtAbstractInterfaceDef_ptr p,
         TAO_OutputCDR & cdr
       );
   };
 
 #endif /* end #if !defined */
 
-#if !defined (_CORBA_OPERATIONDEF__TRAITS_CH_)
-#define _CORBA_OPERATIONDEF__TRAITS_CH_
+#if !defined (_CORBA_LOCALINTERFACEDEF__TRAITS_)
+#define _CORBA_LOCALINTERFACEDEF__TRAITS_
   
   template<>
-  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::OperationDef>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::LocalInterfaceDef>
   {
-    static ::CORBA::OperationDef_ptr duplicate (
-        ::CORBA::OperationDef_ptr
+    static ::CORBA::LocalInterfaceDef_ptr duplicate (
+        ::CORBA::LocalInterfaceDef_ptr
       );
     static void release (
-        ::CORBA::OperationDef_ptr
+        ::CORBA::LocalInterfaceDef_ptr
       );
-    static ::CORBA::OperationDef_ptr nil (void);
+    static ::CORBA::LocalInterfaceDef_ptr nil (void);
     static CORBA::Boolean marshal (
-        ::CORBA::OperationDef_ptr p,
+        ::CORBA::LocalInterfaceDef_ptr p,
         TAO_OutputCDR & cdr
       );
   };
 
 #endif /* end #if !defined */
 
-#if !defined (_CORBA_INTERFACEATTREXTENSION__TRAITS_CH_)
-#define _CORBA_INTERFACEATTREXTENSION__TRAITS_CH_
+#if !defined (_CORBA_EXTLOCALINTERFACEDEF__TRAITS_)
+#define _CORBA_EXTLOCALINTERFACEDEF__TRAITS_
   
   template<>
-  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::InterfaceAttrExtension>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ExtLocalInterfaceDef>
   {
-    static ::CORBA::InterfaceAttrExtension_ptr duplicate (
-        ::CORBA::InterfaceAttrExtension_ptr
+    static ::CORBA::ExtLocalInterfaceDef_ptr duplicate (
+        ::CORBA::ExtLocalInterfaceDef_ptr
       );
     static void release (
-        ::CORBA::InterfaceAttrExtension_ptr
+        ::CORBA::ExtLocalInterfaceDef_ptr
       );
-    static ::CORBA::InterfaceAttrExtension_ptr nil (void);
+    static ::CORBA::ExtLocalInterfaceDef_ptr nil (void);
     static CORBA::Boolean marshal (
-        ::CORBA::InterfaceAttrExtension_ptr p,
+        ::CORBA::ExtLocalInterfaceDef_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -5007,27 +5029,27 @@ TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::FixedDef_ptr *); //
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::FixedDef *&);
 
 // TAO_IDL - Generated from
-// be\be_visitor_enum/any_op_ch.cpp:51
+// be\be_visitor_enum/any_op_ch.cpp:52
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::PrimitiveKind);
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::PrimitiveKind &);
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
+// be\be_visitor_interface/any_op_ch.cpp:53
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::Repository_ptr); // copying
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::Repository_ptr *); // non-copying
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Repository_ptr &);
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
+// be\be_visitor_interface/any_op_ch.cpp:53
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ModuleDef_ptr); // copying
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ModuleDef_ptr *); // non-copying
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ModuleDef_ptr &);
 
 // TAO_IDL - Generated from
-// be\be_visitor_structure/any_op_ch.cpp:52
+// be\be_visitor_structure/any_op_ch.cpp:53
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::ModuleDescription &); // copying version
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ModuleDescription*); // noncopying version
@@ -5035,14 +5057,14 @@ TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Mod
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ModuleDescription *&);
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
+// be\be_visitor_interface/any_op_ch.cpp:53
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ConstantDef_ptr); // copying
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ConstantDef_ptr *); // non-copying
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ConstantDef_ptr &);
 
 // TAO_IDL - Generated from
-// be\be_visitor_structure/any_op_ch.cpp:52
+// be\be_visitor_structure/any_op_ch.cpp:53
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::ConstantDescription &); // copying version
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ConstantDescription*); // noncopying version
@@ -5050,84 +5072,84 @@ TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Con
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ConstantDescription *&);
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
+// be\be_visitor_interface/any_op_ch.cpp:53
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::StructDef_ptr); // copying
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::StructDef_ptr *); // non-copying
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::StructDef_ptr &);
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
+// be\be_visitor_interface/any_op_ch.cpp:53
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::UnionDef_ptr); // copying
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::UnionDef_ptr *); // non-copying
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::UnionDef_ptr &);
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
+// be\be_visitor_interface/any_op_ch.cpp:53
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::EnumDef_ptr); // copying
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::EnumDef_ptr *); // non-copying
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::EnumDef_ptr &);
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
+// be\be_visitor_interface/any_op_ch.cpp:53
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::AliasDef_ptr); // copying
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::AliasDef_ptr *); // non-copying
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::AliasDef_ptr &);
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
+// be\be_visitor_interface/any_op_ch.cpp:53
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::NativeDef_ptr); // copying
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::NativeDef_ptr *); // non-copying
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::NativeDef_ptr &);
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
+// be\be_visitor_interface/any_op_ch.cpp:53
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::PrimitiveDef_ptr); // copying
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::PrimitiveDef_ptr *); // non-copying
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::PrimitiveDef_ptr &);
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
+// be\be_visitor_interface/any_op_ch.cpp:53
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::StringDef_ptr); // copying
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::StringDef_ptr *); // non-copying
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::StringDef_ptr &);
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
+// be\be_visitor_interface/any_op_ch.cpp:53
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::WstringDef_ptr); // copying
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::WstringDef_ptr *); // non-copying
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::WstringDef_ptr &);
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
+// be\be_visitor_interface/any_op_ch.cpp:53
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::SequenceDef_ptr); // copying
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::SequenceDef_ptr *); // non-copying
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::SequenceDef_ptr &);
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
+// be\be_visitor_interface/any_op_ch.cpp:53
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ArrayDef_ptr); // copying
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ArrayDef_ptr *); // non-copying
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ArrayDef_ptr &);
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
+// be\be_visitor_interface/any_op_ch.cpp:53
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ExceptionDef_ptr); // copying
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ExceptionDef_ptr *); // non-copying
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ExceptionDef_ptr &);
 
 // TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
+// be\be_visitor_sequence/any_op_ch.cpp:53
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::ExceptionDefSeq &); // copying version
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ExceptionDefSeq*); // noncopying version
@@ -5135,20 +5157,20 @@ TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Exc
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ExceptionDefSeq *&);
 
 // TAO_IDL - Generated from
-// be\be_visitor_enum/any_op_ch.cpp:51
+// be\be_visitor_enum/any_op_ch.cpp:52
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::AttributeMode);
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::AttributeMode &);
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
+// be\be_visitor_interface/any_op_ch.cpp:53
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::AttributeDef_ptr); // copying
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::AttributeDef_ptr *); // non-copying
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::AttributeDef_ptr &);
 
 // TAO_IDL - Generated from
-// be\be_visitor_structure/any_op_ch.cpp:52
+// be\be_visitor_structure/any_op_ch.cpp:53
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::AttributeDescription &); // copying version
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::AttributeDescription*); // noncopying version
@@ -5156,7 +5178,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Att
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::AttributeDescription *&);
 
 // TAO_IDL - Generated from
-// be\be_visitor_structure/any_op_ch.cpp:52
+// be\be_visitor_structure/any_op_ch.cpp:53
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::ExtAttributeDescription &); // copying version
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ExtAttributeDescription*); // noncopying version
@@ -5164,20 +5186,20 @@ TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Ext
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ExtAttributeDescription *&);
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
+// be\be_visitor_interface/any_op_ch.cpp:53
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ExtAttributeDef_ptr); // copying
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ExtAttributeDef_ptr *); // non-copying
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ExtAttributeDef_ptr &);
 
 // TAO_IDL - Generated from
-// be\be_visitor_enum/any_op_ch.cpp:51
+// be\be_visitor_enum/any_op_ch.cpp:52
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::OperationMode);
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::OperationMode &);
 
 // TAO_IDL - Generated from
-// be\be_visitor_structure/any_op_ch.cpp:52
+// be\be_visitor_structure/any_op_ch.cpp:53
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::ParameterDescription &); // copying version
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ParameterDescription*); // noncopying version
@@ -5185,7 +5207,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Par
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ParameterDescription *&);
 
 // TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
+// be\be_visitor_sequence/any_op_ch.cpp:53
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::ParDescriptionSeq &); // copying version
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ParDescriptionSeq*); // noncopying version
@@ -5193,7 +5215,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Par
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ParDescriptionSeq *&);
 
 // TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
+// be\be_visitor_sequence/any_op_ch.cpp:53
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::ContextIdSeq &); // copying version
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ContextIdSeq*); // noncopying version
@@ -5201,14 +5223,14 @@ TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Con
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ContextIdSeq *&);
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
+// be\be_visitor_interface/any_op_ch.cpp:53
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::OperationDef_ptr); // copying
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::OperationDef_ptr *); // non-copying
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::OperationDef_ptr &);
 
 // TAO_IDL - Generated from
-// be\be_visitor_structure/any_op_ch.cpp:52
+// be\be_visitor_structure/any_op_ch.cpp:53
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::OperationDescription &); // copying version
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::OperationDescription*); // noncopying version
@@ -5216,7 +5238,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Ope
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::OperationDescription *&);
 
 // TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
+// be\be_visitor_sequence/any_op_ch.cpp:53
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::RepositoryIdSeq &); // copying version
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::RepositoryIdSeq*); // noncopying version
@@ -5224,7 +5246,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Rep
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::RepositoryIdSeq *&);
 
 // TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
+// be\be_visitor_sequence/any_op_ch.cpp:53
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::OpDescriptionSeq &); // copying version
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::OpDescriptionSeq*); // noncopying version
@@ -5232,7 +5254,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::OpD
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::OpDescriptionSeq *&);
 
 // TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
+// be\be_visitor_sequence/any_op_ch.cpp:53
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::AttrDescriptionSeq &); // copying version
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::AttrDescriptionSeq*); // noncopying version
@@ -5240,7 +5262,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Att
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::AttrDescriptionSeq *&);
 
 // TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
+// be\be_visitor_sequence/any_op_ch.cpp:53
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::ExtAttrDescriptionSeq &); // copying version
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ExtAttrDescriptionSeq*); // noncopying version
@@ -5248,14 +5270,14 @@ TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Ext
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ExtAttrDescriptionSeq *&);
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
+// be\be_visitor_interface/any_op_ch.cpp:53
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::InterfaceDef_ptr); // copying
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::InterfaceDef_ptr *); // non-copying
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::InterfaceDef_ptr &);
 
 // TAO_IDL - Generated from
-// be\be_visitor_structure/any_op_ch.cpp:52
+// be\be_visitor_structure/any_op_ch.cpp:53
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::InterfaceDef::FullInterfaceDescription &); // copying version
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::InterfaceDef::FullInterfaceDescription*); // noncopying version
@@ -5263,7 +5285,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Int
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::InterfaceDef::FullInterfaceDescription *&);
 
 // TAO_IDL - Generated from
-// be\be_visitor_structure/any_op_ch.cpp:52
+// be\be_visitor_structure/any_op_ch.cpp:53
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::InterfaceDescription &); // copying version
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::InterfaceDescription*); // noncopying version
@@ -5271,14 +5293,14 @@ TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Int
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::InterfaceDescription *&);
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
+// be\be_visitor_interface/any_op_ch.cpp:53
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::InterfaceAttrExtension_ptr); // copying
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::InterfaceAttrExtension_ptr *); // non-copying
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::InterfaceAttrExtension_ptr &);
 
 // TAO_IDL - Generated from
-// be\be_visitor_structure/any_op_ch.cpp:52
+// be\be_visitor_structure/any_op_ch.cpp:53
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription &); // copying version
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription*); // noncopying version
@@ -5286,35 +5308,35 @@ TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Int
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::InterfaceAttrExtension::ExtFullInterfaceDescription *&);
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
+// be\be_visitor_interface/any_op_ch.cpp:53
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ExtInterfaceDef_ptr); // copying
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ExtInterfaceDef_ptr *); // non-copying
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ExtInterfaceDef_ptr &);
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
+// be\be_visitor_interface/any_op_ch.cpp:53
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::AbstractInterfaceDef_ptr); // copying
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::AbstractInterfaceDef_ptr *); // non-copying
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::AbstractInterfaceDef_ptr &);
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
+// be\be_visitor_interface/any_op_ch.cpp:53
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ExtAbstractInterfaceDef_ptr); // copying
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ExtAbstractInterfaceDef_ptr *); // non-copying
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ExtAbstractInterfaceDef_ptr &);
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
+// be\be_visitor_interface/any_op_ch.cpp:53
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::LocalInterfaceDef_ptr); // copying
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::LocalInterfaceDef_ptr *); // non-copying
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::LocalInterfaceDef_ptr &);
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
+// be\be_visitor_interface/any_op_ch.cpp:53
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ExtLocalInterfaceDef_ptr); // copying
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ExtLocalInterfaceDef_ptr *); // non-copying
@@ -5663,7 +5685,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::E
 TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ExtLocalInterfaceDef_ptr &);
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:955
+// be\be_codegen.cpp:1136
 
 #if defined (__ACE_INLINE__)
 #include "IFR_BasicC.inl"
diff --git a/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.cpp b/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.cpp
index 9c80b614a85..ae931277f9a 100644
--- a/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.cpp
+++ b/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.cpp
@@ -7,8 +7,8 @@
 #include "tao/ORB.h"
 #include "tao/Invocation_Adapter.h"
 #include "tao/Stub.h"
-#include "tao/NVList.h"
-#include "tao/Any_Unknown_IDL_Type.h"
+#include "tao/AnyTypeCode/NVList.h"
+#include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h"
 
 ACE_RCSID (IFR_Client,
            IFR_Client_Adapter_Impl,
@@ -23,7 +23,8 @@ namespace TAO
             CORBA::InterfaceDef_ptr,
             CORBA::InterfaceDef_var,
             CORBA::InterfaceDef_out,
-            TAO::Objref_Traits<CORBA::InterfaceDef>
+            TAO::Objref_Traits<CORBA::InterfaceDef>,
+            TAO::Any_Insert_Policy_Stream <CORBA::InterfaceDef_ptr>
           >
   {
   };
@@ -44,11 +45,11 @@ TAO_IFR_Client_Adapter_Impl::interfacedef_cdr_insert (
 
 void
 TAO_IFR_Client_Adapter_Impl::interfacedef_any_insert (
-    CORBA::Any &any,
+    CORBA::Any *any,
     CORBA::InterfaceDef_ptr object_type
   )
 {
-  any <<= object_type;
+  (*any) <<= object_type;
 }
 
 void
diff --git a/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.h b/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.h
index c6a2435b280..bab2b9d2cb8 100644
--- a/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.h
+++ b/TAO/tao/IFR_Client/IFR_Client_Adapter_Impl.h
@@ -47,7 +47,7 @@ public:
     );
 
   virtual void interfacedef_any_insert (
-      CORBA::Any &any,
+      CORBA::Any *any,
       CORBA::InterfaceDef_ptr object_type
     );
 
diff --git a/TAO/tao/IFR_Client/IFR_Components.pidl b/TAO/tao/IFR_Client/IFR_Components.pidl
index 2431d9b5fe5..6bae6d0ebb0 100644
--- a/TAO/tao/IFR_Client/IFR_Components.pidl
+++ b/TAO/tao/IFR_Client/IFR_Components.pidl
@@ -1,55 +1,50 @@
-//
-// $Id$
-//
-// ================================================================
-//
-// = LIBRARY
-//   TAO_IFR_Client
-//
-// = FILENAME
-//   IFR_Components.pidl
-//
-// = DESCRIPTION
-//   This file was used to generate the code in IFR_ComponentsC.{h,i,cpp}.
-//   The original file Interface.idl was split into four pieces, to
-//   keep the generated files to a manageable size and reduce build
-//   time. This IDL file contains all the interfaces and other data
-//   types related to CORBA components.
-//
-//   The command used to generate code from this IDL file is:
-//
-//     tao_idl -Ge 1 -Sc -GA -I../.. \
-//          -Wb,export_macro=TAO_IFR_Client_Export \
-//          -Wb,export_include=ifr_client_export.h \
-//          -Wb,pre_include="ace/pre.h" \
-//          -Wb,post_include="ace/post.h" \
-//          IFR_Components.pidl
-//
-//   Only the stub files are used in the TAO_IFR_Client library. The
-//   skeleton files can be deleted from this directory.
-//
-//   No patching of the generated stub files is necessary.
-//
-//   To generate the skeleton files for the IFR Service, the command is:
-//
-//     tao_idl -o ../../orbsvcs/orbsvcs/IFRService -Ge 1 \
-//          -Wb,pre_include="ace/pre.h" \
-//          -Wb,post_include="ace/post.h" \
-//          IFR_Components.pidl
-//
-//   The only modification necessary to the skeleton files is to
-//   change
-//
-//   #include "IFR_ComponentsC.h"
-//
-//   to
-//
-//   #include "tao/IFR_Client/IFR_ComponentsC.h"
-//
-//   in IFR_ComponentsS.h. The stub files may be deleted from the IFRService
-//   directory.
-//
-// ================================================================
+// -*- IDL -*-
+
+/**
+ * @file IFR_Components.pidl
+ *
+ * $Id$
+ *
+ *   This file was used to generate the code in IFR_ComponentsC.{h,inl,cpp}.
+ *   The original file Interface.idl was split into four pieces, to
+ *   keep the generated files to a manageable size and reduce build
+ *   time. This IDL file contains all the interfaces and other data
+ *   types related to CORBA components.
+ *
+ *   The command used to generate code from this IDL file is:
+ *
+ *     tao_idl -Ge 1 -Sc -I../.. \
+ *          -Wb,export_macro=TAO_IFR_Client_Export \
+ *          -Wb,export_include=ifr_client_export.h \
+ *          -Wb,pre_include="ace/pre.h" \
+ *          -Wb,post_include="ace/post.h" \
+ *          IFR_Components.pidl
+ *
+ *   Only the stub files are used in the TAO_IFR_Client library. The
+ *   skeleton files can be deleted from this directory.
+ *
+ *   No patching of the generated stub files is necessary.
+ *
+ *   To generate the skeleton files for the IFR Service, the command is:
+ *
+ *     tao_idl -o ../../orbsvcs/orbsvcs/IFRService -Ge 1 \
+ *          -Wb,pre_include="ace/pre.h" \
+ *          -Wb,post_include="ace/post.h" \
+ *          IFR_Components.pidl
+ *
+ *   The only modification necessary to the skeleton files is to
+ *   change
+ *
+ *   #include "IFR_ComponentsC.h"
+ *
+ *   to
+ *
+ *   #include "tao/IFR_Client/IFR_ComponentsC.h"
+ *
+ *   in IFR_ComponentsS.h. The stub files may be deleted from the IFRService
+ *   directory.
+ *
+ */
 
 #ifndef _IFR_COMPONENTS_IDL_
 #define _IFR_COMPONENTS_IDL_
diff --git a/TAO/tao/IFR_Client/IFR_ComponentsA.cpp b/TAO/tao/IFR_Client/IFR_ComponentsA.cpp
deleted file mode 100644
index 158fdd88a07..00000000000
--- a/TAO/tao/IFR_Client/IFR_ComponentsA.cpp
+++ /dev/null
@@ -1,1954 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "IFR_ComponentsC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
-#include "tao/Sequence_TypeCode_Static.h"
-#include "tao/String_TypeCode_Static.h"
-#include "tao/Struct_TypeCode_Static.h"
-#include "tao/TypeCode_Struct_Field.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
-#include "tao/Any_Dual_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ComponentIR_EventDef (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/ComponentIR/EventDef:1.0",
-    "EventDef");
-  
-namespace CORBA
-{
-  namespace ComponentIR
-  {
-    ::CORBA::TypeCode_ptr const _tc_EventDef =
-      &_tao_tc_CORBA_ComponentIR_EventDef;
-  }
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ComponentIR_Container (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/ComponentIR/Container:1.0",
-    "Container");
-  
-namespace CORBA
-{
-  namespace ComponentIR
-  {
-    ::CORBA::TypeCode_ptr const _tc_Container =
-      &_tao_tc_CORBA_ComponentIR_Container;
-  }
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ComponentIR_ModuleDef (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/ComponentIR/ModuleDef:1.0",
-    "ModuleDef");
-  
-namespace CORBA
-{
-  namespace ComponentIR
-  {
-    ::CORBA::TypeCode_ptr const _tc_ModuleDef =
-      &_tao_tc_CORBA_ComponentIR_ModuleDef;
-  }
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ComponentIR_Repository (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/ComponentIR/Repository:1.0",
-    "Repository");
-  
-namespace CORBA
-{
-  namespace ComponentIR
-  {
-    ::CORBA::TypeCode_ptr const _tc_Repository =
-      &_tao_tc_CORBA_ComponentIR_Repository;
-  }
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ComponentIR_ProvidesDef (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/ComponentIR/ProvidesDef:1.0",
-    "ProvidesDef");
-  
-namespace CORBA
-{
-  namespace ComponentIR
-  {
-    ::CORBA::TypeCode_ptr const _tc_ProvidesDef =
-      &_tao_tc_CORBA_ComponentIR_ProvidesDef;
-  }
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_ComponentIR_ProvidesDescription[] =
-  {
-    { "name", &CORBA::_tc_Identifier },
-    { "id", &CORBA::_tc_RepositoryId },
-    { "defined_in", &CORBA::_tc_RepositoryId },
-    { "version", &CORBA::_tc_VersionSpec },
-    { "interface_type", &CORBA::_tc_RepositoryId }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ComponentIR_ProvidesDescription (
-    CORBA::tk_struct,
-    "IDL:omg.org/CORBA/ComponentIR/ProvidesDescription:1.0",
-    "ProvidesDescription",
-    _tao_fields_CORBA_ComponentIR_ProvidesDescription,
-    5);
-  
-namespace CORBA
-{
-  namespace ComponentIR
-  {
-    ::CORBA::TypeCode_ptr const _tc_ProvidesDescription =
-      &_tao_tc_CORBA_ComponentIR_ProvidesDescription;
-  }
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ComponentIR_UsesDef (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/ComponentIR/UsesDef:1.0",
-    "UsesDef");
-  
-namespace CORBA
-{
-  namespace ComponentIR
-  {
-    ::CORBA::TypeCode_ptr const _tc_UsesDef =
-      &_tao_tc_CORBA_ComponentIR_UsesDef;
-  }
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_ComponentIR_UsesDescription[] =
-  {
-    { "name", &CORBA::_tc_Identifier },
-    { "id", &CORBA::_tc_RepositoryId },
-    { "defined_in", &CORBA::_tc_RepositoryId },
-    { "version", &CORBA::_tc_VersionSpec },
-    { "interface_type", &CORBA::_tc_RepositoryId },
-    { "is_multiple", &CORBA::_tc_boolean }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ComponentIR_UsesDescription (
-    CORBA::tk_struct,
-    "IDL:omg.org/CORBA/ComponentIR/UsesDescription:1.0",
-    "UsesDescription",
-    _tao_fields_CORBA_ComponentIR_UsesDescription,
-    6);
-  
-namespace CORBA
-{
-  namespace ComponentIR
-  {
-    ::CORBA::TypeCode_ptr const _tc_UsesDescription =
-      &_tao_tc_CORBA_ComponentIR_UsesDescription;
-  }
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ComponentIR_EventPortDef (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/ComponentIR/EventPortDef:1.0",
-    "EventPortDef");
-  
-namespace CORBA
-{
-  namespace ComponentIR
-  {
-    ::CORBA::TypeCode_ptr const _tc_EventPortDef =
-      &_tao_tc_CORBA_ComponentIR_EventPortDef;
-  }
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_ComponentIR_EventPortDescription[] =
-  {
-    { "name", &CORBA::_tc_Identifier },
-    { "id", &CORBA::_tc_RepositoryId },
-    { "defined_in", &CORBA::_tc_RepositoryId },
-    { "version", &CORBA::_tc_VersionSpec },
-    { "event", &CORBA::_tc_RepositoryId }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ComponentIR_EventPortDescription (
-    CORBA::tk_struct,
-    "IDL:omg.org/CORBA/ComponentIR/EventPortDescription:1.0",
-    "EventPortDescription",
-    _tao_fields_CORBA_ComponentIR_EventPortDescription,
-    5);
-  
-namespace CORBA
-{
-  namespace ComponentIR
-  {
-    ::CORBA::TypeCode_ptr const _tc_EventPortDescription =
-      &_tao_tc_CORBA_ComponentIR_EventPortDescription;
-  }
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ComponentIR_EmitsDef (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/ComponentIR/EmitsDef:1.0",
-    "EmitsDef");
-  
-namespace CORBA
-{
-  namespace ComponentIR
-  {
-    ::CORBA::TypeCode_ptr const _tc_EmitsDef =
-      &_tao_tc_CORBA_ComponentIR_EmitsDef;
-  }
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ComponentIR_PublishesDef (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/ComponentIR/PublishesDef:1.0",
-    "PublishesDef");
-  
-namespace CORBA
-{
-  namespace ComponentIR
-  {
-    ::CORBA::TypeCode_ptr const _tc_PublishesDef =
-      &_tao_tc_CORBA_ComponentIR_PublishesDef;
-  }
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ComponentIR_ConsumesDef (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/ComponentIR/ConsumesDef:1.0",
-    "ConsumesDef");
-  
-namespace CORBA
-{
-  namespace ComponentIR
-  {
-    ::CORBA::TypeCode_ptr const _tc_ConsumesDef =
-      &_tao_tc_CORBA_ComponentIR_ConsumesDef;
-  }
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ComponentIR_ComponentDef (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/ComponentIR/ComponentDef:1.0",
-    "ComponentDef");
-  
-namespace CORBA
-{
-  namespace ComponentIR
-  {
-    ::CORBA::TypeCode_ptr const _tc_ComponentDef =
-      &_tao_tc_CORBA_ComponentIR_ComponentDef;
-  }
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
-
-
-#ifndef _TAO_TYPECODE_CORBA_ComponentIR_ProvidesDescriptionSeq_GUARD
-#define _TAO_TYPECODE_CORBA_ComponentIR_ProvidesDescriptionSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_ComponentIR_ProvidesDescriptionSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::ComponentIR::_tc_ProvidesDescription,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_ComponentIR_ProvidesDescriptionSeq_0 =
-      &CORBA_ComponentIR_ProvidesDescriptionSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_ComponentIR_ProvidesDescriptionSeq_GUARD */
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ComponentIR_ProvidesDescriptionSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/ComponentIR/ProvidesDescriptionSeq:1.0",
-    "ProvidesDescriptionSeq",
-    &TAO::TypeCode::tc_CORBA_ComponentIR_ProvidesDescriptionSeq_0);
-  
-namespace CORBA
-{
-  namespace ComponentIR
-  {
-    ::CORBA::TypeCode_ptr const _tc_ProvidesDescriptionSeq =
-      &_tao_tc_CORBA_ComponentIR_ProvidesDescriptionSeq;
-  }
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
-
-
-#ifndef _TAO_TYPECODE_CORBA_ComponentIR_UsesDescriptionSeq_GUARD
-#define _TAO_TYPECODE_CORBA_ComponentIR_UsesDescriptionSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_ComponentIR_UsesDescriptionSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::ComponentIR::_tc_UsesDescription,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_ComponentIR_UsesDescriptionSeq_0 =
-      &CORBA_ComponentIR_UsesDescriptionSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_ComponentIR_UsesDescriptionSeq_GUARD */
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ComponentIR_UsesDescriptionSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/ComponentIR/UsesDescriptionSeq:1.0",
-    "UsesDescriptionSeq",
-    &TAO::TypeCode::tc_CORBA_ComponentIR_UsesDescriptionSeq_0);
-  
-namespace CORBA
-{
-  namespace ComponentIR
-  {
-    ::CORBA::TypeCode_ptr const _tc_UsesDescriptionSeq =
-      &_tao_tc_CORBA_ComponentIR_UsesDescriptionSeq;
-  }
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
-
-
-#ifndef _TAO_TYPECODE_CORBA_ComponentIR_EventPortDescriptionSeq_GUARD
-#define _TAO_TYPECODE_CORBA_ComponentIR_EventPortDescriptionSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_ComponentIR_EventPortDescriptionSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::ComponentIR::_tc_EventPortDescription,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_ComponentIR_EventPortDescriptionSeq_0 =
-      &CORBA_ComponentIR_EventPortDescriptionSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_ComponentIR_EventPortDescriptionSeq_GUARD */
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ComponentIR_EventPortDescriptionSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/ComponentIR/EventPortDescriptionSeq:1.0",
-    "EventPortDescriptionSeq",
-    &TAO::TypeCode::tc_CORBA_ComponentIR_EventPortDescriptionSeq_0);
-  
-namespace CORBA
-{
-  namespace ComponentIR
-  {
-    ::CORBA::TypeCode_ptr const _tc_EventPortDescriptionSeq =
-      &_tao_tc_CORBA_ComponentIR_EventPortDescriptionSeq;
-  }
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_ComponentIR_ComponentDescription[] =
-  {
-    { "name", &CORBA::_tc_Identifier },
-    { "id", &CORBA::_tc_RepositoryId },
-    { "defined_in", &CORBA::_tc_RepositoryId },
-    { "version", &CORBA::_tc_VersionSpec },
-    { "base_component", &CORBA::_tc_RepositoryId },
-    { "supported_interfaces", &CORBA::_tc_RepositoryIdSeq },
-    { "provided_interfaces", &CORBA::ComponentIR::_tc_ProvidesDescriptionSeq },
-    { "used_interfaces", &CORBA::ComponentIR::_tc_UsesDescriptionSeq },
-    { "emits_events", &CORBA::ComponentIR::_tc_EventPortDescriptionSeq },
-    { "publishes_events", &CORBA::ComponentIR::_tc_EventPortDescriptionSeq },
-    { "consumes_events", &CORBA::ComponentIR::_tc_EventPortDescriptionSeq },
-    { "attributes", &CORBA::_tc_ExtAttrDescriptionSeq },
-    { "type", &CORBA::_tc_TypeCode }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ComponentIR_ComponentDescription (
-    CORBA::tk_struct,
-    "IDL:omg.org/CORBA/ComponentIR/ComponentDescription:1.0",
-    "ComponentDescription",
-    _tao_fields_CORBA_ComponentIR_ComponentDescription,
-    13);
-  
-namespace CORBA
-{
-  namespace ComponentIR
-  {
-    ::CORBA::TypeCode_ptr const _tc_ComponentDescription =
-      &_tao_tc_CORBA_ComponentIR_ComponentDescription;
-  }
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ComponentIR_FactoryDef (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/ComponentIR/FactoryDef:1.0",
-    "FactoryDef");
-  
-namespace CORBA
-{
-  namespace ComponentIR
-  {
-    ::CORBA::TypeCode_ptr const _tc_FactoryDef =
-      &_tao_tc_CORBA_ComponentIR_FactoryDef;
-  }
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ComponentIR_FinderDef (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/ComponentIR/FinderDef:1.0",
-    "FinderDef");
-  
-namespace CORBA
-{
-  namespace ComponentIR
-  {
-    ::CORBA::TypeCode_ptr const _tc_FinderDef =
-      &_tao_tc_CORBA_ComponentIR_FinderDef;
-  }
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ComponentIR_HomeDef (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/ComponentIR/HomeDef:1.0",
-    "HomeDef");
-  
-namespace CORBA
-{
-  namespace ComponentIR
-  {
-    ::CORBA::TypeCode_ptr const _tc_HomeDef =
-      &_tao_tc_CORBA_ComponentIR_HomeDef;
-  }
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_ComponentIR_HomeDescription[] =
-  {
-    { "name", &CORBA::_tc_Identifier },
-    { "id", &CORBA::_tc_RepositoryId },
-    { "defined_in", &CORBA::_tc_RepositoryId },
-    { "version", &CORBA::_tc_VersionSpec },
-    { "base_home", &CORBA::_tc_RepositoryId },
-    { "managed_component", &CORBA::_tc_RepositoryId },
-    { "primary_key", &CORBA::_tc_ValueDescription },
-    { "factories", &CORBA::_tc_OpDescriptionSeq },
-    { "finders", &CORBA::_tc_OpDescriptionSeq },
-    { "operations", &CORBA::_tc_OpDescriptionSeq },
-    { "attributes", &CORBA::_tc_ExtAttrDescriptionSeq },
-    { "type", &CORBA::_tc_TypeCode }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ComponentIR_HomeDescription (
-    CORBA::tk_struct,
-    "IDL:omg.org/CORBA/ComponentIR/HomeDescription:1.0",
-    "HomeDescription",
-    _tao_fields_CORBA_ComponentIR_HomeDescription,
-    12);
-  
-namespace CORBA
-{
-  namespace ComponentIR
-  {
-    ::CORBA::TypeCode_ptr const _tc_HomeDescription =
-      &_tao_tc_CORBA_ComponentIR_HomeDescription;
-  }
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::ComponentIR::EventDef>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ComponentIR::EventDef_ptr _tao_elem
-  )
-{
-  CORBA::ComponentIR::EventDef_ptr _tao_objptr =
-    CORBA::ComponentIR::EventDef::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ComponentIR::EventDef_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::ComponentIR::EventDef>::insert (
-      _tao_any,
-      CORBA::ComponentIR::EventDef::_tao_any_destructor,
-      CORBA::ComponentIR::_tc_EventDef,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ComponentIR::EventDef_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::ComponentIR::EventDef>::extract (
-        _tao_any,
-        CORBA::ComponentIR::EventDef::_tao_any_destructor,
-        CORBA::ComponentIR::_tc_EventDef,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::ComponentIR::Container>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ComponentIR::Container_ptr _tao_elem
-  )
-{
-  CORBA::ComponentIR::Container_ptr _tao_objptr =
-    CORBA::ComponentIR::Container::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ComponentIR::Container_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::ComponentIR::Container>::insert (
-      _tao_any,
-      CORBA::ComponentIR::Container::_tao_any_destructor,
-      CORBA::ComponentIR::_tc_Container,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ComponentIR::Container_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::ComponentIR::Container>::extract (
-        _tao_any,
-        CORBA::ComponentIR::Container::_tao_any_destructor,
-        CORBA::ComponentIR::_tc_Container,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::ComponentIR::ModuleDef>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ComponentIR::ModuleDef_ptr _tao_elem
-  )
-{
-  CORBA::ComponentIR::ModuleDef_ptr _tao_objptr =
-    CORBA::ComponentIR::ModuleDef::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ComponentIR::ModuleDef_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::ComponentIR::ModuleDef>::insert (
-      _tao_any,
-      CORBA::ComponentIR::ModuleDef::_tao_any_destructor,
-      CORBA::ComponentIR::_tc_ModuleDef,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ComponentIR::ModuleDef_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::ComponentIR::ModuleDef>::extract (
-        _tao_any,
-        CORBA::ComponentIR::ModuleDef::_tao_any_destructor,
-        CORBA::ComponentIR::_tc_ModuleDef,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::ComponentIR::Repository>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ComponentIR::Repository_ptr _tao_elem
-  )
-{
-  CORBA::ComponentIR::Repository_ptr _tao_objptr =
-    CORBA::ComponentIR::Repository::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ComponentIR::Repository_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::ComponentIR::Repository>::insert (
-      _tao_any,
-      CORBA::ComponentIR::Repository::_tao_any_destructor,
-      CORBA::ComponentIR::_tc_Repository,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ComponentIR::Repository_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::ComponentIR::Repository>::extract (
-        _tao_any,
-        CORBA::ComponentIR::Repository::_tao_any_destructor,
-        CORBA::ComponentIR::_tc_Repository,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::ComponentIR::ProvidesDef>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ComponentIR::ProvidesDef_ptr _tao_elem
-  )
-{
-  CORBA::ComponentIR::ProvidesDef_ptr _tao_objptr =
-    CORBA::ComponentIR::ProvidesDef::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ComponentIR::ProvidesDef_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::ComponentIR::ProvidesDef>::insert (
-      _tao_any,
-      CORBA::ComponentIR::ProvidesDef::_tao_any_destructor,
-      CORBA::ComponentIR::_tc_ProvidesDef,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ComponentIR::ProvidesDef_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::ComponentIR::ProvidesDef>::extract (
-        _tao_any,
-        CORBA::ComponentIR::ProvidesDef::_tao_any_destructor,
-        CORBA::ComponentIR::_tc_ProvidesDef,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::ComponentIR::ProvidesDescription &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ComponentIR::ProvidesDescription>::insert_copy (
-      _tao_any,
-      CORBA::ComponentIR::ProvidesDescription::_tao_any_destructor,
-      CORBA::ComponentIR::_tc_ProvidesDescription,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ComponentIR::ProvidesDescription *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ComponentIR::ProvidesDescription>::insert (
-      _tao_any,
-      CORBA::ComponentIR::ProvidesDescription::_tao_any_destructor,
-      CORBA::ComponentIR::_tc_ProvidesDescription,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ComponentIR::ProvidesDescription *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::ComponentIR::ProvidesDescription *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::ComponentIR::ProvidesDescription *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::ComponentIR::ProvidesDescription>::extract (
-        _tao_any,
-        CORBA::ComponentIR::ProvidesDescription::_tao_any_destructor,
-        CORBA::ComponentIR::_tc_ProvidesDescription,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::ComponentIR::UsesDef>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ComponentIR::UsesDef_ptr _tao_elem
-  )
-{
-  CORBA::ComponentIR::UsesDef_ptr _tao_objptr =
-    CORBA::ComponentIR::UsesDef::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ComponentIR::UsesDef_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::ComponentIR::UsesDef>::insert (
-      _tao_any,
-      CORBA::ComponentIR::UsesDef::_tao_any_destructor,
-      CORBA::ComponentIR::_tc_UsesDef,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ComponentIR::UsesDef_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::ComponentIR::UsesDef>::extract (
-        _tao_any,
-        CORBA::ComponentIR::UsesDef::_tao_any_destructor,
-        CORBA::ComponentIR::_tc_UsesDef,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::ComponentIR::UsesDescription &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ComponentIR::UsesDescription>::insert_copy (
-      _tao_any,
-      CORBA::ComponentIR::UsesDescription::_tao_any_destructor,
-      CORBA::ComponentIR::_tc_UsesDescription,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ComponentIR::UsesDescription *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ComponentIR::UsesDescription>::insert (
-      _tao_any,
-      CORBA::ComponentIR::UsesDescription::_tao_any_destructor,
-      CORBA::ComponentIR::_tc_UsesDescription,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ComponentIR::UsesDescription *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::ComponentIR::UsesDescription *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::ComponentIR::UsesDescription *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::ComponentIR::UsesDescription>::extract (
-        _tao_any,
-        CORBA::ComponentIR::UsesDescription::_tao_any_destructor,
-        CORBA::ComponentIR::_tc_UsesDescription,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::ComponentIR::EventPortDef>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ComponentIR::EventPortDef_ptr _tao_elem
-  )
-{
-  CORBA::ComponentIR::EventPortDef_ptr _tao_objptr =
-    CORBA::ComponentIR::EventPortDef::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ComponentIR::EventPortDef_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::ComponentIR::EventPortDef>::insert (
-      _tao_any,
-      CORBA::ComponentIR::EventPortDef::_tao_any_destructor,
-      CORBA::ComponentIR::_tc_EventPortDef,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ComponentIR::EventPortDef_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::ComponentIR::EventPortDef>::extract (
-        _tao_any,
-        CORBA::ComponentIR::EventPortDef::_tao_any_destructor,
-        CORBA::ComponentIR::_tc_EventPortDef,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::ComponentIR::EventPortDescription &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ComponentIR::EventPortDescription>::insert_copy (
-      _tao_any,
-      CORBA::ComponentIR::EventPortDescription::_tao_any_destructor,
-      CORBA::ComponentIR::_tc_EventPortDescription,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ComponentIR::EventPortDescription *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ComponentIR::EventPortDescription>::insert (
-      _tao_any,
-      CORBA::ComponentIR::EventPortDescription::_tao_any_destructor,
-      CORBA::ComponentIR::_tc_EventPortDescription,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ComponentIR::EventPortDescription *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::ComponentIR::EventPortDescription *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::ComponentIR::EventPortDescription *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::ComponentIR::EventPortDescription>::extract (
-        _tao_any,
-        CORBA::ComponentIR::EventPortDescription::_tao_any_destructor,
-        CORBA::ComponentIR::_tc_EventPortDescription,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::ComponentIR::EmitsDef>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ComponentIR::EmitsDef_ptr _tao_elem
-  )
-{
-  CORBA::ComponentIR::EmitsDef_ptr _tao_objptr =
-    CORBA::ComponentIR::EmitsDef::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ComponentIR::EmitsDef_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::ComponentIR::EmitsDef>::insert (
-      _tao_any,
-      CORBA::ComponentIR::EmitsDef::_tao_any_destructor,
-      CORBA::ComponentIR::_tc_EmitsDef,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ComponentIR::EmitsDef_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::ComponentIR::EmitsDef>::extract (
-        _tao_any,
-        CORBA::ComponentIR::EmitsDef::_tao_any_destructor,
-        CORBA::ComponentIR::_tc_EmitsDef,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::ComponentIR::PublishesDef>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ComponentIR::PublishesDef_ptr _tao_elem
-  )
-{
-  CORBA::ComponentIR::PublishesDef_ptr _tao_objptr =
-    CORBA::ComponentIR::PublishesDef::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ComponentIR::PublishesDef_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::ComponentIR::PublishesDef>::insert (
-      _tao_any,
-      CORBA::ComponentIR::PublishesDef::_tao_any_destructor,
-      CORBA::ComponentIR::_tc_PublishesDef,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ComponentIR::PublishesDef_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::ComponentIR::PublishesDef>::extract (
-        _tao_any,
-        CORBA::ComponentIR::PublishesDef::_tao_any_destructor,
-        CORBA::ComponentIR::_tc_PublishesDef,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::ComponentIR::ConsumesDef>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ComponentIR::ConsumesDef_ptr _tao_elem
-  )
-{
-  CORBA::ComponentIR::ConsumesDef_ptr _tao_objptr =
-    CORBA::ComponentIR::ConsumesDef::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ComponentIR::ConsumesDef_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::ComponentIR::ConsumesDef>::insert (
-      _tao_any,
-      CORBA::ComponentIR::ConsumesDef::_tao_any_destructor,
-      CORBA::ComponentIR::_tc_ConsumesDef,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ComponentIR::ConsumesDef_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::ComponentIR::ConsumesDef>::extract (
-        _tao_any,
-        CORBA::ComponentIR::ConsumesDef::_tao_any_destructor,
-        CORBA::ComponentIR::_tc_ConsumesDef,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::ComponentIR::ComponentDef>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ComponentIR::ComponentDef_ptr _tao_elem
-  )
-{
-  CORBA::ComponentIR::ComponentDef_ptr _tao_objptr =
-    CORBA::ComponentIR::ComponentDef::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ComponentIR::ComponentDef_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::ComponentIR::ComponentDef>::insert (
-      _tao_any,
-      CORBA::ComponentIR::ComponentDef::_tao_any_destructor,
-      CORBA::ComponentIR::_tc_ComponentDef,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ComponentIR::ComponentDef_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::ComponentIR::ComponentDef>::extract (
-        _tao_any,
-        CORBA::ComponentIR::ComponentDef::_tao_any_destructor,
-        CORBA::ComponentIR::_tc_ComponentDef,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::ComponentIR::ProvidesDescriptionSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ComponentIR::ProvidesDescriptionSeq>::insert_copy (
-      _tao_any,
-      CORBA::ComponentIR::ProvidesDescriptionSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_ComponentIR_ProvidesDescriptionSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ComponentIR::ProvidesDescriptionSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ComponentIR::ProvidesDescriptionSeq>::insert (
-      _tao_any,
-      CORBA::ComponentIR::ProvidesDescriptionSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_ComponentIR_ProvidesDescriptionSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ComponentIR::ProvidesDescriptionSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::ComponentIR::ProvidesDescriptionSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::ComponentIR::ProvidesDescriptionSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::ComponentIR::ProvidesDescriptionSeq>::extract (
-        _tao_any,
-        CORBA::ComponentIR::ProvidesDescriptionSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_ComponentIR_ProvidesDescriptionSeq_0,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::ComponentIR::UsesDescriptionSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ComponentIR::UsesDescriptionSeq>::insert_copy (
-      _tao_any,
-      CORBA::ComponentIR::UsesDescriptionSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_ComponentIR_UsesDescriptionSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ComponentIR::UsesDescriptionSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ComponentIR::UsesDescriptionSeq>::insert (
-      _tao_any,
-      CORBA::ComponentIR::UsesDescriptionSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_ComponentIR_UsesDescriptionSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ComponentIR::UsesDescriptionSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::ComponentIR::UsesDescriptionSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::ComponentIR::UsesDescriptionSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::ComponentIR::UsesDescriptionSeq>::extract (
-        _tao_any,
-        CORBA::ComponentIR::UsesDescriptionSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_ComponentIR_UsesDescriptionSeq_0,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::ComponentIR::EventPortDescriptionSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ComponentIR::EventPortDescriptionSeq>::insert_copy (
-      _tao_any,
-      CORBA::ComponentIR::EventPortDescriptionSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_ComponentIR_EventPortDescriptionSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ComponentIR::EventPortDescriptionSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ComponentIR::EventPortDescriptionSeq>::insert (
-      _tao_any,
-      CORBA::ComponentIR::EventPortDescriptionSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_ComponentIR_EventPortDescriptionSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ComponentIR::EventPortDescriptionSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::ComponentIR::EventPortDescriptionSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::ComponentIR::EventPortDescriptionSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::ComponentIR::EventPortDescriptionSeq>::extract (
-        _tao_any,
-        CORBA::ComponentIR::EventPortDescriptionSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_ComponentIR_EventPortDescriptionSeq_0,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::ComponentIR::ComponentDescription &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ComponentIR::ComponentDescription>::insert_copy (
-      _tao_any,
-      CORBA::ComponentIR::ComponentDescription::_tao_any_destructor,
-      CORBA::ComponentIR::_tc_ComponentDescription,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ComponentIR::ComponentDescription *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ComponentIR::ComponentDescription>::insert (
-      _tao_any,
-      CORBA::ComponentIR::ComponentDescription::_tao_any_destructor,
-      CORBA::ComponentIR::_tc_ComponentDescription,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ComponentIR::ComponentDescription *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::ComponentIR::ComponentDescription *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::ComponentIR::ComponentDescription *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::ComponentIR::ComponentDescription>::extract (
-        _tao_any,
-        CORBA::ComponentIR::ComponentDescription::_tao_any_destructor,
-        CORBA::ComponentIR::_tc_ComponentDescription,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::ComponentIR::FactoryDef>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ComponentIR::FactoryDef_ptr _tao_elem
-  )
-{
-  CORBA::ComponentIR::FactoryDef_ptr _tao_objptr =
-    CORBA::ComponentIR::FactoryDef::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ComponentIR::FactoryDef_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::ComponentIR::FactoryDef>::insert (
-      _tao_any,
-      CORBA::ComponentIR::FactoryDef::_tao_any_destructor,
-      CORBA::ComponentIR::_tc_FactoryDef,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ComponentIR::FactoryDef_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::ComponentIR::FactoryDef>::extract (
-        _tao_any,
-        CORBA::ComponentIR::FactoryDef::_tao_any_destructor,
-        CORBA::ComponentIR::_tc_FactoryDef,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::ComponentIR::FinderDef>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ComponentIR::FinderDef_ptr _tao_elem
-  )
-{
-  CORBA::ComponentIR::FinderDef_ptr _tao_objptr =
-    CORBA::ComponentIR::FinderDef::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ComponentIR::FinderDef_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::ComponentIR::FinderDef>::insert (
-      _tao_any,
-      CORBA::ComponentIR::FinderDef::_tao_any_destructor,
-      CORBA::ComponentIR::_tc_FinderDef,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ComponentIR::FinderDef_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::ComponentIR::FinderDef>::extract (
-        _tao_any,
-        CORBA::ComponentIR::FinderDef::_tao_any_destructor,
-        CORBA::ComponentIR::_tc_FinderDef,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::ComponentIR::HomeDef>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ComponentIR::HomeDef_ptr _tao_elem
-  )
-{
-  CORBA::ComponentIR::HomeDef_ptr _tao_objptr =
-    CORBA::ComponentIR::HomeDef::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ComponentIR::HomeDef_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::ComponentIR::HomeDef>::insert (
-      _tao_any,
-      CORBA::ComponentIR::HomeDef::_tao_any_destructor,
-      CORBA::ComponentIR::_tc_HomeDef,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ComponentIR::HomeDef_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::ComponentIR::HomeDef>::extract (
-        _tao_any,
-        CORBA::ComponentIR::HomeDef::_tao_any_destructor,
-        CORBA::ComponentIR::_tc_HomeDef,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::ComponentIR::HomeDescription &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ComponentIR::HomeDescription>::insert_copy (
-      _tao_any,
-      CORBA::ComponentIR::HomeDescription::_tao_any_destructor,
-      CORBA::ComponentIR::_tc_HomeDescription,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ComponentIR::HomeDescription *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ComponentIR::HomeDescription>::insert (
-      _tao_any,
-      CORBA::ComponentIR::HomeDescription::_tao_any_destructor,
-      CORBA::ComponentIR::_tc_HomeDescription,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ComponentIR::HomeDescription *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::ComponentIR::HomeDescription *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::ComponentIR::HomeDescription *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::ComponentIR::HomeDescription>::extract (
-        _tao_any,
-        CORBA::ComponentIR::HomeDescription::_tao_any_destructor,
-        CORBA::ComponentIR::_tc_HomeDescription,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/IFR_Client/IFR_ComponentsA.h b/TAO/tao/IFR_Client/IFR_ComponentsA.h
new file mode 100644
index 00000000000..85f87f8d00d
--- /dev/null
+++ b/TAO/tao/IFR_Client/IFR_ComponentsA.h
@@ -0,0 +1,44 @@
+// -*- C++ -*-
+//
+// $Id$
+
+// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       Irvine, CA
+//       USA
+//       http://doc.ece.uci.edu/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
+//
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
+
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:390
+
+#ifndef _TAO_IDL_ORIG_IFR_COMPONENTS_A_H
+#define _TAO_IDL_ORIG_IFR_COMPONENTS_A_H
+
+#include /**/ "ace/pre.h"
+
+#include "tao/IFR_Client/IFR_ComponentsC.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include /**/ "ace/post.h"
+#endif /* ifndef */
+
diff --git a/TAO/tao/IFR_Client/IFR_ComponentsC.cpp b/TAO/tao/IFR_Client/IFR_ComponentsC.cpp
index f59eb0ee30b..06058bc2fed 100644
--- a/TAO/tao/IFR_Client/IFR_ComponentsC.cpp
+++ b/TAO/tao/IFR_Client/IFR_ComponentsC.cpp
@@ -26,14 +26,26 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:291
+// be\be_codegen.cpp:293
 
 
 #include "IFR_ComponentsC.h"
 #include "tao/CDR.h"
-#include "tao/Exception_Data.h"
+#include "tao/IFR_Client/IFR_ExtendedC.h"
+#include "tao/AnyTypeCode/orb_typesA.h"
 #include "tao/Invocation_Adapter.h"
 #include "tao/Object_T.h"
+#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Sequence_TypeCode_Static.h"
+#include "tao/AnyTypeCode/String_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Struct_TypeCode_Static.h"
+#include "tao/AnyTypeCode/TypeCode_Struct_Field.h"
+#include "tao/AnyTypeCode/Recursive_Type_TypeCode.h"
+#include "tao/AnyTypeCode/Any_Impl_T.h"
+#include "tao/AnyTypeCode/Any_Dual_Impl_T.h"
 #include "tao/Basic_Arguments.h"
 #include "tao/Object_Argument_T.h"
 #include "tao/Special_Basic_Arguments.h"
@@ -50,15 +62,18 @@
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
+// be\be_visitor_arg_traits.cpp:70
 
 // Arg traits specializations.
 namespace TAO
 {
 
-#if !defined (_CORBA_INTERFACEDEF__ARG_TRAITS_CS_)
-#define _CORBA_INTERFACEDEF__ARG_TRAITS_CS_
-  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
+
+#if !defined (_CORBA_INTERFACEDEF__ARG_TRAITS_)
+#define _CORBA_INTERFACEDEF__ARG_TRAITS_
+
   template<>
   class  Arg_Traits<CORBA::InterfaceDef>
     : public
@@ -66,35 +81,40 @@ namespace TAO
             CORBA::InterfaceDef_ptr,
             CORBA::InterfaceDef_var,
             CORBA::InterfaceDef_out,
-            TAO::Objref_Traits<CORBA::InterfaceDef>
+            TAO::Objref_Traits<CORBA::InterfaceDef>,
+            TAO::Any_Insert_Policy_Stream <CORBA::InterfaceDef_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:496
+  // be\be_visitor_arg_traits.cpp:543
+
+#if !defined (_CORBA_INTERFACEDEFSEQ__ARG_TRAITS_)
+#define _CORBA_INTERFACEDEFSEQ__ARG_TRAITS_
 
-#if !defined (_CORBA_INTERFACEDEFSEQ__ARG_TRAITS_CS_)
-#define _CORBA_INTERFACEDEFSEQ__ARG_TRAITS_CS_
-  
   template<>
   class Arg_Traits<CORBA::InterfaceDefSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::InterfaceDefSeq,
             CORBA::InterfaceDefSeq_var,
-            CORBA::InterfaceDefSeq_out
+            CORBA::InterfaceDefSeq_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::InterfaceDefSeq>
           >
   {
   };
 
 #endif /* end #if !defined */
 
-#if !defined (_CORBA_VALUEDEF__ARG_TRAITS_CS_)
-#define _CORBA_VALUEDEF__ARG_TRAITS_CS_
-  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
+
+#if !defined (_CORBA_VALUEDEF__ARG_TRAITS_)
+#define _CORBA_VALUEDEF__ARG_TRAITS_
+
   template<>
   class  Arg_Traits<CORBA::ValueDef>
     : public
@@ -102,91 +122,99 @@ namespace TAO
             CORBA::ValueDef_ptr,
             CORBA::ValueDef_var,
             CORBA::ValueDef_out,
-            TAO::Objref_Traits<CORBA::ValueDef>
+            TAO::Objref_Traits<CORBA::ValueDef>,
+            TAO::Any_Insert_Policy_Stream <CORBA::ValueDef_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:496
+  // be\be_visitor_arg_traits.cpp:543
+
+#if !defined (_CORBA_VALUEDEFSEQ__ARG_TRAITS_)
+#define _CORBA_VALUEDEFSEQ__ARG_TRAITS_
 
-#if !defined (_CORBA_VALUEDEFSEQ__ARG_TRAITS_CS_)
-#define _CORBA_VALUEDEFSEQ__ARG_TRAITS_CS_
-  
   template<>
   class Arg_Traits<CORBA::ValueDefSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::ValueDefSeq,
             CORBA::ValueDefSeq_var,
-            CORBA::ValueDefSeq_out
+            CORBA::ValueDefSeq_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::ValueDefSeq>
           >
   {
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:496
+  // be\be_visitor_arg_traits.cpp:543
+
+#if !defined (_CORBA_EXTINITIALIZERSEQ__ARG_TRAITS_)
+#define _CORBA_EXTINITIALIZERSEQ__ARG_TRAITS_
 
-#if !defined (_CORBA_EXTINITIALIZERSEQ__ARG_TRAITS_CS_)
-#define _CORBA_EXTINITIALIZERSEQ__ARG_TRAITS_CS_
-  
   template<>
   class Arg_Traits<CORBA::ExtInitializerSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::ExtInitializerSeq,
             CORBA::ExtInitializerSeq_var,
-            CORBA::ExtInitializerSeq_out
+            CORBA::ExtInitializerSeq_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::ExtInitializerSeq>
           >
   {
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:496
+  // be\be_visitor_arg_traits.cpp:543
+
+#if !defined (_CORBA_EXCEPTIONDEFSEQ__ARG_TRAITS_)
+#define _CORBA_EXCEPTIONDEFSEQ__ARG_TRAITS_
 
-#if !defined (_CORBA_EXCEPTIONDEFSEQ__ARG_TRAITS_CS_)
-#define _CORBA_EXCEPTIONDEFSEQ__ARG_TRAITS_CS_
-  
   template<>
   class Arg_Traits<CORBA::ExceptionDefSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::ExceptionDefSeq,
             CORBA::ExceptionDefSeq_var,
-            CORBA::ExceptionDefSeq_out
+            CORBA::ExceptionDefSeq_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::ExceptionDefSeq>
           >
   {
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:496
+  // be\be_visitor_arg_traits.cpp:543
+
+#if !defined (_CORBA_PARDESCRIPTIONSEQ__ARG_TRAITS_)
+#define _CORBA_PARDESCRIPTIONSEQ__ARG_TRAITS_
 
-#if !defined (_CORBA_PARDESCRIPTIONSEQ__ARG_TRAITS_CS_)
-#define _CORBA_PARDESCRIPTIONSEQ__ARG_TRAITS_CS_
-  
   template<>
   class Arg_Traits<CORBA::ParDescriptionSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::ParDescriptionSeq,
             CORBA::ParDescriptionSeq_var,
-            CORBA::ParDescriptionSeq_out
+            CORBA::ParDescriptionSeq_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::ParDescriptionSeq>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_COMPONENTIR_COMPONENTDEF__ARG_TRAITS_CS_)
-#define _CORBA_COMPONENTIR_COMPONENTDEF__ARG_TRAITS_CS_
+#if !defined (_CORBA_COMPONENTIR_COMPONENTDEF__ARG_TRAITS_)
+#define _CORBA_COMPONENTIR_COMPONENTDEF__ARG_TRAITS_
   
   template<>
   class  Arg_Traits<CORBA::ComponentIR::ComponentDef>
@@ -195,15 +223,19 @@ namespace TAO
             CORBA::ComponentIR::ComponentDef_ptr,
             CORBA::ComponentIR::ComponentDef_var,
             CORBA::ComponentIR::ComponentDef_out,
-            TAO::Objref_Traits<CORBA::ComponentIR::ComponentDef>
+            TAO::Objref_Traits<CORBA::ComponentIR::ComponentDef>,
+            TAO::Any_Insert_Policy_Stream <CORBA::ComponentIR::ComponentDef_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_COMPONENTIR_HOMEDEF__ARG_TRAITS_CS_)
-#define _CORBA_COMPONENTIR_HOMEDEF__ARG_TRAITS_CS_
+#if !defined (_CORBA_COMPONENTIR_HOMEDEF__ARG_TRAITS_)
+#define _CORBA_COMPONENTIR_HOMEDEF__ARG_TRAITS_
   
   template<>
   class  Arg_Traits<CORBA::ComponentIR::HomeDef>
@@ -212,15 +244,19 @@ namespace TAO
             CORBA::ComponentIR::HomeDef_ptr,
             CORBA::ComponentIR::HomeDef_var,
             CORBA::ComponentIR::HomeDef_out,
-            TAO::Objref_Traits<CORBA::ComponentIR::HomeDef>
+            TAO::Objref_Traits<CORBA::ComponentIR::HomeDef>,
+            TAO::Any_Insert_Policy_Stream <CORBA::ComponentIR::HomeDef_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_COMPONENTIR_EVENTDEF__ARG_TRAITS_CS_)
-#define _CORBA_COMPONENTIR_EVENTDEF__ARG_TRAITS_CS_
+#if !defined (_CORBA_COMPONENTIR_EVENTDEF__ARG_TRAITS_)
+#define _CORBA_COMPONENTIR_EVENTDEF__ARG_TRAITS_
   
   template<>
   class  Arg_Traits<CORBA::ComponentIR::EventDef>
@@ -229,15 +265,19 @@ namespace TAO
             CORBA::ComponentIR::EventDef_ptr,
             CORBA::ComponentIR::EventDef_var,
             CORBA::ComponentIR::EventDef_out,
-            TAO::Objref_Traits<CORBA::ComponentIR::EventDef>
+            TAO::Objref_Traits<CORBA::ComponentIR::EventDef>,
+            TAO::Any_Insert_Policy_Stream <CORBA::ComponentIR::EventDef_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_COMPONENTIR_PROVIDESDEF__ARG_TRAITS_CS_)
-#define _CORBA_COMPONENTIR_PROVIDESDEF__ARG_TRAITS_CS_
+#if !defined (_CORBA_COMPONENTIR_PROVIDESDEF__ARG_TRAITS_)
+#define _CORBA_COMPONENTIR_PROVIDESDEF__ARG_TRAITS_
   
   template<>
   class  Arg_Traits<CORBA::ComponentIR::ProvidesDef>
@@ -246,15 +286,19 @@ namespace TAO
             CORBA::ComponentIR::ProvidesDef_ptr,
             CORBA::ComponentIR::ProvidesDef_var,
             CORBA::ComponentIR::ProvidesDef_out,
-            TAO::Objref_Traits<CORBA::ComponentIR::ProvidesDef>
+            TAO::Objref_Traits<CORBA::ComponentIR::ProvidesDef>,
+            TAO::Any_Insert_Policy_Stream <CORBA::ComponentIR::ProvidesDef_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_COMPONENTIR_USESDEF__ARG_TRAITS_CS_)
-#define _CORBA_COMPONENTIR_USESDEF__ARG_TRAITS_CS_
+#if !defined (_CORBA_COMPONENTIR_USESDEF__ARG_TRAITS_)
+#define _CORBA_COMPONENTIR_USESDEF__ARG_TRAITS_
   
   template<>
   class  Arg_Traits<CORBA::ComponentIR::UsesDef>
@@ -263,15 +307,19 @@ namespace TAO
             CORBA::ComponentIR::UsesDef_ptr,
             CORBA::ComponentIR::UsesDef_var,
             CORBA::ComponentIR::UsesDef_out,
-            TAO::Objref_Traits<CORBA::ComponentIR::UsesDef>
+            TAO::Objref_Traits<CORBA::ComponentIR::UsesDef>,
+            TAO::Any_Insert_Policy_Stream <CORBA::ComponentIR::UsesDef_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_COMPONENTIR_EMITSDEF__ARG_TRAITS_CS_)
-#define _CORBA_COMPONENTIR_EMITSDEF__ARG_TRAITS_CS_
+#if !defined (_CORBA_COMPONENTIR_EMITSDEF__ARG_TRAITS_)
+#define _CORBA_COMPONENTIR_EMITSDEF__ARG_TRAITS_
   
   template<>
   class  Arg_Traits<CORBA::ComponentIR::EmitsDef>
@@ -280,15 +328,19 @@ namespace TAO
             CORBA::ComponentIR::EmitsDef_ptr,
             CORBA::ComponentIR::EmitsDef_var,
             CORBA::ComponentIR::EmitsDef_out,
-            TAO::Objref_Traits<CORBA::ComponentIR::EmitsDef>
+            TAO::Objref_Traits<CORBA::ComponentIR::EmitsDef>,
+            TAO::Any_Insert_Policy_Stream <CORBA::ComponentIR::EmitsDef_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_COMPONENTIR_PUBLISHESDEF__ARG_TRAITS_CS_)
-#define _CORBA_COMPONENTIR_PUBLISHESDEF__ARG_TRAITS_CS_
+#if !defined (_CORBA_COMPONENTIR_PUBLISHESDEF__ARG_TRAITS_)
+#define _CORBA_COMPONENTIR_PUBLISHESDEF__ARG_TRAITS_
   
   template<>
   class  Arg_Traits<CORBA::ComponentIR::PublishesDef>
@@ -297,15 +349,19 @@ namespace TAO
             CORBA::ComponentIR::PublishesDef_ptr,
             CORBA::ComponentIR::PublishesDef_var,
             CORBA::ComponentIR::PublishesDef_out,
-            TAO::Objref_Traits<CORBA::ComponentIR::PublishesDef>
+            TAO::Objref_Traits<CORBA::ComponentIR::PublishesDef>,
+            TAO::Any_Insert_Policy_Stream <CORBA::ComponentIR::PublishesDef_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_COMPONENTIR_CONSUMESDEF__ARG_TRAITS_CS_)
-#define _CORBA_COMPONENTIR_CONSUMESDEF__ARG_TRAITS_CS_
+#if !defined (_CORBA_COMPONENTIR_CONSUMESDEF__ARG_TRAITS_)
+#define _CORBA_COMPONENTIR_CONSUMESDEF__ARG_TRAITS_
   
   template<>
   class  Arg_Traits<CORBA::ComponentIR::ConsumesDef>
@@ -314,15 +370,19 @@ namespace TAO
             CORBA::ComponentIR::ConsumesDef_ptr,
             CORBA::ComponentIR::ConsumesDef_var,
             CORBA::ComponentIR::ConsumesDef_out,
-            TAO::Objref_Traits<CORBA::ComponentIR::ConsumesDef>
+            TAO::Objref_Traits<CORBA::ComponentIR::ConsumesDef>,
+            TAO::Any_Insert_Policy_Stream <CORBA::ComponentIR::ConsumesDef_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_COMPONENTIR_FACTORYDEF__ARG_TRAITS_CS_)
-#define _CORBA_COMPONENTIR_FACTORYDEF__ARG_TRAITS_CS_
+#if !defined (_CORBA_COMPONENTIR_FACTORYDEF__ARG_TRAITS_)
+#define _CORBA_COMPONENTIR_FACTORYDEF__ARG_TRAITS_
   
   template<>
   class  Arg_Traits<CORBA::ComponentIR::FactoryDef>
@@ -331,15 +391,19 @@ namespace TAO
             CORBA::ComponentIR::FactoryDef_ptr,
             CORBA::ComponentIR::FactoryDef_var,
             CORBA::ComponentIR::FactoryDef_out,
-            TAO::Objref_Traits<CORBA::ComponentIR::FactoryDef>
+            TAO::Objref_Traits<CORBA::ComponentIR::FactoryDef>,
+            TAO::Any_Insert_Policy_Stream <CORBA::ComponentIR::FactoryDef_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_COMPONENTIR_FINDERDEF__ARG_TRAITS_CS_)
-#define _CORBA_COMPONENTIR_FINDERDEF__ARG_TRAITS_CS_
+#if !defined (_CORBA_COMPONENTIR_FINDERDEF__ARG_TRAITS_)
+#define _CORBA_COMPONENTIR_FINDERDEF__ARG_TRAITS_
   
   template<>
   class  Arg_Traits<CORBA::ComponentIR::FinderDef>
@@ -348,7 +412,8 @@ namespace TAO
             CORBA::ComponentIR::FinderDef_ptr,
             CORBA::ComponentIR::FinderDef_var,
             CORBA::ComponentIR::FinderDef_out,
-            TAO::Objref_Traits<CORBA::ComponentIR::FinderDef>
+            TAO::Objref_Traits<CORBA::ComponentIR::FinderDef>,
+            TAO::Any_Insert_Policy_Stream <CORBA::ComponentIR::FinderDef_ptr>
           >
   {
   };
@@ -539,6 +604,27 @@ CORBA::ComponentIR::EventDef::marshal (TAO_OutputCDR &cdr)
 }
 
 // TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:76
+
+static TAO::TypeCode::Objref<char const *,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ComponentIR_EventDef (
+    CORBA::tk_objref,
+    "IDL:omg.org/CORBA/ComponentIR/EventDef:1.0",
+    "EventDef");
+  
+namespace CORBA
+{
+  namespace ComponentIR
+  {
+    ::CORBA::TypeCode_ptr const _tc_EventDef =
+      &_tao_tc_CORBA_ComponentIR_EventDef;
+  }
+}
+
+
+
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for CORBA::ComponentIR::Container.
@@ -605,12 +691,12 @@ TAO::Collocation_Proxy_Broker *
       CORBA_ComponentIR_Container_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::ComponentIR::ComponentDef>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
-  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
-  TAO::Arg_Traits< CORBA::ComponentIR::ComponentDef>::in_arg_val _tao_base_component (base_component);
-  TAO::Arg_Traits< CORBA::InterfaceDefSeq>::in_arg_val _tao_supports_interfaces (supports_interfaces);
+  TAO::Arg_Traits< ::CORBA::ComponentIR::ComponentDef>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id);
+  TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name);
+  TAO::Arg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version (version);
+  TAO::Arg_Traits< ::CORBA::ComponentIR::ComponentDef>::in_arg_val _tao_base_component (base_component);
+  TAO::Arg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_val _tao_supports_interfaces (supports_interfaces);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -664,14 +750,14 @@ TAO::Collocation_Proxy_Broker *
       CORBA_ComponentIR_Container_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::ComponentIR::HomeDef>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
-  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
-  TAO::Arg_Traits< CORBA::ComponentIR::HomeDef>::in_arg_val _tao_base_home (base_home);
-  TAO::Arg_Traits< CORBA::ComponentIR::ComponentDef>::in_arg_val _tao_managed_component (managed_component);
-  TAO::Arg_Traits< CORBA::InterfaceDefSeq>::in_arg_val _tao_supports_interfaces (supports_interfaces);
-  TAO::Arg_Traits< CORBA::ValueDef>::in_arg_val _tao_primary_key (primary_key);
+  TAO::Arg_Traits< ::CORBA::ComponentIR::HomeDef>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id);
+  TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name);
+  TAO::Arg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version (version);
+  TAO::Arg_Traits< ::CORBA::ComponentIR::HomeDef>::in_arg_val _tao_base_home (base_home);
+  TAO::Arg_Traits< ::CORBA::ComponentIR::ComponentDef>::in_arg_val _tao_managed_component (managed_component);
+  TAO::Arg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_val _tao_supports_interfaces (supports_interfaces);
+  TAO::Arg_Traits< ::CORBA::ValueDef>::in_arg_val _tao_primary_key (primary_key);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -730,17 +816,17 @@ TAO::Collocation_Proxy_Broker *
       CORBA_ComponentIR_Container_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::ComponentIR::EventDef>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
-  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
+  TAO::Arg_Traits< ::CORBA::ComponentIR::EventDef>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id);
+  TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name);
+  TAO::Arg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version (version);
   TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_is_custom (is_custom);
   TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_is_abstract (is_abstract);
-  TAO::Arg_Traits< CORBA::ValueDef>::in_arg_val _tao_base_value (base_value);
+  TAO::Arg_Traits< ::CORBA::ValueDef>::in_arg_val _tao_base_value (base_value);
   TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_is_truncatable (is_truncatable);
-  TAO::Arg_Traits< CORBA::ValueDefSeq>::in_arg_val _tao_abstract_base_values (abstract_base_values);
-  TAO::Arg_Traits< CORBA::InterfaceDefSeq>::in_arg_val _tao_supported_interfaces (supported_interfaces);
-  TAO::Arg_Traits< CORBA::ExtInitializerSeq>::in_arg_val _tao_initializers (initializers);
+  TAO::Arg_Traits< ::CORBA::ValueDefSeq>::in_arg_val _tao_abstract_base_values (abstract_base_values);
+  TAO::Arg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_val _tao_supported_interfaces (supported_interfaces);
+  TAO::Arg_Traits< ::CORBA::ExtInitializerSeq>::in_arg_val _tao_initializers (initializers);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -896,6 +982,27 @@ CORBA::ComponentIR::Container::marshal (TAO_OutputCDR &cdr)
 }
 
 // TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:76
+
+static TAO::TypeCode::Objref<char const *,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ComponentIR_Container (
+    CORBA::tk_objref,
+    "IDL:omg.org/CORBA/ComponentIR/Container:1.0",
+    "Container");
+  
+namespace CORBA
+{
+  namespace ComponentIR
+  {
+    ::CORBA::TypeCode_ptr const _tc_Container =
+      &_tao_tc_CORBA_ComponentIR_Container;
+  }
+}
+
+
+
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for CORBA::ComponentIR::ModuleDef.
@@ -1074,6 +1181,27 @@ CORBA::ComponentIR::ModuleDef::marshal (TAO_OutputCDR &cdr)
 }
 
 // TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:76
+
+static TAO::TypeCode::Objref<char const *,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ComponentIR_ModuleDef (
+    CORBA::tk_objref,
+    "IDL:omg.org/CORBA/ComponentIR/ModuleDef:1.0",
+    "ModuleDef");
+  
+namespace CORBA
+{
+  namespace ComponentIR
+  {
+    ::CORBA::TypeCode_ptr const _tc_ModuleDef =
+      &_tao_tc_CORBA_ComponentIR_ModuleDef;
+  }
+}
+
+
+
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for CORBA::ComponentIR::Repository.
@@ -1248,6 +1376,27 @@ CORBA::ComponentIR::Repository::marshal (TAO_OutputCDR &cdr)
 }
 
 // TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:76
+
+static TAO::TypeCode::Objref<char const *,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ComponentIR_Repository (
+    CORBA::tk_objref,
+    "IDL:omg.org/CORBA/ComponentIR/Repository:1.0",
+    "Repository");
+  
+namespace CORBA
+{
+  namespace ComponentIR
+  {
+    ::CORBA::TypeCode_ptr const _tc_Repository =
+      &_tao_tc_CORBA_ComponentIR_Repository;
+  }
+}
+
+
+
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for CORBA::ComponentIR::ProvidesDef.
@@ -1309,7 +1458,7 @@ TAO::Collocation_Proxy_Broker *
       CORBA_ComponentIR_ProvidesDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::InterfaceDef>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::InterfaceDef>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -1353,7 +1502,7 @@ void CORBA::ComponentIR::ProvidesDef::interface_type (
     }
   
   TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::InterfaceDef>::in_arg_val _tao_interface_type (interface_type);
+  TAO::Arg_Traits< ::CORBA::InterfaceDef>::in_arg_val _tao_interface_type (interface_type);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -1497,6 +1646,61 @@ CORBA::ComponentIR::ProvidesDef::marshal (TAO_OutputCDR &cdr)
   return (cdr << this);
 }
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:76
+
+static TAO::TypeCode::Objref<char const *,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ComponentIR_ProvidesDef (
+    CORBA::tk_objref,
+    "IDL:omg.org/CORBA/ComponentIR/ProvidesDef:1.0",
+    "ProvidesDef");
+  
+namespace CORBA
+{
+  namespace ComponentIR
+  {
+    ::CORBA::TypeCode_ptr const _tc_ProvidesDef =
+      &_tao_tc_CORBA_ComponentIR_ProvidesDef;
+  }
+}
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/struct_typecode.cpp:87
+
+static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_ComponentIR_ProvidesDescription[] =
+  {
+    { "name", &CORBA::_tc_Identifier },
+    { "id", &CORBA::_tc_RepositoryId },
+    { "defined_in", &CORBA::_tc_RepositoryId },
+    { "version", &CORBA::_tc_VersionSpec },
+    { "interface_type", &CORBA::_tc_RepositoryId }
+    
+  };
+static TAO::TypeCode::Struct<char const *,
+                      CORBA::TypeCode_ptr const *,
+                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
+                      TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ComponentIR_ProvidesDescription (
+    CORBA::tk_struct,
+    "IDL:omg.org/CORBA/ComponentIR/ProvidesDescription:1.0",
+    "ProvidesDescription",
+    _tao_fields_CORBA_ComponentIR_ProvidesDescription,
+    5);
+  
+namespace CORBA
+{
+  namespace ComponentIR
+  {
+    ::CORBA::TypeCode_ptr const _tc_ProvidesDescription =
+      &_tao_tc_CORBA_ComponentIR_ProvidesDescription;
+  }
+}
+
+
+
 // TAO_IDL - Generated from 
 // be\be_visitor_structure/structure_cs.cpp:66
 
@@ -1572,7 +1776,7 @@ TAO::Collocation_Proxy_Broker *
       CORBA_ComponentIR_UsesDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::InterfaceDef>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::InterfaceDef>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -1616,7 +1820,7 @@ void CORBA::ComponentIR::UsesDef::interface_type (
     }
   
   TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::InterfaceDef>::in_arg_val _tao_interface_type (interface_type);
+  TAO::Arg_Traits< ::CORBA::InterfaceDef>::in_arg_val _tao_interface_type (interface_type);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -1845,6 +2049,62 @@ CORBA::ComponentIR::UsesDef::marshal (TAO_OutputCDR &cdr)
   return (cdr << this);
 }
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:76
+
+static TAO::TypeCode::Objref<char const *,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ComponentIR_UsesDef (
+    CORBA::tk_objref,
+    "IDL:omg.org/CORBA/ComponentIR/UsesDef:1.0",
+    "UsesDef");
+  
+namespace CORBA
+{
+  namespace ComponentIR
+  {
+    ::CORBA::TypeCode_ptr const _tc_UsesDef =
+      &_tao_tc_CORBA_ComponentIR_UsesDef;
+  }
+}
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/struct_typecode.cpp:87
+
+static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_ComponentIR_UsesDescription[] =
+  {
+    { "name", &CORBA::_tc_Identifier },
+    { "id", &CORBA::_tc_RepositoryId },
+    { "defined_in", &CORBA::_tc_RepositoryId },
+    { "version", &CORBA::_tc_VersionSpec },
+    { "interface_type", &CORBA::_tc_RepositoryId },
+    { "is_multiple", &CORBA::_tc_boolean }
+    
+  };
+static TAO::TypeCode::Struct<char const *,
+                      CORBA::TypeCode_ptr const *,
+                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
+                      TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ComponentIR_UsesDescription (
+    CORBA::tk_struct,
+    "IDL:omg.org/CORBA/ComponentIR/UsesDescription:1.0",
+    "UsesDescription",
+    _tao_fields_CORBA_ComponentIR_UsesDescription,
+    6);
+  
+namespace CORBA
+{
+  namespace ComponentIR
+  {
+    ::CORBA::TypeCode_ptr const _tc_UsesDescription =
+      &_tao_tc_CORBA_ComponentIR_UsesDescription;
+  }
+}
+
+
+
 // TAO_IDL - Generated from 
 // be\be_visitor_structure/structure_cs.cpp:66
 
@@ -1920,7 +2180,7 @@ TAO::Collocation_Proxy_Broker *
       CORBA_ComponentIR_EventPortDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::ComponentIR::EventDef>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::ComponentIR::EventDef>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -1964,7 +2224,7 @@ void CORBA::ComponentIR::EventPortDef::event (
     }
   
   TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::ComponentIR::EventDef>::in_arg_val _tao_event (event);
+  TAO::Arg_Traits< ::CORBA::ComponentIR::EventDef>::in_arg_val _tao_event (event);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -2007,7 +2267,7 @@ CORBA::Boolean CORBA::ComponentIR::EventPortDef::is_a (
     }
   
   TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_event_id (event_id);
+  TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_event_id (event_id);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -2153,6 +2413,61 @@ CORBA::ComponentIR::EventPortDef::marshal (TAO_OutputCDR &cdr)
   return (cdr << this);
 }
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:76
+
+static TAO::TypeCode::Objref<char const *,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ComponentIR_EventPortDef (
+    CORBA::tk_objref,
+    "IDL:omg.org/CORBA/ComponentIR/EventPortDef:1.0",
+    "EventPortDef");
+  
+namespace CORBA
+{
+  namespace ComponentIR
+  {
+    ::CORBA::TypeCode_ptr const _tc_EventPortDef =
+      &_tao_tc_CORBA_ComponentIR_EventPortDef;
+  }
+}
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/struct_typecode.cpp:87
+
+static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_ComponentIR_EventPortDescription[] =
+  {
+    { "name", &CORBA::_tc_Identifier },
+    { "id", &CORBA::_tc_RepositoryId },
+    { "defined_in", &CORBA::_tc_RepositoryId },
+    { "version", &CORBA::_tc_VersionSpec },
+    { "event", &CORBA::_tc_RepositoryId }
+    
+  };
+static TAO::TypeCode::Struct<char const *,
+                      CORBA::TypeCode_ptr const *,
+                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
+                      TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ComponentIR_EventPortDescription (
+    CORBA::tk_struct,
+    "IDL:omg.org/CORBA/ComponentIR/EventPortDescription:1.0",
+    "EventPortDescription",
+    _tao_fields_CORBA_ComponentIR_EventPortDescription,
+    5);
+  
+namespace CORBA
+{
+  namespace ComponentIR
+  {
+    ::CORBA::TypeCode_ptr const _tc_EventPortDescription =
+      &_tao_tc_CORBA_ComponentIR_EventPortDescription;
+  }
+}
+
+
+
 // TAO_IDL - Generated from 
 // be\be_visitor_structure/structure_cs.cpp:66
 
@@ -2336,6 +2651,27 @@ CORBA::ComponentIR::EmitsDef::marshal (TAO_OutputCDR &cdr)
 }
 
 // TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:76
+
+static TAO::TypeCode::Objref<char const *,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ComponentIR_EmitsDef (
+    CORBA::tk_objref,
+    "IDL:omg.org/CORBA/ComponentIR/EmitsDef:1.0",
+    "EmitsDef");
+  
+namespace CORBA
+{
+  namespace ComponentIR
+  {
+    ::CORBA::TypeCode_ptr const _tc_EmitsDef =
+      &_tao_tc_CORBA_ComponentIR_EmitsDef;
+  }
+}
+
+
+
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for CORBA::ComponentIR::PublishesDef.
@@ -2505,6 +2841,27 @@ CORBA::ComponentIR::PublishesDef::marshal (TAO_OutputCDR &cdr)
 }
 
 // TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:76
+
+static TAO::TypeCode::Objref<char const *,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ComponentIR_PublishesDef (
+    CORBA::tk_objref,
+    "IDL:omg.org/CORBA/ComponentIR/PublishesDef:1.0",
+    "PublishesDef");
+  
+namespace CORBA
+{
+  namespace ComponentIR
+  {
+    ::CORBA::TypeCode_ptr const _tc_PublishesDef =
+      &_tao_tc_CORBA_ComponentIR_PublishesDef;
+  }
+}
+
+
+
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for CORBA::ComponentIR::ConsumesDef.
@@ -2674,6 +3031,27 @@ CORBA::ComponentIR::ConsumesDef::marshal (TAO_OutputCDR &cdr)
 }
 
 // TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:76
+
+static TAO::TypeCode::Objref<char const *,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ComponentIR_ConsumesDef (
+    CORBA::tk_objref,
+    "IDL:omg.org/CORBA/ComponentIR/ConsumesDef:1.0",
+    "ConsumesDef");
+  
+namespace CORBA
+{
+  namespace ComponentIR
+  {
+    ::CORBA::TypeCode_ptr const _tc_ConsumesDef =
+      &_tao_tc_CORBA_ComponentIR_ConsumesDef;
+  }
+}
+
+
+
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for CORBA::ComponentIR::ComponentDef.
@@ -2735,7 +3113,7 @@ TAO::Collocation_Proxy_Broker *
       CORBA_ComponentIR_ComponentDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::ComponentIR::ComponentDef>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::ComponentIR::ComponentDef>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -2779,7 +3157,7 @@ void CORBA::ComponentIR::ComponentDef::base_component (
     }
   
   TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::ComponentIR::ComponentDef>::in_arg_val _tao_base_component (base_component);
+  TAO::Arg_Traits< ::CORBA::ComponentIR::ComponentDef>::in_arg_val _tao_base_component (base_component);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -2820,7 +3198,7 @@ void CORBA::ComponentIR::ComponentDef::base_component (
       CORBA_ComponentIR_ComponentDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::InterfaceDefSeq>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::InterfaceDefSeq>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -2864,7 +3242,7 @@ void CORBA::ComponentIR::ComponentDef::supported_interfaces (
     }
   
   TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::InterfaceDefSeq>::in_arg_val _tao_supported_interfaces (supported_interfaces);
+  TAO::Arg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_val _tao_supported_interfaces (supported_interfaces);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -2909,11 +3287,11 @@ void CORBA::ComponentIR::ComponentDef::supported_interfaces (
       CORBA_ComponentIR_ComponentDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::ComponentIR::ProvidesDef>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
-  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
-  TAO::Arg_Traits< CORBA::InterfaceDef>::in_arg_val _tao_interface_type (interface_type);
+  TAO::Arg_Traits< ::CORBA::ComponentIR::ProvidesDef>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id);
+  TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name);
+  TAO::Arg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version (version);
+  TAO::Arg_Traits< ::CORBA::InterfaceDef>::in_arg_val _tao_interface_type (interface_type);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -2964,11 +3342,11 @@ void CORBA::ComponentIR::ComponentDef::supported_interfaces (
       CORBA_ComponentIR_ComponentDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::ComponentIR::UsesDef>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
-  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
-  TAO::Arg_Traits< CORBA::InterfaceDef>::in_arg_val _tao_interface_type (interface_type);
+  TAO::Arg_Traits< ::CORBA::ComponentIR::UsesDef>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id);
+  TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name);
+  TAO::Arg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version (version);
+  TAO::Arg_Traits< ::CORBA::InterfaceDef>::in_arg_val _tao_interface_type (interface_type);
   TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_is_multiple (is_multiple);
   
   TAO::Argument *_the_tao_operation_signature [] =
@@ -3020,11 +3398,11 @@ void CORBA::ComponentIR::ComponentDef::supported_interfaces (
       CORBA_ComponentIR_ComponentDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::ComponentIR::EmitsDef>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
-  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
-  TAO::Arg_Traits< CORBA::ComponentIR::EventDef>::in_arg_val _tao_event (event);
+  TAO::Arg_Traits< ::CORBA::ComponentIR::EmitsDef>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id);
+  TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name);
+  TAO::Arg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version (version);
+  TAO::Arg_Traits< ::CORBA::ComponentIR::EventDef>::in_arg_val _tao_event (event);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -3074,11 +3452,11 @@ void CORBA::ComponentIR::ComponentDef::supported_interfaces (
       CORBA_ComponentIR_ComponentDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::ComponentIR::PublishesDef>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
-  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
-  TAO::Arg_Traits< CORBA::ComponentIR::EventDef>::in_arg_val _tao_event (event);
+  TAO::Arg_Traits< ::CORBA::ComponentIR::PublishesDef>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id);
+  TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name);
+  TAO::Arg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version (version);
+  TAO::Arg_Traits< ::CORBA::ComponentIR::EventDef>::in_arg_val _tao_event (event);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -3128,11 +3506,11 @@ void CORBA::ComponentIR::ComponentDef::supported_interfaces (
       CORBA_ComponentIR_ComponentDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::ComponentIR::ConsumesDef>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
-  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
-  TAO::Arg_Traits< CORBA::ComponentIR::EventDef>::in_arg_val _tao_event (event);
+  TAO::Arg_Traits< ::CORBA::ComponentIR::ConsumesDef>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id);
+  TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name);
+  TAO::Arg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version (version);
+  TAO::Arg_Traits< ::CORBA::ComponentIR::EventDef>::in_arg_val _tao_event (event);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -3301,6 +3679,27 @@ CORBA::ComponentIR::ComponentDef::marshal (TAO_OutputCDR &cdr)
   return (cdr << this);
 }
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:76
+
+static TAO::TypeCode::Objref<char const *,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ComponentIR_ComponentDef (
+    CORBA::tk_objref,
+    "IDL:omg.org/CORBA/ComponentIR/ComponentDef:1.0",
+    "ComponentDef");
+  
+namespace CORBA
+{
+  namespace ComponentIR
+  {
+    ::CORBA::TypeCode_ptr const _tc_ComponentDef =
+      &_tao_tc_CORBA_ComponentIR_ComponentDef;
+  }
+}
+
+
+
 // TAO_IDL - Generated from 
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
@@ -3314,7 +3713,7 @@ CORBA::ComponentIR::ProvidesDescriptionSeq::ProvidesDescriptionSeq (
     CORBA::ULong max
   )
   : TAO_Unbounded_Sequence<
-        CORBA::ComponentIR::ProvidesDescription
+        ProvidesDescription
       >
     (max)
 {}
@@ -3326,7 +3725,7 @@ CORBA::ComponentIR::ProvidesDescriptionSeq::ProvidesDescriptionSeq (
     CORBA::Boolean release
   )
   : TAO_Unbounded_Sequence<
-        CORBA::ComponentIR::ProvidesDescription
+        ProvidesDescription
       >
     (max, length, buffer, release)
 {}
@@ -3335,7 +3734,7 @@ CORBA::ComponentIR::ProvidesDescriptionSeq::ProvidesDescriptionSeq (
     const ProvidesDescriptionSeq &seq
   )
   : TAO_Unbounded_Sequence<
-        CORBA::ComponentIR::ProvidesDescription
+        ProvidesDescription
       >
     (seq)
 {}
@@ -3354,6 +3753,57 @@ void CORBA::ComponentIR::ProvidesDescriptionSeq::_tao_any_destructor (
 
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/alias_typecode.cpp:50
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+
+#ifndef _TAO_TYPECODE_CORBA_ComponentIR_ProvidesDescriptionSeq_GUARD
+#define _TAO_TYPECODE_CORBA_ComponentIR_ProvidesDescriptionSeq_GUARD
+namespace TAO
+{
+  namespace TypeCode
+  {
+    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
+      CORBA_ComponentIR_ProvidesDescriptionSeq_0 (
+        CORBA::tk_sequence,
+        &CORBA::ComponentIR::_tc_ProvidesDescription,
+        0U);
+      
+    ::CORBA::TypeCode_ptr const tc_CORBA_ComponentIR_ProvidesDescriptionSeq_0 =
+      &CORBA_ComponentIR_ProvidesDescriptionSeq_0;
+    
+  }
+}
+
+
+#endif /* _TAO_TYPECODE_CORBA_ComponentIR_ProvidesDescriptionSeq_GUARD */
+
+static TAO::TypeCode::Alias<char const *,
+                            CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ComponentIR_ProvidesDescriptionSeq (
+    CORBA::tk_alias,
+    "IDL:omg.org/CORBA/ComponentIR/ProvidesDescriptionSeq:1.0",
+    "ProvidesDescriptionSeq",
+    &TAO::TypeCode::tc_CORBA_ComponentIR_ProvidesDescriptionSeq_0);
+  
+namespace CORBA
+{
+  namespace ComponentIR
+  {
+    ::CORBA::TypeCode_ptr const _tc_ProvidesDescriptionSeq =
+      &_tao_tc_CORBA_ComponentIR_ProvidesDescriptionSeq;
+  }
+}
+
+
+
 // TAO_IDL - Generated from 
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
@@ -3367,7 +3817,7 @@ CORBA::ComponentIR::UsesDescriptionSeq::UsesDescriptionSeq (
     CORBA::ULong max
   )
   : TAO_Unbounded_Sequence<
-        CORBA::ComponentIR::UsesDescription
+        UsesDescription
       >
     (max)
 {}
@@ -3379,7 +3829,7 @@ CORBA::ComponentIR::UsesDescriptionSeq::UsesDescriptionSeq (
     CORBA::Boolean release
   )
   : TAO_Unbounded_Sequence<
-        CORBA::ComponentIR::UsesDescription
+        UsesDescription
       >
     (max, length, buffer, release)
 {}
@@ -3388,7 +3838,7 @@ CORBA::ComponentIR::UsesDescriptionSeq::UsesDescriptionSeq (
     const UsesDescriptionSeq &seq
   )
   : TAO_Unbounded_Sequence<
-        CORBA::ComponentIR::UsesDescription
+        UsesDescription
       >
     (seq)
 {}
@@ -3407,6 +3857,57 @@ void CORBA::ComponentIR::UsesDescriptionSeq::_tao_any_destructor (
 
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/alias_typecode.cpp:50
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+
+#ifndef _TAO_TYPECODE_CORBA_ComponentIR_UsesDescriptionSeq_GUARD
+#define _TAO_TYPECODE_CORBA_ComponentIR_UsesDescriptionSeq_GUARD
+namespace TAO
+{
+  namespace TypeCode
+  {
+    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
+      CORBA_ComponentIR_UsesDescriptionSeq_0 (
+        CORBA::tk_sequence,
+        &CORBA::ComponentIR::_tc_UsesDescription,
+        0U);
+      
+    ::CORBA::TypeCode_ptr const tc_CORBA_ComponentIR_UsesDescriptionSeq_0 =
+      &CORBA_ComponentIR_UsesDescriptionSeq_0;
+    
+  }
+}
+
+
+#endif /* _TAO_TYPECODE_CORBA_ComponentIR_UsesDescriptionSeq_GUARD */
+
+static TAO::TypeCode::Alias<char const *,
+                            CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ComponentIR_UsesDescriptionSeq (
+    CORBA::tk_alias,
+    "IDL:omg.org/CORBA/ComponentIR/UsesDescriptionSeq:1.0",
+    "UsesDescriptionSeq",
+    &TAO::TypeCode::tc_CORBA_ComponentIR_UsesDescriptionSeq_0);
+  
+namespace CORBA
+{
+  namespace ComponentIR
+  {
+    ::CORBA::TypeCode_ptr const _tc_UsesDescriptionSeq =
+      &_tao_tc_CORBA_ComponentIR_UsesDescriptionSeq;
+  }
+}
+
+
+
 // TAO_IDL - Generated from 
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
@@ -3420,7 +3921,7 @@ CORBA::ComponentIR::EventPortDescriptionSeq::EventPortDescriptionSeq (
     CORBA::ULong max
   )
   : TAO_Unbounded_Sequence<
-        CORBA::ComponentIR::EventPortDescription
+        EventPortDescription
       >
     (max)
 {}
@@ -3432,7 +3933,7 @@ CORBA::ComponentIR::EventPortDescriptionSeq::EventPortDescriptionSeq (
     CORBA::Boolean release
   )
   : TAO_Unbounded_Sequence<
-        CORBA::ComponentIR::EventPortDescription
+        EventPortDescription
       >
     (max, length, buffer, release)
 {}
@@ -3441,7 +3942,7 @@ CORBA::ComponentIR::EventPortDescriptionSeq::EventPortDescriptionSeq (
     const EventPortDescriptionSeq &seq
   )
   : TAO_Unbounded_Sequence<
-        CORBA::ComponentIR::EventPortDescription
+        EventPortDescription
       >
     (seq)
 {}
@@ -3460,6 +3961,138 @@ void CORBA::ComponentIR::EventPortDescriptionSeq::_tao_any_destructor (
 
 #endif /* end #if !defined */
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/alias_typecode.cpp:50
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+
+#ifndef _TAO_TYPECODE_CORBA_ComponentIR_EventPortDescriptionSeq_GUARD
+#define _TAO_TYPECODE_CORBA_ComponentIR_EventPortDescriptionSeq_GUARD
+namespace TAO
+{
+  namespace TypeCode
+  {
+    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
+      CORBA_ComponentIR_EventPortDescriptionSeq_0 (
+        CORBA::tk_sequence,
+        &CORBA::ComponentIR::_tc_EventPortDescription,
+        0U);
+      
+    ::CORBA::TypeCode_ptr const tc_CORBA_ComponentIR_EventPortDescriptionSeq_0 =
+      &CORBA_ComponentIR_EventPortDescriptionSeq_0;
+    
+  }
+}
+
+
+#endif /* _TAO_TYPECODE_CORBA_ComponentIR_EventPortDescriptionSeq_GUARD */
+
+static TAO::TypeCode::Alias<char const *,
+                            CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ComponentIR_EventPortDescriptionSeq (
+    CORBA::tk_alias,
+    "IDL:omg.org/CORBA/ComponentIR/EventPortDescriptionSeq:1.0",
+    "EventPortDescriptionSeq",
+    &TAO::TypeCode::tc_CORBA_ComponentIR_EventPortDescriptionSeq_0);
+  
+namespace CORBA
+{
+  namespace ComponentIR
+  {
+    ::CORBA::TypeCode_ptr const _tc_EventPortDescriptionSeq =
+      &_tao_tc_CORBA_ComponentIR_EventPortDescriptionSeq;
+  }
+}
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/struct_typecode.cpp:87
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_ComponentIR_ComponentDescription[] =
+  {
+    { "name", &CORBA::_tc_Identifier },
+    { "id", &CORBA::_tc_RepositoryId },
+    { "defined_in", &CORBA::_tc_RepositoryId },
+    { "version", &CORBA::_tc_VersionSpec },
+    { "base_component", &CORBA::_tc_RepositoryId },
+    { "supported_interfaces", &CORBA::_tc_RepositoryIdSeq },
+    { "provided_interfaces", &CORBA::ComponentIR::_tc_ProvidesDescriptionSeq },
+    { "used_interfaces", &CORBA::ComponentIR::_tc_UsesDescriptionSeq },
+    { "emits_events", &CORBA::ComponentIR::_tc_EventPortDescriptionSeq },
+    { "publishes_events", &CORBA::ComponentIR::_tc_EventPortDescriptionSeq },
+    { "consumes_events", &CORBA::ComponentIR::_tc_EventPortDescriptionSeq },
+    { "attributes", &CORBA::_tc_ExtAttrDescriptionSeq },
+    { "type", &CORBA::_tc_TypeCode }
+    
+  };
+static TAO::TypeCode::Recursive_Type<
+  TAO::TypeCode::Struct<char const *,
+                        CORBA::TypeCode_ptr const *,
+                        TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
+                        TAO::Null_RefCount_Policy>,
+  CORBA::TypeCode_ptr const *,
+  TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const * >
+
+  _tao_tc_CORBA_ComponentIR_ComponentDescription (
+    CORBA::tk_struct,
+    "IDL:omg.org/CORBA/ComponentIR/ComponentDescription:1.0",
+    "ComponentDescription",
+    _tao_fields_CORBA_ComponentIR_ComponentDescription,
+    13);
+  
+namespace CORBA
+{
+  namespace ComponentIR
+  {
+    ::CORBA::TypeCode_ptr const _tc_ComponentDescription =
+      &_tao_tc_CORBA_ComponentIR_ComponentDescription;
+  }
+}
+
+
+
 // TAO_IDL - Generated from 
 // be\be_visitor_structure/structure_cs.cpp:66
 
@@ -3643,6 +4276,27 @@ CORBA::ComponentIR::FactoryDef::marshal (TAO_OutputCDR &cdr)
 }
 
 // TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:76
+
+static TAO::TypeCode::Objref<char const *,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ComponentIR_FactoryDef (
+    CORBA::tk_objref,
+    "IDL:omg.org/CORBA/ComponentIR/FactoryDef:1.0",
+    "FactoryDef");
+  
+namespace CORBA
+{
+  namespace ComponentIR
+  {
+    ::CORBA::TypeCode_ptr const _tc_FactoryDef =
+      &_tao_tc_CORBA_ComponentIR_FactoryDef;
+  }
+}
+
+
+
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for CORBA::ComponentIR::FinderDef.
@@ -3812,6 +4466,27 @@ CORBA::ComponentIR::FinderDef::marshal (TAO_OutputCDR &cdr)
 }
 
 // TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:76
+
+static TAO::TypeCode::Objref<char const *,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ComponentIR_FinderDef (
+    CORBA::tk_objref,
+    "IDL:omg.org/CORBA/ComponentIR/FinderDef:1.0",
+    "FinderDef");
+  
+namespace CORBA
+{
+  namespace ComponentIR
+  {
+    ::CORBA::TypeCode_ptr const _tc_FinderDef =
+      &_tao_tc_CORBA_ComponentIR_FinderDef;
+  }
+}
+
+
+
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for CORBA::ComponentIR::HomeDef.
@@ -3873,7 +4548,7 @@ TAO::Collocation_Proxy_Broker *
       CORBA_ComponentIR_HomeDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::ComponentIR::HomeDef>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::ComponentIR::HomeDef>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -3917,7 +4592,7 @@ void CORBA::ComponentIR::HomeDef::base_home (
     }
   
   TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::ComponentIR::HomeDef>::in_arg_val _tao_base_home (base_home);
+  TAO::Arg_Traits< ::CORBA::ComponentIR::HomeDef>::in_arg_val _tao_base_home (base_home);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -3958,7 +4633,7 @@ void CORBA::ComponentIR::HomeDef::base_home (
       CORBA_ComponentIR_HomeDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::InterfaceDefSeq>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::InterfaceDefSeq>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -4002,7 +4677,7 @@ void CORBA::ComponentIR::HomeDef::supported_interfaces (
     }
   
   TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::InterfaceDefSeq>::in_arg_val _tao_supported_interfaces (supported_interfaces);
+  TAO::Arg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_val _tao_supported_interfaces (supported_interfaces);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -4043,7 +4718,7 @@ void CORBA::ComponentIR::HomeDef::supported_interfaces (
       CORBA_ComponentIR_HomeDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::ComponentIR::ComponentDef>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::ComponentIR::ComponentDef>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -4087,7 +4762,7 @@ void CORBA::ComponentIR::HomeDef::managed_component (
     }
   
   TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::ComponentIR::ComponentDef>::in_arg_val _tao_managed_component (managed_component);
+  TAO::Arg_Traits< ::CORBA::ComponentIR::ComponentDef>::in_arg_val _tao_managed_component (managed_component);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -4128,7 +4803,7 @@ void CORBA::ComponentIR::HomeDef::managed_component (
       CORBA_ComponentIR_HomeDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::ValueDef>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::ValueDef>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -4172,7 +4847,7 @@ void CORBA::ComponentIR::HomeDef::primary_key (
     }
   
   TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::ValueDef>::in_arg_val _tao_primary_key (primary_key);
+  TAO::Arg_Traits< ::CORBA::ValueDef>::in_arg_val _tao_primary_key (primary_key);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -4218,12 +4893,12 @@ void CORBA::ComponentIR::HomeDef::primary_key (
       CORBA_ComponentIR_HomeDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::ComponentIR::FactoryDef>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
-  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
-  TAO::Arg_Traits< CORBA::ParDescriptionSeq>::in_arg_val _tao_params (params);
-  TAO::Arg_Traits< CORBA::ExceptionDefSeq>::in_arg_val _tao_exceptions (exceptions);
+  TAO::Arg_Traits< ::CORBA::ComponentIR::FactoryDef>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id);
+  TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name);
+  TAO::Arg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version (version);
+  TAO::Arg_Traits< ::CORBA::ParDescriptionSeq>::in_arg_val _tao_params (params);
+  TAO::Arg_Traits< ::CORBA::ExceptionDefSeq>::in_arg_val _tao_exceptions (exceptions);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -4275,12 +4950,12 @@ void CORBA::ComponentIR::HomeDef::primary_key (
       CORBA_ComponentIR_HomeDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::ComponentIR::FinderDef>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
-  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
-  TAO::Arg_Traits< CORBA::ParDescriptionSeq>::in_arg_val _tao_params (params);
-  TAO::Arg_Traits< CORBA::ExceptionDefSeq>::in_arg_val _tao_exceptions (exceptions);
+  TAO::Arg_Traits< ::CORBA::ComponentIR::FinderDef>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id);
+  TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name);
+  TAO::Arg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version (version);
+  TAO::Arg_Traits< ::CORBA::ParDescriptionSeq>::in_arg_val _tao_params (params);
+  TAO::Arg_Traits< ::CORBA::ExceptionDefSeq>::in_arg_val _tao_exceptions (exceptions);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -4450,6 +5125,92 @@ CORBA::ComponentIR::HomeDef::marshal (TAO_OutputCDR &cdr)
   return (cdr << this);
 }
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:76
+
+static TAO::TypeCode::Objref<char const *,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ComponentIR_HomeDef (
+    CORBA::tk_objref,
+    "IDL:omg.org/CORBA/ComponentIR/HomeDef:1.0",
+    "HomeDef");
+  
+namespace CORBA
+{
+  namespace ComponentIR
+  {
+    ::CORBA::TypeCode_ptr const _tc_HomeDef =
+      &_tao_tc_CORBA_ComponentIR_HomeDef;
+  }
+}
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/struct_typecode.cpp:87
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_ComponentIR_HomeDescription[] =
+  {
+    { "name", &CORBA::_tc_Identifier },
+    { "id", &CORBA::_tc_RepositoryId },
+    { "defined_in", &CORBA::_tc_RepositoryId },
+    { "version", &CORBA::_tc_VersionSpec },
+    { "base_home", &CORBA::_tc_RepositoryId },
+    { "managed_component", &CORBA::_tc_RepositoryId },
+    { "primary_key", &CORBA::_tc_ValueDescription },
+    { "factories", &CORBA::_tc_OpDescriptionSeq },
+    { "finders", &CORBA::_tc_OpDescriptionSeq },
+    { "operations", &CORBA::_tc_OpDescriptionSeq },
+    { "attributes", &CORBA::_tc_ExtAttrDescriptionSeq },
+    { "type", &CORBA::_tc_TypeCode }
+    
+  };
+static TAO::TypeCode::Recursive_Type<
+  TAO::TypeCode::Struct<char const *,
+                        CORBA::TypeCode_ptr const *,
+                        TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
+                        TAO::Null_RefCount_Policy>,
+  CORBA::TypeCode_ptr const *,
+  TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const * >
+
+  _tao_tc_CORBA_ComponentIR_HomeDescription (
+    CORBA::tk_struct,
+    "IDL:omg.org/CORBA/ComponentIR/HomeDescription:1.0",
+    "HomeDescription",
+    _tao_fields_CORBA_ComponentIR_HomeDescription,
+    12);
+  
+namespace CORBA
+{
+  namespace ComponentIR
+  {
+    ::CORBA::TypeCode_ptr const _tc_HomeDescription =
+      &_tao_tc_CORBA_ComponentIR_HomeDescription;
+  }
+}
+
+
+
 // TAO_IDL - Generated from 
 // be\be_visitor_structure/structure_cs.cpp:66
 
@@ -4464,6 +5225,1285 @@ CORBA::ComponentIR::HomeDescription::_tao_any_destructor (
 }
 
 // TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+namespace TAO
+{
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<CORBA::ComponentIR::EventDef>::to_object (
+      CORBA::Object_ptr &_tao_elem
+    ) const
+  {
+    _tao_elem = CORBA::Object::_duplicate (this->value_);
+    return true;
+  }
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ComponentIR::EventDef_ptr _tao_elem
+  )
+{
+  CORBA::ComponentIR::EventDef_ptr _tao_objptr =
+    CORBA::ComponentIR::EventDef::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ComponentIR::EventDef_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<CORBA::ComponentIR::EventDef>::insert (
+      _tao_any,
+      CORBA::ComponentIR::EventDef::_tao_any_destructor,
+      CORBA::ComponentIR::_tc_EventDef,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::ComponentIR::EventDef_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<CORBA::ComponentIR::EventDef>::extract (
+        _tao_any,
+        CORBA::ComponentIR::EventDef::_tao_any_destructor,
+        CORBA::ComponentIR::_tc_EventDef,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+namespace TAO
+{
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<CORBA::ComponentIR::Container>::to_object (
+      CORBA::Object_ptr &_tao_elem
+    ) const
+  {
+    _tao_elem = CORBA::Object::_duplicate (this->value_);
+    return true;
+  }
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ComponentIR::Container_ptr _tao_elem
+  )
+{
+  CORBA::ComponentIR::Container_ptr _tao_objptr =
+    CORBA::ComponentIR::Container::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ComponentIR::Container_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<CORBA::ComponentIR::Container>::insert (
+      _tao_any,
+      CORBA::ComponentIR::Container::_tao_any_destructor,
+      CORBA::ComponentIR::_tc_Container,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::ComponentIR::Container_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<CORBA::ComponentIR::Container>::extract (
+        _tao_any,
+        CORBA::ComponentIR::Container::_tao_any_destructor,
+        CORBA::ComponentIR::_tc_Container,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+namespace TAO
+{
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<CORBA::ComponentIR::ModuleDef>::to_object (
+      CORBA::Object_ptr &_tao_elem
+    ) const
+  {
+    _tao_elem = CORBA::Object::_duplicate (this->value_);
+    return true;
+  }
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ComponentIR::ModuleDef_ptr _tao_elem
+  )
+{
+  CORBA::ComponentIR::ModuleDef_ptr _tao_objptr =
+    CORBA::ComponentIR::ModuleDef::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ComponentIR::ModuleDef_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<CORBA::ComponentIR::ModuleDef>::insert (
+      _tao_any,
+      CORBA::ComponentIR::ModuleDef::_tao_any_destructor,
+      CORBA::ComponentIR::_tc_ModuleDef,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::ComponentIR::ModuleDef_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<CORBA::ComponentIR::ModuleDef>::extract (
+        _tao_any,
+        CORBA::ComponentIR::ModuleDef::_tao_any_destructor,
+        CORBA::ComponentIR::_tc_ModuleDef,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+namespace TAO
+{
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<CORBA::ComponentIR::Repository>::to_object (
+      CORBA::Object_ptr &_tao_elem
+    ) const
+  {
+    _tao_elem = CORBA::Object::_duplicate (this->value_);
+    return true;
+  }
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ComponentIR::Repository_ptr _tao_elem
+  )
+{
+  CORBA::ComponentIR::Repository_ptr _tao_objptr =
+    CORBA::ComponentIR::Repository::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ComponentIR::Repository_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<CORBA::ComponentIR::Repository>::insert (
+      _tao_any,
+      CORBA::ComponentIR::Repository::_tao_any_destructor,
+      CORBA::ComponentIR::_tc_Repository,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::ComponentIR::Repository_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<CORBA::ComponentIR::Repository>::extract (
+        _tao_any,
+        CORBA::ComponentIR::Repository::_tao_any_destructor,
+        CORBA::ComponentIR::_tc_Repository,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+namespace TAO
+{
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<CORBA::ComponentIR::ProvidesDef>::to_object (
+      CORBA::Object_ptr &_tao_elem
+    ) const
+  {
+    _tao_elem = CORBA::Object::_duplicate (this->value_);
+    return true;
+  }
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ComponentIR::ProvidesDef_ptr _tao_elem
+  )
+{
+  CORBA::ComponentIR::ProvidesDef_ptr _tao_objptr =
+    CORBA::ComponentIR::ProvidesDef::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ComponentIR::ProvidesDef_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<CORBA::ComponentIR::ProvidesDef>::insert (
+      _tao_any,
+      CORBA::ComponentIR::ProvidesDef::_tao_any_destructor,
+      CORBA::ComponentIR::_tc_ProvidesDef,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::ComponentIR::ProvidesDef_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<CORBA::ComponentIR::ProvidesDef>::extract (
+        _tao_any,
+        CORBA::ComponentIR::ProvidesDef::_tao_any_destructor,
+        CORBA::ComponentIR::_tc_ProvidesDef,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from 
+// be\be_visitor_structure/any_op_cs.cpp:54
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const CORBA::ComponentIR::ProvidesDescription &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::ComponentIR::ProvidesDescription>::insert_copy (
+      _tao_any,
+      CORBA::ComponentIR::ProvidesDescription::_tao_any_destructor,
+      CORBA::ComponentIR::_tc_ProvidesDescription,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ComponentIR::ProvidesDescription *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::ComponentIR::ProvidesDescription>::insert (
+      _tao_any,
+      CORBA::ComponentIR::ProvidesDescription::_tao_any_destructor,
+      CORBA::ComponentIR::_tc_ProvidesDescription,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::ComponentIR::ProvidesDescription *&_tao_elem
+  )
+{
+  return _tao_any >>= const_cast<
+      const CORBA::ComponentIR::ProvidesDescription *&> (
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CORBA::ComponentIR::ProvidesDescription *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<CORBA::ComponentIR::ProvidesDescription>::extract (
+        _tao_any,
+        CORBA::ComponentIR::ProvidesDescription::_tao_any_destructor,
+        CORBA::ComponentIR::_tc_ProvidesDescription,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+namespace TAO
+{
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<CORBA::ComponentIR::UsesDef>::to_object (
+      CORBA::Object_ptr &_tao_elem
+    ) const
+  {
+    _tao_elem = CORBA::Object::_duplicate (this->value_);
+    return true;
+  }
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ComponentIR::UsesDef_ptr _tao_elem
+  )
+{
+  CORBA::ComponentIR::UsesDef_ptr _tao_objptr =
+    CORBA::ComponentIR::UsesDef::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ComponentIR::UsesDef_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<CORBA::ComponentIR::UsesDef>::insert (
+      _tao_any,
+      CORBA::ComponentIR::UsesDef::_tao_any_destructor,
+      CORBA::ComponentIR::_tc_UsesDef,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::ComponentIR::UsesDef_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<CORBA::ComponentIR::UsesDef>::extract (
+        _tao_any,
+        CORBA::ComponentIR::UsesDef::_tao_any_destructor,
+        CORBA::ComponentIR::_tc_UsesDef,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from 
+// be\be_visitor_structure/any_op_cs.cpp:54
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const CORBA::ComponentIR::UsesDescription &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::ComponentIR::UsesDescription>::insert_copy (
+      _tao_any,
+      CORBA::ComponentIR::UsesDescription::_tao_any_destructor,
+      CORBA::ComponentIR::_tc_UsesDescription,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ComponentIR::UsesDescription *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::ComponentIR::UsesDescription>::insert (
+      _tao_any,
+      CORBA::ComponentIR::UsesDescription::_tao_any_destructor,
+      CORBA::ComponentIR::_tc_UsesDescription,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::ComponentIR::UsesDescription *&_tao_elem
+  )
+{
+  return _tao_any >>= const_cast<
+      const CORBA::ComponentIR::UsesDescription *&> (
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CORBA::ComponentIR::UsesDescription *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<CORBA::ComponentIR::UsesDescription>::extract (
+        _tao_any,
+        CORBA::ComponentIR::UsesDescription::_tao_any_destructor,
+        CORBA::ComponentIR::_tc_UsesDescription,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+namespace TAO
+{
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<CORBA::ComponentIR::EventPortDef>::to_object (
+      CORBA::Object_ptr &_tao_elem
+    ) const
+  {
+    _tao_elem = CORBA::Object::_duplicate (this->value_);
+    return true;
+  }
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ComponentIR::EventPortDef_ptr _tao_elem
+  )
+{
+  CORBA::ComponentIR::EventPortDef_ptr _tao_objptr =
+    CORBA::ComponentIR::EventPortDef::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ComponentIR::EventPortDef_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<CORBA::ComponentIR::EventPortDef>::insert (
+      _tao_any,
+      CORBA::ComponentIR::EventPortDef::_tao_any_destructor,
+      CORBA::ComponentIR::_tc_EventPortDef,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::ComponentIR::EventPortDef_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<CORBA::ComponentIR::EventPortDef>::extract (
+        _tao_any,
+        CORBA::ComponentIR::EventPortDef::_tao_any_destructor,
+        CORBA::ComponentIR::_tc_EventPortDef,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from 
+// be\be_visitor_structure/any_op_cs.cpp:54
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const CORBA::ComponentIR::EventPortDescription &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::ComponentIR::EventPortDescription>::insert_copy (
+      _tao_any,
+      CORBA::ComponentIR::EventPortDescription::_tao_any_destructor,
+      CORBA::ComponentIR::_tc_EventPortDescription,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ComponentIR::EventPortDescription *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::ComponentIR::EventPortDescription>::insert (
+      _tao_any,
+      CORBA::ComponentIR::EventPortDescription::_tao_any_destructor,
+      CORBA::ComponentIR::_tc_EventPortDescription,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::ComponentIR::EventPortDescription *&_tao_elem
+  )
+{
+  return _tao_any >>= const_cast<
+      const CORBA::ComponentIR::EventPortDescription *&> (
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CORBA::ComponentIR::EventPortDescription *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<CORBA::ComponentIR::EventPortDescription>::extract (
+        _tao_any,
+        CORBA::ComponentIR::EventPortDescription::_tao_any_destructor,
+        CORBA::ComponentIR::_tc_EventPortDescription,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+namespace TAO
+{
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<CORBA::ComponentIR::EmitsDef>::to_object (
+      CORBA::Object_ptr &_tao_elem
+    ) const
+  {
+    _tao_elem = CORBA::Object::_duplicate (this->value_);
+    return true;
+  }
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ComponentIR::EmitsDef_ptr _tao_elem
+  )
+{
+  CORBA::ComponentIR::EmitsDef_ptr _tao_objptr =
+    CORBA::ComponentIR::EmitsDef::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ComponentIR::EmitsDef_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<CORBA::ComponentIR::EmitsDef>::insert (
+      _tao_any,
+      CORBA::ComponentIR::EmitsDef::_tao_any_destructor,
+      CORBA::ComponentIR::_tc_EmitsDef,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::ComponentIR::EmitsDef_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<CORBA::ComponentIR::EmitsDef>::extract (
+        _tao_any,
+        CORBA::ComponentIR::EmitsDef::_tao_any_destructor,
+        CORBA::ComponentIR::_tc_EmitsDef,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+namespace TAO
+{
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<CORBA::ComponentIR::PublishesDef>::to_object (
+      CORBA::Object_ptr &_tao_elem
+    ) const
+  {
+    _tao_elem = CORBA::Object::_duplicate (this->value_);
+    return true;
+  }
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ComponentIR::PublishesDef_ptr _tao_elem
+  )
+{
+  CORBA::ComponentIR::PublishesDef_ptr _tao_objptr =
+    CORBA::ComponentIR::PublishesDef::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ComponentIR::PublishesDef_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<CORBA::ComponentIR::PublishesDef>::insert (
+      _tao_any,
+      CORBA::ComponentIR::PublishesDef::_tao_any_destructor,
+      CORBA::ComponentIR::_tc_PublishesDef,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::ComponentIR::PublishesDef_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<CORBA::ComponentIR::PublishesDef>::extract (
+        _tao_any,
+        CORBA::ComponentIR::PublishesDef::_tao_any_destructor,
+        CORBA::ComponentIR::_tc_PublishesDef,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+namespace TAO
+{
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<CORBA::ComponentIR::ConsumesDef>::to_object (
+      CORBA::Object_ptr &_tao_elem
+    ) const
+  {
+    _tao_elem = CORBA::Object::_duplicate (this->value_);
+    return true;
+  }
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ComponentIR::ConsumesDef_ptr _tao_elem
+  )
+{
+  CORBA::ComponentIR::ConsumesDef_ptr _tao_objptr =
+    CORBA::ComponentIR::ConsumesDef::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ComponentIR::ConsumesDef_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<CORBA::ComponentIR::ConsumesDef>::insert (
+      _tao_any,
+      CORBA::ComponentIR::ConsumesDef::_tao_any_destructor,
+      CORBA::ComponentIR::_tc_ConsumesDef,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::ComponentIR::ConsumesDef_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<CORBA::ComponentIR::ConsumesDef>::extract (
+        _tao_any,
+        CORBA::ComponentIR::ConsumesDef::_tao_any_destructor,
+        CORBA::ComponentIR::_tc_ConsumesDef,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+namespace TAO
+{
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<CORBA::ComponentIR::ComponentDef>::to_object (
+      CORBA::Object_ptr &_tao_elem
+    ) const
+  {
+    _tao_elem = CORBA::Object::_duplicate (this->value_);
+    return true;
+  }
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ComponentIR::ComponentDef_ptr _tao_elem
+  )
+{
+  CORBA::ComponentIR::ComponentDef_ptr _tao_objptr =
+    CORBA::ComponentIR::ComponentDef::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ComponentIR::ComponentDef_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<CORBA::ComponentIR::ComponentDef>::insert (
+      _tao_any,
+      CORBA::ComponentIR::ComponentDef::_tao_any_destructor,
+      CORBA::ComponentIR::_tc_ComponentDef,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::ComponentIR::ComponentDef_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<CORBA::ComponentIR::ComponentDef>::extract (
+        _tao_any,
+        CORBA::ComponentIR::ComponentDef::_tao_any_destructor,
+        CORBA::ComponentIR::_tc_ComponentDef,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from 
+// be\be_visitor_sequence/any_op_cs.cpp:54
+
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const CORBA::ComponentIR::ProvidesDescriptionSeq &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::ComponentIR::ProvidesDescriptionSeq>::insert_copy (
+      _tao_any,
+      CORBA::ComponentIR::ProvidesDescriptionSeq::_tao_any_destructor,
+      TAO::TypeCode::tc_CORBA_ComponentIR_ProvidesDescriptionSeq_0,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ComponentIR::ProvidesDescriptionSeq *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::ComponentIR::ProvidesDescriptionSeq>::insert (
+      _tao_any,
+      CORBA::ComponentIR::ProvidesDescriptionSeq::_tao_any_destructor,
+      TAO::TypeCode::tc_CORBA_ComponentIR_ProvidesDescriptionSeq_0,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::ComponentIR::ProvidesDescriptionSeq *&_tao_elem
+  )
+{
+  return _tao_any >>= const_cast<
+      const CORBA::ComponentIR::ProvidesDescriptionSeq *&> (
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CORBA::ComponentIR::ProvidesDescriptionSeq *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<CORBA::ComponentIR::ProvidesDescriptionSeq>::extract (
+        _tao_any,
+        CORBA::ComponentIR::ProvidesDescriptionSeq::_tao_any_destructor,
+        TAO::TypeCode::tc_CORBA_ComponentIR_ProvidesDescriptionSeq_0,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from 
+// be\be_visitor_sequence/any_op_cs.cpp:54
+
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const CORBA::ComponentIR::UsesDescriptionSeq &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::ComponentIR::UsesDescriptionSeq>::insert_copy (
+      _tao_any,
+      CORBA::ComponentIR::UsesDescriptionSeq::_tao_any_destructor,
+      TAO::TypeCode::tc_CORBA_ComponentIR_UsesDescriptionSeq_0,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ComponentIR::UsesDescriptionSeq *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::ComponentIR::UsesDescriptionSeq>::insert (
+      _tao_any,
+      CORBA::ComponentIR::UsesDescriptionSeq::_tao_any_destructor,
+      TAO::TypeCode::tc_CORBA_ComponentIR_UsesDescriptionSeq_0,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::ComponentIR::UsesDescriptionSeq *&_tao_elem
+  )
+{
+  return _tao_any >>= const_cast<
+      const CORBA::ComponentIR::UsesDescriptionSeq *&> (
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CORBA::ComponentIR::UsesDescriptionSeq *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<CORBA::ComponentIR::UsesDescriptionSeq>::extract (
+        _tao_any,
+        CORBA::ComponentIR::UsesDescriptionSeq::_tao_any_destructor,
+        TAO::TypeCode::tc_CORBA_ComponentIR_UsesDescriptionSeq_0,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from 
+// be\be_visitor_sequence/any_op_cs.cpp:54
+
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const CORBA::ComponentIR::EventPortDescriptionSeq &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::ComponentIR::EventPortDescriptionSeq>::insert_copy (
+      _tao_any,
+      CORBA::ComponentIR::EventPortDescriptionSeq::_tao_any_destructor,
+      TAO::TypeCode::tc_CORBA_ComponentIR_EventPortDescriptionSeq_0,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ComponentIR::EventPortDescriptionSeq *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::ComponentIR::EventPortDescriptionSeq>::insert (
+      _tao_any,
+      CORBA::ComponentIR::EventPortDescriptionSeq::_tao_any_destructor,
+      TAO::TypeCode::tc_CORBA_ComponentIR_EventPortDescriptionSeq_0,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::ComponentIR::EventPortDescriptionSeq *&_tao_elem
+  )
+{
+  return _tao_any >>= const_cast<
+      const CORBA::ComponentIR::EventPortDescriptionSeq *&> (
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CORBA::ComponentIR::EventPortDescriptionSeq *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<CORBA::ComponentIR::EventPortDescriptionSeq>::extract (
+        _tao_any,
+        CORBA::ComponentIR::EventPortDescriptionSeq::_tao_any_destructor,
+        TAO::TypeCode::tc_CORBA_ComponentIR_EventPortDescriptionSeq_0,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from 
+// be\be_visitor_structure/any_op_cs.cpp:54
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const CORBA::ComponentIR::ComponentDescription &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::ComponentIR::ComponentDescription>::insert_copy (
+      _tao_any,
+      CORBA::ComponentIR::ComponentDescription::_tao_any_destructor,
+      CORBA::ComponentIR::_tc_ComponentDescription,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ComponentIR::ComponentDescription *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::ComponentIR::ComponentDescription>::insert (
+      _tao_any,
+      CORBA::ComponentIR::ComponentDescription::_tao_any_destructor,
+      CORBA::ComponentIR::_tc_ComponentDescription,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::ComponentIR::ComponentDescription *&_tao_elem
+  )
+{
+  return _tao_any >>= const_cast<
+      const CORBA::ComponentIR::ComponentDescription *&> (
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CORBA::ComponentIR::ComponentDescription *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<CORBA::ComponentIR::ComponentDescription>::extract (
+        _tao_any,
+        CORBA::ComponentIR::ComponentDescription::_tao_any_destructor,
+        CORBA::ComponentIR::_tc_ComponentDescription,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+namespace TAO
+{
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<CORBA::ComponentIR::FactoryDef>::to_object (
+      CORBA::Object_ptr &_tao_elem
+    ) const
+  {
+    _tao_elem = CORBA::Object::_duplicate (this->value_);
+    return true;
+  }
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ComponentIR::FactoryDef_ptr _tao_elem
+  )
+{
+  CORBA::ComponentIR::FactoryDef_ptr _tao_objptr =
+    CORBA::ComponentIR::FactoryDef::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ComponentIR::FactoryDef_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<CORBA::ComponentIR::FactoryDef>::insert (
+      _tao_any,
+      CORBA::ComponentIR::FactoryDef::_tao_any_destructor,
+      CORBA::ComponentIR::_tc_FactoryDef,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::ComponentIR::FactoryDef_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<CORBA::ComponentIR::FactoryDef>::extract (
+        _tao_any,
+        CORBA::ComponentIR::FactoryDef::_tao_any_destructor,
+        CORBA::ComponentIR::_tc_FactoryDef,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+namespace TAO
+{
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<CORBA::ComponentIR::FinderDef>::to_object (
+      CORBA::Object_ptr &_tao_elem
+    ) const
+  {
+    _tao_elem = CORBA::Object::_duplicate (this->value_);
+    return true;
+  }
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ComponentIR::FinderDef_ptr _tao_elem
+  )
+{
+  CORBA::ComponentIR::FinderDef_ptr _tao_objptr =
+    CORBA::ComponentIR::FinderDef::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ComponentIR::FinderDef_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<CORBA::ComponentIR::FinderDef>::insert (
+      _tao_any,
+      CORBA::ComponentIR::FinderDef::_tao_any_destructor,
+      CORBA::ComponentIR::_tc_FinderDef,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::ComponentIR::FinderDef_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<CORBA::ComponentIR::FinderDef>::extract (
+        _tao_any,
+        CORBA::ComponentIR::FinderDef::_tao_any_destructor,
+        CORBA::ComponentIR::_tc_FinderDef,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+namespace TAO
+{
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<CORBA::ComponentIR::HomeDef>::to_object (
+      CORBA::Object_ptr &_tao_elem
+    ) const
+  {
+    _tao_elem = CORBA::Object::_duplicate (this->value_);
+    return true;
+  }
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ComponentIR::HomeDef_ptr _tao_elem
+  )
+{
+  CORBA::ComponentIR::HomeDef_ptr _tao_objptr =
+    CORBA::ComponentIR::HomeDef::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ComponentIR::HomeDef_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<CORBA::ComponentIR::HomeDef>::insert (
+      _tao_any,
+      CORBA::ComponentIR::HomeDef::_tao_any_destructor,
+      CORBA::ComponentIR::_tc_HomeDef,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::ComponentIR::HomeDef_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<CORBA::ComponentIR::HomeDef>::extract (
+        _tao_any,
+        CORBA::ComponentIR::HomeDef::_tao_any_destructor,
+        CORBA::ComponentIR::_tc_HomeDef,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from 
+// be\be_visitor_structure/any_op_cs.cpp:54
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const CORBA::ComponentIR::HomeDescription &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::ComponentIR::HomeDescription>::insert_copy (
+      _tao_any,
+      CORBA::ComponentIR::HomeDescription::_tao_any_destructor,
+      CORBA::ComponentIR::_tc_HomeDescription,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ComponentIR::HomeDescription *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::ComponentIR::HomeDescription>::insert (
+      _tao_any,
+      CORBA::ComponentIR::HomeDescription::_tao_any_destructor,
+      CORBA::ComponentIR::_tc_HomeDescription,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::ComponentIR::HomeDescription *&_tao_elem
+  )
+{
+  return _tao_any >>= const_cast<
+      const CORBA::ComponentIR::HomeDescription *&> (
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CORBA::ComponentIR::HomeDescription *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<CORBA::ComponentIR::HomeDescription>::extract (
+        _tao_any,
+        CORBA::ComponentIR::HomeDescription::_tao_any_destructor,
+        CORBA::ComponentIR::_tc_HomeDescription,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from
 // be\be_visitor_interface/cdr_op_cs.cpp:63
 
 CORBA::Boolean operator<< (
@@ -4722,7 +6762,7 @@ CORBA::Boolean operator<< (
     (strm << _tao_aggregate.defined_in.in ()) &&
     (strm << _tao_aggregate.version.in ()) &&
     (strm << _tao_aggregate.interface_type.in ()) &&
-    (strm << CORBA::Any::from_boolean (_tao_aggregate.is_multiple));
+    (strm << ACE_OutputCDR::from_boolean (_tao_aggregate.is_multiple));
 }
 
 CORBA::Boolean operator>> (
@@ -4736,7 +6776,7 @@ CORBA::Boolean operator>> (
     (strm >> _tao_aggregate.defined_in.out ()) &&
     (strm >> _tao_aggregate.version.out ()) &&
     (strm >> _tao_aggregate.interface_type.out ()) &&
-    (strm >> CORBA::Any::to_boolean (_tao_aggregate.is_multiple));
+    (strm >> ACE_InputCDR::to_boolean (_tao_aggregate.is_multiple));
 }
 
 // TAO_IDL - Generated from
diff --git a/TAO/tao/IFR_Client/IFR_ComponentsC.h b/TAO/tao/IFR_Client/IFR_ComponentsC.h
index 5d35ae15ad8..ad47576bc3f 100644
--- a/TAO/tao/IFR_Client/IFR_ComponentsC.h
+++ b/TAO/tao/IFR_Client/IFR_ComponentsC.h
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:153
+// be\be_codegen.cpp:154
 
 #ifndef _TAO_IDL_ORIG_IFR_COMPONENTSC_H_
 #define _TAO_IDL_ORIG_IFR_COMPONENTSC_H_
@@ -45,8 +45,8 @@
 #include "tao/SystemException.h"
 #include "tao/Environment.h"
 #include "tao/Object.h"
-#include "tao/TypeCode.h"
-#include "tao/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/TypeCode.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/Sequence_T.h"
 #include "tao/Objref_VarOut_T.h"
 #include "tao/Seq_Var_T.h"
@@ -242,7 +242,7 @@ namespace CORBA
 #endif /* end #if !defined */
     
     // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:44
+    // be\be_visitor_typecode/typecode_decl.cpp:49
     
     extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_EventDef;
     
@@ -404,7 +404,7 @@ namespace CORBA
 #endif /* end #if !defined */
     
     // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:44
+    // be\be_visitor_typecode/typecode_decl.cpp:49
     
     extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_Container;
     
@@ -515,7 +515,7 @@ namespace CORBA
 #endif /* end #if !defined */
     
     // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:44
+    // be\be_visitor_typecode/typecode_decl.cpp:49
     
     extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ModuleDef;
     
@@ -626,7 +626,7 @@ namespace CORBA
 #endif /* end #if !defined */
     
     // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:44
+    // be\be_visitor_typecode/typecode_decl.cpp:49
     
     extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_Repository;
     
@@ -757,7 +757,7 @@ namespace CORBA
 #endif /* end #if !defined */
     
     // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:44
+    // be\be_visitor_typecode/typecode_decl.cpp:49
     
     extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ProvidesDef;
     
@@ -780,7 +780,7 @@ namespace CORBA
       ProvidesDescription_out;
     
     // TAO_IDL - Generated from
-    // be\be_visitor_structure/structure_ch.cpp:52
+    // be\be_visitor_structure/structure_ch.cpp:57
     
     struct TAO_IFR_Client_Export ProvidesDescription
     {
@@ -795,7 +795,7 @@ namespace CORBA
     };
     
     // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:44
+    // be\be_visitor_typecode/typecode_decl.cpp:49
     
     extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ProvidesDescription;
     
@@ -947,7 +947,7 @@ namespace CORBA
 #endif /* end #if !defined */
     
     // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:44
+    // be\be_visitor_typecode/typecode_decl.cpp:49
     
     extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_UsesDef;
     
@@ -970,7 +970,7 @@ namespace CORBA
       UsesDescription_out;
     
     // TAO_IDL - Generated from
-    // be\be_visitor_structure/structure_ch.cpp:52
+    // be\be_visitor_structure/structure_ch.cpp:57
     
     struct TAO_IFR_Client_Export UsesDescription
     {
@@ -986,7 +986,7 @@ namespace CORBA
     };
     
     // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:44
+    // be\be_visitor_typecode/typecode_decl.cpp:49
     
     extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_UsesDescription;
     
@@ -1128,7 +1128,7 @@ namespace CORBA
 #endif /* end #if !defined */
     
     // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:44
+    // be\be_visitor_typecode/typecode_decl.cpp:49
     
     extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_EventPortDef;
     
@@ -1151,7 +1151,7 @@ namespace CORBA
       EventPortDescription_out;
     
     // TAO_IDL - Generated from
-    // be\be_visitor_structure/structure_ch.cpp:52
+    // be\be_visitor_structure/structure_ch.cpp:57
     
     struct TAO_IFR_Client_Export EventPortDescription
     {
@@ -1166,7 +1166,7 @@ namespace CORBA
     };
     
     // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:44
+    // be\be_visitor_typecode/typecode_decl.cpp:49
     
     extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_EventPortDescription;
     
@@ -1276,7 +1276,7 @@ namespace CORBA
 #endif /* end #if !defined */
     
     // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:44
+    // be\be_visitor_typecode/typecode_decl.cpp:49
     
     extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_EmitsDef;
     
@@ -1386,7 +1386,7 @@ namespace CORBA
 #endif /* end #if !defined */
     
     // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:44
+    // be\be_visitor_typecode/typecode_decl.cpp:49
     
     extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_PublishesDef;
     
@@ -1496,7 +1496,7 @@ namespace CORBA
 #endif /* end #if !defined */
     
     // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:44
+    // be\be_visitor_typecode/typecode_decl.cpp:49
     
     extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ConsumesDef;
     
@@ -1696,7 +1696,7 @@ namespace CORBA
 #endif /* end #if !defined */
     
     // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:44
+    // be\be_visitor_typecode/typecode_decl.cpp:49
     
     extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ComponentDef;
     
@@ -1749,7 +1749,7 @@ namespace CORBA
 #endif /* end #if !defined */
     
     // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:44
+    // be\be_visitor_typecode/typecode_decl.cpp:49
     
     extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ProvidesDescriptionSeq;
     
@@ -1802,7 +1802,7 @@ namespace CORBA
 #endif /* end #if !defined */
     
     // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:44
+    // be\be_visitor_typecode/typecode_decl.cpp:49
     
     extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_UsesDescriptionSeq;
     
@@ -1855,7 +1855,7 @@ namespace CORBA
 #endif /* end #if !defined */
     
     // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:44
+    // be\be_visitor_typecode/typecode_decl.cpp:49
     
     extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_EventPortDescriptionSeq;
     
@@ -1878,7 +1878,7 @@ namespace CORBA
       ComponentDescription_out;
     
     // TAO_IDL - Generated from
-    // be\be_visitor_structure/structure_ch.cpp:52
+    // be\be_visitor_structure/structure_ch.cpp:57
     
     struct TAO_IFR_Client_Export ComponentDescription
     {
@@ -1901,7 +1901,7 @@ namespace CORBA
     };
     
     // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:44
+    // be\be_visitor_typecode/typecode_decl.cpp:49
     
     extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ComponentDescription;
     
@@ -2011,7 +2011,7 @@ namespace CORBA
 #endif /* end #if !defined */
     
     // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:44
+    // be\be_visitor_typecode/typecode_decl.cpp:49
     
     extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_FactoryDef;
     
@@ -2121,7 +2121,7 @@ namespace CORBA
 #endif /* end #if !defined */
     
     // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:44
+    // be\be_visitor_typecode/typecode_decl.cpp:49
     
     extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_FinderDef;
     
@@ -2322,7 +2322,7 @@ namespace CORBA
 #endif /* end #if !defined */
     
     // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:44
+    // be\be_visitor_typecode/typecode_decl.cpp:49
     
     extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_HomeDef;
     
@@ -2345,7 +2345,7 @@ namespace CORBA
       HomeDescription_out;
     
     // TAO_IDL - Generated from
-    // be\be_visitor_structure/structure_ch.cpp:52
+    // be\be_visitor_structure/structure_ch.cpp:57
     
     struct TAO_IFR_Client_Export HomeDescription
     {
@@ -2367,7 +2367,7 @@ namespace CORBA
     };
     
     // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:44
+    // be\be_visitor_typecode/typecode_decl.cpp:49
     
     extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_HomeDescription;
   
@@ -2477,50 +2477,8 @@ TAO::Collocation_Proxy_Broker *
 namespace TAO
 {
 
-#if !defined (_CORBA_COMPONENTIR_COMPONENTDEF__TRAITS_CH_)
-#define _CORBA_COMPONENTIR_COMPONENTDEF__TRAITS_CH_
-  
-  template<>
-  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ComponentIR::ComponentDef>
-  {
-    static ::CORBA::ComponentIR::ComponentDef_ptr duplicate (
-        ::CORBA::ComponentIR::ComponentDef_ptr
-      );
-    static void release (
-        ::CORBA::ComponentIR::ComponentDef_ptr
-      );
-    static ::CORBA::ComponentIR::ComponentDef_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::CORBA::ComponentIR::ComponentDef_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_COMPONENTIR_HOMEDEF__TRAITS_CH_)
-#define _CORBA_COMPONENTIR_HOMEDEF__TRAITS_CH_
-  
-  template<>
-  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ComponentIR::HomeDef>
-  {
-    static ::CORBA::ComponentIR::HomeDef_ptr duplicate (
-        ::CORBA::ComponentIR::HomeDef_ptr
-      );
-    static void release (
-        ::CORBA::ComponentIR::HomeDef_ptr
-      );
-    static ::CORBA::ComponentIR::HomeDef_ptr nil (void);
-    static CORBA::Boolean marshal (
-        ::CORBA::ComponentIR::HomeDef_ptr p,
-        TAO_OutputCDR & cdr
-      );
-  };
-
-#endif /* end #if !defined */
-
-#if !defined (_CORBA_COMPONENTIR_EVENTDEF__TRAITS_CH_)
-#define _CORBA_COMPONENTIR_EVENTDEF__TRAITS_CH_
+#if !defined (_CORBA_COMPONENTIR_EVENTDEF__TRAITS_)
+#define _CORBA_COMPONENTIR_EVENTDEF__TRAITS_
   
   template<>
   struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ComponentIR::EventDef>
@@ -2540,8 +2498,8 @@ namespace TAO
 
 #endif /* end #if !defined */
 
-#if !defined (_CORBA_COMPONENTIR_CONTAINER__TRAITS_CH_)
-#define _CORBA_COMPONENTIR_CONTAINER__TRAITS_CH_
+#if !defined (_CORBA_COMPONENTIR_CONTAINER__TRAITS_)
+#define _CORBA_COMPONENTIR_CONTAINER__TRAITS_
   
   template<>
   struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ComponentIR::Container>
@@ -2561,8 +2519,8 @@ namespace TAO
 
 #endif /* end #if !defined */
 
-#if !defined (_CORBA_COMPONENTIR_MODULEDEF__TRAITS_CH_)
-#define _CORBA_COMPONENTIR_MODULEDEF__TRAITS_CH_
+#if !defined (_CORBA_COMPONENTIR_MODULEDEF__TRAITS_)
+#define _CORBA_COMPONENTIR_MODULEDEF__TRAITS_
   
   template<>
   struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ComponentIR::ModuleDef>
@@ -2582,8 +2540,8 @@ namespace TAO
 
 #endif /* end #if !defined */
 
-#if !defined (_CORBA_COMPONENTIR_REPOSITORY__TRAITS_CH_)
-#define _CORBA_COMPONENTIR_REPOSITORY__TRAITS_CH_
+#if !defined (_CORBA_COMPONENTIR_REPOSITORY__TRAITS_)
+#define _CORBA_COMPONENTIR_REPOSITORY__TRAITS_
   
   template<>
   struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ComponentIR::Repository>
@@ -2603,8 +2561,8 @@ namespace TAO
 
 #endif /* end #if !defined */
 
-#if !defined (_CORBA_COMPONENTIR_PROVIDESDEF__TRAITS_CH_)
-#define _CORBA_COMPONENTIR_PROVIDESDEF__TRAITS_CH_
+#if !defined (_CORBA_COMPONENTIR_PROVIDESDEF__TRAITS_)
+#define _CORBA_COMPONENTIR_PROVIDESDEF__TRAITS_
   
   template<>
   struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ComponentIR::ProvidesDef>
@@ -2624,8 +2582,8 @@ namespace TAO
 
 #endif /* end #if !defined */
 
-#if !defined (_CORBA_COMPONENTIR_USESDEF__TRAITS_CH_)
-#define _CORBA_COMPONENTIR_USESDEF__TRAITS_CH_
+#if !defined (_CORBA_COMPONENTIR_USESDEF__TRAITS_)
+#define _CORBA_COMPONENTIR_USESDEF__TRAITS_
   
   template<>
   struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ComponentIR::UsesDef>
@@ -2645,8 +2603,8 @@ namespace TAO
 
 #endif /* end #if !defined */
 
-#if !defined (_CORBA_COMPONENTIR_EVENTPORTDEF__TRAITS_CH_)
-#define _CORBA_COMPONENTIR_EVENTPORTDEF__TRAITS_CH_
+#if !defined (_CORBA_COMPONENTIR_EVENTPORTDEF__TRAITS_)
+#define _CORBA_COMPONENTIR_EVENTPORTDEF__TRAITS_
   
   template<>
   struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ComponentIR::EventPortDef>
@@ -2666,8 +2624,8 @@ namespace TAO
 
 #endif /* end #if !defined */
 
-#if !defined (_CORBA_COMPONENTIR_EMITSDEF__TRAITS_CH_)
-#define _CORBA_COMPONENTIR_EMITSDEF__TRAITS_CH_
+#if !defined (_CORBA_COMPONENTIR_EMITSDEF__TRAITS_)
+#define _CORBA_COMPONENTIR_EMITSDEF__TRAITS_
   
   template<>
   struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ComponentIR::EmitsDef>
@@ -2687,8 +2645,8 @@ namespace TAO
 
 #endif /* end #if !defined */
 
-#if !defined (_CORBA_COMPONENTIR_PUBLISHESDEF__TRAITS_CH_)
-#define _CORBA_COMPONENTIR_PUBLISHESDEF__TRAITS_CH_
+#if !defined (_CORBA_COMPONENTIR_PUBLISHESDEF__TRAITS_)
+#define _CORBA_COMPONENTIR_PUBLISHESDEF__TRAITS_
   
   template<>
   struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ComponentIR::PublishesDef>
@@ -2708,8 +2666,8 @@ namespace TAO
 
 #endif /* end #if !defined */
 
-#if !defined (_CORBA_COMPONENTIR_CONSUMESDEF__TRAITS_CH_)
-#define _CORBA_COMPONENTIR_CONSUMESDEF__TRAITS_CH_
+#if !defined (_CORBA_COMPONENTIR_CONSUMESDEF__TRAITS_)
+#define _CORBA_COMPONENTIR_CONSUMESDEF__TRAITS_
   
   template<>
   struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ComponentIR::ConsumesDef>
@@ -2729,8 +2687,29 @@ namespace TAO
 
 #endif /* end #if !defined */
 
-#if !defined (_CORBA_COMPONENTIR_FACTORYDEF__TRAITS_CH_)
-#define _CORBA_COMPONENTIR_FACTORYDEF__TRAITS_CH_
+#if !defined (_CORBA_COMPONENTIR_COMPONENTDEF__TRAITS_)
+#define _CORBA_COMPONENTIR_COMPONENTDEF__TRAITS_
+  
+  template<>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ComponentIR::ComponentDef>
+  {
+    static ::CORBA::ComponentIR::ComponentDef_ptr duplicate (
+        ::CORBA::ComponentIR::ComponentDef_ptr
+      );
+    static void release (
+        ::CORBA::ComponentIR::ComponentDef_ptr
+      );
+    static ::CORBA::ComponentIR::ComponentDef_ptr nil (void);
+    static CORBA::Boolean marshal (
+        ::CORBA::ComponentIR::ComponentDef_ptr p,
+        TAO_OutputCDR & cdr
+      );
+  };
+
+#endif /* end #if !defined */
+
+#if !defined (_CORBA_COMPONENTIR_FACTORYDEF__TRAITS_)
+#define _CORBA_COMPONENTIR_FACTORYDEF__TRAITS_
   
   template<>
   struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ComponentIR::FactoryDef>
@@ -2750,8 +2729,8 @@ namespace TAO
 
 #endif /* end #if !defined */
 
-#if !defined (_CORBA_COMPONENTIR_FINDERDEF__TRAITS_CH_)
-#define _CORBA_COMPONENTIR_FINDERDEF__TRAITS_CH_
+#if !defined (_CORBA_COMPONENTIR_FINDERDEF__TRAITS_)
+#define _CORBA_COMPONENTIR_FINDERDEF__TRAITS_
   
   template<>
   struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ComponentIR::FinderDef>
@@ -2770,45 +2749,66 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
+
+#if !defined (_CORBA_COMPONENTIR_HOMEDEF__TRAITS_)
+#define _CORBA_COMPONENTIR_HOMEDEF__TRAITS_
+  
+  template<>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ComponentIR::HomeDef>
+  {
+    static ::CORBA::ComponentIR::HomeDef_ptr duplicate (
+        ::CORBA::ComponentIR::HomeDef_ptr
+      );
+    static void release (
+        ::CORBA::ComponentIR::HomeDef_ptr
+      );
+    static ::CORBA::ComponentIR::HomeDef_ptr nil (void);
+    static CORBA::Boolean marshal (
+        ::CORBA::ComponentIR::HomeDef_ptr p,
+        TAO_OutputCDR & cdr
+      );
+  };
+
+#endif /* end #if !defined */
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
+// be\be_visitor_interface/any_op_ch.cpp:53
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ComponentIR::EventDef_ptr); // copying
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ComponentIR::EventDef_ptr *); // non-copying
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ComponentIR::EventDef_ptr &);
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
+// be\be_visitor_interface/any_op_ch.cpp:53
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ComponentIR::Container_ptr); // copying
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ComponentIR::Container_ptr *); // non-copying
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ComponentIR::Container_ptr &);
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
+// be\be_visitor_interface/any_op_ch.cpp:53
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ComponentIR::ModuleDef_ptr); // copying
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ComponentIR::ModuleDef_ptr *); // non-copying
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ComponentIR::ModuleDef_ptr &);
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
+// be\be_visitor_interface/any_op_ch.cpp:53
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ComponentIR::Repository_ptr); // copying
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ComponentIR::Repository_ptr *); // non-copying
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ComponentIR::Repository_ptr &);
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
+// be\be_visitor_interface/any_op_ch.cpp:53
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ComponentIR::ProvidesDef_ptr); // copying
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ComponentIR::ProvidesDef_ptr *); // non-copying
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ComponentIR::ProvidesDef_ptr &);
 
 // TAO_IDL - Generated from
-// be\be_visitor_structure/any_op_ch.cpp:52
+// be\be_visitor_structure/any_op_ch.cpp:53
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::ComponentIR::ProvidesDescription &); // copying version
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ComponentIR::ProvidesDescription*); // noncopying version
@@ -2816,14 +2816,14 @@ TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Com
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ComponentIR::ProvidesDescription *&);
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
+// be\be_visitor_interface/any_op_ch.cpp:53
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ComponentIR::UsesDef_ptr); // copying
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ComponentIR::UsesDef_ptr *); // non-copying
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ComponentIR::UsesDef_ptr &);
 
 // TAO_IDL - Generated from
-// be\be_visitor_structure/any_op_ch.cpp:52
+// be\be_visitor_structure/any_op_ch.cpp:53
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::ComponentIR::UsesDescription &); // copying version
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ComponentIR::UsesDescription*); // noncopying version
@@ -2831,14 +2831,14 @@ TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Com
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ComponentIR::UsesDescription *&);
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
+// be\be_visitor_interface/any_op_ch.cpp:53
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ComponentIR::EventPortDef_ptr); // copying
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ComponentIR::EventPortDef_ptr *); // non-copying
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ComponentIR::EventPortDef_ptr &);
 
 // TAO_IDL - Generated from
-// be\be_visitor_structure/any_op_ch.cpp:52
+// be\be_visitor_structure/any_op_ch.cpp:53
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::ComponentIR::EventPortDescription &); // copying version
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ComponentIR::EventPortDescription*); // noncopying version
@@ -2846,35 +2846,35 @@ TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Com
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ComponentIR::EventPortDescription *&);
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
+// be\be_visitor_interface/any_op_ch.cpp:53
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ComponentIR::EmitsDef_ptr); // copying
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ComponentIR::EmitsDef_ptr *); // non-copying
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ComponentIR::EmitsDef_ptr &);
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
+// be\be_visitor_interface/any_op_ch.cpp:53
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ComponentIR::PublishesDef_ptr); // copying
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ComponentIR::PublishesDef_ptr *); // non-copying
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ComponentIR::PublishesDef_ptr &);
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
+// be\be_visitor_interface/any_op_ch.cpp:53
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ComponentIR::ConsumesDef_ptr); // copying
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ComponentIR::ConsumesDef_ptr *); // non-copying
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ComponentIR::ConsumesDef_ptr &);
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
+// be\be_visitor_interface/any_op_ch.cpp:53
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ComponentIR::ComponentDef_ptr); // copying
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ComponentIR::ComponentDef_ptr *); // non-copying
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ComponentIR::ComponentDef_ptr &);
 
 // TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
+// be\be_visitor_sequence/any_op_ch.cpp:53
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::ComponentIR::ProvidesDescriptionSeq &); // copying version
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ComponentIR::ProvidesDescriptionSeq*); // noncopying version
@@ -2882,7 +2882,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Com
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ComponentIR::ProvidesDescriptionSeq *&);
 
 // TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
+// be\be_visitor_sequence/any_op_ch.cpp:53
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::ComponentIR::UsesDescriptionSeq &); // copying version
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ComponentIR::UsesDescriptionSeq*); // noncopying version
@@ -2890,7 +2890,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Com
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ComponentIR::UsesDescriptionSeq *&);
 
 // TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
+// be\be_visitor_sequence/any_op_ch.cpp:53
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::ComponentIR::EventPortDescriptionSeq &); // copying version
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ComponentIR::EventPortDescriptionSeq*); // noncopying version
@@ -2898,7 +2898,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Com
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ComponentIR::EventPortDescriptionSeq *&);
 
 // TAO_IDL - Generated from
-// be\be_visitor_structure/any_op_ch.cpp:52
+// be\be_visitor_structure/any_op_ch.cpp:53
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::ComponentIR::ComponentDescription &); // copying version
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ComponentIR::ComponentDescription*); // noncopying version
@@ -2906,28 +2906,28 @@ TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Com
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ComponentIR::ComponentDescription *&);
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
+// be\be_visitor_interface/any_op_ch.cpp:53
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ComponentIR::FactoryDef_ptr); // copying
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ComponentIR::FactoryDef_ptr *); // non-copying
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ComponentIR::FactoryDef_ptr &);
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
+// be\be_visitor_interface/any_op_ch.cpp:53
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ComponentIR::FinderDef_ptr); // copying
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ComponentIR::FinderDef_ptr *); // non-copying
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ComponentIR::FinderDef_ptr &);
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
+// be\be_visitor_interface/any_op_ch.cpp:53
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ComponentIR::HomeDef_ptr); // copying
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ComponentIR::HomeDef_ptr *); // non-copying
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ComponentIR::HomeDef_ptr &);
 
 // TAO_IDL - Generated from
-// be\be_visitor_structure/any_op_ch.cpp:52
+// be\be_visitor_structure/any_op_ch.cpp:53
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::ComponentIR::HomeDescription &); // copying version
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ComponentIR::HomeDescription*); // noncopying version
@@ -3100,7 +3100,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::C
 TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ComponentIR::HomeDescription &);
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:955
+// be\be_codegen.cpp:1136
 
 #if defined (__ACE_INLINE__)
 #include "IFR_ComponentsC.inl"
diff --git a/TAO/tao/IFR_Client/IFR_Extended.pidl b/TAO/tao/IFR_Client/IFR_Extended.pidl
index 7a6a0ee51c8..e0c06ce2c57 100644
--- a/TAO/tao/IFR_Client/IFR_Extended.pidl
+++ b/TAO/tao/IFR_Client/IFR_Extended.pidl
@@ -1,62 +1,57 @@
-//
-// $Id$
-//
-// ================================================================
-//
-// = LIBRARY
-//   TAO_IFR_Client
-//
-// = FILENAME
-//   IFR_Extended.pidl
-//
-// = DESCRIPTION
-//   This file was used to generate the code in IFR_ExtendedC.{h,i,cpp}.
-//   The original file Interface.idl was split into four pieces, to
-//   keep the generated files to a manageable size and reduce build
-//   time. This IDL file contains all the interfaces and other data
-//   types related to fixed types and valuetypes.
-//
-//   The command used to generate code from this IDL file is:
-//
-//     tao_idl -Ge 1 -Sc -I../.. -GA \
-//          -Wb,export_macro=TAO_IFR_Client_Export \
-//          -Wb,export_include=ifr_client_export.h \
-//          -Wb,pre_include="ace/pre.h" \
-//          -Wb,post_include="ace/post.h" \
-//          IFR_Extended.pidl
-//
-//   Only the stub files are used in the TAO_IFR_Client library. The
-//   skeleton files can be deleted from this directory.
-//
-//   No patching of the generated stub files is necessary.
-//
-//   To generate the skeleton files for the IFR Service, the command is:
-//
-//     tao_idl -o ../../orbsvcs/orbsvcs/IFRService -Ge 1 \
-//          -Wb,pre_include="ace/pre.h" \
-//          -Wb,post_include="ace/post.h" \
-//          IFR_Extended.pidl
-//
-//   The only modification necessary to the skelton files is to
-//   change
-//
-//   #include "IFR_ExtendedC.h"
-//
-//   to
-//
-//   #include "tao/IFR_Client/IFR_ExtendedC.h"
-//
-//   in IFR_ExtendedS.h. The stub files may be deleted from the IFRService
-//   directory.
-//
-// ================================================================
+// -*- IDL -*-
+
+/**
+ * @file IFR_Extended.pidl
+ *
+ * $Id$
+ *
+ *   This file was used to generate the code in IFR_ExtendedC.{h,i,cpp}.
+ *   The original file Interface.idl was split into four pieces, to
+ *   keep the generated files to a manageable size and reduce build
+ *   time. This IDL file contains all the interfaces and other data
+ *   types related to fixed types and valuetypes.
+ *
+ *   The command used to generate code from this IDL file is:
+ *
+ *     tao_idl -Ge 1 -Sc -I../.. \
+ *          -Wb,export_macro=TAO_IFR_Client_Export \
+ *          -Wb,export_include=ifr_client_export.h \
+ *          -Wb,pre_include="ace/pre.h" \
+ *          -Wb,post_include="ace/post.h" \
+ *          IFR_Extended.pidl
+ *
+ *   Only the stub files are used in the TAO_IFR_Client library. The
+ *   skeleton files can be deleted from this directory.
+ *
+ *   No patching of the generated stub files is necessary.
+ *
+ *   To generate the skeleton files for the IFR Service, the command is:
+ *
+ *     tao_idl -o ../../orbsvcs/orbsvcs/IFRService -Ge 1 \
+ *          -Wb,pre_include="ace/pre.h" \
+ *          -Wb,post_include="ace/post.h" \
+ *          IFR_Extended.pidl
+ *
+ *   The only modification necessary to the skelton files is to
+ *   change
+ *
+ *   #include "IFR_ExtendedC.h"
+ *
+ *   to
+ *
+ *   #include "tao/IFR_Client/IFR_ExtendedC.h"
+ *
+ *   in IFR_ExtendedS.h. The stub files may be deleted from the IFRService
+ *   directory.
+ *
+ */
 
 #ifndef _IFR_EXTENDED_IDL_
 #define _IFR_EXTENDED_IDL_
 
 #include "tao/IFR_Client/IFR_Basic.pidl"
-#include <Visibility.pidl>
-#include <ValueModifier.pidl>
+#include "tao/AnyTypeCode/Visibility.pidl"
+#include "tao/AnyTypeCode/ValueModifier.pidl"
 
 module CORBA
 {
diff --git a/TAO/tao/IFR_Client/IFR_ExtendedA.cpp b/TAO/tao/IFR_Client/IFR_ExtendedA.cpp
deleted file mode 100644
index 8fe4284ea71..00000000000
--- a/TAO/tao/IFR_Client/IFR_ExtendedA.cpp
+++ /dev/null
@@ -1,903 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "IFR_ExtendedC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
-#include "tao/Sequence_TypeCode_Static.h"
-#include "tao/String_TypeCode_Static.h"
-#include "tao/Struct_TypeCode_Static.h"
-#include "tao/TypeCode_Struct_Field.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
-#include "tao/Any_Dual_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_FixedDef (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/FixedDef:1.0",
-    "FixedDef");
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_FixedDef =
-    &_tao_tc_CORBA_FixedDef;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_ValueMember[] =
-  {
-    { "name", &CORBA::_tc_Identifier },
-    { "id", &CORBA::_tc_RepositoryId },
-    { "defined_in", &CORBA::_tc_RepositoryId },
-    { "version", &CORBA::_tc_VersionSpec },
-    { "type", &CORBA::_tc_TypeCode },
-    { "type_def", &CORBA::_tc_IDLType },
-    { "access", &CORBA::_tc_Visibility }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ValueMember (
-    CORBA::tk_struct,
-    "IDL:omg.org/CORBA/ValueMember:1.0",
-    "ValueMember",
-    _tao_fields_CORBA_ValueMember,
-    7);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ValueMember =
-    &_tao_tc_CORBA_ValueMember;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/alias_typecode.cpp:31
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:925
-
-
-#ifndef _TAO_TYPECODE_CORBA_ValueMemberSeq_GUARD
-#define _TAO_TYPECODE_CORBA_ValueMemberSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_ValueMemberSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_ValueMember,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_ValueMemberSeq_0 =
-      &CORBA_ValueMemberSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_ValueMemberSeq_GUARD */
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ValueMemberSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/ValueMemberSeq:1.0",
-    "ValueMemberSeq",
-    &TAO::TypeCode::tc_CORBA_ValueMemberSeq_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ValueMemberSeq =
-    &_tao_tc_CORBA_ValueMemberSeq;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ValueMemberDef (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/ValueMemberDef:1.0",
-    "ValueMemberDef");
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ValueMemberDef =
-    &_tao_tc_CORBA_ValueMemberDef;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_ValueDef_FullValueDescription[] =
-  {
-    { "name", &CORBA::_tc_Identifier },
-    { "id", &CORBA::_tc_RepositoryId },
-    { "is_abstract", &CORBA::_tc_boolean },
-    { "is_custom", &CORBA::_tc_boolean },
-    { "defined_in", &CORBA::_tc_RepositoryId },
-    { "version", &CORBA::_tc_VersionSpec },
-    { "operations", &CORBA::_tc_OpDescriptionSeq },
-    { "attributes", &CORBA::_tc_AttrDescriptionSeq },
-    { "members", &CORBA::_tc_ValueMemberSeq },
-    { "initializers", &CORBA::_tc_InitializerSeq },
-    { "supported_interfaces", &CORBA::_tc_RepositoryIdSeq },
-    { "abstract_base_values", &CORBA::_tc_RepositoryIdSeq },
-    { "is_truncatable", &CORBA::_tc_boolean },
-    { "base_value", &CORBA::_tc_RepositoryId },
-    { "type", &CORBA::_tc_TypeCode }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ValueDef_FullValueDescription (
-    CORBA::tk_struct,
-    "IDL:omg.org/CORBA/ValueDef/FullValueDescription:1.0",
-    "FullValueDescription",
-    _tao_fields_CORBA_ValueDef_FullValueDescription,
-    15);
-  
-::CORBA::TypeCode_ptr const CORBA::ValueDef::_tc_FullValueDescription =
-  &_tao_tc_CORBA_ValueDef_FullValueDescription;
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ValueDef (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/ValueDef:1.0",
-    "ValueDef");
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ValueDef =
-    &_tao_tc_CORBA_ValueDef;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_ValueDescription[] =
-  {
-    { "name", &CORBA::_tc_Identifier },
-    { "id", &CORBA::_tc_RepositoryId },
-    { "is_abstract", &CORBA::_tc_boolean },
-    { "is_custom", &CORBA::_tc_boolean },
-    { "defined_in", &CORBA::_tc_RepositoryId },
-    { "version", &CORBA::_tc_VersionSpec },
-    { "supported_interfaces", &CORBA::_tc_RepositoryIdSeq },
-    { "abstract_base_values", &CORBA::_tc_RepositoryIdSeq },
-    { "is_truncatable", &CORBA::_tc_boolean },
-    { "base_value", &CORBA::_tc_RepositoryId }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ValueDescription (
-    CORBA::tk_struct,
-    "IDL:omg.org/CORBA/ValueDescription:1.0",
-    "ValueDescription",
-    _tao_fields_CORBA_ValueDescription,
-    10);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ValueDescription =
-    &_tao_tc_CORBA_ValueDescription;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_ExtValueDef_ExtFullValueDescription[] =
-  {
-    { "name", &CORBA::_tc_Identifier },
-    { "id", &CORBA::_tc_RepositoryId },
-    { "is_abstract", &CORBA::_tc_boolean },
-    { "is_custom", &CORBA::_tc_boolean },
-    { "defined_in", &CORBA::_tc_RepositoryId },
-    { "version", &CORBA::_tc_VersionSpec },
-    { "operations", &CORBA::_tc_OpDescriptionSeq },
-    { "attributes", &CORBA::_tc_ExtAttrDescriptionSeq },
-    { "members", &CORBA::_tc_ValueMemberSeq },
-    { "initializers", &CORBA::_tc_ExtInitializerSeq },
-    { "supported_interfaces", &CORBA::_tc_RepositoryIdSeq },
-    { "abstract_base_values", &CORBA::_tc_RepositoryIdSeq },
-    { "is_truncatable", &CORBA::_tc_boolean },
-    { "base_value", &CORBA::_tc_RepositoryId },
-    { "type", &CORBA::_tc_TypeCode }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ExtValueDef_ExtFullValueDescription (
-    CORBA::tk_struct,
-    "IDL:omg.org/CORBA/ExtValueDef/ExtFullValueDescription:1.0",
-    "ExtFullValueDescription",
-    _tao_fields_CORBA_ExtValueDef_ExtFullValueDescription,
-    15);
-  
-::CORBA::TypeCode_ptr const CORBA::ExtValueDef::_tc_ExtFullValueDescription =
-  &_tao_tc_CORBA_ExtValueDef_ExtFullValueDescription;
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ExtValueDef (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/ExtValueDef:1.0",
-    "ExtValueDef");
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ExtValueDef =
-    &_tao_tc_CORBA_ExtValueDef;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ValueBoxDef (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/ValueBoxDef:1.0",
-    "ValueBoxDef");
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ValueBoxDef =
-    &_tao_tc_CORBA_ValueBoxDef;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::FixedDef>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::FixedDef_ptr _tao_elem
-  )
-{
-  CORBA::FixedDef_ptr _tao_objptr =
-    CORBA::FixedDef::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::FixedDef_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::FixedDef>::insert (
-      _tao_any,
-      CORBA::FixedDef::_tao_any_destructor,
-      CORBA::_tc_FixedDef,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::FixedDef_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::FixedDef>::extract (
-        _tao_any,
-        CORBA::FixedDef::_tao_any_destructor,
-        CORBA::_tc_FixedDef,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::ValueMember &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ValueMember>::insert_copy (
-      _tao_any,
-      CORBA::ValueMember::_tao_any_destructor,
-      CORBA::_tc_ValueMember,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ValueMember *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ValueMember>::insert (
-      _tao_any,
-      CORBA::ValueMember::_tao_any_destructor,
-      CORBA::_tc_ValueMember,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ValueMember *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::ValueMember *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::ValueMember *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::ValueMember>::extract (
-        _tao_any,
-        CORBA::ValueMember::_tao_any_destructor,
-        CORBA::_tc_ValueMember,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::ValueMemberSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ValueMemberSeq>::insert_copy (
-      _tao_any,
-      CORBA::ValueMemberSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_ValueMemberSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ValueMemberSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ValueMemberSeq>::insert (
-      _tao_any,
-      CORBA::ValueMemberSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_ValueMemberSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ValueMemberSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::ValueMemberSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::ValueMemberSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::ValueMemberSeq>::extract (
-        _tao_any,
-        CORBA::ValueMemberSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_ValueMemberSeq_0,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::ValueMemberDef>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ValueMemberDef_ptr _tao_elem
-  )
-{
-  CORBA::ValueMemberDef_ptr _tao_objptr =
-    CORBA::ValueMemberDef::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ValueMemberDef_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::ValueMemberDef>::insert (
-      _tao_any,
-      CORBA::ValueMemberDef::_tao_any_destructor,
-      CORBA::_tc_ValueMemberDef,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ValueMemberDef_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::ValueMemberDef>::extract (
-        _tao_any,
-        CORBA::ValueMemberDef::_tao_any_destructor,
-        CORBA::_tc_ValueMemberDef,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::ValueDef>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ValueDef_ptr _tao_elem
-  )
-{
-  CORBA::ValueDef_ptr _tao_objptr =
-    CORBA::ValueDef::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ValueDef_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::ValueDef>::insert (
-      _tao_any,
-      CORBA::ValueDef::_tao_any_destructor,
-      CORBA::_tc_ValueDef,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ValueDef_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::ValueDef>::extract (
-        _tao_any,
-        CORBA::ValueDef::_tao_any_destructor,
-        CORBA::_tc_ValueDef,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::ValueDef::FullValueDescription &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ValueDef::FullValueDescription>::insert_copy (
-      _tao_any,
-      CORBA::ValueDef::FullValueDescription::_tao_any_destructor,
-      CORBA::ValueDef::_tc_FullValueDescription,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ValueDef::FullValueDescription *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ValueDef::FullValueDescription>::insert (
-      _tao_any,
-      CORBA::ValueDef::FullValueDescription::_tao_any_destructor,
-      CORBA::ValueDef::_tc_FullValueDescription,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ValueDef::FullValueDescription *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::ValueDef::FullValueDescription *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::ValueDef::FullValueDescription *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::ValueDef::FullValueDescription>::extract (
-        _tao_any,
-        CORBA::ValueDef::FullValueDescription::_tao_any_destructor,
-        CORBA::ValueDef::_tc_FullValueDescription,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::ValueDescription &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ValueDescription>::insert_copy (
-      _tao_any,
-      CORBA::ValueDescription::_tao_any_destructor,
-      CORBA::_tc_ValueDescription,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ValueDescription *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ValueDescription>::insert (
-      _tao_any,
-      CORBA::ValueDescription::_tao_any_destructor,
-      CORBA::_tc_ValueDescription,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ValueDescription *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::ValueDescription *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::ValueDescription *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::ValueDescription>::extract (
-        _tao_any,
-        CORBA::ValueDescription::_tao_any_destructor,
-        CORBA::_tc_ValueDescription,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::ExtValueDef>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ExtValueDef_ptr _tao_elem
-  )
-{
-  CORBA::ExtValueDef_ptr _tao_objptr =
-    CORBA::ExtValueDef::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ExtValueDef_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::ExtValueDef>::insert (
-      _tao_any,
-      CORBA::ExtValueDef::_tao_any_destructor,
-      CORBA::_tc_ExtValueDef,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ExtValueDef_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::ExtValueDef>::extract (
-        _tao_any,
-        CORBA::ExtValueDef::_tao_any_destructor,
-        CORBA::_tc_ExtValueDef,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::ExtValueDef::ExtFullValueDescription &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ExtValueDef::ExtFullValueDescription>::insert_copy (
-      _tao_any,
-      CORBA::ExtValueDef::ExtFullValueDescription::_tao_any_destructor,
-      CORBA::ExtValueDef::_tc_ExtFullValueDescription,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ExtValueDef::ExtFullValueDescription *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ExtValueDef::ExtFullValueDescription>::insert (
-      _tao_any,
-      CORBA::ExtValueDef::ExtFullValueDescription::_tao_any_destructor,
-      CORBA::ExtValueDef::_tc_ExtFullValueDescription,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ExtValueDef::ExtFullValueDescription *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::ExtValueDef::ExtFullValueDescription *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::ExtValueDef::ExtFullValueDescription *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::ExtValueDef::ExtFullValueDescription>::extract (
-        _tao_any,
-        CORBA::ExtValueDef::ExtFullValueDescription::_tao_any_destructor,
-        CORBA::ExtValueDef::_tc_ExtFullValueDescription,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::ValueBoxDef>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ValueBoxDef_ptr _tao_elem
-  )
-{
-  CORBA::ValueBoxDef_ptr _tao_objptr =
-    CORBA::ValueBoxDef::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ValueBoxDef_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::ValueBoxDef>::insert (
-      _tao_any,
-      CORBA::ValueBoxDef::_tao_any_destructor,
-      CORBA::_tc_ValueBoxDef,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ValueBoxDef_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::ValueBoxDef>::extract (
-        _tao_any,
-        CORBA::ValueBoxDef::_tao_any_destructor,
-        CORBA::_tc_ValueBoxDef,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/IFR_Client/IFR_ExtendedA.h b/TAO/tao/IFR_Client/IFR_ExtendedA.h
new file mode 100644
index 00000000000..818268f0507
--- /dev/null
+++ b/TAO/tao/IFR_Client/IFR_ExtendedA.h
@@ -0,0 +1,44 @@
+// -*- C++ -*-
+//
+// $Id$
+
+// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       Irvine, CA
+//       USA
+//       http://doc.ece.uci.edu/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
+//
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
+
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:390
+
+#ifndef _TAO_IDL_ORIG_IFR_EXTENDEDA_H_
+#define _TAO_IDL_ORIG_IFR_EXTENDEDA_H_
+
+#include /**/ "ace/pre.h"
+
+#include "tao/IFR_Client/IFR_ExtendedC.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include /**/ "ace/post.h"
+#endif /* ifndef */
+
diff --git a/TAO/tao/IFR_Client/IFR_ExtendedC.cpp b/TAO/tao/IFR_Client/IFR_ExtendedC.cpp
index b4b2c709440..7299eae1cf5 100644
--- a/TAO/tao/IFR_Client/IFR_ExtendedC.cpp
+++ b/TAO/tao/IFR_Client/IFR_ExtendedC.cpp
@@ -26,14 +26,28 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:291
+// be\be_codegen.cpp:293
 
 
 #include "IFR_ExtendedC.h"
 #include "tao/CDR.h"
-#include "tao/Exception_Data.h"
+#include "tao/IFR_Client/IFR_BasicC.h"
+#include "tao/AnyTypeCode/VisibilityA.h"
+#include "tao/AnyTypeCode/ValueModifierA.h"
+#include "tao/AnyTypeCode/orb_typesA.h"
 #include "tao/Invocation_Adapter.h"
 #include "tao/Object_T.h"
+#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Sequence_TypeCode_Static.h"
+#include "tao/AnyTypeCode/String_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Struct_TypeCode_Static.h"
+#include "tao/AnyTypeCode/TypeCode_Struct_Field.h"
+#include "tao/AnyTypeCode/Recursive_Type_TypeCode.h"
+#include "tao/AnyTypeCode/Any_Impl_T.h"
+#include "tao/AnyTypeCode/Any_Dual_Impl_T.h"
 #include "tao/Basic_Arguments.h"
 #include "tao/Object_Argument_T.h"
 #include "tao/Special_Basic_Arguments.h"
@@ -50,15 +64,18 @@
 #endif /* !defined INLINE */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
+// be\be_visitor_arg_traits.cpp:70
 
 // Arg traits specializations.
 namespace TAO
 {
 
-#if !defined (_CORBA_IDLTYPE__ARG_TRAITS_CS_)
-#define _CORBA_IDLTYPE__ARG_TRAITS_CS_
-  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
+
+#if !defined (_CORBA_IDLTYPE__ARG_TRAITS_)
+#define _CORBA_IDLTYPE__ARG_TRAITS_
+
   template<>
   class  Arg_Traits<CORBA::IDLType>
     : public
@@ -66,35 +83,40 @@ namespace TAO
             CORBA::IDLType_ptr,
             CORBA::IDLType_var,
             CORBA::IDLType_out,
-            TAO::Objref_Traits<CORBA::IDLType>
+            TAO::Objref_Traits<CORBA::IDLType>,
+            TAO::Any_Insert_Policy_Stream <CORBA::IDLType_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:496
+  // be\be_visitor_arg_traits.cpp:543
+
+#if !defined (_CORBA_INTERFACEDEFSEQ__ARG_TRAITS_)
+#define _CORBA_INTERFACEDEFSEQ__ARG_TRAITS_
 
-#if !defined (_CORBA_INTERFACEDEFSEQ__ARG_TRAITS_CS_)
-#define _CORBA_INTERFACEDEFSEQ__ARG_TRAITS_CS_
-  
   template<>
   class Arg_Traits<CORBA::InterfaceDefSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::InterfaceDefSeq,
             CORBA::InterfaceDefSeq_var,
-            CORBA::InterfaceDefSeq_out
+            CORBA::InterfaceDefSeq_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::InterfaceDefSeq>
           >
   {
   };
 
 #endif /* end #if !defined */
 
-#if !defined (_CORBA_VALUEDEF__ARG_TRAITS_CS_)
-#define _CORBA_VALUEDEF__ARG_TRAITS_CS_
-  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
+
+#if !defined (_CORBA_VALUEDEF__ARG_TRAITS_)
+#define _CORBA_VALUEDEF__ARG_TRAITS_
+
   template<>
   class  Arg_Traits<CORBA::ValueDef>
     : public
@@ -102,83 +124,88 @@ namespace TAO
             CORBA::ValueDef_ptr,
             CORBA::ValueDef_var,
             CORBA::ValueDef_out,
-            TAO::Objref_Traits<CORBA::ValueDef>
+            TAO::Objref_Traits<CORBA::ValueDef>,
+            TAO::Any_Insert_Policy_Stream <CORBA::ValueDef_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:751
+  // be\be_visitor_arg_traits.cpp:828
+
+#if !defined (_CORBA_VALUEDEF_FULLVALUEDESCRIPTION__ARG_TRAITS_)
+#define _CORBA_VALUEDEF_FULLVALUEDESCRIPTION__ARG_TRAITS_
 
-#if !defined (_CORBA_VALUEDEF_FULLVALUEDESCRIPTION__ARG_TRAITS_CS_)
-#define _CORBA_VALUEDEF_FULLVALUEDESCRIPTION__ARG_TRAITS_CS_
-  
   template<>
   class Arg_Traits<CORBA::ValueDef::FullValueDescription>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::ValueDef::FullValueDescription,
             CORBA::ValueDef::FullValueDescription_var,
-            CORBA::ValueDef::FullValueDescription_out
+            CORBA::ValueDef::FullValueDescription_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::ValueDef::FullValueDescription>
           >
   {
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:496
+  // be\be_visitor_arg_traits.cpp:543
+
+#if !defined (_CORBA_INITIALIZERSEQ__ARG_TRAITS_)
+#define _CORBA_INITIALIZERSEQ__ARG_TRAITS_
 
-#if !defined (_CORBA_INITIALIZERSEQ__ARG_TRAITS_CS_)
-#define _CORBA_INITIALIZERSEQ__ARG_TRAITS_CS_
-  
   template<>
   class Arg_Traits<CORBA::InitializerSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::InitializerSeq,
             CORBA::InitializerSeq_var,
-            CORBA::InitializerSeq_out
+            CORBA::InitializerSeq_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::InitializerSeq>
           >
   {
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:496
+  // be\be_visitor_arg_traits.cpp:543
+
+#if !defined (_CORBA_VALUEDEFSEQ__ARG_TRAITS_)
+#define _CORBA_VALUEDEFSEQ__ARG_TRAITS_
 
-#if !defined (_CORBA_VALUEDEFSEQ__ARG_TRAITS_CS_)
-#define _CORBA_VALUEDEFSEQ__ARG_TRAITS_CS_
-  
   template<>
   class Arg_Traits<CORBA::ValueDefSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::ValueDefSeq,
             CORBA::ValueDefSeq_var,
-            CORBA::ValueDefSeq_out
+            CORBA::ValueDefSeq_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::ValueDefSeq>
           >
   {
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:751
+  // be\be_visitor_arg_traits.cpp:828
+
+#if !defined (_CORBA_EXTVALUEDEF_EXTFULLVALUEDESCRIPTION__ARG_TRAITS_)
+#define _CORBA_EXTVALUEDEF_EXTFULLVALUEDESCRIPTION__ARG_TRAITS_
 
-#if !defined (_CORBA_EXTVALUEDEF_EXTFULLVALUEDESCRIPTION__ARG_TRAITS_CS_)
-#define _CORBA_EXTVALUEDEF_EXTFULLVALUEDESCRIPTION__ARG_TRAITS_CS_
-  
   template<>
   class Arg_Traits<CORBA::ExtValueDef::ExtFullValueDescription>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::ExtValueDef::ExtFullValueDescription,
             CORBA::ExtValueDef::ExtFullValueDescription_var,
-            CORBA::ExtValueDef::ExtFullValueDescription_out
+            CORBA::ExtValueDef::ExtFullValueDescription_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::ExtValueDef::ExtFullValueDescription>
           >
   {
   };
@@ -186,10 +213,10 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:496
+  // be\be_visitor_arg_traits.cpp:543
 
-#if !defined (_CORBA_EXTINITIALIZERSEQ__ARG_TRAITS_CS_)
-#define _CORBA_EXTINITIALIZERSEQ__ARG_TRAITS_CS_
+#if !defined (_CORBA_EXTINITIALIZERSEQ__ARG_TRAITS_)
+#define _CORBA_EXTINITIALIZERSEQ__ARG_TRAITS_
   
   template<>
   class Arg_Traits<CORBA::ExtInitializerSeq>
@@ -197,7 +224,8 @@ namespace TAO
         Var_Size_Arg_Traits_T<
             CORBA::ExtInitializerSeq,
             CORBA::ExtInitializerSeq_var,
-            CORBA::ExtInitializerSeq_out
+            CORBA::ExtInitializerSeq_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::ExtInitializerSeq>
           >
   {
   };
@@ -205,10 +233,10 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:496
+  // be\be_visitor_arg_traits.cpp:543
 
-#if !defined (_CORBA_EXCEPTIONDEFSEQ__ARG_TRAITS_CS_)
-#define _CORBA_EXCEPTIONDEFSEQ__ARG_TRAITS_CS_
+#if !defined (_CORBA_EXCEPTIONDEFSEQ__ARG_TRAITS_)
+#define _CORBA_EXCEPTIONDEFSEQ__ARG_TRAITS_
   
   template<>
   class Arg_Traits<CORBA::ExceptionDefSeq>
@@ -216,7 +244,8 @@ namespace TAO
         Var_Size_Arg_Traits_T<
             CORBA::ExceptionDefSeq,
             CORBA::ExceptionDefSeq_var,
-            CORBA::ExceptionDefSeq_out
+            CORBA::ExceptionDefSeq_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::ExceptionDefSeq>
           >
   {
   };
@@ -224,24 +253,28 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:709
+  // be\be_visitor_arg_traits.cpp:786
 
-#if !defined (_CORBA_ATTRIBUTEMODE__ARG_TRAITS_CS_)
-#define _CORBA_ATTRIBUTEMODE__ARG_TRAITS_CS_
+#if !defined (_CORBA_ATTRIBUTEMODE__ARG_TRAITS_)
+#define _CORBA_ATTRIBUTEMODE__ARG_TRAITS_
   
   template<>
   class Arg_Traits<CORBA::AttributeMode>
     : public
         Basic_Arg_Traits_T<
-            CORBA::AttributeMode
+            CORBA::AttributeMode,
+            TAO::Any_Insert_Policy_Stream <CORBA::AttributeMode>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_ATTRIBUTEDEF__ARG_TRAITS_CS_)
-#define _CORBA_ATTRIBUTEDEF__ARG_TRAITS_CS_
+#if !defined (_CORBA_ATTRIBUTEDEF__ARG_TRAITS_)
+#define _CORBA_ATTRIBUTEDEF__ARG_TRAITS_
   
   template<>
   class  Arg_Traits<CORBA::AttributeDef>
@@ -250,15 +283,19 @@ namespace TAO
             CORBA::AttributeDef_ptr,
             CORBA::AttributeDef_var,
             CORBA::AttributeDef_out,
-            TAO::Objref_Traits<CORBA::AttributeDef>
+            TAO::Objref_Traits<CORBA::AttributeDef>,
+            TAO::Any_Insert_Policy_Stream <CORBA::AttributeDef_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_EXTATTRIBUTEDEF__ARG_TRAITS_CS_)
-#define _CORBA_EXTATTRIBUTEDEF__ARG_TRAITS_CS_
+#if !defined (_CORBA_EXTATTRIBUTEDEF__ARG_TRAITS_)
+#define _CORBA_EXTATTRIBUTEDEF__ARG_TRAITS_
   
   template<>
   class  Arg_Traits<CORBA::ExtAttributeDef>
@@ -267,7 +304,8 @@ namespace TAO
             CORBA::ExtAttributeDef_ptr,
             CORBA::ExtAttributeDef_var,
             CORBA::ExtAttributeDef_out,
-            TAO::Objref_Traits<CORBA::ExtAttributeDef>
+            TAO::Objref_Traits<CORBA::ExtAttributeDef>,
+            TAO::Any_Insert_Policy_Stream <CORBA::ExtAttributeDef_ptr>
           >
   {
   };
@@ -275,16 +313,17 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:709
+  // be\be_visitor_arg_traits.cpp:786
 
-#if !defined (_CORBA_OPERATIONMODE__ARG_TRAITS_CS_)
-#define _CORBA_OPERATIONMODE__ARG_TRAITS_CS_
+#if !defined (_CORBA_OPERATIONMODE__ARG_TRAITS_)
+#define _CORBA_OPERATIONMODE__ARG_TRAITS_
   
   template<>
   class Arg_Traits<CORBA::OperationMode>
     : public
         Basic_Arg_Traits_T<
-            CORBA::OperationMode
+            CORBA::OperationMode,
+            TAO::Any_Insert_Policy_Stream <CORBA::OperationMode>
           >
   {
   };
@@ -292,10 +331,10 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:496
+  // be\be_visitor_arg_traits.cpp:543
 
-#if !defined (_CORBA_PARDESCRIPTIONSEQ__ARG_TRAITS_CS_)
-#define _CORBA_PARDESCRIPTIONSEQ__ARG_TRAITS_CS_
+#if !defined (_CORBA_PARDESCRIPTIONSEQ__ARG_TRAITS_)
+#define _CORBA_PARDESCRIPTIONSEQ__ARG_TRAITS_
   
   template<>
   class Arg_Traits<CORBA::ParDescriptionSeq>
@@ -303,7 +342,8 @@ namespace TAO
         Var_Size_Arg_Traits_T<
             CORBA::ParDescriptionSeq,
             CORBA::ParDescriptionSeq_var,
-            CORBA::ParDescriptionSeq_out
+            CORBA::ParDescriptionSeq_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::ParDescriptionSeq>
           >
   {
   };
@@ -311,10 +351,10 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_arg_traits.cpp:496
+  // be\be_visitor_arg_traits.cpp:543
 
-#if !defined (_CORBA_CONTEXTIDSEQ__ARG_TRAITS_CS_)
-#define _CORBA_CONTEXTIDSEQ__ARG_TRAITS_CS_
+#if !defined (_CORBA_CONTEXTIDSEQ__ARG_TRAITS_)
+#define _CORBA_CONTEXTIDSEQ__ARG_TRAITS_
   
   template<>
   class Arg_Traits<CORBA::ContextIdSeq>
@@ -322,15 +362,19 @@ namespace TAO
         Var_Size_Arg_Traits_T<
             CORBA::ContextIdSeq,
             CORBA::ContextIdSeq_var,
-            CORBA::ContextIdSeq_out
+            CORBA::ContextIdSeq_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::ContextIdSeq>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_OPERATIONDEF__ARG_TRAITS_CS_)
-#define _CORBA_OPERATIONDEF__ARG_TRAITS_CS_
+#if !defined (_CORBA_OPERATIONDEF__ARG_TRAITS_)
+#define _CORBA_OPERATIONDEF__ARG_TRAITS_
   
   template<>
   class  Arg_Traits<CORBA::OperationDef>
@@ -339,15 +383,19 @@ namespace TAO
             CORBA::OperationDef_ptr,
             CORBA::OperationDef_var,
             CORBA::OperationDef_out,
-            TAO::Objref_Traits<CORBA::OperationDef>
+            TAO::Objref_Traits<CORBA::OperationDef>,
+            TAO::Any_Insert_Policy_Stream <CORBA::OperationDef_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_arg_traits.cpp:118
 
-#if !defined (_CORBA_VALUEMEMBERDEF__ARG_TRAITS_CS_)
-#define _CORBA_VALUEMEMBERDEF__ARG_TRAITS_CS_
+#if !defined (_CORBA_VALUEMEMBERDEF__ARG_TRAITS_)
+#define _CORBA_VALUEMEMBERDEF__ARG_TRAITS_
   
   template<>
   class  Arg_Traits<CORBA::ValueMemberDef>
@@ -356,7 +404,8 @@ namespace TAO
             CORBA::ValueMemberDef_ptr,
             CORBA::ValueMemberDef_var,
             CORBA::ValueMemberDef_out,
-            TAO::Objref_Traits<CORBA::ValueMemberDef>
+            TAO::Objref_Traits<CORBA::ValueMemberDef>,
+            TAO::Any_Insert_Policy_Stream <CORBA::ValueMemberDef_ptr>
           >
   {
   };
@@ -700,6 +749,57 @@ CORBA::FixedDef::marshal (TAO_OutputCDR &cdr)
   return (cdr << this);
 }
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:76
+
+static TAO::TypeCode::Objref<char const *,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_FixedDef (
+    CORBA::tk_objref,
+    "IDL:omg.org/CORBA/FixedDef:1.0",
+    "FixedDef");
+  
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_FixedDef =
+    &_tao_tc_CORBA_FixedDef;
+}
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/struct_typecode.cpp:87
+
+static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_ValueMember[] =
+  {
+    { "name", &CORBA::_tc_Identifier },
+    { "id", &CORBA::_tc_RepositoryId },
+    { "defined_in", &CORBA::_tc_RepositoryId },
+    { "version", &CORBA::_tc_VersionSpec },
+    { "type", &CORBA::_tc_TypeCode },
+    { "type_def", &CORBA::_tc_IDLType },
+    { "access", &CORBA::_tc_Visibility }
+    
+  };
+static TAO::TypeCode::Struct<char const *,
+                      CORBA::TypeCode_ptr const *,
+                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
+                      TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ValueMember (
+    CORBA::tk_struct,
+    "IDL:omg.org/CORBA/ValueMember:1.0",
+    "ValueMember",
+    _tao_fields_CORBA_ValueMember,
+    7);
+  
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_ValueMember =
+    &_tao_tc_CORBA_ValueMember;
+}
+
+
+
 // TAO_IDL - Generated from 
 // be\be_visitor_structure/structure_cs.cpp:66
 
@@ -726,7 +826,7 @@ CORBA::ValueMemberSeq::ValueMemberSeq (
     CORBA::ULong max
   )
   : TAO_Unbounded_Sequence<
-        CORBA::ValueMember
+        ValueMember
       >
     (max)
 {}
@@ -738,7 +838,7 @@ CORBA::ValueMemberSeq::ValueMemberSeq (
     CORBA::Boolean release
   )
   : TAO_Unbounded_Sequence<
-        CORBA::ValueMember
+        ValueMember
       >
     (max, length, buffer, release)
 {}
@@ -747,7 +847,7 @@ CORBA::ValueMemberSeq::ValueMemberSeq (
     const ValueMemberSeq &seq
   )
   : TAO_Unbounded_Sequence<
-        CORBA::ValueMember
+        ValueMember
       >
     (seq)
 {}
@@ -767,6 +867,54 @@ void CORBA::ValueMemberSeq::_tao_any_destructor (
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
+// be\be_visitor_typecode/alias_typecode.cpp:50
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+
+#ifndef _TAO_TYPECODE_CORBA_ValueMemberSeq_GUARD
+#define _TAO_TYPECODE_CORBA_ValueMemberSeq_GUARD
+namespace TAO
+{
+  namespace TypeCode
+  {
+    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
+      CORBA_ValueMemberSeq_0 (
+        CORBA::tk_sequence,
+        &CORBA::_tc_ValueMember,
+        0U);
+      
+    ::CORBA::TypeCode_ptr const tc_CORBA_ValueMemberSeq_0 =
+      &CORBA_ValueMemberSeq_0;
+    
+  }
+}
+
+
+#endif /* _TAO_TYPECODE_CORBA_ValueMemberSeq_GUARD */
+
+static TAO::TypeCode::Alias<char const *,
+                            CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ValueMemberSeq (
+    CORBA::tk_alias,
+    "IDL:omg.org/CORBA/ValueMemberSeq:1.0",
+    "ValueMemberSeq",
+    &TAO::TypeCode::tc_CORBA_ValueMemberSeq_0);
+  
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_ValueMemberSeq =
+    &_tao_tc_CORBA_ValueMemberSeq;
+}
+
+
+
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for CORBA::ValueMemberDef.
@@ -870,7 +1018,7 @@ CORBA::TypeCode_ptr CORBA::ValueMemberDef::type (
       CORBA_ValueMemberDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::IDLType>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::IDLType>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -914,7 +1062,7 @@ void CORBA::ValueMemberDef::type_def (
     }
   
   TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::IDLType>::in_arg_val _tao_type_def (type_def);
+  TAO::Arg_Traits< ::CORBA::IDLType>::in_arg_val _tao_type_def (type_def);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -1144,6 +1292,24 @@ CORBA::ValueMemberDef::marshal (TAO_OutputCDR &cdr)
 }
 
 // TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:76
+
+static TAO::TypeCode::Objref<char const *,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ValueMemberDef (
+    CORBA::tk_objref,
+    "IDL:omg.org/CORBA/ValueMemberDef:1.0",
+    "ValueMemberDef");
+  
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_ValueMemberDef =
+    &_tao_tc_CORBA_ValueMemberDef;
+}
+
+
+
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for CORBA::ValueDef.
@@ -1205,7 +1371,7 @@ TAO::Collocation_Proxy_Broker *
       CORBA_ValueDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::InterfaceDefSeq>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::InterfaceDefSeq>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -1249,7 +1415,7 @@ void CORBA::ValueDef::supported_interfaces (
     }
   
   TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::InterfaceDefSeq>::in_arg_val _tao_supported_interfaces (supported_interfaces);
+  TAO::Arg_Traits< ::CORBA::InterfaceDefSeq>::in_arg_val _tao_supported_interfaces (supported_interfaces);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -1290,7 +1456,7 @@ void CORBA::ValueDef::supported_interfaces (
       CORBA_ValueDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::InitializerSeq>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::InitializerSeq>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -1334,7 +1500,7 @@ void CORBA::ValueDef::initializers (
     }
   
   TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::InitializerSeq>::in_arg_val _tao_initializers (initializers);
+  TAO::Arg_Traits< ::CORBA::InitializerSeq>::in_arg_val _tao_initializers (initializers);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -1375,7 +1541,7 @@ void CORBA::ValueDef::initializers (
       CORBA_ValueDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::ValueDef>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::ValueDef>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -1419,7 +1585,7 @@ void CORBA::ValueDef::base_value (
     }
   
   TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::ValueDef>::in_arg_val _tao_base_value (base_value);
+  TAO::Arg_Traits< ::CORBA::ValueDef>::in_arg_val _tao_base_value (base_value);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -1460,7 +1626,7 @@ void CORBA::ValueDef::base_value (
       CORBA_ValueDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::ValueDefSeq>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::ValueDefSeq>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -1504,7 +1670,7 @@ void CORBA::ValueDef::abstract_base_values (
     }
   
   TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::ValueDefSeq>::in_arg_val _tao_abstract_base_values (abstract_base_values);
+  TAO::Arg_Traits< ::CORBA::ValueDefSeq>::in_arg_val _tao_abstract_base_values (abstract_base_values);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -1802,7 +1968,7 @@ CORBA::Boolean CORBA::ValueDef::is_a (
     }
   
   TAO::Arg_Traits< ::ACE_InputCDR::to_boolean>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
+  TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -1825,6 +1991,72 @@ CORBA::Boolean CORBA::ValueDef::is_a (
   return _tao_retval.retn ();
 }
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/struct_typecode.cpp:87
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_ValueDef_FullValueDescription[] =
+  {
+    { "name", &CORBA::_tc_Identifier },
+    { "id", &CORBA::_tc_RepositoryId },
+    { "is_abstract", &CORBA::_tc_boolean },
+    { "is_custom", &CORBA::_tc_boolean },
+    { "defined_in", &CORBA::_tc_RepositoryId },
+    { "version", &CORBA::_tc_VersionSpec },
+    { "operations", &CORBA::_tc_OpDescriptionSeq },
+    { "attributes", &CORBA::_tc_AttrDescriptionSeq },
+    { "members", &CORBA::_tc_ValueMemberSeq },
+    { "initializers", &CORBA::_tc_InitializerSeq },
+    { "supported_interfaces", &CORBA::_tc_RepositoryIdSeq },
+    { "abstract_base_values", &CORBA::_tc_RepositoryIdSeq },
+    { "is_truncatable", &CORBA::_tc_boolean },
+    { "base_value", &CORBA::_tc_RepositoryId },
+    { "type", &CORBA::_tc_TypeCode }
+    
+  };
+static TAO::TypeCode::Struct<char const *,
+                      CORBA::TypeCode_ptr const *,
+                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
+                      TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ValueDef_FullValueDescription (
+    CORBA::tk_struct,
+    "IDL:omg.org/CORBA/ValueDef/FullValueDescription:1.0",
+    "FullValueDescription",
+    _tao_fields_CORBA_ValueDef_FullValueDescription,
+    15);
+  
+::CORBA::TypeCode_ptr const CORBA::ValueDef::_tc_FullValueDescription =
+  &_tao_tc_CORBA_ValueDef_FullValueDescription;
+
 // TAO_IDL - Generated from 
 // be\be_visitor_structure/structure_cs.cpp:66
 
@@ -1858,7 +2090,7 @@ CORBA::ValueDef::FullValueDescription::_tao_any_destructor (
       CORBA_ValueDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::ValueDef::FullValueDescription>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::ValueDef::FullValueDescription>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -1905,11 +2137,11 @@ CORBA::ValueDef::FullValueDescription::_tao_any_destructor (
       CORBA_ValueDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::ValueMemberDef>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
-  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
-  TAO::Arg_Traits< CORBA::IDLType>::in_arg_val _tao_type (type);
+  TAO::Arg_Traits< ::CORBA::ValueMemberDef>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id);
+  TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name);
+  TAO::Arg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version (version);
+  TAO::Arg_Traits< ::CORBA::IDLType>::in_arg_val _tao_type (type);
   TAO::Arg_Traits< ::CORBA::Visibility>::in_arg_val _tao_access (access);
   
   TAO::Argument *_the_tao_operation_signature [] =
@@ -1962,12 +2194,12 @@ CORBA::ValueDef::FullValueDescription::_tao_any_destructor (
       CORBA_ValueDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::AttributeDef>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
-  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
-  TAO::Arg_Traits< CORBA::IDLType>::in_arg_val _tao_type (type);
-  TAO::Arg_Traits< CORBA::AttributeMode>::in_arg_val _tao_mode (mode);
+  TAO::Arg_Traits< ::CORBA::AttributeDef>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id);
+  TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name);
+  TAO::Arg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version (version);
+  TAO::Arg_Traits< ::CORBA::IDLType>::in_arg_val _tao_type (type);
+  TAO::Arg_Traits< ::CORBA::AttributeMode>::in_arg_val _tao_mode (mode);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -2022,15 +2254,15 @@ CORBA::ValueDef::FullValueDescription::_tao_any_destructor (
       CORBA_ValueDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::OperationDef>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
-  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
-  TAO::Arg_Traits< CORBA::IDLType>::in_arg_val _tao_result (result);
-  TAO::Arg_Traits< CORBA::OperationMode>::in_arg_val _tao_mode (mode);
-  TAO::Arg_Traits< CORBA::ParDescriptionSeq>::in_arg_val _tao_params (params);
-  TAO::Arg_Traits< CORBA::ExceptionDefSeq>::in_arg_val _tao_exceptions (exceptions);
-  TAO::Arg_Traits< CORBA::ContextIdSeq>::in_arg_val _tao_contexts (contexts);
+  TAO::Arg_Traits< ::CORBA::OperationDef>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id);
+  TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name);
+  TAO::Arg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version (version);
+  TAO::Arg_Traits< ::CORBA::IDLType>::in_arg_val _tao_result (result);
+  TAO::Arg_Traits< ::CORBA::OperationMode>::in_arg_val _tao_mode (mode);
+  TAO::Arg_Traits< ::CORBA::ParDescriptionSeq>::in_arg_val _tao_params (params);
+  TAO::Arg_Traits< ::CORBA::ExceptionDefSeq>::in_arg_val _tao_exceptions (exceptions);
+  TAO::Arg_Traits< ::CORBA::ContextIdSeq>::in_arg_val _tao_contexts (contexts);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -2193,6 +2425,70 @@ CORBA::ValueDef::marshal (TAO_OutputCDR &cdr)
   return (cdr << this);
 }
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:76
+
+static TAO::TypeCode::Objref<char const *,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ValueDef (
+    CORBA::tk_objref,
+    "IDL:omg.org/CORBA/ValueDef:1.0",
+    "ValueDef");
+  
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_ValueDef =
+    &_tao_tc_CORBA_ValueDef;
+}
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/struct_typecode.cpp:87
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_ValueDescription[] =
+  {
+    { "name", &CORBA::_tc_Identifier },
+    { "id", &CORBA::_tc_RepositoryId },
+    { "is_abstract", &CORBA::_tc_boolean },
+    { "is_custom", &CORBA::_tc_boolean },
+    { "defined_in", &CORBA::_tc_RepositoryId },
+    { "version", &CORBA::_tc_VersionSpec },
+    { "supported_interfaces", &CORBA::_tc_RepositoryIdSeq },
+    { "abstract_base_values", &CORBA::_tc_RepositoryIdSeq },
+    { "is_truncatable", &CORBA::_tc_boolean },
+    { "base_value", &CORBA::_tc_RepositoryId }
+    
+  };
+static TAO::TypeCode::Struct<char const *,
+                      CORBA::TypeCode_ptr const *,
+                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
+                      TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ValueDescription (
+    CORBA::tk_struct,
+    "IDL:omg.org/CORBA/ValueDescription:1.0",
+    "ValueDescription",
+    _tao_fields_CORBA_ValueDescription,
+    10);
+  
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_ValueDescription =
+    &_tao_tc_CORBA_ValueDescription;
+}
+
+
+
 // TAO_IDL - Generated from 
 // be\be_visitor_structure/structure_cs.cpp:66
 
@@ -2268,7 +2564,7 @@ TAO::Collocation_Proxy_Broker *
       CORBA_ExtValueDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::ExtInitializerSeq>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::ExtInitializerSeq>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -2312,7 +2608,7 @@ void CORBA::ExtValueDef::ext_initializers (
     }
   
   TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::ExtInitializerSeq>::in_arg_val _tao_ext_initializers (ext_initializers);
+  TAO::Arg_Traits< ::CORBA::ExtInitializerSeq>::in_arg_val _tao_ext_initializers (ext_initializers);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -2333,6 +2629,72 @@ void CORBA::ExtValueDef::ext_initializers (
   ACE_CHECK;
 }
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/struct_typecode.cpp:87
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_defn.cpp:937
+
+static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_ExtValueDef_ExtFullValueDescription[] =
+  {
+    { "name", &CORBA::_tc_Identifier },
+    { "id", &CORBA::_tc_RepositoryId },
+    { "is_abstract", &CORBA::_tc_boolean },
+    { "is_custom", &CORBA::_tc_boolean },
+    { "defined_in", &CORBA::_tc_RepositoryId },
+    { "version", &CORBA::_tc_VersionSpec },
+    { "operations", &CORBA::_tc_OpDescriptionSeq },
+    { "attributes", &CORBA::_tc_ExtAttrDescriptionSeq },
+    { "members", &CORBA::_tc_ValueMemberSeq },
+    { "initializers", &CORBA::_tc_ExtInitializerSeq },
+    { "supported_interfaces", &CORBA::_tc_RepositoryIdSeq },
+    { "abstract_base_values", &CORBA::_tc_RepositoryIdSeq },
+    { "is_truncatable", &CORBA::_tc_boolean },
+    { "base_value", &CORBA::_tc_RepositoryId },
+    { "type", &CORBA::_tc_TypeCode }
+    
+  };
+static TAO::TypeCode::Struct<char const *,
+                      CORBA::TypeCode_ptr const *,
+                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
+                      TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ExtValueDef_ExtFullValueDescription (
+    CORBA::tk_struct,
+    "IDL:omg.org/CORBA/ExtValueDef/ExtFullValueDescription:1.0",
+    "ExtFullValueDescription",
+    _tao_fields_CORBA_ExtValueDef_ExtFullValueDescription,
+    15);
+  
+::CORBA::TypeCode_ptr const CORBA::ExtValueDef::_tc_ExtFullValueDescription =
+  &_tao_tc_CORBA_ExtValueDef_ExtFullValueDescription;
+
 // TAO_IDL - Generated from 
 // be\be_visitor_structure/structure_cs.cpp:66
 
@@ -2366,7 +2728,7 @@ CORBA::ExtValueDef::ExtFullValueDescription::_tao_any_destructor (
       CORBA_ExtValueDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::ExtValueDef::ExtFullValueDescription>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::ExtValueDef::ExtFullValueDescription>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -2415,14 +2777,14 @@ CORBA::ExtValueDef::ExtFullValueDescription::_tao_any_destructor (
       CORBA_ExtValueDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::ExtAttributeDef>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::RepositoryId>::in_arg_val _tao_id (id);
-  TAO::Arg_Traits< CORBA::Identifier>::in_arg_val _tao_name (name);
-  TAO::Arg_Traits< CORBA::VersionSpec>::in_arg_val _tao_version (version);
-  TAO::Arg_Traits< CORBA::IDLType>::in_arg_val _tao_type (type);
-  TAO::Arg_Traits< CORBA::AttributeMode>::in_arg_val _tao_mode (mode);
-  TAO::Arg_Traits< CORBA::ExceptionDefSeq>::in_arg_val _tao_get_exceptions (get_exceptions);
-  TAO::Arg_Traits< CORBA::ExceptionDefSeq>::in_arg_val _tao_set_exceptions (set_exceptions);
+  TAO::Arg_Traits< ::CORBA::ExtAttributeDef>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::RepositoryId>::in_arg_val _tao_id (id);
+  TAO::Arg_Traits< ::CORBA::Identifier>::in_arg_val _tao_name (name);
+  TAO::Arg_Traits< ::CORBA::VersionSpec>::in_arg_val _tao_version (version);
+  TAO::Arg_Traits< ::CORBA::IDLType>::in_arg_val _tao_type (type);
+  TAO::Arg_Traits< ::CORBA::AttributeMode>::in_arg_val _tao_mode (mode);
+  TAO::Arg_Traits< ::CORBA::ExceptionDefSeq>::in_arg_val _tao_get_exceptions (get_exceptions);
+  TAO::Arg_Traits< ::CORBA::ExceptionDefSeq>::in_arg_val _tao_set_exceptions (set_exceptions);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -2587,6 +2949,24 @@ CORBA::ExtValueDef::marshal (TAO_OutputCDR &cdr)
 }
 
 // TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:76
+
+static TAO::TypeCode::Objref<char const *,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ExtValueDef (
+    CORBA::tk_objref,
+    "IDL:omg.org/CORBA/ExtValueDef:1.0",
+    "ExtValueDef");
+  
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_ExtValueDef =
+    &_tao_tc_CORBA_ExtValueDef;
+}
+
+
+
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_cs.cpp:60
 
 // Traits specializations for CORBA::ValueBoxDef.
@@ -2648,7 +3028,7 @@ TAO::Collocation_Proxy_Broker *
       CORBA_ValueBoxDef_setup_collocation ();
     }
   
-  TAO::Arg_Traits< CORBA::IDLType>::ret_val _tao_retval;
+  TAO::Arg_Traits< ::CORBA::IDLType>::ret_val _tao_retval;
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -2692,7 +3072,7 @@ void CORBA::ValueBoxDef::original_type_def (
     }
   
   TAO::Arg_Traits< void>::ret_val _tao_retval;
-  TAO::Arg_Traits< CORBA::IDLType>::in_arg_val _tao_original_type_def (original_type_def);
+  TAO::Arg_Traits< ::CORBA::IDLType>::in_arg_val _tao_original_type_def (original_type_def);
   
   TAO::Argument *_the_tao_operation_signature [] =
     {
@@ -2845,6 +3225,605 @@ CORBA::ValueBoxDef::marshal (TAO_OutputCDR &cdr)
 }
 
 // TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:76
+
+static TAO::TypeCode::Objref<char const *,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_CORBA_ValueBoxDef (
+    CORBA::tk_objref,
+    "IDL:omg.org/CORBA/ValueBoxDef:1.0",
+    "ValueBoxDef");
+  
+namespace CORBA
+{
+  ::CORBA::TypeCode_ptr const _tc_ValueBoxDef =
+    &_tao_tc_CORBA_ValueBoxDef;
+}
+
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+namespace TAO
+{
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<CORBA::FixedDef>::to_object (
+      CORBA::Object_ptr &_tao_elem
+    ) const
+  {
+    _tao_elem = CORBA::Object::_duplicate (this->value_);
+    return true;
+  }
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::FixedDef_ptr _tao_elem
+  )
+{
+  CORBA::FixedDef_ptr _tao_objptr =
+    CORBA::FixedDef::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::FixedDef_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<CORBA::FixedDef>::insert (
+      _tao_any,
+      CORBA::FixedDef::_tao_any_destructor,
+      CORBA::_tc_FixedDef,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::FixedDef_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<CORBA::FixedDef>::extract (
+        _tao_any,
+        CORBA::FixedDef::_tao_any_destructor,
+        CORBA::_tc_FixedDef,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from 
+// be\be_visitor_structure/any_op_cs.cpp:54
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const CORBA::ValueMember &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::ValueMember>::insert_copy (
+      _tao_any,
+      CORBA::ValueMember::_tao_any_destructor,
+      CORBA::_tc_ValueMember,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ValueMember *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::ValueMember>::insert (
+      _tao_any,
+      CORBA::ValueMember::_tao_any_destructor,
+      CORBA::_tc_ValueMember,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::ValueMember *&_tao_elem
+  )
+{
+  return _tao_any >>= const_cast<
+      const CORBA::ValueMember *&> (
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CORBA::ValueMember *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<CORBA::ValueMember>::extract (
+        _tao_any,
+        CORBA::ValueMember::_tao_any_destructor,
+        CORBA::_tc_ValueMember,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from 
+// be\be_visitor_sequence/any_op_cs.cpp:54
+
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const CORBA::ValueMemberSeq &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::ValueMemberSeq>::insert_copy (
+      _tao_any,
+      CORBA::ValueMemberSeq::_tao_any_destructor,
+      TAO::TypeCode::tc_CORBA_ValueMemberSeq_0,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ValueMemberSeq *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::ValueMemberSeq>::insert (
+      _tao_any,
+      CORBA::ValueMemberSeq::_tao_any_destructor,
+      TAO::TypeCode::tc_CORBA_ValueMemberSeq_0,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::ValueMemberSeq *&_tao_elem
+  )
+{
+  return _tao_any >>= const_cast<
+      const CORBA::ValueMemberSeq *&> (
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CORBA::ValueMemberSeq *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<CORBA::ValueMemberSeq>::extract (
+        _tao_any,
+        CORBA::ValueMemberSeq::_tao_any_destructor,
+        TAO::TypeCode::tc_CORBA_ValueMemberSeq_0,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+namespace TAO
+{
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<CORBA::ValueMemberDef>::to_object (
+      CORBA::Object_ptr &_tao_elem
+    ) const
+  {
+    _tao_elem = CORBA::Object::_duplicate (this->value_);
+    return true;
+  }
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ValueMemberDef_ptr _tao_elem
+  )
+{
+  CORBA::ValueMemberDef_ptr _tao_objptr =
+    CORBA::ValueMemberDef::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ValueMemberDef_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<CORBA::ValueMemberDef>::insert (
+      _tao_any,
+      CORBA::ValueMemberDef::_tao_any_destructor,
+      CORBA::_tc_ValueMemberDef,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::ValueMemberDef_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<CORBA::ValueMemberDef>::extract (
+        _tao_any,
+        CORBA::ValueMemberDef::_tao_any_destructor,
+        CORBA::_tc_ValueMemberDef,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+namespace TAO
+{
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<CORBA::ValueDef>::to_object (
+      CORBA::Object_ptr &_tao_elem
+    ) const
+  {
+    _tao_elem = CORBA::Object::_duplicate (this->value_);
+    return true;
+  }
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ValueDef_ptr _tao_elem
+  )
+{
+  CORBA::ValueDef_ptr _tao_objptr =
+    CORBA::ValueDef::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ValueDef_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<CORBA::ValueDef>::insert (
+      _tao_any,
+      CORBA::ValueDef::_tao_any_destructor,
+      CORBA::_tc_ValueDef,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::ValueDef_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<CORBA::ValueDef>::extract (
+        _tao_any,
+        CORBA::ValueDef::_tao_any_destructor,
+        CORBA::_tc_ValueDef,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from 
+// be\be_visitor_structure/any_op_cs.cpp:54
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const CORBA::ValueDef::FullValueDescription &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::ValueDef::FullValueDescription>::insert_copy (
+      _tao_any,
+      CORBA::ValueDef::FullValueDescription::_tao_any_destructor,
+      CORBA::ValueDef::_tc_FullValueDescription,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ValueDef::FullValueDescription *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::ValueDef::FullValueDescription>::insert (
+      _tao_any,
+      CORBA::ValueDef::FullValueDescription::_tao_any_destructor,
+      CORBA::ValueDef::_tc_FullValueDescription,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::ValueDef::FullValueDescription *&_tao_elem
+  )
+{
+  return _tao_any >>= const_cast<
+      const CORBA::ValueDef::FullValueDescription *&> (
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CORBA::ValueDef::FullValueDescription *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<CORBA::ValueDef::FullValueDescription>::extract (
+        _tao_any,
+        CORBA::ValueDef::FullValueDescription::_tao_any_destructor,
+        CORBA::ValueDef::_tc_FullValueDescription,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from 
+// be\be_visitor_structure/any_op_cs.cpp:54
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const CORBA::ValueDescription &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::ValueDescription>::insert_copy (
+      _tao_any,
+      CORBA::ValueDescription::_tao_any_destructor,
+      CORBA::_tc_ValueDescription,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ValueDescription *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::ValueDescription>::insert (
+      _tao_any,
+      CORBA::ValueDescription::_tao_any_destructor,
+      CORBA::_tc_ValueDescription,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::ValueDescription *&_tao_elem
+  )
+{
+  return _tao_any >>= const_cast<
+      const CORBA::ValueDescription *&> (
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CORBA::ValueDescription *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<CORBA::ValueDescription>::extract (
+        _tao_any,
+        CORBA::ValueDescription::_tao_any_destructor,
+        CORBA::_tc_ValueDescription,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+namespace TAO
+{
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<CORBA::ExtValueDef>::to_object (
+      CORBA::Object_ptr &_tao_elem
+    ) const
+  {
+    _tao_elem = CORBA::Object::_duplicate (this->value_);
+    return true;
+  }
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ExtValueDef_ptr _tao_elem
+  )
+{
+  CORBA::ExtValueDef_ptr _tao_objptr =
+    CORBA::ExtValueDef::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ExtValueDef_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<CORBA::ExtValueDef>::insert (
+      _tao_any,
+      CORBA::ExtValueDef::_tao_any_destructor,
+      CORBA::_tc_ExtValueDef,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::ExtValueDef_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<CORBA::ExtValueDef>::extract (
+        _tao_any,
+        CORBA::ExtValueDef::_tao_any_destructor,
+        CORBA::_tc_ExtValueDef,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from 
+// be\be_visitor_structure/any_op_cs.cpp:54
+
+// Copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    const CORBA::ExtValueDef::ExtFullValueDescription &_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::ExtValueDef::ExtFullValueDescription>::insert_copy (
+      _tao_any,
+      CORBA::ExtValueDef::ExtFullValueDescription::_tao_any_destructor,
+      CORBA::ExtValueDef::_tc_ExtFullValueDescription,
+      _tao_elem
+    );
+}
+
+// Non-copying insertion.
+void operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ExtValueDef::ExtFullValueDescription *_tao_elem
+  )
+{
+  TAO::Any_Dual_Impl_T<CORBA::ExtValueDef::ExtFullValueDescription>::insert (
+      _tao_any,
+      CORBA::ExtValueDef::ExtFullValueDescription::_tao_any_destructor,
+      CORBA::ExtValueDef::_tc_ExtFullValueDescription,
+      _tao_elem
+    );
+}
+
+// Extraction to non-const pointer (deprecated).
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::ExtValueDef::ExtFullValueDescription *&_tao_elem
+  )
+{
+  return _tao_any >>= const_cast<
+      const CORBA::ExtValueDef::ExtFullValueDescription *&> (
+      _tao_elem
+    );
+}
+
+// Extraction to const pointer.
+CORBA::Boolean operator>>= (
+    const CORBA::Any &_tao_any,
+    const CORBA::ExtValueDef::ExtFullValueDescription *&_tao_elem
+  )
+{
+  return
+    TAO::Any_Dual_Impl_T<CORBA::ExtValueDef::ExtFullValueDescription>::extract (
+        _tao_any,
+        CORBA::ExtValueDef::ExtFullValueDescription::_tao_any_destructor,
+        CORBA::ExtValueDef::_tc_ExtFullValueDescription,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_cs.cpp:50
+
+namespace TAO
+{
+  template<>
+  CORBA::Boolean
+  Any_Impl_T<CORBA::ValueBoxDef>::to_object (
+      CORBA::Object_ptr &_tao_elem
+    ) const
+  {
+    _tao_elem = CORBA::Object::_duplicate (this->value_);
+    return true;
+  }
+}
+
+// Copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ValueBoxDef_ptr _tao_elem
+  )
+{
+  CORBA::ValueBoxDef_ptr _tao_objptr =
+    CORBA::ValueBoxDef::_duplicate (_tao_elem);
+  _tao_any <<= &_tao_objptr;
+}
+
+// Non-copying insertion.
+void
+operator<<= (
+    CORBA::Any &_tao_any,
+    CORBA::ValueBoxDef_ptr *_tao_elem
+  )
+{
+  TAO::Any_Impl_T<CORBA::ValueBoxDef>::insert (
+      _tao_any,
+      CORBA::ValueBoxDef::_tao_any_destructor,
+      CORBA::_tc_ValueBoxDef,
+      *_tao_elem
+    );
+}
+
+CORBA::Boolean
+operator>>= (
+    const CORBA::Any &_tao_any,
+    CORBA::ValueBoxDef_ptr &_tao_elem
+  )
+{
+  return
+    TAO::Any_Impl_T<CORBA::ValueBoxDef>::extract (
+        _tao_any,
+        CORBA::ValueBoxDef::_tao_any_destructor,
+        CORBA::_tc_ValueBoxDef,
+        _tao_elem
+      );
+}
+
+// TAO_IDL - Generated from
 // be\be_visitor_interface/cdr_op_cs.cpp:63
 
 CORBA::Boolean operator<< (
@@ -3035,8 +4014,8 @@ CORBA::Boolean operator<< (
   return
     (strm << _tao_aggregate.name.in ()) &&
     (strm << _tao_aggregate.id.in ()) &&
-    (strm << CORBA::Any::from_boolean (_tao_aggregate.is_abstract)) &&
-    (strm << CORBA::Any::from_boolean (_tao_aggregate.is_custom)) &&
+    (strm << ACE_OutputCDR::from_boolean (_tao_aggregate.is_abstract)) &&
+    (strm << ACE_OutputCDR::from_boolean (_tao_aggregate.is_custom)) &&
     (strm << _tao_aggregate.defined_in.in ()) &&
     (strm << _tao_aggregate.version.in ()) &&
     (strm << _tao_aggregate.operations) &&
@@ -3045,7 +4024,7 @@ CORBA::Boolean operator<< (
     (strm << _tao_aggregate.initializers) &&
     (strm << _tao_aggregate.supported_interfaces) &&
     (strm << _tao_aggregate.abstract_base_values) &&
-    (strm << CORBA::Any::from_boolean (_tao_aggregate.is_truncatable)) &&
+    (strm << ACE_OutputCDR::from_boolean (_tao_aggregate.is_truncatable)) &&
     (strm << _tao_aggregate.base_value.in ()) &&
     (strm << _tao_aggregate.type.in ());
 }
@@ -3058,8 +4037,8 @@ CORBA::Boolean operator>> (
   return
     (strm >> _tao_aggregate.name.out ()) &&
     (strm >> _tao_aggregate.id.out ()) &&
-    (strm >> CORBA::Any::to_boolean (_tao_aggregate.is_abstract)) &&
-    (strm >> CORBA::Any::to_boolean (_tao_aggregate.is_custom)) &&
+    (strm >> ACE_InputCDR::to_boolean (_tao_aggregate.is_abstract)) &&
+    (strm >> ACE_InputCDR::to_boolean (_tao_aggregate.is_custom)) &&
     (strm >> _tao_aggregate.defined_in.out ()) &&
     (strm >> _tao_aggregate.version.out ()) &&
     (strm >> _tao_aggregate.operations) &&
@@ -3068,7 +4047,7 @@ CORBA::Boolean operator>> (
     (strm >> _tao_aggregate.initializers) &&
     (strm >> _tao_aggregate.supported_interfaces) &&
     (strm >> _tao_aggregate.abstract_base_values) &&
-    (strm >> CORBA::Any::to_boolean (_tao_aggregate.is_truncatable)) &&
+    (strm >> ACE_InputCDR::to_boolean (_tao_aggregate.is_truncatable)) &&
     (strm >> _tao_aggregate.base_value.out ()) &&
     (strm >> _tao_aggregate.type.out ());
 }
@@ -3120,13 +4099,13 @@ CORBA::Boolean operator<< (
   return
     (strm << _tao_aggregate.name.in ()) &&
     (strm << _tao_aggregate.id.in ()) &&
-    (strm << CORBA::Any::from_boolean (_tao_aggregate.is_abstract)) &&
-    (strm << CORBA::Any::from_boolean (_tao_aggregate.is_custom)) &&
+    (strm << ACE_OutputCDR::from_boolean (_tao_aggregate.is_abstract)) &&
+    (strm << ACE_OutputCDR::from_boolean (_tao_aggregate.is_custom)) &&
     (strm << _tao_aggregate.defined_in.in ()) &&
     (strm << _tao_aggregate.version.in ()) &&
     (strm << _tao_aggregate.supported_interfaces) &&
     (strm << _tao_aggregate.abstract_base_values) &&
-    (strm << CORBA::Any::from_boolean (_tao_aggregate.is_truncatable)) &&
+    (strm << ACE_OutputCDR::from_boolean (_tao_aggregate.is_truncatable)) &&
     (strm << _tao_aggregate.base_value.in ());
 }
 
@@ -3138,13 +4117,13 @@ CORBA::Boolean operator>> (
   return
     (strm >> _tao_aggregate.name.out ()) &&
     (strm >> _tao_aggregate.id.out ()) &&
-    (strm >> CORBA::Any::to_boolean (_tao_aggregate.is_abstract)) &&
-    (strm >> CORBA::Any::to_boolean (_tao_aggregate.is_custom)) &&
+    (strm >> ACE_InputCDR::to_boolean (_tao_aggregate.is_abstract)) &&
+    (strm >> ACE_InputCDR::to_boolean (_tao_aggregate.is_custom)) &&
     (strm >> _tao_aggregate.defined_in.out ()) &&
     (strm >> _tao_aggregate.version.out ()) &&
     (strm >> _tao_aggregate.supported_interfaces) &&
     (strm >> _tao_aggregate.abstract_base_values) &&
-    (strm >> CORBA::Any::to_boolean (_tao_aggregate.is_truncatable)) &&
+    (strm >> ACE_InputCDR::to_boolean (_tao_aggregate.is_truncatable)) &&
     (strm >> _tao_aggregate.base_value.out ());
 }
 
@@ -3159,8 +4138,8 @@ CORBA::Boolean operator<< (
   return
     (strm << _tao_aggregate.name.in ()) &&
     (strm << _tao_aggregate.id.in ()) &&
-    (strm << CORBA::Any::from_boolean (_tao_aggregate.is_abstract)) &&
-    (strm << CORBA::Any::from_boolean (_tao_aggregate.is_custom)) &&
+    (strm << ACE_OutputCDR::from_boolean (_tao_aggregate.is_abstract)) &&
+    (strm << ACE_OutputCDR::from_boolean (_tao_aggregate.is_custom)) &&
     (strm << _tao_aggregate.defined_in.in ()) &&
     (strm << _tao_aggregate.version.in ()) &&
     (strm << _tao_aggregate.operations) &&
@@ -3169,7 +4148,7 @@ CORBA::Boolean operator<< (
     (strm << _tao_aggregate.initializers) &&
     (strm << _tao_aggregate.supported_interfaces) &&
     (strm << _tao_aggregate.abstract_base_values) &&
-    (strm << CORBA::Any::from_boolean (_tao_aggregate.is_truncatable)) &&
+    (strm << ACE_OutputCDR::from_boolean (_tao_aggregate.is_truncatable)) &&
     (strm << _tao_aggregate.base_value.in ()) &&
     (strm << _tao_aggregate.type.in ());
 }
@@ -3182,8 +4161,8 @@ CORBA::Boolean operator>> (
   return
     (strm >> _tao_aggregate.name.out ()) &&
     (strm >> _tao_aggregate.id.out ()) &&
-    (strm >> CORBA::Any::to_boolean (_tao_aggregate.is_abstract)) &&
-    (strm >> CORBA::Any::to_boolean (_tao_aggregate.is_custom)) &&
+    (strm >> ACE_InputCDR::to_boolean (_tao_aggregate.is_abstract)) &&
+    (strm >> ACE_InputCDR::to_boolean (_tao_aggregate.is_custom)) &&
     (strm >> _tao_aggregate.defined_in.out ()) &&
     (strm >> _tao_aggregate.version.out ()) &&
     (strm >> _tao_aggregate.operations) &&
@@ -3192,7 +4171,7 @@ CORBA::Boolean operator>> (
     (strm >> _tao_aggregate.initializers) &&
     (strm >> _tao_aggregate.supported_interfaces) &&
     (strm >> _tao_aggregate.abstract_base_values) &&
-    (strm >> CORBA::Any::to_boolean (_tao_aggregate.is_truncatable)) &&
+    (strm >> ACE_InputCDR::to_boolean (_tao_aggregate.is_truncatable)) &&
     (strm >> _tao_aggregate.base_value.out ()) &&
     (strm >> _tao_aggregate.type.out ());
 }
diff --git a/TAO/tao/IFR_Client/IFR_ExtendedC.h b/TAO/tao/IFR_Client/IFR_ExtendedC.h
index b62da63b595..281a37c13e7 100644
--- a/TAO/tao/IFR_Client/IFR_ExtendedC.h
+++ b/TAO/tao/IFR_Client/IFR_ExtendedC.h
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:153
+// be\be_codegen.cpp:154
 
 #ifndef _TAO_IDL_ORIG_IFR_EXTENDEDC_H_
 #define _TAO_IDL_ORIG_IFR_EXTENDEDC_H_
@@ -45,8 +45,8 @@
 #include "tao/SystemException.h"
 #include "tao/Environment.h"
 #include "tao/Object.h"
-#include "tao/TypeCode.h"
-#include "tao/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/TypeCode.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/Sequence_T.h"
 #include "tao/Objref_VarOut_T.h"
 #include "tao/Seq_Var_T.h"
@@ -54,8 +54,8 @@
 #include "tao/VarOut_T.h"
 
 #include "tao/IFR_Client/IFR_BasicC.h"
-#include "tao/VisibilityC.h"
-#include "tao/ValueModifierC.h"
+#include "tao/AnyTypeCode/VisibilityC.h"
+#include "tao/AnyTypeCode/ValueModifierC.h"
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
@@ -234,7 +234,7 @@ namespace CORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:49
   
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_FixedDef;
   
@@ -257,7 +257,7 @@ namespace CORBA
     ValueMember_out;
   
   // TAO_IDL - Generated from
-  // be\be_visitor_structure/structure_ch.cpp:52
+  // be\be_visitor_structure/structure_ch.cpp:57
   
   struct TAO_IFR_Client_Export ValueMember
   {
@@ -274,7 +274,7 @@ namespace CORBA
   };
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:49
   
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ValueMember;
   
@@ -327,7 +327,7 @@ namespace CORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:49
   
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ValueMemberSeq;
   
@@ -489,7 +489,7 @@ namespace CORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:49
   
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ValueMemberDef;
   
@@ -731,7 +731,7 @@ namespace CORBA
       FullValueDescription_out;
     
     // TAO_IDL - Generated from
-    // be\be_visitor_structure/structure_ch.cpp:52
+    // be\be_visitor_structure/structure_ch.cpp:57
     
     struct TAO_IFR_Client_Export FullValueDescription
     {
@@ -756,7 +756,7 @@ namespace CORBA
     };
     
     // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:44
+    // be\be_visitor_typecode/typecode_decl.cpp:49
     
     static ::CORBA::TypeCode_ptr const _tc_FullValueDescription;
     
@@ -865,7 +865,7 @@ namespace CORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:49
   
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ValueDef;
   
@@ -888,7 +888,7 @@ namespace CORBA
     ValueDescription_out;
   
   // TAO_IDL - Generated from
-  // be\be_visitor_structure/structure_ch.cpp:52
+  // be\be_visitor_structure/structure_ch.cpp:57
   
   struct TAO_IFR_Client_Export ValueDescription
   {
@@ -908,7 +908,7 @@ namespace CORBA
   };
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:49
   
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ValueDescription;
   
@@ -1011,7 +1011,7 @@ namespace CORBA
       ExtFullValueDescription_out;
     
     // TAO_IDL - Generated from
-    // be\be_visitor_structure/structure_ch.cpp:52
+    // be\be_visitor_structure/structure_ch.cpp:57
     
     struct TAO_IFR_Client_Export ExtFullValueDescription
     {
@@ -1036,7 +1036,7 @@ namespace CORBA
     };
     
     // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:44
+    // be\be_visitor_typecode/typecode_decl.cpp:49
     
     static ::CORBA::TypeCode_ptr const _tc_ExtFullValueDescription;
     
@@ -1114,7 +1114,7 @@ namespace CORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:49
   
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ExtValueDef;
   
@@ -1245,7 +1245,7 @@ namespace CORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:49
   
   extern TAO_IFR_Client_Export ::CORBA::TypeCode_ptr const _tc_ValueBoxDef;
 
@@ -1296,105 +1296,105 @@ TAO::Collocation_Proxy_Broker *
 namespace TAO
 {
 
-#if !defined (_CORBA_VALUEDEF__TRAITS_CH_)
-#define _CORBA_VALUEDEF__TRAITS_CH_
+#if !defined (_CORBA_FIXEDDEF__TRAITS_)
+#define _CORBA_FIXEDDEF__TRAITS_
   
   template<>
-  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ValueDef>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::FixedDef>
   {
-    static ::CORBA::ValueDef_ptr duplicate (
-        ::CORBA::ValueDef_ptr
+    static ::CORBA::FixedDef_ptr duplicate (
+        ::CORBA::FixedDef_ptr
       );
     static void release (
-        ::CORBA::ValueDef_ptr
+        ::CORBA::FixedDef_ptr
       );
-    static ::CORBA::ValueDef_ptr nil (void);
+    static ::CORBA::FixedDef_ptr nil (void);
     static CORBA::Boolean marshal (
-        ::CORBA::ValueDef_ptr p,
+        ::CORBA::FixedDef_ptr p,
         TAO_OutputCDR & cdr
       );
   };
 
 #endif /* end #if !defined */
 
-#if !defined (_CORBA_VALUEBOXDEF__TRAITS_CH_)
-#define _CORBA_VALUEBOXDEF__TRAITS_CH_
+#if !defined (_CORBA_VALUEMEMBERDEF__TRAITS_)
+#define _CORBA_VALUEMEMBERDEF__TRAITS_
   
   template<>
-  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ValueBoxDef>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ValueMemberDef>
   {
-    static ::CORBA::ValueBoxDef_ptr duplicate (
-        ::CORBA::ValueBoxDef_ptr
+    static ::CORBA::ValueMemberDef_ptr duplicate (
+        ::CORBA::ValueMemberDef_ptr
       );
     static void release (
-        ::CORBA::ValueBoxDef_ptr
+        ::CORBA::ValueMemberDef_ptr
       );
-    static ::CORBA::ValueBoxDef_ptr nil (void);
+    static ::CORBA::ValueMemberDef_ptr nil (void);
     static CORBA::Boolean marshal (
-        ::CORBA::ValueBoxDef_ptr p,
+        ::CORBA::ValueMemberDef_ptr p,
         TAO_OutputCDR & cdr
       );
   };
 
 #endif /* end #if !defined */
 
-#if !defined (_CORBA_EXTVALUEDEF__TRAITS_CH_)
-#define _CORBA_EXTVALUEDEF__TRAITS_CH_
+#if !defined (_CORBA_VALUEDEF__TRAITS_)
+#define _CORBA_VALUEDEF__TRAITS_
   
   template<>
-  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ExtValueDef>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ValueDef>
   {
-    static ::CORBA::ExtValueDef_ptr duplicate (
-        ::CORBA::ExtValueDef_ptr
+    static ::CORBA::ValueDef_ptr duplicate (
+        ::CORBA::ValueDef_ptr
       );
     static void release (
-        ::CORBA::ExtValueDef_ptr
+        ::CORBA::ValueDef_ptr
       );
-    static ::CORBA::ExtValueDef_ptr nil (void);
+    static ::CORBA::ValueDef_ptr nil (void);
     static CORBA::Boolean marshal (
-        ::CORBA::ExtValueDef_ptr p,
+        ::CORBA::ValueDef_ptr p,
         TAO_OutputCDR & cdr
       );
   };
 
 #endif /* end #if !defined */
 
-#if !defined (_CORBA_FIXEDDEF__TRAITS_CH_)
-#define _CORBA_FIXEDDEF__TRAITS_CH_
+#if !defined (_CORBA_EXTVALUEDEF__TRAITS_)
+#define _CORBA_EXTVALUEDEF__TRAITS_
   
   template<>
-  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::FixedDef>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ExtValueDef>
   {
-    static ::CORBA::FixedDef_ptr duplicate (
-        ::CORBA::FixedDef_ptr
+    static ::CORBA::ExtValueDef_ptr duplicate (
+        ::CORBA::ExtValueDef_ptr
       );
     static void release (
-        ::CORBA::FixedDef_ptr
+        ::CORBA::ExtValueDef_ptr
       );
-    static ::CORBA::FixedDef_ptr nil (void);
+    static ::CORBA::ExtValueDef_ptr nil (void);
     static CORBA::Boolean marshal (
-        ::CORBA::FixedDef_ptr p,
+        ::CORBA::ExtValueDef_ptr p,
         TAO_OutputCDR & cdr
       );
   };
 
 #endif /* end #if !defined */
 
-#if !defined (_CORBA_VALUEMEMBERDEF__TRAITS_CH_)
-#define _CORBA_VALUEMEMBERDEF__TRAITS_CH_
+#if !defined (_CORBA_VALUEBOXDEF__TRAITS_)
+#define _CORBA_VALUEBOXDEF__TRAITS_
   
   template<>
-  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ValueMemberDef>
+  struct TAO_IFR_Client_Export Objref_Traits< ::CORBA::ValueBoxDef>
   {
-    static ::CORBA::ValueMemberDef_ptr duplicate (
-        ::CORBA::ValueMemberDef_ptr
+    static ::CORBA::ValueBoxDef_ptr duplicate (
+        ::CORBA::ValueBoxDef_ptr
       );
     static void release (
-        ::CORBA::ValueMemberDef_ptr
+        ::CORBA::ValueBoxDef_ptr
       );
-    static ::CORBA::ValueMemberDef_ptr nil (void);
+    static ::CORBA::ValueBoxDef_ptr nil (void);
     static CORBA::Boolean marshal (
-        ::CORBA::ValueMemberDef_ptr p,
+        ::CORBA::ValueBoxDef_ptr p,
         TAO_OutputCDR & cdr
       );
   };
@@ -1403,14 +1403,14 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
+// be\be_visitor_interface/any_op_ch.cpp:53
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::FixedDef_ptr); // copying
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::FixedDef_ptr *); // non-copying
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::FixedDef_ptr &);
 
 // TAO_IDL - Generated from
-// be\be_visitor_structure/any_op_ch.cpp:52
+// be\be_visitor_structure/any_op_ch.cpp:53
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::ValueMember &); // copying version
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ValueMember*); // noncopying version
@@ -1418,7 +1418,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Val
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ValueMember *&);
 
 // TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
+// be\be_visitor_sequence/any_op_ch.cpp:53
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::ValueMemberSeq &); // copying version
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ValueMemberSeq*); // noncopying version
@@ -1426,21 +1426,21 @@ TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Val
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ValueMemberSeq *&);
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
+// be\be_visitor_interface/any_op_ch.cpp:53
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ValueMemberDef_ptr); // copying
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ValueMemberDef_ptr *); // non-copying
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ValueMemberDef_ptr &);
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
+// be\be_visitor_interface/any_op_ch.cpp:53
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ValueDef_ptr); // copying
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ValueDef_ptr *); // non-copying
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ValueDef_ptr &);
 
 // TAO_IDL - Generated from
-// be\be_visitor_structure/any_op_ch.cpp:52
+// be\be_visitor_structure/any_op_ch.cpp:53
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::ValueDef::FullValueDescription &); // copying version
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ValueDef::FullValueDescription*); // noncopying version
@@ -1448,7 +1448,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Val
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ValueDef::FullValueDescription *&);
 
 // TAO_IDL - Generated from
-// be\be_visitor_structure/any_op_ch.cpp:52
+// be\be_visitor_structure/any_op_ch.cpp:53
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::ValueDescription &); // copying version
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ValueDescription*); // noncopying version
@@ -1456,14 +1456,14 @@ TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Val
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ValueDescription *&);
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
+// be\be_visitor_interface/any_op_ch.cpp:53
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ExtValueDef_ptr); // copying
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ExtValueDef_ptr *); // non-copying
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ExtValueDef_ptr &);
 
 // TAO_IDL - Generated from
-// be\be_visitor_structure/any_op_ch.cpp:52
+// be\be_visitor_structure/any_op_ch.cpp:53
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, const CORBA::ExtValueDef::ExtFullValueDescription &); // copying version
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ExtValueDef::ExtFullValueDescription*); // noncopying version
@@ -1471,7 +1471,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Ext
 TAO_IFR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ExtValueDef::ExtFullValueDescription *&);
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
+// be\be_visitor_interface/any_op_ch.cpp:53
 
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ValueBoxDef_ptr); // copying
 TAO_IFR_Client_Export void operator<<= (CORBA::Any &, CORBA::ValueBoxDef_ptr *); // non-copying
@@ -1549,7 +1549,7 @@ TAO_IFR_Client_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::V
 TAO_IFR_Client_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ValueBoxDef_ptr &);
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:955
+// be\be_codegen.cpp:1136
 
 #if defined (__ACE_INLINE__)
 #include "IFR_ExtendedC.inl"
diff --git a/TAO/tao/IFR_Client_Adapter.h b/TAO/tao/IFR_Client_Adapter.h
index 9e8afc3e10f..1d3240b853e 100644
--- a/TAO/tao/IFR_Client_Adapter.h
+++ b/TAO/tao/IFR_Client_Adapter.h
@@ -34,8 +34,6 @@ namespace CORBA
   class InterfaceDef;
   typedef InterfaceDef *InterfaceDef_ptr;
 
-  class Any;
-
   class ORB;
   typedef ORB *ORB_ptr;
 
@@ -69,7 +67,7 @@ public:
     ) = 0;
 
   virtual void interfacedef_any_insert (
-      CORBA::Any &any,
+      CORBA::Any *any,
       CORBA::InterfaceDef_ptr object_type
     ) = 0;
 
diff --git a/TAO/tao/IIOP.pidl b/TAO/tao/IIOP.pidl
index 4fa9e7da509..cd52af48f60 100644
--- a/TAO/tao/IIOP.pidl
+++ b/TAO/tao/IIOP.pidl
@@ -2,21 +2,23 @@
 //
 // $Id$
 
-//
-//   This file was used to generate the code in
-//   IIOP*.* The command used to generate code
-//   is:
-//
-//     tao_idl \
-//        -o orig -Gp -Gd -Ge 1 -GA -Sc -Sci
-//          -Wb,export_macro=TAO_Export \
-//          -Wb,export_include="tao/TAO_Export.h" \
-//          -Wb,pre_include="ace/pre.h" \
-//          -Wb,post_include="ace/post.h" \
-//          IIOP.pidl
-//
-//   Remember to patch the generated files using diff/IIOP.diff
-//   This is from the GIOP 1.2 spec for Bi Dir IIOP.
+/**
+ *
+ *   This file was used to generate the code in
+ *   IIOP*.* The command used to generate code
+ *   is:
+ *
+ *     tao_idl \
+ *        -o orig -Gp -Gd -Ge 1 -GA -Sc -Sci
+ *          -Wb,export_macro=TAO_Export \
+ *          -Wb,export_include="tao/TAO_Export.h" \
+ *          -Wb,pre_include="ace/pre.h" \
+ *          -Wb,post_include="ace/post.h" \
+ *          IIOP.pidl
+ *
+ *   Remember to patch the generated files using diff/IIOP.diff
+ *   This is from the GIOP 1.2 spec for Bi Dir IIOP.
+ */
 
 #ifndef TAO_IIOP_PIDL
 #define TAO_IIOP_PIDL
diff --git a/TAO/tao/IIOPA.cpp b/TAO/tao/IIOPA.cpp
deleted file mode 100644
index 3915ddc3c03..00000000000
--- a/TAO/tao/IIOPA.cpp
+++ /dev/null
@@ -1,322 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "IIOPC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Sequence_TypeCode_Static.h"
-#include "tao/String_TypeCode_Static.h"
-#include "tao/Struct_TypeCode_Static.h"
-#include "tao/TypeCode_Struct_Field.h"
-#include "tao/Recursive_Type_TypeCode.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Dual_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/struct_typecode.cpp:87
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_IIOP_ListenPoint[] =
-  {
-    { "host", &CORBA::_tc_string },
-    { "port", &CORBA::_tc_ushort }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                      CORBA::TypeCode_ptr const *,
-                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
-                      TAO::Null_RefCount_Policy>
-  _tao_tc_IIOP_ListenPoint (
-    CORBA::tk_struct,
-    "IDL:omg.org/IIOP/ListenPoint:1.0",
-    "ListenPoint",
-    _tao_fields_IIOP_ListenPoint,
-    2);
-  
-namespace IIOP
-{
-  ::CORBA::TypeCode_ptr const _tc_ListenPoint =
-    &_tao_tc_IIOP_ListenPoint;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:937
-
-
-#ifndef _TAO_TYPECODE_IIOP_ListenPointList_GUARD
-#define _TAO_TYPECODE_IIOP_ListenPointList_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      IIOP_ListenPointList_0 (
-        CORBA::tk_sequence,
-        &IIOP::_tc_ListenPoint,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_IIOP_ListenPointList_0 =
-      &IIOP_ListenPointList_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_IIOP_ListenPointList_GUARD */
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_IIOP_ListenPointList (
-    CORBA::tk_alias,
-    "IDL:omg.org/IIOP/ListenPointList:1.0",
-    "ListenPointList",
-    &TAO::TypeCode::tc_IIOP_ListenPointList_0);
-  
-namespace IIOP
-{
-  ::CORBA::TypeCode_ptr const _tc_ListenPointList =
-    &_tao_tc_IIOP_ListenPointList;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/struct_typecode.cpp:87
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:937
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_IIOP_BiDirIIOPServiceContext[] =
-  {
-    { "listen_points", &IIOP::_tc_ListenPointList }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                      CORBA::TypeCode_ptr const *,
-                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
-                      TAO::Null_RefCount_Policy>
-  _tao_tc_IIOP_BiDirIIOPServiceContext (
-    CORBA::tk_struct,
-    "IDL:omg.org/IIOP/BiDirIIOPServiceContext:1.0",
-    "BiDirIIOPServiceContext",
-    _tao_fields_IIOP_BiDirIIOPServiceContext,
-    1);
-  
-namespace IIOP
-{
-  ::CORBA::TypeCode_ptr const _tc_BiDirIIOPServiceContext =
-    &_tao_tc_IIOP_BiDirIIOPServiceContext;
-}
-
-
-
-// TAO_IDL - Generated from 
-// be\be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const IIOP::ListenPoint &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<IIOP::ListenPoint>::insert_copy (
-      _tao_any,
-      IIOP::ListenPoint::_tao_any_destructor,
-      IIOP::_tc_ListenPoint,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    IIOP::ListenPoint *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<IIOP::ListenPoint>::insert (
-      _tao_any,
-      IIOP::ListenPoint::_tao_any_destructor,
-      IIOP::_tc_ListenPoint,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    IIOP::ListenPoint *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const IIOP::ListenPoint *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const IIOP::ListenPoint *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<IIOP::ListenPoint>::extract (
-        _tao_any,
-        IIOP::ListenPoint::_tao_any_destructor,
-        IIOP::_tc_ListenPoint,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const IIOP::ListenPointList &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<IIOP::ListenPointList>::insert_copy (
-      _tao_any,
-      IIOP::ListenPointList::_tao_any_destructor,
-      TAO::TypeCode::tc_IIOP_ListenPointList_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    IIOP::ListenPointList *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<IIOP::ListenPointList>::insert (
-      _tao_any,
-      IIOP::ListenPointList::_tao_any_destructor,
-      TAO::TypeCode::tc_IIOP_ListenPointList_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    IIOP::ListenPointList *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const IIOP::ListenPointList *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const IIOP::ListenPointList *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<IIOP::ListenPointList>::extract (
-        _tao_any,
-        IIOP::ListenPointList::_tao_any_destructor,
-        TAO::TypeCode::tc_IIOP_ListenPointList_0,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const IIOP::BiDirIIOPServiceContext &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<IIOP::BiDirIIOPServiceContext>::insert_copy (
-      _tao_any,
-      IIOP::BiDirIIOPServiceContext::_tao_any_destructor,
-      IIOP::_tc_BiDirIIOPServiceContext,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    IIOP::BiDirIIOPServiceContext *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<IIOP::BiDirIIOPServiceContext>::insert (
-      _tao_any,
-      IIOP::BiDirIIOPServiceContext::_tao_any_destructor,
-      IIOP::_tc_BiDirIIOPServiceContext,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    IIOP::BiDirIIOPServiceContext *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const IIOP::BiDirIIOPServiceContext *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const IIOP::BiDirIIOPServiceContext *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<IIOP::BiDirIIOPServiceContext>::extract (
-        _tao_any,
-        IIOP::BiDirIIOPServiceContext::_tao_any_destructor,
-        IIOP::_tc_BiDirIIOPServiceContext,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/IIOPC.cpp b/TAO/tao/IIOPC.cpp
index b0ef17be4e1..6bb33006503 100644
--- a/TAO/tao/IIOPC.cpp
+++ b/TAO/tao/IIOPC.cpp
@@ -26,16 +26,12 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:291
+// be\be_codegen.cpp:288
 
 
 #include "IIOPC.h"
 #include "tao/CDR.h"
 
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
@@ -71,7 +67,7 @@ IIOP::ListenPointList::ListenPointList (
     CORBA::ULong max
   )
   : TAO_Unbounded_Sequence<
-        IIOP::ListenPoint
+        ListenPoint
       >
     (max)
 {}
@@ -83,7 +79,7 @@ IIOP::ListenPointList::ListenPointList (
     CORBA::Boolean release
   )
   : TAO_Unbounded_Sequence<
-        IIOP::ListenPoint
+        ListenPoint
       >
     (max, length, buffer, release)
 {}
@@ -92,7 +88,7 @@ IIOP::ListenPointList::ListenPointList (
     const ListenPointList &seq
   )
   : TAO_Unbounded_Sequence<
-        IIOP::ListenPoint
+        ListenPoint
       >
     (seq)
 {}
diff --git a/TAO/tao/IIOPC.h b/TAO/tao/IIOPC.h
index 332e5cd56dd..18133b7e39a 100644
--- a/TAO/tao/IIOPC.h
+++ b/TAO/tao/IIOPC.h
@@ -26,10 +26,10 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:153
+// be\be_codegen.cpp:154
 
-#ifndef _TAO_IDL_ORIG_IIOPC_H_
-#define _TAO_IDL_ORIG_IIOPC_H_
+#ifndef _TAO_IDL_IIOPC_H_
+#define _TAO_IDL_IIOPC_H_
 
 #include /**/ "ace/pre.h"
 
@@ -58,12 +58,8 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:49
 
 namespace IIOP
 {
@@ -87,7 +83,7 @@ namespace IIOP
     ListenPoint_out;
   
   // TAO_IDL - Generated from
-  // be\be_visitor_structure/structure_ch.cpp:52
+  // be\be_visitor_structure/structure_ch.cpp:57
   
   struct TAO_Export ListenPoint
   {
@@ -99,11 +95,6 @@ namespace IIOP
   };
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ListenPoint;
-  
-  // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_IIOP_LISTENPOINTLIST_CH_)
@@ -152,11 +143,6 @@ namespace IIOP
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ListenPointList;
-  
-  // TAO_IDL - Generated from
   // be\be_type.cpp:258
   
   struct BiDirIIOPServiceContext;
@@ -175,7 +161,7 @@ namespace IIOP
     BiDirIIOPServiceContext_out;
   
   // TAO_IDL - Generated from
-  // be\be_visitor_structure/structure_ch.cpp:52
+  // be\be_visitor_structure/structure_ch.cpp:57
   
   struct TAO_Export BiDirIIOPServiceContext
   {
@@ -184,14 +170,9 @@ namespace IIOP
     static void _tao_any_destructor (void *);
     IIOP::ListenPointList listen_points;
   };
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_BiDirIIOPServiceContext;
 
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:78
 
 } // module IIOP
 
@@ -204,30 +185,6 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_structure/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const IIOP::ListenPoint &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, IIOP::ListenPoint*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IIOP::ListenPoint *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IIOP::ListenPoint *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const IIOP::ListenPointList &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, IIOP::ListenPointList*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IIOP::ListenPointList *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IIOP::ListenPointList *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const IIOP::BiDirIIOPServiceContext &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, IIOP::BiDirIIOPServiceContext*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IIOP::BiDirIIOPServiceContext *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IIOP::BiDirIIOPServiceContext *&);
-
-// TAO_IDL - Generated from
 // be\be_visitor_structure/cdr_op_ch.cpp:54
 
 TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IIOP::ListenPoint &);
@@ -257,16 +214,12 @@ TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IIOP::BiDirIIOPServ
 TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, IIOP::BiDirIIOPServiceContext &);
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:955
+// be\be_codegen.cpp:1062
 
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
diff --git a/TAO/tao/IIOP_Acceptor.cpp b/TAO/tao/IIOP_Acceptor.cpp
index 4e4e0cf7fa9..0ddf5d044e6 100644
--- a/TAO/tao/IIOP_Acceptor.cpp
+++ b/TAO/tao/IIOP_Acceptor.cpp
@@ -779,7 +779,8 @@ TAO_IIOP_Acceptor::object_key (IOP::TaggedProfile &profile,
                     profile.profile_data.length ());
 #endif /* TAO_NO_COPY_OCTET_SEQUENCES == 1 */
 
-  CORBA::Octet major, minor;
+  CORBA::Octet major;
+  CORBA::Octet minor;
 
   // Read the version. We just read it here. We don't*do any*
   // processing.
diff --git a/TAO/tao/IIOP_EndpointsA.cpp b/TAO/tao/IIOP_EndpointsA.cpp
deleted file mode 100644
index 5ea6a8c8da9..00000000000
--- a/TAO/tao/IIOP_EndpointsA.cpp
+++ /dev/null
@@ -1,233 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "IIOP_EndpointsC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Sequence_TypeCode_Static.h"
-#include "tao/String_TypeCode_Static.h"
-#include "tao/Struct_TypeCode_Static.h"
-#include "tao/TypeCode_Struct_Field.h"
-#include "tao/Recursive_Type_TypeCode.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Dual_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/struct_typecode.cpp:87
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_TAO_IIOP_Endpoint_Info[] =
-  {
-    { "host", &CORBA::_tc_string },
-    { "port", &CORBA::_tc_short },
-    { "priority", &CORBA::_tc_short }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                      CORBA::TypeCode_ptr const *,
-                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
-                      TAO::Null_RefCount_Policy>
-  _tao_tc_TAO_IIOP_Endpoint_Info (
-    CORBA::tk_struct,
-    "IDL:TAO/IIOP_Endpoint_Info:1.0",
-    "IIOP_Endpoint_Info",
-    _tao_fields_TAO_IIOP_Endpoint_Info,
-    3);
-  
-namespace TAO
-{
-  ::CORBA::TypeCode_ptr const _tc_IIOP_Endpoint_Info =
-    &_tao_tc_TAO_IIOP_Endpoint_Info;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:937
-
-
-#ifndef _TAO_TYPECODE_TAO_IIOPEndpointSequence_GUARD
-#define _TAO_TYPECODE_TAO_IIOPEndpointSequence_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      TAO_IIOPEndpointSequence_0 (
-        CORBA::tk_sequence,
-        &TAO::_tc_IIOP_Endpoint_Info,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_TAO_IIOPEndpointSequence_0 =
-      &TAO_IIOPEndpointSequence_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_TAO_IIOPEndpointSequence_GUARD */
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_TAO_IIOPEndpointSequence (
-    CORBA::tk_alias,
-    "IDL:TAO/IIOPEndpointSequence:1.0",
-    "IIOPEndpointSequence",
-    &TAO::TypeCode::tc_TAO_IIOPEndpointSequence_0);
-  
-namespace TAO
-{
-  ::CORBA::TypeCode_ptr const _tc_IIOPEndpointSequence =
-    &_tao_tc_TAO_IIOPEndpointSequence;
-}
-
-
-
-// TAO_IDL - Generated from 
-// be\be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const TAO::IIOP_Endpoint_Info &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<TAO::IIOP_Endpoint_Info>::insert_copy (
-      _tao_any,
-      TAO::IIOP_Endpoint_Info::_tao_any_destructor,
-      TAO::_tc_IIOP_Endpoint_Info,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    TAO::IIOP_Endpoint_Info *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<TAO::IIOP_Endpoint_Info>::insert (
-      _tao_any,
-      TAO::IIOP_Endpoint_Info::_tao_any_destructor,
-      TAO::_tc_IIOP_Endpoint_Info,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    TAO::IIOP_Endpoint_Info *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const TAO::IIOP_Endpoint_Info *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const TAO::IIOP_Endpoint_Info *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<TAO::IIOP_Endpoint_Info>::extract (
-        _tao_any,
-        TAO::IIOP_Endpoint_Info::_tao_any_destructor,
-        TAO::_tc_IIOP_Endpoint_Info,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const TAO::IIOPEndpointSequence &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<TAO::IIOPEndpointSequence>::insert_copy (
-      _tao_any,
-      TAO::IIOPEndpointSequence::_tao_any_destructor,
-      TAO::TypeCode::tc_TAO_IIOPEndpointSequence_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    TAO::IIOPEndpointSequence *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<TAO::IIOPEndpointSequence>::insert (
-      _tao_any,
-      TAO::IIOPEndpointSequence::_tao_any_destructor,
-      TAO::TypeCode::tc_TAO_IIOPEndpointSequence_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    TAO::IIOPEndpointSequence *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const TAO::IIOPEndpointSequence *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const TAO::IIOPEndpointSequence *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<TAO::IIOPEndpointSequence>::extract (
-        _tao_any,
-        TAO::IIOPEndpointSequence::_tao_any_destructor,
-        TAO::TypeCode::tc_TAO_IIOPEndpointSequence_0,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/IIOP_EndpointsC.h b/TAO/tao/IIOP_EndpointsC.h
index 95077b7450c..2b780ea4150 100644
--- a/TAO/tao/IIOP_EndpointsC.h
+++ b/TAO/tao/IIOP_EndpointsC.h
@@ -67,58 +67,53 @@
 
 namespace TAO
 {
-  
+
   // TAO_IDL - Generated from
   // be\be_type.cpp:258
-  
+
   struct IIOP_Endpoint_Info;
-  
+
   typedef
     TAO_Var_Var_T<
         IIOP_Endpoint_Info
       >
     IIOP_Endpoint_Info_var;
-  
+
   typedef
     TAO_Out_T<
         IIOP_Endpoint_Info,
         IIOP_Endpoint_Info_var
       >
     IIOP_Endpoint_Info_out;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_structure/structure_ch.cpp:52
-  
+
   struct TAO_Export IIOP_Endpoint_Info
   {
     typedef IIOP_Endpoint_Info_var _var_type;
-    
+
     static void _tao_any_destructor (void *);
     TAO_String_Manager host;
     CORBA::Short port;
     CORBA::Short priority;
   };
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_IIOP_Endpoint_Info;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_TAO_IIOPENDPOINTSEQUENCE_CH_)
 #define _TAO_IIOPENDPOINTSEQUENCE_CH_
-  
+
   class IIOPEndpointSequence;
-  
+
   typedef
     TAO_VarSeq_Var_T<
         IIOPEndpointSequence,
         IIOP_Endpoint_Info
       >
     IIOPEndpointSequence_var;
-  
+
   typedef
     TAO_Seq_Out_T<
         IIOPEndpointSequence,
@@ -126,7 +121,7 @@ namespace TAO
         IIOP_Endpoint_Info
       >
     IIOPEndpointSequence_out;
-  
+
   class TAO_Export IIOPEndpointSequence
     : public
         TAO_Unbounded_Sequence<
@@ -139,23 +134,18 @@ namespace TAO
     IIOPEndpointSequence (
         CORBA::ULong max,
         CORBA::ULong length,
-        IIOP_Endpoint_Info* buffer, 
+        IIOP_Endpoint_Info* buffer,
         CORBA::Boolean release = 0
       );
     IIOPEndpointSequence (const IIOPEndpointSequence &);
     ~IIOPEndpointSequence (void);
-    
+
     static void _tao_any_destructor (void *);
-    
+
     typedef IIOPEndpointSequence_var _var_type;
   };
 
 #endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_IIOPEndpointSequence;
 
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:66
@@ -171,22 +161,6 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_structure/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const TAO::IIOP_Endpoint_Info &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, TAO::IIOP_Endpoint_Info*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, TAO::IIOP_Endpoint_Info *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const TAO::IIOP_Endpoint_Info *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const TAO::IIOPEndpointSequence &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, TAO::IIOPEndpointSequence*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, TAO::IIOPEndpointSequence *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const TAO::IIOPEndpointSequence *&);
-
-// TAO_IDL - Generated from
 // be\be_visitor_structure/cdr_op_ch.cpp:54
 
 TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const TAO::IIOP_Endpoint_Info &);
diff --git a/TAO/tao/IOPC.cpp b/TAO/tao/IOPC.cpp
index 9053a1fe2c3..b5108933284 100644
--- a/TAO/tao/IOPC.cpp
+++ b/TAO/tao/IOPC.cpp
@@ -26,16 +26,12 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:291
+// be\be_codegen.cpp:288
 
 
 #include "IOPC.h"
 #include "tao/CDR.h"
 
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
diff --git a/TAO/tao/IOPC.h b/TAO/tao/IOPC.h
index 392a5d9e1f4..e0bbb0a432a 100644
--- a/TAO/tao/IOPC.h
+++ b/TAO/tao/IOPC.h
@@ -26,10 +26,10 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:153
+// be\be_codegen.cpp:154
 
-#ifndef _TAO_IDL_ORIG_IOPC_H_
-#define _TAO_IDL_ORIG_IOPC_H_
+#ifndef _TAO_IDL_IOPC_H_
+#define _TAO_IDL_IOPC_H_
 
 #include /**/ "ace/pre.h"
 
@@ -56,10 +56,6 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
 // be\be_visitor_traits.cpp:61
 
@@ -69,16 +65,12 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:955
+// be\be_codegen.cpp:1062
 
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
diff --git a/TAO/tao/IOP_IORA.cpp b/TAO/tao/IOP_IORA.cpp
deleted file mode 100644
index 1c268452262..00000000000
--- a/TAO/tao/IOP_IORA.cpp
+++ /dev/null
@@ -1,998 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "IOP_IORC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Sequence_TypeCode_Static.h"
-#include "tao/String_TypeCode_Static.h"
-#include "tao/Struct_TypeCode_Static.h"
-#include "tao/TypeCode_Struct_Field.h"
-#include "tao/Recursive_Type_TypeCode.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Dual_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_IOP_ProfileId (
-    CORBA::tk_alias,
-    "IDL:omg.org/IOP/ProfileId:1.0",
-    "ProfileId",
-    &CORBA::_tc_ulong);
-  
-namespace IOP
-{
-  ::CORBA::TypeCode_ptr const _tc_ProfileId =
-    &_tao_tc_IOP_ProfileId;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/struct_typecode.cpp:87
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:937
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_IOP_TaggedProfile[] =
-  {
-    { "tag", &IOP::_tc_ProfileId },
-    { "profile_data", &CORBA::_tc_OctetSeq }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                      CORBA::TypeCode_ptr const *,
-                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
-                      TAO::Null_RefCount_Policy>
-  _tao_tc_IOP_TaggedProfile (
-    CORBA::tk_struct,
-    "IDL:omg.org/IOP/TaggedProfile:1.0",
-    "TaggedProfile",
-    _tao_fields_IOP_TaggedProfile,
-    2);
-  
-namespace IOP
-{
-  ::CORBA::TypeCode_ptr const _tc_TaggedProfile =
-    &_tao_tc_IOP_TaggedProfile;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:937
-
-
-#ifndef _TAO_TYPECODE_IOP_TaggedProfileSeq_GUARD
-#define _TAO_TYPECODE_IOP_TaggedProfileSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      IOP_TaggedProfileSeq_0 (
-        CORBA::tk_sequence,
-        &IOP::_tc_TaggedProfile,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_IOP_TaggedProfileSeq_0 =
-      &IOP_TaggedProfileSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_IOP_TaggedProfileSeq_GUARD */
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_IOP_TaggedProfileSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/IOP/TaggedProfileSeq:1.0",
-    "TaggedProfileSeq",
-    &TAO::TypeCode::tc_IOP_TaggedProfileSeq_0);
-  
-namespace IOP
-{
-  ::CORBA::TypeCode_ptr const _tc_TaggedProfileSeq =
-    &_tao_tc_IOP_TaggedProfileSeq;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/struct_typecode.cpp:87
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:937
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_IOP_IOR[] =
-  {
-    { "type_id", &CORBA::_tc_string },
-    { "profiles", &IOP::_tc_TaggedProfileSeq }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                      CORBA::TypeCode_ptr const *,
-                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
-                      TAO::Null_RefCount_Policy>
-  _tao_tc_IOP_IOR (
-    CORBA::tk_struct,
-    "IDL:omg.org/IOP/IOR:1.0",
-    "IOR",
-    _tao_fields_IOP_IOR,
-    2);
-  
-namespace IOP
-{
-  ::CORBA::TypeCode_ptr const _tc_IOR =
-    &_tao_tc_IOP_IOR;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_IOP_ComponentId (
-    CORBA::tk_alias,
-    "IDL:omg.org/IOP/ComponentId:1.0",
-    "ComponentId",
-    &CORBA::_tc_ulong);
-  
-namespace IOP
-{
-  ::CORBA::TypeCode_ptr const _tc_ComponentId =
-    &_tao_tc_IOP_ComponentId;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/struct_typecode.cpp:87
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:937
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_IOP_TaggedComponent[] =
-  {
-    { "tag", &IOP::_tc_ComponentId },
-    { "component_data", &CORBA::_tc_OctetSeq }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                      CORBA::TypeCode_ptr const *,
-                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
-                      TAO::Null_RefCount_Policy>
-  _tao_tc_IOP_TaggedComponent (
-    CORBA::tk_struct,
-    "IDL:omg.org/IOP/TaggedComponent:1.0",
-    "TaggedComponent",
-    _tao_fields_IOP_TaggedComponent,
-    2);
-  
-namespace IOP
-{
-  ::CORBA::TypeCode_ptr const _tc_TaggedComponent =
-    &_tao_tc_IOP_TaggedComponent;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:937
-
-
-#ifndef _TAO_TYPECODE_IOP_MultipleComponentProfile_GUARD
-#define _TAO_TYPECODE_IOP_MultipleComponentProfile_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      IOP_MultipleComponentProfile_0 (
-        CORBA::tk_sequence,
-        &IOP::_tc_TaggedComponent,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_IOP_MultipleComponentProfile_0 =
-      &IOP_MultipleComponentProfile_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_IOP_MultipleComponentProfile_GUARD */
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_IOP_MultipleComponentProfile (
-    CORBA::tk_alias,
-    "IDL:omg.org/IOP/MultipleComponentProfile:1.0",
-    "MultipleComponentProfile",
-    &TAO::TypeCode::tc_IOP_MultipleComponentProfile_0);
-  
-namespace IOP
-{
-  ::CORBA::TypeCode_ptr const _tc_MultipleComponentProfile =
-    &_tao_tc_IOP_MultipleComponentProfile;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:937
-
-
-#ifndef _TAO_TYPECODE_IOP_TaggedComponentList_GUARD
-#define _TAO_TYPECODE_IOP_TaggedComponentList_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      IOP_TaggedComponentList_0 (
-        CORBA::tk_sequence,
-        &IOP::_tc_TaggedComponent,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_IOP_TaggedComponentList_0 =
-      &IOP_TaggedComponentList_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_IOP_TaggedComponentList_GUARD */
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_IOP_TaggedComponentList (
-    CORBA::tk_alias,
-    "IDL:omg.org/IOP/TaggedComponentList:1.0",
-    "TaggedComponentList",
-    &TAO::TypeCode::tc_IOP_TaggedComponentList_0);
-  
-namespace IOP
-{
-  ::CORBA::TypeCode_ptr const _tc_TaggedComponentList =
-    &_tao_tc_IOP_TaggedComponentList;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:937
-
-
-#ifndef _TAO_TYPECODE_IOP_TaggedComponentSeq_GUARD
-#define _TAO_TYPECODE_IOP_TaggedComponentSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      IOP_TaggedComponentSeq_0 (
-        CORBA::tk_sequence,
-        &IOP::_tc_TaggedComponent,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_IOP_TaggedComponentSeq_0 =
-      &IOP_TaggedComponentSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_IOP_TaggedComponentSeq_GUARD */
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_IOP_TaggedComponentSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/IOP/TaggedComponentSeq:1.0",
-    "TaggedComponentSeq",
-    &TAO::TypeCode::tc_IOP_TaggedComponentSeq_0);
-  
-namespace IOP
-{
-  ::CORBA::TypeCode_ptr const _tc_TaggedComponentSeq =
-    &_tao_tc_IOP_TaggedComponentSeq;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_IOP_ServiceId (
-    CORBA::tk_alias,
-    "IDL:omg.org/IOP/ServiceId:1.0",
-    "ServiceId",
-    &CORBA::_tc_ulong);
-  
-namespace IOP
-{
-  ::CORBA::TypeCode_ptr const _tc_ServiceId =
-    &_tao_tc_IOP_ServiceId;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/struct_typecode.cpp:87
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:937
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_IOP_ServiceContext[] =
-  {
-    { "context_id", &IOP::_tc_ServiceId },
-    { "context_data", &CORBA::_tc_OctetSeq }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                      CORBA::TypeCode_ptr const *,
-                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
-                      TAO::Null_RefCount_Policy>
-  _tao_tc_IOP_ServiceContext (
-    CORBA::tk_struct,
-    "IDL:omg.org/IOP/ServiceContext:1.0",
-    "ServiceContext",
-    _tao_fields_IOP_ServiceContext,
-    2);
-  
-namespace IOP
-{
-  ::CORBA::TypeCode_ptr const _tc_ServiceContext =
-    &_tao_tc_IOP_ServiceContext;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:937
-
-
-#ifndef _TAO_TYPECODE_IOP_ServiceContextList_GUARD
-#define _TAO_TYPECODE_IOP_ServiceContextList_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      IOP_ServiceContextList_0 (
-        CORBA::tk_sequence,
-        &IOP::_tc_ServiceContext,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_IOP_ServiceContextList_0 =
-      &IOP_ServiceContextList_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_IOP_ServiceContextList_GUARD */
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_IOP_ServiceContextList (
-    CORBA::tk_alias,
-    "IDL:omg.org/IOP/ServiceContextList:1.0",
-    "ServiceContextList",
-    &TAO::TypeCode::tc_IOP_ServiceContextList_0);
-  
-namespace IOP
-{
-  ::CORBA::TypeCode_ptr const _tc_ServiceContextList =
-    &_tao_tc_IOP_ServiceContextList;
-}
-
-
-
-// TAO_IDL - Generated from 
-// be\be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const IOP::TaggedProfile &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<IOP::TaggedProfile>::insert_copy (
-      _tao_any,
-      IOP::TaggedProfile::_tao_any_destructor,
-      IOP::_tc_TaggedProfile,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    IOP::TaggedProfile *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<IOP::TaggedProfile>::insert (
-      _tao_any,
-      IOP::TaggedProfile::_tao_any_destructor,
-      IOP::_tc_TaggedProfile,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    IOP::TaggedProfile *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const IOP::TaggedProfile *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const IOP::TaggedProfile *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<IOP::TaggedProfile>::extract (
-        _tao_any,
-        IOP::TaggedProfile::_tao_any_destructor,
-        IOP::_tc_TaggedProfile,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const IOP::TaggedProfileSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<IOP::TaggedProfileSeq>::insert_copy (
-      _tao_any,
-      IOP::TaggedProfileSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_IOP_TaggedProfileSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    IOP::TaggedProfileSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<IOP::TaggedProfileSeq>::insert (
-      _tao_any,
-      IOP::TaggedProfileSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_IOP_TaggedProfileSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    IOP::TaggedProfileSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const IOP::TaggedProfileSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const IOP::TaggedProfileSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<IOP::TaggedProfileSeq>::extract (
-        _tao_any,
-        IOP::TaggedProfileSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_IOP_TaggedProfileSeq_0,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const IOP::IOR &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<IOP::IOR>::insert_copy (
-      _tao_any,
-      IOP::IOR::_tao_any_destructor,
-      IOP::_tc_IOR,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    IOP::IOR *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<IOP::IOR>::insert (
-      _tao_any,
-      IOP::IOR::_tao_any_destructor,
-      IOP::_tc_IOR,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    IOP::IOR *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const IOP::IOR *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const IOP::IOR *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<IOP::IOR>::extract (
-        _tao_any,
-        IOP::IOR::_tao_any_destructor,
-        IOP::_tc_IOR,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const IOP::TaggedComponent &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<IOP::TaggedComponent>::insert_copy (
-      _tao_any,
-      IOP::TaggedComponent::_tao_any_destructor,
-      IOP::_tc_TaggedComponent,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    IOP::TaggedComponent *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<IOP::TaggedComponent>::insert (
-      _tao_any,
-      IOP::TaggedComponent::_tao_any_destructor,
-      IOP::_tc_TaggedComponent,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    IOP::TaggedComponent *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const IOP::TaggedComponent *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const IOP::TaggedComponent *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<IOP::TaggedComponent>::extract (
-        _tao_any,
-        IOP::TaggedComponent::_tao_any_destructor,
-        IOP::_tc_TaggedComponent,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const IOP::MultipleComponentProfile &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<IOP::MultipleComponentProfile>::insert_copy (
-      _tao_any,
-      IOP::MultipleComponentProfile::_tao_any_destructor,
-      TAO::TypeCode::tc_IOP_MultipleComponentProfile_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    IOP::MultipleComponentProfile *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<IOP::MultipleComponentProfile>::insert (
-      _tao_any,
-      IOP::MultipleComponentProfile::_tao_any_destructor,
-      TAO::TypeCode::tc_IOP_MultipleComponentProfile_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    IOP::MultipleComponentProfile *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const IOP::MultipleComponentProfile *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const IOP::MultipleComponentProfile *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<IOP::MultipleComponentProfile>::extract (
-        _tao_any,
-        IOP::MultipleComponentProfile::_tao_any_destructor,
-        TAO::TypeCode::tc_IOP_MultipleComponentProfile_0,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const IOP::TaggedComponentList &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<IOP::TaggedComponentList>::insert_copy (
-      _tao_any,
-      IOP::TaggedComponentList::_tao_any_destructor,
-      TAO::TypeCode::tc_IOP_TaggedComponentList_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    IOP::TaggedComponentList *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<IOP::TaggedComponentList>::insert (
-      _tao_any,
-      IOP::TaggedComponentList::_tao_any_destructor,
-      TAO::TypeCode::tc_IOP_TaggedComponentList_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    IOP::TaggedComponentList *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const IOP::TaggedComponentList *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const IOP::TaggedComponentList *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<IOP::TaggedComponentList>::extract (
-        _tao_any,
-        IOP::TaggedComponentList::_tao_any_destructor,
-        TAO::TypeCode::tc_IOP_TaggedComponentList_0,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const IOP::TaggedComponentSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<IOP::TaggedComponentSeq>::insert_copy (
-      _tao_any,
-      IOP::TaggedComponentSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_IOP_TaggedComponentSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    IOP::TaggedComponentSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<IOP::TaggedComponentSeq>::insert (
-      _tao_any,
-      IOP::TaggedComponentSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_IOP_TaggedComponentSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    IOP::TaggedComponentSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const IOP::TaggedComponentSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const IOP::TaggedComponentSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<IOP::TaggedComponentSeq>::extract (
-        _tao_any,
-        IOP::TaggedComponentSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_IOP_TaggedComponentSeq_0,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const IOP::ServiceContext &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<IOP::ServiceContext>::insert_copy (
-      _tao_any,
-      IOP::ServiceContext::_tao_any_destructor,
-      IOP::_tc_ServiceContext,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    IOP::ServiceContext *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<IOP::ServiceContext>::insert (
-      _tao_any,
-      IOP::ServiceContext::_tao_any_destructor,
-      IOP::_tc_ServiceContext,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    IOP::ServiceContext *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const IOP::ServiceContext *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const IOP::ServiceContext *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<IOP::ServiceContext>::extract (
-        _tao_any,
-        IOP::ServiceContext::_tao_any_destructor,
-        IOP::_tc_ServiceContext,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const IOP::ServiceContextList &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<IOP::ServiceContextList>::insert_copy (
-      _tao_any,
-      IOP::ServiceContextList::_tao_any_destructor,
-      TAO::TypeCode::tc_IOP_ServiceContextList_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    IOP::ServiceContextList *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<IOP::ServiceContextList>::insert (
-      _tao_any,
-      IOP::ServiceContextList::_tao_any_destructor,
-      TAO::TypeCode::tc_IOP_ServiceContextList_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    IOP::ServiceContextList *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const IOP::ServiceContextList *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const IOP::ServiceContextList *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<IOP::ServiceContextList>::extract (
-        _tao_any,
-        IOP::ServiceContextList::_tao_any_destructor,
-        TAO::TypeCode::tc_IOP_ServiceContextList_0,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/IOP_IORC.cpp b/TAO/tao/IOP_IORC.cpp
index 816b166ac49..0dcb0c1062d 100644
--- a/TAO/tao/IOP_IORC.cpp
+++ b/TAO/tao/IOP_IORC.cpp
@@ -26,17 +26,13 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:291
+// be\be_codegen.cpp:288
 
 
 #include "IOP_IORC.h"
 #include "tao/CDR.h"
 #include "tao/ORB_Core.h"
 
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
@@ -72,7 +68,7 @@ IOP::TaggedProfileSeq::TaggedProfileSeq (
     CORBA::ULong max
   )
   : TAO_Unbounded_Sequence<
-        IOP::TaggedProfile
+        TaggedProfile
       >
     (max)
 {}
@@ -84,7 +80,7 @@ IOP::TaggedProfileSeq::TaggedProfileSeq (
     CORBA::Boolean release
   )
   : TAO_Unbounded_Sequence<
-        IOP::TaggedProfile
+        TaggedProfile
       >
     (max, length, buffer, release)
 {}
@@ -93,7 +89,7 @@ IOP::TaggedProfileSeq::TaggedProfileSeq (
     const TaggedProfileSeq &seq
   )
   : TAO_Unbounded_Sequence<
-        IOP::TaggedProfile
+        TaggedProfile
       >
     (seq)
 {}
@@ -151,7 +147,7 @@ IOP::MultipleComponentProfile::MultipleComponentProfile (
     CORBA::ULong max
   )
   : TAO_Unbounded_Sequence<
-        IOP::TaggedComponent
+        TaggedComponent
       >
     (max)
 {}
@@ -163,7 +159,7 @@ IOP::MultipleComponentProfile::MultipleComponentProfile (
     CORBA::Boolean release
   )
   : TAO_Unbounded_Sequence<
-        IOP::TaggedComponent
+        TaggedComponent
       >
     (max, length, buffer, release)
 {}
@@ -172,7 +168,7 @@ IOP::MultipleComponentProfile::MultipleComponentProfile (
     const MultipleComponentProfile &seq
   )
   : TAO_Unbounded_Sequence<
-        IOP::TaggedComponent
+        TaggedComponent
       >
     (seq)
 {}
@@ -204,7 +200,7 @@ IOP::TaggedComponentList::TaggedComponentList (
     CORBA::ULong max
   )
   : TAO_Unbounded_Sequence<
-        IOP::TaggedComponent
+        TaggedComponent
       >
     (max)
 {}
@@ -216,7 +212,7 @@ IOP::TaggedComponentList::TaggedComponentList (
     CORBA::Boolean release
   )
   : TAO_Unbounded_Sequence<
-        IOP::TaggedComponent
+        TaggedComponent
       >
     (max, length, buffer, release)
 {}
@@ -225,7 +221,7 @@ IOP::TaggedComponentList::TaggedComponentList (
     const TaggedComponentList &seq
   )
   : TAO_Unbounded_Sequence<
-        IOP::TaggedComponent
+        TaggedComponent
       >
     (seq)
 {}
@@ -257,7 +253,7 @@ IOP::TaggedComponentSeq::TaggedComponentSeq (
     CORBA::ULong max
   )
   : TAO_Unbounded_Sequence<
-        IOP::TaggedComponent
+        TaggedComponent
       >
     (max)
 {}
@@ -269,7 +265,7 @@ IOP::TaggedComponentSeq::TaggedComponentSeq (
     CORBA::Boolean release
   )
   : TAO_Unbounded_Sequence<
-        IOP::TaggedComponent
+        TaggedComponent
       >
     (max, length, buffer, release)
 {}
@@ -278,7 +274,7 @@ IOP::TaggedComponentSeq::TaggedComponentSeq (
     const TaggedComponentSeq &seq
   )
   : TAO_Unbounded_Sequence<
-        IOP::TaggedComponent
+        TaggedComponent
       >
     (seq)
 {}
@@ -323,7 +319,7 @@ IOP::ServiceContextList::ServiceContextList (
     CORBA::ULong max
   )
   : TAO_Unbounded_Sequence<
-        IOP::ServiceContext
+        ServiceContext
       >
     (max)
 {}
@@ -335,7 +331,7 @@ IOP::ServiceContextList::ServiceContextList (
     CORBA::Boolean release
   )
   : TAO_Unbounded_Sequence<
-        IOP::ServiceContext
+        ServiceContext
       >
     (max, length, buffer, release)
 {}
@@ -344,7 +340,7 @@ IOP::ServiceContextList::ServiceContextList (
     const ServiceContextList &seq
   )
   : TAO_Unbounded_Sequence<
-        IOP::ServiceContext
+        ServiceContext
       >
     (seq)
 {}
diff --git a/TAO/tao/IOP_IORC.h b/TAO/tao/IOP_IORC.h
index 496f143ca0a..4bf5d87e8d1 100644
--- a/TAO/tao/IOP_IORC.h
+++ b/TAO/tao/IOP_IORC.h
@@ -26,10 +26,10 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:153
+// be\be_codegen.cpp:154
 
-#ifndef _TAO_IDL_ORIG_IOP_IORC_H_
-#define _TAO_IDL_ORIG_IOP_IORC_H_
+#ifndef _TAO_IDL_IOP_IORC_H_
+#define _TAO_IDL_IOP_IORC_H_
 
 #include /**/ "ace/pre.h"
 
@@ -60,12 +60,8 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:49
 
 namespace IOP
 {
@@ -77,11 +73,6 @@ namespace IOP
   typedef CORBA::ULong_out ProfileId_out;
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ProfileId;
-  
-  // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
   
   const IOP::ProfileId TAG_INTERNET_IOP = 0U;
@@ -110,7 +101,7 @@ namespace IOP
     TaggedProfile_out;
   
   // TAO_IDL - Generated from
-  // be\be_visitor_structure/structure_ch.cpp:52
+  // be\be_visitor_structure/structure_ch.cpp:57
   
   struct TAO_Export TaggedProfile
   {
@@ -122,11 +113,6 @@ namespace IOP
   };
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_TaggedProfile;
-  
-  // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_IOP_TAGGEDPROFILESEQ_CH_)
@@ -175,11 +161,6 @@ namespace IOP
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_TaggedProfileSeq;
-  
-  // TAO_IDL - Generated from
   // be\be_type.cpp:258
   
   struct IOR;
@@ -198,7 +179,7 @@ namespace IOP
     IOR_out;
   
   // TAO_IDL - Generated from
-  // be\be_visitor_structure/structure_ch.cpp:52
+  // be\be_visitor_structure/structure_ch.cpp:57
   
   struct TAO_Export IOR
   {
@@ -210,22 +191,12 @@ namespace IOP
   };
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_IOR;
-  
-  // TAO_IDL - Generated from
   // be\be_visitor_typedef/typedef_ch.cpp:379
   
   typedef CORBA::ULong ComponentId;
   typedef CORBA::ULong_out ComponentId_out;
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ComponentId;
-  
-  // TAO_IDL - Generated from
   // be\be_type.cpp:258
   
   struct TaggedComponent;
@@ -244,7 +215,7 @@ namespace IOP
     TaggedComponent_out;
   
   // TAO_IDL - Generated from
-  // be\be_visitor_structure/structure_ch.cpp:52
+  // be\be_visitor_structure/structure_ch.cpp:57
   
   struct TAO_Export TaggedComponent
   {
@@ -256,11 +227,6 @@ namespace IOP
   };
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_TaggedComponent;
-  
-  // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_IOP_MULTIPLECOMPONENTPROFILE_CH_)
@@ -309,11 +275,6 @@ namespace IOP
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_MultipleComponentProfile;
-  
-  // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_IOP_TAGGEDCOMPONENTLIST_CH_)
@@ -362,11 +323,6 @@ namespace IOP
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_TaggedComponentList;
-  
-  // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_IOP_TAGGEDCOMPONENTSEQ_CH_)
@@ -415,11 +371,6 @@ namespace IOP
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_TaggedComponentSeq;
-  
-  // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
   
   const IOP::ComponentId TAG_ORB_TYPE = 0U;
@@ -476,11 +427,6 @@ namespace IOP
   typedef CORBA::ULong_out ServiceId_out;
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ServiceId;
-  
-  // TAO_IDL - Generated from
   // be\be_type.cpp:258
   
   struct ServiceContext;
@@ -499,7 +445,7 @@ namespace IOP
     ServiceContext_out;
   
   // TAO_IDL - Generated from
-  // be\be_visitor_structure/structure_ch.cpp:52
+  // be\be_visitor_structure/structure_ch.cpp:57
   
   struct TAO_Export ServiceContext
   {
@@ -511,11 +457,6 @@ namespace IOP
   };
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ServiceContext;
-  
-  // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_IOP_SERVICECONTEXTLIST_CH_)
@@ -564,11 +505,6 @@ namespace IOP
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ServiceContextList;
-  
-  // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
   
   const IOP::ServiceId TransactionService = 0U;
@@ -664,7 +600,7 @@ namespace IOP
   const IOP::ComponentId TAG_GROUP_IIOP = 40U;
 
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:78
 
 } // module IOP
 
@@ -677,78 +613,6 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_structure/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const IOP::TaggedProfile &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, IOP::TaggedProfile*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IOP::TaggedProfile *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IOP::TaggedProfile *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const IOP::TaggedProfileSeq &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, IOP::TaggedProfileSeq*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IOP::TaggedProfileSeq *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IOP::TaggedProfileSeq *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const IOP::IOR &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, IOP::IOR*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IOP::IOR *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IOP::IOR *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const IOP::TaggedComponent &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, IOP::TaggedComponent*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IOP::TaggedComponent *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IOP::TaggedComponent *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const IOP::MultipleComponentProfile &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, IOP::MultipleComponentProfile*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IOP::MultipleComponentProfile *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IOP::MultipleComponentProfile *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const IOP::TaggedComponentList &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, IOP::TaggedComponentList*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IOP::TaggedComponentList *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IOP::TaggedComponentList *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const IOP::TaggedComponentSeq &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, IOP::TaggedComponentSeq*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IOP::TaggedComponentSeq *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IOP::TaggedComponentSeq *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const IOP::ServiceContext &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, IOP::ServiceContext*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IOP::ServiceContext *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IOP::ServiceContext *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const IOP::ServiceContextList &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, IOP::ServiceContextList*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, IOP::ServiceContextList *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const IOP::ServiceContextList *&);
-
-// TAO_IDL - Generated from
 // be\be_visitor_structure/cdr_op_ch.cpp:54
 
 TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const IOP::TaggedProfile &);
@@ -858,16 +722,12 @@ TAO_Export CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_IOP_ServiceContextList_H_ */
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:955
+// be\be_codegen.cpp:1062
 
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
diff --git a/TAO/tao/IORInterceptor.mpc b/TAO/tao/IORInterceptor.mpc
index 0500c435f1e..45e5936e409 100644
--- a/TAO/tao/IORInterceptor.mpc
+++ b/TAO/tao/IORInterceptor.mpc
@@ -27,6 +27,9 @@ project : taolib, portableserver, objreftemplate, pi, core {
     IORInterceptor
   }
 
+  IDL_Files {
+  }
+
   Pkgconfig_Files {
     IORInterceptor/TAO_IORInterceptor.pc.in
   }
diff --git a/TAO/tao/IORInterceptor/IORInfoC.cpp b/TAO/tao/IORInterceptor/IORInfoC.cpp
index 584dcd8d6f1..e20c34af88b 100644
--- a/TAO/tao/IORInterceptor/IORInfoC.cpp
+++ b/TAO/tao/IORInterceptor/IORInfoC.cpp
@@ -47,7 +47,7 @@ namespace TAO
 
 #if !defined (_PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY__ARG_TRAITS_CS_)
 #define _PORTABLEINTERCEPTOR_OBJECTREFERENCEFACTORY__ARG_TRAITS_CS_
-  
+
   template<>
   class Arg_Traits<PortableInterceptor::ObjectReferenceFactory>
     : public
@@ -55,7 +55,8 @@ namespace TAO
             PortableInterceptor::ObjectReferenceFactory *,
             PortableInterceptor::ObjectReferenceFactory_var,
             PortableInterceptor::ObjectReferenceFactory_out,
-            TAO::Value_Traits<PortableInterceptor::ObjectReferenceFactory>
+            TAO::Value_Traits<PortableInterceptor::ObjectReferenceFactory>,
+            TAO::Any_Insert_Policy_Stream <PortableInterceptor::ObjectReferenceFactory *>
           >
   {
   };
@@ -135,7 +136,7 @@ PortableInterceptor::IORInfo::_duplicate (IORInfo_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
diff --git a/TAO/tao/IORManipulation.mpc b/TAO/tao/IORManipulation.mpc
index af964e2a3aa..bb732c53194 100644
--- a/TAO/tao/IORManipulation.mpc
+++ b/TAO/tao/IORManipulation.mpc
@@ -1,5 +1,5 @@
 //$Id$
-project : taolib, core {
+project : taolib, core, anytypecode {
   sharedname   = TAO_IORManip
   dynamicflags = TAO_IORMANIP_BUILD_DLL
 
@@ -27,6 +27,9 @@ project : taolib, core {
     IORManipulation
   }
 
+  IDL_Files {
+  }
+
   Pkgconfig_Files {
     IORManipulation/TAO_IORManip.pc.in
   }
diff --git a/TAO/tao/IORManipulation/IORA.cpp b/TAO/tao/IORManipulation/IORA.cpp
index c433be40bdb..164f0dc60b9 100644
--- a/TAO/tao/IORManipulation/IORA.cpp
+++ b/TAO/tao/IORManipulation/IORA.cpp
@@ -26,17 +26,17 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "IORManip_Loader.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
-#include "tao/Sequence_TypeCode_Static.h"
-#include "tao/Struct_TypeCode_Static.h"
-#include "tao/TypeCode_Struct_Field.h"
+#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Sequence_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Struct_TypeCode_Static.h"
+#include "tao/AnyTypeCode/TypeCode_Struct_Field.h"
 #include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
-#include "tao/Any_Dual_Impl_T.h"
+#include "tao/AnyTypeCode/Any.h"
+#include "tao/AnyTypeCode/Any_Impl_T.h"
+#include "tao/AnyTypeCode/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
 // be/be_visitor_typecode/struct_typecode.cpp:74
@@ -53,7 +53,7 @@ static TAO::TypeCode::Struct<char const *,
     "EmptyProfileList",
     _tao_fields_TAO_IOP_EmptyProfileList,
     0);
-  
+
 namespace TAO_IOP
 {
   ::CORBA::TypeCode_ptr const _tc_EmptyProfileList =
@@ -77,7 +77,7 @@ static TAO::TypeCode::Struct<char const *,
     "NotFound",
     _tao_fields_TAO_IOP_NotFound,
     0);
-  
+
 namespace TAO_IOP
 {
   ::CORBA::TypeCode_ptr const _tc_NotFound =
@@ -101,7 +101,7 @@ static TAO::TypeCode::Struct<char const *,
     "Duplicate",
     _tao_fields_TAO_IOP_Duplicate,
     0);
-  
+
 namespace TAO_IOP
 {
   ::CORBA::TypeCode_ptr const _tc_Duplicate =
@@ -125,7 +125,7 @@ static TAO::TypeCode::Struct<char const *,
     "Invalid_IOR",
     _tao_fields_TAO_IOP_Invalid_IOR,
     0);
-  
+
 namespace TAO_IOP
 {
   ::CORBA::TypeCode_ptr const _tc_Invalid_IOR =
@@ -149,7 +149,7 @@ static TAO::TypeCode::Struct<char const *,
     "MultiProfileList",
     _tao_fields_TAO_IOP_MultiProfileList,
     0);
-  
+
 namespace TAO_IOP
 {
   ::CORBA::TypeCode_ptr const _tc_MultiProfileList =
@@ -167,7 +167,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:TAO_IOP/TAO_IOR_Property:1.0",
     "TAO_IOR_Property");
-  
+
 namespace TAO_IOP
 {
   ::CORBA::TypeCode_ptr const _tc_TAO_IOR_Property =
@@ -197,10 +197,10 @@ namespace TAO
         CORBA::tk_sequence,
         &CORBA::_tc_Object,
         0U);
-      
+
     ::CORBA::TypeCode_ptr const tc_TAO_IOP_TAO_IOR_Manipulation_IORList_0 =
       &TAO_IOP_TAO_IOR_Manipulation_IORList_0;
-    
+
   }
 }
 
@@ -214,7 +214,7 @@ static TAO::TypeCode::Alias<char const *,
     "IDL:TAO_IOP/TAO_IOR_Manipulation/IORList:1.0",
     "IORList",
     &TAO::TypeCode::tc_TAO_IOP_TAO_IOR_Manipulation_IORList_0);
-  
+
 ::CORBA::TypeCode_ptr const TAO_IOP::TAO_IOR_Manipulation::_tc_IORList =
   &_tao_tc_TAO_IOP_TAO_IOR_Manipulation_IORList;
 
@@ -227,7 +227,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:TAO_IOP/TAO_IOR_Manipulation:1.0",
     "TAO_IOR_Manipulation");
-  
+
 namespace TAO_IOP
 {
   ::CORBA::TypeCode_ptr const _tc_TAO_IOR_Manipulation =
@@ -236,7 +236,7 @@ namespace TAO_IOP
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be/be_visitor_exception/any_op_cs.cpp:50
 
 namespace TAO
@@ -248,12 +248,12 @@ namespace TAO
     )
   {
     CORBA::String_var id;
-    
+
     if (!(cdr >> id.out ()))
       {
         return false;
       }
-    
+
     ACE_TRY_NEW_ENV
       {
         this->value_->_tao_decode (cdr ACE_ENV_ARG_PARAMETER);
@@ -264,7 +264,7 @@ namespace TAO
         return false;
       }
     ACE_ENDTRY;
-    
+
     return true;
   }
 }
@@ -324,7 +324,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be/be_visitor_exception/any_op_cs.cpp:50
 
 namespace TAO
@@ -336,12 +336,12 @@ namespace TAO
     )
   {
     CORBA::String_var id;
-    
+
     if (!(cdr >> id.out ()))
       {
         return false;
       }
-    
+
     ACE_TRY_NEW_ENV
       {
         this->value_->_tao_decode (cdr ACE_ENV_ARG_PARAMETER);
@@ -352,7 +352,7 @@ namespace TAO
         return false;
       }
     ACE_ENDTRY;
-    
+
     return true;
   }
 }
@@ -412,7 +412,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be/be_visitor_exception/any_op_cs.cpp:50
 
 namespace TAO
@@ -424,12 +424,12 @@ namespace TAO
     )
   {
     CORBA::String_var id;
-    
+
     if (!(cdr >> id.out ()))
       {
         return false;
       }
-    
+
     ACE_TRY_NEW_ENV
       {
         this->value_->_tao_decode (cdr ACE_ENV_ARG_PARAMETER);
@@ -440,7 +440,7 @@ namespace TAO
         return false;
       }
     ACE_ENDTRY;
-    
+
     return true;
   }
 }
@@ -500,7 +500,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be/be_visitor_exception/any_op_cs.cpp:50
 
 namespace TAO
@@ -512,12 +512,12 @@ namespace TAO
     )
   {
     CORBA::String_var id;
-    
+
     if (!(cdr >> id.out ()))
       {
         return false;
       }
-    
+
     ACE_TRY_NEW_ENV
       {
         this->value_->_tao_decode (cdr ACE_ENV_ARG_PARAMETER);
@@ -528,7 +528,7 @@ namespace TAO
         return false;
       }
     ACE_ENDTRY;
-    
+
     return true;
   }
 }
@@ -588,7 +588,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be/be_visitor_exception/any_op_cs.cpp:50
 
 namespace TAO
@@ -600,12 +600,12 @@ namespace TAO
     )
   {
     CORBA::String_var id;
-    
+
     if (!(cdr >> id.out ()))
       {
         return false;
       }
-    
+
     ACE_TRY_NEW_ENV
       {
         this->value_->_tao_decode (cdr ACE_ENV_ARG_PARAMETER);
@@ -616,7 +616,7 @@ namespace TAO
         return false;
       }
     ACE_ENDTRY;
-    
+
     return true;
   }
 }
@@ -700,7 +700,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Impl_T<TAO_IOP::TAO_IOR_Property>::demarshal_value (TAO_InputCDR &)
@@ -775,7 +775,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Impl_T<TAO_IOP::TAO_IOR_Manipulation>::demarshal_value (TAO_InputCDR &)
@@ -826,7 +826,7 @@ operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be/be_visitor_sequence/any_op_cs.cpp:54
 
 namespace TAO
@@ -837,7 +837,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Dual_Impl_T<TAO_IOP::TAO_IOR_Manipulation::IORList>::demarshal_value (TAO_InputCDR &)
diff --git a/TAO/tao/IORTable.mpc b/TAO/tao/IORTable.mpc
index 92010d7a90f..1c706d457fb 100644
--- a/TAO/tao/IORTable.mpc
+++ b/TAO/tao/IORTable.mpc
@@ -4,7 +4,7 @@ project : taolib, core {
   dynamicflags = TAO_IORTABLE_BUILD_DLL
 
   Source_Files {
-    IORTable 
+    IORTable
   }
 
   Header_Files {
diff --git a/TAO/tao/ImR_Client.mpc b/TAO/tao/ImR_Client.mpc
index b7906ed913d..e47749ec0ae 100644
--- a/TAO/tao/ImR_Client.mpc
+++ b/TAO/tao/ImR_Client.mpc
@@ -27,6 +27,9 @@ project : taolib, core, portableserver {
     ImR_Client
   }
 
+  IDL_Files {
+  }
+
   Pkgconfig_Files {
     ImR_Client/TAO_ImR_Client.pc.in
   }
diff --git a/TAO/tao/ImR_Client/ImplRepo.pidl b/TAO/tao/ImR_Client/ImplRepo.pidl
index ca566711e42..8bc8366f28e 100644
--- a/TAO/tao/ImR_Client/ImplRepo.pidl
+++ b/TAO/tao/ImR_Client/ImplRepo.pidl
@@ -15,7 +15,7 @@
  */
 //=============================================================================
 
-#include "ServerObject.pidl"
+#include "tao/ImR_Client/ServerObject.pidl"
 
 module ImplementationRepository
 {
diff --git a/TAO/tao/ImR_Client/ImplRepoA.cpp b/TAO/tao/ImR_Client/ImplRepoA.cpp
index 2d3a83d6e60..6fd14f542ee 100644
--- a/TAO/tao/ImR_Client/ImplRepoA.cpp
+++ b/TAO/tao/ImR_Client/ImplRepoA.cpp
@@ -26,21 +26,21 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "ImplRepoC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Enum_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
-#include "tao/Sequence_TypeCode_Static.h"
-#include "tao/String_TypeCode_Static.h"
-#include "tao/Struct_TypeCode_Static.h"
-#include "tao/TypeCode_Struct_Field.h"
-#include "tao/Recursive_Type_TypeCode.h"
+#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Enum_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Sequence_TypeCode_Static.h"
+#include "tao/AnyTypeCode/String_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Struct_TypeCode_Static.h"
+#include "tao/AnyTypeCode/TypeCode_Struct_Field.h"
+#include "tao/AnyTypeCode/Recursive_Type_TypeCode.h"
 #include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
-#include "tao/Any_Dual_Impl_T.h"
-#include "tao/Any_Basic_Impl_T.h"
+#include "tao/AnyTypeCode/Any.h"
+#include "tao/AnyTypeCode/Any_Impl_T.h"
+#include "tao/AnyTypeCode/Any_Dual_Impl_T.h"
+#include "tao/AnyTypeCode/Any_Basic_Impl_T.h"
 
 // TAO_IDL - Generated from
 // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_typecode/struct_typecode.cpp:87
@@ -56,7 +56,7 @@ static TAO::TypeCode::Struct<char const *,
     "AlreadyRegistered",
     _tao_fields_ImplementationRepository_AlreadyRegistered,
     0);
- 
+
 namespace ImplementationRepository
 {
   ::CORBA::TypeCode_ptr const _tc_AlreadyRegistered =
@@ -71,7 +71,7 @@ namespace ImplementationRepository
 static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_ImplementationRepository_CannotActivate[] =
   {
     { "reason", &CORBA::_tc_string }
- 
+
   };
 static TAO::TypeCode::Struct<char const *,
                       CORBA::TypeCode_ptr const *,
@@ -83,7 +83,7 @@ static TAO::TypeCode::Struct<char const *,
     "CannotActivate",
     _tao_fields_ImplementationRepository_CannotActivate,
     1);
- 
+
 namespace ImplementationRepository
 {
   ::CORBA::TypeCode_ptr const _tc_CannotActivate =
@@ -106,7 +106,7 @@ static TAO::TypeCode::Struct<char const *,
     "NotFound",
     _tao_fields_ImplementationRepository_NotFound,
     0);
- 
+
 namespace ImplementationRepository
 {
   ::CORBA::TypeCode_ptr const _tc_NotFound =
@@ -122,7 +122,7 @@ static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> co
   {
     { "name", &CORBA::_tc_string },
     { "value", &CORBA::_tc_string }
- 
+
   };
 static TAO::TypeCode::Struct<char const *,
                       CORBA::TypeCode_ptr const *,
@@ -134,7 +134,7 @@ static TAO::TypeCode::Struct<char const *,
     "EnvironmentVariable",
     _tao_fields_ImplementationRepository_EnvironmentVariable,
     2);
- 
+
 namespace ImplementationRepository
 {
   ::CORBA::TypeCode_ptr const _tc_EnvironmentVariable =
@@ -164,10 +164,10 @@ namespace TAO
         CORBA::tk_sequence,
         &ImplementationRepository::_tc_EnvironmentVariable,
         0U);
- 
+
     ::CORBA::TypeCode_ptr const tc_ImplementationRepository_EnvironmentList_0 =
       &ImplementationRepository_EnvironmentList_0;
- 
+
   }
 }
 
@@ -182,7 +182,7 @@ static TAO::TypeCode::Alias<char const *,
     "IDL:ImplementationRepository/EnvironmentList:1.0",
     "EnvironmentList",
     &TAO::TypeCode::tc_ImplementationRepository_EnvironmentList_0);
- 
+
 namespace ImplementationRepository
 {
   ::CORBA::TypeCode_ptr const _tc_EnvironmentList =
@@ -200,7 +200,7 @@ static char const * const _tao_enumerators_ImplementationRepository_ActivationMo
     "MANUAL",
     "PER_CLIENT",
     "AUTO_START"
- 
+
   };
 
 static TAO::TypeCode::Enum<char const *,
@@ -211,7 +211,7 @@ static TAO::TypeCode::Enum<char const *,
     "ActivationMode",
     _tao_enumerators_ImplementationRepository_ActivationMode,
     4);
- 
+
 namespace ImplementationRepository
 {
   ::CORBA::TypeCode_ptr const _tc_ActivationMode =
@@ -236,7 +236,7 @@ static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> co
     { "activation", &ImplementationRepository::_tc_ActivationMode },
     { "activator", &CORBA::_tc_string },
     { "start_limit", &CORBA::_tc_long }
- 
+
   };
 static TAO::TypeCode::Struct<char const *,
                       CORBA::TypeCode_ptr const *,
@@ -248,7 +248,7 @@ static TAO::TypeCode::Struct<char const *,
     "StartupOptions",
     _tao_fields_ImplementationRepository_StartupOptions,
     6);
- 
+
 namespace ImplementationRepository
 {
   ::CORBA::TypeCode_ptr const _tc_StartupOptions =
@@ -265,7 +265,7 @@ static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> co
     { "server", &CORBA::_tc_string },
     { "startup", &ImplementationRepository::_tc_StartupOptions },
     { "partial_ior", &CORBA::_tc_string }
- 
+
   };
 static TAO::TypeCode::Struct<char const *,
                       CORBA::TypeCode_ptr const *,
@@ -277,7 +277,7 @@ static TAO::TypeCode::Struct<char const *,
     "ServerInformation",
     _tao_fields_ImplementationRepository_ServerInformation,
     3);
- 
+
 namespace ImplementationRepository
 {
   ::CORBA::TypeCode_ptr const _tc_ServerInformation =
@@ -307,10 +307,10 @@ namespace TAO
         CORBA::tk_sequence,
         &ImplementationRepository::_tc_ServerInformation,
         0U);
- 
+
     ::CORBA::TypeCode_ptr const tc_ImplementationRepository_ServerInformationList_0 =
       &ImplementationRepository_ServerInformationList_0;
- 
+
   }
 }
 
@@ -325,7 +325,7 @@ static TAO::TypeCode::Alias<char const *,
     "IDL:ImplementationRepository/ServerInformationList:1.0",
     "ServerInformationList",
     &TAO::TypeCode::tc_ImplementationRepository_ServerInformationList_0);
- 
+
 namespace ImplementationRepository
 {
   ::CORBA::TypeCode_ptr const _tc_ServerInformationList =
@@ -343,7 +343,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_objref,
     "IDL:ImplementationRepository/ServerInformationIterator:1.0",
     "ServerInformationIterator");
- 
+
 namespace ImplementationRepository
 {
   ::CORBA::TypeCode_ptr const _tc_ServerInformationIterator =
@@ -361,7 +361,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_objref,
     "IDL:ImplementationRepository/Administration:1.0",
     "Administration");
- 
+
 namespace ImplementationRepository
 {
   ::CORBA::TypeCode_ptr const _tc_Administration =
@@ -382,12 +382,12 @@ namespace TAO
     )
   {
     CORBA::String_var id;
- 
+
     if (!(cdr >> id.out ()))
       {
         return false;
       }
- 
+
     ACE_TRY_NEW_ENV
       {
         this->value_->_tao_decode (cdr ACE_ENV_ARG_PARAMETER);
@@ -398,7 +398,7 @@ namespace TAO
         return false;
       }
     ACE_ENDTRY;
- 
+
     return true;
   }
 }
@@ -470,12 +470,12 @@ namespace TAO
     )
   {
     CORBA::String_var id;
- 
+
     if (!(cdr >> id.out ()))
       {
         return false;
       }
- 
+
     ACE_TRY_NEW_ENV
       {
         this->value_->_tao_decode (cdr ACE_ENV_ARG_PARAMETER);
@@ -486,7 +486,7 @@ namespace TAO
         return false;
       }
     ACE_ENDTRY;
- 
+
     return true;
   }
 }
@@ -558,12 +558,12 @@ namespace TAO
     )
   {
     CORBA::String_var id;
- 
+
     if (!(cdr >> id.out ()))
       {
         return false;
       }
- 
+
     ACE_TRY_NEW_ENV
       {
         this->value_->_tao_decode (cdr ACE_ENV_ARG_PARAMETER);
@@ -574,7 +574,7 @@ namespace TAO
         return false;
       }
     ACE_ENDTRY;
- 
+
     return true;
   }
 }
diff --git a/TAO/tao/ImR_Client/ImplRepoA.h b/TAO/tao/ImR_Client/ImplRepoA.h
new file mode 100644
index 00000000000..aaeab08b626
--- /dev/null
+++ b/TAO/tao/ImR_Client/ImplRepoA.h
@@ -0,0 +1,188 @@
+// -*- C++ -*-
+//
+// $Id$
+
+// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       Irvine, CA
+//       USA
+//       http://doc.ece.uci.edu/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
+//
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
+
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:805
+
+#ifndef _TAO_IDL_ORIG_IMPLREPOA_H_
+#define _TAO_IDL_ORIG_IMPLREPOA_H_
+
+#include /**/ "ace/pre.h"
+
+#include "imr_client_export.h"
+#include "tao/ImR_Client/ImplRepoC.h"
+
+#if defined (__BORLANDC__)
+#pragma option push -w-rvl -w-rch -w-ccc -w-inl
+#endif /* __BORLANDC__ */
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_decl.cpp:49
+
+extern TAO_IMR_Client_Export ::CORBA::TypeCode_ptr const _tc_AlreadyRegistered;
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_decl.cpp:49
+
+extern TAO_IMR_Client_Export ::CORBA::TypeCode_ptr const _tc_CannotActivate;
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_decl.cpp:49
+
+extern TAO_IMR_Client_Export ::CORBA::TypeCode_ptr const _tc_NotFound;
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_decl.cpp:49
+
+extern TAO_IMR_Client_Export ::CORBA::TypeCode_ptr const _tc_EnvironmentVariable;
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_decl.cpp:49
+
+extern TAO_IMR_Client_Export ::CORBA::TypeCode_ptr const _tc_EnvironmentList;
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_decl.cpp:49
+
+extern TAO_IMR_Client_Export ::CORBA::TypeCode_ptr const _tc_ActivationMode;
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_decl.cpp:49
+
+extern TAO_IMR_Client_Export ::CORBA::TypeCode_ptr const _tc_StartupOptions;
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_decl.cpp:49
+
+extern TAO_IMR_Client_Export ::CORBA::TypeCode_ptr const _tc_ServerInformation;
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_decl.cpp:49
+
+extern TAO_IMR_Client_Export ::CORBA::TypeCode_ptr const _tc_ServerInformationList;
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_decl.cpp:49
+
+extern TAO_IMR_Client_Export ::CORBA::TypeCode_ptr const _tc_ServerInformationIterator;
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_decl.cpp:49
+
+extern TAO_IMR_Client_Export ::CORBA::TypeCode_ptr const _tc_Administration;
+
+// TAO_IDL - Generated from
+// be\be_visitor_exception/any_op_ch.cpp:53
+
+TAO_IMR_Client_Export void operator<<= (CORBA::Any &, const ImplementationRepository::AlreadyRegistered &); // copying version
+TAO_IMR_Client_Export void operator<<= (CORBA::Any &, ImplementationRepository::AlreadyRegistered*); // noncopying version
+TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::AlreadyRegistered *&); // deprecated
+TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::AlreadyRegistered *&);
+
+// TAO_IDL - Generated from
+// be\be_visitor_exception/any_op_ch.cpp:53
+
+TAO_IMR_Client_Export void operator<<= (CORBA::Any &, const ImplementationRepository::CannotActivate &); // copying version
+TAO_IMR_Client_Export void operator<<= (CORBA::Any &, ImplementationRepository::CannotActivate*); // noncopying version
+TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::CannotActivate *&); // deprecated
+TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::CannotActivate *&);
+
+// TAO_IDL - Generated from
+// be\be_visitor_exception/any_op_ch.cpp:53
+
+TAO_IMR_Client_Export void operator<<= (CORBA::Any &, const ImplementationRepository::NotFound &); // copying version
+TAO_IMR_Client_Export void operator<<= (CORBA::Any &, ImplementationRepository::NotFound*); // noncopying version
+TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::NotFound *&); // deprecated
+TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::NotFound *&);
+
+// TAO_IDL - Generated from
+// be\be_visitor_structure/any_op_ch.cpp:53
+
+TAO_IMR_Client_Export void operator<<= (CORBA::Any &, const ImplementationRepository::EnvironmentVariable &); // copying version
+TAO_IMR_Client_Export void operator<<= (CORBA::Any &, ImplementationRepository::EnvironmentVariable*); // noncopying version
+TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::EnvironmentVariable *&); // deprecated
+TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::EnvironmentVariable *&);
+
+// TAO_IDL - Generated from
+// be\be_visitor_sequence/any_op_ch.cpp:53
+
+TAO_IMR_Client_Export void operator<<= (CORBA::Any &, const ImplementationRepository::EnvironmentList &); // copying version
+TAO_IMR_Client_Export void operator<<= (CORBA::Any &, ImplementationRepository::EnvironmentList*); // noncopying version
+TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::EnvironmentList *&); // deprecated
+TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::EnvironmentList *&);
+
+// TAO_IDL - Generated from
+// be\be_visitor_enum/any_op_ch.cpp:52
+
+TAO_IMR_Client_Export void operator<<= (CORBA::Any &, ImplementationRepository::ActivationMode);
+TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::ActivationMode &);
+
+// TAO_IDL - Generated from
+// be\be_visitor_structure/any_op_ch.cpp:53
+
+TAO_IMR_Client_Export void operator<<= (CORBA::Any &, const ImplementationRepository::StartupOptions &); // copying version
+TAO_IMR_Client_Export void operator<<= (CORBA::Any &, ImplementationRepository::StartupOptions*); // noncopying version
+TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::StartupOptions *&); // deprecated
+TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::StartupOptions *&);
+
+// TAO_IDL - Generated from
+// be\be_visitor_structure/any_op_ch.cpp:53
+
+TAO_IMR_Client_Export void operator<<= (CORBA::Any &, const ImplementationRepository::ServerInformation &); // copying version
+TAO_IMR_Client_Export void operator<<= (CORBA::Any &, ImplementationRepository::ServerInformation*); // noncopying version
+TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::ServerInformation *&); // deprecated
+TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::ServerInformation *&);
+
+// TAO_IDL - Generated from
+// be\be_visitor_sequence/any_op_ch.cpp:53
+
+TAO_IMR_Client_Export void operator<<= (CORBA::Any &, const ImplementationRepository::ServerInformationList &); // copying version
+TAO_IMR_Client_Export void operator<<= (CORBA::Any &, ImplementationRepository::ServerInformationList*); // noncopying version
+TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::ServerInformationList *&); // deprecated
+TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, const ImplementationRepository::ServerInformationList *&);
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_ch.cpp:53
+
+TAO_IMR_Client_Export void operator<<= (CORBA::Any &, ImplementationRepository::ServerInformationIterator_ptr); // copying
+TAO_IMR_Client_Export void operator<<= (CORBA::Any &, ImplementationRepository::ServerInformationIterator_ptr *); // non-copying
+TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::ServerInformationIterator_ptr &);
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_ch.cpp:53
+
+TAO_IMR_Client_Export void operator<<= (CORBA::Any &, ImplementationRepository::Administration_ptr); // copying
+TAO_IMR_Client_Export void operator<<= (CORBA::Any &, ImplementationRepository::Administration_ptr *); // non-copying
+TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::Administration_ptr &);
+
+#if defined (__BORLANDC__)
+#pragma option pop
+#endif /* __BORLANDC__ */
+
+#include /**/ "ace/post.h"
+
+#endif /* ifndef */
diff --git a/TAO/tao/ImR_Client/ImplRepoC.cpp b/TAO/tao/ImR_Client/ImplRepoC.cpp
index 62e31a92d1c..68ea6e3b79b 100644
--- a/TAO/tao/ImR_Client/ImplRepoC.cpp
+++ b/TAO/tao/ImR_Client/ImplRepoC.cpp
@@ -58,7 +58,7 @@ namespace TAO
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVEROBJECT__ARG_TRAITS_CS_)
 #define _IMPLEMENTATIONREPOSITORY_SERVEROBJECT__ARG_TRAITS_CS_
- 
+
   template<>
   class  Arg_Traits<ImplementationRepository::ServerObject>
     : public
@@ -66,64 +66,68 @@ namespace TAO
             ImplementationRepository::ServerObject_ptr,
             ImplementationRepository::ServerObject_var,
             ImplementationRepository::ServerObject_out,
-            TAO::Objref_Traits<ImplementationRepository::ServerObject>
+            TAO::Objref_Traits<ImplementationRepository::ServerObject>,
+            TAO::Any_Insert_Policy_Stream <ImplementationRepository::ServerObject_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
- 
+
   // TAO_IDL - Generated from
   // .\be\be_visitor_arg_traits.cpp:772
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_STARTUPOPTIONS__ARG_TRAITS_CS_)
 #define _IMPLEMENTATIONREPOSITORY_STARTUPOPTIONS__ARG_TRAITS_CS_
- 
+
   template<>
   class Arg_Traits<ImplementationRepository::StartupOptions>
     : public
         Var_Size_Arg_Traits_T<
             ImplementationRepository::StartupOptions,
             ImplementationRepository::StartupOptions_var,
-            ImplementationRepository::StartupOptions_out
+            ImplementationRepository::StartupOptions_out,
+            TAO::Any_Insert_Policy_Stream <ImplementationRepository::StartupOptions>
           >
   {
   };
 
 #endif /* end #if !defined */
- 
+
   // TAO_IDL - Generated from
   // .\be\be_visitor_arg_traits.cpp:772
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATION__ARG_TRAITS_CS_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATION__ARG_TRAITS_CS_
- 
+
   template<>
   class Arg_Traits<ImplementationRepository::ServerInformation>
     : public
         Var_Size_Arg_Traits_T<
             ImplementationRepository::ServerInformation,
             ImplementationRepository::ServerInformation_var,
-            ImplementationRepository::ServerInformation_out
+            ImplementationRepository::ServerInformation_out,
+            TAO::Any_Insert_Policy_Stream <ImplementationRepository::ServerInformation>
           >
   {
   };
 
 #endif /* end #if !defined */
- 
+
   // TAO_IDL - Generated from
   // .\be\be_visitor_arg_traits.cpp:489
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST__ARG_TRAITS_CS_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST__ARG_TRAITS_CS_
- 
+
   template<>
   class Arg_Traits<ImplementationRepository::ServerInformationList>
     : public
         Var_Size_Arg_Traits_T<
             ImplementationRepository::ServerInformationList,
             ImplementationRepository::ServerInformationList_var,
-            ImplementationRepository::ServerInformationList_out
+            ImplementationRepository::ServerInformationList_out,
+            TAO::Any_Insert_Policy_Stream <ImplementationRepository::ServerInformationList>
           >
   {
   };
@@ -132,7 +136,7 @@ namespace TAO
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__ARG_TRAITS_CS_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__ARG_TRAITS_CS_
- 
+
   template<>
   class  Arg_Traits<ImplementationRepository::ServerInformationIterator>
     : public
@@ -140,7 +144,8 @@ namespace TAO
             ImplementationRepository::ServerInformationIterator_ptr,
             ImplementationRepository::ServerInformationIterator_var,
             ImplementationRepository::ServerInformationIterator_out,
-            TAO::Objref_Traits<ImplementationRepository::ServerInformationIterator>
+            TAO::Objref_Traits<ImplementationRepository::ServerInformationIterator>,
+            TAO::Any_Insert_Policy_Stream <ImplementationRepository::ServerInformationIterator_ptr>
           >
   {
   };
diff --git a/TAO/tao/ImR_Client/ImplRepoS.cpp b/TAO/tao/ImR_Client/ImplRepoS.cpp
index 3df3311909e..de4c1dca776 100644
--- a/TAO/tao/ImR_Client/ImplRepoS.cpp
+++ b/TAO/tao/ImR_Client/ImplRepoS.cpp
@@ -54,8 +54,8 @@
 #include "tao/Stub.h"
 #include "tao/IFR_Client_Adapter.h"
 #include "tao/Object_T.h"
-#include "tao/TypeCode.h"
-#include "tao/DynamicC.h"
+#include "tao/AnyTypeCode/TypeCode.h"
+#include "tao/AnyTypeCode/DynamicC.h"
 #include "tao/CDR.h"
 #include "tao/operation_details.h"
 #include "tao/PortableInterceptor.h"
@@ -80,71 +80,75 @@ namespace TAO
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVEROBJECT__SARG_TRAITS_SS_)
 #define _IMPLEMENTATIONREPOSITORY_SERVEROBJECT__SARG_TRAITS_SS_
- 
+
   template<>
   class  SArg_Traits<ImplementationRepository::ServerObject>
     : public
         Object_SArg_Traits_T<
             ImplementationRepository::ServerObject_ptr,
             ImplementationRepository::ServerObject_var,
-            ImplementationRepository::ServerObject_out
+            ImplementationRepository::ServerObject_out,
+            TAO::Any_Insert_Policy_Stream <ImplementationRepository::ServerObject_ptr>
           >
   {
   };
 
 #endif /* end #if !defined */
- 
+
   // TAO_IDL - Generated from
   // .\be\be_visitor_arg_traits.cpp:772
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_STARTUPOPTIONS__SARG_TRAITS_SS_)
 #define _IMPLEMENTATIONREPOSITORY_STARTUPOPTIONS__SARG_TRAITS_SS_
- 
+
   template<>
   class SArg_Traits<ImplementationRepository::StartupOptions>
     : public
         Var_Size_SArg_Traits_T<
             ImplementationRepository::StartupOptions,
             ImplementationRepository::StartupOptions_var,
-            ImplementationRepository::StartupOptions_out
+            ImplementationRepository::StartupOptions_out,
+            TAO::Any_Insert_Policy_Stream <ImplementationRepository::StartupOptions>
           >
   {
   };
 
 #endif /* end #if !defined */
- 
+
   // TAO_IDL - Generated from
   // .\be\be_visitor_arg_traits.cpp:772
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATION__SARG_TRAITS_SS_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATION__SARG_TRAITS_SS_
- 
+
   template<>
   class SArg_Traits<ImplementationRepository::ServerInformation>
     : public
         Var_Size_SArg_Traits_T<
             ImplementationRepository::ServerInformation,
             ImplementationRepository::ServerInformation_var,
-            ImplementationRepository::ServerInformation_out
+            ImplementationRepository::ServerInformation_out,
+            TAO::Any_Insert_Policy_Stream <ImplementationRepository::ServerInformation>
           >
   {
   };
 
 #endif /* end #if !defined */
- 
+
   // TAO_IDL - Generated from
   // .\be\be_visitor_arg_traits.cpp:489
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST__SARG_TRAITS_SS_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST__SARG_TRAITS_SS_
- 
+
   template<>
   class SArg_Traits<ImplementationRepository::ServerInformationList>
     : public
         Var_Size_SArg_Traits_T<
             ImplementationRepository::ServerInformationList,
             ImplementationRepository::ServerInformationList_var,
-            ImplementationRepository::ServerInformationList_out
+            ImplementationRepository::ServerInformationList_out,
+            TAO::Any_Insert_Policy_Stream <ImplementationRepository::ServerInformationList>
           >
   {
   };
@@ -153,14 +157,15 @@ namespace TAO
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__SARG_TRAITS_SS_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__SARG_TRAITS_SS_
- 
+
   template<>
   class  SArg_Traits<ImplementationRepository::ServerInformationIterator>
     : public
         Object_SArg_Traits_T<
             ImplementationRepository::ServerInformationIterator_ptr,
             ImplementationRepository::ServerInformationIterator_var,
-            ImplementationRepository::ServerInformationIterator_out
+            ImplementationRepository::ServerInformationIterator_out,
+            TAO::Any_Insert_Policy_Stream <ImplementationRepository::ServerInformationIterator_ptr>
           >
   {
   };
@@ -178,7 +183,7 @@ namespace TAO
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVEROBJECT__ARG_TRAITS_SS_)
 #define _IMPLEMENTATIONREPOSITORY_SERVEROBJECT__ARG_TRAITS_SS_
- 
+
   template<>
   class  Arg_Traits<ImplementationRepository::ServerObject>
     : public
@@ -186,64 +191,68 @@ namespace TAO
             ImplementationRepository::ServerObject_ptr,
             ImplementationRepository::ServerObject_var,
             ImplementationRepository::ServerObject_out,
-            TAO::Objref_Traits<ImplementationRepository::ServerObject>
+            TAO::Objref_Traits<ImplementationRepository::ServerObject>,
+            TAO::Any_Insert_Policy_Stream <ImplementationRepository::ServerObject>
           >
   {
   };
 
 #endif /* end #if !defined */
- 
+
   // TAO_IDL - Generated from
   // .\be\be_visitor_arg_traits.cpp:772
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_STARTUPOPTIONS__ARG_TRAITS_SS_)
 #define _IMPLEMENTATIONREPOSITORY_STARTUPOPTIONS__ARG_TRAITS_SS_
- 
+
   template<>
   class Arg_Traits<ImplementationRepository::StartupOptions>
     : public
         Var_Size_Arg_Traits_T<
             ImplementationRepository::StartupOptions,
             ImplementationRepository::StartupOptions_var,
-            ImplementationRepository::StartupOptions_out
+            ImplementationRepository::StartupOptions_out,
+            TAO::Any_Insert_Policy_Stream <ImplementationRepository::StartupOptions>
           >
   {
   };
 
 #endif /* end #if !defined */
- 
+
   // TAO_IDL - Generated from
   // .\be\be_visitor_arg_traits.cpp:772
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATION__ARG_TRAITS_SS_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATION__ARG_TRAITS_SS_
- 
+
   template<>
   class Arg_Traits<ImplementationRepository::ServerInformation>
     : public
         Var_Size_Arg_Traits_T<
             ImplementationRepository::ServerInformation,
             ImplementationRepository::ServerInformation_var,
-            ImplementationRepository::ServerInformation_out
+            ImplementationRepository::ServerInformation_out,
+            TAO::Any_Insert_Policy_Stream <ImplementationRepository::ServerInformation>
           >
   {
   };
 
 #endif /* end #if !defined */
- 
+
   // TAO_IDL - Generated from
   // .\be\be_visitor_arg_traits.cpp:489
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST__ARG_TRAITS_SS_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONLIST__ARG_TRAITS_SS_
- 
+
   template<>
   class Arg_Traits<ImplementationRepository::ServerInformationList>
     : public
         Var_Size_Arg_Traits_T<
             ImplementationRepository::ServerInformationList,
             ImplementationRepository::ServerInformationList_var,
-            ImplementationRepository::ServerInformationList_out
+            ImplementationRepository::ServerInformationList_out,
+            TAO::Any_Insert_Policy_Stream <ImplementationRepository::ServerInformation>
           >
   {
   };
@@ -252,7 +261,7 @@ namespace TAO
 
 #if !defined (_IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__ARG_TRAITS_SS_)
 #define _IMPLEMENTATIONREPOSITORY_SERVERINFORMATIONITERATOR__ARG_TRAITS_SS_
- 
+
   template<>
   class  Arg_Traits<ImplementationRepository::ServerInformationIterator>
     : public
@@ -260,7 +269,8 @@ namespace TAO
             ImplementationRepository::ServerInformationIterator_ptr,
             ImplementationRepository::ServerInformationIterator_var,
             ImplementationRepository::ServerInformationIterator_out,
-            TAO::Objref_Traits<ImplementationRepository::ServerInformationIterator>
+            TAO::Objref_Traits<ImplementationRepository::ServerInformationIterator>,
+            TAO::Any_Insert_Policy_Stream <ImplementationRepository::ServerInformationIterator_ptr>
           >
   {
   };
@@ -393,7 +403,7 @@ POA_ImplementationRepository::_TAO_ServerInformationIterator_Strategized_Proxy_B
 {
   static POA_ImplementationRepository::_TAO_ServerInformationIterator_Strategized_Proxy_Broker
   strategized_proxy_broker;
- 
+
   return &strategized_proxy_broker;
 }
 
@@ -415,7 +425,7 @@ POA_ImplementationRepository::_TAO_ServerInformationIterator_Strategized_Proxy_B
   TAO::Collocation_Strategy strategy =
     TAO_ORB_Core::collocation_strategy (obj ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (TAO::TAO_CS_REMOTE_STRATEGY);
- 
+
   return strategy;
 }
 
@@ -463,7 +473,7 @@ ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_Ini
 {
   ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_function_pointer =
     ImplementationRepository__TAO_ServerInformationIterator_Proxy_Broker_Factory_function;
- 
+
   return 0;
 }
 
@@ -553,11 +563,11 @@ POA_ImplementationRepository::ServerInformationIterator::~ServerInformationItera
 }
 namespace POA_ImplementationRepository
 {
- 
- 
+
+
   // TAO_IDL - Generated from
   // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/upcall_command_ss.cpp:127
- 
+
   class next_n_ServerInformationIterator
     : public TAO::Upcall_Command
   {
@@ -571,41 +581,41 @@ namespace POA_ImplementationRepository
       , args_ (args)
     {
     }
- 
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
           this->operation_details_,
           this->args_);
- 
+
       TAO::SArg_Traits< ::CORBA::ULong>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::ULong, TAO::SArg_Traits< ::CORBA::ULong>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
- 
+
       TAO::SArg_Traits< ::ImplementationRepository::ServerInformationList>::out_arg_type arg_2 =
         TAO::Portable_Server::get_out_arg< ::ImplementationRepository::ServerInformationList, TAO::SArg_Traits< ::ImplementationRepository::ServerInformationList>::out_arg_type> (
           this->operation_details_,
           this->args_,
           2);
- 
- 
+
+
       retval =
         this->servant_->next_n (
           arg_1
           , arg_2
           ACE_ENV_ARG_PARAMETER);
- 
+
     }
- 
+
   private:
     POA_ImplementationRepository::ServerInformationIterator * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
- 
+
 }
 
 
@@ -619,26 +629,26 @@ void POA_ImplementationRepository::ServerInformationIterator::next_n_skel (
     ACE_ENV_ARG_DECL
   )
 {
- 
- 
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static CORBA::TypeCode_ptr const * const exceptions = 0;
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
- 
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::ULong>::in_arg_val _tao_how_many;
   TAO::SArg_Traits< ::ImplementationRepository::ServerInformationList>::out_arg_val _tao_servers;
- 
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_how_many,
       &_tao_servers
     };
- 
+
   static size_t const nargs = 3;
- 
+
   POA_ImplementationRepository::ServerInformationIterator * const impl =
     static_cast<POA_ImplementationRepository::ServerInformationIterator *> (servant);
 
@@ -646,7 +656,7 @@ void POA_ImplementationRepository::ServerInformationIterator::next_n_skel (
     impl,
     server_request.operation_details (),
     args);
- 
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -659,15 +669,15 @@ void POA_ImplementationRepository::ServerInformationIterator::next_n_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
- 
+
 }
 namespace POA_ImplementationRepository
 {
- 
- 
+
+
   // TAO_IDL - Generated from
   // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/upcall_command_ss.cpp:127
- 
+
   class destroy_ServerInformationIterator
     : public TAO::Upcall_Command
   {
@@ -677,18 +687,18 @@ namespace POA_ImplementationRepository
       : servant_ (servant)
     {
     }
- 
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       this->servant_->destroy (
         ACE_ENV_SINGLE_ARG_PARAMETER);
- 
+
     }
- 
+
   private:
     POA_ImplementationRepository::ServerInformationIterator * const servant_;
   };
- 
+
 }
 
 
@@ -702,28 +712,28 @@ void POA_ImplementationRepository::ServerInformationIterator::destroy_skel (
     ACE_ENV_ARG_DECL
   )
 {
- 
- 
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static CORBA::TypeCode_ptr const * const exceptions = 0;
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
- 
+
   TAO::SArg_Traits< void>::ret_val retval;
- 
+
   TAO::Argument * const args[] =
     {
       &retval
     };
- 
+
   static size_t const nargs = 1;
- 
+
   POA_ImplementationRepository::ServerInformationIterator * const impl =
     static_cast<POA_ImplementationRepository::ServerInformationIterator *> (servant);
 
   destroy_ServerInformationIterator command (
     impl);
- 
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -736,7 +746,7 @@ void POA_ImplementationRepository::ServerInformationIterator::destroy_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
- 
+
 }
 
 // TAO_IDL - Generated from
@@ -744,11 +754,11 @@ void POA_ImplementationRepository::ServerInformationIterator::destroy_skel (
 
 namespace POA_ImplementationRepository
 {
- 
- 
+
+
   // TAO_IDL - Generated from
   // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/upcall_command_ss.cpp:127
- 
+
   class _is_a_ServerInformationIterator_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -762,34 +772,34 @@ namespace POA_ImplementationRepository
       , args_ (args)
     {
     }
- 
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
           this->operation_details_,
           this->args_);
- 
+
       TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
- 
- 
+
+
       retval =
         this->servant_-> _is_a (
           arg_1
           ACE_ENV_ARG_PARAMETER);
- 
+
     }
- 
+
   private:
     POA_ImplementationRepository::ServerInformationIterator * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
- 
+
 }
 void POA_ImplementationRepository::ServerInformationIterator::_is_a_skel (
     TAO_ServerRequest & server_request,
@@ -798,32 +808,32 @@ void POA_ImplementationRepository::ServerInformationIterator::_is_a_skel (
     ACE_ENV_ARG_DECL
   )
 {
- 
- 
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static CORBA::TypeCode_ptr const * const exceptions = 0;
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
- 
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
- 
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_repository_id
     };
- 
+
   static size_t const nargs = 2;
- 
+
   POA_ImplementationRepository::ServerInformationIterator * const impl =
     static_cast<POA_ImplementationRepository::ServerInformationIterator *> (servant);
- 
+
   _is_a_ServerInformationIterator_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
- 
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -836,16 +846,16 @@ void POA_ImplementationRepository::ServerInformationIterator::_is_a_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
- 
+
 }
 
 namespace POA_ImplementationRepository
 {
- 
- 
+
+
   // TAO_IDL - Generated from
   // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/upcall_command_ss.cpp:127
- 
+
   class _non_existent_ServerInformationIterator_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -859,27 +869,27 @@ namespace POA_ImplementationRepository
       , args_ (args)
     {
     }
- 
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
           this->operation_details_,
           this->args_);
- 
- 
+
+
       retval =
         this->servant_-> _non_existent (
           ACE_ENV_SINGLE_ARG_PARAMETER);
- 
+
     }
- 
+
   private:
     POA_ImplementationRepository::ServerInformationIterator * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
- 
+
 }
 void POA_ImplementationRepository::ServerInformationIterator::_non_existent_skel (
     TAO_ServerRequest & server_request,
@@ -888,30 +898,30 @@ void POA_ImplementationRepository::ServerInformationIterator::_non_existent_skel
     ACE_ENV_ARG_DECL
   )
 {
- 
- 
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static CORBA::TypeCode_ptr const * const exceptions = 0;
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
- 
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
- 
+
   TAO::Argument * const args[] =
     {
       &retval
     };
- 
+
   static size_t const nargs = 1;
- 
+
   POA_ImplementationRepository::ServerInformationIterator * const impl =
     static_cast<POA_ImplementationRepository::ServerInformationIterator *> (servant);
- 
+
   _non_existent_ServerInformationIterator_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
- 
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -924,7 +934,7 @@ void POA_ImplementationRepository::ServerInformationIterator::_non_existent_skel
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
- 
+
 }
 
 
@@ -945,30 +955,30 @@ void POA_ImplementationRepository::ServerInformationIterator::_interface_skel (
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
- 
+
   if (_tao_adapter == 0)
     {
       ACE_THROW (CORBA::INTF_REPOS (CORBA::OMGVMCID | 1,
                                     CORBA::COMPLETED_NO));
     }
- 
+
   POA_ImplementationRepository::ServerInformationIterator * const impl =
     static_cast<POA_ImplementationRepository::ServerInformationIterator *> (servant);
   CORBA::InterfaceDef_ptr _tao_retval =
     impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
- 
+
   server_request.init_reply ();
   TAO_OutputCDR &_tao_out = *server_request.outgoing ();
- 
+
   CORBA::Boolean const _tao_result =
     _tao_adapter->interfacedef_cdr_insert (
         _tao_out,
         _tao_retval
       );
- 
+
   _tao_adapter->dispose (_tao_retval);
- 
+
   if (_tao_result == 0)
     {
       ACE_THROW (CORBA::MARSHAL ());
@@ -977,11 +987,11 @@ void POA_ImplementationRepository::ServerInformationIterator::_interface_skel (
 
 namespace POA_ImplementationRepository
 {
- 
- 
+
+
   // TAO_IDL - Generated from
   // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/upcall_command_ss.cpp:127
- 
+
   class _get_component_ServerInformationIterator_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -995,27 +1005,27 @@ namespace POA_ImplementationRepository
       , args_ (args)
     {
     }
- 
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Object, TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type> (
           this->operation_details_,
           this->args_);
- 
- 
+
+
       retval =
         this->servant_-> _get_component (
           ACE_ENV_SINGLE_ARG_PARAMETER);
- 
+
     }
- 
+
   private:
     POA_ImplementationRepository::ServerInformationIterator * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
- 
+
 }
 void POA_ImplementationRepository::ServerInformationIterator::_component_skel (
     TAO_ServerRequest & server_request,
@@ -1024,30 +1034,30 @@ void POA_ImplementationRepository::ServerInformationIterator::_component_skel (
     ACE_ENV_ARG_DECL
   )
 {
- 
- 
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static CORBA::TypeCode_ptr const * const exceptions = 0;
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
- 
+
   TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
- 
+
   TAO::Argument * const args[] =
     {
       &retval
     };
- 
+
   static size_t const nargs = 1;
- 
+
   POA_ImplementationRepository::ServerInformationIterator * const impl =
     static_cast<POA_ImplementationRepository::ServerInformationIterator *> (servant);
- 
+
   _get_component_ServerInformationIterator_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
- 
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -1060,7 +1070,7 @@ void POA_ImplementationRepository::ServerInformationIterator::_component_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
- 
+
 }
 
 CORBA::Boolean POA_ImplementationRepository::ServerInformationIterator::_is_a (
@@ -1109,22 +1119,22 @@ POA_ImplementationRepository::ServerInformationIterator::_this (ACE_ENV_SINGLE_A
 {
   TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
- 
+
   TAO_Stub_Auto_Ptr safe_stub (stub);
   CORBA::Object_ptr tmp = CORBA::Object::_nil ();
- 
+
   CORBA::Boolean _tao_opt_colloc =
     stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
- 
+
   ACE_NEW_RETURN (
       tmp,
       CORBA::Object (stub, _tao_opt_colloc, this),
       0
     );
- 
+
   CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
- 
+
   typedef ::ImplementationRepository::ServerInformationIterator STUB_SCOPED_NAME;
   return
     TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -1267,7 +1277,7 @@ POA_ImplementationRepository::_TAO_Administration_Strategized_Proxy_Broker::the_
 {
   static POA_ImplementationRepository::_TAO_Administration_Strategized_Proxy_Broker
   strategized_proxy_broker;
- 
+
   return &strategized_proxy_broker;
 }
 
@@ -1289,7 +1299,7 @@ POA_ImplementationRepository::_TAO_Administration_Strategized_Proxy_Broker::get_
   TAO::Collocation_Strategy strategy =
     TAO_ORB_Core::collocation_strategy (obj ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (TAO::TAO_CS_REMOTE_STRATEGY);
- 
+
   return strategy;
 }
 
@@ -1337,7 +1347,7 @@ ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_Initializer (s
 {
   ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_function_pointer =
     ImplementationRepository__TAO_Administration_Proxy_Broker_Factory_function;
- 
+
   return 0;
 }
 
@@ -1594,11 +1604,11 @@ POA_ImplementationRepository::Administration::~Administration (void)
 }
 namespace POA_ImplementationRepository
 {
- 
- 
+
+
   // TAO_IDL - Generated from
   // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/upcall_command_ss.cpp:127
- 
+
   class activate_server_Administration
     : public TAO::Upcall_Command
   {
@@ -1612,7 +1622,7 @@ namespace POA_ImplementationRepository
       , args_ (args)
     {
     }
- 
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
@@ -1620,19 +1630,19 @@ namespace POA_ImplementationRepository
           this->operation_details_,
           this->args_,
           1);
- 
+
       this->servant_->activate_server (
         arg_1
         ACE_ENV_ARG_PARAMETER);
- 
+
     }
- 
+
   private:
     POA_ImplementationRepository::Administration * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
- 
+
 }
 
 
@@ -1646,8 +1656,8 @@ void POA_ImplementationRepository::Administration::activate_server_skel (
     ACE_ENV_ARG_DECL
   )
 {
- 
- 
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static CORBA::TypeCode_ptr const exceptions[] =
     {
@@ -1656,18 +1666,18 @@ void POA_ImplementationRepository::Administration::activate_server_skel (
     };
   static size_t const nexceptions = 2;
 #endif /* TAO_HAS_INTERCEPTORS */
- 
+
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_server;
- 
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_server
     };
- 
+
   static size_t const nargs = 2;
- 
+
   POA_ImplementationRepository::Administration * const impl =
     static_cast<POA_ImplementationRepository::Administration *> (servant);
 
@@ -1675,7 +1685,7 @@ void POA_ImplementationRepository::Administration::activate_server_skel (
     impl,
     server_request.operation_details (),
     args);
- 
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -1688,15 +1698,15 @@ void POA_ImplementationRepository::Administration::activate_server_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
- 
+
 }
 namespace POA_ImplementationRepository
 {
- 
- 
+
+
   // TAO_IDL - Generated from
   // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/upcall_command_ss.cpp:127
- 
+
   class add_or_update_server_Administration
     : public TAO::Upcall_Command
   {
@@ -1710,7 +1720,7 @@ namespace POA_ImplementationRepository
       , args_ (args)
     {
     }
- 
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
@@ -1718,26 +1728,26 @@ namespace POA_ImplementationRepository
           this->operation_details_,
           this->args_,
           1);
- 
+
       TAO::SArg_Traits< ::ImplementationRepository::StartupOptions>::in_arg_type arg_2 =
         TAO::Portable_Server::get_in_arg< ::ImplementationRepository::StartupOptions, TAO::SArg_Traits< ::ImplementationRepository::StartupOptions>::in_arg_type> (
           this->operation_details_,
           this->args_,
           2);
- 
+
       this->servant_->add_or_update_server (
         arg_1
         , arg_2
         ACE_ENV_ARG_PARAMETER);
- 
+
     }
- 
+
   private:
     POA_ImplementationRepository::Administration * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
- 
+
 }
 
 
@@ -1751,8 +1761,8 @@ void POA_ImplementationRepository::Administration::add_or_update_server_skel (
     ACE_ENV_ARG_DECL
   )
 {
- 
- 
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static CORBA::TypeCode_ptr const exceptions[] =
     {
@@ -1760,20 +1770,20 @@ void POA_ImplementationRepository::Administration::add_or_update_server_skel (
     };
   static size_t const nexceptions = 1;
 #endif /* TAO_HAS_INTERCEPTORS */
- 
+
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_server;
   TAO::SArg_Traits< ::ImplementationRepository::StartupOptions>::in_arg_val _tao_options;
- 
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_server,
       &_tao_options
     };
- 
+
   static size_t const nargs = 3;
- 
+
   POA_ImplementationRepository::Administration * const impl =
     static_cast<POA_ImplementationRepository::Administration *> (servant);
 
@@ -1781,7 +1791,7 @@ void POA_ImplementationRepository::Administration::add_or_update_server_skel (
     impl,
     server_request.operation_details (),
     args);
- 
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -1794,15 +1804,15 @@ void POA_ImplementationRepository::Administration::add_or_update_server_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
- 
+
 }
 namespace POA_ImplementationRepository
 {
- 
- 
+
+
   // TAO_IDL - Generated from
   // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/upcall_command_ss.cpp:127
- 
+
   class remove_server_Administration
     : public TAO::Upcall_Command
   {
@@ -1816,7 +1826,7 @@ namespace POA_ImplementationRepository
       , args_ (args)
     {
     }
- 
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
@@ -1824,19 +1834,19 @@ namespace POA_ImplementationRepository
           this->operation_details_,
           this->args_,
           1);
- 
+
       this->servant_->remove_server (
         arg_1
         ACE_ENV_ARG_PARAMETER);
- 
+
     }
- 
+
   private:
     POA_ImplementationRepository::Administration * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
- 
+
 }
 
 
@@ -1850,8 +1860,8 @@ void POA_ImplementationRepository::Administration::remove_server_skel (
     ACE_ENV_ARG_DECL
   )
 {
- 
- 
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static CORBA::TypeCode_ptr const exceptions[] =
     {
@@ -1859,18 +1869,18 @@ void POA_ImplementationRepository::Administration::remove_server_skel (
     };
   static size_t const nexceptions = 1;
 #endif /* TAO_HAS_INTERCEPTORS */
- 
+
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_server;
- 
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_server
     };
- 
+
   static size_t const nargs = 2;
- 
+
   POA_ImplementationRepository::Administration * const impl =
     static_cast<POA_ImplementationRepository::Administration *> (servant);
 
@@ -1878,7 +1888,7 @@ void POA_ImplementationRepository::Administration::remove_server_skel (
     impl,
     server_request.operation_details (),
     args);
- 
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -1891,15 +1901,15 @@ void POA_ImplementationRepository::Administration::remove_server_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
- 
+
 }
 namespace POA_ImplementationRepository
 {
- 
- 
+
+
   // TAO_IDL - Generated from
   // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/upcall_command_ss.cpp:127
- 
+
   class shutdown_server_Administration
     : public TAO::Upcall_Command
   {
@@ -1913,7 +1923,7 @@ namespace POA_ImplementationRepository
       , args_ (args)
     {
     }
- 
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
@@ -1921,19 +1931,19 @@ namespace POA_ImplementationRepository
           this->operation_details_,
           this->args_,
           1);
- 
+
       this->servant_->shutdown_server (
         arg_1
         ACE_ENV_ARG_PARAMETER);
- 
+
     }
- 
+
   private:
     POA_ImplementationRepository::Administration * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
- 
+
 }
 
 
@@ -1947,8 +1957,8 @@ void POA_ImplementationRepository::Administration::shutdown_server_skel (
     ACE_ENV_ARG_DECL
   )
 {
- 
- 
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static CORBA::TypeCode_ptr const exceptions[] =
     {
@@ -1956,18 +1966,18 @@ void POA_ImplementationRepository::Administration::shutdown_server_skel (
     };
   static size_t const nexceptions = 1;
 #endif /* TAO_HAS_INTERCEPTORS */
- 
+
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_server;
- 
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_server
     };
- 
+
   static size_t const nargs = 2;
- 
+
   POA_ImplementationRepository::Administration * const impl =
     static_cast<POA_ImplementationRepository::Administration *> (servant);
 
@@ -1975,7 +1985,7 @@ void POA_ImplementationRepository::Administration::shutdown_server_skel (
     impl,
     server_request.operation_details (),
     args);
- 
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -1988,15 +1998,15 @@ void POA_ImplementationRepository::Administration::shutdown_server_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
- 
+
 }
 namespace POA_ImplementationRepository
 {
- 
- 
+
+
   // TAO_IDL - Generated from
   // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/upcall_command_ss.cpp:127
- 
+
   class server_is_running_Administration
     : public TAO::Upcall_Command
   {
@@ -2010,7 +2020,7 @@ namespace POA_ImplementationRepository
       , args_ (args)
     {
     }
- 
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
@@ -2018,33 +2028,33 @@ namespace POA_ImplementationRepository
           this->operation_details_,
           this->args_,
           1);
- 
+
       TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_2 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type> (
           this->operation_details_,
           this->args_,
           2);
- 
+
       TAO::SArg_Traits< ::ImplementationRepository::ServerObject>::in_arg_type arg_3 =
         TAO::Portable_Server::get_in_arg< ::ImplementationRepository::ServerObject, TAO::SArg_Traits< ::ImplementationRepository::ServerObject>::in_arg_type> (
           this->operation_details_,
           this->args_,
           3);
- 
+
       this->servant_->server_is_running (
         arg_1
         , arg_2
         , arg_3
         ACE_ENV_ARG_PARAMETER);
- 
+
     }
- 
+
   private:
     POA_ImplementationRepository::Administration * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
- 
+
 }
 
 
@@ -2058,8 +2068,8 @@ void POA_ImplementationRepository::Administration::server_is_running_skel (
     ACE_ENV_ARG_DECL
   )
 {
- 
- 
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static CORBA::TypeCode_ptr const exceptions[] =
     {
@@ -2067,12 +2077,12 @@ void POA_ImplementationRepository::Administration::server_is_running_skel (
     };
   static size_t const nexceptions = 1;
 #endif /* TAO_HAS_INTERCEPTORS */
- 
+
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_server;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_partial_ior;
   TAO::SArg_Traits< ::ImplementationRepository::ServerObject>::in_arg_val _tao_server_object;
- 
+
   TAO::Argument * const args[] =
     {
       &retval,
@@ -2080,9 +2090,9 @@ void POA_ImplementationRepository::Administration::server_is_running_skel (
       &_tao_partial_ior,
       &_tao_server_object
     };
- 
+
   static size_t const nargs = 4;
- 
+
   POA_ImplementationRepository::Administration * const impl =
     static_cast<POA_ImplementationRepository::Administration *> (servant);
 
@@ -2090,7 +2100,7 @@ void POA_ImplementationRepository::Administration::server_is_running_skel (
     impl,
     server_request.operation_details (),
     args);
- 
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -2103,15 +2113,15 @@ void POA_ImplementationRepository::Administration::server_is_running_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
- 
+
 }
 namespace POA_ImplementationRepository
 {
- 
- 
+
+
   // TAO_IDL - Generated from
   // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/upcall_command_ss.cpp:127
- 
+
   class server_is_shutting_down_Administration
     : public TAO::Upcall_Command
   {
@@ -2125,7 +2135,7 @@ namespace POA_ImplementationRepository
       , args_ (args)
     {
     }
- 
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
@@ -2133,19 +2143,19 @@ namespace POA_ImplementationRepository
           this->operation_details_,
           this->args_,
           1);
- 
+
       this->servant_->server_is_shutting_down (
         arg_1
         ACE_ENV_ARG_PARAMETER);
- 
+
     }
- 
+
   private:
     POA_ImplementationRepository::Administration * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
- 
+
 }
 
 
@@ -2159,8 +2169,8 @@ void POA_ImplementationRepository::Administration::server_is_shutting_down_skel
     ACE_ENV_ARG_DECL
   )
 {
- 
- 
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static CORBA::TypeCode_ptr const exceptions[] =
     {
@@ -2168,18 +2178,18 @@ void POA_ImplementationRepository::Administration::server_is_shutting_down_skel
     };
   static size_t const nexceptions = 1;
 #endif /* TAO_HAS_INTERCEPTORS */
- 
+
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_server;
- 
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_server
     };
- 
+
   static size_t const nargs = 2;
- 
+
   POA_ImplementationRepository::Administration * const impl =
     static_cast<POA_ImplementationRepository::Administration *> (servant);
 
@@ -2187,7 +2197,7 @@ void POA_ImplementationRepository::Administration::server_is_shutting_down_skel
     impl,
     server_request.operation_details (),
     args);
- 
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -2200,15 +2210,15 @@ void POA_ImplementationRepository::Administration::server_is_shutting_down_skel
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
- 
+
 }
 namespace POA_ImplementationRepository
 {
- 
- 
+
+
   // TAO_IDL - Generated from
   // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/upcall_command_ss.cpp:127
- 
+
   class find_Administration
     : public TAO::Upcall_Command
   {
@@ -2222,7 +2232,7 @@ namespace POA_ImplementationRepository
       , args_ (args)
     {
     }
- 
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
@@ -2230,26 +2240,26 @@ namespace POA_ImplementationRepository
           this->operation_details_,
           this->args_,
           1);
- 
+
       TAO::SArg_Traits< ::ImplementationRepository::ServerInformation>::out_arg_type arg_2 =
         TAO::Portable_Server::get_out_arg< ::ImplementationRepository::ServerInformation, TAO::SArg_Traits< ::ImplementationRepository::ServerInformation>::out_arg_type> (
           this->operation_details_,
           this->args_,
           2);
- 
+
       this->servant_->find (
         arg_1
         , arg_2
         ACE_ENV_ARG_PARAMETER);
- 
+
     }
- 
+
   private:
     POA_ImplementationRepository::Administration * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
- 
+
 }
 
 
@@ -2263,26 +2273,26 @@ void POA_ImplementationRepository::Administration::find_skel (
     ACE_ENV_ARG_DECL
   )
 {
- 
- 
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static CORBA::TypeCode_ptr const * const exceptions = 0;
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
- 
+
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_server;
   TAO::SArg_Traits< ::ImplementationRepository::ServerInformation>::out_arg_val _tao_info;
- 
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_server,
       &_tao_info
     };
- 
+
   static size_t const nargs = 3;
- 
+
   POA_ImplementationRepository::Administration * const impl =
     static_cast<POA_ImplementationRepository::Administration *> (servant);
 
@@ -2290,7 +2300,7 @@ void POA_ImplementationRepository::Administration::find_skel (
     impl,
     server_request.operation_details (),
     args);
- 
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -2303,15 +2313,15 @@ void POA_ImplementationRepository::Administration::find_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
- 
+
 }
 namespace POA_ImplementationRepository
 {
- 
- 
+
+
   // TAO_IDL - Generated from
   // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/upcall_command_ss.cpp:127
- 
+
   class list_Administration
     : public TAO::Upcall_Command
   {
@@ -2325,7 +2335,7 @@ namespace POA_ImplementationRepository
       , args_ (args)
     {
     }
- 
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::ULong>::in_arg_type arg_1 =
@@ -2333,33 +2343,33 @@ namespace POA_ImplementationRepository
           this->operation_details_,
           this->args_,
           1);
- 
+
       TAO::SArg_Traits< ::ImplementationRepository::ServerInformationList>::out_arg_type arg_2 =
         TAO::Portable_Server::get_out_arg< ::ImplementationRepository::ServerInformationList, TAO::SArg_Traits< ::ImplementationRepository::ServerInformationList>::out_arg_type> (
           this->operation_details_,
           this->args_,
           2);
- 
+
       TAO::SArg_Traits< ::ImplementationRepository::ServerInformationIterator>::out_arg_type arg_3 =
         TAO::Portable_Server::get_out_arg< ::ImplementationRepository::ServerInformationIterator, TAO::SArg_Traits< ::ImplementationRepository::ServerInformationIterator>::out_arg_type> (
           this->operation_details_,
           this->args_,
           3);
- 
+
       this->servant_->list (
         arg_1
         , arg_2
         , arg_3
         ACE_ENV_ARG_PARAMETER);
- 
+
     }
- 
+
   private:
     POA_ImplementationRepository::Administration * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
- 
+
 }
 
 
@@ -2373,18 +2383,18 @@ void POA_ImplementationRepository::Administration::list_skel (
     ACE_ENV_ARG_DECL
   )
 {
- 
- 
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static CORBA::TypeCode_ptr const * const exceptions = 0;
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
- 
+
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::ULong>::in_arg_val _tao_how_many;
   TAO::SArg_Traits< ::ImplementationRepository::ServerInformationList>::out_arg_val _tao_server_list;
   TAO::SArg_Traits< ::ImplementationRepository::ServerInformationIterator>::out_arg_val _tao_server_iterator;
- 
+
   TAO::Argument * const args[] =
     {
       &retval,
@@ -2392,9 +2402,9 @@ void POA_ImplementationRepository::Administration::list_skel (
       &_tao_server_list,
       &_tao_server_iterator
     };
- 
+
   static size_t const nargs = 4;
- 
+
   POA_ImplementationRepository::Administration * const impl =
     static_cast<POA_ImplementationRepository::Administration *> (servant);
 
@@ -2402,7 +2412,7 @@ void POA_ImplementationRepository::Administration::list_skel (
     impl,
     server_request.operation_details (),
     args);
- 
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -2415,15 +2425,15 @@ void POA_ImplementationRepository::Administration::list_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
- 
+
 }
 namespace POA_ImplementationRepository
 {
- 
- 
+
+
   // TAO_IDL - Generated from
   // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/upcall_command_ss.cpp:127
- 
+
   class shutdown_Administration
     : public TAO::Upcall_Command
   {
@@ -2437,7 +2447,7 @@ namespace POA_ImplementationRepository
       , args_ (args)
     {
     }
- 
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_type arg_1 =
@@ -2445,26 +2455,26 @@ namespace POA_ImplementationRepository
           this->operation_details_,
           this->args_,
           1);
- 
+
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_type arg_2 =
         TAO::Portable_Server::get_in_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_type> (
           this->operation_details_,
           this->args_,
           2);
- 
+
       this->servant_->shutdown (
         arg_1
         , arg_2
         ACE_ENV_ARG_PARAMETER);
- 
+
     }
- 
+
   private:
     POA_ImplementationRepository::Administration * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
- 
+
 }
 
 
@@ -2478,26 +2488,26 @@ void POA_ImplementationRepository::Administration::shutdown_skel (
     ACE_ENV_ARG_DECL
   )
 {
- 
- 
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static CORBA::TypeCode_ptr const * const exceptions = 0;
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
- 
+
   TAO::SArg_Traits< void>::ret_val retval;
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_activators;
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::in_arg_val _tao_servers;
- 
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_activators,
       &_tao_servers
     };
- 
+
   static size_t const nargs = 3;
- 
+
   POA_ImplementationRepository::Administration * const impl =
     static_cast<POA_ImplementationRepository::Administration *> (servant);
 
@@ -2505,7 +2515,7 @@ void POA_ImplementationRepository::Administration::shutdown_skel (
     impl,
     server_request.operation_details (),
     args);
- 
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -2518,7 +2528,7 @@ void POA_ImplementationRepository::Administration::shutdown_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
- 
+
 }
 
 // TAO_IDL - Generated from
@@ -2526,11 +2536,11 @@ void POA_ImplementationRepository::Administration::shutdown_skel (
 
 namespace POA_ImplementationRepository
 {
- 
- 
+
+
   // TAO_IDL - Generated from
   // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/upcall_command_ss.cpp:127
- 
+
   class _is_a_Administration_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -2544,34 +2554,34 @@ namespace POA_ImplementationRepository
       , args_ (args)
     {
     }
- 
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
           this->operation_details_,
           this->args_);
- 
+
       TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
- 
- 
+
+
       retval =
         this->servant_-> _is_a (
           arg_1
           ACE_ENV_ARG_PARAMETER);
- 
+
     }
- 
+
   private:
     POA_ImplementationRepository::Administration * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
- 
+
 }
 void POA_ImplementationRepository::Administration::_is_a_skel (
     TAO_ServerRequest & server_request,
@@ -2580,32 +2590,32 @@ void POA_ImplementationRepository::Administration::_is_a_skel (
     ACE_ENV_ARG_DECL
   )
 {
- 
- 
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static CORBA::TypeCode_ptr const * const exceptions = 0;
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
- 
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
- 
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_repository_id
     };
- 
+
   static size_t const nargs = 2;
- 
+
   POA_ImplementationRepository::Administration * const impl =
     static_cast<POA_ImplementationRepository::Administration *> (servant);
- 
+
   _is_a_Administration_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
- 
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -2618,16 +2628,16 @@ void POA_ImplementationRepository::Administration::_is_a_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
- 
+
 }
 
 namespace POA_ImplementationRepository
 {
- 
- 
+
+
   // TAO_IDL - Generated from
   // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/upcall_command_ss.cpp:127
- 
+
   class _non_existent_Administration_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -2641,27 +2651,27 @@ namespace POA_ImplementationRepository
       , args_ (args)
     {
     }
- 
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
           this->operation_details_,
           this->args_);
- 
- 
+
+
       retval =
         this->servant_-> _non_existent (
           ACE_ENV_SINGLE_ARG_PARAMETER);
- 
+
     }
- 
+
   private:
     POA_ImplementationRepository::Administration * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
- 
+
 }
 void POA_ImplementationRepository::Administration::_non_existent_skel (
     TAO_ServerRequest & server_request,
@@ -2670,30 +2680,30 @@ void POA_ImplementationRepository::Administration::_non_existent_skel (
     ACE_ENV_ARG_DECL
   )
 {
- 
- 
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static CORBA::TypeCode_ptr const * const exceptions = 0;
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
- 
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
- 
+
   TAO::Argument * const args[] =
     {
       &retval
     };
- 
+
   static size_t const nargs = 1;
- 
+
   POA_ImplementationRepository::Administration * const impl =
     static_cast<POA_ImplementationRepository::Administration *> (servant);
- 
+
   _non_existent_Administration_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
- 
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -2706,7 +2716,7 @@ void POA_ImplementationRepository::Administration::_non_existent_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
- 
+
 }
 
 
@@ -2727,30 +2737,30 @@ void POA_ImplementationRepository::Administration::_interface_skel (
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
- 
+
   if (_tao_adapter == 0)
     {
       ACE_THROW (CORBA::INTF_REPOS (CORBA::OMGVMCID | 1,
                                     CORBA::COMPLETED_NO));
     }
- 
+
   POA_ImplementationRepository::Administration * const impl =
     static_cast<POA_ImplementationRepository::Administration *> (servant);
   CORBA::InterfaceDef_ptr _tao_retval =
     impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
- 
+
   server_request.init_reply ();
   TAO_OutputCDR &_tao_out = *server_request.outgoing ();
- 
+
   CORBA::Boolean const _tao_result =
     _tao_adapter->interfacedef_cdr_insert (
         _tao_out,
         _tao_retval
       );
- 
+
   _tao_adapter->dispose (_tao_retval);
- 
+
   if (_tao_result == 0)
     {
       ACE_THROW (CORBA::MARSHAL ());
@@ -2759,11 +2769,11 @@ void POA_ImplementationRepository::Administration::_interface_skel (
 
 namespace POA_ImplementationRepository
 {
- 
- 
+
+
   // TAO_IDL - Generated from
   // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/upcall_command_ss.cpp:127
- 
+
   class _get_component_Administration_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -2777,27 +2787,27 @@ namespace POA_ImplementationRepository
       , args_ (args)
     {
     }
- 
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Object, TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type> (
           this->operation_details_,
           this->args_);
- 
- 
+
+
       retval =
         this->servant_-> _get_component (
           ACE_ENV_SINGLE_ARG_PARAMETER);
- 
+
     }
- 
+
   private:
     POA_ImplementationRepository::Administration * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
- 
+
 }
 void POA_ImplementationRepository::Administration::_component_skel (
     TAO_ServerRequest & server_request,
@@ -2806,30 +2816,30 @@ void POA_ImplementationRepository::Administration::_component_skel (
     ACE_ENV_ARG_DECL
   )
 {
- 
- 
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static CORBA::TypeCode_ptr const * const exceptions = 0;
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
- 
+
   TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
- 
+
   TAO::Argument * const args[] =
     {
       &retval
     };
- 
+
   static size_t const nargs = 1;
- 
+
   POA_ImplementationRepository::Administration * const impl =
     static_cast<POA_ImplementationRepository::Administration *> (servant);
- 
+
   _get_component_Administration_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
- 
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -2842,7 +2852,7 @@ void POA_ImplementationRepository::Administration::_component_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
- 
+
 }
 
 CORBA::Boolean POA_ImplementationRepository::Administration::_is_a (
@@ -2891,22 +2901,22 @@ POA_ImplementationRepository::Administration::_this (ACE_ENV_SINGLE_ARG_DECL)
 {
   TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
- 
+
   TAO_Stub_Auto_Ptr safe_stub (stub);
   CORBA::Object_ptr tmp = CORBA::Object::_nil ();
- 
+
   CORBA::Boolean _tao_opt_colloc =
     stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
- 
+
   ACE_NEW_RETURN (
       tmp,
       CORBA::Object (stub, _tao_opt_colloc, this),
       0
     );
- 
+
   CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
- 
+
   typedef ::ImplementationRepository::Administration STUB_SCOPED_NAME;
   return
     TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
diff --git a/TAO/tao/ImR_Client/ServerObjectA.cpp b/TAO/tao/ImR_Client/ServerObjectA.cpp
index 153a0c83393..fcc9fb5f011 100644
--- a/TAO/tao/ImR_Client/ServerObjectA.cpp
+++ b/TAO/tao/ImR_Client/ServerObjectA.cpp
@@ -26,13 +26,13 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "ServerObjectC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
 #include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
+#include "tao/AnyTypeCode/Any.h"
+#include "tao/AnyTypeCode/Any_Impl_T.h"
 
 // TAO_IDL - Generated from
 // be/be_visitor_typecode/objref_typecode.cpp:76
@@ -43,7 +43,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_objref,
     "IDL:ImplementationRepository/ServerObject:1.0",
     "ServerObject");
-  
+
 namespace ImplementationRepository
 {
   ::CORBA::TypeCode_ptr const _tc_ServerObject =
diff --git a/TAO/tao/ImR_Client/ServerObjectA.h b/TAO/tao/ImR_Client/ServerObjectA.h
new file mode 100644
index 00000000000..7dda3b08207
--- /dev/null
+++ b/TAO/tao/ImR_Client/ServerObjectA.h
@@ -0,0 +1,61 @@
+// -*- C++ -*-
+//
+// $Id$
+
+// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       Irvine, CA
+//       USA
+//       http://doc.ece.uci.edu/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
+//
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
+
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:805
+
+#ifndef _TAO_IDL_ORIG_SERVEROBJECTA_H_
+#define _TAO_IDL_ORIG_SERVEROBJECTA_H_
+
+#include /**/ "ace/pre.h"
+
+#include "imr_client_export.h"
+#include "tao/ImR_Client/ServerObjectC.h"
+
+#if defined (__BORLANDC__)
+#pragma option push -w-rvl -w-rch -w-ccc -w-inl
+#endif /* __BORLANDC__ */
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/typecode_decl.cpp:49
+
+extern TAO_IMR_Client_Export ::CORBA::TypeCode_ptr const _tc_ServerObject;
+
+// TAO_IDL - Generated from
+// be\be_visitor_interface/any_op_ch.cpp:53
+
+TAO_IMR_Client_Export void operator<<= (CORBA::Any &, ImplementationRepository::ServerObject_ptr); // copying
+TAO_IMR_Client_Export void operator<<= (CORBA::Any &, ImplementationRepository::ServerObject_ptr *); // non-copying
+TAO_IMR_Client_Export CORBA::Boolean operator>>= (const CORBA::Any &, ImplementationRepository::ServerObject_ptr &);
+
+#if defined (__BORLANDC__)
+#pragma option pop
+#endif /* __BORLANDC__ */
+
+#include /**/ "ace/post.h"
+
+#endif /* ifndef */
diff --git a/TAO/tao/ImR_Client/ServerObjectS.cpp b/TAO/tao/ImR_Client/ServerObjectS.cpp
index 0efb994538d..8bf53af58f2 100644
--- a/TAO/tao/ImR_Client/ServerObjectS.cpp
+++ b/TAO/tao/ImR_Client/ServerObjectS.cpp
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // .\be\be_codegen.cpp:599
 
 #ifndef _TAO_IDL_SERVEROBJECTS_CPP_
@@ -53,8 +53,8 @@
 #include "tao/Stub.h"
 #include "tao/IFR_Client_Adapter.h"
 #include "tao/Object_T.h"
-#include "tao/TypeCode.h"
-#include "tao/DynamicC.h"
+#include "tao/AnyTypeCode/TypeCode.h"
+#include "tao/AnyTypeCode/DynamicC.h"
 #include "tao/CDR.h"
 #include "tao/operation_details.h"
 #include "tao/PortableInterceptor.h"
@@ -209,7 +209,7 @@ POA_ImplementationRepository::_TAO_ServerObject_Strategized_Proxy_Broker::the_TA
 {
   static POA_ImplementationRepository::_TAO_ServerObject_Strategized_Proxy_Broker
   strategized_proxy_broker;
-  
+
   return &strategized_proxy_broker;
 }
 
@@ -231,7 +231,7 @@ POA_ImplementationRepository::_TAO_ServerObject_Strategized_Proxy_Broker::get_st
   TAO::Collocation_Strategy strategy =
     TAO_ORB_Core::collocation_strategy (obj ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (TAO::TAO_CS_REMOTE_STRATEGY);
-  
+
   return strategy;
 }
 
@@ -250,13 +250,13 @@ POA_ImplementationRepository::_TAO_ServerObject_Strategized_Proxy_Broker::dispat
 {
   TAO::Direct_Collocation_Upcall_Wrapper collocation_upcall_wrapper;
   collocation_upcall_wrapper.upcall (
-    obj, 
-    forward_obj, 
-    args, 
-    num_args, 
-    op, 
-    op_len, 
-    strategy 
+    obj,
+    forward_obj,
+    args,
+    num_args,
+    op,
+    op_len,
+    strategy
     ACE_ENV_ARG_PARAMETER);
 }
 
@@ -277,9 +277,9 @@ ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_function (CORBA:
 int
 ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_Initializer (size_t)
 {
-  ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_function_pointer = 
+  ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_function_pointer =
     ImplementationRepository__TAO_ServerObject_Proxy_Broker_Factory_function;
-  
+
   return 0;
 }
 
@@ -298,14 +298,14 @@ ImplementationRepository__TAO_ServerObject_Proxy_Broker_Stub_Factory_Initializer
 POA_ImplementationRepository::_TAO_ServerObject_Direct_Proxy_Impl::_TAO_ServerObject_Direct_Proxy_Impl (void)
 {}
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
 
 void
 POA_ImplementationRepository::_TAO_ServerObject_Direct_Proxy_Impl::ping (
     TAO_Abstract_ServantBase  *servant,
     TAO::Argument **,
-    int 
+    int
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -319,14 +319,14 @@ POA_ImplementationRepository::_TAO_ServerObject_Direct_Proxy_Impl::ping (
       );
   ACE_CHECK;
 }
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
 
 void
 POA_ImplementationRepository::_TAO_ServerObject_Direct_Proxy_Impl::shutdown (
     TAO_Abstract_ServantBase  *servant,
     TAO::Argument **,
-    int 
+    int
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -346,7 +346,7 @@ POA_ImplementationRepository::_TAO_ServerObject_Direct_Proxy_Impl::shutdown (
 //           End Direct Proxy Implementation
 ///////////////////////////////////////////////////////////////////////
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ss.cpp:103
 
 POA_ImplementationRepository::ServerObject::ServerObject (void)
@@ -366,11 +366,11 @@ POA_ImplementationRepository::ServerObject::~ServerObject (void)
 }
 namespace POA_ImplementationRepository
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class ping_ServerObject
     : public TAO::Upcall_Command
   {
@@ -380,22 +380,22 @@ namespace POA_ImplementationRepository
       : servant_ (servant)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       this->servant_->ping (
         ACE_ENV_SINGLE_ARG_PARAMETER);
-      
+
     }
-  
+
   private:
     POA_ImplementationRepository::ServerObject * const servant_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_ImplementationRepository::ServerObject::ping_skel (
@@ -405,28 +405,28 @@ void POA_ImplementationRepository::ServerObject::ping_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static CORBA::TypeCode_ptr const * const exceptions = 0;
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< void>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_ImplementationRepository::ServerObject * const impl =
     static_cast<POA_ImplementationRepository::ServerObject *> (servant);
 
   ping_ServerObject command (
     impl);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -439,15 +439,15 @@ void POA_ImplementationRepository::ServerObject::ping_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_ImplementationRepository
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class shutdown_ServerObject
     : public TAO::Upcall_Command
   {
@@ -457,22 +457,22 @@ namespace POA_ImplementationRepository
       : servant_ (servant)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       this->servant_->shutdown (
         ACE_ENV_SINGLE_ARG_PARAMETER);
-      
+
     }
-  
+
   private:
     POA_ImplementationRepository::ServerObject * const servant_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_ImplementationRepository::ServerObject::shutdown_skel (
@@ -482,28 +482,28 @@ void POA_ImplementationRepository::ServerObject::shutdown_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static CORBA::TypeCode_ptr const * const exceptions = 0;
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< void>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_ImplementationRepository::ServerObject * const impl =
     static_cast<POA_ImplementationRepository::ServerObject *> (servant);
 
   shutdown_ServerObject command (
     impl);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -516,19 +516,19 @@ void POA_ImplementationRepository::ServerObject::shutdown_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ss.cpp:169
 
 namespace POA_ImplementationRepository
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _is_a_ServerObject_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -542,68 +542,68 @@ namespace POA_ImplementationRepository
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< CORBA::Char *>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< CORBA::Char *, TAO::SArg_Traits< CORBA::Char *>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
-        
-      
+
+
       retval =
         this->servant_-> _is_a (
           arg_1
           ACE_ENV_ARG_PARAMETER);
-        
+
     }
-  
+
   private:
     POA_ImplementationRepository::ServerObject * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_ImplementationRepository::ServerObject::_is_a_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static CORBA::TypeCode_ptr const * const exceptions = 0;
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
   TAO::SArg_Traits< CORBA::Char *>::in_arg_val _tao_repository_id;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_repository_id
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_ImplementationRepository::ServerObject * const impl =
     static_cast<POA_ImplementationRepository::ServerObject *> (servant);
-  
+
   _is_a_ServerObject_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -616,16 +616,16 @@ void POA_ImplementationRepository::ServerObject::_is_a_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 namespace POA_ImplementationRepository
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _non_existent_ServerObject_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -639,59 +639,59 @@ namespace POA_ImplementationRepository
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
-      
+
+
       retval =
         this->servant_-> _non_existent (
           ACE_ENV_SINGLE_ARG_PARAMETER);
-        
+
     }
-  
+
   private:
     POA_ImplementationRepository::ServerObject * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_ImplementationRepository::ServerObject::_non_existent_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static CORBA::TypeCode_ptr const * const exceptions = 0;
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_ImplementationRepository::ServerObject * const impl =
     static_cast<POA_ImplementationRepository::ServerObject *> (servant);
-  
+
   _non_existent_ServerObject_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -704,18 +704,18 @@ void POA_ImplementationRepository::ServerObject::_non_existent_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ss.cpp:393
 
 
 
 void POA_ImplementationRepository::ServerObject::_interface_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
     ACE_ENV_ARG_DECL
@@ -725,30 +725,30 @@ void POA_ImplementationRepository::ServerObject::_interface_skel (
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-    
+
   if (_tao_adapter == 0)
     {
       ACE_THROW (CORBA::INTF_REPOS (CORBA::OMGVMCID | 1,
                                     CORBA::COMPLETED_NO));
     }
-  
+
   POA_ImplementationRepository::ServerObject * const impl =
     static_cast<POA_ImplementationRepository::ServerObject *> (servant);
-  CORBA::InterfaceDef_ptr _tao_retval = 
+  CORBA::InterfaceDef_ptr _tao_retval =
     impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   server_request.init_reply ();
   TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-  
+
   CORBA::Boolean const _tao_result =
     _tao_adapter->interfacedef_cdr_insert (
         _tao_out,
         _tao_retval
       );
-  
+
   _tao_adapter->dispose (_tao_retval);
-  
+
   if (_tao_result == 0)
     {
       ACE_THROW (CORBA::MARSHAL ());
@@ -757,11 +757,11 @@ void POA_ImplementationRepository::ServerObject::_interface_skel (
 
 namespace POA_ImplementationRepository
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // c:\cvsdoc\ace_wrappers\tao\tao_idl\be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_component_ServerObject_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -775,59 +775,59 @@ namespace POA_ImplementationRepository
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Object, TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
-      
+
+
       retval =
         this->servant_-> _get_component (
           ACE_ENV_SINGLE_ARG_PARAMETER);
-        
+
     }
-  
+
   private:
     POA_ImplementationRepository::ServerObject * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_ImplementationRepository::ServerObject::_component_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static CORBA::TypeCode_ptr const * const exceptions = 0;
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_ImplementationRepository::ServerObject * const impl =
     static_cast<POA_ImplementationRepository::ServerObject *> (servant);
-  
+
   _get_component_ServerObject_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -840,7 +840,7 @@ void POA_ImplementationRepository::ServerObject::_component_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 CORBA::Boolean POA_ImplementationRepository::ServerObject::_is_a (
@@ -889,22 +889,22 @@ POA_ImplementationRepository::ServerObject::_this (ACE_ENV_SINGLE_ARG_DECL)
 {
   TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   TAO_Stub_Auto_Ptr safe_stub (stub);
   CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-  
+
   CORBA::Boolean _tao_opt_colloc =
     stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-  
+
   ACE_NEW_RETURN (
       tmp,
       CORBA::Object (stub, _tao_opt_colloc, this),
       0
     );
-  
+
   CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
-  
+
   typedef ::ImplementationRepository::ServerObject STUB_SCOPED_NAME;
   return
     TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
diff --git a/TAO/tao/Invocation_Adapter.h b/TAO/tao/Invocation_Adapter.h
index d9f3ad21c1e..c464e06b644 100644
--- a/TAO/tao/Invocation_Adapter.h
+++ b/TAO/tao/Invocation_Adapter.h
@@ -29,8 +29,6 @@
 #include "tao/CORBA_methods.h"
 #include "tao/Pseudo_VarOut_T.h"
 
-
-struct TAO_Exception_Data;
 class TAO_Operation_Details;
 class TAO_Stub;
 class ACE_Time_Value;
@@ -267,7 +265,7 @@ namespace TAO
 
     /// String length of the operation name.
     int const op_len_;
-    
+
     /// Collocation proxy broker for this operation.
     Collocation_Proxy_Broker * const cpb_;
 
diff --git a/TAO/tao/Invocation_Base.cpp b/TAO/tao/Invocation_Base.cpp
index bcfa3ff6cef..7c0728b3c49 100644
--- a/TAO/tao/Invocation_Base.cpp
+++ b/TAO/tao/Invocation_Base.cpp
@@ -2,8 +2,6 @@
 #include "Stub.h"
 #include "operation_details.h"
 #include "ORB_Core.h"
-#include "TypeCode.h"
-#include "DynamicC.h"
 #include "SystemException.h"
 #include "PortableInterceptor.h"  /* Must always be visible. */
 
@@ -11,7 +9,6 @@
 
 #if TAO_HAS_INTERCEPTORS == 1
 # include "PortableInterceptorC.h"
-# include "RequestInfo_Util.h"
 # include "ClientRequestInterceptor_Adapter_Factory.h"
 #endif /* TAO_HAS_INTERCEPTORS == 1*/
 
@@ -75,73 +72,6 @@ namespace TAO
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-  char *
-  Invocation_Base::operation_name (void)
-  {
-    return const_cast<char *> (this->details_.opname ());
-  }
-
-  Dynamic::ParameterList *
-  Invocation_Base::arguments (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-  {
-    // Generate the argument list on demand.
-    Dynamic::ParameterList *parameter_list =
-      TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK_RETURN (0);
-
-    Dynamic::ParameterList_var safe_parameter_list = parameter_list;
-
-    if (this->details_.parameter_list (*parameter_list) == false)
-      ACE_THROW_RETURN (CORBA::MARSHAL (),
-                        0);
-
-    return safe_parameter_list._retn ();
-  }
-
-  Dynamic::ExceptionList *
-  Invocation_Base::exceptions (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-  {
-    // Generate the argument list on demand.
-    Dynamic::ExceptionList *exception_list =
-      TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK_RETURN (0);
-
-    Dynamic::ExceptionList_var safe_exception_list = exception_list;
-
-    if (this->details_.exception_list (*exception_list) == false)
-      ACE_THROW_RETURN (CORBA::MARSHAL (),
-                        0);
-
-    return safe_exception_list._retn ();
-  }
-
-  CORBA::Any *
-  Invocation_Base::result (ACE_ENV_SINGLE_ARG_DECL)
-    ACE_THROW_SPEC ((CORBA::SystemException))
-  {
-    // Generate the result on demand.
-    static const CORBA::Boolean tk_void_any = 0;
-    CORBA::Any *result_any =
-      TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (0);
-
-    CORBA::Any_var safe_result_any = result_any;
-
-    if (this->details_.result (result_any) == false)
-      ACE_THROW_RETURN (CORBA::MARSHAL (),
-                        0);
-
-    return safe_result_any._retn ();
-  }
-
-  CORBA::Octet
-  Invocation_Base::sync_scope (void) const
-  {
-    return this->details_.response_flags ();
-  }
-
   Invocation_Status
   Invocation_Base::send_request_interception (ACE_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
diff --git a/TAO/tao/Invocation_Base.h b/TAO/tao/Invocation_Base.h
index 65288736ecd..04488139d42 100644
--- a/TAO/tao/Invocation_Base.h
+++ b/TAO/tao/Invocation_Base.h
@@ -64,8 +64,8 @@ namespace TAO
   public:
     virtual ~Invocation_Base (void);
 
-    //@{
     /// Accessor and mutator methods
+    //@{
     TAO_ORB_Core *orb_core (void) const;
 
     TAO_Stub *stub (void) const;
@@ -109,6 +109,9 @@ namespace TAO
 
     /// Does this invocation return a response?
     CORBA::Boolean response_expected (void) const;
+
+    /// The operaton details of the invocation
+    TAO_Operation_Details &operation_details (void);
     //@}
 
   protected:
@@ -171,28 +174,6 @@ namespace TAO
     //@{
 #if TAO_HAS_INTERCEPTORS == 1
   public:
-    /// Return the name of the operation.
-    char *operation_name (void);
-
-    /// Return the list of arguments as a ParameterList
-    /**
-     * It is declared virtual so that the DynamicInterface can use its
-     * own way of creating the ParameterList.
-     */
-    virtual Dynamic::ParameterList *arguments (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    /// Return the list of exceptions declared as a ExceptionList
-    Dynamic::ExceptionList *exceptions (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    /// Return the result of the operation as an Any.
-    CORBA::Any * result (ACE_ENV_SINGLE_ARG_DECL)
-      ACE_THROW_SPEC ((CORBA::SystemException));
-
-    /// Return the syncscope policy of the operation.
-    CORBA::Octet sync_scope (void) const;
-
     /// Return a reference to the number of interceptors pushed on to
     /// the current interceptor flow stack.
     /**
diff --git a/TAO/tao/Invocation_Base.inl b/TAO/tao/Invocation_Base.inl
index cf534126a6a..fcdf1d95f41 100644
--- a/TAO/tao/Invocation_Base.inl
+++ b/TAO/tao/Invocation_Base.inl
@@ -56,6 +56,12 @@ namespace TAO
     return this->target_;
   }
 
+  ACE_INLINE TAO_Operation_Details &
+  Invocation_Base::operation_details (void)
+  {
+    return this->details_;
+  }
+
 #if TAO_HAS_INTERCEPTORS == 1
   ACE_INLINE size_t &
   Invocation_Base::stack_size  (void)
diff --git a/TAO/tao/Leader_Follower_Flushing_Strategy.h b/TAO/tao/Leader_Follower_Flushing_Strategy.h
index ab2f4094968..630b0302a8a 100644
--- a/TAO/tao/Leader_Follower_Flushing_Strategy.h
+++ b/TAO/tao/Leader_Follower_Flushing_Strategy.h
@@ -27,7 +27,7 @@
  * @brief Implement a flushing strategy that uses the Leader/Follower
  *        set.
  */
-class TAO_Export TAO_Leader_Follower_Flushing_Strategy 
+class TAO_Leader_Follower_Flushing_Strategy
   : public TAO_Flushing_Strategy
 {
 public:
diff --git a/TAO/tao/LongDoubleSeqA.cpp b/TAO/tao/LongDoubleSeqA.cpp
deleted file mode 100644
index fe577fac602..00000000000
--- a/TAO/tao/LongDoubleSeqA.cpp
+++ /dev/null
@@ -1,142 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "LongDoubleSeqC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Sequence_TypeCode_Static.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Dual_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:937
-
-
-#ifndef _TAO_TYPECODE_CORBA_LongDoubleSeq_GUARD
-#define _TAO_TYPECODE_CORBA_LongDoubleSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_LongDoubleSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_longdouble,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_LongDoubleSeq_0 =
-      &CORBA_LongDoubleSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_LongDoubleSeq_GUARD */
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_LongDoubleSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/LongDoubleSeq:1.0",
-    "LongDoubleSeq",
-    &TAO::TypeCode::tc_CORBA_LongDoubleSeq_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_LongDoubleSeq =
-    &_tao_tc_CORBA_LongDoubleSeq;
-}
-
-
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::LongDoubleSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::LongDoubleSeq>::insert_copy (
-      _tao_any,
-      CORBA::LongDoubleSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_LongDoubleSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::LongDoubleSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::LongDoubleSeq>::insert (
-      _tao_any,
-      CORBA::LongDoubleSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_LongDoubleSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::LongDoubleSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::LongDoubleSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::LongDoubleSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::LongDoubleSeq>::extract (
-        _tao_any,
-        CORBA::LongDoubleSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_LongDoubleSeq_0,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/LongDoubleSeqC.h b/TAO/tao/LongDoubleSeqC.h
index bdcba518788..87a2dcaab12 100644
--- a/TAO/tao/LongDoubleSeqC.h
+++ b/TAO/tao/LongDoubleSeqC.h
@@ -66,22 +66,22 @@
 
 namespace CORBA
 {
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_LONGDOUBLESEQ_CH_)
 #define _CORBA_LONGDOUBLESEQ_CH_
-  
+
   class LongDoubleSeq;
-  
+
   typedef
     TAO_FixedSeq_Var_T<
         LongDoubleSeq,
         CORBA::LongDouble
       >
     LongDoubleSeq_var;
-  
+
   typedef
     TAO_Seq_Out_T<
         LongDoubleSeq,
@@ -89,7 +89,7 @@ namespace CORBA
         CORBA::LongDouble
       >
     LongDoubleSeq_out;
-  
+
   class TAO_Export LongDoubleSeq
     : public
         TAO_Unbounded_Sequence<
@@ -102,23 +102,18 @@ namespace CORBA
     LongDoubleSeq (
         CORBA::ULong max,
         CORBA::ULong length,
-        CORBA::LongDouble* buffer, 
+        CORBA::LongDouble* buffer,
         CORBA::Boolean release = 0
       );
     LongDoubleSeq (const LongDoubleSeq &);
     ~LongDoubleSeq (void);
-    
+
     static void _tao_any_destructor (void *);
-    
+
     typedef LongDoubleSeq_var _var_type;
   };
 
 #endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_LongDoubleSeq;
 
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:66
@@ -134,14 +129,6 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const CORBA::LongDoubleSeq &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, CORBA::LongDoubleSeq*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::LongDoubleSeq *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::LongDoubleSeq *&);
-
-// TAO_IDL - Generated from
 // be\be_visitor_sequence/cdr_op_ch.cpp:71
 
 #if !defined _TAO_CDR_OP_CORBA_LongDoubleSeq_H_
diff --git a/TAO/tao/LongLongSeqA.cpp b/TAO/tao/LongLongSeqA.cpp
deleted file mode 100644
index 26cd80eaacc..00000000000
--- a/TAO/tao/LongLongSeqA.cpp
+++ /dev/null
@@ -1,142 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "LongLongSeqC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Sequence_TypeCode_Static.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Dual_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:937
-
-
-#ifndef _TAO_TYPECODE_CORBA_LongLongSeq_GUARD
-#define _TAO_TYPECODE_CORBA_LongLongSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_LongLongSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_longlong,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_LongLongSeq_0 =
-      &CORBA_LongLongSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_LongLongSeq_GUARD */
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_LongLongSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/LongLongSeq:1.0",
-    "LongLongSeq",
-    &TAO::TypeCode::tc_CORBA_LongLongSeq_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_LongLongSeq =
-    &_tao_tc_CORBA_LongLongSeq;
-}
-
-
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::LongLongSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::LongLongSeq>::insert_copy (
-      _tao_any,
-      CORBA::LongLongSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_LongLongSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::LongLongSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::LongLongSeq>::insert (
-      _tao_any,
-      CORBA::LongLongSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_LongLongSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::LongLongSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::LongLongSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::LongLongSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::LongLongSeq>::extract (
-        _tao_any,
-        CORBA::LongLongSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_LongLongSeq_0,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/LongLongSeqC.h b/TAO/tao/LongLongSeqC.h
index 2d5de085d1b..78c8d8223b9 100644
--- a/TAO/tao/LongLongSeqC.h
+++ b/TAO/tao/LongLongSeqC.h
@@ -66,22 +66,22 @@
 
 namespace CORBA
 {
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_LONGLONGSEQ_CH_)
 #define _CORBA_LONGLONGSEQ_CH_
-  
+
   class LongLongSeq;
-  
+
   typedef
     TAO_FixedSeq_Var_T<
         LongLongSeq,
         CORBA::LongLong
       >
     LongLongSeq_var;
-  
+
   typedef
     TAO_Seq_Out_T<
         LongLongSeq,
@@ -89,7 +89,7 @@ namespace CORBA
         CORBA::LongLong
       >
     LongLongSeq_out;
-  
+
   class TAO_Export LongLongSeq
     : public
         TAO_Unbounded_Sequence<
@@ -102,23 +102,18 @@ namespace CORBA
     LongLongSeq (
         CORBA::ULong max,
         CORBA::ULong length,
-        CORBA::LongLong* buffer, 
+        CORBA::LongLong* buffer,
         CORBA::Boolean release = 0
       );
     LongLongSeq (const LongLongSeq &);
     ~LongLongSeq (void);
-    
+
     static void _tao_any_destructor (void *);
-    
+
     typedef LongLongSeq_var _var_type;
   };
 
 #endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_LongLongSeq;
 
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:66
@@ -134,14 +129,6 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const CORBA::LongLongSeq &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, CORBA::LongLongSeq*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::LongLongSeq *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::LongLongSeq *&);
-
-// TAO_IDL - Generated from
 // be\be_visitor_sequence/cdr_op_ch.cpp:71
 
 #if !defined _TAO_CDR_OP_CORBA_LongLongSeq_H_
diff --git a/TAO/tao/LongSeqA.cpp b/TAO/tao/LongSeqA.cpp
deleted file mode 100644
index 3664a6f3f21..00000000000
--- a/TAO/tao/LongSeqA.cpp
+++ /dev/null
@@ -1,142 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "LongSeqC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Sequence_TypeCode_Static.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Dual_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:937
-
-
-#ifndef _TAO_TYPECODE_CORBA_LongSeq_GUARD
-#define _TAO_TYPECODE_CORBA_LongSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_LongSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_long,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_LongSeq_0 =
-      &CORBA_LongSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_LongSeq_GUARD */
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_LongSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/LongSeq:1.0",
-    "LongSeq",
-    &TAO::TypeCode::tc_CORBA_LongSeq_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_LongSeq =
-    &_tao_tc_CORBA_LongSeq;
-}
-
-
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::LongSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::LongSeq>::insert_copy (
-      _tao_any,
-      CORBA::LongSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_LongSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::LongSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::LongSeq>::insert (
-      _tao_any,
-      CORBA::LongSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_LongSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::LongSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::LongSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::LongSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::LongSeq>::extract (
-        _tao_any,
-        CORBA::LongSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_LongSeq_0,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/LongSeqC.h b/TAO/tao/LongSeqC.h
index 4e027ef765a..4fd2f60e996 100644
--- a/TAO/tao/LongSeqC.h
+++ b/TAO/tao/LongSeqC.h
@@ -66,22 +66,22 @@
 
 namespace CORBA
 {
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_LONGSEQ_CH_)
 #define _CORBA_LONGSEQ_CH_
-  
+
   class LongSeq;
-  
+
   typedef
     TAO_FixedSeq_Var_T<
         LongSeq,
         CORBA::Long
       >
     LongSeq_var;
-  
+
   typedef
     TAO_Seq_Out_T<
         LongSeq,
@@ -89,7 +89,7 @@ namespace CORBA
         CORBA::Long
       >
     LongSeq_out;
-  
+
   class TAO_Export LongSeq
     : public
         TAO_Unbounded_Sequence<
@@ -102,23 +102,18 @@ namespace CORBA
     LongSeq (
         CORBA::ULong max,
         CORBA::ULong length,
-        CORBA::Long* buffer, 
+        CORBA::Long* buffer,
         CORBA::Boolean release = 0
       );
     LongSeq (const LongSeq &);
     ~LongSeq (void);
-    
+
     static void _tao_any_destructor (void *);
-    
+
     typedef LongSeq_var _var_type;
   };
 
 #endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_LongSeq;
 
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:66
@@ -134,14 +129,6 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const CORBA::LongSeq &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, CORBA::LongSeq*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::LongSeq *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::LongSeq *&);
-
-// TAO_IDL - Generated from
 // be\be_visitor_sequence/cdr_op_ch.cpp:71
 
 #if !defined _TAO_CDR_OP_CORBA_LongSeq_H_
diff --git a/TAO/tao/Marshal.cpp b/TAO/tao/Marshal.cpp
deleted file mode 100644
index b63181880a5..00000000000
--- a/TAO/tao/Marshal.cpp
+++ /dev/null
@@ -1,262 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    marshal.cpp
-//
-// = DESCRIPTION
-//   Implements the Marshal_Object class and the factory
-//
-//   The original encoder and decoder code now appears in files encode.cpp and
-//   decode.cpp
-//
-// = AUTHOR
-//     Copyright 1994-1995 by Sun Microsystems Inc.
-//     and
-//     Aniruddha Gokhale
-//
-// ============================================================================
-
-#include "tao/Marshal.h"
-#include "tao/TypeCode.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tao/Marshal.i"
-#endif /* ! __ACE_INLINE__ */
-
-ACE_RCSID (tao,
-           Marshal, 
-           "$Id$")
-
-TAO_Marshal_Object::~TAO_Marshal_Object (void)
-{
-}
-
-TAO::traverse_status
-TAO_Marshal_Object::perform_skip (CORBA::TypeCode_ptr tc,
-                                  TAO_InputCDR *stream
-                                  ACE_ENV_ARG_DECL)
-{
-  CORBA::ULong kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-  switch (kind)
-    {
-    default:
-    case CORBA::tk_fixed:
-    case CORBA::tk_value_box:
-    case CORBA::tk_native:
-    case CORBA::tk_abstract_interface:
-    case CORBA::tk_component:
-    case CORBA::tk_home:
-      // @@ We don't know how to handle any of them yet.
-      return TAO::TRAVERSE_STOP;
-
-    case CORBA::tk_null:
-    case CORBA::tk_void:
-    case CORBA::tk_short:
-    case CORBA::tk_long:
-    case CORBA::tk_ushort:
-    case CORBA::tk_ulong:
-    case CORBA::tk_float:
-    case CORBA::tk_double:
-    case CORBA::tk_boolean:
-    case CORBA::tk_char:
-    case CORBA::tk_octet:
-    case CORBA::tk_longlong:
-    case CORBA::tk_ulonglong:
-    case CORBA::tk_longdouble:
-    case CORBA::tk_wchar:
-    case CORBA::tk_enum:
-      {
-        TAO_Marshal_Primitive marshal;
-        return marshal.skip (tc, stream ACE_ENV_ARG_PARAMETER);
-      }
-
-    case CORBA::tk_any:
-      {
-        TAO_Marshal_Any marshal;
-        return marshal.skip (tc, stream ACE_ENV_ARG_PARAMETER);
-      }
-    case CORBA::tk_TypeCode:
-      {
-        TAO_Marshal_TypeCode marshal;
-        return marshal.skip (tc, stream ACE_ENV_ARG_PARAMETER);
-      }
-    case CORBA::tk_Principal:
-      {
-        TAO_Marshal_Principal marshal;
-        return marshal.skip (tc, stream ACE_ENV_ARG_PARAMETER);
-      }
-    case CORBA::tk_objref:
-      {
-        TAO_Marshal_ObjRef marshal;
-        return marshal.skip (tc, stream ACE_ENV_ARG_PARAMETER);
-      }
-    case CORBA::tk_struct:
-      {
-        TAO_Marshal_Struct marshal;
-        return marshal.skip (tc, stream ACE_ENV_ARG_PARAMETER);
-      }
-    case CORBA::tk_union:
-      {
-        TAO_Marshal_Union marshal;
-        return marshal.skip (tc, stream ACE_ENV_ARG_PARAMETER);
-      }
-    case CORBA::tk_string:
-      {
-        TAO_Marshal_String marshal;
-        return marshal.skip (tc, stream ACE_ENV_ARG_PARAMETER);
-      }
-    case CORBA::tk_sequence:
-      {
-        TAO_Marshal_Sequence marshal;
-        return marshal.skip (tc, stream ACE_ENV_ARG_PARAMETER);
-      }
-    case CORBA::tk_array:
-      {
-        TAO_Marshal_Array marshal;
-        return marshal.skip (tc, stream ACE_ENV_ARG_PARAMETER);
-      }
-    case CORBA::tk_alias:
-      {
-        TAO_Marshal_Alias marshal;
-        return marshal.skip (tc, stream ACE_ENV_ARG_PARAMETER);
-      }
-    case CORBA::tk_except:
-      {
-        TAO_Marshal_Except marshal;
-        return marshal.skip (tc, stream ACE_ENV_ARG_PARAMETER);
-      }
-    case CORBA::tk_wstring:
-      {
-        TAO_Marshal_WString marshal;
-        return marshal.skip (tc, stream ACE_ENV_ARG_PARAMETER);
-      }
-    case CORBA::tk_value:
-      {
-        TAO_Marshal_Value marshal;
-        return marshal.skip (tc, stream ACE_ENV_ARG_PARAMETER);
-      }
-    }
-}
-
-TAO::traverse_status
-TAO_Marshal_Object::perform_append (CORBA::TypeCode_ptr tc,
-                                    TAO_InputCDR *src,
-                                    TAO_OutputCDR *dest
-                                    ACE_ENV_ARG_DECL)
-{
-  CORBA::ULong kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-  switch (kind)
-    {
-    default:
-    case CORBA::tk_fixed:
-    case CORBA::tk_value_box:
-    case CORBA::tk_native:
-    case CORBA::tk_abstract_interface:
-    case CORBA::tk_component:
-    case CORBA::tk_home:
-      // @@ We don't know how to handle any of them yet.
-      return TAO::TRAVERSE_STOP;
-
-    case CORBA::tk_null:
-    case CORBA::tk_void:
-    case CORBA::tk_short:
-    case CORBA::tk_long:
-    case CORBA::tk_ushort:
-    case CORBA::tk_ulong:
-    case CORBA::tk_float:
-    case CORBA::tk_double:
-    case CORBA::tk_boolean:
-    case CORBA::tk_char:
-    case CORBA::tk_octet:
-    case CORBA::tk_longlong:
-    case CORBA::tk_ulonglong:
-    case CORBA::tk_longdouble:
-    case CORBA::tk_wchar:
-    case CORBA::tk_enum:
-      {
-        TAO_Marshal_Primitive marshal;
-        return marshal.append (tc, src, dest ACE_ENV_ARG_PARAMETER);
-      }
-
-    case CORBA::tk_any:
-      {
-        TAO_Marshal_Any marshal;
-        return marshal.append (tc, src, dest ACE_ENV_ARG_PARAMETER);
-      }
-    case CORBA::tk_TypeCode:
-      {
-        TAO_Marshal_TypeCode marshal;
-        return marshal.append (tc, src, dest ACE_ENV_ARG_PARAMETER);
-      }
-    case CORBA::tk_Principal:
-      {
-        TAO_Marshal_Principal marshal;
-        return marshal.append (tc, src, dest ACE_ENV_ARG_PARAMETER);
-      }
-    case CORBA::tk_objref:
-      {
-        TAO_Marshal_ObjRef marshal;
-        return marshal.append (tc, src, dest ACE_ENV_ARG_PARAMETER);
-      }
-    case CORBA::tk_struct:
-      {
-        TAO_Marshal_Struct marshal;
-        return marshal.append (tc, src, dest ACE_ENV_ARG_PARAMETER);
-      }
-    case CORBA::tk_union:
-      {
-        TAO_Marshal_Union marshal;
-        return marshal.append (tc, src, dest ACE_ENV_ARG_PARAMETER);
-      }
-    case CORBA::tk_string:
-      {
-        TAO_Marshal_String marshal;
-        return marshal.append (tc, src, dest ACE_ENV_ARG_PARAMETER);
-      }
-    case CORBA::tk_sequence:
-      {
-        TAO_Marshal_Sequence marshal;
-        return marshal.append (tc, src, dest ACE_ENV_ARG_PARAMETER);
-      }
-    case CORBA::tk_array:
-      {
-        TAO_Marshal_Array marshal;
-        return marshal.append (tc, src, dest ACE_ENV_ARG_PARAMETER);
-      }
-    case CORBA::tk_alias:
-      {
-        TAO_Marshal_Alias marshal;
-        return marshal.append (tc, src, dest ACE_ENV_ARG_PARAMETER);
-      }
-    case CORBA::tk_except:
-      {
-        TAO_Marshal_Except marshal;
-        return marshal.append (tc, src, dest ACE_ENV_ARG_PARAMETER);
-      }
-    case CORBA::tk_wstring:
-      {
-        TAO_Marshal_WString marshal;
-        return marshal.append (tc, src, dest ACE_ENV_ARG_PARAMETER);
-      }
-    case CORBA::tk_value:
-      {
-        TAO_Marshal_Value marshal;
-        return marshal.append (tc, src, dest ACE_ENV_ARG_PARAMETER);
-      }
-    }
-}
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/Marshal.h b/TAO/tao/Marshal.h
deleted file mode 100644
index 2fee59a0e01..00000000000
--- a/TAO/tao/Marshal.h
+++ /dev/null
@@ -1,455 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Marshal.h
- *
- *  $Id$
- *
- *   Classes that marshal various IDL data types.
- *
- *
- *  @author  Aniruddha S. Gokhale
- */
-//=============================================================================
-
-
-#ifndef TAO_MARSHAL_H
-#define TAO_MARSHAL_H
-
-#include /**/ "ace/pre.h"
-#include "ace/CORBA_macros.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TAO_Export.h"
-#include "tao/Basic_Types.h"
-
-namespace CORBA
-{
-  class TypeCode;
-  typedef TypeCode *TypeCode_ptr;
-
-  class Environment;
-}
-
-class TAO_OutputCDR;
-class TAO_InputCDR;
-
-// = Forward declarations.
-class TAO_Marshal_Object;
-class TAO_Marshal_Primitive;
-class TAO_Marshal_Any;
-class TAO_Marshal_TypeCode;
-class TAO_Marshal_Principal;
-class TAO_Marshal_ObjRef;
-class TAO_Marshal_Struct;
-class TAO_Marshal_Union;
-class TAO_Marshal_String;
-class TAO_Marshal_Sequence;
-class TAO_Marshal_Array;
-class TAO_Marshal_Alias;
-class TAO_Marshal_Except;
-class TAO_Marshal_WString;
-class TAO_Marshal_Value;
-
-namespace TAO
-{
-  enum traverse_status
-    {
-      TRAVERSE_STOP,
-      TRAVERSE_CONTINUE
-    };
-}
-
-/**
- * @class TAO_Marshal_Object
- *
- * @brief TAO_Marshal_Object
- *
- * The Marshaling object that provides a common interface to the
- * CDR object for marshaling different IDL data types
- * Provides a set of virtual methods for appending and skipping
- * data over a CDR stream.
- */
-class TAO_Export TAO_Marshal_Object
-{
-public:
-  /// constructor
-  TAO_Marshal_Object (void);
-
-  /// destructor
-  virtual ~TAO_Marshal_Object (void);
-
-  /// skip entry point, it allocates the right kind of Marshal_Object
-  /// and invokes skip on it.
-  static TAO::traverse_status perform_skip (CORBA::TypeCode_ptr tc,
-                                            TAO_InputCDR *context
-                                            ACE_ENV_ARG_DECL);
-
-  /// skip operation
-  virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc,
-                                     TAO_InputCDR *context
-                                     ACE_ENV_ARG_DECL) = 0;
-
-  /// append entry point, it allocates the right kind of Marshal_Object
-  /// and invokes skip on it.
-  static TAO::traverse_status perform_append (CORBA::TypeCode_ptr tc,
-                                              TAO_InputCDR *src,
-                                              TAO_OutputCDR *dest
-                                              ACE_ENV_ARG_DECL);
-
-  /// append operation
-  virtual TAO::traverse_status append (CORBA::TypeCode_ptr tc,
-                                       TAO_InputCDR *src,
-                                       TAO_OutputCDR *dest
-                                       ACE_ENV_ARG_DECL) = 0;
-};
-
-/**
- * @class TAO_Marshal_Primitive:
- *
- * @brief TAO_Marshal_Primitive
- *
- * marshaling primitives
- */
-class TAO_Export TAO_Marshal_Primitive: public TAO_Marshal_Object
-{
-public:
-  TAO_Marshal_Primitive (void);
-
-  /// skip operation
-  virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc,
-                                     TAO_InputCDR *context
-                                     ACE_ENV_ARG_DECL);
-
-  /// append operation
-  virtual TAO::traverse_status append (CORBA::TypeCode_ptr tc,
-                                       TAO_InputCDR *src,
-                                       TAO_OutputCDR *dest
-                                       ACE_ENV_ARG_DECL);
-};
-
-/**
- * @class TAO_Marshal_Any:
- *
- * @brief TAO_Marshal_Any
- *
- * Marshal an Any
- */
-class TAO_Export TAO_Marshal_Any: public TAO_Marshal_Object
-{
-public:
-  TAO_Marshal_Any (void);
-
-  /// skip operation
-  virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc,
-                                     TAO_InputCDR *context
-                                     ACE_ENV_ARG_DECL);
-
-  /// append operation
-  virtual TAO::traverse_status append (CORBA::TypeCode_ptr tc,
-                                       TAO_InputCDR *src,
-                                       TAO_OutputCDR *dest
-                                       ACE_ENV_ARG_DECL);
-};
-
-/**
- * @class TAO_Marshal_TypeCode:
- *
- * @brief TAO_Marshal_TypeCode
- *
- * marshal a typecode
- */
-class TAO_Export TAO_Marshal_TypeCode: public TAO_Marshal_Object
-{
-public:
-  TAO_Marshal_TypeCode (void);
-
-  /// skip operation
-  virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc,
-                                     TAO_InputCDR *context
-                                     ACE_ENV_ARG_DECL);
-
-  /// append operation
-  virtual TAO::traverse_status append (CORBA::TypeCode_ptr tc,
-                                       TAO_InputCDR *src,
-                                       TAO_OutputCDR *dest
-                                       ACE_ENV_ARG_DECL);
-};
-
-/**
- * @class TAO_Marshal_Principal:
- *
- * @brief TAO_Marshal_Principal
- *
- * marshal a principal
- */
-class TAO_Export TAO_Marshal_Principal: public TAO_Marshal_Object
-{
-public:
-  TAO_Marshal_Principal (void);
-
-  /// skip operation
-  virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc,
-                                     TAO_InputCDR *context
-                                     ACE_ENV_ARG_DECL);
-
-  /// append operation
-  virtual TAO::traverse_status append (CORBA::TypeCode_ptr tc,
-                                       TAO_InputCDR *src,
-                                       TAO_OutputCDR *dest
-                                       ACE_ENV_ARG_DECL);
-};
-
-/**
- * @class TAO_Marshal_ObjRef:
- *
- * @brief TAO_Marshal_ObjRef
- *
- * marshal an object reference
- */
-class TAO_Export TAO_Marshal_ObjRef: public TAO_Marshal_Object
-{
-public:
-  TAO_Marshal_ObjRef (void);
-
-  /// skip operation
-  virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc,
-                                     TAO_InputCDR *context
-                                     ACE_ENV_ARG_DECL);
-
-  /// append operation
-  virtual TAO::traverse_status append (CORBA::TypeCode_ptr tc,
-                                       TAO_InputCDR *src,
-                                       TAO_OutputCDR *dest
-                                       ACE_ENV_ARG_DECL);
-};
-
-/**
- * @class TAO_Marshal_Struct:
- *
- * @brief TAO_Marshal_Struct
- *
- * marshal a struct
- */
-class TAO_Export TAO_Marshal_Struct: public TAO_Marshal_Object
-{
-public:
-  TAO_Marshal_Struct (void);
-
-  /// skip operation
-  virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc,
-                                     TAO_InputCDR *context
-                                     ACE_ENV_ARG_DECL);
-
-  /// append operation
-  virtual TAO::traverse_status append (CORBA::TypeCode_ptr tc,
-                                       TAO_InputCDR *src,
-                                       TAO_OutputCDR *dest
-                                       ACE_ENV_ARG_DECL);
-};
-
-/**
- * @class TAO_Marshal_Union:
- *
- * @brief TAO_Marshal_Union
- *
- * marshal a union
- */
-class TAO_Export TAO_Marshal_Union: public TAO_Marshal_Object
-{
-public:
-  TAO_Marshal_Union (void);
-
-  /// skip operation
-  virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc,
-                                     TAO_InputCDR *context
-                                     ACE_ENV_ARG_DECL);
-
-  /// append operation
-  virtual TAO::traverse_status append (CORBA::TypeCode_ptr tc,
-                                       TAO_InputCDR *src,
-                                       TAO_OutputCDR *dest
-                                       ACE_ENV_ARG_DECL);
-};
-
-/**
- * @class TAO_Marshal_String:
- *
- * @brief TAO_Marshal_String
- *
- * marshal a string
- */
-class TAO_Export TAO_Marshal_String: public TAO_Marshal_Object
-{
-public:
-  TAO_Marshal_String (void);
-
-  /// skip operation
-  virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc,
-                                     TAO_InputCDR *context
-                                     ACE_ENV_ARG_DECL);
-
-  /// append operation
-  virtual TAO::traverse_status append (CORBA::TypeCode_ptr tc,
-                                       TAO_InputCDR *src,
-                                       TAO_OutputCDR *dest
-                                       ACE_ENV_ARG_DECL);
-};
-
-/**
- * @class TAO_Marshal_Sequence:
- *
- * @brief TAO_Marshal_Sequence
- *
- * marshal a sequence
- */
-class TAO_Export TAO_Marshal_Sequence: public TAO_Marshal_Object
-{
-public:
-  TAO_Marshal_Sequence (void);
-
-  /// skip operation
-  virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc,
-                                     TAO_InputCDR *context
-                                     ACE_ENV_ARG_DECL);
-
-  /// append operation
-  virtual TAO::traverse_status append (CORBA::TypeCode_ptr tc,
-                                       TAO_InputCDR *src,
-                                       TAO_OutputCDR *dest
-                                       ACE_ENV_ARG_DECL);
-};
-
-/**
- * @class TAO_Marshal_Array:
- *
- * @brief TAO_Marshal_Array
- *
- * marshal an array
- */
-class TAO_Export TAO_Marshal_Array: public TAO_Marshal_Object
-{
-public:
-  TAO_Marshal_Array (void);
-
-  /// skip operation
-  virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc,
-                                     TAO_InputCDR *context
-                                     ACE_ENV_ARG_DECL);
-
-  /// append operation
-  virtual TAO::traverse_status append (CORBA::TypeCode_ptr tc,
-                                       TAO_InputCDR *src,
-                                       TAO_OutputCDR *dest
-                                       ACE_ENV_ARG_DECL);
-};
-
-/**
- * @class TAO_Marshal_Alias:
- *
- * @brief TAO_Marshal_Alias
- *
- * marshal an alias
- */
-class TAO_Export TAO_Marshal_Alias: public TAO_Marshal_Object
-{
-public:
-  TAO_Marshal_Alias (void);
-
-  /// skip operation
-  virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc,
-                                     TAO_InputCDR *context
-                                     ACE_ENV_ARG_DECL);
-
-  /// append operation
-  virtual TAO::traverse_status append (CORBA::TypeCode_ptr tc,
-                                       TAO_InputCDR *src,
-                                       TAO_OutputCDR *dest
-                                       ACE_ENV_ARG_DECL);
-};
-
-/**
- * @class TAO_Marshal_Except:
- *
- * @brief TAO_Marshal_Except
- *
- * marshal an exception
- */
-class TAO_Export TAO_Marshal_Except: public TAO_Marshal_Object
-{
-public:
-  TAO_Marshal_Except (void);
-
-  /// skip operation
-  virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc,
-                                     TAO_InputCDR *context
-                                     ACE_ENV_ARG_DECL);
-
-  /// append operation
-  virtual TAO::traverse_status append (CORBA::TypeCode_ptr tc,
-                                       TAO_InputCDR *src,
-                                       TAO_OutputCDR *dest
-                                       ACE_ENV_ARG_DECL);
-};
-
-/**
- * @class TAO_Marshal_WString
- *
- * @brief TAO_Marshal_WString
- *
- * marshal a wide string
- */
-class TAO_Export TAO_Marshal_WString : public TAO_Marshal_Object
-{
-public:
-  TAO_Marshal_WString (void);
-
-  /// skip operation
-  virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc,
-                                     TAO_InputCDR *context
-                                     ACE_ENV_ARG_DECL);
-
-  /// append operation
-  virtual TAO::traverse_status append (CORBA::TypeCode_ptr tc,
-                                       TAO_InputCDR *src,
-                                       TAO_OutputCDR *dest
-                                       ACE_ENV_ARG_DECL);
-};
-
-/**
- * @class TAO_Marshal_Value:
- *
- * @brief TAO_Marshal_Value
- *
- * marshal a valuetype
- */
-class TAO_Export TAO_Marshal_Value: public TAO_Marshal_Object
-{
-public:
-  TAO_Marshal_Value (void);
-
-  /// skip operation
-  virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc,
-                                     TAO_InputCDR *context
-                                     ACE_ENV_ARG_DECL);
-
-  /// append operation
-  virtual TAO::traverse_status append (CORBA::TypeCode_ptr tc,
-                                       TAO_InputCDR *src,
-                                       TAO_OutputCDR *dest
-                                       ACE_ENV_ARG_DECL);
-
-private:
-  CORBA::Boolean nested_processing_;
-};
-
-#if defined (__ACE_INLINE__)
-# include "tao/Marshal.i"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-#endif /* TAO_MARSHAL_H */
diff --git a/TAO/tao/Marshal.i b/TAO/tao/Marshal.i
deleted file mode 100644
index 8b78849a003..00000000000
--- a/TAO/tao/Marshal.i
+++ /dev/null
@@ -1,77 +0,0 @@
-//$Id$
-
-ACE_INLINE
-TAO_Marshal_Object::TAO_Marshal_Object (void)
-{
-}
-
-ACE_INLINE
-TAO_Marshal_Primitive::TAO_Marshal_Primitive (void)
-{
-}
-
-ACE_INLINE
-TAO_Marshal_Any::TAO_Marshal_Any (void)
-{
-}
-
-ACE_INLINE
-TAO_Marshal_Principal::TAO_Marshal_Principal (void)
-{
-}
-
-ACE_INLINE
-TAO_Marshal_TypeCode::TAO_Marshal_TypeCode (void)
-{
-}
-
-ACE_INLINE
-TAO_Marshal_ObjRef::TAO_Marshal_ObjRef (void)
-{
-}
-
-ACE_INLINE
-TAO_Marshal_Struct::TAO_Marshal_Struct (void)
-{
-}
-
-ACE_INLINE
-TAO_Marshal_Union::TAO_Marshal_Union (void)
-{
-}
-
-ACE_INLINE
-TAO_Marshal_String::TAO_Marshal_String (void)
-{
-}
-
-ACE_INLINE
-TAO_Marshal_Sequence::TAO_Marshal_Sequence (void)
-{
-}
-
-ACE_INLINE
-TAO_Marshal_Array::TAO_Marshal_Array (void)
-{
-}
-
-ACE_INLINE
-TAO_Marshal_Alias::TAO_Marshal_Alias (void)
-{
-}
-
-ACE_INLINE
-TAO_Marshal_Except::TAO_Marshal_Except (void)
-{
-}
-
-ACE_INLINE
-TAO_Marshal_WString::TAO_Marshal_WString (void)
-{
-}
-
-ACE_INLINE
-TAO_Marshal_Value::TAO_Marshal_Value (void)
-  : nested_processing_ (0)
-{
-}
diff --git a/TAO/tao/Messaging.mpc b/TAO/tao/Messaging.mpc
index 5a8e8333115..a5dafc89186 100644
--- a/TAO/tao/Messaging.mpc
+++ b/TAO/tao/Messaging.mpc
@@ -27,6 +27,9 @@ project : taolib, core, portableserver, pi, valuetype {
     Messaging
   }
 
+  IDL_Files {
+  }
+
   Pkgconfig_Files {
     Messaging/TAO_Messaging.pc.in
   }
diff --git a/TAO/tao/Messaging/Connection_Timeout_Policy_i.cpp b/TAO/tao/Messaging/Connection_Timeout_Policy_i.cpp
index 56a75c6984d..df49288c887 100644
--- a/TAO/tao/Messaging/Connection_Timeout_Policy_i.cpp
+++ b/TAO/tao/Messaging/Connection_Timeout_Policy_i.cpp
@@ -3,7 +3,7 @@
 #include "tao/ORB_Core.h"
 #include "tao/Stub.h"
 #include "tao/debug.h"
-
+#include "tao/AnyTypeCode/Any.h"
 
 ACE_RCSID (Messaging,
            Connection_Timeout_Policy_i,
diff --git a/TAO/tao/Messaging/Messaging.cpp b/TAO/tao/Messaging/Messaging.cpp
index f500acc331b..8b245a2ac34 100644
--- a/TAO/tao/Messaging/Messaging.cpp
+++ b/TAO/tao/Messaging/Messaging.cpp
@@ -54,10 +54,9 @@ exception_holder_raise (TAO::Exception_Data *exception_data,
           (_tao_in >> completion) == 0)
         ACE_THROW (CORBA::MARSHAL (TAO::VMCID,
                                    CORBA::COMPLETED_MAYBE));
+
       CORBA::SystemException* exception =
-        TAO_Exceptions::create_system_exception (type_id.in ()
-                                                 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
+        TAO_Exceptions::create_system_exception (type_id.in ());
 
       if (exception == 0)
         {
diff --git a/TAO/tao/Messaging/MessagingA.cpp b/TAO/tao/Messaging/MessagingA.cpp
index 3ed9b68a974..4dba22229de 100644
--- a/TAO/tao/Messaging/MessagingA.cpp
+++ b/TAO/tao/Messaging/MessagingA.cpp
@@ -26,16 +26,17 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "Messaging.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
-#include "tao/Value_TypeCode_Static.h"
-#include "tao/TypeCode_Value_Field.h"
-#include "tao/Recursive_Type_TypeCode.h"
+#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Value_TypeCode_Static.h"
+#include "tao/AnyTypeCode/TypeCode_Value_Field.h"
+#include "tao/AnyTypeCode/Recursive_Type_TypeCode.h"
 #include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
+#include "tao/AnyTypeCode/Any.h"
+#include "tao/AnyTypeCode/Any_Impl_T.h"
+#include "tao/AnyTypeCode/OctetSeqA.h"
 
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/value_typecode.cpp:61
@@ -50,7 +51,7 @@ static TAO::TypeCode::Value_Field<char const *, CORBA::TypeCode_ptr const *> con
     { "is_system_exception", &CORBA::_tc_boolean, CORBA::PUBLIC_MEMBER },
     { "byte_order", &CORBA::_tc_boolean, CORBA::PUBLIC_MEMBER },
     { "marshaled_exception", &CORBA::_tc_OctetSeq, CORBA::PUBLIC_MEMBER }
-    
+
   };
 static TAO::TypeCode::Value<char const *,
                      CORBA::TypeCode_ptr const *,
@@ -64,7 +65,7 @@ static TAO::TypeCode::Value<char const *,
     &CORBA::_tc_null,
     _tao_fields_Messaging_ExceptionHolder,
     3);
-  
+
 namespace Messaging
 {
   ::CORBA::TypeCode_ptr const _tc_ExceptionHolder =
@@ -82,7 +83,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_objref,
     "IDL:omg.org/Messaging/ReplyHandler:1.0",
     "ReplyHandler");
-  
+
 namespace Messaging
 {
   ::CORBA::TypeCode_ptr const _tc_ReplyHandler =
diff --git a/TAO/tao/Messaging/MessagingC.cpp b/TAO/tao/Messaging/MessagingC.cpp
index b1d34471827..1fcfb9dc5f4 100644
--- a/TAO/tao/Messaging/MessagingC.cpp
+++ b/TAO/tao/Messaging/MessagingC.cpp
@@ -126,29 +126,29 @@ CORBA::Boolean Messaging::ExceptionHolder::_tao_unmarshal (
         base,
         ExceptionHolder::_tao_obv_static_repository_id ()
       );
-  
+
   if (retval == 0)
     {
       return 0;
     }
-  
+
   if (factory.in () != 0)
     {
       base = factory->create_for_unmarshal ();
-      
+
       if (base == 0)
         {
           return 0;  // %! except.?
         }
-      
+
       retval = base->_tao_unmarshal_v (strm);
-      
+
       if (retval == 0)
         {
           return 0;
         }
     }
-  
+
   // Now base must be null or point to the unmarshaled object.
   // Align the pointer to the right subobject.
   new_object = ExceptionHolder::_downcast (base);
@@ -172,7 +172,7 @@ Messaging::ExceptionHolder_init::_downcast (CORBA::ValueFactoryBase *v)
   return dynamic_cast< ::Messaging::ExceptionHolder_init * > (v);
 }
 
-const char* 
+const char*
 Messaging::ExceptionHolder_init::tao_repository_id (void)
 {
   return ::Messaging::ExceptionHolder::_tao_obv_static_repository_id ();
@@ -227,7 +227,7 @@ TAO::Objref_Traits<Messaging::ReplyHandler>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
+TAO::Collocation_Proxy_Broker *
 (*Messaging__TAO_ReplyHandler_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -251,7 +251,7 @@ Messaging::ReplyHandler::Messaging_ReplyHandler_setup_collocation ()
 Messaging::ReplyHandler::~ReplyHandler (void)
 {}
 
-void 
+void
 Messaging::ReplyHandler::_tao_any_destructor (void *_tao_void_pointer)
 {
   ReplyHandler *_tao_tmp_pointer =
@@ -296,7 +296,7 @@ Messaging::ReplyHandler::_duplicate (ReplyHandler_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -480,8 +480,8 @@ CORBA::Boolean
 OBV_Messaging::ExceptionHolder::_tao_marshal_state (TAO_OutputCDR &strm) const
 {
   return (
-      (strm << CORBA::Any::from_boolean (_pd_is_system_exception)) &&
-      (strm << CORBA::Any::from_boolean (_pd_byte_order)) &&
+      (strm << ACE_OutputCDR::from_boolean (_pd_is_system_exception)) &&
+      (strm << ACE_OutputCDR::from_boolean (_pd_byte_order)) &&
       (strm << _pd_marshaled_exception)
     );
 }
@@ -490,8 +490,8 @@ CORBA::Boolean
 OBV_Messaging::ExceptionHolder::_tao_unmarshal_state (TAO_InputCDR &strm)
 {
   return (
-    (strm >> CORBA::Any::to_boolean (_pd_is_system_exception)) &&
-    (strm >> CORBA::Any::to_boolean (_pd_byte_order)) &&
+    (strm >> ACE_InputCDR::to_boolean (_pd_is_system_exception)) &&
+    (strm >> ACE_InputCDR::to_boolean (_pd_byte_order)) &&
     (strm >> _pd_marshaled_exception)
   );
 }
@@ -514,20 +514,20 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::Object_var obj;
-  
+
   if (!(strm >> obj.inout ()))
     {
       return false;
     }
-  
+
   typedef ::Messaging::ReplyHandler RHS_SCOPED_NAME;
-  
+
   // Narrow to the right type.
   _tao_objref =
     TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
         obj.in (),
         Messaging__TAO_ReplyHandler_Proxy_Broker_Factory_function_pointer
       );
-    
+
   return 1;
 }
diff --git a/TAO/tao/Messaging/MessagingS.cpp b/TAO/tao/Messaging/MessagingS.cpp
index 26e5e5b1124..8ee0e3c16c5 100644
--- a/TAO/tao/Messaging/MessagingS.cpp
+++ b/TAO/tao/Messaging/MessagingS.cpp
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_codegen.cpp:599
 
 #ifndef _TAO_IDL_ORIG_MESSAGINGS_CPP_
@@ -52,8 +52,8 @@
 #include "tao/Stub.h"
 #include "tao/IFR_Client_Adapter.h"
 #include "tao/Object_T.h"
-#include "tao/TypeCode.h"
-#include "tao/DynamicC.h"
+#include "tao/AnyTypeCode/TypeCode.h"
+#include "tao/AnyTypeCode/DynamicC.h"
 #include "tao/CDR.h"
 #include "tao/operation_details.h"
 #include "tao/PortableInterceptor.h"
@@ -203,7 +203,7 @@ POA_Messaging::_TAO_ReplyHandler_Strategized_Proxy_Broker::the_TAO_ReplyHandler_
 {
   static POA_Messaging::_TAO_ReplyHandler_Strategized_Proxy_Broker
   strategized_proxy_broker;
-  
+
   return &strategized_proxy_broker;
 }
 
@@ -225,7 +225,7 @@ POA_Messaging::_TAO_ReplyHandler_Strategized_Proxy_Broker::get_strategy (
   TAO::Collocation_Strategy strategy =
     TAO_ORB_Core::collocation_strategy (obj ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (TAO::TAO_CS_REMOTE_STRATEGY);
-  
+
   return strategy;
 }
 
@@ -244,13 +244,13 @@ POA_Messaging::_TAO_ReplyHandler_Strategized_Proxy_Broker::dispatch (
 {
   TAO::Direct_Collocation_Upcall_Wrapper collocation_upcall_wrapper;
   collocation_upcall_wrapper.upcall (
-    obj, 
-    forward_obj, 
-    args, 
-    num_args, 
-    op, 
-    op_len, 
-    strategy 
+    obj,
+    forward_obj,
+    args,
+    num_args,
+    op,
+    op_len,
+    strategy
     ACE_ENV_ARG_PARAMETER);
 }
 
@@ -271,9 +271,9 @@ Messaging__TAO_ReplyHandler_Proxy_Broker_Factory_function (CORBA::Object_ptr)
 int
 Messaging__TAO_ReplyHandler_Proxy_Broker_Factory_Initializer (size_t)
 {
-  Messaging__TAO_ReplyHandler_Proxy_Broker_Factory_function_pointer = 
+  Messaging__TAO_ReplyHandler_Proxy_Broker_Factory_function_pointer =
     Messaging__TAO_ReplyHandler_Proxy_Broker_Factory_function;
-  
+
   return 0;
 }
 
@@ -301,7 +301,7 @@ POA_Messaging::_TAO_ReplyHandler_Direct_Proxy_Impl::~_TAO_ReplyHandler_Direct_Pr
 //           End Direct Proxy Implementation
 ///////////////////////////////////////////////////////////////////////
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:103
 
 POA_Messaging::ReplyHandler::ReplyHandler (void)
@@ -320,16 +320,16 @@ POA_Messaging::ReplyHandler::~ReplyHandler (void)
 {
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:169
 
 namespace POA_Messaging
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _is_a_ReplyHandler_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -343,68 +343,68 @@ namespace POA_Messaging
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< ::CORBA::Char *, TAO::SArg_Traits< ::CORBA::Char *>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
-        
-      
+
+
       retval =
         this->servant_-> _is_a (
           arg_1
           ACE_ENV_ARG_PARAMETER);
-        
+
     }
-  
+
   private:
     POA_Messaging::ReplyHandler * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_Messaging::ReplyHandler::_is_a_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static CORBA::TypeCode_ptr const * const exceptions = 0;
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
   TAO::SArg_Traits< ::CORBA::Char *>::in_arg_val _tao_repository_id;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_repository_id
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_Messaging::ReplyHandler * const impl =
     static_cast<POA_Messaging::ReplyHandler *> (servant);
-  
+
   _is_a_ReplyHandler_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -417,16 +417,16 @@ void POA_Messaging::ReplyHandler::_is_a_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 namespace POA_Messaging
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _non_existent_ReplyHandler_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -440,59 +440,59 @@ namespace POA_Messaging
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
-      
+
+
       retval =
         this->servant_-> _non_existent (
           ACE_ENV_SINGLE_ARG_PARAMETER);
-        
+
     }
-  
+
   private:
     POA_Messaging::ReplyHandler * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_Messaging::ReplyHandler::_non_existent_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static CORBA::TypeCode_ptr const * const exceptions = 0;
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_Messaging::ReplyHandler * const impl =
     static_cast<POA_Messaging::ReplyHandler *> (servant);
-  
+
   _non_existent_ReplyHandler_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -505,18 +505,18 @@ void POA_Messaging::ReplyHandler::_non_existent_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:393
 
 
 
 void POA_Messaging::ReplyHandler::_interface_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
     ACE_ENV_ARG_DECL
@@ -526,30 +526,30 @@ void POA_Messaging::ReplyHandler::_interface_skel (
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-    
+
   if (_tao_adapter == 0)
     {
       ACE_THROW (CORBA::INTF_REPOS (CORBA::OMGVMCID | 1,
                                     CORBA::COMPLETED_NO));
     }
-  
+
   POA_Messaging::ReplyHandler * const impl =
     static_cast<POA_Messaging::ReplyHandler *> (servant);
-  CORBA::InterfaceDef_ptr _tao_retval = 
+  CORBA::InterfaceDef_ptr _tao_retval =
     impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   server_request.init_reply ();
   TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-  
+
   CORBA::Boolean const _tao_result =
     _tao_adapter->interfacedef_cdr_insert (
         _tao_out,
         _tao_retval
       );
-  
+
   _tao_adapter->dispose (_tao_retval);
-  
+
   if (_tao_result == 0)
     {
       ACE_THROW (CORBA::MARSHAL ());
@@ -558,11 +558,11 @@ void POA_Messaging::ReplyHandler::_interface_skel (
 
 namespace POA_Messaging
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_component_ReplyHandler_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -576,59 +576,59 @@ namespace POA_Messaging
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Object, TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
-      
+
+
       retval =
         this->servant_-> _get_component (
           ACE_ENV_SINGLE_ARG_PARAMETER);
-        
+
     }
-  
+
   private:
     POA_Messaging::ReplyHandler * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_Messaging::ReplyHandler::_component_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static CORBA::TypeCode_ptr const * const exceptions = 0;
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_Messaging::ReplyHandler * const impl =
     static_cast<POA_Messaging::ReplyHandler *> (servant);
-  
+
   _get_component_ReplyHandler_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -641,7 +641,7 @@ void POA_Messaging::ReplyHandler::_component_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 CORBA::Boolean POA_Messaging::ReplyHandler::_is_a (
@@ -690,22 +690,22 @@ POA_Messaging::ReplyHandler::_this (ACE_ENV_SINGLE_ARG_DECL)
 {
   TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   TAO_Stub_Auto_Ptr safe_stub (stub);
   CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-  
+
   CORBA::Boolean _tao_opt_colloc =
     stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-  
+
   ACE_NEW_RETURN (
       tmp,
       CORBA::Object (stub, _tao_opt_colloc, this),
       0
     );
-  
+
   CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
-  
+
   typedef ::Messaging::ReplyHandler STUB_SCOPED_NAME;
   return
     TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
diff --git a/TAO/tao/Messaging/Messaging_No_ImplA.cpp b/TAO/tao/Messaging/Messaging_No_ImplA.cpp
index cb99e224ed5..4d9d4e4736f 100644
--- a/TAO/tao/Messaging/Messaging_No_ImplA.cpp
+++ b/TAO/tao/Messaging/Messaging_No_ImplA.cpp
@@ -26,17 +26,17 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "Messaging_No_ImplC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
-#include "tao/Struct_TypeCode_Static.h"
-#include "tao/TypeCode_Struct_Field.h"
-#include "tao/Recursive_Type_TypeCode.h"
+#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Struct_TypeCode_Static.h"
+#include "tao/AnyTypeCode/TypeCode_Struct_Field.h"
+#include "tao/AnyTypeCode/Recursive_Type_TypeCode.h"
 #include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
-#include "tao/Any_Dual_Impl_T.h"
+#include "tao/AnyTypeCode/Any.h"
+#include "tao/AnyTypeCode/Any_Impl_T.h"
+#include "tao/AnyTypeCode/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/alias_typecode.cpp:50
@@ -49,7 +49,7 @@ static TAO::TypeCode::Alias<char const *,
     "IDL:omg.org/Messaging/Priority:1.0",
     "Priority",
     &CORBA::_tc_short);
-  
+
 namespace Messaging
 {
   ::CORBA::TypeCode_ptr const _tc_Priority =
@@ -69,7 +69,7 @@ static TAO::TypeCode::Alias<char const *,
     "IDL:omg.org/Messaging/RebindMode:1.0",
     "RebindMode",
     &CORBA::_tc_short);
-  
+
 namespace Messaging
 {
   ::CORBA::TypeCode_ptr const _tc_RebindMode =
@@ -89,7 +89,7 @@ static TAO::TypeCode::Alias<char const *,
     "IDL:omg.org/Messaging/RoutingType:1.0",
     "RoutingType",
     &CORBA::_tc_short);
-  
+
 namespace Messaging
 {
   ::CORBA::TypeCode_ptr const _tc_RoutingType =
@@ -109,7 +109,7 @@ static TAO::TypeCode::Alias<char const *,
     "IDL:omg.org/Messaging/Ordering:1.0",
     "Ordering",
     &CORBA::_tc_ushort);
-  
+
 namespace Messaging
 {
   ::CORBA::TypeCode_ptr const _tc_Ordering =
@@ -127,7 +127,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:omg.org/Messaging/RebindPolicy:1.0",
     "RebindPolicy");
-  
+
 namespace Messaging
 {
   ::CORBA::TypeCode_ptr const _tc_RebindPolicy =
@@ -143,7 +143,7 @@ static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> co
   {
     { "min", &Messaging::_tc_Priority },
     { "max", &Messaging::_tc_Priority }
-    
+
   };
 static TAO::TypeCode::Struct<char const *,
                       CORBA::TypeCode_ptr const *,
@@ -155,7 +155,7 @@ static TAO::TypeCode::Struct<char const *,
     "PriorityRange",
     _tao_fields_Messaging_PriorityRange,
     2);
-  
+
 namespace Messaging
 {
   ::CORBA::TypeCode_ptr const _tc_PriorityRange =
@@ -173,7 +173,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:omg.org/Messaging/RequestPriorityPolicy:1.0",
     "RequestPriorityPolicy");
-  
+
 namespace Messaging
 {
   ::CORBA::TypeCode_ptr const _tc_RequestPriorityPolicy =
@@ -191,7 +191,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:omg.org/Messaging/ReplyPriorityPolicy:1.0",
     "ReplyPriorityPolicy");
-  
+
 namespace Messaging
 {
   ::CORBA::TypeCode_ptr const _tc_ReplyPriorityPolicy =
@@ -209,7 +209,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:omg.org/Messaging/RequestStartTimePolicy:1.0",
     "RequestStartTimePolicy");
-  
+
 namespace Messaging
 {
   ::CORBA::TypeCode_ptr const _tc_RequestStartTimePolicy =
@@ -227,7 +227,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:omg.org/Messaging/RequestEndTimePolicy:1.0",
     "RequestEndTimePolicy");
-  
+
 namespace Messaging
 {
   ::CORBA::TypeCode_ptr const _tc_RequestEndTimePolicy =
@@ -245,7 +245,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:omg.org/Messaging/ReplyStartTimePolicy:1.0",
     "ReplyStartTimePolicy");
-  
+
 namespace Messaging
 {
   ::CORBA::TypeCode_ptr const _tc_ReplyStartTimePolicy =
@@ -263,7 +263,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:omg.org/Messaging/ReplyEndTimePolicy:1.0",
     "ReplyEndTimePolicy");
-  
+
 namespace Messaging
 {
   ::CORBA::TypeCode_ptr const _tc_ReplyEndTimePolicy =
@@ -281,7 +281,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:omg.org/Messaging/RelativeRequestTimeoutPolicy:1.0",
     "RelativeRequestTimeoutPolicy");
-  
+
 namespace Messaging
 {
   ::CORBA::TypeCode_ptr const _tc_RelativeRequestTimeoutPolicy =
@@ -297,7 +297,7 @@ static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> co
   {
     { "min", &Messaging::_tc_RoutingType },
     { "max", &Messaging::_tc_RoutingType }
-    
+
   };
 static TAO::TypeCode::Struct<char const *,
                       CORBA::TypeCode_ptr const *,
@@ -309,7 +309,7 @@ static TAO::TypeCode::Struct<char const *,
     "RoutingTypeRange",
     _tao_fields_Messaging_RoutingTypeRange,
     2);
-  
+
 namespace Messaging
 {
   ::CORBA::TypeCode_ptr const _tc_RoutingTypeRange =
@@ -327,7 +327,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:omg.org/Messaging/RoutingPolicy:1.0",
     "RoutingPolicy");
-  
+
 namespace Messaging
 {
   ::CORBA::TypeCode_ptr const _tc_RoutingPolicy =
@@ -345,7 +345,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:omg.org/Messaging/MaxHopsPolicy:1.0",
     "MaxHopsPolicy");
-  
+
 namespace Messaging
 {
   ::CORBA::TypeCode_ptr const _tc_MaxHopsPolicy =
@@ -363,7 +363,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:omg.org/Messaging/QueueOrderPolicy:1.0",
     "QueueOrderPolicy");
-  
+
 namespace Messaging
 {
   ::CORBA::TypeCode_ptr const _tc_QueueOrderPolicy =
@@ -396,7 +396,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Impl_T<Messaging::RebindPolicy>::demarshal_value (TAO_InputCDR &)
@@ -447,7 +447,7 @@ operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -529,7 +529,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Impl_T<Messaging::RequestPriorityPolicy>::demarshal_value (TAO_InputCDR &)
@@ -604,7 +604,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Impl_T<Messaging::ReplyPriorityPolicy>::demarshal_value (TAO_InputCDR &)
@@ -679,7 +679,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Impl_T<Messaging::RequestStartTimePolicy>::demarshal_value (TAO_InputCDR &)
@@ -754,7 +754,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Impl_T<Messaging::RequestEndTimePolicy>::demarshal_value (TAO_InputCDR &)
@@ -829,7 +829,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Impl_T<Messaging::ReplyStartTimePolicy>::demarshal_value (TAO_InputCDR &)
@@ -904,7 +904,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Impl_T<Messaging::ReplyEndTimePolicy>::demarshal_value (TAO_InputCDR &)
@@ -979,7 +979,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Impl_T<Messaging::RelativeRequestTimeoutPolicy>::demarshal_value (TAO_InputCDR &)
@@ -1030,7 +1030,7 @@ operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -1112,7 +1112,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Impl_T<Messaging::RoutingPolicy>::demarshal_value (TAO_InputCDR &)
@@ -1187,7 +1187,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Impl_T<Messaging::MaxHopsPolicy>::demarshal_value (TAO_InputCDR &)
@@ -1262,7 +1262,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Impl_T<Messaging::QueueOrderPolicy>::demarshal_value (TAO_InputCDR &)
diff --git a/TAO/tao/Messaging/Messaging_PolicyFactory.cpp b/TAO/tao/Messaging/Messaging_PolicyFactory.cpp
index 2897a284bd5..d93b65c098c 100644
--- a/TAO/tao/Messaging/Messaging_PolicyFactory.cpp
+++ b/TAO/tao/Messaging/Messaging_PolicyFactory.cpp
@@ -9,7 +9,27 @@ ACE_RCSID (Messaging,
 
 #include "tao/PolicyC.h"
 #include "tao/Buffering_Constraint_Policy.h"
-#include "tao/Any.h"
+#include "tao/AnyTypeCode/TAOA.h"
+#include "tao/AnyTypeCode/Any.h"
+
+CORBA::Policy_ptr
+TAO_Messaging_PolicyFactory::create_buffering_constraint_policy (
+    const CORBA::Any& val
+    ACE_ENV_ARG_DECL)
+{
+  TAO::BufferingConstraint *buffering_constraint = 0;
+  if ((val >>= buffering_constraint) == 0)
+    ACE_THROW_RETURN (CORBA::PolicyError (CORBA::BAD_POLICY_VALUE),
+                      CORBA::Policy::_nil ());
+
+  TAO_Buffering_Constraint_Policy *servant = 0;
+  ACE_NEW_THROW_EX (servant,
+                    TAO_Buffering_Constraint_Policy (*buffering_constraint),
+                    CORBA::NO_MEMORY ());
+  ACE_CHECK_RETURN (CORBA::Policy::_nil ());
+
+  return servant;
+}
 
 CORBA::Policy_ptr
 TAO_Messaging_PolicyFactory::create_policy (
@@ -39,8 +59,8 @@ TAO_Messaging_PolicyFactory::create_policy (
 
 #if (TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1)
   if (type == TAO::BUFFERING_CONSTRAINT_POLICY_TYPE)
-    return TAO_Buffering_Constraint_Policy::create (value
-                                                    ACE_ENV_ARG_PARAMETER);
+    return this->create_buffering_constraint_policy (value
+                                                     ACE_ENV_ARG_PARAMETER);
 #endif /* TAO_HAS_BUFFERING_CONSTRAINT_POLICY == 1 */
 
   if (
diff --git a/TAO/tao/Messaging/Messaging_PolicyFactory.h b/TAO/tao/Messaging/Messaging_PolicyFactory.h
index 286acf3d7dc..2a76ceb3993 100644
--- a/TAO/tao/Messaging/Messaging_PolicyFactory.h
+++ b/TAO/tao/Messaging/Messaging_PolicyFactory.h
@@ -45,6 +45,10 @@ public:
                                            ACE_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      CORBA::PolicyError));
+private:
+  CORBA::Policy_ptr
+  create_buffering_constraint_policy (const CORBA::Any& val
+                                      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
 };
 
 
diff --git a/TAO/tao/Messaging/Messaging_Policy_i.cpp b/TAO/tao/Messaging/Messaging_Policy_i.cpp
index ede4f4ec4bd..f4e244a8696 100644
--- a/TAO/tao/Messaging/Messaging_Policy_i.cpp
+++ b/TAO/tao/Messaging/Messaging_Policy_i.cpp
@@ -3,6 +3,7 @@
 #include "tao/Stub.h"
 #include "tao/ORB_Core.h"
 #include "tao/debug.h"
+#include "tao/AnyTypeCode/Any.h"
 
 #if ! defined (__ACE_INLINE__)
 #include "Messaging_Policy_i.i"
diff --git a/TAO/tao/Messaging/Messaging_RT_PolicyA.cpp b/TAO/tao/Messaging/Messaging_RT_PolicyA.cpp
index 22f0f631301..3d7726af4df 100644
--- a/TAO/tao/Messaging/Messaging_RT_PolicyA.cpp
+++ b/TAO/tao/Messaging/Messaging_RT_PolicyA.cpp
@@ -26,13 +26,14 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "Messaging_RT_PolicyC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
 #include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
+#include "tao/AnyTypeCode/Any.h"
+#include "tao/AnyTypeCode/Any_Impl_T.h"
+#include "tao/AnyTypeCode/TimeBaseA.h"
 
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/alias_typecode.cpp:50
@@ -45,7 +46,7 @@ static TAO::TypeCode::Alias<char const *,
     "IDL:omg.org/Messaging/Timeout:1.0",
     "Timeout",
     &TimeBase::_tc_TimeT);
-  
+
 namespace Messaging
 {
   ::CORBA::TypeCode_ptr const _tc_Timeout =
@@ -63,7 +64,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:omg.org/Messaging/RelativeRoundtripTimeoutPolicy:1.0",
     "RelativeRoundtripTimeoutPolicy");
-  
+
 namespace Messaging
 {
   ::CORBA::TypeCode_ptr const _tc_RelativeRoundtripTimeoutPolicy =
@@ -96,7 +97,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Impl_T<Messaging::RelativeRoundtripTimeoutPolicy>::demarshal_value (TAO_InputCDR &)
diff --git a/TAO/tao/Messaging/Messaging_SyncScope_PolicyA.cpp b/TAO/tao/Messaging/Messaging_SyncScope_PolicyA.cpp
index a14bdb23202..2e1c5244428 100644
--- a/TAO/tao/Messaging/Messaging_SyncScope_PolicyA.cpp
+++ b/TAO/tao/Messaging/Messaging_SyncScope_PolicyA.cpp
@@ -26,13 +26,13 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "Messaging_SyncScope_PolicyC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
 #include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
+#include "tao/AnyTypeCode/Any.h"
+#include "tao/AnyTypeCode/Any_Impl_T.h"
 
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/objref_typecode.cpp:76
@@ -43,7 +43,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:omg.org/Messaging/SyncScopePolicy:1.0",
     "SyncScopePolicy");
-  
+
 namespace Messaging
 {
   ::CORBA::TypeCode_ptr const _tc_SyncScopePolicy =
@@ -76,7 +76,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Impl_T<Messaging::SyncScopePolicy>::demarshal_value (TAO_InputCDR &)
diff --git a/TAO/tao/Messaging/PollableC.cpp b/TAO/tao/Messaging/PollableC.cpp
index 6811a0edd6d..a99b058b3dd 100644
--- a/TAO/tao/Messaging/PollableC.cpp
+++ b/TAO/tao/Messaging/PollableC.cpp
@@ -31,14 +31,14 @@
 
 #include "PollableC.h"
 #include "tao/CDR.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
-#include "tao/Struct_TypeCode_Static.h"
-#include "tao/TypeCode_Struct_Field.h"
-#include "tao/Any_Impl_T.h"
-#include "tao/Any_Dual_Impl_T.h"
+#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Struct_TypeCode_Static.h"
+#include "tao/AnyTypeCode/TypeCode_Struct_Field.h"
+#include "tao/AnyTypeCode/Any_Impl_T.h"
+#include "tao/AnyTypeCode/Any_Dual_Impl_T.h"
 #include "ace/OS_NS_string.h"
 
 #if defined (__BORLANDC__)
@@ -96,7 +96,7 @@ CORBA::Pollable::Pollable (void)
 CORBA::Pollable::~Pollable (void)
 {}
 
-void 
+void
 CORBA::Pollable::_tao_any_destructor (void *_tao_void_pointer)
 {
   Pollable *_tao_tmp_pointer =
@@ -133,7 +133,7 @@ CORBA::Pollable::_duplicate (Pollable_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -192,7 +192,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:omg.org/CORBA/Pollable:1.0",
     "Pollable");
-  
+
 namespace CORBA
 {
   ::CORBA::TypeCode_ptr const _tc_Pollable =
@@ -243,7 +243,7 @@ CORBA::DIIPollable::DIIPollable (void)
 CORBA::DIIPollable::~DIIPollable (void)
 {}
 
-void 
+void
 CORBA::DIIPollable::_tao_any_destructor (void *_tao_void_pointer)
 {
   DIIPollable *_tao_tmp_pointer =
@@ -280,7 +280,7 @@ CORBA::DIIPollable::_duplicate (DIIPollable_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -343,7 +343,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:omg.org/CORBA/DIIPollable:1.0",
     "DIIPollable");
-  
+
 namespace CORBA
 {
   ::CORBA::TypeCode_ptr const _tc_DIIPollable =
@@ -388,7 +388,7 @@ TAO::Objref_Traits<CORBA::PollableSet>::marshal (
   return CORBA::Object::marshal (p, cdr);
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_exception/exception_cs.cpp:63
 
 CORBA::PollableSet::NoPossiblePollable::NoPossiblePollable (void)
@@ -497,11 +497,11 @@ static TAO::TypeCode::Struct<char const *,
     "NoPossiblePollable",
     _tao_fields_CORBA_PollableSet_NoPossiblePollable,
     0);
-  
+
 ::CORBA::TypeCode_ptr const CORBA::PollableSet::_tc_NoPossiblePollable =
   &_tao_tc_CORBA_PollableSet_NoPossiblePollable;
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_exception/exception_cs.cpp:63
 
 CORBA::PollableSet::UnknownPollable::UnknownPollable (void)
@@ -610,7 +610,7 @@ static TAO::TypeCode::Struct<char const *,
     "UnknownPollable",
     _tao_fields_CORBA_PollableSet_UnknownPollable,
     0);
-  
+
 ::CORBA::TypeCode_ptr const CORBA::PollableSet::_tc_UnknownPollable =
   &_tao_tc_CORBA_PollableSet_UnknownPollable;
 
@@ -620,7 +620,7 @@ CORBA::PollableSet::PollableSet (void)
 CORBA::PollableSet::~PollableSet (void)
 {}
 
-void 
+void
 CORBA::PollableSet::_tao_any_destructor (void *_tao_void_pointer)
 {
   PollableSet *_tao_tmp_pointer =
@@ -657,7 +657,7 @@ CORBA::PollableSet::_duplicate (PollableSet_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -716,7 +716,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:omg.org/CORBA/PollableSet:1.0",
     "PollableSet");
-  
+
 namespace CORBA
 {
   ::CORBA::TypeCode_ptr const _tc_PollableSet =
@@ -749,7 +749,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Impl_T<CORBA::Pollable>::demarshal_value (TAO_InputCDR &)
@@ -824,7 +824,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Impl_T<CORBA::DIIPollable>::demarshal_value (TAO_InputCDR &)
@@ -899,7 +899,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Impl_T<CORBA::PollableSet>::demarshal_value (TAO_InputCDR &)
@@ -950,7 +950,7 @@ operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_exception/any_op_cs.cpp:50
 
 namespace TAO
@@ -961,7 +961,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Dual_Impl_T<CORBA::PollableSet::NoPossiblePollable>::demarshal_value (TAO_InputCDR &)
@@ -1025,7 +1025,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_exception/any_op_cs.cpp:50
 
 namespace TAO
@@ -1036,7 +1036,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Dual_Impl_T<CORBA::PollableSet::UnknownPollable>::demarshal_value (TAO_InputCDR &)
diff --git a/TAO/tao/Messaging/TAO_ExtA.cpp b/TAO/tao/Messaging/TAO_ExtA.cpp
index 6b1f475f8f8..3bce6d7972b 100644
--- a/TAO/tao/Messaging/TAO_ExtA.cpp
+++ b/TAO/tao/Messaging/TAO_ExtA.cpp
@@ -26,13 +26,13 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "TAO_ExtC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
 #include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
+#include "tao/AnyTypeCode/Any.h"
+#include "tao/AnyTypeCode/Any_Impl_T.h"
 
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/objref_typecode.cpp:76
@@ -43,7 +43,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:tao/TAO/ConnectionTimeoutPolicy:1.0",
     "ConnectionTimeoutPolicy");
-  
+
 namespace TAO
 {
   ::CORBA::TypeCode_ptr const _tc_ConnectionTimeoutPolicy =
@@ -76,7 +76,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Impl_T<TAO::ConnectionTimeoutPolicy>::demarshal_value (TAO_InputCDR &)
diff --git a/TAO/tao/Messaging_PolicyValue.pidl b/TAO/tao/Messaging_PolicyValue.pidl
index fcff2799c8b..7467a10720a 100644
--- a/TAO/tao/Messaging_PolicyValue.pidl
+++ b/TAO/tao/Messaging_PolicyValue.pidl
@@ -8,12 +8,15 @@
  *
  * The command used to generate code from this file is:
  *
- *   tao_idl.exe
- *        -o orig -Ge 1 -GA -Sc -Sci
- *        -Wb,export_macro=TAO_Export
- *        -Wb,export_include=tao/TAO_Export.h
- *        -Wb,pre_include="ace/pre.h"
- *        -Wb,post_include="ace/post.h"
+ *     tao_idl
+ *          -oA AnyTypeCode
+ *          -Ge 1 -GA -Sc -SS -Sci
+ *          -Wb,pre_include=ace/pre.h
+ *          -Wb,post_include=ace/post.h
+ *          -Wb,export_macro=TAO_Export
+ *          -Wb,export_include=tao/TAO_Export.h
+ *          -Wb,anyop_export_macro=TAO_AnyTypeCode_Export
+ *          -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h
  *        Messaging_PolicyValue.pidl
  *
  */
diff --git a/TAO/tao/Messaging_PolicyValueA.cpp b/TAO/tao/Messaging_PolicyValueA.cpp
deleted file mode 100644
index 6b5404ab811..00000000000
--- a/TAO/tao/Messaging_PolicyValueA.cpp
+++ /dev/null
@@ -1,237 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "Messaging_PolicyValueC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Sequence_TypeCode_Static.h"
-#include "tao/String_TypeCode_Static.h"
-#include "tao/Struct_TypeCode_Static.h"
-#include "tao/TypeCode_Struct_Field.h"
-#include "tao/Recursive_Type_TypeCode.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Dual_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/struct_typecode.cpp:87
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:937
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_Messaging_PolicyValue[] =
-  {
-    { "ptype", &CORBA::_tc_PolicyType },
-    { "pvalue", &CORBA::_tc_OctetSeq }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                      CORBA::TypeCode_ptr const *,
-                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
-                      TAO::Null_RefCount_Policy>
-  _tao_tc_Messaging_PolicyValue (
-    CORBA::tk_struct,
-    "IDL:omg.org/Messaging/PolicyValue:1.0",
-    "PolicyValue",
-    _tao_fields_Messaging_PolicyValue,
-    2);
-  
-namespace Messaging
-{
-  ::CORBA::TypeCode_ptr const _tc_PolicyValue =
-    &_tao_tc_Messaging_PolicyValue;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:937
-
-
-#ifndef _TAO_TYPECODE_Messaging_PolicyValueSeq_GUARD
-#define _TAO_TYPECODE_Messaging_PolicyValueSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      Messaging_PolicyValueSeq_0 (
-        CORBA::tk_sequence,
-        &Messaging::_tc_PolicyValue,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_Messaging_PolicyValueSeq_0 =
-      &Messaging_PolicyValueSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_Messaging_PolicyValueSeq_GUARD */
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_Messaging_PolicyValueSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/Messaging/PolicyValueSeq:1.0",
-    "PolicyValueSeq",
-    &TAO::TypeCode::tc_Messaging_PolicyValueSeq_0);
-  
-namespace Messaging
-{
-  ::CORBA::TypeCode_ptr const _tc_PolicyValueSeq =
-    &_tao_tc_Messaging_PolicyValueSeq;
-}
-
-
-
-// TAO_IDL - Generated from 
-// be\be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const Messaging::PolicyValue &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<Messaging::PolicyValue>::insert_copy (
-      _tao_any,
-      Messaging::PolicyValue::_tao_any_destructor,
-      Messaging::_tc_PolicyValue,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    Messaging::PolicyValue *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<Messaging::PolicyValue>::insert (
-      _tao_any,
-      Messaging::PolicyValue::_tao_any_destructor,
-      Messaging::_tc_PolicyValue,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    Messaging::PolicyValue *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const Messaging::PolicyValue *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const Messaging::PolicyValue *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<Messaging::PolicyValue>::extract (
-        _tao_any,
-        Messaging::PolicyValue::_tao_any_destructor,
-        Messaging::_tc_PolicyValue,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const Messaging::PolicyValueSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<Messaging::PolicyValueSeq>::insert_copy (
-      _tao_any,
-      Messaging::PolicyValueSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_Messaging_PolicyValueSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    Messaging::PolicyValueSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<Messaging::PolicyValueSeq>::insert (
-      _tao_any,
-      Messaging::PolicyValueSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_Messaging_PolicyValueSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    Messaging::PolicyValueSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const Messaging::PolicyValueSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const Messaging::PolicyValueSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<Messaging::PolicyValueSeq>::extract (
-        _tao_any,
-        Messaging::PolicyValueSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_Messaging_PolicyValueSeq_0,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/Messaging_PolicyValueC.h b/TAO/tao/Messaging_PolicyValueC.h
index ab003706b1e..abe0c4f2eb5 100644
--- a/TAO/tao/Messaging_PolicyValueC.h
+++ b/TAO/tao/Messaging_PolicyValueC.h
@@ -26,10 +26,10 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:153
+// be\be_codegen.cpp:154
 
-#ifndef _TAO_IDL_ORIG_MESSAGING_POLICYVALUEC_H_
-#define _TAO_IDL_ORIG_MESSAGING_POLICYVALUEC_H_
+#ifndef _TAO_IDL_MESSAGING_POLICYVALUEC_H_
+#define _TAO_IDL_MESSAGING_POLICYVALUEC_H_
 
 #include /**/ "ace/pre.h"
 
@@ -61,10 +61,6 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:48
 
@@ -90,7 +86,7 @@ namespace Messaging
     PolicyValue_out;
   
   // TAO_IDL - Generated from
-  // be\be_visitor_structure/structure_ch.cpp:52
+  // be\be_visitor_structure/structure_ch.cpp:57
   
   struct TAO_Export PolicyValue
   {
@@ -102,11 +98,6 @@ namespace Messaging
   };
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_PolicyValue;
-  
-  // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_MESSAGING_POLICYVALUESEQ_CH_)
@@ -155,11 +146,6 @@ namespace Messaging
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_PolicyValueSeq;
-  
-  // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
   
   const IOP::ComponentId TAG_POLICIES = 2U;
@@ -183,22 +169,6 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_structure/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const Messaging::PolicyValue &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, Messaging::PolicyValue*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, Messaging::PolicyValue *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const Messaging::PolicyValue *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const Messaging::PolicyValueSeq &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, Messaging::PolicyValueSeq*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, Messaging::PolicyValueSeq *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const Messaging::PolicyValueSeq *&);
-
-// TAO_IDL - Generated from
 // be\be_visitor_structure/cdr_op_ch.cpp:54
 
 TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const Messaging::PolicyValue &);
@@ -222,16 +192,12 @@ TAO_Export CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_Messaging_PolicyValueSeq_H_ */
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:955
+// be\be_codegen.cpp:1062
 
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
diff --git a/TAO/tao/NVList.cpp b/TAO/tao/NVList.cpp
deleted file mode 100644
index d6e2b993635..00000000000
--- a/TAO/tao/NVList.cpp
+++ /dev/null
@@ -1,498 +0,0 @@
-// $Id$
-
-
-// Implementation of Named Value List and NamedValue classes
-
-#include "NVList.h"
-
-#include "tao/SystemException.h"
-#include "tao/BoundsC.h"
-#include "tao/TypeCode.h"
-#include "tao/Marshal.h"
-#include "tao/CORBA_String.h"
-#include "tao/Any_Impl.h"
-#include "tao/CDR.h"
-#include "tao/debug.h"
-
-#include "ace/Auto_Ptr.h"
-#include "ace/Log_Msg.h"
-
-#if !defined (__ACE_INLINE__)
-# include "tao/NVList.i"
-#endif /* ! __ACE_INLINE__ */
-
-ACE_RCSID (tao,
-           NVList,
-           "$Id$")
-
-// Reference counting for DII Request object
-
-CORBA::ULong
-CORBA::NamedValue::_incr_refcnt (void)
-{
-  return ++this->refcount_;
-}
-
-CORBA::ULong
-CORBA::NamedValue::_decr_refcnt (void)
-{
-  const CORBA::ULong new_count = --this->refcount_;
-
-  if (new_count == 0)
-    delete this;
-
-  return new_count;
-}
-
-CORBA::NamedValue::~NamedValue (void)
-{
-  if (this->name_)
-    {
-      CORBA::string_free (this->name_);
-      this->name_ = 0;
-    }
-  // the any will be destroyed by itself
-}
-
-// ****************************************************************
-
-CORBA::ULong
-CORBA::NVList::_incr_refcnt (void)
-{
-  return ++this->refcount_;
-}
-
-CORBA::ULong
-CORBA::NVList::_decr_refcnt (void)
-{
-  const CORBA::ULong new_count = --this->refcount_;
-
-  if (new_count == 0)
-    delete this;
-
-  return new_count;
-}
-
-CORBA::NVList::~NVList (void)
-{
-  // initialize an iterator and delete each NamedValue
-  ACE_Unbounded_Queue_Iterator<CORBA::NamedValue_ptr> iter (this->values_);
-
-  for (iter.first (); !iter.done (); iter.advance ())
-    {
-      CORBA::NamedValue_ptr *nv;
-      (void) iter.next (nv);
-      delete *nv;
-    }
-
-  this->max_ = 0;
-
-  // Remove the CDR stream if it is present.
-  delete this->incoming_;
-}
-
-// add an element and just initialize its flags
-CORBA::NamedValue_ptr
-CORBA::NVList::add (CORBA::Flags flags
-                    ACE_ENV_ARG_DECL)
-{
-  // call the helper to allocate a NamedValue element (if necessary)
-  return this->add_element (flags
-                            ACE_ENV_ARG_PARAMETER);
-}
-
-// add an element and just initialize its flags and name
-CORBA::NamedValue_ptr
-CORBA::NVList::add_item (const char *name,
-                         CORBA::Flags flags
-                         ACE_ENV_ARG_DECL)
-{
-  // call the helper to allocate a NamedValue element
-  CORBA::NamedValue_ptr nv = this->add_element (flags
-                                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (nv)
-    {
-      // now initialize the fields
-      nv->name_ = CORBA::string_dup (name);
-      return nv;
-    }
-  else
-    {
-      return 0;
-    }
-}
-
-// add a value. If necessary, increment the list
-CORBA::NamedValue_ptr
-CORBA::NVList::add_value (const char *name,
-                          const CORBA::Any &value,
-                          CORBA::Flags flags
-                          ACE_ENV_ARG_DECL)
-{
-  // Call the helper to allocate a NamedValue element.
-  CORBA::NamedValue_ptr nv = this->add_element (flags
-                                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (nv)
-    {
-      nv->name_ = CORBA::string_dup (name);
-
-      // With the original Any implementation, we had alternate
-      // paths for the assignment based on the IN_COPY_VALUE flag.
-      // Now that the Any's contained Any_Impl is refcounted, the
-      // distinction between the ORB "copying" or "borrowing" the
-      // memory is irrelevant. The IN_COPY_VALUE flag was not
-      // checked anywhere else in the ORB anyway.
-      nv->any_ = value;
-      return nv;
-    }
-  else
-    {
-      return 0;
-    }
-}
-
-// add an element and just initialize its flags and name
-CORBA::NamedValue_ptr
-CORBA::NVList::add_item_consume (char *name,
-                                 CORBA::Flags flags
-                                 ACE_ENV_ARG_DECL)
-{
-
-  // call the helper to allocate a NamedValue element
-  CORBA::NamedValue_ptr nv = this->add_element (flags
-                                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (nv)
-    {
-      // now initialize the fields
-
-      // consume the name
-      nv->name_ = name;
-      return nv;
-    }
-  else
-    {
-      return 0;
-    }
-}
-
-// add a value. If necessary, increment the list
-CORBA::NamedValue_ptr
-CORBA::NVList::add_value_consume (char * name,
-                                  CORBA::Any * value,
-                                  CORBA::Flags flags
-                                  ACE_ENV_ARG_DECL)
-{
-  // call the helper to allocate a NamedValue element
-  CORBA::NamedValue_ptr nv = this->add_element (flags
-                                                ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (nv)
-    {
-      // now initialize the fields
-
-      // consume name
-      nv->name_ = name;
-
-      // consume the value @@ (ASG) have we? we may need to destroy
-      // the in parameter
-      nv->any_ = *value;
-      return nv;
-    }
-  else
-    {
-      return 0;
-    }
-}
-
-//CORBA::Status
-void
-CORBA::NVList::remove (CORBA::ULong /* n */
-                       ACE_ENV_ARG_DECL_NOT_USED)
-{
-  // not implemented
-  // @@ (ASG) - TODO
-}
-
-// Helper method
-CORBA::NamedValue_ptr
-CORBA::NVList::add_element (CORBA::Flags flags
-                            ACE_ENV_ARG_DECL)
-{
-  this->evaluate (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::NamedValue::_nil ());
-
-  if (ACE_BIT_DISABLED (flags,
-                        CORBA::ARG_IN | CORBA::ARG_OUT | CORBA::ARG_INOUT))
-    {
-      ACE_THROW_RETURN (CORBA::BAD_PARAM (),
-                        CORBA::NamedValue::_nil ());
-    }
-
-  CORBA::NamedValue_ptr nv;
-
-  // allocate a new NamedValue
-  ACE_NEW_THROW_EX (nv,
-                    CORBA::NamedValue,
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (CORBA::NamedValue::_nil ());
-
-  // set the flags and enqueue in the queue
-  nv->flags_ = flags;
-
-  if (this->values_.enqueue_tail (nv) == -1)
-    {
-      delete nv;
-      return 0;
-    }
-
-  this->max_++;
-  return nv; // success
-}
-
-// return the item at location n
-CORBA::NamedValue_ptr
-CORBA::NVList::item (CORBA::ULong n
-                     ACE_ENV_ARG_DECL)
-{
-  this->evaluate (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::NamedValue::_nil ());
-
-  if (n >= this->max_)
-    {
-      ACE_THROW_RETURN (CORBA::Bounds (),
-                        CORBA::NamedValue::_nil ());
-    }
-
-  CORBA::NamedValue_ptr *nv = 0;
-
-  this->values_.get (nv, n);
-  return *nv;
-}
-
-void
-CORBA::NVList::_tao_incoming_cdr (TAO_InputCDR &cdr,
-                                  int flag,
-                                  bool &lazy_evaluation
-                                  ACE_ENV_ARG_DECL)
-{
-  // If the list is empty then using lazy evaluation is the only
-  // choice.
-  // @@ There are other cases where we can use lazy evaluation, for
-  //    example if the list is not empty but the anys own all their
-  //    objects.
-  if (lazy_evaluation == false && this->max_ == 0)
-    {
-      lazy_evaluation = true;
-    }
-
-  if (lazy_evaluation == false)
-    {
-      this->_tao_decode (cdr,
-                         flag
-                         ACE_ENV_ARG_PARAMETER);
-      return;
-    }
-
-  ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
-
-  if (this->incoming_ != 0)
-    {
-      delete this->incoming_;
-      this->incoming_ = 0;
-    }
-
-  ACE_NEW (this->incoming_, TAO_InputCDR (cdr));
-  this->incoming_flag_ = flag;
-}
-
-void
-CORBA::NVList::_tao_encode (TAO_OutputCDR &cdr,
-                            int flag
-                            ACE_ENV_ARG_DECL)
-{
-  ACE_GUARD (TAO_SYNCH_MUTEX,
-             ace_mon,
-             this->lock_);
-
-  if (this->incoming_ != 0)
-    {
-      if (this->max_ == 0)
-        {
-          // The list is empty aggresively reduce copies and just send
-          // the CDR stream, we assume that
-          // TAO_Server_Request::init_reply
-          // has inserted appropiated padding already to make this
-          // operation correct
-          cdr.write_octet_array_mb (this->incoming_->start ());
-          return;
-        }
-
-      // Then unmarshal each "in" and "inout" parameter.
-      ACE_Unbounded_Queue_Iterator<CORBA::NamedValue_ptr> i (this->values_);
-
-      for (i.first (); !i.done (); i.advance ())
-        {
-          CORBA::NamedValue_ptr *item = 0;
-          (void) i.next (item);
-
-          CORBA::NamedValue_ptr nv = *item;
-
-          if (ACE_BIT_DISABLED (nv->flags (), flag))
-            {
-              continue;
-            }
-
-          if (TAO_debug_level > 3)
-            {
-              const char* arg = nv->name ();
-
-              if (arg == 0)
-                {
-                  arg = "(nil)";
-                }
-
-              ACE_DEBUG ((LM_DEBUG,
-                          ACE_TEXT ("NVList::_tao_encode - parameter <%s>\n"),
-                          ACE_TEXT_CHAR_TO_TCHAR (arg)));
-            }
-          CORBA::TypeCode_ptr tc = nv->value ()->_tao_get_typecode ();
-          (void) TAO_Marshal_Object::perform_append (tc,
-                                                     this->incoming_,
-                                                     &cdr
-                                                     ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK;
-        }
-
-      delete this->incoming_;
-      this->incoming_ = 0;
-      return;
-    }
-
-  // The list is already evaluated, we cannot optimize the copies, go
-  // ahead with the slow way to do things.
-
-  // Then marshal each "in" and "inout" parameter.
-  ACE_Unbounded_Queue_Iterator<CORBA::NamedValue_ptr> i (this->values_);
-
-  for (i.first (); !i.done (); i.advance ())
-    {
-      CORBA::NamedValue_ptr *item = 0;
-      (void) i.next (item);
-
-      CORBA::NamedValue_ptr nv = *item;
-
-      if (ACE_BIT_DISABLED (nv->flags (), flag))
-        {
-          continue;
-        }
-
-      nv->value ()->impl ()->marshal_value (cdr);
-    }
-}
-
-void
-CORBA::NVList::_tao_decode (TAO_InputCDR &incoming,
-                            int flag
-                            ACE_ENV_ARG_DECL)
-{
-  if (TAO_debug_level > 3)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("TAO (%P|%t) : NVList::_tao_decode\n")));
-    }
-
-  // Then unmarshal each "in" and "inout" parameter.
-  ACE_Unbounded_Queue_Iterator<CORBA::NamedValue_ptr> i (this->values_);
-
-  for (i.first (); !i.done (); i.advance ())
-    {
-      CORBA::NamedValue_ptr *item;
-      (void) i.next (item);
-
-      CORBA::NamedValue_ptr nv = *item;
-
-      // check if it is an in or inout parameter
-      // @@ this is where we assume that the NVList is coming from
-      //    a Server-side request, we could probably handle both
-      //    cases with a flag, but there is no clear need for that.
-      if (ACE_BIT_DISABLED (nv->flags (), flag))
-        {
-          continue;
-        }
-
-      if (TAO_debug_level > 3)
-        {
-          ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("TAO (%P|%t) : NVList::_tao_decode - %s\n"),
-                      ACE_TEXT_CHAR_TO_TCHAR (nv->name ()? nv->name () : "(no name given)" )));
-        }
-
-      CORBA::Any_ptr any = nv->value ();
-      any->impl ()->_tao_decode (incoming
-                                 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK;
-    }
-}
-
-ptrdiff_t
-CORBA::NVList::_tao_target_alignment (void)
-{
-  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
-                    ace_mon,
-                    this->lock_,
-                    ACE_CDR::MAX_ALIGNMENT);
-
-  if (this->incoming_ == 0)
-    {
-      return ACE_CDR::MAX_ALIGNMENT;
-    }
-
-  const char* rd = this->incoming_->start ()->rd_ptr ();
-  ptrdiff_t t = ptrdiff_t (rd) % ACE_CDR::MAX_ALIGNMENT;
-
-  if (t < 0)
-    {
-      t += ACE_CDR::MAX_ALIGNMENT;
-    }
-
-  return t;
-}
-
-void
-CORBA::NVList::evaluate (ACE_ENV_SINGLE_ARG_DECL)
-{
-  ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
-
-  if (this->incoming_ == 0)
-    {
-      return;
-    }
-
-  auto_ptr<TAO_InputCDR> incoming (this->incoming_);
-  this->incoming_ = 0;
-
-  this->_tao_decode (*(incoming.get ()),
-                     this->incoming_flag_
-                     ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Boolean
-CORBA::NVList::_lazy_has_arguments (void) const
-{
-  if (this->incoming_ != 0)
-    {
-      return this->incoming_->length () == 0 ? 0 : 1;
-    }
-  else
-    {
-      return this->count () == 0 ? 0 : 1;
-    }
-}
-
diff --git a/TAO/tao/NVList.h b/TAO/tao/NVList.h
deleted file mode 100644
index 6252b5f179a..00000000000
--- a/TAO/tao/NVList.h
+++ /dev/null
@@ -1,310 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    NVList.h
- *
- *  $Id$
- *
- *  @author  Copyright 1994-1995 by Sun Microsystems Inc.
- *  @author  Aniruddha Gokhale <gokhale@cs.wustl.edu>
- */
-//=============================================================================
-
-
-#ifndef TAO_NVLIST_H
-#define TAO_NVLIST_H
-
-#include /**/ "ace/pre.h"
-#include "ace/CORBA_macros.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "ace/Unbounded_Queue.h"
-#include "ace/Thread_Mutex.h"
-#include "ace/Atomic_Op.h"
-
-#include "tao/CORBA_methods.h"
-#include "tao/Any.h"
-#include "tao/Environment.h"
-
-class TAO_ORB_Core;
-class TAO_InputCDR;
-
-namespace CORBA
-{
-  enum
-  {
-    // = Flags for NVList add methods
-    ARG_IN                  = 0x01,
-    ARG_OUT                 = 0x02,
-    ARG_INOUT               = 0x04,
-    IN_COPY_VALUE           = 0x08,
-    OUT_LIST_MEMORY         = 0x10,
-    DEPENDENT_LIST          = 0x20,
-
-    // = (Unused) flags for Context methods
-    CTX_RESTRICT_SCOPE      = 0x40,
-    CTX_DELETE_DESCENDENTS  = 0x80,
-
-    // = Flags for deferred synchronous methods
-    INV_NO_RESPONSE         = 0x100,
-    INV_TERM_ON_ERR         = 0x200,
-    RESP_NO_WAIT            = 0x400
-  };
-
-  class NamedValue;
-  typedef NamedValue *NamedValue_ptr;
-  typedef TAO_Pseudo_Var_T<NamedValue> NamedValue_var;
-  typedef TAO_Pseudo_Out_T<NamedValue, NamedValue_var> NamedValue_out;
-
-  typedef ULong Flags;
-
-  /**
-   * @class NamedValue
-   *
-   * @brief CORBA Name/value pair implementation.
-   *
-   * These occur only in "NVList" (named value list) data structures.
-   * The binary form of the data structure is frozen and visible to
-   * programs using it (e.g. from C).  The C++ class supports some
-   * programming discipline, e.g. to avoid memory leaks.  They just
-   * represent parameters to calls.  The name is optional, and the
-   * value is packaged as an Any.  The flags indicate parameter mode,
-   * and some ownership rules for "top level" memory.
-   */
-  class TAO_Export NamedValue
-  {
-    friend class ORB;
-    friend class NVList;
-    friend class Request;
-
-  public:
-    /// optional name
-    const char * name (void) const;
-
-    /// return the value
-    Any_ptr value (void) const;
-
-    /// return the parameter mode flag
-    Flags flags (void) const;
-
-    // The pseudo object static methods..
-    static NamedValue * _duplicate (NamedValue *);
-    static NamedValue * _nil (void);
-
-    // = Reference counting.
-    ULong _incr_refcnt (void);
-    ULong _decr_refcnt (void);
-
-    // Useful for template programming.
-    typedef NamedValue_ptr _ptr_type;
-    typedef NamedValue_var _var_type;
-
-  protected:
-
-    /// Destructor
-    /**
-     * Protected destructor to enforce proper memory management
-     * through the reference counting mechanism.
-     */
-    ~NamedValue (void);
-
-  private:
-
-    /// private constructor. Cannot be directly instantiated other than
-    /// by its friends.
-    NamedValue (void);
-
-  private:
-
-    /// Reference counter.
-    ACE_Atomic_Op<TAO_SYNCH_MUTEX, ULong> refcount_;
-
-    /// holds the value
-    Any any_;
-
-    /// parameter mode flags
-    Flags flags_;
-
-    /// optional IDL name of the parameter
-    char * name_;
-  };
-
-  // ****************************************************************
-
-  class NVList;
-  typedef NVList *NVList_ptr;
-  typedef TAO_Pseudo_Var_T<NVList> NVList_var;
-  typedef TAO_Pseudo_Out_T<NVList, NVList_var> NVList_out;
-
-  /**
-   * @class NVList
-   *
-   * @brief CORBA::NVList implementation.
-
-   * This is used in the (client side) DII (Dynamic Invocation
-   * Interface) to hold parameters, except for the return
-   * parameter. It's used in the same role in the (server side) DSI
-   * (Dynamic Skeleton Interface).
-   *
-   * Each user (client, server) provides the typecode and memory for
-   * each parameter using an NVList, then talks to the ORB using a
-   * Request or ServerRequest pseudo-object.  The ORB copies data
-   * to/from the IPC messages (e.g. IIOP::Request, IIOP::Response)
-   * as appropriate.
-   */
-  class TAO_Export NVList
-  {
-    friend class ORB;
-    friend class Request;
-
-  public:
-
-    /// return the current number of elements in the list
-    ULong count (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) const;
-
-    /// add an element and just initialize the flags
-    NamedValue_ptr add (Flags
-                        ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    /// add an element and initialize its name and flags
-    NamedValue_ptr add_item (const char *,
-                             Flags
-                             ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    /// initializes a value, name, and flags
-    NamedValue_ptr add_value (const char *,
-                              const Any &,
-                              Flags
-                              ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    /// just like add_item. In addition, memory management of char *
-    /// name is taken over by the NVList
-    NamedValue_ptr add_item_consume (char *,
-                                     Flags
-                                     ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    /// just like add_value. In addition, the NVList controls the
-    /// memory management of the char *name and Any *value parameter
-    NamedValue_ptr add_value_consume (char *,
-                                      Any_ptr,
-                                      Flags
-                                      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    /// retrieve the item at the nth location. Raises Bounds
-    NamedValue_ptr item (ULong n
-                         ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    //  CORBA::Status
-    /// remove element at index n. Raises Bounds
-    void remove (ULong n
-                 ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    // The pseudo object static methods..
-    static NVList * _duplicate (NVList *);
-    static NVList * _nil (void);
-
-    // = Reference counting.
-    ULong _incr_refcnt (void);
-    ULong _decr_refcnt (void);
-
-    // = TAO Extensions:
-
-    /**
-     * Set the incoming CDR stream, this is used by TAO to perform lazy
-     * evaluation of the NVList in an incoming ServerRequest.
-     * The <flag> is used to check which parameters (IN, OUT and/or
-     * INOUT) are to be extracted
-     */
-    void _tao_incoming_cdr (TAO_InputCDR & cdr,
-                            int flag,
-                            bool &lazy_evaluation
-                            ACE_ENV_ARG_DECL);
-
-    /// Encode the NVList into the CDR stream. <flag> masks the type of
-    /// arguments (IN, OUT or INOUT) that are to be marshaled.
-    void _tao_encode (TAO_OutputCDR & cdr,
-                      int flag
-                      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    /// Decode the NVList arguments from the <cdr> stream.
-    void _tao_decode (TAO_InputCDR & cdr,
-                      int flag
-                      ACE_ENV_ARG_DECL);
-
-    /**
-     * Return the required alignment to marshal the NVList without any
-     * re-alignment.
-     * It returns ACE_CDR::MAX_ALIGNMENT to indicate errors.
-     */
-    ptrdiff_t _tao_target_alignment (void);
-
-    /**
-     * If this list is used by a DII request, this will tell us if
-     * our CDR stream contains any marshaled arguments (needed for
-     * GIOP 1.2).
-     */
-    Boolean _lazy_has_arguments (void) const;
-
-    // Useful for template programming.
-    typedef NVList_ptr _ptr_type;
-    typedef NVList_var _var_type;
-
-  protected:
-
-    /// Destructor
-    /**
-     * Protected destructor to enforce proper memory management
-     * through the reference counting mechanism.
-     */
-    ~NVList (void);
-
-  private:
-    /// constructor - cannot be instantiated directly other than
-    /// through the CORBA::ORB::create_list method
-    NVList (void);
-
-    /// helper to increase the list size. This is used by all the add_
-    /// methods of the NVList class
-    NamedValue_ptr add_element (Flags
-                               ACE_ENV_ARG_DECL_WITH_DEFAULTS);
-
-    /// Lazy evaluation routine to fill up the Anys in the NVList from
-    /// the CDR stream.
-    void evaluate (ACE_ENV_SINGLE_ARG_DECL);
-
-  private:
-    /// internal list of parameters stored as NamedValues
-    ACE_Unbounded_Queue<NamedValue_ptr> values_;
-
-    /// maximum length of list
-    ULong max_;
-
-    /// Reference counter.
-    ACE_Atomic_Op<TAO_SYNCH_MUTEX, ULong> refcount_;
-
-    /// Protects the incoming pointer.
-    TAO_SYNCH_MUTEX lock_;
-
-    /**
-     * When the NVList is used as part of a Server Request we can simply
-     * store the CDR buffer and perform lazy evaluation to compute the
-     * Anys.
-     */
-    TAO_InputCDR * incoming_;
-
-    /// The flags used to check which parameters are actually extracted
-    /// from the <incoming_> buffer
-    int incoming_flag_;
-  };
-}
-
-#if defined (__ACE_INLINE__)
-# include "tao/NVList.i"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-#endif /* TAO_NVLIST_H */
diff --git a/TAO/tao/NVList.i b/TAO/tao/NVList.i
deleted file mode 100644
index 035279feaf6..00000000000
--- a/TAO/tao/NVList.i
+++ /dev/null
@@ -1,126 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-ACE_INLINE CORBA::Boolean
-CORBA::is_nil (CORBA::NamedValue_ptr nv)
-{
-  return nv == 0;
-}
-
-ACE_INLINE void
-CORBA::release (CORBA::NamedValue_ptr nv)
-{
-  if (nv)
-    nv->_decr_refcnt ();
-}
-
-// *************************************************************
-
-ACE_INLINE
-CORBA::NamedValue::NamedValue (void)
-  : refcount_ (1),
-    flags_ (0),
-    name_ (0)
-{
-}
-
-ACE_INLINE
-const char *
-CORBA::NamedValue::name (void) const
-{
-  return this->name_;
-}
-
-ACE_INLINE
-CORBA::Any_ptr
-CORBA::NamedValue::value (void) const
-{
-  return const_cast<CORBA::Any_ptr> (&this->any_);
-}
-
-ACE_INLINE
-CORBA::Flags
-CORBA::NamedValue::flags (void) const
-{
-  return this->flags_;
-}
-
-ACE_INLINE
-CORBA::NamedValue *
-CORBA::NamedValue::_duplicate (CORBA::NamedValue * x)
-{
-  if (x != 0)
-    {
-      x->_incr_refcnt ();
-    }
-
-  return x;
-}
-
-ACE_INLINE
-CORBA::NamedValue*
-CORBA::NamedValue::_nil (void)
-{
-  return 0;
-}
-
-// *************************************************************
-
-ACE_INLINE
-CORBA::Boolean
-CORBA::is_nil (CORBA::NVList_ptr nvl)
-{
-  return (CORBA::Boolean) (nvl == 0);
-}
-
-ACE_INLINE
-void
-CORBA::release (CORBA::NVList_ptr nvl)
-{
-  if (nvl)
-    {
-      nvl->_decr_refcnt ();
-    }
-}
-
-// ****************************************************************
-
-ACE_INLINE
-CORBA::NVList::NVList (void)
-  : max_ (0),
-    refcount_ (1),
-    incoming_ (0),
-    incoming_flag_ (0)
-{
-}
-
-ACE_INLINE
-CORBA::ULong
-CORBA::NVList::count (ACE_ENV_SINGLE_ARG_DECL) const
-{
-  (const_cast<CORBA::NVList *> (this))->evaluate (
-    ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  return this->max_;
-}
-
-ACE_INLINE
-CORBA::NVList *
-CORBA::NVList::_duplicate (CORBA::NVList * x)
-{
-  if (x != 0)
-    {
-      x->_incr_refcnt ();
-    }
-
-  return x;
-}
-
-ACE_INLINE
-CORBA::NVList *
-CORBA::NVList::_nil (void)
-{
-  return 0;
-}
diff --git a/TAO/tao/NVList_Adapter.cpp b/TAO/tao/NVList_Adapter.cpp
new file mode 100644
index 00000000000..a79fd8fde97
--- /dev/null
+++ b/TAO/tao/NVList_Adapter.cpp
@@ -0,0 +1,12 @@
+// @(#) $Id$
+
+#include "tao/NVList_Adapter.h"
+
+ACE_RCSID (tao,
+           NVList_Adapter,
+           "$Id$")
+
+TAO_NVList_Adapter::~TAO_NVList_Adapter (void)
+{
+}
+
diff --git a/TAO/tao/NVList_Adapter.h b/TAO/tao/NVList_Adapter.h
new file mode 100644
index 00000000000..207d5c2e014
--- /dev/null
+++ b/TAO/tao/NVList_Adapter.h
@@ -0,0 +1,59 @@
+// This may look like C, but it's really -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    NVList_Adapter.h
+ *
+ *  $Id$
+ *
+ *  @author  Johnny Willemsen  <jwillemsen@remedy.nl>
+ */
+//=============================================================================
+
+#ifndef TAO_NVLIST_ADAPTER_H
+#define TAO_NVLIST_ADAPTER_H
+
+#include /**/ "ace/pre.h"
+
+#include "tao/TAO_Export.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "ace/Service_Object.h"
+#include "tao/Basic_Types.h"
+#include "ace/CORBA_macros.h"
+
+namespace CORBA
+{
+  class NVList;
+  typedef NVList *NVList_ptr;
+
+  class NamedValue;
+  typedef NamedValue *NamedValue_ptr;
+
+  class Environment;
+}
+
+/**
+ * @class TAO_NVList_Adapter
+ */
+class TAO_Export TAO_NVList_Adapter : public ACE_Service_Object
+{
+public:
+  virtual ~TAO_NVList_Adapter (void);
+
+  virtual void create_list (
+      CORBA::Long count,
+      CORBA::NVList_ptr &new_list
+      ACE_ENV_ARG_DECL) = 0;
+
+  virtual void create_named_value (
+      CORBA::NamedValue_ptr &nv
+      ACE_ENV_ARG_DECL) = 0;
+
+};
+
+#include /**/ "ace/post.h"
+#endif /* TAO_NVLIST_ADAPTER_H */
diff --git a/TAO/tao/Null_RefCount_Policy.h b/TAO/tao/Null_RefCount_Policy.h
deleted file mode 100644
index 8f8a25307cd..00000000000
--- a/TAO/tao/Null_RefCount_Policy.h
+++ /dev/null
@@ -1,78 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Null_RefCount_Policy.h
- *
- *  $Id$
- *
- *  Header file for TAO's reference count policy (unrelated to CORBA
- *  policies).
- *
- *  @author Ossama Othman <ossama@dre.vanderbilt.edu>
- */
-//=============================================================================
-
-#ifndef TAO_NULL_REFCOUNT_POLICY_H
-#define TAO_NULL_REFCOUNT_POLICY_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/TAO_Export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-namespace TAO
-{
-
-  /**
-   * @class Null_RefCount_Policy
-   *
-   * @brief No-op reference counting policy.
-   *
-   * This class is intended to be used as a "policy" argument to a
-   * host class template that implements no-op reference counting.
-   * That class would then inherit privately from it like so:
-   *
-   * @code
-   *   template <class RefCountPolicy>
-   *   class MyHostClass : private RefCountPolicy
-   *   {
-   *   public:
-   *     void my_add_ref (void)    { this->RefCountPolicy::add_ref (); }
-   *     void my_remove_ref (void) { this->RefCountPolicy::remove_ref (); }
-   *   };
-   * @endcode
-   *
-   * and use it like so:
-   *
-   * @code
-   *   typedef MyHostClass<TAO::Null_RefCount_Policy> MyNonRefCountedClass;
-   *   MyNonRefCountedClass m;
-   *   ...
-   * @endcode
-   *
-   * @note In order to incur no size overhead on the host class due to
-   *       virtual tables, no base class defining an interface is
-   *       defined.  This allows C++ compilers to apply the Empty Base
-   *       Class Optimization.
-   */
-  class TAO_Export Null_RefCount_Policy
-  {
-  public:
-
-    /// No-op reference increment.
-    void add_ref (void)  { }
-
-    /// No-op reference decrement.
-    void remove_ref (void) { }
-
-  };
-
-}  // End namespace TAO
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_NULL_REFCOUNT_POLICY_H */
diff --git a/TAO/tao/ORB.cpp b/TAO/tao/ORB.cpp
index 4e0a2833fe1..1740dc23273 100644
--- a/TAO/tao/ORB.cpp
+++ b/TAO/tao/ORB.cpp
@@ -13,12 +13,12 @@ ACE_RCSID (tao,
 #include "ORB_Core.h"
 #include "ORB_Core_TSS_Resources.h"
 #include "TAO_Internal.h"
-#include "NVList.h"
 #include "Dynamic_Adapter.h"
 #include "Profile.h"
 #include "default_ports.h"
 #include "ORBInitializer_Registry_Adapter.h"
 #include "PolicyFactory_Registry_Adapter.h"
+#include "NVList_Adapter.h"
 #include "TAO_Singleton_Manager.h"
 #include "Policy_Current.h"
 #include "Policy_Manager.h"
@@ -30,11 +30,6 @@ ACE_RCSID (tao,
 #include "SystemException.h"
 #include "default_environment.h"
 
-#if TAO_HAS_INTERCEPTORS == 1
-# include "PICurrent_Loader.h"  /* @@ This should go away! */
-# include "PICurrent.h"  /* @@ This should go away! */
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-
 #if !defined (__ACE_INLINE__)
 # include "ORB.i"
 #endif /* ! __ACE_INLINE__ */
@@ -111,7 +106,7 @@ CORBA::Exception *CORBA::ORB::InvalidName::_alloc (void)
 CORBA::Exception *
 CORBA::ORB::InvalidName::_tao_duplicate (void) const
 {
-  CORBA::Exception *result;
+  CORBA::Exception *result = 0;
   ACE_NEW_RETURN (
       result,
       ::CORBA::ORB::InvalidName (*this),
@@ -289,38 +284,21 @@ CORBA::ORB::create_list (CORBA::Long count,
                          CORBA::NVList_ptr &new_list
                          ACE_ENV_ARG_DECL)
 {
-  ACE_ASSERT (CORBA::ULong (count) <= UINT_MAX);
-
-  // Create an empty list
-  ACE_NEW_THROW_EX (new_list,
-                    CORBA::NVList,
-                    CORBA::NO_MEMORY (
-                      CORBA::SystemException::_tao_minor_code (
-                        0,
-                        ENOMEM),
-                      CORBA::COMPLETED_NO));
-  ACE_CHECK;
+  TAO_NVList_Adapter *adapter =
+    ACE_Dynamic_Service<TAO_NVList_Adapter>::instance (
+        "TAO_NVList_Adapter"
+      );
 
-  // If count is greater than 0, create a list of NamedValues.
-  if (count != 0)
+  if (adapter == 0)
     {
-      new_list->max_ = (CORBA::ULong) count;
-
-      for (CORBA::Long i = 0; i < count; ++i)
-        {
-          CORBA::NamedValue_ptr nv = 0;
-          ACE_NEW_THROW_EX (nv,
-                            CORBA::NamedValue,
-                            CORBA::NO_MEMORY (
-                              CORBA::SystemException::_tao_minor_code (
-                                0,
-                                ENOMEM),
-                              CORBA::COMPLETED_NO));
-          ACE_CHECK;
-
-          new_list->values_.enqueue_tail (nv);
-        }
+      ACE_ERROR ((LM_ERROR,
+                  ACE_TEXT ("(%P|%t) %p\n"),
+                  ACE_TEXT ("ORB unable to find the ")
+                  ACE_TEXT ("NVList Adapter instance")));
+      ACE_THROW (CORBA::INTERNAL ());
     }
+
+  adapter->create_list (count, new_list ACE_ENV_ARG_PARAMETER);
 }
 
 void
@@ -375,13 +353,22 @@ void
 CORBA::ORB::create_named_value (CORBA::NamedValue_ptr &nv
                                 ACE_ENV_ARG_DECL)
 {
-  ACE_NEW_THROW_EX (nv,
-                    CORBA::NamedValue,
-                    CORBA::NO_MEMORY (
-                      CORBA::SystemException::_tao_minor_code (
-                        0,
-                        ENOMEM),
-                      CORBA::COMPLETED_NO));
+  TAO_NVList_Adapter *adapter =
+    ACE_Dynamic_Service<TAO_NVList_Adapter>::instance (
+        "TAO_NVList_Adapter"
+      );
+
+  if (adapter == 0)
+    {
+      ACE_ERROR ((LM_ERROR,
+                  ACE_TEXT ("(%P|%t) %p\n"),
+                  ACE_TEXT ("ORB unable to find the ")
+                  ACE_TEXT ("NVList Adapter instance")));
+
+      ACE_THROW (CORBA::INTERNAL ());
+    }
+
+  adapter->create_named_value (nv ACE_ENV_ARG_PARAMETER);
 }
 
 // The following functions are not implemented - they just throw
@@ -1614,13 +1601,6 @@ CORBA::ORB_init (int &argc,
                                           slotid
                                           ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA::ORB::_nil ());
-
-#if TAO_HAS_INTERCEPTORS == 1
-      TAO::PICurrent *pi = oc->pi_current ();
-
-      if (pi != 0)
-        pi->initialize (slotid);
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
     }
 
   if (TAO_debug_level > 2)
diff --git a/TAO/tao/ORB.h b/TAO/tao/ORB.h
index 1fa5acbe664..803d857d6f0 100644
--- a/TAO/tao/ORB.h
+++ b/TAO/tao/ORB.h
@@ -30,6 +30,9 @@
 #include "Policy_ForwardC.h"
 #include "CORBA_methods.h"
 #include "VarOut_T.h"
+#include "Seq_Var_T.h"
+#include "Seq_Out_T.h"
+#include "Sequence_T.h"
 
 #include "ace/Thread_Mutex.h"
 #include "ace/Guard_T.h"
@@ -76,6 +79,14 @@ namespace CORBA
   class NVList;
   typedef NVList *NVList_ptr;
 
+  class NamedValue;
+  typedef NamedValue *NamedValue_ptr;
+
+  class Policy;
+  typedef Policy *Policy_ptr;
+
+  typedef CORBA::ULong PolicyType;
+
   // TODO - implement OMG's 'ORBid CORBA::ORB::id (void)'.
 
   typedef
diff --git a/TAO/tao/ORBInitializer_Registry_Adapter.h b/TAO/tao/ORBInitializer_Registry_Adapter.h
index 3ce462fea29..ffd9b863d58 100644
--- a/TAO/tao/ORBInitializer_Registry_Adapter.h
+++ b/TAO/tao/ORBInitializer_Registry_Adapter.h
@@ -82,13 +82,15 @@ namespace TAO
        * @param argc Number of arguments
        * @param argv Argv array
        * @param slotid The slot id
+       * @param picurrent PI Current, if this is not null, the concrete
+       * implementation will update the slot id
        */
       virtual void post_init (
         size_t pre_init_count,
         TAO_ORB_Core *orb_core,
         int argc,
         char *argv[],
-        PortableInterceptor::SlotId &slotid
+        PortableInterceptor::SlotId slotid
         ACE_ENV_ARG_DECL) = 0;
   };
 }
diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp
index bce6daa608b..e0bc632002e 100644
--- a/TAO/tao/ORB_Core.cpp
+++ b/TAO/tao/ORB_Core.cpp
@@ -57,6 +57,7 @@
 
 #include "ace/OS_NS_strings.h"
 #include "ace/OS_NS_string.h"
+#include "ace/Message_Block.h"
 
 #if TAO_HAS_INTERCEPTORS == 1
 # include "tao/ClientRequestInterceptor_Adapter.h"
@@ -79,7 +80,7 @@ ACE_RCSID (tao,
 CORBA::Environment&
 TAO_default_environment (void)
 {
-  return *TAO_TSS_RESOURCES::instance ()->default_environment_;
+  return *TAO_TSS_Resources::instance ()->default_environment_;
 }
 
 // ****************************************************************
@@ -195,7 +196,7 @@ TAO_ORB_Core::TAO_ORB_Core (const char *orbid)
     policy_factory_registry_ (0),
     orbinitializer_registry_ (0),
 #if (TAO_HAS_INTERCEPTORS == 1)
-    pi_current_ (0),
+    pi_current_ (CORBA::Object::_nil ()),
     client_request_interceptor_adapter_ (0),
     server_request_interceptor_adapter_ (0),
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
@@ -1303,15 +1304,15 @@ TAO_ORB_Core::set_resource_factory (const char *resource_factory_name)
 void
 TAO_ORB_Core::set_gui_resource_factory (TAO::GUIResource_Factory *gui_resource_factory)
 {
-  if (TAO_TSS_RESOURCES::instance ()->gui_resource_factory_ != 0)
+  if (TAO_TSS_Resources::instance ()->gui_resource_factory_ != 0)
     {
 
       ACE_DEBUG ((LM_WARNING,
                   "TAO (%P|%t) - Deleting old gui_resource_factory.\n"));
-      delete TAO_TSS_RESOURCES::instance ()->gui_resource_factory_;
+      delete TAO_TSS_Resources::instance ()->gui_resource_factory_;
     }
 
-  TAO_TSS_RESOURCES::instance ()->gui_resource_factory_ = gui_resource_factory;
+  TAO_TSS_Resources::instance ()->gui_resource_factory_ = gui_resource_factory;
 }
 
 void
@@ -1394,7 +1395,7 @@ TAO_ORB_Core::resource_factory (void)
 TAO::GUIResource_Factory *
 TAO_ORB_Core::gui_resource_factory (void)
 {
-  return TAO_TSS_RESOURCES::instance ()->gui_resource_factory_;
+  return TAO_TSS_Resources::instance ()->gui_resource_factory_;
 }
 
 
@@ -2083,7 +2084,6 @@ TAO_ORB_Core::shutdown (CORBA::Boolean wait_for_completion
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       CORBA::release (this->pi_current_);
-      this->pi_current_ = 0;  // For the sake of consistency.
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
     }
   ACE_CATCHALL
@@ -2257,7 +2257,7 @@ TAO_ORB_Core::resolve_picurrent_i (ACE_ENV_SINGLE_ARG_DECL)
     {
       ACE_Service_Config::process_directive (
         ACE_DYNAMIC_SERVICE_DIRECTIVE("PICurrent_Loader",
-                                      "TAO",
+                                      "TAO_PI",
                                       "_make_TAO_PICurrent_Loader",
                                       ""));
       loader =
@@ -2270,7 +2270,7 @@ TAO_ORB_Core::resolve_picurrent_i (ACE_ENV_SINGLE_ARG_DECL)
         loader->create_object (this->orb_, 0, 0 ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
-      this->pi_current_ = dynamic_cast <TAO::PICurrent *> (pi);
+      this->pi_current_ = pi;
     }
 }
 
@@ -2844,13 +2844,13 @@ TAO_ORB_Core::get_cached_policy_including_current (
 CORBA::Environment *
 TAO_ORB_Core::default_environment (void) const
 {
-  return TAO_TSS_RESOURCES::instance ()->default_environment_;
+  return TAO_TSS_Resources::instance ()->default_environment_;
 }
 
 void
 TAO_ORB_Core::default_environment (CORBA::Environment *env)
 {
-  TAO_TSS_RESOURCES::instance ()->default_environment_ = env;
+  TAO_TSS_Resources::instance ()->default_environment_ = env;
 }
 
 void
diff --git a/TAO/tao/ORB_Core.h b/TAO/tao/ORB_Core.h
index 524d1811834..a7d565fe3f7 100644
--- a/TAO/tao/ORB_Core.h
+++ b/TAO/tao/ORB_Core.h
@@ -40,8 +40,6 @@
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-#include "tao/PICurrent.h"
-
 namespace TAO
 {
   class ClientRequestInterceptor_Adapter;
@@ -55,6 +53,8 @@ namespace TAO
 #include "ace/TSS_T.h"
 
 // Forward declarations
+class ACE_Data_Block;
+
 class TAO_Adapter;
 class TAO_Acceptor;
 class TAO_Connector;
@@ -190,10 +190,10 @@ public:
   void poa_current (CORBA::Object_ptr poa_current);
   //@}
 
-  ///Get the connector registry
+  /// Get the connector registry
   TAO_Connector_Registry *connector_registry (ACE_ENV_SINGLE_ARG_DECL);
 
-  ///Get the IOR parser registry
+  /// Get the IOR parser registry
   TAO_Parser_Registry *parser_registry (void);
 
   /// Return pointer to the policy factory registry associated with
@@ -413,7 +413,6 @@ public:
   /// locking strategies.
   ACE_Data_Block *create_input_cdr_data_block (size_t size);
 
-
   /// Return the locking strategy used for the data blocks.
   ACE_Lock *locking_strategy (void);
 
@@ -787,10 +786,10 @@ public:
 #if TAO_HAS_INTERCEPTORS == 1
 
   /// Return a pointer to the cached TAO::PICurrent object.
-  TAO::PICurrent *pi_current (void);
+  CORBA::Object_ptr pi_current (void);
 
   /// Set the pointer to the cached TAO::PICurrent object.
-  void pi_current (TAO::PICurrent *current);
+  void pi_current (CORBA::Object_ptr current);
 
   /// Register a client request interceptor.
   void add_interceptor (
@@ -1166,7 +1165,7 @@ protected:
    * invocation path).  Caching it prevents additional overhead to due
    * object resolution from occurring.
    */
-  TAO::PICurrent *pi_current_;
+  CORBA::Object_ptr pi_current_;
 
   /// The adapter for handling client request interceptors
   TAO::ClientRequestInterceptor_Adapter *client_request_interceptor_adapter_;
diff --git a/TAO/tao/ORB_Core.i b/TAO/tao/ORB_Core.i
index 60b9a0db058..a5dc61de082 100644
--- a/TAO/tao/ORB_Core.i
+++ b/TAO/tao/ORB_Core.i
@@ -602,7 +602,7 @@ TAO_ORB_Core::resolve_rt_orb (void)
 }
 
 #if (TAO_HAS_INTERCEPTORS == 1)
-ACE_INLINE TAO::PICurrent *
+ACE_INLINE CORBA::Object_ptr
 TAO_ORB_Core::pi_current (void)
 {
   // A pointer/reference to PICurrent is cached in the ORB Core since
@@ -613,7 +613,7 @@ TAO_ORB_Core::pi_current (void)
 }
 
 ACE_INLINE void
-TAO_ORB_Core::pi_current (TAO::PICurrent *current)
+TAO_ORB_Core::pi_current (CORBA::Object_ptr current)
 {
   // Not duplicated since the ORB Core's "object_ref_table" already
   // contains a duplicate of the PICurrent object.
diff --git a/TAO/tao/ORB_Core_Auto_Ptr.h b/TAO/tao/ORB_Core_Auto_Ptr.h
index 52aa611502b..f99c4f79a9d 100644
--- a/TAO/tao/ORB_Core_Auto_Ptr.h
+++ b/TAO/tao/ORB_Core_Auto_Ptr.h
@@ -33,7 +33,9 @@ class TAO_Export TAO_ORB_Core_Auto_Ptr
 {
 public:
 
-  /// Initialization and termination methods
+  /**
+   * @name Initialization and termination methods
+   */
   //@{
   explicit TAO_ORB_Core_Auto_Ptr (TAO_ORB_Core *p = 0);
   TAO_ORB_Core_Auto_Ptr (TAO_ORB_Core_Auto_Ptr &ap);
@@ -41,7 +43,9 @@ public:
   ~TAO_ORB_Core_Auto_Ptr (void);
   //@}
 
-  /// Accessor methods.
+  /**
+   * @name Accessor methods.
+   */
   //@{
   TAO_ORB_Core &operator *() const;
   TAO_ORB_Core *get (void) const;
diff --git a/TAO/tao/ORB_Core_TSS_Resources.cpp b/TAO/tao/ORB_Core_TSS_Resources.cpp
index 400ab9ff947..a9d364e90f2 100644
--- a/TAO/tao/ORB_Core_TSS_Resources.cpp
+++ b/TAO/tao/ORB_Core_TSS_Resources.cpp
@@ -9,9 +9,6 @@ TAO_ORB_Core_TSS_Resources::TAO_ORB_Core_TSS_Resources (void)
   , ts_objects_ ()
   , upcalls_temporarily_suspended_on_this_thread_ (false)
   , orb_core_ (0)
-#if TAO_HAS_INTERCEPTORS == 1
-    , pi_current_ ()
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
 {
 }
 
diff --git a/TAO/tao/ORB_Core_TSS_Resources.h b/TAO/tao/ORB_Core_TSS_Resources.h
index 0853605a831..9488216500e 100644
--- a/TAO/tao/ORB_Core_TSS_Resources.h
+++ b/TAO/tao/ORB_Core_TSS_Resources.h
@@ -27,10 +27,6 @@
 
 class TAO_ORB_Core;
 
-#if TAO_HAS_INTERCEPTORS == 1
-#include "PICurrent_Impl.h"
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-
 /**
  * @class TAO_ORB_Core_TSS_Resources
  *
@@ -85,11 +81,6 @@ public:
   /// cleanup functions for the TSS objects stored in the TSS object
   /// array in this class.
   TAO_ORB_Core *orb_core_;
-
-#if TAO_HAS_INTERCEPTORS == 1
-  /// The thread-specific portion of the PICurrent object.
-  TAO::PICurrent_Impl pi_current_;
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
 };
 
 
diff --git a/TAO/tao/ORB_Table.h b/TAO/tao/ORB_Table.h
index d527c79377a..1b35ae545b0 100644
--- a/TAO/tao/ORB_Table.h
+++ b/TAO/tao/ORB_Table.h
@@ -78,7 +78,9 @@ namespace TAO
     typedef Table::size_type  size_type;
     typedef Table::iterator   iterator;
 
-    /// The canonical ACE_Map methods.
+    /**
+     * @name The canonical ACE_Map methods.
+     */
     //@{
     iterator begin (void);
     iterator end (void);
diff --git a/TAO/tao/ObjRefTemplate.mpc b/TAO/tao/ObjRefTemplate.mpc
index 77150719a80..b4abf145b34 100644
--- a/TAO/tao/ObjRefTemplate.mpc
+++ b/TAO/tao/ObjRefTemplate.mpc
@@ -27,6 +27,9 @@ project : valuetype, portableserver, core {
     ObjRefTemplate
   }
 
+  IDL_Files {
+  }
+
   Pkgconfig_Files {
     ObjRefTemplate/TAO_ObjRefTemplate.pc.in
   }
diff --git a/TAO/tao/ObjRefTemplate/Default_ORTA.cpp b/TAO/tao/ObjRefTemplate/Default_ORTA.cpp
index 9be9852ca99..b78d8423c3f 100644
--- a/TAO/tao/ObjRefTemplate/Default_ORTA.cpp
+++ b/TAO/tao/ObjRefTemplate/Default_ORTA.cpp
@@ -26,15 +26,15 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "Default_ORTC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/String_TypeCode_Static.h"
-#include "tao/Value_TypeCode_Static.h"
-#include "tao/TypeCode_Value_Field.h"
+#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
+#include "tao/AnyTypeCode/String_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Value_TypeCode_Static.h"
+#include "tao/AnyTypeCode/TypeCode_Value_Field.h"
 #include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
+#include "tao/AnyTypeCode/Any.h"
+#include "tao/AnyTypeCode/Any_Impl_T.h"
 
 // TAO_IDL - Generated from
 // be/be_visitor_typecode/value_typecode.cpp:50
@@ -54,7 +54,7 @@ static TAO::TypeCode::Value<char const *,
     &CORBA::_tc_null,
     _tao_fields_TAO_Default_ORT_ObjectReferenceTemplate,
     0);
-  
+
 namespace TAO_Default_ORT
 {
   ::CORBA::TypeCode_ptr const _tc_ObjectReferenceTemplate =
diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateA.cpp b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateA.cpp
index 1c230c1fa55..3ee1ad6f6d7 100644
--- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateA.cpp
+++ b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateA.cpp
@@ -26,17 +26,17 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "ObjectReferenceTemplate.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Sequence_TypeCode_Static.h"
-#include "tao/String_TypeCode_Static.h"
-#include "tao/Value_TypeCode_Static.h"
-#include "tao/TypeCode_Value_Field.h"
+#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Sequence_TypeCode_Static.h"
+#include "tao/AnyTypeCode/String_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Value_TypeCode_Static.h"
+#include "tao/AnyTypeCode/TypeCode_Value_Field.h"
 #include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
-#include "tao/Any_Dual_Impl_T.h"
+#include "tao/AnyTypeCode/Any.h"
+#include "tao/AnyTypeCode/Any_Impl_T.h"
+#include "tao/AnyTypeCode/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
 // be/be_visitor_typecode/value_typecode.cpp:50
@@ -56,7 +56,7 @@ static TAO::TypeCode::Value<char const *,
     &CORBA::_tc_null,
     _tao_fields_PortableInterceptor_ObjectReferenceFactory,
     0);
-  
+
 namespace PortableInterceptor
 {
   ::CORBA::TypeCode_ptr const _tc_ObjectReferenceFactory =
@@ -83,7 +83,7 @@ static TAO::TypeCode::Value<char const *,
     &CORBA::_tc_null,
     _tao_fields_PortableInterceptor_ObjectReferenceTemplate,
     0);
-  
+
 namespace PortableInterceptor
 {
   ::CORBA::TypeCode_ptr const _tc_ObjectReferenceTemplate =
@@ -113,10 +113,10 @@ namespace TAO
         CORBA::tk_sequence,
         &PortableInterceptor::_tc_ObjectReferenceTemplate,
         0U);
-      
+
     ::CORBA::TypeCode_ptr const tc_PortableInterceptor_ObjectReferenceTemplateSeq_0 =
       &PortableInterceptor_ObjectReferenceTemplateSeq_0;
-    
+
   }
 }
 
@@ -130,7 +130,7 @@ static TAO::TypeCode::Alias<char const *,
     "IDL:omg.org/PortableInterceptor/ObjectReferenceTemplateSeq:1.0",
     "ObjectReferenceTemplateSeq",
     &TAO::TypeCode::tc_PortableInterceptor_ObjectReferenceTemplateSeq_0);
-  
+
 namespace PortableInterceptor
 {
   ::CORBA::TypeCode_ptr const _tc_ObjectReferenceTemplateSeq =
@@ -259,7 +259,7 @@ operator>>= (
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be/be_visitor_sequence/any_op_cs.cpp:54
 
 
diff --git a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.cpp b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.cpp
index 3c6be414aa1..9ffbc54f337 100644
--- a/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.cpp
+++ b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplateC.cpp
@@ -53,20 +53,21 @@
 // Arg traits specializations.
 namespace TAO
 {
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:489
 
 #if !defined (_CORBA_STRINGSEQ__ARG_TRAITS_CS_)
 #define _CORBA_STRINGSEQ__ARG_TRAITS_CS_
-  
+
   template<>
   class Arg_Traits<CORBA::StringSeq>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::StringSeq,
             CORBA::StringSeq_var,
-            CORBA::StringSeq_out
+            CORBA::StringSeq_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::StringSeq>
           >
   {
   };
@@ -139,29 +140,29 @@ CORBA::Boolean PortableInterceptor::ObjectReferenceFactory::_tao_unmarshal (
         base,
         ObjectReferenceFactory::_tao_obv_static_repository_id ()
       );
-  
+
   if (retval == 0)
     {
       return 0;
     }
-  
+
   if (factory.in () != 0)
     {
       base = factory->create_for_unmarshal ();
-      
+
       if (base == 0)
         {
           return 0;  // %! except.?
         }
-      
+
       retval = base->_tao_unmarshal_v (strm);
-      
+
       if (retval == 0)
         {
           return 0;
         }
     }
-  
+
   // Now base must be null or point to the unmarshaled object.
   // Align the pointer to the right subobject.
   new_object = ObjectReferenceFactory::_downcast (base);
diff --git a/TAO/tao/VisibilityC.cpp b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_includeA.h
index dea87ac4d8f..fbf583b4fef 100644
--- a/TAO/tao/VisibilityC.cpp
+++ b/TAO/tao/ObjRefTemplate/ObjectReferenceTemplate_includeA.h
@@ -26,44 +26,41 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:291
+// be\be_codegen.cpp:390
 
+#ifndef _TAO_IDL_ORIG_OBJECTREFERENCETEMPLATE_INCLUDEA_H_
+#define _TAO_IDL_ORIG_OBJECTREFERENCETEMPLATE_INCLUDES_H_
 
-#include "VisibilityC.h"
-#include "tao/CDR.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
+#include /**/ "ace/pre.h"
+
+#include "tao/ObjRefTemplate/ObjectReferenceTemplate_includeC.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+
+#if defined(_MSC_VER)
+#pragma warning(push)
+#pragma warning(disable:4250)
+#endif /* _MSC_VER */
 
 #if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
+#pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:70
+// be\be_codegen.cpp:999
 
-// Arg traits specializations.
-namespace TAO
-{
-}
 
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif /* _MSC_VER */
 
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_Visibility (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/Visibility:1.0",
-    "Visibility",
-    &CORBA::_tc_short);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_Visibility =
-    &_tao_tc_CORBA_Visibility;
-}
+#if defined (__BORLANDC__)
+#pragma option pop
+#endif /* __BORLANDC__ */
 
+#include /**/ "ace/post.h"
+#endif /* ifndef */
 
diff --git a/TAO/tao/Object.cpp b/TAO/tao/Object.cpp
index 37c9a8008bc..15580b19b63 100644
--- a/TAO/tao/Object.cpp
+++ b/TAO/tao/Object.cpp
@@ -1007,48 +1007,6 @@ namespace TAO
   {
     return p->marshal (cdr);
   }
-
-//============================================================================
-  using namespace CORBA;
-
-  CORBA::Boolean
-  Ret_Object_Argument_T<Object_ptr,Object_var>::demarshal (TAO_InputCDR &cdr)
-  {
-    return cdr >> this->x_.out ();
-  }
-
-  void
-  Ret_Object_Argument_T<Object_ptr,Object_var>::interceptor_result (CORBA::Any * )
-  {
-    if (TAO_debug_level > 2)
-      {
-        ACE_DEBUG ((LM_DEBUG,
-                    "TAO (%P|%t) - Cannot insert a vanilla CORBA Object"
-                    " into an Any for returning the return argument \n"));
-      }
-  }
-
-  Ret_Object_Argument_T<Object_ptr,Object_var>::Ret_Object_Argument_T (void)
-  {
-  }
-
-  Object_ptr &
-  Ret_Object_Argument_T<Object_ptr,Object_var>::arg (void)
-  {
-    return this->x_.out ();
-  }
-
-  Object_ptr
-  Ret_Object_Argument_T<Object_ptr,Object_var>::excp (void)
-  {
-    return this->x_.ptr ();
-  }
-
-  Object_ptr
-  Ret_Object_Argument_T<Object_ptr,Object_var>::retn (void)
-  {
-    return this->x_._retn ();
-  }
 } // close TAO namespace
 
 
diff --git a/TAO/tao/Object.h b/TAO/tao/Object.h
index cad1d111e00..548cf871edd 100644
--- a/TAO/tao/Object.h
+++ b/TAO/tao/Object.h
@@ -31,6 +31,7 @@
 #include "tao/Pseudo_VarOut_T.h"
 #include "tao/Object_Argument_T.h"
 #include "tao/Arg_Traits_T.h"
+#include "tao/Any_Insert_Policy_T.h"
 
 #if defined (HPUX) && defined (IOR)
    /* HP-UX 11.11 defines IOR in /usr/include/pa/inline.h
@@ -427,7 +428,8 @@ namespace TAO
     : public Object_Arg_Traits_T<CORBA::Object_ptr,
                                  CORBA::Object_var,
                                  CORBA::Object_out,
-                                 TAO::Objref_Traits<CORBA::Object> >
+                                 TAO::Objref_Traits<CORBA::Object>,
+                                 TAO::Any_Insert_Policy_CORBA_Object <CORBA::Object_ptr> >
   {
   };
 
@@ -440,35 +442,8 @@ namespace TAO
     static CORBA::Boolean marshal (CORBA::Object_ptr p,
                                    TAO_OutputCDR & cdr);
   };
-
-  /**
-   * @class Ret_Object_Argument_T
-   *
-   * @brief Specialization for CORBA::Object, necessitated since we
-   *  don't have an Any insertion operator for Object.
-   */
-  template<>
-  class TAO_Export Ret_Object_Argument_T <CORBA::Object_ptr, CORBA::Object_var>
-    : public Argument
-  {
-  public:
-    Ret_Object_Argument_T (void);
-
-    virtual CORBA::Boolean demarshal (TAO_InputCDR &);
-
-    virtual void interceptor_result (CORBA::Any *);
-
-    CORBA::Object_ptr & arg (void);
-
-    CORBA::Object_ptr excp (void);
-    CORBA::Object_ptr retn (void);
-
-  private:
-    CORBA::Object_var x_;
-  };
 }
 
-
 /// This function pointer is set only when the Portable server
 /// library is present.
 extern
diff --git a/TAO/tao/ObjectIdListA.cpp b/TAO/tao/ObjectIdListA.cpp
deleted file mode 100644
index db1e3a6e222..00000000000
--- a/TAO/tao/ObjectIdListA.cpp
+++ /dev/null
@@ -1,100 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "ObjectIdListC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Sequence_TypeCode_Static.h"
-#include "tao/String_TypeCode_Static.h"
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ORB_ObjectId (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/ORB_ObjectId:1.0",
-    "ORB_ObjectId",
-    &CORBA::_tc_string);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ORB_ObjectId =
-    &_tao_tc_CORBA_ORB_ObjectId;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:937
-
-
-#ifndef _TAO_TYPECODE_CORBA_ORB_ObjectIdList_GUARD
-#define _TAO_TYPECODE_CORBA_ORB_ObjectIdList_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_ORB_ObjectIdList_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_ORB_ObjectId,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_ORB_ObjectIdList_0 =
-      &CORBA_ORB_ObjectIdList_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_ORB_ObjectIdList_GUARD */
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ORB_ObjectIdList (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/ORB_ObjectIdList:1.0",
-    "ORB_ObjectIdList",
-    &TAO::TypeCode::tc_CORBA_ORB_ObjectIdList_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ORB_ObjectIdList =
-    &_tao_tc_CORBA_ORB_ObjectIdList;
-}
-
diff --git a/TAO/tao/ObjectIdListC.h b/TAO/tao/ObjectIdListC.h
index f0d4cc61ce3..41ec5807c6d 100644
--- a/TAO/tao/ObjectIdListC.h
+++ b/TAO/tao/ObjectIdListC.h
@@ -66,34 +66,29 @@
 
 namespace CORBA
 {
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typedef/typedef_ch.cpp:413
-  
+
   typedef char * ORB_ObjectId;
   typedef CORBA::String_var ORB_ObjectId_var;
   typedef CORBA::String_out ORB_ObjectId_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ORB_ObjectId;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_ORB_OBJECTIDLIST_CH_)
 #define _CORBA_ORB_OBJECTIDLIST_CH_
-  
+
   class ORB_ObjectIdList;
-  
+
   typedef
     TAO_MngSeq_Var_T<
         ORB_ObjectIdList,
         TAO_SeqElem_String_Manager
       >
     ORB_ObjectIdList_var;
-  
+
   typedef
     TAO_MngSeq_Out_T<
         ORB_ObjectIdList,
@@ -101,7 +96,7 @@ namespace CORBA
         TAO_SeqElem_String_Manager
       >
     ORB_ObjectIdList_out;
-  
+
   class TAO_Export ORB_ObjectIdList
     : public
         TAO_Unbounded_String_Sequence
@@ -112,21 +107,16 @@ namespace CORBA
     ORB_ObjectIdList (
         CORBA::ULong max,
         CORBA::ULong length,
-        char ** buffer, 
+        char ** buffer,
         CORBA::Boolean release = 0
       );
     ORB_ObjectIdList (const ORB_ObjectIdList &);
     ~ORB_ObjectIdList (void);
-    
+
     typedef ORB_ObjectIdList_var _var_type;
   };
 
 #endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ORB_ObjectIdList;
 
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:66
diff --git a/TAO/tao/Object_Argument_T.cpp b/TAO/tao/Object_Argument_T.cpp
index db3a85f5329..9d949775999 100644
--- a/TAO/tao/Object_Argument_T.cpp
+++ b/TAO/tao/Object_Argument_T.cpp
@@ -4,7 +4,6 @@
 #define TAO_OBJECT_ARGUMENT_T_C
 
 #include "tao/Object_Argument_T.h"
-#include "tao/Dynamic_ParameterC.h"
 
 #if !defined (__ACE_INLINE__)
 #include "tao/Object_Argument_T.inl"
@@ -14,37 +13,36 @@ ACE_RCSID (tao,
            Object_Argument_T,
            "$Id$")
 
-template<typename S_ptr>
+template<typename S_ptr, typename Insert_Policy>
 CORBA::Boolean
-TAO::In_Object_Argument_T<S_ptr>::marshal (TAO_OutputCDR & cdr)
+TAO::In_Object_Argument_T<S_ptr,Insert_Policy>::marshal (TAO_OutputCDR &cdr)
 {
   return cdr << this->x_;
 }
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S_ptr>
+template<typename S_ptr, typename Insert_Policy>
 void
-TAO::In_Object_Argument_T<S_ptr>::interceptor_param (Dynamic::Parameter & p)
+TAO::In_Object_Argument_T<S_ptr,Insert_Policy>::interceptor_value (CORBA::Any *any) const
 {
-  p.argument <<= this->x_;
-  p.mode = CORBA::PARAM_IN;
+  this->Insert_Policy::any_insert (any, this->x_);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // ===========================================================
 
-template<typename S_ptr, typename S_traits>
+template<typename S_ptr, typename S_traits, typename Insert_Policy>
 CORBA::Boolean
-TAO::Inout_Object_Argument_T<S_ptr,S_traits>::marshal (TAO_OutputCDR & cdr)
+TAO::Inout_Object_Argument_T<S_ptr,S_traits,Insert_Policy>::marshal (TAO_OutputCDR &cdr)
 {
   return cdr << this->x_;
 }
 
-template<typename S_ptr, typename S_traits>
+template<typename S_ptr, typename S_traits, typename Insert_Policy>
 CORBA::Boolean
-TAO::Inout_Object_Argument_T<S_ptr,S_traits>::demarshal (TAO_InputCDR & cdr)
+TAO::Inout_Object_Argument_T<S_ptr,S_traits,Insert_Policy>::demarshal (TAO_InputCDR & cdr)
 {
   S_traits::release (this->x_);
   return cdr >> this->x_;
@@ -52,57 +50,54 @@ TAO::Inout_Object_Argument_T<S_ptr,S_traits>::demarshal (TAO_InputCDR & cdr)
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S_ptr, typename S_traits>
+template<typename S_ptr, typename S_traits, typename Insert_Policy>
 void
-TAO::Inout_Object_Argument_T<S_ptr,S_traits>::interceptor_param (
-    Dynamic::Parameter & p
-  )
+TAO::Inout_Object_Argument_T<S_ptr,S_traits,Insert_Policy>::interceptor_value (
+    CORBA::Any *any) const
 {
-  p.argument <<= this->x_;
-  p.mode = CORBA::PARAM_INOUT;
+  this->Insert_Policy::any_insert (any, this->x_);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // ==============================================================
 
-template<typename S_ptr, typename S_out>
+template<typename S_ptr, typename S_out, typename Insert_Policy>
 CORBA::Boolean
-TAO::Out_Object_Argument_T<S_ptr,S_out>::demarshal (TAO_InputCDR & cdr)
+TAO::Out_Object_Argument_T<S_ptr,S_out,Insert_Policy>::demarshal (TAO_InputCDR & cdr)
 {
   return cdr >> this->x_;
 }
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S_ptr, typename S_out>
+template<typename S_ptr, typename S_out, typename Insert_Policy>
 void
-TAO::Out_Object_Argument_T<S_ptr,S_out>::interceptor_param (
-    Dynamic::Parameter & p
-  )
+TAO::Out_Object_Argument_T<S_ptr,S_out,Insert_Policy>::interceptor_value (
+    CORBA::Any *any) const
 {
-  p.argument <<= this->x_;
-  p.mode = CORBA::PARAM_OUT;
+  this->Insert_Policy::any_insert (any, this->x_);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // ============================================================
 
-template<typename S_ptr, typename S_var>
+template<typename S_ptr, typename S_var, typename Insert_Policy>
 CORBA::Boolean
-TAO::Ret_Object_Argument_T<S_ptr,S_var>::demarshal (TAO_InputCDR & cdr)
+TAO::Ret_Object_Argument_T<S_ptr,S_var,Insert_Policy>::demarshal (TAO_InputCDR & cdr)
 {
   return cdr >> this->x_.out ();
 }
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S_ptr, typename S_var>
+template<typename S_ptr, typename S_var, typename Insert_Policy>
 void
-TAO::Ret_Object_Argument_T<S_ptr,S_var>::interceptor_result (CORBA::Any * any)
+TAO::Ret_Object_Argument_T<S_ptr,S_var,Insert_Policy>::interceptor_value (
+    CORBA::Any *any) const
 {
-  (*any) <<= this->x_.in ();
+  this->Insert_Policy::any_insert (any, this->x_.in ());
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
diff --git a/TAO/tao/Object_Argument_T.h b/TAO/tao/Object_Argument_T.h
index 2e2d86fb2a3..b5157e3616f 100644
--- a/TAO/tao/Object_Argument_T.h
+++ b/TAO/tao/Object_Argument_T.h
@@ -22,11 +22,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-// This set of classes is also used by valuetype arguments. If the
-// specialization is done using S * for the parameter, the semantics
-// are the same as for interfaces, so there's no need for another
-// set of classes.
-
 namespace TAO
 {
   /**
@@ -35,15 +30,15 @@ namespace TAO
    * @brief Template class for IN object argument.
    *
    */
-  template<typename S_ptr>
-  class In_Object_Argument_T : public Argument
+  template<typename S_ptr, typename Insert_Policy>
+  class In_Object_Argument_T : public InArgument, private Insert_Policy
   {
   public:
     In_Object_Argument_T (S_ptr x);
 
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S_ptr arg (void) const;
 
@@ -57,16 +52,16 @@ namespace TAO
    * @brief Template class for INOUT object argument.
    *
    */
-  template<typename S_ptr, typename S_traits>
-  class Inout_Object_Argument_T : public Argument
+  template<typename S_ptr, typename S_traits, typename Insert_Policy>
+  class Inout_Object_Argument_T : public InoutArgument, private Insert_Policy
   {
   public:
     Inout_Object_Argument_T (S_ptr & x);
 
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
-    virtual CORBA::Boolean demarshal (TAO_InputCDR &);
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+    virtual CORBA::Boolean demarshal (TAO_InputCDR &cdr);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S_ptr & arg (void);
 
@@ -77,18 +72,18 @@ namespace TAO
   /**
    * @class Out_Object_Argument_T
    *
-   * @brief Template class for INOUT object argument.
+   * @brief Template class for OUT object argument.
    *
    */
-  template<typename S_ptr, typename S_out>
-  class Out_Object_Argument_T : public Argument
+  template<typename S_ptr, typename S_out, typename Insert_Policy>
+  class Out_Object_Argument_T : public OutArgument, private Insert_Policy
   {
   public:
     Out_Object_Argument_T (S_out & x);
 
-    virtual CORBA::Boolean demarshal (TAO_InputCDR &);
+    virtual CORBA::Boolean demarshal (TAO_InputCDR &cdr);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S_out arg (void);
 
@@ -102,8 +97,8 @@ namespace TAO
    * @brief Template class for return stub value of object argument.
    *
    */
-  template<typename S_ptr, typename S_var>
-  class Ret_Object_Argument_T : public Argument
+  template<typename S_ptr, typename S_var, typename Insert_Policy>
+  class Ret_Object_Argument_T : public RetArgument, private Insert_Policy
   {
   public:
 
@@ -111,7 +106,7 @@ namespace TAO
 
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_result (CORBA::Any *);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S_ptr & arg (void);
 
@@ -131,13 +126,11 @@ namespace TAO
   struct TAO_Export Object_Tag {};
 
   /**
-   * @struct Basic_Arg_Traits_T
+   * @struct Object_Arg_Traits_T
    *
    * @brief Template class for stub argument traits of objects.
-   *
    */
-
-  template<typename T_ptr, typename T_var, typename T_out, typename T_traits>
+  template<typename T_ptr, typename T_var, typename T_out, typename T_traits, typename Insert_Policy>
   struct Object_Arg_Traits_T
   {
     typedef T_ptr                                         ret_type;
@@ -145,10 +138,14 @@ namespace TAO
     typedef T_ptr &                                       inout_type;
     typedef T_out                                         out_type;
 
-    typedef In_Object_Argument_T<T_ptr>                   in_arg_val;
-    typedef Inout_Object_Argument_T<T_ptr, T_traits>      inout_arg_val;
-    typedef Out_Object_Argument_T<T_ptr,T_out>            out_arg_val;
-    typedef Ret_Object_Argument_T<T_ptr,T_var>            ret_val;
+    typedef In_Object_Argument_T<T_ptr, Insert_Policy>
+      in_arg_val;
+    typedef Inout_Object_Argument_T<T_ptr, T_traits, Insert_Policy>
+      inout_arg_val;
+    typedef Out_Object_Argument_T<T_ptr,T_out, Insert_Policy>
+      out_arg_val;
+    typedef Ret_Object_Argument_T<T_ptr,T_var, Insert_Policy>
+      ret_val;
 
     typedef Object_Tag                                    idl_tag;
   };
diff --git a/TAO/tao/Object_Argument_T.inl b/TAO/tao/Object_Argument_T.inl
index feb64a6af6e..b4a778c9299 100644
--- a/TAO/tao/Object_Argument_T.inl
+++ b/TAO/tao/Object_Argument_T.inl
@@ -2,81 +2,81 @@
 //
 // $Id$
 
-template<typename S_ptr>
+template<typename S_ptr, typename Insert_Policy>
 ACE_INLINE
-TAO::In_Object_Argument_T<S_ptr>::In_Object_Argument_T (S_ptr x)
+TAO::In_Object_Argument_T<S_ptr,Insert_Policy>::In_Object_Argument_T (S_ptr x)
   : x_ (x)
 {}
 
-template<typename S_ptr>
+template<typename S_ptr, typename Insert_Policy>
 ACE_INLINE
 S_ptr
-TAO::In_Object_Argument_T<S_ptr>::arg (void) const
+TAO::In_Object_Argument_T<S_ptr,Insert_Policy>::arg (void) const
 {
   return this->x_;
 }
 
 // ==========================================================================
 
-template<typename S_ptr, typename S_traits>
+template<typename S_ptr, typename S_traits, typename Insert_Policy>
 ACE_INLINE
-TAO::Inout_Object_Argument_T<S_ptr,S_traits>::Inout_Object_Argument_T (
+TAO::Inout_Object_Argument_T<S_ptr,S_traits,Insert_Policy>::Inout_Object_Argument_T (
     S_ptr & x
   )
   : x_ (x)
 {}
 
-template<typename S_ptr, typename S_traits>
+template<typename S_ptr, typename S_traits, typename Insert_Policy>
 ACE_INLINE
 S_ptr &
-TAO::Inout_Object_Argument_T<S_ptr,S_traits>::arg (void)
+TAO::Inout_Object_Argument_T<S_ptr,S_traits,Insert_Policy>::arg (void)
 {
   return this->x_;
 }
 
 // ==========================================================================
 
-template<typename S_ptr, typename S_out>
+template<typename S_ptr, typename S_out, typename Insert_Policy>
 ACE_INLINE
-TAO::Out_Object_Argument_T<S_ptr,S_out>::Out_Object_Argument_T (S_out & x)
+TAO::Out_Object_Argument_T<S_ptr,S_out,Insert_Policy>::Out_Object_Argument_T (S_out & x)
   : x_ (x.ptr ())
 {}
 
-template<typename S_ptr, typename S_out>
+template<typename S_ptr, typename S_out, typename Insert_Policy>
 ACE_INLINE
 S_out
-TAO::Out_Object_Argument_T<S_ptr,S_out>::arg (void)
+TAO::Out_Object_Argument_T<S_ptr,S_out,Insert_Policy>::arg (void)
 {
   return this->x_;
 }
 
 // ==========================================================================
 
-template<typename S_ptr, typename S_var>
+template<typename S_ptr, typename S_var, typename Insert_Policy>
 ACE_INLINE
-TAO::Ret_Object_Argument_T<S_ptr,S_var>::Ret_Object_Argument_T (void)
+TAO::Ret_Object_Argument_T<S_ptr,S_var,Insert_Policy>::Ret_Object_Argument_T (void)
 {}
 
-template<typename S_ptr, typename S_var>
+template<typename S_ptr, typename S_var, typename Insert_Policy>
 ACE_INLINE
 S_ptr &
-TAO::Ret_Object_Argument_T<S_ptr,S_var>::arg (void)
+TAO::Ret_Object_Argument_T<S_ptr,S_var,Insert_Policy>::arg (void)
 {
   return this->x_.out ();
 }
 
-template<typename S_ptr, typename S_var>
+template<typename S_ptr, typename S_var, typename Insert_Policy>
 ACE_INLINE
 S_ptr
-TAO::Ret_Object_Argument_T<S_ptr,S_var>::excp (void)
+TAO::Ret_Object_Argument_T<S_ptr,S_var,Insert_Policy>::excp (void)
 {
   return this->x_.ptr ();
 }
 
-template<typename S_ptr, typename S_var>
+template<typename S_ptr, typename S_var, typename Insert_Policy>
 ACE_INLINE
 S_ptr
-TAO::Ret_Object_Argument_T<S_ptr,S_var>::retn (void)
+TAO::Ret_Object_Argument_T<S_ptr,S_var,Insert_Policy>::retn (void)
 {
   return this->x_._retn ();
 }
diff --git a/TAO/tao/Object_KeyC.cpp b/TAO/tao/Object_KeyC.cpp
index 1c6754f5847..3f46183a1f5 100644
--- a/TAO/tao/Object_KeyC.cpp
+++ b/TAO/tao/Object_KeyC.cpp
@@ -157,7 +157,7 @@ TAO::ObjectKey::decode_string_to_sequence (TAO_Unbounded_Sequence<CORBA::Octet>
       return;
     }
 
-  u_int length = ACE_OS::strlen (str);
+  size_t length = ACE_OS::strlen (str);
   const char *eos = str + length;
   const char *cp = str;
 
diff --git a/TAO/tao/Objref_TypeCode.cpp b/TAO/tao/Objref_TypeCode.cpp
deleted file mode 100644
index 03c5b129e63..00000000000
--- a/TAO/tao/Objref_TypeCode.cpp
+++ /dev/null
@@ -1,153 +0,0 @@
-// $Id$
-
-#ifndef TAO_OBJREF_TYPECODE_CPP
-#define TAO_OBJREF_TYPECODE_CPP
-
-#include "tao/Objref_TypeCode.h"
-
-#ifndef __ACE_INLINE__
-# include "tao/Objref_TypeCode.inl"
-#endif  /* !__ACE_INLINE__ */
-
-#include "tao/CDR.h"
-
-#include "ace/OS_NS_string.h"
-
-
-template <typename StringType, class RefCountPolicy>
-bool
-TAO::TypeCode::Objref<StringType, RefCountPolicy>::tao_marshal (
-  TAO_OutputCDR & cdr,
-  CORBA::ULong) const
-{
-  // A tk_objref TypeCode has a "complex" parameter list type (see
-  // Table 15-2 in Section 15.3.5.1 "TypeCode" in the CDR section of
-  // the CORBA specification), meaning that it must be marshaled into
-  // a CDR encapsulation.
-
-  // Create a CDR encapsulation.
-  TAO_OutputCDR enc;
-
-  return
-    enc << TAO_OutputCDR::from_boolean (TAO_ENCAP_BYTE_ORDER)
-    && enc << TAO_OutputCDR::from_string (this->attributes_.id (), 0)
-    && enc << TAO_OutputCDR::from_string (this->attributes_.name (), 0)
-    && cdr << static_cast<CORBA::ULong> (enc.total_length ())
-    && cdr.write_octet_array_mb (enc.begin ());
-}
-
-template <typename StringType, class RefCountPolicy>
-void
-TAO::TypeCode::Objref<StringType, RefCountPolicy>::tao_duplicate (void)
-{
-  this->RefCountPolicy::add_ref ();
-}
-
-template <typename StringType, class RefCountPolicy>
-void
-TAO::TypeCode::Objref<StringType, RefCountPolicy>::tao_release (void)
-{
-  this->RefCountPolicy::remove_ref ();
-}
-
-template <typename StringType, class RefCountPolicy>
-CORBA::Boolean
-TAO::TypeCode::Objref<StringType, RefCountPolicy>::equal_i (
-  CORBA::TypeCode_ptr /* tc */
-  ACE_ENV_ARG_DECL_NOT_USED) const
-{
-  // Equality has already been established in the
-  // CORBA::TypeCode base class.
-
-  return true;
-}
-
-template <typename StringType, class RefCountPolicy>
-CORBA::Boolean
-TAO::TypeCode::Objref<StringType, RefCountPolicy>::equivalent_i (
-  CORBA::TypeCode_ptr
-  ACE_ENV_ARG_DECL_NOT_USED) const
-{
-  // Equivalence already verified in the base class
-  // CORBA::TypeCode::equivalent() method.
-
-  return true;
-}
-
-template <typename StringType, class RefCountPolicy>
-CORBA::TypeCode_ptr
-TAO::TypeCode::Objref<StringType,
-                      RefCountPolicy>::get_compact_typecode_i (
-  ACE_ENV_SINGLE_ARG_DECL) const
-{
-  TAO_TypeCodeFactory_Adapter * const adapter =
-    ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
-        TAO_ORB_Core::typecodefactory_adapter_name ()
-      );
-
-  if (adapter == 0)
-    {
-      ACE_THROW_RETURN (CORBA::INTERNAL (),
-                        CORBA::TypeCode::_nil ());
-    }
-
-  if (this->kind_ == CORBA::tk_abstract_interface)
-    {
-      return adapter->create_abstract_interface_tc (this->attributes_.id (),
-                                                    ""  /* empty name */
-                                                    ACE_ENV_ARG_PARAMETER);
-    }
-  else if (this->kind_ == CORBA::tk_component)
-    {
-      return adapter->create_component_tc (this->attributes_.id (),
-                                           ""  /* empty name */
-                                           ACE_ENV_ARG_PARAMETER);
-    }
-  else if (this->kind_ == CORBA::tk_home)
-    {
-      return adapter->create_home_tc (this->attributes_.id (),
-                                      ""  /* empty name */
-                                      ACE_ENV_ARG_PARAMETER);
-    }
-  else if (this->kind_ == CORBA::tk_local_interface)
-    {
-      return adapter->create_local_interface_tc (this->attributes_.id (),
-                                                 ""  /* empty name */
-                                                 ACE_ENV_ARG_PARAMETER);
-
-    }
-  else if (this->kind_ == CORBA::tk_native)
-    {
-      return adapter->create_native_tc (this->attributes_.id (),
-                                        ""  /* empty name */
-                                        ACE_ENV_ARG_PARAMETER);
-    }
-  else // CORBA::tk_objref
-    {
-      return adapter->create_interface_tc (this->attributes_.id (),
-                                           ""  /* empty name */
-                                           ACE_ENV_ARG_PARAMETER);
-    }
-}
-
-template <typename StringType, class RefCountPolicy>
-char const *
-TAO::TypeCode::Objref<StringType, RefCountPolicy>::id_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  // Ownership is retained by the TypeCode, as required by the C++
-  // mapping.
-  return this->attributes_.id ();
-}
-
-template <typename StringType, class RefCountPolicy>
-char const *
-TAO::TypeCode::Objref<StringType, RefCountPolicy>::name_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  // Ownership is retained by the TypeCode, as required by the C++
-  // mapping.
-  return this->attributes_.name ();
-}
-
-#endif  /*  TAO_OBJREF_TYPECODE_CPP */
diff --git a/TAO/tao/Objref_TypeCode.h b/TAO/tao/Objref_TypeCode.h
deleted file mode 100644
index 0f49b5d99f7..00000000000
--- a/TAO/tao/Objref_TypeCode.h
+++ /dev/null
@@ -1,122 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Objref_TypeCode.h
- *
- *  $Id$
- *
- *  Header file for
- *    @c tk_abstract_interface,
- *    @c tk_component,
- *    @c tk_home,
- *    @c tk_local_interface,
- *    @c tk_native and
- *    @c tk_objref
- *  @c CORBA::TypeCodes.
- *
- *  @author Ossama Othman <ossama@dre.vanderbilt.edu>
- */
-//=============================================================================
-
-#ifndef TAO_OBJREF_TYPECODE_H
-#define TAO_OBJREF_TYPECODE_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/TypeCode.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TypeCode_Base_Attributes.h"
-
-namespace TAO
-{
-  namespace TypeCode
-  {
-    /**
-     * @class Objref_Base
-     *
-     * @brief @c CORBA::TypeCode implementation for an OMG IDL
-     *        @c object and object-like types.
-     *
-     * This class implements a @c CORBA::TypeCode for an OMG IDL
-     * @c object (interface) and object-like types (abstract
-     * interface, component, home, local interface and native).
-     */
-    template <typename StringType, class RefCountPolicy>
-    class Objref
-      : public CORBA::TypeCode,
-        private RefCountPolicy
-    {
-    public:
-
-      /// Constructor.
-      Objref (CORBA::TCKind kind,
-              char const * id,
-              char const * name);
-
-      /**
-       * @name TAO-specific @c CORBA::TypeCode Methods
-       *
-       * Methods required by TAO's implementation of the
-       * @c CORBA::TypeCode class.
-       *
-       * @see @c CORBA::TypeCode
-       */
-      //@{
-      virtual bool tao_marshal (TAO_OutputCDR & cdr,
-                                CORBA::ULong offset) const;
-      virtual void tao_duplicate (void);
-      virtual void tao_release (void);
-      //@}
-
-    protected:
-
-      /**
-       * @name @c TAO CORBA::TypeCode Template Methods
-       *
-       * @c tk_abstract_interface, @c tk_component, @c
-       * tk_local_interface, @c tk_native and @c tk_objref
-       * @c CORBA::TypeCode -specific template methods.
-       *
-       * @see @c CORBA::TypeCode
-       */
-      //@{
-      virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc
-                                      ACE_ENV_ARG_DECL) const;
-      virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc
-                                           ACE_ENV_ARG_DECL) const;
-      virtual CORBA::TypeCode_ptr get_compact_typecode_i (
-        ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual char const * id_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual char const * name_i (ACE_ENV_SINGLE_ARG_DECL) const;
-
-    protected:
-
-      /// Base attributes (@c id and @c name).
-      Base_Attributes<StringType> attributes_;
-
-    };
-
-  }  // End namespace TypeCode
-}  // End namespace TAO
-
-
-#ifdef __ACE_INLINE__
-# include "tao/Objref_TypeCode.inl"
-#endif  /* __ACE_INLINE__ */
-
-#ifdef ACE_TEMPLATES_REQUIRE_SOURCE
-# include "tao/Objref_TypeCode.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#ifdef ACE_TEMPLATES_REQUIRE_PRAGMA
-# pragma implementation ("Objref_TypeCode.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_OBJREF_TYPECODE_H */
diff --git a/TAO/tao/Objref_TypeCode.inl b/TAO/tao/Objref_TypeCode.inl
deleted file mode 100644
index e40aa1e10d9..00000000000
--- a/TAO/tao/Objref_TypeCode.inl
+++ /dev/null
@@ -1,16 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-
-template <typename StringType, class RefCountPolicy>
-ACE_INLINE
-TAO::TypeCode::Objref<StringType, RefCountPolicy>::Objref (
-  CORBA::TCKind kind,
-  char const * id,
-  char const * name)
-  : CORBA::TypeCode (kind)
-  , RefCountPolicy ()
-  , attributes_ (id, name)
-{
-}
diff --git a/TAO/tao/Objref_TypeCode_Static.cpp b/TAO/tao/Objref_TypeCode_Static.cpp
deleted file mode 100644
index fb2e89240a3..00000000000
--- a/TAO/tao/Objref_TypeCode_Static.cpp
+++ /dev/null
@@ -1,149 +0,0 @@
-// $Id$
-
-#include "tao/Objref_TypeCode_Static.h"
-
-#ifndef __ACE_INLINE__
-# include "tao/Objref_TypeCode_Static.inl"
-#endif  /* !__ACE_INLINE__ */
-
-#include "tao/CDR.h"
-#include "tao/TypeCodeFactory_Adapter.h"
-#include "tao/ORB_Core.h"
-
-#include "ace/Dynamic_Service.h"
-#include "ace/OS_NS_string.h"
-
-
-ACE_RCSID (tao,
-           Objref_TypeCode_Static,
-           "$Id$")
-
-
-bool
-TAO::TypeCode::Objref<char const *, TAO::Null_RefCount_Policy>::tao_marshal (
-  TAO_OutputCDR & cdr,
-  CORBA::ULong) const
-{
-  // A tk_objref TypeCode has a "complex" parameter list type (see
-  // Table 15-2 in Section 15.3.5.1 "TypeCode" in the CDR section of
-  // the CORBA specification), meaning that it must be marshaled into
-  // a CDR encapsulation.
-
-  // Create a CDR encapsulation.
-  TAO_OutputCDR enc;
-
-  return
-    enc << TAO_OutputCDR::from_boolean (TAO_ENCAP_BYTE_ORDER)
-    && enc << TAO_OutputCDR::from_string (this->attributes_.id (), 0)
-    && enc << TAO_OutputCDR::from_string (this->attributes_.name (), 0)
-    && cdr << static_cast<CORBA::ULong> (enc.total_length ())
-    && cdr.write_octet_array_mb (enc.begin ());
-}
-
-void
-TAO::TypeCode::Objref<char const *,
-                      TAO::Null_RefCount_Policy>::tao_duplicate (void)
-{
-}
-
-void
-TAO::TypeCode::Objref<char const *,
-                      TAO::Null_RefCount_Policy>::tao_release (void)
-{
-}
-
-CORBA::Boolean
-TAO::TypeCode::Objref<char const *, TAO::Null_RefCount_Policy>::equal_i (
-  CORBA::TypeCode_ptr /* tc */
-  ACE_ENV_ARG_DECL_NOT_USED) const
-{
-  // Equality has already been established in the
-  // CORBA::TypeCode base class.
-
-  return true;
-}
-
-CORBA::Boolean
-TAO::TypeCode::Objref<char const *, TAO::Null_RefCount_Policy>::equivalent_i (
-  CORBA::TypeCode_ptr
-  ACE_ENV_ARG_DECL_NOT_USED) const
-{
-  // Equivalence already verified in the base class
-  // CORBA::TypeCode::equivalent() method.
-
-  return true;
-}
-
-CORBA::TypeCode_ptr
-TAO::TypeCode::Objref<char const *,
-                      TAO::Null_RefCount_Policy>::get_compact_typecode_i (
-  ACE_ENV_SINGLE_ARG_DECL) const
-{
-  TAO_TypeCodeFactory_Adapter * const adapter =
-    ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
-        TAO_ORB_Core::typecodefactory_adapter_name ()
-      );
-
-  if (adapter == 0)
-    {
-      ACE_THROW_RETURN (CORBA::INTERNAL (),
-                        CORBA::TypeCode::_nil ());
-    }
-
-  if (this->kind_ == CORBA::tk_abstract_interface)
-    {
-      return adapter->create_abstract_interface_tc (this->attributes_.id (),
-                                                    ""  /* empty name */
-                                                    ACE_ENV_ARG_PARAMETER);
-    }
-  else if (this->kind_ == CORBA::tk_component)
-    {
-      return adapter->create_component_tc (this->attributes_.id (),
-                                           ""  /* empty name */
-                                           ACE_ENV_ARG_PARAMETER);
-    }
-  else if (this->kind_ == CORBA::tk_home)
-    {
-      return adapter->create_home_tc (this->attributes_.id (),
-                                      ""  /* empty name */
-                                      ACE_ENV_ARG_PARAMETER);
-    }
-  else if (this->kind_ == CORBA::tk_local_interface)
-    {
-      return adapter->create_local_interface_tc (this->attributes_.id (),
-                                                 ""  /* empty name */
-                                                 ACE_ENV_ARG_PARAMETER);
-
-    }
-  else if (this->kind_ == CORBA::tk_native)
-    {
-      return adapter->create_native_tc (this->attributes_.id (),
-                                        ""  /* empty name */
-                                        ACE_ENV_ARG_PARAMETER);
-    }
-  else // CORBA::tk_objref
-    {
-      return adapter->create_interface_tc (this->attributes_.id (),
-                                           ""  /* empty name */
-                                           ACE_ENV_ARG_PARAMETER);
-    }
-}
-
-char const *
-TAO::TypeCode::Objref<char const *, TAO::Null_RefCount_Policy>::id_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  // Ownership is retained by the TypeCode, as required by the C++
-  // mapping.
-  return this->attributes_.id ();
-}
-
-char const *
-TAO::TypeCode::Objref<char const *, TAO::Null_RefCount_Policy>::name_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  // Ownership is retained by the TypeCode, as required by the C++
-  // mapping.
-  return this->attributes_.name ();
-}
-
diff --git a/TAO/tao/Objref_TypeCode_Static.h b/TAO/tao/Objref_TypeCode_Static.h
deleted file mode 100644
index 69e86efe82b..00000000000
--- a/TAO/tao/Objref_TypeCode_Static.h
+++ /dev/null
@@ -1,118 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Objref_TypeCode_Static.h
- *
- *  $Id$
- *
- *  Header file for static
- *    @c tk_abstract_interface,
- *    @c tk_component,
- *    @c tk_home,
- *    @c tk_local_interface,
- *    @c tk_native and
- *    @c tk_objref
- *  @c CORBA::TypeCodes.
- *
- *  @author Ossama Othman <ossama@dre.vanderbilt.edu>
- */
-//=============================================================================
-
-#ifndef TAO_OBJREF_TYPECODE_STATIC_H
-#define TAO_OBJREF_TYPECODE_STATIC_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/TypeCode.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TypeCode_Base_Attributes.h"
-#include "tao/Null_RefCount_Policy.h"
-
-
-namespace TAO
-{
-  namespace TypeCode
-  {
-    template <typename StringType, class RefCountPolicy> class Objref;
-
-    /**
-     * @class Objref
-     *
-     * @brief @c CORBA::TypeCode implementation for an OMG IDL
-     *        @c object and object-like types.
-     *
-     * This class implements a @c CORBA::TypeCode for an OMG IDL
-     * @c object (interface) and object-like types (abstract
-     * interface, component, home, local interface and native).
-     */
-    template<>
-    class TAO_Export Objref<char const *, TAO::Null_RefCount_Policy>
-      : public CORBA::TypeCode,
-        private TAO::Null_RefCount_Policy
-    {
-    public:
-
-      /// Constructor.
-      Objref (CORBA::TCKind kind,
-              char const * id,
-              char const * name);
-
-      /**
-       * @name TAO-specific @c CORBA::TypeCode Methods
-       *
-       * Methods required by TAO's implementation of the
-       * @c CORBA::TypeCode class.
-       *
-       * @see @c CORBA::TypeCode
-       */
-      //@{
-      virtual bool tao_marshal (TAO_OutputCDR & cdr,
-                                CORBA::ULong offset) const;
-      virtual void tao_duplicate (void);
-      virtual void tao_release (void);
-      //@}
-
-    protected:
-
-      /**
-       * @name @c TAO CORBA::TypeCode Template Methods
-       *
-       * @c tk_abstract_interface, @c tk_component, @c
-       * tk_local_interface, @c tk_native and @c tk_objref
-       * @c CORBA::TypeCode -specific template methods.
-       *
-       * @see @c CORBA::TypeCode
-       */
-      //@{
-      virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc
-                                      ACE_ENV_ARG_DECL) const;
-      virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc
-                                           ACE_ENV_ARG_DECL) const;
-      virtual CORBA::TypeCode_ptr get_compact_typecode_i (
-        ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual char const * id_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual char const * name_i (ACE_ENV_SINGLE_ARG_DECL) const;
-
-    protected:
-
-      /// Base attributes (@c id and @c name).
-      Base_Attributes<char const *> attributes_;
-
-    };
-
-  }  // End namespace TypeCode
-}  // End namespace TAO
-
-
-#ifdef __ACE_INLINE__
-# include "tao/Objref_TypeCode_Static.inl"
-#endif  /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_OBJREF_TYPECODE_STATIC_H */
diff --git a/TAO/tao/Objref_TypeCode_Static.inl b/TAO/tao/Objref_TypeCode_Static.inl
deleted file mode 100644
index 07c5d36ece2..00000000000
--- a/TAO/tao/Objref_TypeCode_Static.inl
+++ /dev/null
@@ -1,15 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-
-ACE_INLINE
-TAO::TypeCode::Objref<char const *, TAO::Null_RefCount_Policy>::Objref (
-  CORBA::TCKind kind,
-  char const * id,
-  char const * name)
-  : CORBA::TypeCode (kind)
-  , ACE_NESTED_CLASS (TAO, Null_RefCount_Policy) ()
-  , attributes_ (id, name)
-{
-}
diff --git a/TAO/tao/OctetSeq.pidl b/TAO/tao/OctetSeq.pidl
index e1f1cb3850f..e0d27947f2a 100644
--- a/TAO/tao/OctetSeq.pidl
+++ b/TAO/tao/OctetSeq.pidl
@@ -2,21 +2,25 @@
 //
 // $Id$
 
-// ================================================================
-//
-//   This file was used to generate the code in OctetSeqC.*
-//   The command used to generate code is:
-//
-//     tao_idl
-//        -o orig -Ge 1 -GA -Sc -SS -Sci
-//          -Wb,export_macro=TAO_Export
-//          -Wb,pre_include="ace/pre.h"
-//          -Wb,post_include="ace/post.h"
-//          OctetSeq.pidl
-//
-//   Patches for changes to the generated code are available in the
-//   `diffs' directory.
-// ================================================================
+/**
+ *
+ *   This file was used to generate the code in OctetSeqC.*
+ *   The command used to generate code is:
+ *
+ *     tao_idl
+ *          -oA AnyTypeCode
+ *          -Ge 1 -GA -Sc -SS -Sci
+ *          -Wb,pre_include=ace/pre.h
+ *          -Wb,post_include=ace/post.h
+ *          -Wb,export_macro=TAO_Export
+ *          -Wb,export_include=tao/TAO_Export.h
+ *          -Wb,anyop_export_macro=TAO_AnyTypeCode_Export
+ *          -Wb,anyop_export_include=tao/AnyTypeCode/TAO_AnyTypeCode_Export.h
+ *          OctetSeq.pidl
+ *
+ *   Patches for changes to the generated code are available in the
+ *   `diffs' directory.
+ */
 
 
 #ifndef TAO_CORBA_OCTET_SEQ_IDL
diff --git a/TAO/tao/OctetSeqA.cpp b/TAO/tao/OctetSeqA.cpp
deleted file mode 100644
index e81a0d009be..00000000000
--- a/TAO/tao/OctetSeqA.cpp
+++ /dev/null
@@ -1,142 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "OctetSeqC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Sequence_TypeCode_Static.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Dual_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:937
-
-
-#ifndef _TAO_TYPECODE_CORBA_OctetSeq_GUARD
-#define _TAO_TYPECODE_CORBA_OctetSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_OctetSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_octet,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_OctetSeq_0 =
-      &CORBA_OctetSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_OctetSeq_GUARD */
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_OctetSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/OctetSeq:1.0",
-    "OctetSeq",
-    &TAO::TypeCode::tc_CORBA_OctetSeq_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_OctetSeq =
-    &_tao_tc_CORBA_OctetSeq;
-}
-
-
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::OctetSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::OctetSeq>::insert_copy (
-      _tao_any,
-      CORBA::OctetSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_OctetSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::OctetSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::OctetSeq>::insert (
-      _tao_any,
-      CORBA::OctetSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_OctetSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::OctetSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::OctetSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::OctetSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::OctetSeq>::extract (
-        _tao_any,
-        CORBA::OctetSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_OctetSeq_0,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/OctetSeqC.cpp b/TAO/tao/OctetSeqC.cpp
index 0e00b3c9aaf..c59ead52d2b 100644
--- a/TAO/tao/OctetSeqC.cpp
+++ b/TAO/tao/OctetSeqC.cpp
@@ -26,17 +26,13 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:291
+// be\be_codegen.cpp:288
 
 
 #include "OctetSeqC.h"
 #include "tao/CDR.h"
 #include "tao/ORB_Core.h"
 
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
diff --git a/TAO/tao/OctetSeqC.h b/TAO/tao/OctetSeqC.h
index 860e2422858..5fa4471699b 100644
--- a/TAO/tao/OctetSeqC.h
+++ b/TAO/tao/OctetSeqC.h
@@ -26,10 +26,10 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:153
+// be\be_codegen.cpp:154
 
-#ifndef _TAO_IDL_ORIG_OCTETSEQC_H_
-#define _TAO_IDL_ORIG_OCTETSEQC_H_
+#ifndef _TAO_IDL_OCTETSEQC_H_
+#define _TAO_IDL_OCTETSEQC_H_
 
 #include /**/ "ace/pre.h"
 
@@ -57,31 +57,27 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:49
 
 namespace CORBA
 {
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_OCTETSEQ_CH_)
 #define _CORBA_OCTETSEQ_CH_
-  
+
   class OctetSeq;
-  
+
   typedef
     TAO_FixedSeq_Var_T<
         OctetSeq,
         CORBA::Octet
       >
     OctetSeq_var;
-  
+
   typedef
     TAO_Seq_Out_T<
         OctetSeq,
@@ -89,7 +85,7 @@ namespace CORBA
         CORBA::Octet
       >
     OctetSeq_out;
-  
+
   class TAO_Export OctetSeq
     : public
         TAO_Unbounded_Sequence<
@@ -102,14 +98,14 @@ namespace CORBA
     OctetSeq (
         CORBA::ULong max,
         CORBA::ULong length,
-        CORBA::Octet* buffer, 
+        CORBA::Octet* buffer,
         CORBA::Boolean release = 0
       );
     OctetSeq (const OctetSeq &);
     ~OctetSeq (void);
-    
+
     static void _tao_any_destructor (void *);
-    
+
     typedef OctetSeq_var _var_type;
 
 #if (TAO_NO_COPY_OCTET_SEQUENCES == 1)
@@ -122,14 +118,9 @@ namespace CORBA
   };
 
 #endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_OctetSeq;
 
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:78
 
 } // module CORBA
 
@@ -153,13 +144,6 @@ namespace TAO
   template class TAO_Export TAO_Unbounded_Sequence<CORBA::OctetSeq>;
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT */
 
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const CORBA::OctetSeq &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, CORBA::OctetSeq*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::OctetSeq *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::OctetSeq *&);
 
 // TAO_IDL - Generated from
 // be\be_visitor_sequence/cdr_op_ch.cpp:71
@@ -179,16 +163,12 @@ TAO_Export CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_CORBA_OctetSeq_H_ */
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:955
+// be\be_codegen.cpp:1062
 
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
diff --git a/TAO/tao/PI.mpc b/TAO/tao/PI.mpc
index 80535eb629b..ac39d912cd7 100644
--- a/TAO/tao/PI.mpc
+++ b/TAO/tao/PI.mpc
@@ -27,6 +27,9 @@ project : taolib, codecfactory, core {
     PI
   }
 
+  IDL_Files {
+  }
+
   Pkgconfig_Files {
     PI/TAO_PI.pc.in
   }
diff --git a/TAO/tao/PI/ClientRequestInfo.cpp b/TAO/tao/PI/ClientRequestInfo.cpp
index d5c7271f555..6105ebb0cb6 100644
--- a/TAO/tao/PI/ClientRequestInfo.cpp
+++ b/TAO/tao/PI/ClientRequestInfo.cpp
@@ -4,21 +4,25 @@
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-
 ACE_RCSID (tao,
            ClientRequestInfo,
            "$Id$")
 
-#include "tao/Any.h"
+#include "PICurrent.h"
+#include "RequestInfo_Util.h"
+
+#include "tao/AnyTypeCode/Any.h"
+#include "tao/AnyTypeCode/ExceptionA.h"
 #include "tao/PolicyC.h"
 #include "tao/PortableInterceptorC.h"
-#include "tao/PICurrent.h"
 #include "tao/Invocation_Base.h"
+#include "tao/operation_details.h"
 #include "tao/Stub.h"
 #include "tao/ORB_Core.h"
 #include "tao/Profile.h"
 #include "tao/debug.h"
 #include "tao/Service_Context.h"
+#include "tao/Exception_Data.h"
 
 TAO_ClientRequestInfo::TAO_ClientRequestInfo (TAO::Invocation_Base *inv)
   : invocation_ (inv),
@@ -32,9 +36,12 @@ void
 TAO_ClientRequestInfo::setup_picurrent (void)
 {
   // Retrieve the thread scope current (no TSS access incurred yet).
-  TAO::PICurrent *pi_current =
+  CORBA::Object_ptr pi_current_obj =
     this->invocation_->orb_core ()->pi_current ();
 
+  TAO::PICurrent *pi_current =
+    dynamic_cast <TAO::PICurrent*> (pi_current_obj);
+
   // If the slot count is zero, then there is nothing to copy.
   // Prevent any copying (and hence TSS accesses) from occurring.
   if (pi_current != 0 && pi_current->slot_count () != 0)
@@ -456,7 +463,8 @@ TAO_ClientRequestInfo::operation (ACE_ENV_SINGLE_ARG_DECL)
   this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  return CORBA::string_dup (this->invocation_->operation_name ());
+  return CORBA::string_dup (
+    this->invocation_->operation_details ().opname  ());
 }
 
 Dynamic::ParameterList *
@@ -466,7 +474,38 @@ TAO_ClientRequestInfo::arguments (ACE_ENV_SINGLE_ARG_DECL)
   this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  return this->invocation_->arguments (ACE_ENV_SINGLE_ARG_PARAMETER);
+  // Generate the argument list on demand.
+  Dynamic::ParameterList *parameter_list =
+    TAO_RequestInfo_Util::make_parameter_list (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+
+  Dynamic::ParameterList_var safe_parameter_list = parameter_list;
+
+  if (this->parameter_list (*parameter_list) == false)
+    ACE_THROW_RETURN (CORBA::MARSHAL (),
+                      0);
+
+  return safe_parameter_list._retn ();
+
+  //return this->invocation_->arguments (ACE_ENV_SINGLE_ARG_PARAMETER);
+}
+
+bool
+TAO_ClientRequestInfo::parameter_list (Dynamic::ParameterList &param_list)
+{
+  // Account for the return type that could be in the argument list.
+  param_list.length (this->invocation_->operation_details ().args_num () - 1);
+
+  for (CORBA::ULong i = 1; i != this->invocation_->operation_details ().args_num (); ++i)
+    {
+      TAO::Argument *argument =
+        this->invocation_->operation_details ().args ()[i];
+      Dynamic::Parameter &p = param_list[i - 1];
+      p.mode = argument->mode ();
+      argument->interceptor_value (&p.argument);
+    }
+
+  return true;
 }
 
 Dynamic::ExceptionList *
@@ -476,7 +515,37 @@ TAO_ClientRequestInfo::exceptions (ACE_ENV_SINGLE_ARG_DECL)
   this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  return this->invocation_->exceptions (ACE_ENV_SINGLE_ARG_PARAMETER);
+  Dynamic::ExceptionList *exception_list =
+    TAO_RequestInfo_Util::make_exception_list (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+
+  Dynamic::ExceptionList_var safe_exception_list = exception_list;
+
+  if (this->exception_list (*exception_list) == false)
+    ACE_THROW_RETURN (CORBA::MARSHAL (),
+                      0);
+
+  return safe_exception_list._retn ();
+}
+
+bool
+TAO_ClientRequestInfo::exception_list (Dynamic::ExceptionList &exception_list)
+{
+
+  if (this->invocation_->operation_details ().ex_count ())
+    {
+      exception_list.length (this->invocation_->operation_details ().ex_count ());
+
+      for (CORBA::ULong i = 0;
+           i != this->invocation_->operation_details ().ex_count ();
+           ++i)
+        {
+          CORBA::TypeCode_ptr tcp = this->invocation_->operation_details ().ex_data ()[i].tc_ptr;
+          TAO_Pseudo_Object_Manager<CORBA::TypeCode> tcp_object (&tcp, 1);
+          exception_list[i] = tcp_object;
+        }
+    }
+  return true;
 }
 
 Dynamic::ContextList *
@@ -510,7 +579,28 @@ TAO_ClientRequestInfo::result (ACE_ENV_SINGLE_ARG_DECL)
   this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  return this->invocation_->result (ACE_ENV_SINGLE_ARG_PARAMETER);
+  // Generate the result on demand.
+  static const CORBA::Boolean tk_void_any = 0;
+  CORBA::Any *result_any =
+    TAO_RequestInfo_Util::make_any (tk_void_any ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (0);
+
+  CORBA::Any_var safe_result_any = result_any;
+
+  if (this->result (result_any) == false)
+    ACE_THROW_RETURN (CORBA::MARSHAL (),
+                      0);
+
+  return safe_result_any._retn ();
+}
+
+bool
+TAO_ClientRequestInfo::result (CORBA::Any *any)
+{
+  for (CORBA::ULong i = 0; i != this->invocation_->operation_details ().args_num (); ++i)
+    (*this->invocation_->operation_details ().args ()[i]).interceptor_value (any);
+
+  return true;
 }
 
 CORBA::Boolean
@@ -530,7 +620,7 @@ TAO_ClientRequestInfo::sync_scope (ACE_ENV_SINGLE_ARG_DECL)
   this->check_validity (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  return this->invocation_->sync_scope ();
+  return this->invocation_->operation_details ().response_flags ();
 }
 
 PortableInterceptor::ReplyStatus
diff --git a/TAO/tao/PI/ClientRequestInfo.h b/TAO/tao/PI/ClientRequestInfo.h
index 5fc84ad5e5f..b3391bf247d 100644
--- a/TAO/tao/PI/ClientRequestInfo.h
+++ b/TAO/tao/PI/ClientRequestInfo.h
@@ -33,10 +33,10 @@
 
 #include "ClientRequestInfoC.h"
 #include "PIForwardRequestC.h"
+#include "PICurrent_Impl.h"
+#include "PICurrent_Copy_Callback.h"
 #include "tao/ORB_Constants.h"
 #include "tao/Invocation_Utils.h"
-#include "tao/PICurrent_Impl.h"
-#include "tao/PICurrent_Copy_Callback.h"
 
 class TAO_Service_Context;
 
@@ -219,6 +219,12 @@ public:
 
 private:
 
+  bool parameter_list (Dynamic::ParameterList &param_list);
+
+  bool exception_list (Dynamic::ExceptionList &exception_list);
+
+  bool result (CORBA::Any *any);
+
   /// Check if this ClientRequestInfo object is called within the
   /// context of a request.
   void check_validity (ACE_ENV_SINGLE_ARG_DECL);
diff --git a/TAO/tao/PI/ClientRequestInfoA.cpp b/TAO/tao/PI/ClientRequestInfoA.cpp
index 75245ee97ed..f6840ced1f9 100644
--- a/TAO/tao/PI/ClientRequestInfoA.cpp
+++ b/TAO/tao/PI/ClientRequestInfoA.cpp
@@ -26,14 +26,14 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "ClientRequestInfoC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
-#include "tao/String_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
+#include "tao/AnyTypeCode/String_TypeCode_Static.h"
 #include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
+#include "tao/AnyTypeCode/Any.h"
+#include "tao/AnyTypeCode/Any_Impl_T.h"
 
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/objref_typecode.cpp:76
@@ -44,7 +44,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:omg.org/PortableInterceptor/ClientRequestInfo:1.0",
     "ClientRequestInfo");
-  
+
 namespace PortableInterceptor
 {
   ::CORBA::TypeCode_ptr const _tc_ClientRequestInfo =
@@ -77,7 +77,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Impl_T<PortableInterceptor::ClientRequestInfo>::demarshal_value (TAO_InputCDR &)
diff --git a/TAO/tao/PI/ClientRequestInfoC.h b/TAO/tao/PI/ClientRequestInfoC.h
index 9a5becb6f4a..d9c265ec99b 100644
--- a/TAO/tao/PI/ClientRequestInfoC.h
+++ b/TAO/tao/PI/ClientRequestInfoC.h
@@ -45,9 +45,9 @@
 #include "tao/SystemException.h"
 #include "tao/Environment.h"
 #include "tao/Object.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Any.h"
-#include "tao/TypeCode.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Any.h"
+#include "tao/AnyTypeCode/TypeCode.h"
 #include "tao/Objref_VarOut_T.h"
 
 #include "tao/PI/RequestInfoC.h"
@@ -73,22 +73,22 @@
 
 namespace PortableInterceptor
 {
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINFO__VAR_OUT_CH_)
 #define _PORTABLEINTERCEPTOR_CLIENTREQUESTINFO__VAR_OUT_CH_
-  
+
   class ClientRequestInfo;
   typedef ClientRequestInfo *ClientRequestInfo_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         ClientRequestInfo
       >
     ClientRequestInfo_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         ClientRequestInfo
@@ -96,95 +96,95 @@ namespace PortableInterceptor
     ClientRequestInfo_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINFO_CH_)
 #define _PORTABLEINTERCEPTOR_CLIENTREQUESTINFO_CH_
-  
+
   class TAO_PI_Export ClientRequestInfo
     : public virtual ::PortableInterceptor::RequestInfo
   {
   public:
     typedef ClientRequestInfo_ptr _ptr_type;
     typedef ClientRequestInfo_var _var_type;
-    
+
     // The static operations.
     static ClientRequestInfo_ptr _duplicate (ClientRequestInfo_ptr obj);
-    
+
     static void _tao_release (ClientRequestInfo_ptr obj);
-    
+
     static ClientRequestInfo_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static ClientRequestInfo_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static ClientRequestInfo_ptr _nil (void)
     {
       return static_cast<ClientRequestInfo_ptr> (0);
     }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::Object_ptr target (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::Object_ptr effective_target (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::IOP::TaggedProfile * effective_profile (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::Any * received_exception (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual char * received_exception_id (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::IOP::TaggedComponent * get_effective_component (
         ::IOP::ComponentId id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -192,10 +192,10 @@ namespace PortableInterceptor
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::IOP::TaggedComponentSeq * get_effective_components (
         ::IOP::ComponentId id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -203,10 +203,10 @@ namespace PortableInterceptor
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::Policy_ptr get_request_policy (
         ::CORBA::PolicyType type
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -214,10 +214,10 @@ namespace PortableInterceptor
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void add_request_service_context (
         const ::IOP::ServiceContext & service_context,
         ::CORBA::Boolean replace
@@ -226,36 +226,36 @@ namespace PortableInterceptor
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
-    
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
+
   protected:
     // Abstract or local interface only.
     ClientRequestInfo (void);
-    
+
     virtual ~ClientRequestInfo (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     ClientRequestInfo (const ClientRequestInfo &);
-    
+
     void operator= (const ClientRequestInfo &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   extern TAO_PI_Export ::CORBA::TypeCode_ptr const _tc_ClientRequestInfo;
 
 // TAO_IDL - Generated from
@@ -272,7 +272,7 @@ namespace TAO
 
 #if !defined (_PORTABLEINTERCEPTOR_CLIENTREQUESTINFO__TRAITS_CH_)
 #define _PORTABLEINTERCEPTOR_CLIENTREQUESTINFO__TRAITS_CH_
-  
+
   template<>
   struct TAO_PI_Export Objref_Traits< ::PortableInterceptor::ClientRequestInfo>
   {
diff --git a/TAO/tao/PI/ClientRequestInterceptorA.cpp b/TAO/tao/PI/ClientRequestInterceptorA.cpp
index 37540f43dbc..a74dc65102d 100644
--- a/TAO/tao/PI/ClientRequestInterceptorA.cpp
+++ b/TAO/tao/PI/ClientRequestInterceptorA.cpp
@@ -26,14 +26,14 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "ClientRequestInterceptorC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
-#include "tao/String_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
+#include "tao/AnyTypeCode/String_TypeCode_Static.h"
 #include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
+#include "tao/AnyTypeCode/Any.h"
+#include "tao/AnyTypeCode/Any_Impl_T.h"
 
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/objref_typecode.cpp:76
@@ -44,7 +44,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:omg.org/PortableInterceptor/ClientRequestInterceptor:1.0",
     "ClientRequestInterceptor");
-  
+
 namespace PortableInterceptor
 {
   ::CORBA::TypeCode_ptr const _tc_ClientRequestInterceptor =
@@ -77,7 +77,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Impl_T<PortableInterceptor::ClientRequestInterceptor>::demarshal_value (TAO_InputCDR &)
diff --git a/TAO/tao/PI/InterceptorA.cpp b/TAO/tao/PI/InterceptorA.cpp
index d386dfcfff3..ce25543d0a6 100644
--- a/TAO/tao/PI/InterceptorA.cpp
+++ b/TAO/tao/PI/InterceptorA.cpp
@@ -26,14 +26,14 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "InterceptorC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
-#include "tao/String_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
+#include "tao/AnyTypeCode/String_TypeCode_Static.h"
 #include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
+#include "tao/AnyTypeCode/Any.h"
+#include "tao/AnyTypeCode/Any_Impl_T.h"
 
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/objref_typecode.cpp:76
@@ -44,7 +44,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:omg.org/PortableInterceptor/Interceptor:1.0",
     "Interceptor");
-  
+
 namespace PortableInterceptor
 {
   ::CORBA::TypeCode_ptr const _tc_Interceptor =
@@ -77,7 +77,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Impl_T<PortableInterceptor::Interceptor>::demarshal_value (TAO_InputCDR &)
diff --git a/TAO/tao/InvalidSlot.pidl b/TAO/tao/PI/InvalidSlot.pidl
index bd82c726aa5..bd82c726aa5 100644
--- a/TAO/tao/InvalidSlot.pidl
+++ b/TAO/tao/PI/InvalidSlot.pidl
diff --git a/TAO/tao/InvalidSlotA.cpp b/TAO/tao/PI/InvalidSlotA.cpp
index 265b0414b41..b4f76a7cbd6 100644
--- a/TAO/tao/InvalidSlotA.cpp
+++ b/TAO/tao/PI/InvalidSlotA.cpp
@@ -25,15 +25,15 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "InvalidSlotC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Struct_TypeCode_Static.h"
-#include "tao/TypeCode_Struct_Field.h"
+#include "InvalidSlotA.h"
+#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Struct_TypeCode_Static.h"
+#include "tao/AnyTypeCode/TypeCode_Struct_Field.h"
 #include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Dual_Impl_T.h"
+#include "tao/AnyTypeCode/Any.h"
+#include "tao/AnyTypeCode/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/struct_typecode.cpp:87
@@ -49,7 +49,7 @@ static TAO::TypeCode::Struct<char const *,
     "InvalidSlot",
     _tao_fields_PortableInterceptor_InvalidSlot,
     0);
-  
+
 namespace PortableInterceptor
 {
   ::CORBA::TypeCode_ptr const _tc_InvalidSlot =
@@ -58,7 +58,7 @@ namespace PortableInterceptor
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_exception/any_op_cs.cpp:50
 
 namespace TAO
@@ -70,12 +70,12 @@ namespace TAO
     )
   {
     CORBA::String_var id;
-    
+
     if (!(cdr >> id.out ()))
       {
         return false;
       }
-    
+
     ACE_TRY_NEW_ENV
       {
         this->value_->_tao_decode (cdr ACE_ENV_ARG_PARAMETER);
@@ -86,7 +86,7 @@ namespace TAO
         return false;
       }
     ACE_ENDTRY;
-    
+
     return true;
   }
 }
diff --git a/TAO/tao/VisibilityC.h b/TAO/tao/PI/InvalidSlotA.h
index 86b69215c9e..bd02e893965 100644
--- a/TAO/tao/VisibilityC.h
+++ b/TAO/tao/PI/InvalidSlotA.h
@@ -28,8 +28,8 @@
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:153
 
-#ifndef _TAO_IDL_ORIG_VISIBILITYC_H_
-#define _TAO_IDL_ORIG_VISIBILITYC_H_
+#ifndef _TAO_IDL_ORIG_INVALIDSLOTA_H_
+#define _TAO_IDL_ORIG_INVALIDSLOTA_H_
 
 #include /**/ "ace/pre.h"
 
@@ -40,14 +40,13 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/TAO_Export.h"
-#include "tao/ORB.h"
-#include "tao/Environment.h"
+#include "tao/PI/pi_export.h"
+#include "tao/PI/InvalidSlotC.h"
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
 #endif
-#define TAO_EXPORT_MACRO TAO_Export
+#define TAO_EXPORT_MACRO TAO_PI_Export
 
 #if defined(_MSC_VER)
 #pragma warning(push)
@@ -61,34 +60,17 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:48
 
-namespace CORBA
+namespace PortableInterceptor
 {
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typedef/typedef_ch.cpp:379
-  
-  typedef CORBA::Short Visibility;
-  typedef CORBA::Short_out Visibility_out;
-  
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_Visibility;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-  
-  const CORBA::Visibility PRIVATE_MEMBER = 0;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-  
-  const CORBA::Visibility PUBLIC_MEMBER = 1;
+
+  extern TAO_PI_Export ::CORBA::TypeCode_ptr const _tc_InvalidSlot;
 
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:66
 
-} // module CORBA
+} // module PortableInterceptor
 
 // TAO_IDL - Generated from
 // be\be_visitor_traits.cpp:61
@@ -99,6 +81,14 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
+// be\be_visitor_exception/any_op_ch.cpp:52
+
+TAO_PI_Export void operator<<= (CORBA::Any &, const PortableInterceptor::InvalidSlot &); // copying version
+TAO_PI_Export void operator<<= (CORBA::Any &, PortableInterceptor::InvalidSlot*); // noncopying version
+TAO_PI_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::InvalidSlot *&); // deprecated
+TAO_PI_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableInterceptor::InvalidSlot *&);
+
+// TAO_IDL - Generated from
 // be\be_codegen.cpp:955
 
 #if defined(_MSC_VER)
diff --git a/TAO/tao/InvalidSlotC.cpp b/TAO/tao/PI/InvalidSlotC.cpp
index ede7638814e..441c13306f4 100644
--- a/TAO/tao/InvalidSlotC.cpp
+++ b/TAO/tao/PI/InvalidSlotC.cpp
@@ -29,7 +29,7 @@
 // be\be_codegen.cpp:291
 
 
-#include "InvalidSlotC.h"
+#include "InvalidSlotA.h"
 #include "tao/CDR.h"
 #include "tao/SystemException.h"
 #include "ace/OS_NS_string.h"
@@ -47,7 +47,7 @@ namespace TAO
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_exception/exception_cs.cpp:63
 
 PortableInterceptor::InvalidSlot::InvalidSlot (void)
@@ -129,7 +129,7 @@ void PortableInterceptor::InvalidSlot::_tao_encode (
     {
       return;
     }
-  
+
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -142,7 +142,7 @@ void PortableInterceptor::InvalidSlot::_tao_decode (
     {
       return;
     }
-  
+
   ACE_THROW (CORBA::MARSHAL ());
 }
 
diff --git a/TAO/tao/InvalidSlotC.h b/TAO/tao/PI/InvalidSlotC.h
index 03b060a0081..47acd600e79 100644
--- a/TAO/tao/InvalidSlotC.h
+++ b/TAO/tao/PI/InvalidSlotC.h
@@ -40,14 +40,14 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/TAO_Export.h"
+#include "tao/PI/pi_export.h"
 #include "tao/ORB.h"
 #include "tao/Environment.h"
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
 #endif
-#define TAO_EXPORT_MACRO TAO_Export
+#define TAO_EXPORT_MACRO TAO_PI_Export
 
 #if defined(_MSC_VER)
 #pragma warning(push)
@@ -63,30 +63,30 @@
 
 namespace PortableInterceptor
 {
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_exception/exception_ch.cpp:53
 
 #if !defined (_PORTABLEINTERCEPTOR_INVALIDSLOT_CH_)
 #define _PORTABLEINTERCEPTOR_INVALIDSLOT_CH_
-  
-  class TAO_Export InvalidSlot : public CORBA::UserException
+
+  class TAO_PI_Export InvalidSlot : public CORBA::UserException
   {
   public:
-    
+
     InvalidSlot (void);
     InvalidSlot (const InvalidSlot &);
     ~InvalidSlot (void);
 
     InvalidSlot &operator= (const InvalidSlot &);
-    
+
     static void _tao_any_destructor (void *);
-    
+
     static InvalidSlot *_downcast (CORBA::Exception *);
     static const InvalidSlot *_downcast (CORBA::Exception const *);
-    
+
     static CORBA::Exception *_alloc (void);
-    
+
     virtual CORBA::Exception *_tao_duplicate (void) const;
 
     virtual void _raise (void) const;
@@ -95,22 +95,17 @@ namespace PortableInterceptor
         TAO_OutputCDR &
         ACE_ENV_ARG_DECL
       ) const;
-    
+
     virtual void _tao_decode (
         TAO_InputCDR &
         ACE_ENV_ARG_DECL
       );
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_exception/exception_ch.cpp:129
-    
+
     virtual CORBA::TypeCode_ptr _tao_type (void) const;
   };
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_InvalidSlot;
 
 #endif /* end #if !defined */
 
@@ -128,18 +123,10 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_exception/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const PortableInterceptor::InvalidSlot &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::InvalidSlot*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::InvalidSlot *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableInterceptor::InvalidSlot *&);
-
-// TAO_IDL - Generated from
 // be\be_visitor_exception/cdr_op_ch.cpp:52
 
-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableInterceptor::InvalidSlot &);
-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableInterceptor::InvalidSlot &);
+TAO_PI_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableInterceptor::InvalidSlot &);
+TAO_PI_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableInterceptor::InvalidSlot &);
 
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:955
diff --git a/TAO/tao/InvalidSlotS.h b/TAO/tao/PI/InvalidSlotS.h
index 17b1360599e..17b1360599e 100644
--- a/TAO/tao/InvalidSlotS.h
+++ b/TAO/tao/PI/InvalidSlotS.h
diff --git a/TAO/tao/PI/ORBInitInfo.cpp b/TAO/tao/PI/ORBInitInfo.cpp
index 36ad778a95a..658f11d6238 100644
--- a/TAO/tao/PI/ORBInitInfo.cpp
+++ b/TAO/tao/PI/ORBInitInfo.cpp
@@ -11,7 +11,7 @@
 #include "ace/Service_Config.h"
 
 #if TAO_HAS_INTERCEPTORS == 1
-#include "tao/PICurrent.h"
+#include "PICurrent.h"
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 
 ACE_RCSID (TAO,
diff --git a/TAO/tao/PI/ORBInitInfoA.cpp b/TAO/tao/PI/ORBInitInfoA.cpp
index 4a097c2a612..86c49b8a9e6 100644
--- a/TAO/tao/PI/ORBInitInfoA.cpp
+++ b/TAO/tao/PI/ORBInitInfoA.cpp
@@ -26,17 +26,17 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "ORBInitInfoC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
-#include "tao/String_TypeCode_Static.h"
-#include "tao/Struct_TypeCode_Static.h"
-#include "tao/TypeCode_Struct_Field.h"
+#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
+#include "tao/AnyTypeCode/String_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Struct_TypeCode_Static.h"
+#include "tao/AnyTypeCode/TypeCode_Struct_Field.h"
 #include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
-#include "tao/Any_Dual_Impl_T.h"
+#include "tao/AnyTypeCode/Any.h"
+#include "tao/AnyTypeCode/Any_Impl_T.h"
+#include "tao/AnyTypeCode/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/alias_typecode.cpp:50
@@ -49,7 +49,7 @@ static TAO::TypeCode::Alias<char const *,
     "IDL:omg.org/PortableInterceptor/ORBInitInfo/ObjectId:1.0",
     "ObjectId",
     &CORBA::_tc_string);
-  
+
 ::CORBA::TypeCode_ptr const PortableInterceptor::ORBInitInfo::_tc_ObjectId =
   &_tao_tc_PortableInterceptor_ORBInitInfo_ObjectId;
 
@@ -59,7 +59,7 @@ static TAO::TypeCode::Alias<char const *,
 static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_PortableInterceptor_ORBInitInfo_DuplicateName[] =
   {
     { "name", &CORBA::_tc_string }
-    
+
   };
 static TAO::TypeCode::Struct<char const *,
                       CORBA::TypeCode_ptr const *,
@@ -71,7 +71,7 @@ static TAO::TypeCode::Struct<char const *,
     "DuplicateName",
     _tao_fields_PortableInterceptor_ORBInitInfo_DuplicateName,
     1);
-  
+
 ::CORBA::TypeCode_ptr const PortableInterceptor::ORBInitInfo::_tc_DuplicateName =
   &_tao_tc_PortableInterceptor_ORBInitInfo_DuplicateName;
 
@@ -89,7 +89,7 @@ static TAO::TypeCode::Struct<char const *,
     "InvalidName",
     _tao_fields_PortableInterceptor_ORBInitInfo_InvalidName,
     0);
-  
+
 ::CORBA::TypeCode_ptr const PortableInterceptor::ORBInitInfo::_tc_InvalidName =
   &_tao_tc_PortableInterceptor_ORBInitInfo_InvalidName;
 
@@ -102,7 +102,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:omg.org/PortableInterceptor/ORBInitInfo:1.0",
     "ORBInitInfo");
-  
+
 namespace PortableInterceptor
 {
   ::CORBA::TypeCode_ptr const _tc_ORBInitInfo =
@@ -135,7 +135,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Impl_T<PortableInterceptor::ORBInitInfo>::demarshal_value (TAO_InputCDR &)
@@ -186,7 +186,7 @@ operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_exception/any_op_cs.cpp:50
 
 namespace TAO
@@ -197,7 +197,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Dual_Impl_T<PortableInterceptor::ORBInitInfo::DuplicateName>::demarshal_value (TAO_InputCDR &)
@@ -261,7 +261,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_exception/any_op_cs.cpp:50
 
 namespace TAO
@@ -272,7 +272,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Dual_Impl_T<PortableInterceptor::ORBInitInfo::InvalidName>::demarshal_value (TAO_InputCDR &)
diff --git a/TAO/tao/PI/ORBInitializerA.cpp b/TAO/tao/PI/ORBInitializerA.cpp
index 6eef8945468..61bf2ec78aa 100644
--- a/TAO/tao/PI/ORBInitializerA.cpp
+++ b/TAO/tao/PI/ORBInitializerA.cpp
@@ -26,13 +26,13 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "ORBInitializerC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
 #include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
+#include "tao/AnyTypeCode/Any.h"
+#include "tao/AnyTypeCode/Any_Impl_T.h"
 
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/objref_typecode.cpp:76
@@ -43,7 +43,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:omg.org/PortableInterceptor/ORBInitializer:1.0",
     "ORBInitializer");
-  
+
 namespace PortableInterceptor
 {
   ::CORBA::TypeCode_ptr const _tc_ORBInitializer =
@@ -76,7 +76,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Impl_T<PortableInterceptor::ORBInitializer>::demarshal_value (TAO_InputCDR &)
diff --git a/TAO/tao/PI/ORBInitializer_Registry_Impl.cpp b/TAO/tao/PI/ORBInitializer_Registry_Impl.cpp
index 89986bc2a56..55efc3a28a9 100644
--- a/TAO/tao/PI/ORBInitializer_Registry_Impl.cpp
+++ b/TAO/tao/PI/ORBInitializer_Registry_Impl.cpp
@@ -1,7 +1,8 @@
 #include "ORBInitializer_Registry_Impl.h"
 #include "ORBInitInfo.h"
+#include "PICurrent.h"
 
-#include "tao/ORB.h"
+#include "tao/ORB_Core.h"
 #include "tao/ORB_Constants.h"
 #include "tao/SystemException.h"
 
@@ -123,7 +124,7 @@ TAO::ORBInitializer_Registry::post_init (
   TAO_ORB_Core *orb_core,
   int argc,
   char *argv[],
-  PortableInterceptor::SlotId &slotid
+  PortableInterceptor::SlotId slotid
   ACE_ENV_ARG_DECL)
 {
   if (pre_init_count > 0)
@@ -155,7 +156,20 @@ TAO::ORBInitializer_Registry::post_init (
           ACE_CHECK;
         }
 
-      slotid = orb_init_info_->slot_count ();
+#if TAO_HAS_INTERCEPTORS == 1
+      CORBA::Object_ptr picurrent_ptr = orb_core->pi_current ();
+
+      if (!CORBA::is_nil (picurrent_ptr))
+        {
+          TAO::PICurrent *pi = dynamic_cast <TAO::PICurrent*> (picurrent_ptr);
+
+          if (pi)
+            {
+              pi->initialize (orb_init_info_->slot_count () ACE_ENV_ARG_PARAMETER);
+              ACE_CHECK;
+            }
+        }
+#endif /* TAO_HAS_INTERCEPTORS == 1 */
 
       // Invalidate the ORBInitInfo instance to prevent future
       // modifications to the ORB.  This behavior complies with the
diff --git a/TAO/tao/PI/ORBInitializer_Registry_Impl.h b/TAO/tao/PI/ORBInitializer_Registry_Impl.h
index 2a3d83d114b..f8f8b9ab7ae 100644
--- a/TAO/tao/PI/ORBInitializer_Registry_Impl.h
+++ b/TAO/tao/PI/ORBInitializer_Registry_Impl.h
@@ -70,7 +70,7 @@ namespace TAO
         TAO_ORB_Core *orb_core,
         int argc,
         char *argv[],
-        PortableInterceptor::SlotId &slotid
+        PortableInterceptor::SlotId slotid
         ACE_ENV_ARG_DECL);
 
   private:
diff --git a/TAO/tao/PI/PI.h b/TAO/tao/PI/PI.h
index ab654f7a923..389c1ebdce3 100644
--- a/TAO/tao/PI/PI.h
+++ b/TAO/tao/PI/PI.h
@@ -46,6 +46,7 @@ TAO_Requires_PI_Initializer =
 #include "InterceptorC.h"
 #include "ClientRequestInfoC.h"
 #include "ClientRequestInterceptorC.h"
+#include "PICurrentC.h"
 #undef TAO_PI_SAFE_INCLUDE
 
 #endif  /* TAO_PI_H */
diff --git a/TAO/tao/PICurrent.cpp b/TAO/tao/PI/PICurrent.cpp
index 421b76bb74a..dc3bf53884a 100644
--- a/TAO/tao/PICurrent.cpp
+++ b/TAO/tao/PI/PICurrent.cpp
@@ -11,15 +11,17 @@ ACE_RCSID (tao,
 # include "PICurrent.inl"
 #endif /* __ACE_INLINE__ */
 
-#include "ORB_Core.h"
-#include "ORB_Core_TSS_Resources.h"
-#include "TAO_Server_Request.h"
-#include "PICurrent_Copy_Callback.h"
-#include "SystemException.h"
+#include "PICurrent_Impl.h"
+
+#include "tao/ORB_Core.h"
+#include "tao/ORB_Core_TSS_Resources.h"
+#include "tao/TAO_Server_Request.h"
+#include "tao/SystemException.h"
 
 
 TAO::PICurrent::PICurrent (TAO_ORB_Core &orb_core)
   : orb_core_ (orb_core),
+    tss_slot_ (0),
     slot_count_ (0)
 {
 }
@@ -70,10 +72,11 @@ TAO::PICurrent::set_slot (PortableInterceptor::SlotId identifier,
 TAO::PICurrent_Impl *
 TAO::PICurrent::tsc (void)
 {
-  TAO_ORB_Core_TSS_Resources *tss =
-    this->orb_core_.get_tss_resources ();
+  TAO::PICurrent_Impl *impl =
+    static_cast<TAO::PICurrent_Impl *> (
+      this->orb_core_.get_tss_resource (this->tss_slot_));
 
-  return &tss->pi_current_;
+  return impl;
 }
 
 void
@@ -92,4 +95,30 @@ TAO::PICurrent::_get_orb (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
   return CORBA::ORB::_duplicate (this->orb_core_.orb ());
 }
 
+int
+TAO::PICurrent::initialize (PortableInterceptor::SlotId sc
+                            ACE_ENV_ARG_DECL_NOT_USED)
+{
+  this->slot_count_ = sc;
+
+  if (this->tsc () == 0 && tss_slot_ == 0)
+    {
+      TAO::PICurrent_Impl *impl = 0;
+      ACE_NEW_RETURN (impl,
+                      TAO::PICurrent_Impl,
+                      0);
+
+      const int result = this->orb_core_.add_tss_cleanup_func (0,
+                                                               tss_slot_);
+
+      if (result != 0)
+        return result;
+
+      this->orb_core_.set_tss_resource (tss_slot_, impl);
+    }
+
+  return 0;
+}
+
+
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
diff --git a/TAO/tao/PICurrent.h b/TAO/tao/PI/PICurrent.h
index 107d16c8d77..98e391d1aaf 100644
--- a/TAO/tao/PICurrent.h
+++ b/TAO/tao/PI/PICurrent.h
@@ -15,25 +15,24 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/TAO_Export.h"
+#include "pi_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbconf.h"
+#include "tao/orbconf.h"
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-#include "ace/Array_Base.h"
-#include "Any.h"
 #include "PICurrentC.h"
-#include "LocalObject.h"
+
+#include "ace/Array_Base.h"
+#include "tao/LocalObject.h"
 
 #if defined(_MSC_VER)
 # pragma warning(push)
 # pragma warning(disable:4250)
-# pragma warning(disable:4251)
 #endif /* _MSC_VER */
 
 /// Forward declarations.
@@ -54,7 +53,7 @@ namespace TAO
    * request interceptors, in addition to passing data from an
    * interceptor to the calling thread.
    */
-  class TAO_Export PICurrent
+  class TAO_PI_Export PICurrent
     : public virtual PortableInterceptor::Current,
       public virtual TAO_Local_RefCounted_Object
   {
@@ -101,7 +100,7 @@ namespace TAO
                          ACE_ENV_ARG_DECL);
 
     /// Initialize the PICurrent object.
-    void initialize (PortableInterceptor::SlotId sc);
+    int initialize (PortableInterceptor::SlotId sc ACE_ENV_ARG_DECL);
 
   protected:
 
@@ -126,6 +125,9 @@ namespace TAO
     /// Reference to the orb core.
     TAO_ORB_Core &orb_core_;
 
+    /// TSS slot assigned to this object.
+    size_t tss_slot_;
+
     /// The number of allocated slots.
     PortableInterceptor::SlotId slot_count_;
 
diff --git a/TAO/tao/PICurrent.inl b/TAO/tao/PI/PICurrent.inl
index 5f64a548660..7fd7fc77b1b 100644
--- a/TAO/tao/PICurrent.inl
+++ b/TAO/tao/PI/PICurrent.inl
@@ -9,9 +9,3 @@ TAO::PICurrent::slot_count (void) const
   return this->slot_count_;
 }
 
-ACE_INLINE void
-TAO::PICurrent::initialize (PortableInterceptor::SlotId sc)
-{
-  this->slot_count_ = sc;
-}
-
diff --git a/TAO/tao/PICurrent.pidl b/TAO/tao/PI/PICurrent.pidl
index f60324effc1..f60324effc1 100644
--- a/TAO/tao/PICurrent.pidl
+++ b/TAO/tao/PI/PICurrent.pidl
diff --git a/TAO/tao/PICurrentA.cpp b/TAO/tao/PI/PICurrentA.cpp
index 6a256f1cdf8..3b0f9ba8765 100644
--- a/TAO/tao/PICurrentA.cpp
+++ b/TAO/tao/PI/PICurrentA.cpp
@@ -25,15 +25,15 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "PICurrentC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
-#include "tao/String_TypeCode_Static.h"
+#include "PICurrentA.h"
+#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
+#include "tao/AnyTypeCode/String_TypeCode_Static.h"
 #include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
+#include "tao/AnyTypeCode/Any.h"
+#include "tao/AnyTypeCode/Any_Impl_T.h"
 
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/objref_typecode.cpp:76
@@ -44,7 +44,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:omg.org/PortableInterceptor/Current:1.0",
     "Current");
-  
+
 namespace PortableInterceptor
 {
   ::CORBA::TypeCode_ptr const _tc_Current =
@@ -77,7 +77,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Impl_T<PortableInterceptor::Current>::demarshal_value (TAO_InputCDR &)
diff --git a/TAO/tao/ValueModifierC.h b/TAO/tao/PI/PICurrentA.h
index 2bfe5a25b4e..092901e4ad4 100644
--- a/TAO/tao/ValueModifierC.h
+++ b/TAO/tao/PI/PICurrentA.h
@@ -28,8 +28,8 @@
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:153
 
-#ifndef _TAO_IDL_ORIG_VALUEMODIFIERC_H_
-#define _TAO_IDL_ORIG_VALUEMODIFIERC_H_
+#ifndef _TAO_IDL_ORIG_PICURRENTA_H_
+#define _TAO_IDL_ORIG_PICURRENTA_H_
 
 #include /**/ "ace/pre.h"
 
@@ -40,14 +40,13 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/TAO_Export.h"
-#include "tao/ORB.h"
-#include "tao/Environment.h"
+#include "pi_export.h"
+#include "tao/PI/PICurrentC.h"
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
 #endif
-#define TAO_EXPORT_MACRO TAO_Export
+#define TAO_EXPORT_MACRO TAO_PI_Export
 
 #if defined(_MSC_VER)
 #pragma warning(push)
@@ -61,47 +60,24 @@
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:48
 
-namespace CORBA
+namespace PortableInterceptor
 {
-  
   // TAO_IDL - Generated from
-  // be\be_visitor_typedef/typedef_ch.cpp:379
-  
-  typedef CORBA::Short ValueModifier;
-  typedef CORBA::Short_out ValueModifier_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-  
-  const CORBA::ValueModifier VM_NONE = 0;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-  
-  const CORBA::ValueModifier VM_CUSTOM = 1;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-  
-  const CORBA::ValueModifier VM_ABSTRACT = 2;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_constant/constant_ch.cpp:52
-  
-  const CORBA::ValueModifier VM_TRUNCATABLE = 3;
+  // be\be_visitor_typecode/typecode_decl.cpp:44
+
+  extern TAO_PI_Export ::CORBA::TypeCode_ptr const _tc_Current;
 
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:66
 
-} // module CORBA
+} // module PortableInterceptor
 
 // TAO_IDL - Generated from
-// be\be_visitor_traits.cpp:61
+// be\be_visitor_interface/any_op_ch.cpp:52
 
-// Traits specializations.
-namespace TAO
-{
-}
+TAO_PI_Export void operator<<= (CORBA::Any &, PortableInterceptor::Current_ptr); // copying
+TAO_PI_Export void operator<<= (CORBA::Any &, PortableInterceptor::Current_ptr *); // non-copying
+TAO_PI_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::Current_ptr &);
 
 // TAO_IDL - Generated from
 // be\be_codegen.cpp:955
diff --git a/TAO/tao/PICurrentC.cpp b/TAO/tao/PI/PICurrentC.cpp
index 197b87f3c07..197b87f3c07 100644
--- a/TAO/tao/PICurrentC.cpp
+++ b/TAO/tao/PI/PICurrentC.cpp
diff --git a/TAO/tao/PICurrentC.h b/TAO/tao/PI/PICurrentC.h
index e54d5082d55..242cd2d0ca5 100644
--- a/TAO/tao/PICurrentC.h
+++ b/TAO/tao/PI/PICurrentC.h
@@ -40,24 +40,21 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/TAO_Export.h"
+#include "pi_export.h"
 #include "tao/ORB.h"
 #include "tao/SystemException.h"
 #include "tao/Environment.h"
 #include "tao/Object.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Any.h"
-#include "tao/TypeCode.h"
 #include "tao/Objref_VarOut_T.h"
 
-#include "tao/InvalidSlotC.h"
+#include "tao/PI/InvalidSlotC.h"
 #include "tao/PI_ForwardC.h"
 #include "tao/CurrentC.h"
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
 #endif
-#define TAO_EXPORT_MACRO TAO_Export
+#define TAO_EXPORT_MACRO TAO_PI_Export
 
 #if defined(_MSC_VER)
 #pragma warning(push)
@@ -73,22 +70,22 @@
 
 namespace PortableInterceptor
 {
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_PORTABLEINTERCEPTOR_CURRENT__VAR_OUT_CH_)
 #define _PORTABLEINTERCEPTOR_CURRENT__VAR_OUT_CH_
-  
+
   class Current;
   typedef Current *Current_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         Current
       >
     Current_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         Current
@@ -96,45 +93,45 @@ namespace PortableInterceptor
     Current_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_PORTABLEINTERCEPTOR_CURRENT_CH_)
 #define _PORTABLEINTERCEPTOR_CURRENT_CH_
-  
-  class TAO_Export Current
+
+  class TAO_PI_Export Current
     : public virtual ::CORBA::Current
   {
   public:
     typedef Current_ptr _ptr_type;
     typedef Current_var _var_type;
-    
+
     // The static operations.
     static Current_ptr _duplicate (Current_ptr obj);
-    
+
     static void _tao_release (Current_ptr obj);
-    
+
     static Current_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static Current_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static Current_ptr _nil (void)
     {
       return static_cast<Current_ptr> (0);
     }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::Any * get_slot (
         ::PortableInterceptor::SlotId id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -143,10 +140,10 @@ namespace PortableInterceptor
         CORBA::SystemException,
         ::PortableInterceptor::InvalidSlot
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void set_slot (
         ::PortableInterceptor::SlotId id,
         const ::CORBA::Any & data
@@ -156,37 +153,32 @@ namespace PortableInterceptor
         CORBA::SystemException,
         ::PortableInterceptor::InvalidSlot
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
-    
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
+
   protected:
     // Abstract or local interface only.
     Current (void);
-    
+
     virtual ~Current (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     Current (const Current &);
-    
+
     void operator= (const Current &);
   };
 
 #endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_Current;
 
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:66
@@ -202,9 +194,9 @@ namespace TAO
 
 #if !defined (_PORTABLEINTERCEPTOR_CURRENT__TRAITS_CH_)
 #define _PORTABLEINTERCEPTOR_CURRENT__TRAITS_CH_
-  
+
   template<>
-  struct TAO_Export Objref_Traits< ::PortableInterceptor::Current>
+  struct TAO_PI_Export Objref_Traits< ::PortableInterceptor::Current>
   {
     static ::PortableInterceptor::Current_ptr duplicate (
         ::PortableInterceptor::Current_ptr
@@ -223,13 +215,6 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::Current_ptr); // copying
-TAO_Export void operator<<= (CORBA::Any &, PortableInterceptor::Current_ptr *); // non-copying
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableInterceptor::Current_ptr &);
-
-// TAO_IDL - Generated from
 // be\be_codegen.cpp:955
 
 #if defined(_MSC_VER)
diff --git a/TAO/tao/PICurrentS.h b/TAO/tao/PI/PICurrentS.h
index 17b1360599e..17b1360599e 100644
--- a/TAO/tao/PICurrentS.h
+++ b/TAO/tao/PI/PICurrentS.h
diff --git a/TAO/tao/PICurrent_Copy_Callback.cpp b/TAO/tao/PI/PICurrent_Copy_Callback.cpp
index bb4b79aa4e5..7ad09ada95b 100644
--- a/TAO/tao/PICurrent_Copy_Callback.cpp
+++ b/TAO/tao/PI/PICurrent_Copy_Callback.cpp
@@ -25,7 +25,7 @@ TAO::PICurrent_Copy_Callback::~PICurrent_Copy_Callback (void)
 }
 
 int
-TAO::PICurrent_Copy_Callback::execute (void *)
+TAO::PICurrent_Copy_Callback::execute (void)
 {
   if (this->src_ != 0 && this->dst_ != 0
       && this->src_ != this->dst_)
diff --git a/TAO/tao/PICurrent_Copy_Callback.h b/TAO/tao/PI/PICurrent_Copy_Callback.h
index 09e5b384c76..5b5f17d4505 100644
--- a/TAO/tao/PICurrent_Copy_Callback.h
+++ b/TAO/tao/PI/PICurrent_Copy_Callback.h
@@ -15,18 +15,16 @@
 
 #include /**/ "ace/pre.h"
 
-#include "TAO_Export.h"
+#include "pi_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbconf.h"
+#include "tao/orbconf.h"
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-#include "ace/Functor.h"
-
 namespace TAO
 {
   class PICurrent_Impl;
@@ -40,8 +38,7 @@ namespace TAO
    * object's slot table to the destination PICurrent_Impl object's
    * slot table.
    */
-  class TAO_Export PICurrent_Copy_Callback
-    : public ACE_Command_Base
+  class TAO_PI_Export PICurrent_Copy_Callback
   {
   public:
 
@@ -52,7 +49,7 @@ namespace TAO
     ~PICurrent_Copy_Callback (void);
 
     /// Perform the copy.
-    virtual int execute (void * arg = 0);
+    int execute (void);
 
     /// Set the source and destination PICurrent_Impl objects.
     void src_and_dst (PICurrent_Impl * src, PICurrent_Impl * dst);
diff --git a/TAO/tao/PICurrent_Impl.cpp b/TAO/tao/PI/PICurrent_Impl.cpp
index a201c29ffe8..ecbccc90274 100644
--- a/TAO/tao/PICurrent_Impl.cpp
+++ b/TAO/tao/PI/PICurrent_Impl.cpp
@@ -11,9 +11,10 @@ ACE_RCSID (tao,
 # include "PICurrent_Impl.inl"
 #endif /* __ACE_INLINE__ */
 
-#include "TAO_Server_Request.h"
 #include "PICurrent_Copy_Callback.h"
-#include "SystemException.h"
+
+#include "tao/TAO_Server_Request.h"
+#include "tao/SystemException.h"
 #include "ace/Log_Msg.h"
 
 TAO::PICurrent_Impl::PICurrent_Impl (void)
diff --git a/TAO/tao/PICurrent_Impl.h b/TAO/tao/PI/PICurrent_Impl.h
index 1f3e6d2a6b7..e77945a9135 100644
--- a/TAO/tao/PICurrent_Impl.h
+++ b/TAO/tao/PI/PICurrent_Impl.h
@@ -15,18 +15,18 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/TAO_Export.h"
+#include "pi_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "orbconf.h"
+#include "tao/orbconf.h"
 
 #if TAO_HAS_INTERCEPTORS == 1
 
 #include "ace/Array_Base.h"
-#include "Any.h"
+#include "tao/AnyTypeCode/Any.h"
 #include "PICurrentC.h"
 
 /// Forward declarations.
@@ -47,7 +47,7 @@ namespace TAO
    * "thread scope current" objects as required by Portable
    * Interceptors.
    */
-  class TAO_Export PICurrent_Impl
+  class TAO_PI_Export PICurrent_Impl
   {
   public:
 
diff --git a/TAO/tao/PICurrent_Impl.inl b/TAO/tao/PI/PICurrent_Impl.inl
index 8b708ec7f5a..8b708ec7f5a 100644
--- a/TAO/tao/PICurrent_Impl.inl
+++ b/TAO/tao/PI/PICurrent_Impl.inl
diff --git a/TAO/tao/PICurrent_Loader.cpp b/TAO/tao/PI/PICurrent_Loader.cpp
index 12ce0be04bc..5671986bb86 100644
--- a/TAO/tao/PICurrent_Loader.cpp
+++ b/TAO/tao/PI/PICurrent_Loader.cpp
@@ -54,6 +54,6 @@ ACE_STATIC_SVC_DEFINE (TAO_PICurrent_Loader,
                        &ACE_SVC_NAME (TAO_PICurrent_Loader),
                        ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
                        0)
-ACE_FACTORY_DEFINE (TAO, TAO_PICurrent_Loader)
+ACE_FACTORY_DEFINE (TAO_PI, TAO_PICurrent_Loader)
 
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
diff --git a/TAO/tao/PICurrent_Loader.h b/TAO/tao/PI/PICurrent_Loader.h
index 6235c9b06ec..0498d95dd5d 100644
--- a/TAO/tao/PICurrent_Loader.h
+++ b/TAO/tao/PI/PICurrent_Loader.h
@@ -17,7 +17,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/TAO_Export.h"
+#include "pi_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -31,7 +31,7 @@
 
 #include "ace/Service_Config.h"
 
-class TAO_Export TAO_PICurrent_Loader
+class TAO_PI_Export TAO_PICurrent_Loader
   : public TAO_Object_Loader
 {
 public:
@@ -47,7 +47,7 @@ public:
 };
 
 ACE_STATIC_SVC_DECLARE (TAO_PICurrent_Loader)
-ACE_FACTORY_DECLARE (TAO, TAO_PICurrent_Loader)
+ACE_FACTORY_DECLARE (TAO_PI, TAO_PICurrent_Loader)
 
 static int
 TAO_Requires_PICurrent_Initializer = TAO_PICurrent_Loader::Initializer ();
diff --git a/TAO/tao/PI/PIForwardRequestA.cpp b/TAO/tao/PI/PIForwardRequestA.cpp
index bd8c5684d25..c0e4bd3cb89 100644
--- a/TAO/tao/PI/PIForwardRequestA.cpp
+++ b/TAO/tao/PI/PIForwardRequestA.cpp
@@ -26,14 +26,14 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "PIForwardRequestC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Struct_TypeCode_Static.h"
-#include "tao/TypeCode_Struct_Field.h"
+#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Struct_TypeCode_Static.h"
+#include "tao/AnyTypeCode/TypeCode_Struct_Field.h"
 #include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Dual_Impl_T.h"
+#include "tao/AnyTypeCode/Any.h"
+#include "tao/AnyTypeCode/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/struct_typecode.cpp:87
@@ -41,7 +41,7 @@
 static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_PortableInterceptor_ForwardRequest[] =
   {
     { "forward", &CORBA::_tc_Object }
-    
+
   };
 static TAO::TypeCode::Struct<char const *,
                       CORBA::TypeCode_ptr const *,
@@ -53,7 +53,7 @@ static TAO::TypeCode::Struct<char const *,
     "ForwardRequest",
     _tao_fields_PortableInterceptor_ForwardRequest,
     1);
-  
+
 namespace PortableInterceptor
 {
   ::CORBA::TypeCode_ptr const _tc_ForwardRequest =
@@ -62,7 +62,7 @@ namespace PortableInterceptor
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_exception/any_op_cs.cpp:50
 
 namespace TAO
@@ -74,12 +74,12 @@ namespace TAO
     )
   {
     CORBA::String_var id;
-    
+
     if (!(cdr >> id.out ()))
       {
         return false;
       }
-    
+
     ACE_TRY_NEW_ENV
       {
         this->value_->_tao_decode (cdr ACE_ENV_ARG_PARAMETER);
@@ -90,7 +90,7 @@ namespace TAO
         return false;
       }
     ACE_ENDTRY;
-    
+
     return true;
   }
 }
diff --git a/TAO/tao/PI/PolicyFactoryA.cpp b/TAO/tao/PI/PolicyFactoryA.cpp
index d0ecbffbf57..eba4bd3ab6a 100644
--- a/TAO/tao/PI/PolicyFactoryA.cpp
+++ b/TAO/tao/PI/PolicyFactoryA.cpp
@@ -26,13 +26,13 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "PolicyFactoryC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
 #include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
+#include "tao/AnyTypeCode/Any.h"
+#include "tao/AnyTypeCode/Any_Impl_T.h"
 
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/objref_typecode.cpp:76
@@ -43,7 +43,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:omg.org/PortableInterceptor/PolicyFactory:1.0",
     "PolicyFactory");
-  
+
 namespace PortableInterceptor
 {
   ::CORBA::TypeCode_ptr const _tc_PolicyFactory =
@@ -76,7 +76,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Impl_T<PortableInterceptor::PolicyFactory>::demarshal_value (TAO_InputCDR &)
diff --git a/TAO/tao/PI/PolicyFactoryC.h b/TAO/tao/PI/PolicyFactoryC.h
index e4e9410ec0e..ff691089edc 100644
--- a/TAO/tao/PI/PolicyFactoryC.h
+++ b/TAO/tao/PI/PolicyFactoryC.h
@@ -45,9 +45,9 @@
 #include "tao/SystemException.h"
 #include "tao/Environment.h"
 #include "tao/Object.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Any.h"
-#include "tao/TypeCode.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Any.h"
+#include "tao/AnyTypeCode/TypeCode.h"
 #include "tao/Objref_VarOut_T.h"
 
 #include "tao/PolicyC.h"
@@ -71,22 +71,22 @@
 
 namespace PortableInterceptor
 {
-  
+
   // TAO_IDL - Generated from
   // .\be\be_interface.cpp:598
 
 #if !defined (_PORTABLEINTERCEPTOR_POLICYFACTORY__VAR_OUT_CH_)
 #define _PORTABLEINTERCEPTOR_POLICYFACTORY__VAR_OUT_CH_
-  
+
   class PolicyFactory;
   typedef PolicyFactory *PolicyFactory_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         PolicyFactory
       >
     PolicyFactory_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         PolicyFactory
@@ -94,45 +94,45 @@ namespace PortableInterceptor
     PolicyFactory_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_PORTABLEINTERCEPTOR_POLICYFACTORY_CH_)
 #define _PORTABLEINTERCEPTOR_POLICYFACTORY_CH_
-  
+
   class TAO_PI_Export PolicyFactory
     : public virtual CORBA::Object
   {
   public:
     typedef PolicyFactory_ptr _ptr_type;
     typedef PolicyFactory_var _var_type;
-    
+
     // The static operations.
     static PolicyFactory_ptr _duplicate (PolicyFactory_ptr obj);
-    
+
     static void _tao_release (PolicyFactory_ptr obj);
-    
+
     static PolicyFactory_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static PolicyFactory_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static PolicyFactory_ptr _nil (void)
     {
       return static_cast<PolicyFactory_ptr> (0);
     }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::Policy_ptr create_policy (
         ::CORBA::PolicyType type,
         const ::CORBA::Any & value
@@ -142,7 +142,7 @@ namespace PortableInterceptor
         CORBA::SystemException,
         ::CORBA::PolicyError
       )) = 0;
-    
+
     // Hand-crafted addition.
     virtual ::CORBA::Policy_ptr _create_policy (
         CORBA::PolicyType type
@@ -155,33 +155,33 @@ namespace PortableInterceptor
 
     // TAO_IDL - Generated from
     // c:\ace\latest\ace_wrappers\tao\tao_idl\be\be_visitor_interface/interface_ch.cpp:210
-    
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
+
   protected:
     // Abstract or local interface only.
     PolicyFactory (void);
-    
+
     virtual ~PolicyFactory (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     PolicyFactory (const PolicyFactory &);
-    
+
     void operator= (const PolicyFactory &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   extern TAO_PI_Export ::CORBA::TypeCode_ptr const _tc_PolicyFactory;
 
 // TAO_IDL - Generated from
@@ -198,7 +198,7 @@ namespace TAO
 
 #if !defined (_PORTABLEINTERCEPTOR_POLICYFACTORY__TRAITS_CH_)
 #define _PORTABLEINTERCEPTOR_POLICYFACTORY__TRAITS_CH_
-  
+
   template<>
   struct TAO_PI_Export Objref_Traits< ::PortableInterceptor::PolicyFactory>
   {
diff --git a/TAO/tao/PI/RequestInfo.pidl b/TAO/tao/PI/RequestInfo.pidl
index 5714a704de4..e832e45d2ca 100644
--- a/TAO/tao/PI/RequestInfo.pidl
+++ b/TAO/tao/PI/RequestInfo.pidl
@@ -23,9 +23,9 @@
 #define _REQUESTINFO_PIDL_
 
 #include <PI_Forward.pidl>
-#include <Dynamic.pidl>
+#include "tao/AnyTypeCode/Dynamic.pidl"
 #include <Messaging_SyncScope.pidl>
-#include <InvalidSlot.pidl>
+#include "tao/PI/InvalidSlot.pidl"
 #include <IOP_IOR.pidl>
 
 module PortableInterceptor {
diff --git a/TAO/tao/PI/RequestInfoA.cpp b/TAO/tao/PI/RequestInfoA.cpp
index b01b21aca7f..79d1beb30cc 100644
--- a/TAO/tao/PI/RequestInfoA.cpp
+++ b/TAO/tao/PI/RequestInfoA.cpp
@@ -26,14 +26,14 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "RequestInfoC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
-#include "tao/String_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
+#include "tao/AnyTypeCode/String_TypeCode_Static.h"
 #include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
+#include "tao/AnyTypeCode/Any.h"
+#include "tao/AnyTypeCode/Any_Impl_T.h"
 
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/objref_typecode.cpp:76
@@ -44,7 +44,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:omg.org/PortableInterceptor/RequestInfo:1.0",
     "RequestInfo");
-  
+
 namespace PortableInterceptor
 {
   ::CORBA::TypeCode_ptr const _tc_RequestInfo =
@@ -77,7 +77,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Impl_T<PortableInterceptor::RequestInfo>::demarshal_value (TAO_InputCDR &)
diff --git a/TAO/tao/PI/RequestInfoC.h b/TAO/tao/PI/RequestInfoC.h
index 90fde2c2eb6..7c9d6ddb4fb 100644
--- a/TAO/tao/PI/RequestInfoC.h
+++ b/TAO/tao/PI/RequestInfoC.h
@@ -45,15 +45,15 @@
 #include "tao/SystemException.h"
 #include "tao/Environment.h"
 #include "tao/Object.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Any.h"
-#include "tao/TypeCode.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Any.h"
+#include "tao/AnyTypeCode/TypeCode.h"
 #include "tao/Objref_VarOut_T.h"
 
 #include "tao/PI_ForwardC.h"
-#include "tao/DynamicC.h"
+#include "tao/AnyTypeCode/DynamicC.h"
 #include "tao/Messaging_SyncScopeC.h"
-#include "tao/InvalidSlotC.h"
+#include "tao/PI/InvalidSlotC.h"
 #include "tao/IOP_IORC.h"
 
 #if defined (TAO_EXPORT_MACRO)
@@ -75,22 +75,22 @@
 
 namespace PortableInterceptor
 {
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_PORTABLEINTERCEPTOR_REQUESTINFO__VAR_OUT_CH_)
 #define _PORTABLEINTERCEPTOR_REQUESTINFO__VAR_OUT_CH_
-  
+
   class RequestInfo;
   typedef RequestInfo *RequestInfo_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         RequestInfo
       >
     RequestInfo_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         RequestInfo
@@ -98,155 +98,155 @@ namespace PortableInterceptor
     RequestInfo_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_PORTABLEINTERCEPTOR_REQUESTINFO_CH_)
 #define _PORTABLEINTERCEPTOR_REQUESTINFO_CH_
-  
+
   class TAO_PI_Export RequestInfo
     : public virtual CORBA::Object
   {
   public:
     typedef RequestInfo_ptr _ptr_type;
     typedef RequestInfo_var _var_type;
-    
+
     // The static operations.
     static RequestInfo_ptr _duplicate (RequestInfo_ptr obj);
-    
+
     static void _tao_release (RequestInfo_ptr obj);
-    
+
     static RequestInfo_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static RequestInfo_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static RequestInfo_ptr _nil (void)
     {
       return static_cast<RequestInfo_ptr> (0);
     }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::ULong request_id (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual char * operation (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::Dynamic::ParameterList * arguments (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::Dynamic::ExceptionList * exceptions (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::Dynamic::ContextList * contexts (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::Dynamic::RequestContext * operation_context (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::Any * result (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::Boolean response_expected (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual Messaging::SyncScope sync_scope (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual PortableInterceptor::ReplyStatus reply_status (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::Object_ptr forward_reference (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::Any * get_slot (
         ::PortableInterceptor::SlotId id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -255,10 +255,10 @@ namespace PortableInterceptor
         CORBA::SystemException,
         ::PortableInterceptor::InvalidSlot
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::IOP::ServiceContext * get_request_service_context (
         ::IOP::ServiceId id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -266,10 +266,10 @@ namespace PortableInterceptor
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::IOP::ServiceContext * get_reply_service_context (
         ::IOP::ServiceId id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -277,36 +277,36 @@ namespace PortableInterceptor
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
-    
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
+
   protected:
     // Abstract or local interface only.
     RequestInfo (void);
-    
+
     virtual ~RequestInfo (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     RequestInfo (const RequestInfo &);
-    
+
     void operator= (const RequestInfo &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   extern TAO_PI_Export ::CORBA::TypeCode_ptr const _tc_RequestInfo;
 
 // TAO_IDL - Generated from
@@ -323,7 +323,7 @@ namespace TAO
 
 #if !defined (_PORTABLEINTERCEPTOR_REQUESTINFO__TRAITS_CH_)
 #define _PORTABLEINTERCEPTOR_REQUESTINFO__TRAITS_CH_
-  
+
   template<>
   struct TAO_PI_Export Objref_Traits< ::PortableInterceptor::RequestInfo>
   {
diff --git a/TAO/tao/RequestInfo_Util.cpp b/TAO/tao/PI/RequestInfo_Util.cpp
index f4ba3e2fedc..191a30e51c4 100644
--- a/TAO/tao/RequestInfo_Util.cpp
+++ b/TAO/tao/PI/RequestInfo_Util.cpp
@@ -3,12 +3,14 @@
 // $Id$
 
 #include "RequestInfo_Util.h"
-#include "TypeCode.h"
-#include "ORB_Constants.h"
-#include "StringSeqC.h"
-#include "DynamicC.h"
-#include "SystemException.h"
 
+#if TAO_HAS_INTERCEPTORS == 1
+
+#include "tao/AnyTypeCode/TypeCode.h"
+#include "tao/AnyTypeCode/DynamicC.h"
+#include "tao/ORB_Constants.h"
+#include "tao/StringSeqC.h"
+#include "tao/SystemException.h"
 
 ACE_RCSID (tao,
            RequestInfo_Util,
@@ -105,3 +107,5 @@ TAO_RequestInfo_Util::make_any (CORBA::Boolean tk_void_any
 
   return any;
 }
+
+#endif
diff --git a/TAO/tao/RequestInfo_Util.h b/TAO/tao/PI/RequestInfo_Util.h
index bdf4278ed34..f32b1d8dc2f 100644
--- a/TAO/tao/RequestInfo_Util.h
+++ b/TAO/tao/PI/RequestInfo_Util.h
@@ -14,14 +14,19 @@
 #define TAO_REQUEST_INFO_UTIL_H
 
 #include /**/ "ace/pre.h"
-#include "ace/CORBA_macros.h"
+
+#include "tao/Basic_Types.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/Basic_Types.h"
-#include "tao/TAO_Export.h"
+#include "tao/orbconf.h"
+
+#if TAO_HAS_INTERCEPTORS == 1
+
+#include "ace/CORBA_macros.h"
+#include "pi_export.h"
 
 namespace CORBA
 {
@@ -45,7 +50,7 @@ namespace Dynamic
  * PortableInterceptor::ClientRequestInfo and
  * PortableInterceptor::ServerRequestInfo objects.
  */
-class TAO_Export TAO_RequestInfo_Util
+class TAO_PI_Export TAO_RequestInfo_Util
 {
 public:
 
@@ -75,6 +80,8 @@ public:
   //@}
 };
 
+#endif
+
 #include /**/ "ace/post.h"
 
 #endif /* TAO_REQUEST_INFO_UTIL_H */
diff --git a/TAO/tao/PI_ForwardC.cpp b/TAO/tao/PI_ForwardC.cpp
index 2887387a168..a077461b82b 100644
--- a/TAO/tao/PI_ForwardC.cpp
+++ b/TAO/tao/PI_ForwardC.cpp
@@ -32,10 +32,6 @@
 #include "PI_ForwardC.h"
 #include "tao/CDR.h"
 #include "tao/ORB_Core.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/String_TypeCode_Static.h"
 
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
@@ -49,163 +45,3 @@ namespace TAO
 {
 }
 
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_PortableInterceptor_ServerId (
-    CORBA::tk_alias,
-    "IDL:omg.org/PortableInterceptor/ServerId:1.0",
-    "ServerId",
-    &CORBA::_tc_string);
-  
-namespace PortableInterceptor
-{
-  ::CORBA::TypeCode_ptr const _tc_ServerId =
-    &_tao_tc_PortableInterceptor_ServerId;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_PortableInterceptor_ORBId (
-    CORBA::tk_alias,
-    "IDL:omg.org/PortableInterceptor/ORBId:1.0",
-    "ORBId",
-    &CORBA::_tc_string);
-  
-namespace PortableInterceptor
-{
-  ::CORBA::TypeCode_ptr const _tc_ORBId =
-    &_tao_tc_PortableInterceptor_ORBId;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_PortableInterceptor_AdapterName (
-    CORBA::tk_alias,
-    "IDL:omg.org/PortableInterceptor/AdapterName:1.0",
-    "AdapterName",
-    &CORBA::_tc_StringSeq);
-  
-namespace PortableInterceptor
-{
-  ::CORBA::TypeCode_ptr const _tc_AdapterName =
-    &_tao_tc_PortableInterceptor_AdapterName;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_PortableInterceptor_ObjectId (
-    CORBA::tk_alias,
-    "IDL:omg.org/PortableInterceptor/ObjectId:1.0",
-    "ObjectId",
-    &CORBA::_tc_OctetSeq);
-  
-namespace PortableInterceptor
-{
-  ::CORBA::TypeCode_ptr const _tc_ObjectId =
-    &_tao_tc_PortableInterceptor_ObjectId;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_PortableInterceptor_AdapterManagerId (
-    CORBA::tk_alias,
-    "IDL:omg.org/PortableInterceptor/AdapterManagerId:1.0",
-    "AdapterManagerId",
-    &CORBA::_tc_long);
-  
-namespace PortableInterceptor
-{
-  ::CORBA::TypeCode_ptr const _tc_AdapterManagerId =
-    &_tao_tc_PortableInterceptor_AdapterManagerId;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_PortableInterceptor_AdapterState (
-    CORBA::tk_alias,
-    "IDL:omg.org/PortableInterceptor/AdapterState:1.0",
-    "AdapterState",
-    &CORBA::_tc_short);
-  
-namespace PortableInterceptor
-{
-  ::CORBA::TypeCode_ptr const _tc_AdapterState =
-    &_tao_tc_PortableInterceptor_AdapterState;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_PortableInterceptor_SlotId (
-    CORBA::tk_alias,
-    "IDL:omg.org/PortableInterceptor/SlotId:1.0",
-    "SlotId",
-    &CORBA::_tc_ulong);
-  
-namespace PortableInterceptor
-{
-  ::CORBA::TypeCode_ptr const _tc_SlotId =
-    &_tao_tc_PortableInterceptor_SlotId;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_PortableInterceptor_ReplyStatus (
-    CORBA::tk_alias,
-    "IDL:omg.org/PortableInterceptor/ReplyStatus:1.0",
-    "ReplyStatus",
-    &CORBA::_tc_short);
-  
-namespace PortableInterceptor
-{
-  ::CORBA::TypeCode_ptr const _tc_ReplyStatus =
-    &_tao_tc_PortableInterceptor_ReplyStatus;
-}
-
-
diff --git a/TAO/tao/PI_ForwardC.h b/TAO/tao/PI_ForwardC.h
index 88c027c4e17..9738014449c 100644
--- a/TAO/tao/PI_ForwardC.h
+++ b/TAO/tao/PI_ForwardC.h
@@ -66,98 +66,58 @@
 
 namespace PortableInterceptor
 {
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typedef/typedef_ch.cpp:413
-  
+
   typedef char * ServerId;
   typedef CORBA::String_var ServerId_var;
   typedef CORBA::String_out ServerId_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ServerId;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typedef/typedef_ch.cpp:413
-  
+
   typedef char * ORBId;
   typedef CORBA::String_var ORBId_var;
   typedef CORBA::String_out ORBId_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ORBId;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typedef/typedef_ch.cpp:472
-  
+
   typedef CORBA::StringSeq AdapterName;
   typedef CORBA::StringSeq_var AdapterName_var;
   typedef CORBA::StringSeq_out AdapterName_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_AdapterName;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typedef/typedef_ch.cpp:472
-  
+
   typedef CORBA::OctetSeq ObjectId;
   typedef CORBA::OctetSeq_var ObjectId_var;
   typedef CORBA::OctetSeq_out ObjectId_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ObjectId;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typedef/typedef_ch.cpp:379
-  
+
   typedef CORBA::Long AdapterManagerId;
   typedef CORBA::Long_out AdapterManagerId_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_AdapterManagerId;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typedef/typedef_ch.cpp:379
-  
+
   typedef CORBA::Short AdapterState;
   typedef CORBA::Short_out AdapterState_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_AdapterState;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typedef/typedef_ch.cpp:379
-  
+
   typedef CORBA::ULong SlotId;
   typedef CORBA::ULong_out SlotId_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_SlotId;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typedef/typedef_ch.cpp:379
-  
+
   typedef CORBA::Short ReplyStatus;
   typedef CORBA::Short_out ReplyStatus_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ReplyStatus;
 
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:66
diff --git a/TAO/tao/PI_Server.mpc b/TAO/tao/PI_Server.mpc
index d57c1f89108..11aea476aeb 100644
--- a/TAO/tao/PI_Server.mpc
+++ b/TAO/tao/PI_Server.mpc
@@ -27,6 +27,9 @@ project : taolib, pi, portableserver, core {
     PI_Server
   }
 
+  IDL_Files {
+  }
+
   Pkgconfig_Files {
     PI_Server/TAO_PI_Server.pc.in
   }
diff --git a/TAO/tao/PortableServer/PICurrent_Guard.cpp b/TAO/tao/PI_Server/PICurrent_Guard.cpp
index b396f7d9e00..9aff070ca96 100644
--- a/TAO/tao/PortableServer/PICurrent_Guard.cpp
+++ b/TAO/tao/PI_Server/PICurrent_Guard.cpp
@@ -10,8 +10,9 @@ ACE_RCSID (PortableServer,
 
 #include "tao/ORB_Core.h"
 #include "tao/TAO_Server_Request.h"
-#include "tao/PICurrent_Copy_Callback.h"
-
+#include "tao/PI/PICurrent_Copy_Callback.h"
+#include "tao/PI/PICurrent.h"
+#include "tao/PI/PICurrent_Impl.h"
 
 TAO::PICurrent_Guard::PICurrent_Guard (TAO_ServerRequest &server_request,
                                        bool tsc_to_rsc)
@@ -23,14 +24,18 @@ TAO::PICurrent_Guard::PICurrent_Guard (TAO_ServerRequest &server_request,
   // This constructor is used on the server side.
 
   // Retrieve the thread scope current (no TSS access incurred yet).
-  PICurrent * pi_current = server_request.orb_core ()->pi_current ();
+  CORBA::Object_ptr pi_current_obj =
+    server_request.orb_core ()->pi_current ();
+
+  TAO::PICurrent *pi_current =
+    dynamic_cast <TAO::PICurrent*> (pi_current_obj);
 
   // If the slot count is zero, there is nothing to copy.  Prevent any
   // copying (and hence TSS accesses) from occurring.
   if (pi_current != 0 && pi_current->slot_count () != 0)
     {
       // Retrieve the request scope current.
-      PICurrent_Impl * rsc = &server_request.rs_pi_current ();
+      PICurrent_Impl * rsc = server_request.rs_pi_current ();
 
       // Retrieve the thread scope current.
       PICurrent_Impl * tsc = pi_current->tsc ();
@@ -71,8 +76,8 @@ TAO::PICurrent_Guard::~PICurrent_Guard (void)
       // necessary, if the thread scope current is modified after its
       // contents have been *logically* copied to the request scope
       // current.  The same goes for the reverse, i.e. RSC to TSC.
-      this->copy_callback_.src_and_dst (this->src_, this->dest_);
-      this->src_->copy_callback (&this->copy_callback_);
+      this->copy_callback_->src_and_dst (this->src_, this->dest_);
+      this->src_->copy_callback (this->copy_callback_);
     }
 }
 
diff --git a/TAO/tao/PortableServer/PICurrent_Guard.h b/TAO/tao/PI_Server/PICurrent_Guard.h
index c4340fdbbf1..6bbda8f3ec4 100644
--- a/TAO/tao/PortableServer/PICurrent_Guard.h
+++ b/TAO/tao/PI_Server/PICurrent_Guard.h
@@ -15,7 +15,7 @@
 
 #include /**/ "ace/pre.h"
 
-#include "portableserver_export.h"
+#include "pi_server_export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -46,7 +46,7 @@ namespace TAO
    *
    * @note This Guard class is only used on the server side.
    */
-  class TAO_PortableServer_Export PICurrent_Guard
+  class TAO_PI_Server_Export PICurrent_Guard
   {
   public:
 
@@ -78,15 +78,15 @@ namespace TAO
   private:
 
     /// The PICurrent implementation whose slot table will be copied.
-    PICurrent_Impl * src_;
+    PICurrent_Impl *src_;
 
     /// The PICurrent implementation whose slot table will be filled
     /// with the contents of another PICurrent's slot table.
-    PICurrent_Impl * dest_;
+    PICurrent_Impl *dest_;
 
     /// Callback object responsible for performing deep copies of a
     /// PICurrent's slot table.
-    PICurrent_Copy_Callback & copy_callback_;
+    PICurrent_Copy_Callback *copy_callback_;
 
     /// Flag that indicates if the TSC is to be copied to the RSC.
     /**
diff --git a/TAO/tao/PI_Server/PI_Server_include.pidl b/TAO/tao/PI_Server/PI_Server_include.pidl
new file mode 100644
index 00000000000..0b86cdf7238
--- /dev/null
+++ b/TAO/tao/PI_Server/PI_Server_include.pidl
@@ -0,0 +1,15 @@
+/**
+ * @file PI_Server_include.pidl
+ *
+ * $Id$
+ *
+ * @brief Include file for use in applications that need PI_Server.pidl.
+ */
+
+#ifndef _PORTABLESERVER_INCLUDE_IDL_
+#define _PORTABLESERVER_INCLUDE_IDL_
+
+///FUZZ: disable check_for_include/
+#include <tao/PI_Server/ServerRequestInterceptor.pidl>
+
+#endif /* _PORTABLESERVER_INCLUDE_IDL_ */
diff --git a/TAO/tao/PI_Server/PI_Server_includeA.h b/TAO/tao/PI_Server/PI_Server_includeA.h
new file mode 100644
index 00000000000..44c20559645
--- /dev/null
+++ b/TAO/tao/PI_Server/PI_Server_includeA.h
@@ -0,0 +1,44 @@
+// -*- C++ -*-
+//
+// $Id$
+
+// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       Irvine, CA
+//       USA
+//       http://doc.ece.uci.edu/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
+//
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
+
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:390
+
+#ifndef _TAO_IDL_ORIG_PI_SERVER_INCLUDEA_H_
+#define _TAO_IDL_ORIG_PI_SERVER_INCLUDEA_H_
+
+#include /**/ "ace/pre.h"
+
+#include "tao/PI_Server/PI_Server_includeC.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include /**/ "ace/post.h"
+#endif /* ifndef */
+
diff --git a/TAO/tao/AnySeqS.h b/TAO/tao/PI_Server/PI_Server_includeC.h
index 17b1360599e..2f941a52b2e 100644
--- a/TAO/tao/AnySeqS.h
+++ b/TAO/tao/PI_Server/PI_Server_includeC.h
@@ -25,4 +25,32 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-// Skeleton file generation suppressed with command line option -SS
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:153
+
+#ifndef _TAO_IDL_ORIG_PI_SERVER_INCLUDEC_H_
+#define _TAO_IDL_ORIG_PI_SERVER_INCLUDEC_H_
+
+#include /**/ "ace/pre.h"
+
+
+#include "ace/config-all.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "pi_server_export.h"
+
+#include "tao/PI_Server/ServerRequestInterceptorC.h"
+
+// TAO_IDL - Generated from
+// be\be_visitor_traits.cpp:61
+
+// Traits specializations.
+
+#include /**/ "ace/post.h"
+
+#endif /* ifndef */
+
+
diff --git a/TAO/tao/DynamicS.h b/TAO/tao/PI_Server/PI_Server_includeS.h
index 17b1360599e..dc5cdcf7c2b 100644
--- a/TAO/tao/DynamicS.h
+++ b/TAO/tao/PI_Server/PI_Server_includeS.h
@@ -25,4 +25,17 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-// Skeleton file generation suppressed with command line option -SS
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:390
+
+#ifndef _TAO_IDL_ORIG_PORTABLESERVER_INCLUDES_H_
+#define _TAO_IDL_ORIG_PORTABLESERVER_INCLUDES_H_
+
+#include /**/ "ace/pre.h"
+
+#include "tao/PI_Server/ServerRequestInterceptorS.h"
+#include "tao/PI_Server/PI_Server_includeC.h"
+
+#include /**/ "ace/post.h"
+#endif /* ifndef */
+
diff --git a/TAO/tao/PI_Server/POA_Current.cpp b/TAO/tao/PI_Server/POA_Current.cpp
index cf696518b9f..0a53d6802d9 100644
--- a/TAO/tao/PI_Server/POA_Current.cpp
+++ b/TAO/tao/PI_Server/POA_Current.cpp
@@ -63,14 +63,14 @@ namespace TAO
     POA_Current::implementation (void)
     {
       return static_cast <POA_Current_Impl *>
-                        (TAO_TSS_RESOURCES::instance ()->poa_current_impl_);
+                        (TAO_TSS_Resources::instance ()->poa_current_impl_);
     }
 
     POA_Current_Impl *
     POA_Current::implementation (POA_Current_Impl *new_current)
     {
       TAO_TSS_Resources *tss =
-        TAO_TSS_RESOURCES::instance ();
+        TAO_TSS_Resources::instance ();
 
       POA_Current_Impl *old =
         static_cast <POA_Current_Impl *>
diff --git a/TAO/tao/PI_Server/PS_CurrentA.cpp b/TAO/tao/PI_Server/PS_CurrentA.cpp
index fd0ff6f7c7e..05de30be3a2 100644
--- a/TAO/tao/PI_Server/PS_CurrentA.cpp
+++ b/TAO/tao/PI_Server/PS_CurrentA.cpp
@@ -26,16 +26,16 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "PS_CurrentC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
-#include "tao/Struct_TypeCode_Static.h"
-#include "tao/TypeCode_Struct_Field.h"
+#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Struct_TypeCode_Static.h"
+#include "tao/AnyTypeCode/TypeCode_Struct_Field.h"
 #include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
-#include "tao/Any_Dual_Impl_T.h"
+#include "tao/AnyTypeCode/Any.h"
+#include "tao/AnyTypeCode/Any_Impl_T.h"
+#include "tao/AnyTypeCode/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/struct_typecode.cpp:87
@@ -51,7 +51,7 @@ static TAO::TypeCode::Struct<char const *,
     "NoContext",
     _tao_fields_PortableServer_Current_NoContext,
     0);
-  
+
 ::CORBA::TypeCode_ptr const PortableServer::Current::_tc_NoContext =
   &_tao_tc_PortableServer_Current_NoContext;
 
@@ -64,7 +64,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:omg.org/PortableServer/Current:2.3",
     "Current");
-  
+
 namespace PortableServer
 {
   ::CORBA::TypeCode_ptr const _tc_Current =
@@ -97,7 +97,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Impl_T<PortableServer::Current>::demarshal_value (TAO_InputCDR &)
@@ -148,7 +148,7 @@ operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_exception/any_op_cs.cpp:50
 
 namespace TAO
@@ -159,7 +159,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Dual_Impl_T<PortableServer::Current::NoContext>::demarshal_value (TAO_InputCDR &)
diff --git a/TAO/tao/PI_Server/ServerInterceptorAdapter.cpp b/TAO/tao/PI_Server/ServerInterceptorAdapter.cpp
index 23b62c798b1..6355bda6942 100644
--- a/TAO/tao/PI_Server/ServerInterceptorAdapter.cpp
+++ b/TAO/tao/PI_Server/ServerInterceptorAdapter.cpp
@@ -9,12 +9,15 @@ ACE_RCSID (PortableServer,
            "$Id$")
 
 #include "ServerRequestInfo.h"
-#include "tao/PortableServer/PICurrent_Guard.h"
+#include "PICurrent_Guard.h"
 
 #include "tao/ServerRequestInterceptor_Adapter.h"
 #include "tao/TAO_Server_Request.h"
 #include "tao/ORB_Core.h"
-
+#include "tao/PI/PICurrent_Impl.h"
+#include "tao/PI/PICurrent_Copy_Callback.h"
+#include "tao/PortableServer/Upcall_Command.h"
+#include "tao/PortableInterceptor.h"
 
 TAO::ServerRequestInterceptor_Adapter_Impl::ServerRequestInterceptor_Adapter_Impl (void)
 {
@@ -231,6 +234,9 @@ TAO::ServerRequestInterceptor_Adapter_Impl::receive_request (
                                        exceptions,
                                        nexceptions);
 
+  TAO::PICurrent_Guard pi_guard (server_request,
+                                 true  /* Copy TSC to RSC */);
+
   ACE_TRY
     {
       for (size_t i = 0; i < server_request.interceptor_count (); ++i)
@@ -478,4 +484,53 @@ TAO::ServerRequestInterceptor_Adapter_Impl::destroy_interceptors (
   this->interceptor_list_.destroy_interceptors (ACE_ENV_SINGLE_ARG_PARAMETER);
 }
 
+TAO::PICurrent_Impl *
+TAO::ServerRequestInterceptor_Adapter_Impl::allocate_pi_current (void)
+{
+  TAO::PICurrent_Impl *pi = 0;
+  ACE_NEW_RETURN (pi,
+                  TAO::PICurrent_Impl,
+                  0);
+  return pi;
+}
+
+TAO::PICurrent_Copy_Callback *
+TAO::ServerRequestInterceptor_Adapter_Impl::allocate_pi_current_callback (void)
+{
+  TAO::PICurrent_Copy_Callback *pi = 0;
+  ACE_NEW_RETURN (pi,
+                  TAO::PICurrent_Copy_Callback,
+                  0);
+  return pi;
+}
+
+void
+TAO::ServerRequestInterceptor_Adapter_Impl::deallocate_pi_current (
+        TAO::PICurrent_Impl *picurrent)
+{
+  delete picurrent;
+}
+
+void
+TAO::ServerRequestInterceptor_Adapter_Impl::deallocate_pi_current_callback (
+  TAO::PICurrent_Copy_Callback *callback)
+{
+  delete callback;
+}
+
+void
+TAO::ServerRequestInterceptor_Adapter_Impl::execute_command (
+  TAO_ServerRequest &server_request,
+  TAO::Upcall_Command &command
+  ACE_ENV_ARG_DECL)
+{
+  TAO::PICurrent_Guard pi_guard (server_request,
+                                 true  /* Copy TSC to RSC */);
+
+  // The actual upcall.
+  command.execute (ACE_ENV_SINGLE_ARG_PARAMETER);
+  ACE_CHECK;
+}
+
+
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
diff --git a/TAO/tao/PI_Server/ServerInterceptorAdapter.h b/TAO/tao/PI_Server/ServerInterceptorAdapter.h
index 97be061c7ef..1cf01b210f3 100644
--- a/TAO/tao/PI_Server/ServerInterceptorAdapter.h
+++ b/TAO/tao/PI_Server/ServerInterceptorAdapter.h
@@ -154,6 +154,22 @@ namespace TAO
 
     virtual void destroy_interceptors (ACE_ENV_SINGLE_ARG_DECL);
 
+    virtual TAO::PICurrent_Impl *allocate_pi_current (void);
+
+    virtual TAO::PICurrent_Copy_Callback *
+        allocate_pi_current_callback (void);
+
+    virtual void deallocate_pi_current (
+        TAO::PICurrent_Impl *picurrent);
+
+    virtual void deallocate_pi_current_callback (
+        TAO::PICurrent_Copy_Callback *callback);
+
+    virtual void execute_command (
+        TAO_ServerRequest &server_request,
+        TAO::Upcall_Command &command
+        ACE_ENV_ARG_DECL);
+
   private:
 
     /// List of registered interceptors.
diff --git a/TAO/tao/PI_Server/ServerRequestInfo.cpp b/TAO/tao/PI_Server/ServerRequestInfo.cpp
index 33c9d149cc1..2b613ec3738 100644
--- a/TAO/tao/PI_Server/ServerRequestInfo.cpp
+++ b/TAO/tao/PI_Server/ServerRequestInfo.cpp
@@ -15,10 +15,13 @@ ACE_RCSID (PortableServer,
 #include "tao/TAO_Server_Request.h"
 #include "tao/ORB_Core.h"
 #include "tao/PolicyC.h"
-#include "tao/DynamicC.h"
+#include "tao/AnyTypeCode/DynamicC.h"
 #include "tao/ORB_Core.h"
 #include "tao/Service_Context.h"
-#include "tao/RequestInfo_Util.h"
+#include "tao/PI/RequestInfo_Util.h"
+#include "tao/PI/PICurrent.h"
+#include "tao/PI/PICurrent_Impl.h"
+#include "tao/AnyTypeCode/ExceptionA.h"
 
 #include "ace/OS_NS_string.h"
 
@@ -107,7 +110,9 @@ TAO::ServerRequestInfo::arguments (ACE_ENV_SINGLE_ARG_DECL)
     {
       // Insert the operation parameters into the
       // Dynamic::ParameterList.
-      (*i)->interceptor_param ((*parameter_list)[p]);
+      Dynamic::Parameter& parameter = (*parameter_list)[p];
+      parameter.mode = (*i)->mode ();
+      (*i)->interceptor_value (&parameter.argument);
     }
 
   return safe_parameter_list._retn ();
@@ -191,7 +196,7 @@ TAO::ServerRequestInfo::result (ACE_ENV_SINGLE_ARG_DECL)
   // Result is always first element in TAO::Argument array.
   TAO::Argument * const r = this->args_[0];
 
-  r->interceptor_result (result_any);
+  r->interceptor_value (result_any);
 
   return safe_result_any._retn ();
 }
@@ -250,9 +255,12 @@ TAO::ServerRequestInfo::get_slot (PortableInterceptor::SlotId id
 {
   // Retrieve the total number of assigned slots from the PICurrent.
   // No TSS access is incurred.
-  TAO::PICurrent * pi_current =
+  CORBA::Object_ptr pi_current_obj =
     this->server_request_.orb_core ()->pi_current ();
 
+  TAO::PICurrent *pi_current =
+    dynamic_cast <TAO::PICurrent*> (pi_current_obj);
+
   if (pi_current == 0)
     ACE_THROW_RETURN (CORBA::INTERNAL (), 0);
 
@@ -260,9 +268,9 @@ TAO::ServerRequestInfo::get_slot (PortableInterceptor::SlotId id
   ACE_CHECK_RETURN (0);
 
   // Retrieve the request scope PICurrent object.
-  TAO::PICurrent_Impl &rsc = this->server_request_.rs_pi_current ();
+  TAO::PICurrent_Impl *rsc = this->server_request_.rs_pi_current ();
 
-  return rsc.get_slot (id ACE_ENV_ARG_PARAMETER);
+  return rsc->get_slot (id ACE_ENV_ARG_PARAMETER);
 
 }
 
@@ -517,9 +525,12 @@ TAO::ServerRequestInfo::set_slot (PortableInterceptor::SlotId id,
 {
   // Retrieve the total number of assigned slots from the PICurrent
   // object.  No TSS access is incurred.
-  TAO::PICurrent * pi_current =
+  CORBA::Object_ptr pi_current_obj =
     this->server_request_.orb_core ()->pi_current ();
 
+  TAO::PICurrent *pi_current =
+    dynamic_cast <TAO::PICurrent*> (pi_current_obj);
+
   if (pi_current == 0)
     ACE_THROW (CORBA::INTERNAL ());
 
@@ -527,9 +538,9 @@ TAO::ServerRequestInfo::set_slot (PortableInterceptor::SlotId id,
   ACE_CHECK;
 
   // Retrieve the "request scope current" (RSC).
-  TAO::PICurrent_Impl & rsc = this->server_request_.rs_pi_current ();
+  TAO::PICurrent_Impl * rsc = this->server_request_.rs_pi_current ();
 
-  rsc.set_slot (id, data ACE_ENV_ARG_PARAMETER);
+  rsc->set_slot (id, data ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
diff --git a/TAO/tao/PI_Server/ServerRequestInfoA.cpp b/TAO/tao/PI_Server/ServerRequestInfoA.cpp
index b97a8646554..1dc8ac2a761 100644
--- a/TAO/tao/PI_Server/ServerRequestInfoA.cpp
+++ b/TAO/tao/PI_Server/ServerRequestInfoA.cpp
@@ -26,14 +26,14 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "ServerRequestInfoC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
-#include "tao/String_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
+#include "tao/AnyTypeCode/String_TypeCode_Static.h"
 #include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
+#include "tao/AnyTypeCode/Any.h"
+#include "tao/AnyTypeCode/Any_Impl_T.h"
 
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/objref_typecode.cpp:76
@@ -44,7 +44,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:omg.org/PortableInterceptor/ServerRequestInfo:1.0",
     "ServerRequestInfo");
-  
+
 namespace PortableInterceptor
 {
   ::CORBA::TypeCode_ptr const _tc_ServerRequestInfo =
@@ -77,7 +77,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Impl_T<PortableInterceptor::ServerRequestInfo>::demarshal_value (TAO_InputCDR &)
diff --git a/TAO/tao/PI_Server/ServerRequestInfoC.h b/TAO/tao/PI_Server/ServerRequestInfoC.h
index 99849c7b129..ef918d43a45 100644
--- a/TAO/tao/PI_Server/ServerRequestInfoC.h
+++ b/TAO/tao/PI_Server/ServerRequestInfoC.h
@@ -45,9 +45,9 @@
 #include "tao/SystemException.h"
 #include "tao/Environment.h"
 #include "tao/Object.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Any.h"
-#include "tao/TypeCode.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Any.h"
+#include "tao/AnyTypeCode/TypeCode.h"
 #include "tao/Objref_VarOut_T.h"
 
 #include "tao/PI/RequestInfoC.h"
@@ -201,10 +201,10 @@ namespace PortableInterceptor
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::Policy_ptr get_server_policy (
         ::CORBA::PolicyType type
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -212,10 +212,10 @@ namespace PortableInterceptor
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void set_slot (
         ::PortableInterceptor::SlotId id,
         const ::CORBA::Any & data
@@ -225,10 +225,10 @@ namespace PortableInterceptor
         CORBA::SystemException,
         ::PortableInterceptor::InvalidSlot
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::Boolean target_is_a (
         const char * id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -236,10 +236,10 @@ namespace PortableInterceptor
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void add_reply_service_context (
         const ::IOP::ServiceContext & service_context,
         ::CORBA::Boolean replace
@@ -248,36 +248,36 @@ namespace PortableInterceptor
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
-    
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
+
   protected:
     // Abstract or local interface only.
     ServerRequestInfo (void);
-    
+
     virtual ~ServerRequestInfo (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     ServerRequestInfo (const ServerRequestInfo &);
-    
+
     void operator= (const ServerRequestInfo &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   extern TAO_PI_Server_Export ::CORBA::TypeCode_ptr const _tc_ServerRequestInfo;
 
 // TAO_IDL - Generated from
@@ -294,7 +294,7 @@ namespace TAO
 
 #if !defined (_PORTABLEINTERCEPTOR_SERVERREQUESTINFO__TRAITS_CH_)
 #define _PORTABLEINTERCEPTOR_SERVERREQUESTINFO__TRAITS_CH_
-  
+
   template<>
   struct TAO_PI_Server_Export Objref_Traits< ::PortableInterceptor::ServerRequestInfo>
   {
diff --git a/TAO/tao/PI_Server/ServerRequestInterceptorA.cpp b/TAO/tao/PI_Server/ServerRequestInterceptorA.cpp
index 7ff84e2a730..58a08ac8132 100644
--- a/TAO/tao/PI_Server/ServerRequestInterceptorA.cpp
+++ b/TAO/tao/PI_Server/ServerRequestInterceptorA.cpp
@@ -26,14 +26,14 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "ServerRequestInterceptorC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
-#include "tao/String_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
+#include "tao/AnyTypeCode/String_TypeCode_Static.h"
 #include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
+#include "tao/AnyTypeCode/Any.h"
+#include "tao/AnyTypeCode/Any_Impl_T.h"
 
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/objref_typecode.cpp:76
@@ -44,7 +44,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:omg.org/PortableInterceptor/ServerRequestInterceptor:1.0",
     "ServerRequestInterceptor");
-  
+
 namespace PortableInterceptor
 {
   ::CORBA::TypeCode_ptr const _tc_ServerRequestInterceptor =
@@ -77,7 +77,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Impl_T<PortableInterceptor::ServerRequestInterceptor>::demarshal_value (TAO_InputCDR &)
diff --git a/TAO/tao/ParameterModeA.cpp b/TAO/tao/ParameterModeA.cpp
deleted file mode 100644
index 7014fcef47a..00000000000
--- a/TAO/tao/ParameterModeA.cpp
+++ /dev/null
@@ -1,91 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "ParameterModeC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Enum_TypeCode_Static.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Basic_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/enum_typecode.cpp:34
-
-static char const * const _tao_enumerators_CORBA_ParameterMode[] =
-  {
-    "PARAM_IN",
-    "PARAM_OUT",
-    "PARAM_INOUT"
-    
-  };
-
-static TAO::TypeCode::Enum<char const *,
-                           char const * const *,
-                           TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ParameterMode (
-    "IDL:omg.org/CORBA/ParameterMode:1.0",
-    "ParameterMode",
-    _tao_enumerators_CORBA_ParameterMode,
-    3);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ParameterMode =
-    &_tao_tc_CORBA_ParameterMode;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_enum/any_op_cs.cpp:52
-
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ParameterMode _tao_elem
-  )
-{
-  TAO::Any_Basic_Impl_T<CORBA::ParameterMode>::insert (
-      _tao_any,
-      CORBA::_tc_ParameterMode,
-      _tao_elem
-    );
-}
-
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ParameterMode &_tao_elem
-  )
-{
-  return
-    TAO::Any_Basic_Impl_T<CORBA::ParameterMode>::extract (
-        _tao_any,
-        CORBA::_tc_ParameterMode,
-        _tao_elem 
-      );
-}
diff --git a/TAO/tao/ParameterModeC.h b/TAO/tao/ParameterModeC.h
index 8f03c9dcb15..641439da90d 100644
--- a/TAO/tao/ParameterModeC.h
+++ b/TAO/tao/ParameterModeC.h
@@ -63,23 +63,18 @@
 
 namespace CORBA
 {
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_enum/enum_ch.cpp:57
-  
+
   enum ParameterMode
   {
     PARAM_IN,
     PARAM_OUT,
     PARAM_INOUT
   };
-  
+
   typedef ParameterMode &ParameterMode_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ParameterMode;
 
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:66
@@ -95,12 +90,6 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_enum/any_op_ch.cpp:51
-
-TAO_Export void operator<<= (CORBA::Any &, CORBA::ParameterMode);
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ParameterMode &);
-
-// TAO_IDL - Generated from
 // be\be_visitor_enum/cdr_op_ch.cpp:50
 
 TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, CORBA::ParameterMode);
diff --git a/TAO/tao/PolicyA.cpp b/TAO/tao/PolicyA.cpp
deleted file mode 100644
index 67be5692475..00000000000
--- a/TAO/tao/PolicyA.cpp
+++ /dev/null
@@ -1,555 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "PolicyC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
-#include "tao/Struct_TypeCode_Static.h"
-#include "tao/TypeCode_Struct_Field.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
-#include "tao/Any_Dual_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_PolicyErrorCode (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/PolicyErrorCode:1.0",
-    "PolicyErrorCode",
-    &CORBA::_tc_short);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_PolicyErrorCode =
-    &_tao_tc_CORBA_PolicyErrorCode;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/struct_typecode.cpp:87
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_PolicyError[] =
-  {
-    { "reason", &CORBA::_tc_PolicyErrorCode }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                      CORBA::TypeCode_ptr const *,
-                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
-                      TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_PolicyError (
-    CORBA::tk_except,
-    "IDL:omg.org/CORBA/PolicyError:1.0",
-    "PolicyError",
-    _tao_fields_CORBA_PolicyError,
-    1);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_PolicyError =
-    &_tao_tc_CORBA_PolicyError;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/struct_typecode.cpp:87
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:937
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_InvalidPolicies[] =
-  {
-    { "indices", &CORBA::_tc_UShortSeq }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                      CORBA::TypeCode_ptr const *,
-                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
-                      TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_InvalidPolicies (
-    CORBA::tk_except,
-    "IDL:omg.org/CORBA/InvalidPolicies:1.0",
-    "InvalidPolicies",
-    _tao_fields_CORBA_InvalidPolicies,
-    1);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_InvalidPolicies =
-    &_tao_tc_CORBA_InvalidPolicies;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_Policy (
-    CORBA::tk_objref,
-    "IDL:omg.org/CORBA/Policy:1.0",
-    "Policy");
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_Policy =
-    &_tao_tc_CORBA_Policy;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_PolicyManager (
-    CORBA::tk_local_interface,
-    "IDL:omg.org/CORBA/PolicyManager:1.0",
-    "PolicyManager");
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_PolicyManager =
-    &_tao_tc_CORBA_PolicyManager;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_PolicyCurrent (
-    CORBA::tk_local_interface,
-    "IDL:omg.org/CORBA/PolicyCurrent:1.0",
-    "PolicyCurrent");
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_PolicyCurrent =
-    &_tao_tc_CORBA_PolicyCurrent;
-}
-
-
-
-// TAO_IDL - Generated from 
-// be\be_visitor_exception/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Dual_Impl_T<CORBA::PolicyError>::demarshal_value (
-      TAO_InputCDR & cdr
-    )
-  {
-    CORBA::String_var id;
-    
-    if (!(cdr >> id.out ()))
-      {
-        return false;
-      }
-    
-    ACE_TRY_NEW_ENV
-      {
-        this->value_->_tao_decode (cdr ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-      }
-    ACE_CATCHANY
-      {
-        return false;
-      }
-    ACE_ENDTRY;
-    
-    return true;
-  }
-}
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::PolicyError &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::PolicyError>::insert_copy (
-      _tao_any,
-      CORBA::PolicyError::_tao_any_destructor,
-      CORBA::_tc_PolicyError,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::PolicyError *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::PolicyError>::insert (
-      _tao_any,
-      CORBA::PolicyError::_tao_any_destructor,
-      CORBA::_tc_PolicyError,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::PolicyError *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::PolicyError *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::PolicyError *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::PolicyError>::extract (
-        _tao_any,
-        CORBA::PolicyError::_tao_any_destructor,
-        CORBA::_tc_PolicyError,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_exception/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Dual_Impl_T<CORBA::InvalidPolicies>::demarshal_value (
-      TAO_InputCDR & cdr
-    )
-  {
-    CORBA::String_var id;
-    
-    if (!(cdr >> id.out ()))
-      {
-        return false;
-      }
-    
-    ACE_TRY_NEW_ENV
-      {
-        this->value_->_tao_decode (cdr ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-      }
-    ACE_CATCHANY
-      {
-        return false;
-      }
-    ACE_ENDTRY;
-    
-    return true;
-  }
-}
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::InvalidPolicies &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::InvalidPolicies>::insert_copy (
-      _tao_any,
-      CORBA::InvalidPolicies::_tao_any_destructor,
-      CORBA::_tc_InvalidPolicies,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::InvalidPolicies *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::InvalidPolicies>::insert (
-      _tao_any,
-      CORBA::InvalidPolicies::_tao_any_destructor,
-      CORBA::_tc_InvalidPolicies,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::InvalidPolicies *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::InvalidPolicies *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::InvalidPolicies *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::InvalidPolicies>::extract (
-        _tao_any,
-        CORBA::InvalidPolicies::_tao_any_destructor,
-        CORBA::_tc_InvalidPolicies,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::Policy>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::Policy_ptr _tao_elem
-  )
-{
-  CORBA::Policy_ptr _tao_objptr =
-    CORBA::Policy::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::Policy_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::Policy>::insert (
-      _tao_any,
-      CORBA::Policy::_tao_any_destructor,
-      CORBA::_tc_Policy,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::Policy_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::Policy>::extract (
-        _tao_any,
-        CORBA::Policy::_tao_any_destructor,
-        CORBA::_tc_Policy,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::PolicyManager>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::PolicyManager>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-  
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::PolicyManager>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::PolicyManager_ptr _tao_elem
-  )
-{
-  CORBA::PolicyManager_ptr _tao_objptr =
-    CORBA::PolicyManager::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::PolicyManager_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::PolicyManager>::insert (
-      _tao_any,
-      CORBA::PolicyManager::_tao_any_destructor,
-      CORBA::_tc_PolicyManager,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::PolicyManager_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::PolicyManager>::extract (
-        _tao_any,
-        CORBA::PolicyManager::_tao_any_destructor,
-        CORBA::_tc_PolicyManager,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::PolicyCurrent>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::PolicyCurrent>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-  
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<CORBA::PolicyCurrent>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::PolicyCurrent_ptr _tao_elem
-  )
-{
-  CORBA::PolicyCurrent_ptr _tao_objptr =
-    CORBA::PolicyCurrent::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::PolicyCurrent_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<CORBA::PolicyCurrent>::insert (
-      _tao_any,
-      CORBA::PolicyCurrent::_tao_any_destructor,
-      CORBA::_tc_PolicyCurrent,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::PolicyCurrent_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<CORBA::PolicyCurrent>::extract (
-        _tao_any,
-        CORBA::PolicyCurrent::_tao_any_destructor,
-        CORBA::_tc_PolicyCurrent,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/PolicyC.cpp b/TAO/tao/PolicyC.cpp
index 7d0b9432492..606c217d2bf 100644
--- a/TAO/tao/PolicyC.cpp
+++ b/TAO/tao/PolicyC.cpp
@@ -31,12 +31,13 @@
 
 #include "PolicyC.h"
 #include "tao/CDR.h"
-#include "tao/Exception_Data.h"
 #include "tao/Invocation_Adapter.h"
 #include "tao/Object_T.h"
 #include "tao/Basic_Arguments.h"
 #include "tao/Object_Argument_T.h"
 #include "ace/OS_NS_string.h"
+#include "tao/AnyTypeCode_Adapter.h"
+#include "ace/Dynamic_Service.h"
 
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
@@ -49,13 +50,31 @@
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
+// TAO specific stuff.
+namespace CORBA
+{
+  class Policy;
+  typedef Policy *Policy_ptr;
+  typedef TAO_Objref_Var_T<Policy> Policy_var;
+  typedef TAO_Objref_Out_T<Policy> Policy_out;
+}
+
+namespace TAO
+{
+
+#if TAO_HAS_INTERCEPTORS == 1
+
+#endif /* TAO_HAS_INTERCEPTORS */
+
+}
+
 // Arg traits specializations.
 namespace TAO
 {
 
 #if !defined (_CORBA_POLICY__ARG_TRAITS_CS_)
 #define _CORBA_POLICY__ARG_TRAITS_CS_
-  
+
   template<>
   class  Arg_Traits<CORBA::Policy>
     : public
@@ -63,7 +82,8 @@ namespace TAO
             CORBA::Policy_ptr,
             CORBA::Policy_var,
             CORBA::Policy_out,
-            TAO::Objref_Traits<CORBA::Policy>
+            TAO::Objref_Traits<CORBA::Policy>,
+            TAO::Any_Insert_Policy_AnyTypeCode_Adapter <CORBA::Policy_ptr>
           >
   {
   };
@@ -72,7 +92,7 @@ namespace TAO
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_exception/exception_cs.cpp:63
 
 CORBA::PolicyError::PolicyError (void)
@@ -156,7 +176,7 @@ void CORBA::PolicyError::_tao_encode (
     {
       return;
     }
-  
+
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -169,7 +189,7 @@ void CORBA::PolicyError::_tao_decode (
     {
       return;
     }
-  
+
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -192,10 +212,23 @@ CORBA::PolicyError::PolicyError (
 // TAO extension - the virtual _type method.
 CORBA::TypeCode_ptr CORBA::PolicyError::_tao_type (void) const
 {
-  return ::CORBA::_tc_PolicyError;
+  TAO_AnyTypeCode_Adapter *adapter =
+    ACE_Dynamic_Service<TAO_AnyTypeCode_Adapter>::instance (
+        "AnyTypeCode_Adapter"
+      );
+  if (adapter != 0)
+    return adapter->_tao_type_PolicyError ();
+  else
+    {
+      ACE_ERROR ((LM_ERROR,
+                  ACE_TEXT ("(%P|%t) %p\n"),
+                  ACE_TEXT ("Unable to find the ")
+                  ACE_TEXT ("AnyTypeCode Adapter instance")));
+      return 0;
+    }
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_exception/exception_cs.cpp:63
 
 CORBA::InvalidPolicies::InvalidPolicies (void)
@@ -279,7 +312,7 @@ void CORBA::InvalidPolicies::_tao_encode (
     {
       return;
     }
-  
+
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -292,7 +325,7 @@ void CORBA::InvalidPolicies::_tao_decode (
     {
       return;
     }
-  
+
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -315,7 +348,20 @@ CORBA::InvalidPolicies::InvalidPolicies (
 // TAO extension - the virtual _type method.
 CORBA::TypeCode_ptr CORBA::InvalidPolicies::_tao_type (void) const
 {
-  return ::CORBA::_tc_InvalidPolicies;
+  TAO_AnyTypeCode_Adapter *adapter =
+    ACE_Dynamic_Service<TAO_AnyTypeCode_Adapter>::instance (
+        "AnyTypeCode_Adapter"
+      );
+  if (adapter != 0)
+    return adapter->_tao_type_InvalidPolicies ();
+  else
+    {
+      ACE_ERROR ((LM_ERROR,
+                  ACE_TEXT ("(%P|%t) %p\n"),
+                  ACE_TEXT ("Unable to find the ")
+                  ACE_TEXT ("AnyTypeCode Adapter instance")));
+      return 0;
+    }
 }
 
 // TAO_IDL - Generated from
@@ -355,7 +401,7 @@ TAO::Objref_Traits<CORBA::Policy>::marshal (
 }
 
 // Function pointer for collocation factory initialization.
-TAO::Collocation_Proxy_Broker * 
+TAO::Collocation_Proxy_Broker *
 (*CORBA__TAO_Policy_Proxy_Broker_Factory_function_pointer) (
     CORBA::Object_ptr obj
   ) = 0;
@@ -374,19 +420,19 @@ CORBA::PolicyType CORBA::Policy::policy_type (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_Policy_Proxy_Broker_ == 0)
     {
       CORBA_Policy_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< ::CORBA::PolicyType>::ret_val _tao_retval;
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -395,10 +441,10 @@ CORBA::PolicyType CORBA::Policy::policy_type (
       16,
       this->the_TAO_Policy_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -416,19 +462,19 @@ CORBA::PolicyType CORBA::Policy::policy_type (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_Policy_Proxy_Broker_ == 0)
     {
       CORBA_Policy_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< ::CORBA::Policy>::ret_val _tao_retval;
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -437,10 +483,10 @@ CORBA::PolicyType CORBA::Policy::policy_type (
       4,
       this->the_TAO_Policy_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (_tao_retval.excp ());
-  
+
   return _tao_retval.retn ();
 }
 
@@ -458,19 +504,19 @@ void CORBA::Policy::destroy (
     {
       ACE_NESTED_CLASS (CORBA, Object)::tao_object_initialize (this);
     }
-  
+
   if (this->the_TAO_Policy_Proxy_Broker_ == 0)
     {
       CORBA_Policy_setup_collocation ();
     }
-  
+
   TAO::Arg_Traits< void>::ret_val _tao_retval;
-  
+
   TAO::Argument *_the_tao_operation_signature [] =
     {
       &_tao_retval
     };
-  
+
   TAO::Invocation_Adapter _tao_call (
       this,
       _the_tao_operation_signature,
@@ -479,7 +525,7 @@ void CORBA::Policy::destroy (
       7,
       this->the_TAO_Policy_Proxy_Broker_
     );
-  
+
   _tao_call.invoke (0, 0 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
@@ -503,7 +549,7 @@ CORBA::Policy::CORBA_Policy_setup_collocation ()
 CORBA::Policy::~Policy (void)
 {}
 
-void 
+void
 CORBA::Policy::_tao_any_destructor (void *_tao_void_pointer)
 {
   Policy *_tao_tmp_pointer =
@@ -548,7 +594,7 @@ CORBA::Policy::_duplicate (Policy_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -639,7 +685,7 @@ CORBA::PolicyManager::PolicyManager (void)
 CORBA::PolicyManager::~PolicyManager (void)
 {}
 
-void 
+void
 CORBA::PolicyManager::_tao_any_destructor (void *_tao_void_pointer)
 {
   PolicyManager *_tao_tmp_pointer =
@@ -676,7 +722,7 @@ CORBA::PolicyManager::_duplicate (PolicyManager_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -768,7 +814,7 @@ CORBA::PolicyCurrent::PolicyCurrent (void)
 CORBA::PolicyCurrent::~PolicyCurrent (void)
 {}
 
-void 
+void
 CORBA::PolicyCurrent::_tao_any_destructor (void *_tao_void_pointer)
 {
   PolicyCurrent *_tao_tmp_pointer =
@@ -805,7 +851,7 @@ CORBA::PolicyCurrent::_duplicate (PolicyCurrent_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
@@ -975,20 +1021,20 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::Object_var obj;
-  
+
   if (!(strm >> obj.inout ()))
     {
       return false;
     }
-  
+
   typedef ::CORBA::Policy RHS_SCOPED_NAME;
-  
+
   // Narrow to the right type.
   _tao_objref =
     TAO::Narrow_Utils<RHS_SCOPED_NAME>::unchecked_narrow (
         obj.in (),
         CORBA__TAO_Policy_Proxy_Broker_Factory_function_pointer
       );
-    
+
   return 1;
 }
diff --git a/TAO/tao/PolicyC.h b/TAO/tao/PolicyC.h
index 6c04ac532f1..3346c12a828 100644
--- a/TAO/tao/PolicyC.h
+++ b/TAO/tao/PolicyC.h
@@ -65,7 +65,7 @@
 #pragma option push -w-rvl -w-rch -w-ccc -w-inl
 #endif /* __BORLANDC__ */
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_root/root_ch.cpp:62
 
 namespace TAO
@@ -79,67 +79,62 @@ namespace TAO
 
 namespace CORBA
 {
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typedef/typedef_ch.cpp:379
-  
+
   typedef CORBA::Short PolicyErrorCode;
   typedef CORBA::Short_out PolicyErrorCode_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_PolicyErrorCode;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-  
+
   const CORBA::PolicyErrorCode BAD_POLICY = 0;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-  
+
   const CORBA::PolicyErrorCode UNSUPPORTED_POLICY = 1;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-  
+
   const CORBA::PolicyErrorCode BAD_POLICY_TYPE = 2;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-  
+
   const CORBA::PolicyErrorCode BAD_POLICY_VALUE = 3;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-  
+
   const CORBA::PolicyErrorCode UNSUPPORTED_POLICY_VALUE = 4;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_exception/exception_ch.cpp:53
 
 #if !defined (_CORBA_POLICYERROR_CH_)
 #define _CORBA_POLICYERROR_CH_
-  
+
   class TAO_Export PolicyError : public CORBA::UserException
   {
   public:
-    
+
     CORBA::PolicyErrorCode reason;
     PolicyError (void);
     PolicyError (const PolicyError &);
     ~PolicyError (void);
 
     PolicyError &operator= (const PolicyError &);
-    
+
     static void _tao_any_destructor (void *);
-    
+
     static PolicyError *_downcast (CORBA::Exception *);
     static const PolicyError *_downcast (CORBA::Exception const *);
-    
+
     static CORBA::Exception *_alloc (void);
-    
+
     virtual CORBA::Exception *_tao_duplicate (void) const;
 
     virtual void _raise (void) const;
@@ -148,56 +143,51 @@ namespace CORBA
         TAO_OutputCDR &
         ACE_ENV_ARG_DECL
       ) const;
-    
+
     virtual void _tao_decode (
         TAO_InputCDR &
         ACE_ENV_ARG_DECL
       );
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_exception/exception_ctor.cpp:66
-    
+
     PolicyError (
         ACE_NESTED_CLASS (CORBA, PolicyErrorCode) _tao_reason
       );
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_exception/exception_ch.cpp:129
-    
+
     virtual CORBA::TypeCode_ptr _tao_type (void) const;
   };
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_PolicyError;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_exception/exception_ch.cpp:53
 
 #if !defined (_CORBA_INVALIDPOLICIES_CH_)
 #define _CORBA_INVALIDPOLICIES_CH_
-  
+
   class TAO_Export InvalidPolicies : public CORBA::UserException
   {
   public:
-    
+
     CORBA::UShortSeq indices;
     InvalidPolicies (void);
     InvalidPolicies (const InvalidPolicies &);
     ~InvalidPolicies (void);
 
     InvalidPolicies &operator= (const InvalidPolicies &);
-    
+
     static void _tao_any_destructor (void *);
-    
+
     static InvalidPolicies *_downcast (CORBA::Exception *);
     static const InvalidPolicies *_downcast (CORBA::Exception const *);
-    
+
     static CORBA::Exception *_alloc (void);
-    
+
     virtual CORBA::Exception *_tao_duplicate (void) const;
 
     virtual void _raise (void) const;
@@ -206,47 +196,42 @@ namespace CORBA
         TAO_OutputCDR &
         ACE_ENV_ARG_DECL
       ) const;
-    
+
     virtual void _tao_decode (
         TAO_InputCDR &
         ACE_ENV_ARG_DECL
       );
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_exception/exception_ctor.cpp:66
-    
+
     InvalidPolicies (
         const ACE_NESTED_CLASS (CORBA, UShortSeq) & _tao_indices
       );
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_exception/exception_ch.cpp:129
-    
+
     virtual CORBA::TypeCode_ptr _tao_type (void) const;
   };
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_InvalidPolicies;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_CORBA_POLICY__VAR_OUT_CH_)
 #define _CORBA_POLICY__VAR_OUT_CH_
-  
+
   class Policy;
   typedef Policy *Policy_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         Policy
       >
     Policy_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         Policy
@@ -254,13 +239,13 @@ namespace CORBA
     Policy_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_POLICY_CH_)
 #define _CORBA_POLICY_CH_
-  
+
   class TAO_Export Policy
     : public virtual CORBA::Object
   {
@@ -268,67 +253,67 @@ namespace CORBA
     friend class TAO::Narrow_Utils<Policy>;
     typedef Policy_ptr _ptr_type;
     typedef Policy_var _var_type;
-    
+
     // The static operations.
     static Policy_ptr _duplicate (Policy_ptr obj);
-    
+
     static void _tao_release (Policy_ptr obj);
-    
+
     static Policy_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static Policy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static Policy_ptr _nil (void)
     {
       return static_cast<Policy_ptr> (0);
     }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::PolicyType policy_type (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::Policy_ptr copy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void destroy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
-    
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
 
@@ -342,21 +327,21 @@ namespace CORBA
 
   private:
     TAO::Collocation_Proxy_Broker *the_TAO_Policy_Proxy_Broker_;
-  
+
   protected:
     // Concrete interface only.
     Policy (void);
-    
+
     // These methods travese the inheritance tree and set the
     // parents piece of the given class in the right mode.
     virtual void CORBA_Policy_setup_collocation (void);
-    
+
     // Concrete non-local interface only.
     Policy (
         IOP::IOR *ior,
         TAO_ORB_Core *orb_core = 0
       );
-    
+
     // Non-local interface only.
     Policy (
         TAO_Stub *objref,
@@ -364,38 +349,33 @@ namespace CORBA
         TAO_Abstract_ServantBase *servant = 0,
         TAO_ORB_Core *orb_core = 0
       );
-    
+
     virtual ~Policy (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     Policy (const Policy &);
-    
+
     void operator= (const Policy &);
   };
 
 #endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_Policy;
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_CORBA_POLICYMANAGER__VAR_OUT_CH_)
 #define _CORBA_POLICYMANAGER__VAR_OUT_CH_
-  
+
   class PolicyManager;
   typedef PolicyManager *PolicyManager_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         PolicyManager
       >
     PolicyManager_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         PolicyManager
@@ -403,45 +383,45 @@ namespace CORBA
     PolicyManager_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_POLICYMANAGER_CH_)
 #define _CORBA_POLICYMANAGER_CH_
-  
+
   class TAO_Export PolicyManager
     : public virtual CORBA::Object
   {
   public:
     typedef PolicyManager_ptr _ptr_type;
     typedef PolicyManager_var _var_type;
-    
+
     // The static operations.
     static PolicyManager_ptr _duplicate (PolicyManager_ptr obj);
-    
+
     static void _tao_release (PolicyManager_ptr obj);
-    
+
     static PolicyManager_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static PolicyManager_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static PolicyManager_ptr _nil (void)
     {
       return static_cast<PolicyManager_ptr> (0);
     }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::PolicyList * get_policy_overrides (
         const ::CORBA::PolicyTypeSeq & ts
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -449,10 +429,10 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void set_policy_overrides (
         const ::CORBA::PolicyList & policies,
         ::CORBA::SetOverrideType set_add
@@ -462,53 +442,48 @@ namespace CORBA
         CORBA::SystemException,
         ::CORBA::InvalidPolicies
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
-    
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
+
   protected:
     // Abstract or local interface only.
     PolicyManager (void);
-    
+
     virtual ~PolicyManager (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     PolicyManager (const PolicyManager &);
-    
+
     void operator= (const PolicyManager &);
   };
 
 #endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_PolicyManager;
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_CORBA_POLICYCURRENT__VAR_OUT_CH_)
 #define _CORBA_POLICYCURRENT__VAR_OUT_CH_
-  
+
   class PolicyCurrent;
   typedef PolicyCurrent *PolicyCurrent_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         PolicyCurrent
       >
     PolicyCurrent_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         PolicyCurrent
@@ -516,13 +491,13 @@ namespace CORBA
     PolicyCurrent_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_POLICYCURRENT_CH_)
 #define _CORBA_POLICYCURRENT_CH_
-  
+
   class TAO_Export PolicyCurrent
     : public virtual ::CORBA::PolicyManager,
       public virtual ::CORBA::Current
@@ -530,59 +505,54 @@ namespace CORBA
   public:
     typedef PolicyCurrent_ptr _ptr_type;
     typedef PolicyCurrent_var _var_type;
-    
+
     // The static operations.
     static PolicyCurrent_ptr _duplicate (PolicyCurrent_ptr obj);
-    
+
     static void _tao_release (PolicyCurrent_ptr obj);
-    
+
     static PolicyCurrent_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static PolicyCurrent_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static PolicyCurrent_ptr _nil (void)
     {
       return static_cast<PolicyCurrent_ptr> (0);
     }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
-    
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
+
   protected:
     // Abstract or local interface only.
     PolicyCurrent (void);
-    
+
     virtual ~PolicyCurrent (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     PolicyCurrent (const PolicyCurrent &);
-    
+
     void operator= (const PolicyCurrent &);
   };
 
 #endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_PolicyCurrent;
 
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:66
@@ -607,9 +577,9 @@ TAO::Collocation_Proxy_Broker *
 namespace TAO
 {
 
-#if !defined (_CORBA_POLICY__TRAITS_CH_)
-#define _CORBA_POLICY__TRAITS_CH_
-  
+#if !defined (_CORBA_POLICY__TRAITS_)
+#define _CORBA_POLICY__TRAITS_
+
   template<>
   struct TAO_Export Objref_Traits< ::CORBA::Policy>
   {
@@ -630,7 +600,7 @@ namespace TAO
 
 #if !defined (_CORBA_POLICYMANAGER__TRAITS_CH_)
 #define _CORBA_POLICYMANAGER__TRAITS_CH_
-  
+
   template<>
   struct TAO_Export Objref_Traits< ::CORBA::PolicyManager>
   {
@@ -649,9 +619,9 @@ namespace TAO
 
 #endif /* end #if !defined */
 
-#if !defined (_CORBA_POLICYCURRENT__TRAITS_CH_)
-#define _CORBA_POLICYCURRENT__TRAITS_CH_
-  
+#if !defined (_CORBA_POLICYCURRENT__TRAITS_)
+#define _CORBA_POLICYCURRENT__TRAITS_
+
   template<>
   struct TAO_Export Objref_Traits< ::CORBA::PolicyCurrent>
   {
@@ -672,43 +642,6 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_exception/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const CORBA::PolicyError &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, CORBA::PolicyError*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::PolicyError *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::PolicyError *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_exception/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const CORBA::InvalidPolicies &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, CORBA::InvalidPolicies*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::InvalidPolicies *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::InvalidPolicies *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, CORBA::Policy_ptr); // copying
-TAO_Export void operator<<= (CORBA::Any &, CORBA::Policy_ptr *); // non-copying
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Policy_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, CORBA::PolicyManager_ptr); // copying
-TAO_Export void operator<<= (CORBA::Any &, CORBA::PolicyManager_ptr *); // non-copying
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::PolicyManager_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, CORBA::PolicyCurrent_ptr); // copying
-TAO_Export void operator<<= (CORBA::Any &, CORBA::PolicyCurrent_ptr *); // non-copying
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::PolicyCurrent_ptr &);
-
-// TAO_IDL - Generated from
 // be\be_visitor_exception/cdr_op_ch.cpp:52
 
 TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::PolicyError &);
diff --git a/TAO/tao/Policy_Current.cpp b/TAO/tao/Policy_Current.cpp
index 10def0962a0..fc8cbb69227 100644
--- a/TAO/tao/Policy_Current.cpp
+++ b/TAO/tao/Policy_Current.cpp
@@ -20,7 +20,7 @@ TAO_Policy_Current_Impl &
 TAO_Policy_Current::implementation (TAO_Policy_Current_Impl &current)
 {
   TAO_TSS_Resources *tss =
-    TAO_TSS_RESOURCES::instance ();
+    TAO_TSS_Resources::instance ();
 
   TAO_Policy_Current_Impl *old = tss->policy_current_;
   tss->policy_current_ = &current;
@@ -30,7 +30,7 @@ TAO_Policy_Current::implementation (TAO_Policy_Current_Impl &current)
 TAO_Policy_Current_Impl &
 TAO_Policy_Current::implementation (void) const
 {
-  return *TAO_TSS_RESOURCES::instance ()->policy_current_;
+  return *TAO_TSS_Resources::instance ()->policy_current_;
 }
 
 CORBA::Policy_ptr
diff --git a/TAO/tao/Policy_ForwardA.cpp b/TAO/tao/Policy_ForwardA.cpp
deleted file mode 100644
index b764212b911..00000000000
--- a/TAO/tao/Policy_ForwardA.cpp
+++ /dev/null
@@ -1,331 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "Policy_ForwardC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Enum_TypeCode_Static.h"
-#include "tao/Sequence_TypeCode_Static.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Dual_Impl_T.h"
-#include "tao/Any_Basic_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_PolicyType (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/PolicyType:1.0",
-    "PolicyType",
-    &CORBA::_tc_ulong);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_PolicyType =
-    &_tao_tc_CORBA_PolicyType;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:937
-
-namespace CORBA
-{
-  extern ::CORBA::TypeCode_ptr const _tc_Policy;
-}
-
-
-#ifndef _TAO_TYPECODE_CORBA_PolicyList_GUARD
-#define _TAO_TYPECODE_CORBA_PolicyList_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_PolicyList_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_Policy,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_PolicyList_0 =
-      &CORBA_PolicyList_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_PolicyList_GUARD */
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_PolicyList (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/PolicyList:1.0",
-    "PolicyList",
-    &TAO::TypeCode::tc_CORBA_PolicyList_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_PolicyList =
-    &_tao_tc_CORBA_PolicyList;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:937
-
-
-#ifndef _TAO_TYPECODE_CORBA_PolicyTypeSeq_GUARD
-#define _TAO_TYPECODE_CORBA_PolicyTypeSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_PolicyTypeSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_PolicyType,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_PolicyTypeSeq_0 =
-      &CORBA_PolicyTypeSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_PolicyTypeSeq_GUARD */
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_PolicyTypeSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/PolicyTypeSeq:1.0",
-    "PolicyTypeSeq",
-    &TAO::TypeCode::tc_CORBA_PolicyTypeSeq_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_PolicyTypeSeq =
-    &_tao_tc_CORBA_PolicyTypeSeq;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/enum_typecode.cpp:34
-
-static char const * const _tao_enumerators_CORBA_SetOverrideType[] =
-  {
-    "SET_OVERRIDE",
-    "ADD_OVERRIDE"
-    
-  };
-
-static TAO::TypeCode::Enum<char const *,
-                           char const * const *,
-                           TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_SetOverrideType (
-    "IDL:omg.org/CORBA/SetOverrideType:1.0",
-    "SetOverrideType",
-    _tao_enumerators_CORBA_SetOverrideType,
-    2);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_SetOverrideType =
-    &_tao_tc_CORBA_SetOverrideType;
-}
-
-
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::PolicyList &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::PolicyList>::insert_copy (
-      _tao_any,
-      CORBA::PolicyList::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_PolicyList_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::PolicyList *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::PolicyList>::insert (
-      _tao_any,
-      CORBA::PolicyList::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_PolicyList_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::PolicyList *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::PolicyList *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::PolicyList *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::PolicyList>::extract (
-        _tao_any,
-        CORBA::PolicyList::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_PolicyList_0,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::PolicyTypeSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::PolicyTypeSeq>::insert_copy (
-      _tao_any,
-      CORBA::PolicyTypeSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_PolicyTypeSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::PolicyTypeSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::PolicyTypeSeq>::insert (
-      _tao_any,
-      CORBA::PolicyTypeSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_PolicyTypeSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::PolicyTypeSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::PolicyTypeSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::PolicyTypeSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::PolicyTypeSeq>::extract (
-        _tao_any,
-        CORBA::PolicyTypeSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_PolicyTypeSeq_0,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_enum/any_op_cs.cpp:52
-
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::SetOverrideType _tao_elem
-  )
-{
-  TAO::Any_Basic_Impl_T<CORBA::SetOverrideType>::insert (
-      _tao_any,
-      CORBA::_tc_SetOverrideType,
-      _tao_elem
-    );
-}
-
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::SetOverrideType &_tao_elem
-  )
-{
-  return
-    TAO::Any_Basic_Impl_T<CORBA::SetOverrideType>::extract (
-        _tao_any,
-        CORBA::_tc_SetOverrideType,
-        _tao_elem 
-      );
-}
diff --git a/TAO/tao/Policy_ForwardC.cpp b/TAO/tao/Policy_ForwardC.cpp
index 86eac4a4651..b056d46a8e3 100644
--- a/TAO/tao/Policy_ForwardC.cpp
+++ b/TAO/tao/Policy_ForwardC.cpp
@@ -26,16 +26,12 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:291
+// be\be_codegen.cpp:277
 
 
 #include "Policy_ForwardC.h"
 #include "tao/CDR.h"
 
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
@@ -58,8 +54,8 @@ CORBA::PolicyList::PolicyList (
     CORBA::ULong max
   )
   : TAO_Unbounded_Object_Sequence<
-        CORBA::Policy,
-        CORBA::Policy_var
+        Policy,
+        Policy_var
       >
     (max)
 {}
@@ -71,8 +67,8 @@ CORBA::PolicyList::PolicyList (
     CORBA::Boolean release
   )
   : TAO_Unbounded_Object_Sequence<
-        CORBA::Policy,
-        CORBA::Policy_var
+        Policy,
+        Policy_var
       >
     (max, length, buffer, release)
 {}
@@ -81,8 +77,8 @@ CORBA::PolicyList::PolicyList (
     const PolicyList &seq
   )
   : TAO_Unbounded_Object_Sequence<
-        CORBA::Policy,
-        CORBA::Policy_var
+        Policy,
+        Policy_var
       >
     (seq)
 {}
@@ -114,7 +110,7 @@ CORBA::PolicyTypeSeq::PolicyTypeSeq (
     CORBA::ULong max
   )
   : TAO_Unbounded_Sequence<
-        CORBA::PolicyType
+        PolicyType
       >
     (max)
 {}
@@ -126,7 +122,7 @@ CORBA::PolicyTypeSeq::PolicyTypeSeq (
     CORBA::Boolean release
   )
   : TAO_Unbounded_Sequence<
-        CORBA::PolicyType
+        PolicyType
       >
     (max, length, buffer, release)
 {}
@@ -135,7 +131,7 @@ CORBA::PolicyTypeSeq::PolicyTypeSeq (
     const PolicyTypeSeq &seq
   )
   : TAO_Unbounded_Sequence<
-        CORBA::PolicyType
+        PolicyType
       >
     (seq)
 {}
diff --git a/TAO/tao/Policy_ForwardC.h b/TAO/tao/Policy_ForwardC.h
index 385cd6f768b..9d15b8a3cf2 100644
--- a/TAO/tao/Policy_ForwardC.h
+++ b/TAO/tao/Policy_ForwardC.h
@@ -26,10 +26,10 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:153
+// be\be_codegen.cpp:154
 
-#ifndef _TAO_IDL_ORIG_POLICY_FORWARDC_H_
-#define _TAO_IDL_ORIG_POLICY_FORWARDC_H_
+#ifndef _TAO_IDL_POLICY_FORWARDC_H_
+#define _TAO_IDL_POLICY_FORWARDC_H_
 
 #include /**/ "ace/pre.h"
 
@@ -41,6 +41,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/TAO_Export.h"
+#include "tao/ORB.h"
 #include "tao/Environment.h"
 #include "tao/Sequence_T.h"
 #include "tao/Objref_VarOut_T.h"
@@ -52,17 +53,8 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_Export
 
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:49
 
 namespace CORBA
 {
@@ -74,11 +66,6 @@ namespace CORBA
   typedef CORBA::ULong_out PolicyType_out;
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_PolicyType;
-  
-  // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_CORBA_POLICY__VAR_OUT_CH_)
@@ -157,11 +144,6 @@ namespace CORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_PolicyList;
-  
-  // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_POLICYTYPESEQ_CH_)
@@ -210,11 +192,6 @@ namespace CORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_PolicyTypeSeq;
-  
-  // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_CORBA_POLICYCURRENT__VAR_OUT_CH_)
@@ -247,14 +224,9 @@ namespace CORBA
   };
   
   typedef SetOverrideType &SetOverrideType_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_SetOverrideType;
 
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:78
 
 } // module CORBA
 
@@ -265,8 +237,8 @@ namespace CORBA
 namespace TAO
 {
 
-#if !defined (_CORBA_POLICY__TRAITS_CH_)
-#define _CORBA_POLICY__TRAITS_CH_
+#if !defined (_CORBA_POLICY__TRAITS_)
+#define _CORBA_POLICY__TRAITS_
   
   template<>
   struct TAO_Export Objref_Traits< ::CORBA::Policy>
@@ -286,8 +258,8 @@ namespace TAO
 
 #endif /* end #if !defined */
 
-#if !defined (_CORBA_POLICYCURRENT__TRAITS_CH_)
-#define _CORBA_POLICYCURRENT__TRAITS_CH_
+#if !defined (_CORBA_POLICYCURRENT__TRAITS_)
+#define _CORBA_POLICYCURRENT__TRAITS_
   
   template<>
   struct TAO_Export Objref_Traits< ::CORBA::PolicyCurrent>
@@ -309,35 +281,6 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface_fwd/any_op_ch.cpp:63
-
-TAO_Export void operator<<= (CORBA::Any &, CORBA::Policy_ptr); // copying
-TAO_Export void operator<<= (CORBA::Any &, CORBA::Policy_ptr *); // non-copying
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::Policy *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const CORBA::PolicyList &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, CORBA::PolicyList*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::PolicyList *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::PolicyList *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const CORBA::PolicyTypeSeq &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, CORBA::PolicyTypeSeq*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::PolicyTypeSeq *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::PolicyTypeSeq *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_enum/any_op_ch.cpp:51
-
-TAO_Export void operator<<= (CORBA::Any &, CORBA::SetOverrideType);
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::SetOverrideType &);
-
-// TAO_IDL - Generated from
 // be\be_visitor_interface_fwd/cdr_op_ch.cpp:66
 
 TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::Policy_ptr );
@@ -385,15 +328,7 @@ TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, CORBA::SetOverrideType);
 TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::SetOverrideType &);
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
+// be\be_codegen.cpp:1028
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/tao/PortableInterceptor.pidl b/TAO/tao/PortableInterceptor.pidl
index 90eee47b8f5..00e1a22675c 100644
--- a/TAO/tao/PortableInterceptor.pidl
+++ b/TAO/tao/PortableInterceptor.pidl
@@ -37,9 +37,6 @@
 #include <PI_Forward.pidl>
 #include <Messaging_SyncScope.pidl>
 
-#include <InvalidSlot.pidl>
-#include <PICurrent.pidl>
-
 module PortableInterceptor {
 
   typeprefix PortableInterceptor "omg.org";
diff --git a/TAO/tao/PortableInterceptorC.cpp b/TAO/tao/PortableInterceptorC.cpp
index f2232e01981..25d2f8334ff 100644
--- a/TAO/tao/PortableInterceptorC.cpp
+++ b/TAO/tao/PortableInterceptorC.cpp
@@ -26,19 +26,11 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:291
+// be\be_codegen.cpp:277
 
 
 #include "PortableInterceptorC.h"
 #include "tao/CDR.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/String_TypeCode_Static.h"
-
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
diff --git a/TAO/tao/PortableInterceptorC.h b/TAO/tao/PortableInterceptorC.h
index cd207a3911f..bf1b51c4d81 100644
--- a/TAO/tao/PortableInterceptorC.h
+++ b/TAO/tao/PortableInterceptorC.h
@@ -26,10 +26,10 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:153
+// be\be_codegen.cpp:154
 
-#ifndef _TAO_IDL_ORIG_PORTABLEINTERCEPTORC_H_
-#define _TAO_IDL_ORIG_PORTABLEINTERCEPTORC_H_
+#ifndef _TAO_IDL_PORTABLEINTERCEPTORC_H_
+#define _TAO_IDL_PORTABLEINTERCEPTORC_H_
 
 #include /**/ "ace/pre.h"
 
@@ -42,91 +42,79 @@
 
 #include "tao/TAO_Export.h"
 #include "tao/ORB.h"
-#include "tao/SystemException.h"
 #include "tao/Environment.h"
 
 #include "tao/PI_ForwardC.h"
 #include "tao/Messaging_SyncScopeC.h"
-#include "tao/InvalidSlotC.h"
-#include "tao/PICurrentC.h"
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
 #endif
 #define TAO_EXPORT_MACRO TAO_Export
 
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:49
 
 namespace PortableInterceptor
 {
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-
+  
   const PortableInterceptor::AdapterState HOLDING = 0;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-
+  
   const PortableInterceptor::AdapterState ACTIVE = 1;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-
+  
   const PortableInterceptor::AdapterState DISCARDING = 2;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-
+  
   const PortableInterceptor::AdapterState INACTIVE = 3;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-
+  
   const PortableInterceptor::AdapterState NON_EXISTENT = 4;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-
+  
   const PortableInterceptor::ReplyStatus SUCCESSFUL = 0;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-
+  
   const PortableInterceptor::ReplyStatus SYSTEM_EXCEPTION = 1;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-
+  
   const PortableInterceptor::ReplyStatus USER_EXCEPTION = 2;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-
+  
   const PortableInterceptor::ReplyStatus LOCATION_FORWARD = 3;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-
+  
   const PortableInterceptor::ReplyStatus TRANSPORT_RETRY = 4;
-
+  
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-
+  
   const PortableInterceptor::ReplyStatus UNKNOWN = 5;
 
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:78
 
 } // module PortableInterceptor
 
@@ -139,15 +127,7 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
+// be\be_codegen.cpp:1028
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/tao/PortableServer.mpc b/TAO/tao/PortableServer.mpc
index a839d48bc48..add4704f0a3 100644
--- a/TAO/tao/PortableServer.mpc
+++ b/TAO/tao/PortableServer.mpc
@@ -1,5 +1,5 @@
 //$Id$
-project : taolib, core {
+project : taolib, core, anytypecode {
   sharedname   = TAO_PortableServer
   dynamicflags = TAO_PORTABLESERVER_BUILD_DLL
 
@@ -27,6 +27,10 @@ project : taolib, core {
     PortableServer
   }
 
+  IDL_Files {
+    PortableServer
+  }
+
   Pkgconfig_Files {
     PortableServer/TAO_PortableServer.pc.in
   }
diff --git a/TAO/tao/PortableServer/AdapterActivatorA.cpp b/TAO/tao/PortableServer/AdapterActivatorA.cpp
index 2b071bd18ca..919f249a06a 100644
--- a/TAO/tao/PortableServer/AdapterActivatorA.cpp
+++ b/TAO/tao/PortableServer/AdapterActivatorA.cpp
@@ -25,15 +25,15 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "AdapterActivatorC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
-#include "tao/String_TypeCode_Static.h"
+#include "AdapterActivatorA.h"
+#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
+#include "tao/AnyTypeCode/String_TypeCode_Static.h"
 #include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
+#include "tao/AnyTypeCode/Any.h"
+#include "tao/AnyTypeCode/Any_Impl_T.h"
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
@@ -46,88 +46,11 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:omg.org/PortableServer/AdapterActivator:2.3",
     "AdapterActivator");
-  
+
 namespace PortableServer
 {
   ::CORBA::TypeCode_ptr const _tc_AdapterActivator =
     &_tao_tc_PortableServer_AdapterActivator;
 }
 
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableServer::AdapterActivator>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableServer::AdapterActivator>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-  
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableServer::AdapterActivator>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableServer::AdapterActivator_ptr _tao_elem
-  )
-{
-  PortableServer::AdapterActivator_ptr _tao_objptr =
-    PortableServer::AdapterActivator::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableServer::AdapterActivator_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<PortableServer::AdapterActivator>::insert (
-      _tao_any,
-      PortableServer::AdapterActivator::_tao_any_destructor,
-      PortableServer::_tc_AdapterActivator,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    PortableServer::AdapterActivator_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<PortableServer::AdapterActivator>::extract (
-        _tao_any,
-        PortableServer::AdapterActivator::_tao_any_destructor,
-        PortableServer::_tc_AdapterActivator,
-        _tao_elem
-      );
-}
-
 #endif /* TAO_HAS_MINIMUM_CORBA == 0 */
diff --git a/TAO/tao/PortableServer/AdapterActivatorA.h b/TAO/tao/PortableServer/AdapterActivatorA.h
new file mode 100644
index 00000000000..b67fd60fcae
--- /dev/null
+++ b/TAO/tao/PortableServer/AdapterActivatorA.h
@@ -0,0 +1,59 @@
+// -*- C++ -*-
+//
+// $Id$
+
+// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       Irvine, CA
+//       USA
+//       http://doc.ece.uci.edu/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
+//
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
+
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:754
+
+#ifndef _TAO_IDL_ADAPTERACTIVATORA_H_
+#define _TAO_IDL_ADAPTERACTIVATORA_H_
+
+#include /**/ "ace/pre.h"
+
+#include "portableserver_export.h"
+#include "AdapterActivatorC.h"
+#include "tao/PortableServer/PS_ForwardA.h"
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:59
+
+namespace PortableServer
+{
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+  
+  extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_AdapterActivator;
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:86
+
+} // module PortableServer
+
+#include /**/ "ace/post.h"
+
+#endif /* ifndef */
diff --git a/TAO/tao/PortableServer/AdapterActivatorC.cpp b/TAO/tao/PortableServer/AdapterActivatorC.cpp
index 9e68f0c7308..14a2fbb7712 100644
--- a/TAO/tao/PortableServer/AdapterActivatorC.cpp
+++ b/TAO/tao/PortableServer/AdapterActivatorC.cpp
@@ -26,17 +26,13 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:291
+// be\be_codegen.cpp:277
 
 
 #include "AdapterActivatorC.h"
 #include "tao/CDR.h"
 #include "ace/OS_NS_string.h"
 
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
@@ -90,14 +86,6 @@ PortableServer::AdapterActivator::AdapterActivator (void)
 PortableServer::AdapterActivator::~AdapterActivator (void)
 {}
 
-void 
-PortableServer::AdapterActivator::_tao_any_destructor (void *_tao_void_pointer)
-{
-  AdapterActivator *_tao_tmp_pointer =
-    static_cast<AdapterActivator *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
 PortableServer::AdapterActivator_ptr
 PortableServer::AdapterActivator::_narrow (
     CORBA::Object_ptr _tao_objref
diff --git a/TAO/tao/PortableServer/AdapterActivatorC.h b/TAO/tao/PortableServer/AdapterActivatorC.h
index 8eb1558e581..f2f020051a9 100644
--- a/TAO/tao/PortableServer/AdapterActivatorC.h
+++ b/TAO/tao/PortableServer/AdapterActivatorC.h
@@ -26,10 +26,10 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:153
+// be\be_codegen.cpp:154
 
-#ifndef _TAO_IDL_ORIG_ADAPTERACTIVATORC_H_
-#define _TAO_IDL_ORIG_ADAPTERACTIVATORC_H_
+#ifndef _TAO_IDL_ADAPTERACTIVATORC_H_
+#define _TAO_IDL_ADAPTERACTIVATORC_H_
 
 #include /**/ "ace/pre.h"
 
@@ -54,17 +54,8 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_PortableServer_Export
 
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:49
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
@@ -126,7 +117,7 @@ namespace PortableServer
       return static_cast<AdapterActivator_ptr> (0);
     }
     
-    static void _tao_any_destructor (void *);
+    
     
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
@@ -165,14 +156,9 @@ namespace PortableServer
   };
 
 #endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_AdapterActivator;
 
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:78
 
 } // module PortableServer
 
@@ -183,8 +169,8 @@ namespace PortableServer
 namespace TAO
 {
 
-#if !defined (_PORTABLESERVER_ADAPTERACTIVATOR__TRAITS_CH_)
-#define _PORTABLESERVER_ADAPTERACTIVATOR__TRAITS_CH_
+#if !defined (_PORTABLESERVER_ADAPTERACTIVATOR__TRAITS_)
+#define _PORTABLESERVER_ADAPTERACTIVATOR__TRAITS_
   
   template<>
   struct TAO_PortableServer_Export Objref_Traits< ::PortableServer::AdapterActivator>
@@ -205,25 +191,10 @@ namespace TAO
 #endif /* end #if !defined */
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::AdapterActivator_ptr); // copying
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::AdapterActivator_ptr *); // non-copying
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::AdapterActivator_ptr &);
-
 #endif /* TAO_HAS_MINIMUM_CORBA == 0 */
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
+// be\be_codegen.cpp:1028
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/tao/PortableServer/Any_SArg_Traits.h b/TAO/tao/PortableServer/Any_SArg_Traits.h
index 1b672c8e571..abb88199417 100644
--- a/TAO/tao/PortableServer/Any_SArg_Traits.h
+++ b/TAO/tao/PortableServer/Any_SArg_Traits.h
@@ -39,7 +39,8 @@ namespace TAO
         Var_Size_SArg_Traits_T<
             CORBA::Any,
             CORBA::Any_var,
-            CORBA::Any_out
+            CORBA::Any_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::Any>
           >
   {
   };
diff --git a/TAO/tao/PortableServer/BD_String_SArgument_T.cpp b/TAO/tao/PortableServer/BD_String_SArgument_T.cpp
index ad2cabfd5d8..1b9ae8f7adf 100644
--- a/TAO/tao/PortableServer/BD_String_SArgument_T.cpp
+++ b/TAO/tao/PortableServer/BD_String_SArgument_T.cpp
@@ -4,7 +4,6 @@
 #define TAO_BD_STRING_SARGUMENT_T_CPP
 
 #include "tao/PortableServer/BD_String_SArgument_T.h"
-#include "tao/Dynamic_ParameterC.h"
 
 #if !defined (__ACE_INLINE__)
 #include "tao/PortableServer/BD_String_SArgument_T.inl"
@@ -15,9 +14,10 @@ template<typename S,
          typename S_var,
          typename to_S,
          typename from_S,
-         size_t BOUND>
+         size_t BOUND,
+         typename Insert_Policy>
 CORBA::Boolean
-TAO::In_BD_String_SArgument_T<S,S_var,to_S,from_S,BOUND>::demarshal (
+TAO::In_BD_String_SArgument_T<S,S_var,to_S,from_S,BOUND,Insert_Policy>::demarshal (
     TAO_InputCDR & cdr
   )
 {
@@ -30,14 +30,13 @@ template<typename S,
          typename S_var,
          typename to_S,
          typename from_S,
-         size_t BOUND>
+         size_t BOUND,
+         typename Insert_Policy>
 void
-TAO::In_BD_String_SArgument_T<S,S_var,to_S,from_S,BOUND>::interceptor_param (
-    Dynamic::Parameter & p
-  )
+TAO::In_BD_String_SArgument_T<S,S_var,to_S,from_S,BOUND,Insert_Policy>::interceptor_value (
+  CORBA::Any *any) const
 {
-  p.argument <<= from_S (this->x_.in (), BOUND);
-  p.mode = CORBA::PARAM_IN;
+  this->Insert_Policy::any_insert (any, from_S (this->x_.in (), BOUND));
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -48,9 +47,10 @@ template<typename S,
          typename S_var,
          typename to_S,
          typename from_S,
-         size_t BOUND>
+         size_t BOUND,
+         typename Insert_Policy>
 CORBA::Boolean
-TAO::Inout_BD_String_SArgument_T<S,S_var,to_S,from_S,BOUND>::marshal (
+TAO::Inout_BD_String_SArgument_T<S,S_var,to_S,from_S,BOUND,Insert_Policy>::marshal (
     TAO_OutputCDR & cdr
   )
 {
@@ -61,9 +61,10 @@ template<typename S,
          typename S_var,
          typename to_S,
          typename from_S,
-         size_t BOUND>
+         size_t BOUND,
+         typename Insert_Policy>
 CORBA::Boolean
-TAO::Inout_BD_String_SArgument_T<S,S_var,to_S,from_S,BOUND>::demarshal (
+TAO::Inout_BD_String_SArgument_T<S,S_var,to_S,from_S,BOUND,Insert_Policy>::demarshal (
     TAO_InputCDR & cdr
   )
 {
@@ -76,13 +77,13 @@ template<typename S,
          typename S_var,
          typename to_S,
          typename from_S,
-         size_t BOUND>
+         size_t BOUND,
+         typename Insert_Policy>
 void
-TAO::Inout_BD_String_SArgument_T<S,S_var,to_S,from_S,BOUND>::
-interceptor_param (Dynamic::Parameter & p)
+TAO::Inout_BD_String_SArgument_T<S,S_var,to_S,from_S,BOUND,Insert_Policy>::
+interceptor_value (CORBA::Any *any) const
 {
-  p.argument <<= from_S (this->x_.in (), BOUND);
-  p.mode = CORBA::PARAM_INOUT;
+  this->Insert_Policy::any_insert (any, from_S (this->x_.in (), BOUND));
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -94,9 +95,10 @@ template<typename S,
          typename S_out,
          typename to_S,
          typename from_S,
-         size_t BOUND>
+         size_t BOUND,
+         typename Insert_Policy>
 CORBA::Boolean
-TAO::Out_BD_String_SArgument_T<S,S_var,S_out,to_S,from_S,BOUND>::marshal (
+TAO::Out_BD_String_SArgument_T<S,S_var,S_out,to_S,from_S,BOUND,Insert_Policy>::marshal (
     TAO_OutputCDR &cdr
   )
 {
@@ -110,13 +112,13 @@ template<typename S,
          typename S_out,
          typename to_S,
          typename from_S,
-         size_t BOUND>
+         size_t BOUND,
+         typename Insert_Policy>
 void
-TAO::Out_BD_String_SArgument_T<S,S_var,S_out,to_S,from_S,BOUND>::
-interceptor_param (Dynamic::Parameter & p)
+TAO::Out_BD_String_SArgument_T<S,S_var,S_out,to_S,from_S,BOUND,Insert_Policy>::
+interceptor_value (CORBA::Any *any) const
 {
-  p.argument <<= from_S (this->x_.in (), BOUND);
-  p.mode = CORBA::PARAM_OUT;
+  this->Insert_Policy::any_insert (any, from_S (this->x_.in (), BOUND));
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -127,9 +129,10 @@ template<typename S,
          typename S_var,
          typename to_S,
          typename from_S,
-         size_t BOUND>
+         size_t BOUND,
+         typename Insert_Policy>
 CORBA::Boolean
-TAO::Ret_BD_String_SArgument_T<S,S_var,to_S,from_S,BOUND>::marshal (
+TAO::Ret_BD_String_SArgument_T<S,S_var,to_S,from_S,BOUND,Insert_Policy>::marshal (
     TAO_OutputCDR & cdr
   )
 {
@@ -142,12 +145,13 @@ template<typename S,
          typename S_var,
          typename to_S,
          typename from_S,
-         size_t BOUND>
+         size_t BOUND,
+         typename Insert_Policy>
 void
-TAO::Ret_BD_String_SArgument_T<S,S_var,to_S,from_S,BOUND>::
-interceptor_result (CORBA::Any * any)
+TAO::Ret_BD_String_SArgument_T<S,S_var,to_S,from_S,BOUND,Insert_Policy>::
+interceptor_value (CORBA::Any *any) const
 {
-  (*any) <<= from_S (this->x_.in (), BOUND);
+  this->Insert_Policy::any_insert (any, from_S (this->x_.in (), BOUND));
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
diff --git a/TAO/tao/PortableServer/BD_String_SArgument_T.h b/TAO/tao/PortableServer/BD_String_SArgument_T.h
index 4ad82f430bc..e4cd49d1ab6 100644
--- a/TAO/tao/PortableServer/BD_String_SArgument_T.h
+++ b/TAO/tao/PortableServer/BD_String_SArgument_T.h
@@ -23,6 +23,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/Argument.h"
+#include "tao/Any_Insert_Policy_T.h"
 
 namespace TAO
 {
@@ -36,15 +37,16 @@ namespace TAO
            typename S_var,
            typename to_S,
            typename from_S,
-           size_t BOUND>
-  class In_BD_String_SArgument_T : public Argument
+           size_t BOUND,
+           typename Insert_Policy>
+  class In_BD_String_SArgument_T : public InArgument, private Insert_Policy
   {
   public:
     In_BD_String_SArgument_T (void);
 
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     const S * arg (void) const;
 
@@ -62,16 +64,17 @@ namespace TAO
            typename S_var,
            typename to_S,
            typename from_S,
-           size_t BOUND>
-  class Inout_BD_String_SArgument_T : public Argument
+           size_t BOUND,
+           typename Insert_Policy>
+  class Inout_BD_String_SArgument_T : public InoutArgument, private Insert_Policy
   {
   public:
     Inout_BD_String_SArgument_T (void);
 
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S *& arg (void);
 
@@ -90,15 +93,16 @@ namespace TAO
            typename S_out,
            typename to_S,
            typename from_S,
-           size_t BOUND>
-  class Out_BD_String_SArgument_T : public Argument
+           size_t BOUND,
+           typename Insert_Policy>
+  class Out_BD_String_SArgument_T : public OutArgument, private Insert_Policy
   {
   public:
     Out_BD_String_SArgument_T (void);
 
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S *& arg (void);
 
@@ -116,15 +120,16 @@ namespace TAO
            typename S_var,
            typename to_S,
            typename from_S,
-           size_t BOUND>
-  class Ret_BD_String_SArgument_T : public Argument
+           size_t BOUND,
+           typename Insert_Policy>
+  class Ret_BD_String_SArgument_T : public RetArgument, private Insert_Policy
   {
   public:
     Ret_BD_String_SArgument_T (void);
 
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_result (CORBA::Any *);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S *& arg (void);
 
@@ -143,7 +148,8 @@ namespace TAO
            typename T_out,
            typename to_T,
            typename from_T,
-           size_t BOUND>
+           size_t BOUND,
+           typename Insert_Policy>
   struct BD_String_SArg_Traits_T
   {
     typedef T *                                   ret_type;
@@ -155,23 +161,27 @@ namespace TAO
                                      T_var,
                                      to_T,
                                      from_T,
-                                     BOUND>       in_arg_val;
+                                     BOUND,
+                                     Insert_Policy>       in_arg_val;
     typedef Inout_BD_String_SArgument_T<T,
                                         T_var,
                                         to_T,
                                         from_T,
-                                        BOUND>    inout_arg_val;
+                                        BOUND,
+                                        Insert_Policy>    inout_arg_val;
     typedef Out_BD_String_SArgument_T<T,
                                       T_var,
                                       T_out,
                                       to_T,
                                       from_T,
-                                      BOUND>      out_arg_val;
+                                      BOUND,
+                                      Insert_Policy>      out_arg_val;
     typedef Ret_BD_String_SArgument_T<T,
                                       T_var,
                                       to_T,
                                       from_T,
-                                      BOUND>      ret_val;
+                                      BOUND,
+                                      Insert_Policy>      ret_val;
 
     // Typedefs corresponding to return value of arg() method in both
     // the client and server side argument class templates.
@@ -181,34 +191,6 @@ namespace TAO
     typedef inout_type                            ret_arg_type;
 
   };
-
-  /**
-   *
-   * @brief Specializations for bounded (w)strings
-   *
-   */
-
-  template<size_t BOUND>
-  class BD_String_SArg_Traits
-    : public BD_String_SArg_Traits_T<CORBA::Char,
-                                     CORBA::String_var,
-                                     CORBA::String_out,
-                                     ACE_InputCDR::to_string,
-                                     ACE_OutputCDR::from_string,
-                                     BOUND>
-  {
-  };
-
-  template<size_t BOUND>
-  class BD_WString_SArg_Traits
-    : public BD_String_SArg_Traits_T<CORBA::WChar,
-                                     CORBA::WString_var,
-                                     CORBA::WString_out,
-                                     ACE_InputCDR::to_wstring,
-                                     ACE_OutputCDR::from_wstring,
-                                     BOUND>
-  {
-  };
 }
 
 #if defined (__ACE_INLINE__)
diff --git a/TAO/tao/PortableServer/BD_String_SArgument_T.inl b/TAO/tao/PortableServer/BD_String_SArgument_T.inl
index f8a76b8938f..c8727fb3d32 100644
--- a/TAO/tao/PortableServer/BD_String_SArgument_T.inl
+++ b/TAO/tao/PortableServer/BD_String_SArgument_T.inl
@@ -1,97 +1,109 @@
 // $Id$
 
-template<typename S, 
-         typename S_var, 
-         typename to_S, 
-         typename from_S, 
-         size_t BOUND>
+template<typename S,
+         typename S_var,
+         typename to_S,
+         typename from_S,
+         size_t BOUND,
+         typename Insert_Policy>
 ACE_INLINE
-TAO::In_BD_String_SArgument_T<S,S_var,to_S,from_S,BOUND>::
+TAO::In_BD_String_SArgument_T<S,S_var,to_S,from_S,BOUND,Insert_Policy>::
 In_BD_String_SArgument_T (void)
 {}
 
-template<typename S, 
-         typename S_var, 
-         typename to_S, 
-         typename from_S, 
-         size_t BOUND>
+template<typename S,
+         typename S_var,
+         typename to_S,
+         typename from_S,
+         size_t BOUND,
+         typename Insert_Policy>
 ACE_INLINE
 const S *
-TAO::In_BD_String_SArgument_T<S,S_var,to_S,from_S,BOUND>::arg (void) const
+TAO::In_BD_String_SArgument_T<S,S_var,to_S,from_S,BOUND,Insert_Policy>::
+arg (void) const
 {
   return this->x_.in ();
 }
 
 // ==========================================================================
 
-template<typename S, 
-         typename S_var, 
-         typename to_S, 
-         typename from_S, 
-         size_t BOUND>
+template<typename S,
+         typename S_var,
+         typename to_S,
+         typename from_S,
+         size_t BOUND,
+         typename Insert_Policy>
 ACE_INLINE
-TAO::Inout_BD_String_SArgument_T<S,S_var,to_S,from_S,BOUND>::
+TAO::Inout_BD_String_SArgument_T<S,S_var,to_S,from_S,BOUND,Insert_Policy>::
 Inout_BD_String_SArgument_T (void)
 {}
 
-template<typename S, 
-         typename S_var, 
-         typename to_S, 
-         typename from_S, 
-         size_t BOUND>
+template<typename S,
+         typename S_var,
+         typename to_S,
+         typename from_S,
+         size_t BOUND,
+         typename Insert_Policy>
 ACE_INLINE
 S *&
-TAO::Inout_BD_String_SArgument_T<S,S_var,to_S,from_S,BOUND>::arg (void)
+TAO::Inout_BD_String_SArgument_T<S,S_var,to_S,from_S,BOUND,Insert_Policy>::
+arg (void)
 {
   return this->x_.inout ();
 }
 
 // ==========================================================================
 
-template<typename S, 
+template<typename S,
          typename S_var,
          typename S_out,
-         typename to_S, 
-         typename from_S, 
-         size_t BOUND>
+         typename to_S,
+         typename from_S,
+         size_t BOUND,
+         typename Insert_Policy>
 ACE_INLINE
-TAO::Out_BD_String_SArgument_T<S,S_var,S_out,to_S,from_S,BOUND>::
+TAO::Out_BD_String_SArgument_T<S,S_var,S_out,to_S,from_S,BOUND,Insert_Policy>::
 Out_BD_String_SArgument_T (void)
 {}
 
-template<typename S, 
-         typename S_var, 
+template<typename S,
+         typename S_var,
          typename S_out,
-         typename to_S, 
-         typename from_S, 
-         size_t BOUND>
+         typename to_S,
+         typename from_S,
+         size_t BOUND,
+         typename Insert_Policy>
 ACE_INLINE
 S *&
-TAO::Out_BD_String_SArgument_T<S,S_var,S_out,to_S,from_S,BOUND>::arg (void)
+TAO::Out_BD_String_SArgument_T<S,S_var,S_out,to_S,from_S,BOUND,Insert_Policy>::
+arg (void)
 {
   return this->x_.out ();
 }
 
 // ==========================================================================
 
-template<typename S, 
-         typename S_var, 
-         typename to_S, 
-         typename from_S, 
-         size_t BOUND>
+template<typename S,
+         typename S_var,
+         typename to_S,
+         typename from_S,
+         size_t BOUND,
+         typename Insert_Policy>
 ACE_INLINE
-TAO::Ret_BD_String_SArgument_T<S,S_var,to_S,from_S,BOUND>::
+TAO::Ret_BD_String_SArgument_T<S,S_var,to_S,from_S,BOUND,Insert_Policy>::
 Ret_BD_String_SArgument_T (void)
 {}
 
-template<typename S, 
-         typename S_var, 
-         typename to_S, 
-         typename from_S, 
-         size_t BOUND>
+template<typename S,
+         typename S_var,
+         typename to_S,
+         typename from_S,
+         size_t BOUND,
+         typename Insert_Policy>
 ACE_INLINE
 S *&
-TAO::Ret_BD_String_SArgument_T<S,S_var,to_S,from_S,BOUND>::arg (void)
+TAO::Ret_BD_String_SArgument_T<S,S_var,to_S,from_S,BOUND,Insert_Policy>::
+arg (void)
 {
   return this->x_.out ();
 }
diff --git a/TAO/tao/PortableServer/Basic_SArgument_T.cpp b/TAO/tao/PortableServer/Basic_SArgument_T.cpp
index 79301cfb9aa..a6fe3ead5f4 100644
--- a/TAO/tao/PortableServer/Basic_SArgument_T.cpp
+++ b/TAO/tao/PortableServer/Basic_SArgument_T.cpp
@@ -4,97 +4,93 @@
 #define TAO_BASIC_SARGUMENT_T_CPP
 
 #include "tao/PortableServer/Basic_SArgument_T.h"
-#include "tao/Dynamic_ParameterC.h"
 
 #if !defined (__ACE_INLINE__)
 #include "tao/PortableServer/Basic_SArgument_T.inl"
 #endif /* __ACE_INLINE__ */
 
 
-template<typename S>
+template<typename S, typename Insert_Policy>
 CORBA::Boolean
-TAO::In_Basic_SArgument_T<S>::demarshal (TAO_InputCDR &cdr)
+TAO::In_Basic_SArgument_T<S,Insert_Policy>::demarshal (TAO_InputCDR &cdr)
 {
   return cdr >> this->x_;
 }
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S>
+template<typename S, typename Insert_Policy>
 void
-TAO::In_Basic_SArgument_T<S>::interceptor_param (Dynamic::Parameter & p)
+TAO::In_Basic_SArgument_T<S,Insert_Policy>::interceptor_value (CORBA::Any *any) const
 {
-  p.argument <<= this->x_;
-  p.mode = CORBA::PARAM_IN;
+  this->Insert_Policy::any_insert (any, this->x_);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // ===========================================================
 
-template<typename S>
+template<typename S, typename Insert_Policy>
 CORBA::Boolean
-TAO::Inout_Basic_SArgument_T<S>::marshal (TAO_OutputCDR & cdr)
+TAO::Inout_Basic_SArgument_T<S,Insert_Policy>::marshal (TAO_OutputCDR &cdr)
 {
   return cdr << this->x_;
 }
 
-template<typename S>
+template<typename S, typename Insert_Policy>
 CORBA::Boolean
-TAO::Inout_Basic_SArgument_T<S>::demarshal (TAO_InputCDR & cdr)
+TAO::Inout_Basic_SArgument_T<S,Insert_Policy>::demarshal (TAO_InputCDR & cdr)
 {
   return cdr >> this->x_;
 }
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S>
+template<typename S, typename Insert_Policy>
 void
-TAO::Inout_Basic_SArgument_T<S>::interceptor_param (Dynamic::Parameter & p)
+TAO::Inout_Basic_SArgument_T<S,Insert_Policy>::interceptor_value (CORBA::Any *any) const
 {
-  p.argument <<= this->x_;
-  p.mode = CORBA::PARAM_INOUT;
+  this->Insert_Policy::any_insert (any, this->x_);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // ==============================================================
 
-template<typename S>
+template<typename S, typename Insert_Policy>
 CORBA::Boolean
-TAO::Out_Basic_SArgument_T<S>::marshal (TAO_OutputCDR &cdr)
+TAO::Out_Basic_SArgument_T<S,Insert_Policy>::marshal (TAO_OutputCDR &cdr)
 {
   return cdr << this->x_;
 }
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S>
+template<typename S, typename Insert_Policy>
 void
-TAO::Out_Basic_SArgument_T<S>::interceptor_param (Dynamic::Parameter & p)
+TAO::Out_Basic_SArgument_T<S,Insert_Policy>::interceptor_value (CORBA::Any *any) const
 {
-  p.argument <<= this->x_;
-  p.mode = CORBA::PARAM_OUT;
+  this->Insert_Policy::any_insert (any, this->x_);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // ============================================================
 
-template<typename S>
+template<typename S, typename Insert_Policy>
 CORBA::Boolean
-TAO::Ret_Basic_SArgument_T<S>::marshal (TAO_OutputCDR & cdr)
+TAO::Ret_Basic_SArgument_T<S,Insert_Policy>::marshal (TAO_OutputCDR &cdr)
 {
   return cdr << this->x_;
 }
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S>
+template<typename S, typename Insert_Policy>
 void
-TAO::Ret_Basic_SArgument_T<S>::interceptor_result (CORBA::Any * any)
+TAO::Ret_Basic_SArgument_T<S,Insert_Policy>::interceptor_value (CORBA::Any *any) const
 {
-  (*any) <<= this->x_;
+  this->Insert_Policy::any_insert (any, this->x_);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
diff --git a/TAO/tao/PortableServer/Basic_SArgument_T.h b/TAO/tao/PortableServer/Basic_SArgument_T.h
index 4c0518a9674..33297cb7adf 100644
--- a/TAO/tao/PortableServer/Basic_SArgument_T.h
+++ b/TAO/tao/PortableServer/Basic_SArgument_T.h
@@ -30,15 +30,15 @@ namespace TAO
    * @brief Template class for IN skeleton argument of basic IDL types.
    *
    */
-  template<typename S>
-  class In_Basic_SArgument_T : public Argument
+  template<typename S, typename Insert_Policy>
+  class In_Basic_SArgument_T : public InArgument, private Insert_Policy
   {
   public:
     In_Basic_SArgument_T (void);
 
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S arg (void) const;
 
@@ -52,16 +52,16 @@ namespace TAO
    * @brief Template class for INOUT skeleton argument of basic IDL types.
    *
    */
-  template<typename S>
-  class Inout_Basic_SArgument_T : public Argument
+  template<typename S, typename Insert_Policy>
+  class Inout_Basic_SArgument_T : public InoutArgument, private Insert_Policy
   {
   public:
     Inout_Basic_SArgument_T (void);
 
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S & arg (void);
 
@@ -75,15 +75,15 @@ namespace TAO
    * @brief Template class for OUT skeleton argument of basic IDL types.
    *
    */
-  template<typename S>
-  class Out_Basic_SArgument_T : public Argument
+  template<typename S, typename Insert_Policy>
+  class Out_Basic_SArgument_T : public OutArgument, private Insert_Policy
   {
   public:
     Out_Basic_SArgument_T (void);
 
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S & arg (void);
 
@@ -97,15 +97,15 @@ namespace TAO
    * @brief Template class for return skeleton value of basic IDL types.
    *
    */
-  template<typename S>
-  class Ret_Basic_SArgument_T : public Argument
+  template<typename S, typename Insert_Policy>
+  class Ret_Basic_SArgument_T : public RetArgument, private Insert_Policy
   {
   public:
     Ret_Basic_SArgument_T (void);
 
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_result (CORBA::Any *);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S & arg (void);
 
@@ -119,7 +119,7 @@ namespace TAO
    * @brief Template class for skeleton argument traits of basic IDL types.
    *
    */
-  template<typename T>
+  template<typename T, typename Insert_Policy>
   struct Basic_SArg_Traits_T
   {
     typedef T                           ret_type;
@@ -127,10 +127,10 @@ namespace TAO
     typedef T &                         inout_type;
     typedef T &                         out_type;
 
-    typedef In_Basic_SArgument_T<T>     in_arg_val;
-    typedef Inout_Basic_SArgument_T<T>  inout_arg_val;
-    typedef Out_Basic_SArgument_T<T>    out_arg_val;
-    typedef Ret_Basic_SArgument_T<T>    ret_val;
+    typedef In_Basic_SArgument_T<T, Insert_Policy>     in_arg_val;
+    typedef Inout_Basic_SArgument_T<T, Insert_Policy>  inout_arg_val;
+    typedef Out_Basic_SArgument_T<T, Insert_Policy>    out_arg_val;
+    typedef Ret_Basic_SArgument_T<T, Insert_Policy>    ret_val;
 
     // Typedefs corresponding to return value of arg() method in both
     // the client and server side argument class templates.
diff --git a/TAO/tao/PortableServer/Basic_SArgument_T.inl b/TAO/tao/PortableServer/Basic_SArgument_T.inl
index 2bbaba955ab..195d7bca229 100644
--- a/TAO/tao/PortableServer/Basic_SArgument_T.inl
+++ b/TAO/tao/PortableServer/Basic_SArgument_T.inl
@@ -2,60 +2,60 @@
 //
 // $Id$
 
-template<typename S>
+template<typename S, typename Insert_Policy>
 ACE_INLINE
-TAO::In_Basic_SArgument_T<S>::In_Basic_SArgument_T (void)
+TAO::In_Basic_SArgument_T<S,Insert_Policy>::In_Basic_SArgument_T (void)
 {}
 
-template<typename S>
+template<typename S, typename Insert_Policy>
 ACE_INLINE
 S
-TAO::In_Basic_SArgument_T<S>::arg (void) const
+TAO::In_Basic_SArgument_T<S,Insert_Policy>::arg (void) const
 {
   return this->x_;
 }
 
 // ================================================================
 
-template<typename S>
+template<typename S, typename Insert_Policy>
 ACE_INLINE
-TAO::Inout_Basic_SArgument_T<S>::Inout_Basic_SArgument_T (void)
+TAO::Inout_Basic_SArgument_T<S,Insert_Policy>::Inout_Basic_SArgument_T (void)
 {}
 
-template<typename S>
+template<typename S, typename Insert_Policy>
 ACE_INLINE
 S &
-TAO::Inout_Basic_SArgument_T<S>::arg (void)
+TAO::Inout_Basic_SArgument_T<S,Insert_Policy>::arg (void)
 {
   return this->x_;
 }
 
 // ================================================================
 
-template<typename S>
+template<typename S, typename Insert_Policy>
 ACE_INLINE
-TAO::Out_Basic_SArgument_T<S>::Out_Basic_SArgument_T (void)
+TAO::Out_Basic_SArgument_T<S,Insert_Policy>::Out_Basic_SArgument_T (void)
 {}
 
-template<typename S>
+template<typename S, typename Insert_Policy>
 ACE_INLINE
 S &
-TAO::Out_Basic_SArgument_T<S>::arg (void)
+TAO::Out_Basic_SArgument_T<S,Insert_Policy>::arg (void)
 {
   return this->x_;
 }
 
 // ================================================================
 
-template<typename S>
+template<typename S, typename Insert_Policy>
 ACE_INLINE
-TAO::Ret_Basic_SArgument_T<S>::Ret_Basic_SArgument_T (void)
+TAO::Ret_Basic_SArgument_T<S,Insert_Policy>::Ret_Basic_SArgument_T (void)
 {}
 
-template<typename S>
+template<typename S, typename Insert_Policy>
 ACE_INLINE
 S &
-TAO::Ret_Basic_SArgument_T<S>::arg (void)
+TAO::Ret_Basic_SArgument_T<S,Insert_Policy>::arg (void)
 {
   return this->x_;
 }
diff --git a/TAO/tao/PortableServer/Basic_SArguments.h b/TAO/tao/PortableServer/Basic_SArguments.h
index a61a5dc68b6..933476cb806 100644
--- a/TAO/tao/PortableServer/Basic_SArguments.h
+++ b/TAO/tao/PortableServer/Basic_SArguments.h
@@ -23,7 +23,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/PortableServer/Basic_SArgument_T.h"
-#include "tao/Arg_Traits_T.h"
+#include "tao/PortableServer/SArg_Traits_T.h"
 
 
 namespace TAO
@@ -39,7 +39,7 @@ namespace TAO
   public:
 
     typedef void        ret_type;
-    typedef Argument    ret_val;
+    typedef RetArgument ret_val;
 
   };
 
@@ -52,55 +52,55 @@ namespace TAO
 
   template<>
   class TAO_PortableServer_Export SArg_Traits<CORBA::Short>
-    : public Basic_SArg_Traits_T<CORBA::Short>
+    : public Basic_SArg_Traits_T<CORBA::Short, TAO::Any_Insert_Policy_Stream <CORBA::Short> >
   {
   };
 
   template<>
   class TAO_PortableServer_Export SArg_Traits<CORBA::Long>
-    : public Basic_SArg_Traits_T<CORBA::Long>
+    : public Basic_SArg_Traits_T<CORBA::Long, TAO::Any_Insert_Policy_Stream <CORBA::Long> >
   {
   };
 
   template<>
   class TAO_PortableServer_Export SArg_Traits<CORBA::UShort>
-    : public Basic_SArg_Traits_T<CORBA::UShort>
+    : public Basic_SArg_Traits_T<CORBA::UShort, TAO::Any_Insert_Policy_Stream <CORBA::UShort> >
   {
   };
 
   template<>
   class TAO_PortableServer_Export SArg_Traits<CORBA::ULong>
-    : public Basic_SArg_Traits_T<CORBA::ULong>
+    : public Basic_SArg_Traits_T<CORBA::ULong, TAO::Any_Insert_Policy_Stream <CORBA::ULong> >
   {
   };
 
   template<>
   class TAO_PortableServer_Export SArg_Traits<CORBA::Float>
-    : public Basic_SArg_Traits_T<CORBA::Float>
+    : public Basic_SArg_Traits_T<CORBA::Float, TAO::Any_Insert_Policy_Stream <CORBA::Float> >
   {
   };
 
   template<>
   class TAO_PortableServer_Export SArg_Traits<CORBA::Double>
-    : public Basic_SArg_Traits_T<CORBA::Double>
+    : public Basic_SArg_Traits_T<CORBA::Double, TAO::Any_Insert_Policy_Stream <CORBA::Double> >
   {
   };
 
   template<>
   class TAO_PortableServer_Export SArg_Traits<CORBA::LongLong>
-    : public Basic_SArg_Traits_T<CORBA::LongLong>
+    : public Basic_SArg_Traits_T<CORBA::LongLong, TAO::Any_Insert_Policy_Stream <CORBA::LongLong> >
   {
   };
 
   template<>
   class TAO_PortableServer_Export SArg_Traits<CORBA::ULongLong>
-    : public Basic_SArg_Traits_T<CORBA::ULongLong>
+    : public Basic_SArg_Traits_T<CORBA::ULongLong, TAO::Any_Insert_Policy_Stream <CORBA::ULongLong> >
   {
   };
 
   template<>
   class TAO_PortableServer_Export SArg_Traits<CORBA::LongDouble>
-    : public Basic_SArg_Traits_T<CORBA::LongDouble>
+    : public Basic_SArg_Traits_T<CORBA::LongDouble, TAO::Any_Insert_Policy_Stream <CORBA::LongDouble> >
   {
   };
 
diff --git a/TAO/tao/PortableServer/Fixed_Array_SArgument_T.cpp b/TAO/tao/PortableServer/Fixed_Array_SArgument_T.cpp
index 424e0a8f5b4..1d90e7de4bc 100644
--- a/TAO/tao/PortableServer/Fixed_Array_SArgument_T.cpp
+++ b/TAO/tao/PortableServer/Fixed_Array_SArgument_T.cpp
@@ -4,18 +4,20 @@
 #define TAO_FIXED_ARRAY_SARGUMENT_T_CPP
 
 #include "tao/PortableServer/Fixed_Array_SArgument_T.h"
-#include "tao/Dynamic_ParameterC.h"
 
 #if !defined (__ACE_INLINE__)
 #include "tao/PortableServer/Fixed_Array_SArgument_T.inl"
 #endif /* __ACE_INLINE__ */
 
-
-template<typename S, typename S_slice, typename S_forany>
+template<typename S,
+         typename S_slice,
+         typename S_forany,
+         typename Insert_Policy>
 CORBA::Boolean
 TAO::In_Fixed_Array_SArgument_T<S,
                                 S_slice,
-                                S_forany>::demarshal (TAO_InputCDR &cdr)
+                                S_forany,
+                                Insert_Policy>::demarshal (TAO_InputCDR &cdr)
 {
   S_forany tmp (this->x_);
   return cdr >> tmp;
@@ -23,36 +25,47 @@ TAO::In_Fixed_Array_SArgument_T<S,
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S, typename S_slice, typename S_forany>
+template<typename S,
+         typename S_slice,
+         typename S_forany,
+         typename Insert_Policy>
 void
 TAO::In_Fixed_Array_SArgument_T<S,
                                 S_slice,
-                                S_forany>::interceptor_param (
-    Dynamic::Parameter & p
-  )
+                                S_forany,
+                                Insert_Policy>::interceptor_value (
+    CORBA::Any *any) const
 {
-  p.argument <<= S_forany (this->x_);
-  p.mode = CORBA::PARAM_IN;
+  this->Insert_Policy::any_insert (any, S_forany (this->x_));
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // ===========================================================
 
-template<typename S, typename S_slice, typename S_forany>
+template<typename S,
+         typename S_slice,
+         typename S_forany,
+         typename Insert_Policy>
 CORBA::Boolean
 TAO::Inout_Fixed_Array_SArgument_T<S,
                                    S_slice,
-                                   S_forany>::marshal (TAO_OutputCDR & cdr)
+                                   S_forany,
+                                   Insert_Policy>::marshal (TAO_OutputCDR &cdr)
 {
   return cdr << S_forany (this->x_);
 }
 
-template<typename S, typename S_slice, typename S_forany>
+template<typename S,
+         typename S_slice,
+         typename S_forany,
+         typename Insert_Policy>
 CORBA::Boolean
 TAO::Inout_Fixed_Array_SArgument_T<S,
                                    S_slice,
-                                   S_forany>::demarshal (TAO_InputCDR & cdr)
+                                   S_forany,
+                                   Insert_Policy>::
+demarshal (TAO_InputCDR & cdr)
 {
   S_forany tmp (this->x_);
   return cdr >> tmp;
@@ -60,51 +73,66 @@ TAO::Inout_Fixed_Array_SArgument_T<S,
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S, typename S_slice, typename S_forany>
+template<typename S,
+         typename S_slice,
+         typename S_forany,
+         typename Insert_Policy>
 void
 TAO::Inout_Fixed_Array_SArgument_T<S,
                                    S_slice,
-                                   S_forany>::interceptor_param (
-    Dynamic::Parameter & p
-  )
+                                   S_forany,
+                                   Insert_Policy>::interceptor_value (
+    CORBA::Any *any) const
 {
-  p.argument <<= S_forany (this->x_);
-  p.mode = CORBA::PARAM_INOUT;
+  this->Insert_Policy::any_insert (any, S_forany (this->x_));
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // ==============================================================
 
-template<typename S, typename S_slice, typename S_forany>
+template<typename S,
+         typename S_slice,
+         typename S_forany,
+         typename Insert_Policy>
 CORBA::Boolean
 TAO::Out_Fixed_Array_SArgument_T<S,
                                  S_slice,
-                                 S_forany>::marshal (TAO_OutputCDR &cdr)
+                                 S_forany,
+                                 Insert_Policy>::marshal (TAO_OutputCDR &cdr)
 {
   return cdr << S_forany (this->x_);
 }
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S, typename S_slice, typename S_forany>
+template<typename S,
+         typename S_slice,
+         typename S_forany,
+         typename Insert_Policy>
 void
 TAO::Out_Fixed_Array_SArgument_T<S,
                                  S_slice,
-                                 S_forany>::interceptor_param (
-    Dynamic::Parameter & p)
+                                 S_forany,
+                                 Insert_Policy>::interceptor_value (
+    CORBA::Any *any) const
 {
-  p.argument <<= S_forany (this->x_);
-  p.mode = CORBA::PARAM_OUT;
+  this->Insert_Policy::any_insert (any, S_forany (this->x_));
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // ============================================================
 
-template<typename S_slice, typename S_var, typename S_forany>
+template<typename S_slice,
+         typename S_var,
+         typename S_forany,
+         typename Insert_Policy>
 CORBA::Boolean
-TAO::Ret_Fixed_Array_SArgument_T<S_slice,S_var,S_forany>::marshal (
+TAO::Ret_Fixed_Array_SArgument_T<S_slice,
+                                 S_var,
+                                 S_forany,
+                                 Insert_Policy>::marshal (
     TAO_OutputCDR & cdr
   )
 {
@@ -113,13 +141,18 @@ TAO::Ret_Fixed_Array_SArgument_T<S_slice,S_var,S_forany>::marshal (
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S_slice, typename S_var, typename S_forany>
+template<typename S_slice,
+         typename S_var,
+         typename S_forany,
+         typename Insert_Policy>
 void
-TAO::Ret_Fixed_Array_SArgument_T<S_slice,S_var,S_forany>::interceptor_result (
-    CORBA::Any * any
-  )
+TAO::Ret_Fixed_Array_SArgument_T<S_slice,
+                                 S_var,
+                                 S_forany,
+                                 Insert_Policy>::interceptor_value (
+  CORBA::Any *any) const
 {
-  (*any) <<= S_forany (this->x_.ptr ());
+  this->Insert_Policy::any_insert (any, S_forany (this->x_.ptr ()));
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
diff --git a/TAO/tao/PortableServer/Fixed_Array_SArgument_T.h b/TAO/tao/PortableServer/Fixed_Array_SArgument_T.h
index bfd112ad36c..369fd9afe4d 100644
--- a/TAO/tao/PortableServer/Fixed_Array_SArgument_T.h
+++ b/TAO/tao/PortableServer/Fixed_Array_SArgument_T.h
@@ -30,15 +30,18 @@ namespace TAO
    * @brief IN skeleton argument of fixed size element array.
    *
    */
-  template<typename S, typename S_slice, typename S_forany>
-  class In_Fixed_Array_SArgument_T : public Argument
+  template<typename S,
+           typename S_slice,
+           typename S_forany,
+           typename Insert_Policy>
+  class In_Fixed_Array_SArgument_T : public InArgument, private Insert_Policy
   {
   public:
     In_Fixed_Array_SArgument_T (void);
 
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S_slice const * arg (void) const;
 
@@ -52,16 +55,19 @@ namespace TAO
    * @brief INOUT skeleton argument of fixed size element array.
    *
    */
-  template<typename S, typename S_slice, typename S_forany>
-  class Inout_Fixed_Array_SArgument_T : public Argument
+  template<typename S,
+           typename S_slice,
+           typename S_forany,
+           typename Insert_Policy>
+  class Inout_Fixed_Array_SArgument_T : public InoutArgument, private Insert_Policy
   {
   public:
     Inout_Fixed_Array_SArgument_T (void);
 
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
-    virtual CORBA::Boolean demarshal (TAO_InputCDR &);
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
+    virtual CORBA::Boolean demarshal (TAO_InputCDR &cdr);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S_slice * arg (void);
 
@@ -75,15 +81,18 @@ namespace TAO
    * @brief OUT skeleton argument of fixed size element array.
    *
    */
-  template<typename S, typename S_slice, typename S_forany>
-  class Out_Fixed_Array_SArgument_T : public Argument
+  template<typename S,
+           typename S_slice,
+           typename S_forany,
+           typename Insert_Policy>
+  class Out_Fixed_Array_SArgument_T : public OutArgument, private Insert_Policy
   {
   public:
     Out_Fixed_Array_SArgument_T (void);
 
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S_slice * arg (void);
 
@@ -97,15 +106,18 @@ namespace TAO
    * @brief Skeleton value of fixed size element array.
    *
    */
-  template<typename S_slice, typename S_var, typename S_forany>
-  class Ret_Fixed_Array_SArgument_T : public Argument
+  template<typename S_slice,
+           typename S_var,
+           typename S_forany,
+           typename Insert_Policy>
+  class Ret_Fixed_Array_SArgument_T : public RetArgument, private Insert_Policy
   {
   public:
     Ret_Fixed_Array_SArgument_T (void);
 
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_result (CORBA::Any *);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S_slice *& arg (void);
 
@@ -122,33 +134,38 @@ namespace TAO
   template<typename T,
            typename T_slice,
            typename T_var,
-           typename T_forany>
+           typename T_forany,
+           typename Insert_Policy>
   struct Fixed_Array_SArg_Traits_T
   {
-    typedef T_slice *                                   ret_type;
-    typedef const T                                     in_type;
-    typedef T                                           inout_type;
-    typedef T                                           out_type;
+    typedef T_slice *                                    ret_type;
+    typedef const T                                      in_type;
+    typedef T                                            inout_type;
+    typedef T                                            out_type;
 
     typedef In_Fixed_Array_SArgument_T<T,
                                        T_slice,
-                                       T_forany>        in_arg_val;
+                                       T_forany,
+                                       Insert_Policy>    in_arg_val;
     typedef Inout_Fixed_Array_SArgument_T<T,
                                           T_slice,
-                                          T_forany>     inout_arg_val;
+                                          T_forany,
+                                          Insert_Policy> inout_arg_val;
     typedef Out_Fixed_Array_SArgument_T<T,
                                         T_slice,
-                                        T_forany>       out_arg_val;
+                                        T_forany,
+                                        Insert_Policy>   out_arg_val;
     typedef Ret_Fixed_Array_SArgument_T<T_slice,
                                         T_var,
-                                        T_forany>       ret_val;
+                                        T_forany,
+                                        Insert_Policy>   ret_val;
 
     // Typedefs corresponding to return value of arg() method in both
     // the client and server side argument class templates.
-    typedef T_slice const *                             in_arg_type;
-    typedef ret_type                                    inout_arg_type;
-    typedef ret_type                                    out_arg_type;
-    typedef ret_type &                                  ret_arg_type;
+    typedef T_slice const *                              in_arg_type;
+    typedef ret_type                                     inout_arg_type;
+    typedef ret_type                                     out_arg_type;
+    typedef ret_type &                                   ret_arg_type;
 
   };
 }
diff --git a/TAO/tao/PortableServer/Fixed_Array_SArgument_T.inl b/TAO/tao/PortableServer/Fixed_Array_SArgument_T.inl
index 65b78d9416d..24a54390d96 100644
--- a/TAO/tao/PortableServer/Fixed_Array_SArgument_T.inl
+++ b/TAO/tao/PortableServer/Fixed_Array_SArgument_T.inl
@@ -2,17 +2,28 @@
 //
 // $Id$
 
-template<typename S, typename S_slice, typename S_forany>
+template<typename S,
+         typename S_slice,
+         typename S_forany,
+         typename Insert_Policy>
 ACE_INLINE
 TAO::In_Fixed_Array_SArgument_T<S,
                                 S_slice,
-                                S_forany>::In_Fixed_Array_SArgument_T (void)
-{}
+                                S_forany,
+                                Insert_Policy>::In_Fixed_Array_SArgument_T (void)
+{
+}
 
-template<typename S, typename S_slice, typename S_forany>
+template<typename S,
+         typename S_slice,
+         typename S_forany,
+         typename Insert_Policy>
 ACE_INLINE
 S_slice const *
-TAO::In_Fixed_Array_SArgument_T<S, S_slice, S_forany>::arg (void) const
+TAO::In_Fixed_Array_SArgument_T<S,
+                                S_slice,
+                                S_forany,
+                                Insert_Policy>::arg (void) const
 {
   S_forany tmp (this->x_);
   return tmp.in ();
@@ -20,20 +31,29 @@ TAO::In_Fixed_Array_SArgument_T<S, S_slice, S_forany>::arg (void) const
 
 // ===========================================================================
 
-template<typename S, typename S_slice, typename S_forany>
+template<typename S,
+         typename S_slice,
+         typename S_forany,
+         typename Insert_Policy>
 ACE_INLINE
 TAO::Inout_Fixed_Array_SArgument_T<S,
                                    S_slice,
-                                   S_forany>::
+                                   S_forany,
+                                   Insert_Policy>::
 Inout_Fixed_Array_SArgument_T (void)
-{}
+{
+}
 
-template<typename S, typename S_slice, typename S_forany>
+template<typename S,
+         typename S_slice,
+         typename S_forany,
+         typename Insert_Policy>
 ACE_INLINE
 S_slice *
 TAO::Inout_Fixed_Array_SArgument_T<S,
                                    S_slice,
-                                   S_forany>::arg (void)
+                                   S_forany,
+                                   Insert_Policy>::arg (void)
 {
   S_forany tmp (this->x_);
   return tmp.inout ();
@@ -41,19 +61,29 @@ TAO::Inout_Fixed_Array_SArgument_T<S,
 
 // ===========================================================================
 
-template<typename S, typename S_slice, typename S_forany>
+template<typename S,
+         typename S_slice,
+         typename S_forany,
+         typename Insert_Policy>
 ACE_INLINE
 TAO::Out_Fixed_Array_SArgument_T<S,
                                  S_slice,
-                                 S_forany>::Out_Fixed_Array_SArgument_T (void)
-{}
+                                 S_forany,
+                                 Insert_Policy>::
+Out_Fixed_Array_SArgument_T (void)
+{
+}
 
-template<typename S, typename S_slice, typename S_forany>
+template<typename S,
+         typename S_slice,
+         typename S_forany,
+         typename Insert_Policy>
 ACE_INLINE
 S_slice *
 TAO::Out_Fixed_Array_SArgument_T<S,
                                  S_slice,
-                                 S_forany>::arg (void)
+                                 S_forany,
+                                 Insert_Policy>::arg (void)
 {
   S_forany tmp (this->x_);
   return tmp.inout ();
@@ -61,16 +91,29 @@ TAO::Out_Fixed_Array_SArgument_T<S,
 
 // ===========================================================================
 
-template<typename S_slice, typename S_var, typename S_forany>
+template<typename S_slice,
+         typename S_var,
+         typename S_forany,
+         typename Insert_Policy>
 ACE_INLINE
-TAO::Ret_Fixed_Array_SArgument_T<S_slice,S_var,S_forany>::
+TAO::Ret_Fixed_Array_SArgument_T<S_slice,
+                                 S_var,
+                                 S_forany,
+                                 Insert_Policy>::
 Ret_Fixed_Array_SArgument_T (void)
-{}
+{
+}
 
-template<typename S_slice, typename S_var, typename S_forany>
+template<typename S_slice,
+         typename S_var,
+         typename S_forany,
+         typename Insert_Policy>
 ACE_INLINE
 S_slice *&
-TAO::Ret_Fixed_Array_SArgument_T<S_slice,S_var,S_forany>::arg (void)
+TAO::Ret_Fixed_Array_SArgument_T<S_slice,
+                                 S_var,
+                                 S_forany,
+                                 Insert_Policy>::arg (void)
 {
   return this->x_._retn_arg ();
 }
diff --git a/TAO/tao/PortableServer/Fixed_Size_SArgument_T.cpp b/TAO/tao/PortableServer/Fixed_Size_SArgument_T.cpp
index e31e1aef094..a145529ec0c 100644
--- a/TAO/tao/PortableServer/Fixed_Size_SArgument_T.cpp
+++ b/TAO/tao/PortableServer/Fixed_Size_SArgument_T.cpp
@@ -5,101 +5,106 @@
 
 #include "tao/PortableServer/Fixed_Size_SArgument_T.h"
 
-#if TAO_HAS_INTERCEPTORS == 1
-# include "tao/Dynamic_ParameterC.h"
-#endif  /* TAO_HAS_INTERCEPTORS == 1 */
-
 #if !defined (__ACE_INLINE__)
 #include "tao/PortableServer/Fixed_Size_SArgument_T.inl"
 #endif /* __ACE_INLINE__ */
 
 
-template<typename S>
+template<typename S,
+         typename Insert_Policy>
 CORBA::Boolean
-TAO::In_Fixed_Size_SArgument_T<S>::demarshal (TAO_InputCDR & cdr)
+TAO::In_Fixed_Size_SArgument_T<S,Insert_Policy>::demarshal (TAO_InputCDR & cdr)
 {
   return cdr >> this->x_;
 }
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S>
+template<typename S,
+         typename Insert_Policy>
 void
-TAO::In_Fixed_Size_SArgument_T<S>::interceptor_param (Dynamic::Parameter & p)
+TAO::In_Fixed_Size_SArgument_T<S,Insert_Policy>::interceptor_value (
+  CORBA::Any *any) const
 {
-  p.argument <<= this->x_;
-  p.mode = CORBA::PARAM_IN;
+  this->Insert_Policy::any_insert (any, this->x_);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // ===========================================================
 
-template<typename S>
+template<typename S,
+         typename Insert_Policy>
 CORBA::Boolean
-TAO::Inout_Fixed_Size_SArgument_T<S>::marshal (TAO_OutputCDR & cdr)
+TAO::Inout_Fixed_Size_SArgument_T<S,Insert_Policy>::marshal (TAO_OutputCDR &cdr)
 {
   return cdr << this->x_;
 }
 
-template<typename S>
+template<typename S,
+         typename Insert_Policy>
 CORBA::Boolean
-TAO::Inout_Fixed_Size_SArgument_T<S>::demarshal (TAO_InputCDR & cdr)
+TAO::Inout_Fixed_Size_SArgument_T<S,Insert_Policy>::demarshal (
+  TAO_InputCDR & cdr)
 {
   return cdr >> this->x_;
 }
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S>
+template<typename S,
+         typename Insert_Policy>
 void
-TAO::Inout_Fixed_Size_SArgument_T<S>::interceptor_param (
-    Dynamic::Parameter & p
-  )
+TAO::Inout_Fixed_Size_SArgument_T<S,Insert_Policy>::interceptor_value (
+  CORBA::Any *any) const
 {
-  p.argument <<= this->x_;
-  p.mode = CORBA::PARAM_INOUT;
+  this->Insert_Policy::any_insert (any, this->x_);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // ==============================================================
 
-template<typename S>
+template<typename S,
+         typename Insert_Policy>
 CORBA::Boolean
-TAO::Out_Fixed_Size_SArgument_T<S>::marshal (TAO_OutputCDR &cdr)
+TAO::Out_Fixed_Size_SArgument_T<S,Insert_Policy>::marshal (TAO_OutputCDR &cdr)
 {
   return cdr << this->x_;
 }
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S>
+template<typename S,
+         typename Insert_Policy>
 void
-TAO::Out_Fixed_Size_SArgument_T<S>::interceptor_param (Dynamic::Parameter & p)
+TAO::Out_Fixed_Size_SArgument_T<S,Insert_Policy>::interceptor_value (
+  CORBA::Any *any) const
 {
-  p.argument <<= this->x_;
-  p.mode = CORBA::PARAM_OUT;
+  this->Insert_Policy::any_insert (any, this->x_);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // ============================================================
 
-template<typename S>
+template<typename S,
+         typename Insert_Policy>
 CORBA::Boolean
-TAO::Ret_Fixed_Size_SArgument_T<S>::marshal (TAO_OutputCDR & cdr)
+TAO::Ret_Fixed_Size_SArgument_T<S,Insert_Policy>::marshal (TAO_OutputCDR &cdr)
 {
   return cdr << this->x_;
 }
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S>
+template<typename S,
+         typename Insert_Policy>
 void
-TAO::Ret_Fixed_Size_SArgument_T<S>::interceptor_result (CORBA::Any * any)
+TAO::Ret_Fixed_Size_SArgument_T<S,Insert_Policy>::interceptor_value (
+  CORBA::Any *any) const
 {
-  (*any) <<= this->x_;
+  this->Insert_Policy::any_insert (any, this->x_);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
diff --git a/TAO/tao/PortableServer/Fixed_Size_SArgument_T.h b/TAO/tao/PortableServer/Fixed_Size_SArgument_T.h
index dda407ab99c..b7d77ee05d3 100644
--- a/TAO/tao/PortableServer/Fixed_Size_SArgument_T.h
+++ b/TAO/tao/PortableServer/Fixed_Size_SArgument_T.h
@@ -35,8 +35,8 @@ namespace TAO
    * Skeleton class template for operation "IN" arguments of fixed
    * size IDL types.
    */
-  template<typename S>
-  class In_Fixed_Size_SArgument_T : public Argument
+  template<typename S, typename Insert_Policy>
+  class In_Fixed_Size_SArgument_T : public InArgument, private Insert_Policy
   {
   public:
 
@@ -52,7 +52,7 @@ namespace TAO
     virtual CORBA::Boolean demarshal (TAO_InputCDR & cdr);
 
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter & p);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     //@}
 
@@ -74,8 +74,8 @@ namespace TAO
    * @brief Template class for INOUT skeleton arg of fixed size IDL types.
    *
    */
-  template<typename S>
-  class Inout_Fixed_Size_SArgument_T : public Argument
+  template<typename S, typename Insert_Policy>
+  class Inout_Fixed_Size_SArgument_T : public InoutArgument, private Insert_Policy
   {
   public:
 
@@ -91,10 +91,10 @@ namespace TAO
      * @see @c TAO::Argument.
      */
     //@{
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     //@}
 
@@ -113,8 +113,8 @@ namespace TAO
    * @brief Template class for OUT skeleton argument of fixed size IDL types.
    *
    */
-  template<typename S>
-  class Out_Fixed_Size_SArgument_T : public Argument
+  template<typename S, typename Insert_Policy>
+  class Out_Fixed_Size_SArgument_T : public OutArgument, private Insert_Policy
   {
   public:
 
@@ -130,9 +130,9 @@ namespace TAO
      * @see @c TAO::Argument.
      */
     //@{
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     //@}
 
@@ -152,8 +152,8 @@ namespace TAO
    * @brief Template class for return skeleton value of fixed size IDL types.
    *
    */
-  template<typename S>
-  class Ret_Fixed_Size_SArgument_T : public Argument
+  template<typename S, typename Insert_Policy>
+  class Ret_Fixed_Size_SArgument_T : public RetArgument, private Insert_Policy
   {
   public:
 
@@ -169,9 +169,9 @@ namespace TAO
      * @see @c TAO::Argument.
      */
     //@{
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_result (CORBA::Any *);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     //@}
 
@@ -191,25 +191,25 @@ namespace TAO
    * @brief Template class for argument traits of fixed size IDL types.
    *
    */
-  template<typename T>
+  template<typename T, typename Insert_Policy>
   struct Fixed_Size_SArg_Traits_T
   {
-    typedef T                                 ret_type;
-    typedef T const &                         in_type;
-    typedef T &                               inout_type;
-    typedef T &                               out_type;
+    typedef T                                               ret_type;
+    typedef T const &                                       in_type;
+    typedef T &                                             inout_type;
+    typedef T &                                             out_type;
 
-    typedef In_Fixed_Size_SArgument_T<T>      in_arg_val;
-    typedef Inout_Fixed_Size_SArgument_T<T>   inout_arg_val;
-    typedef Out_Fixed_Size_SArgument_T<T>     out_arg_val;
-    typedef Ret_Fixed_Size_SArgument_T<T>     ret_val;
+    typedef In_Fixed_Size_SArgument_T<T,Insert_Policy>      in_arg_val;
+    typedef Inout_Fixed_Size_SArgument_T<T,Insert_Policy>   inout_arg_val;
+    typedef Out_Fixed_Size_SArgument_T<T,Insert_Policy>     out_arg_val;
+    typedef Ret_Fixed_Size_SArgument_T<T,Insert_Policy>     ret_val;
 
     // Typedefs corresponding to return value of arg() method in both
     // the client and server side argument class templates.
-    typedef in_type                           in_arg_type;
-    typedef inout_type                        inout_arg_type;
-    typedef out_type                          out_arg_type;
-    typedef out_type                          ret_arg_type;
+    typedef in_type                                         in_arg_type;
+    typedef inout_type                                      inout_arg_type;
+    typedef out_type                                        out_arg_type;
+    typedef out_type                                        ret_arg_type;
 
   };
 
diff --git a/TAO/tao/PortableServer/Fixed_Size_SArgument_T.inl b/TAO/tao/PortableServer/Fixed_Size_SArgument_T.inl
index 0455d607179..05e29ce35a6 100644
--- a/TAO/tao/PortableServer/Fixed_Size_SArgument_T.inl
+++ b/TAO/tao/PortableServer/Fixed_Size_SArgument_T.inl
@@ -2,53 +2,66 @@
 //
 // $Id$
 
-template<typename S>
+template<typename S,
+         typename Insert_Policy>
 ACE_INLINE
 S const &
-TAO::In_Fixed_Size_SArgument_T<S>::arg (void) const
+TAO::In_Fixed_Size_SArgument_T<S,Insert_Policy>::arg (void) const
 {
   return this->x_;
 }
 
 // ==========================================================================
 
-template<typename S>
+template<typename S,
+         typename Insert_Policy>
 ACE_INLINE
-TAO::Inout_Fixed_Size_SArgument_T<S>::Inout_Fixed_Size_SArgument_T (void)
-{}
+TAO::Inout_Fixed_Size_SArgument_T<S,Insert_Policy>::
+Inout_Fixed_Size_SArgument_T (void)
+{
+}
 
-template<typename S>
+template<typename S,
+         typename Insert_Policy>
+ACE_INLINE
 S &
-TAO::Inout_Fixed_Size_SArgument_T<S>::arg (void)
+TAO::Inout_Fixed_Size_SArgument_T<S,Insert_Policy>::arg (void)
 {
   return this->x_;
 }
 
 // ==========================================================================
 
-template<typename S>
+template<typename S,
+         typename Insert_Policy>
 ACE_INLINE
-TAO::Out_Fixed_Size_SArgument_T<S>::Out_Fixed_Size_SArgument_T (void)
+TAO::Out_Fixed_Size_SArgument_T<S,
+                                Insert_Policy>::
+Out_Fixed_Size_SArgument_T (void)
 {}
 
-template<typename S>
+template<typename S,
+         typename Insert_Policy>
+ACE_INLINE
 S &
-TAO::Out_Fixed_Size_SArgument_T<S>::arg (void)
+TAO::Out_Fixed_Size_SArgument_T<S,Insert_Policy>::arg (void)
 {
   return this->x_;
 }
 
 // ==========================================================================
 
-template<typename S>
+template<typename S,
+         typename Insert_Policy>
 ACE_INLINE
-TAO::Ret_Fixed_Size_SArgument_T<S>::Ret_Fixed_Size_SArgument_T (void)
+TAO::Ret_Fixed_Size_SArgument_T<S,Insert_Policy>::Ret_Fixed_Size_SArgument_T (void)
 {}
 
-template<typename S>
+template<typename S,
+         typename Insert_Policy>
 ACE_INLINE
 S &
-TAO::Ret_Fixed_Size_SArgument_T<S>::arg (void)
+TAO::Ret_Fixed_Size_SArgument_T<S,Insert_Policy>::arg (void)
 {
   return this->x_;
 }
diff --git a/TAO/tao/PortableServer/ForwardRequestA.cpp b/TAO/tao/PortableServer/ForwardRequestA.cpp
index 618f11ee0db..94b7aa7216f 100644
--- a/TAO/tao/PortableServer/ForwardRequestA.cpp
+++ b/TAO/tao/PortableServer/ForwardRequestA.cpp
@@ -25,15 +25,21 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "ForwardRequestC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Struct_TypeCode_Static.h"
-#include "tao/TypeCode_Struct_Field.h"
+#include "ForwardRequestA.h"
+#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Struct_TypeCode_Static.h"
+#include "tao/AnyTypeCode/TypeCode_Struct_Field.h"
 #include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Dual_Impl_T.h"
+#include "tao/AnyTypeCode/Any.h"
+#include "tao/AnyTypeCode/Any_Dual_Impl_T.h"
+
+// TAO extension - the virtual _type method.
+CORBA::TypeCode_ptr PortableServer::ForwardRequest::_tao_type (void) const
+{
+  return ::PortableServer::_tc_ForwardRequest;
+}
 
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/struct_typecode.cpp:87
diff --git a/TAO/tao/PortableServer/ForwardRequestA.h b/TAO/tao/PortableServer/ForwardRequestA.h
new file mode 100644
index 00000000000..11f8a66ffd8
--- /dev/null
+++ b/TAO/tao/PortableServer/ForwardRequestA.h
@@ -0,0 +1,66 @@
+// -*- C++ -*-
+//
+// $Id$
+
+// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       Irvine, CA
+//       USA
+//       http://doc.ece.uci.edu/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
+//
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
+
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:754
+
+#ifndef _TAO_IDL_FORWARDREQUESTA_H_
+#define _TAO_IDL_FORWARDREQUESTA_H_
+
+#include /**/ "ace/pre.h"
+
+#include "portableserver_export.h"
+#include "ForwardRequestC.h"
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:59
+
+namespace PortableServer
+{
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+  
+  extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_ForwardRequest;
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:86
+
+} // module PortableServer
+
+// TAO_IDL - Generated from
+// be\be_visitor_exception/any_op_ch.cpp:53
+
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, const PortableServer::ForwardRequest &); // copying version
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ForwardRequest*); // noncopying version
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ForwardRequest *&); // deprecated
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableServer::ForwardRequest *&);
+
+#include /**/ "ace/post.h"
+
+#endif /* ifndef */
diff --git a/TAO/tao/PortableServer/ForwardRequestC.cpp b/TAO/tao/PortableServer/ForwardRequestC.cpp
index 1389d40971e..c062858725e 100644
--- a/TAO/tao/PortableServer/ForwardRequestC.cpp
+++ b/TAO/tao/PortableServer/ForwardRequestC.cpp
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:291
+// be\be_codegen.cpp:277
 
 
 #include "ForwardRequestC.h"
@@ -34,10 +34,6 @@
 #include "tao/SystemException.h"
 #include "ace/OS_NS_string.h"
 
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
 #if (TAO_HAS_MINIMUM_POA == 0)
 
 // TAO_IDL - Generated from
@@ -166,11 +162,7 @@ PortableServer::ForwardRequest::ForwardRequest (
   this->forward_reference = CORBA::Object::_duplicate (_tao_forward_reference);
 }
 
-// TAO extension - the virtual _type method.
-CORBA::TypeCode_ptr PortableServer::ForwardRequest::_tao_type (void) const
-{
-  return ::PortableServer::_tc_ForwardRequest;
-}
+
 
 // TAO_IDL - Generated from
 // be\be_visitor_exception/cdr_op_cs.cpp:60
diff --git a/TAO/tao/PortableServer/ForwardRequestC.h b/TAO/tao/PortableServer/ForwardRequestC.h
index a9f92232cc7..54511944fb5 100644
--- a/TAO/tao/PortableServer/ForwardRequestC.h
+++ b/TAO/tao/PortableServer/ForwardRequestC.h
@@ -26,10 +26,10 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:153
+// be\be_codegen.cpp:154
 
-#ifndef _TAO_IDL_ORIG_FORWARDREQUESTC_H_
-#define _TAO_IDL_ORIG_FORWARDREQUESTC_H_
+#ifndef _TAO_IDL_FORWARDREQUESTC_H_
+#define _TAO_IDL_FORWARDREQUESTC_H_
 
 #include /**/ "ace/pre.h"
 
@@ -50,47 +50,38 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_PortableServer_Export
 
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
 #if (TAO_HAS_MINIMUM_POA == 0)
 
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:49
 
 namespace PortableServer
 {
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_exception/exception_ch.cpp:53
 
 #if !defined (_PORTABLESERVER_FORWARDREQUEST_CH_)
 #define _PORTABLESERVER_FORWARDREQUEST_CH_
-  
+
   class TAO_PortableServer_Export ForwardRequest : public CORBA::UserException
   {
   public:
-    
+
     CORBA::Object_var forward_reference;
     ForwardRequest (void);
     ForwardRequest (const ForwardRequest &);
     ~ForwardRequest (void);
 
     ForwardRequest &operator= (const ForwardRequest &);
-    
+
     static void _tao_any_destructor (void *);
-    
+
     static ForwardRequest *_downcast (CORBA::Exception *);
     static const ForwardRequest *_downcast (CORBA::Exception const *);
-    
+
     static CORBA::Exception *_alloc (void);
-    
+
     virtual CORBA::Exception *_tao_duplicate (void) const;
 
     virtual void _raise (void) const;
@@ -99,34 +90,29 @@ namespace PortableServer
         TAO_OutputCDR &
         ACE_ENV_ARG_DECL
       ) const;
-    
+
     virtual void _tao_decode (
         TAO_InputCDR &
         ACE_ENV_ARG_DECL
       );
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_exception/exception_ctor.cpp:66
-    
+
     ForwardRequest (
         const CORBA::Object_ptr  _tao_forward_reference
       );
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_exception/exception_ch.cpp:129
-    
+
     virtual CORBA::TypeCode_ptr _tao_type (void) const;
   };
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_ForwardRequest;
 
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:78
 
 } // module PortableServer
 
@@ -139,31 +125,15 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_exception/any_op_ch.cpp:52
-
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, const PortableServer::ForwardRequest &); // copying version
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ForwardRequest*); // noncopying version
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ForwardRequest *&); // deprecated
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableServer::ForwardRequest *&);
-
-// TAO_IDL - Generated from
 // be\be_visitor_exception/cdr_op_ch.cpp:52
 
 TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const PortableServer::ForwardRequest &);
 TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::ForwardRequest &);
 
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
 #endif /* TAO_HAS_MINIMUM_CORBA == 0 */
 
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:1028
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/tao/PortableServer/IdAssignmentPolicyA.cpp b/TAO/tao/PortableServer/IdAssignmentPolicyA.cpp
index d1dbdf43bb3..395f34da510 100644
--- a/TAO/tao/PortableServer/IdAssignmentPolicyA.cpp
+++ b/TAO/tao/PortableServer/IdAssignmentPolicyA.cpp
@@ -25,16 +25,16 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "IdAssignmentPolicyC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Enum_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
+#include "IdAssignmentPolicyA.h"
+#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Enum_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
 #include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
-#include "tao/Any_Basic_Impl_T.h"
+#include "tao/AnyTypeCode/Any.h"
+#include "tao/AnyTypeCode/Any_Impl_T.h"
+#include "tao/AnyTypeCode/Any_Basic_Impl_T.h"
 
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/enum_typecode.cpp:34
@@ -108,78 +108,3 @@ CORBA::Boolean operator>>= (
         _tao_elem 
       );
 }
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableServer::IdAssignmentPolicy>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableServer::IdAssignmentPolicy>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-  
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableServer::IdAssignmentPolicy>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableServer::IdAssignmentPolicy_ptr _tao_elem
-  )
-{
-  PortableServer::IdAssignmentPolicy_ptr _tao_objptr =
-    PortableServer::IdAssignmentPolicy::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableServer::IdAssignmentPolicy_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<PortableServer::IdAssignmentPolicy>::insert (
-      _tao_any,
-      PortableServer::IdAssignmentPolicy::_tao_any_destructor,
-      PortableServer::_tc_IdAssignmentPolicy,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    PortableServer::IdAssignmentPolicy_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<PortableServer::IdAssignmentPolicy>::extract (
-        _tao_any,
-        PortableServer::IdAssignmentPolicy::_tao_any_destructor,
-        PortableServer::_tc_IdAssignmentPolicy,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/PortableServer/IdAssignmentPolicyA.h b/TAO/tao/PortableServer/IdAssignmentPolicyA.h
new file mode 100644
index 00000000000..5e640efa07f
--- /dev/null
+++ b/TAO/tao/PortableServer/IdAssignmentPolicyA.h
@@ -0,0 +1,70 @@
+// -*- C++ -*-
+//
+// $Id$
+
+// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       Irvine, CA
+//       USA
+//       http://doc.ece.uci.edu/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
+//
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
+
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:754
+
+#ifndef _TAO_IDL_IDASSIGNMENTPOLICYA_H_
+#define _TAO_IDL_IDASSIGNMENTPOLICYA_H_
+
+#include /**/ "ace/pre.h"
+
+#include "portableserver_export.h"
+#include "IdAssignmentPolicyC.h"
+#include "tao/AnyTypeCode/PolicyA.h"
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:59
+
+namespace PortableServer
+{
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+  
+  extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_IdAssignmentPolicyValue;
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+  
+  extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_IdAssignmentPolicy;
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:86
+
+} // module PortableServer
+
+// TAO_IDL - Generated from
+// be\be_visitor_enum/any_op_ch.cpp:52
+
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::IdAssignmentPolicyValue);
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::IdAssignmentPolicyValue &);
+
+#include /**/ "ace/post.h"
+
+#endif /* ifndef */
diff --git a/TAO/tao/PortableServer/IdAssignmentPolicyC.cpp b/TAO/tao/PortableServer/IdAssignmentPolicyC.cpp
index 5dac367c80d..dae4a91d05b 100644
--- a/TAO/tao/PortableServer/IdAssignmentPolicyC.cpp
+++ b/TAO/tao/PortableServer/IdAssignmentPolicyC.cpp
@@ -26,17 +26,13 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:291
+// be\be_codegen.cpp:277
 
 
 #include "IdAssignmentPolicyC.h"
 #include "tao/CDR.h"
 #include "ace/OS_NS_string.h"
 
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
@@ -88,14 +84,6 @@ PortableServer::IdAssignmentPolicy::IdAssignmentPolicy (void)
 PortableServer::IdAssignmentPolicy::~IdAssignmentPolicy (void)
 {}
 
-void 
-PortableServer::IdAssignmentPolicy::_tao_any_destructor (void *_tao_void_pointer)
-{
-  IdAssignmentPolicy *_tao_tmp_pointer =
-    static_cast<IdAssignmentPolicy *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
 PortableServer::IdAssignmentPolicy_ptr
 PortableServer::IdAssignmentPolicy::_narrow (
     CORBA::Object_ptr _tao_objref
diff --git a/TAO/tao/PortableServer/IdAssignmentPolicyC.h b/TAO/tao/PortableServer/IdAssignmentPolicyC.h
index 1773460d112..f7c43ec160d 100644
--- a/TAO/tao/PortableServer/IdAssignmentPolicyC.h
+++ b/TAO/tao/PortableServer/IdAssignmentPolicyC.h
@@ -26,10 +26,10 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:153
+// be\be_codegen.cpp:154
 
-#ifndef _TAO_IDL_ORIG_IDASSIGNMENTPOLICYC_H_
-#define _TAO_IDL_ORIG_IDASSIGNMENTPOLICYC_H_
+#ifndef _TAO_IDL_IDASSIGNMENTPOLICYC_H_
+#define _TAO_IDL_IDASSIGNMENTPOLICYC_H_
 
 #include /**/ "ace/pre.h"
 
@@ -54,17 +54,8 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_PortableServer_Export
 
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:49
 
 namespace PortableServer
 {
@@ -81,11 +72,6 @@ namespace PortableServer
   typedef IdAssignmentPolicyValue &IdAssignmentPolicyValue_out;
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_IdAssignmentPolicyValue;
-  
-  // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_PORTABLESERVER_IDASSIGNMENTPOLICY__VAR_OUT_CH_)
@@ -141,7 +127,7 @@ namespace PortableServer
       return static_cast<IdAssignmentPolicy_ptr> (0);
     }
     
-    static void _tao_any_destructor (void *);
+    
     
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
@@ -198,14 +184,9 @@ namespace PortableServer
   };
 
 #endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_IdAssignmentPolicy;
 
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:78
 
 } // module PortableServer
 
@@ -216,8 +197,8 @@ namespace PortableServer
 namespace TAO
 {
 
-#if !defined (_PORTABLESERVER_IDASSIGNMENTPOLICY__TRAITS_CH_)
-#define _PORTABLESERVER_IDASSIGNMENTPOLICY__TRAITS_CH_
+#if !defined (_PORTABLESERVER_IDASSIGNMENTPOLICY__TRAITS_)
+#define _PORTABLESERVER_IDASSIGNMENTPOLICY__TRAITS_
   
   template<>
   struct TAO_PortableServer_Export Objref_Traits< ::PortableServer::IdAssignmentPolicy>
@@ -239,34 +220,13 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_enum/any_op_ch.cpp:51
-
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::IdAssignmentPolicyValue);
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::IdAssignmentPolicyValue &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::IdAssignmentPolicy_ptr); // copying
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::IdAssignmentPolicy_ptr *); // non-copying
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::IdAssignmentPolicy_ptr &);
-
-// TAO_IDL - Generated from
 // be\be_visitor_enum/cdr_op_ch.cpp:50
 
 TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, PortableServer::IdAssignmentPolicyValue);
 TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::IdAssignmentPolicyValue &);
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
+// be\be_codegen.cpp:1028
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/tao/PortableServer/IdUniquenessPolicyA.cpp b/TAO/tao/PortableServer/IdUniquenessPolicyA.cpp
index 5be9e5f2571..2fc8e7ec024 100644
--- a/TAO/tao/PortableServer/IdUniquenessPolicyA.cpp
+++ b/TAO/tao/PortableServer/IdUniquenessPolicyA.cpp
@@ -25,16 +25,16 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "IdUniquenessPolicyC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Enum_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
+#include "IdUniquenessPolicyA.h"
+#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Enum_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
 #include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
-#include "tao/Any_Basic_Impl_T.h"
+#include "tao/AnyTypeCode/Any.h"
+#include "tao/AnyTypeCode/Any_Impl_T.h"
+#include "tao/AnyTypeCode/Any_Basic_Impl_T.h"
 
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/enum_typecode.cpp:34
@@ -108,78 +108,3 @@ CORBA::Boolean operator>>= (
         _tao_elem 
       );
 }
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableServer::IdUniquenessPolicy>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableServer::IdUniquenessPolicy>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-  
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableServer::IdUniquenessPolicy>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableServer::IdUniquenessPolicy_ptr _tao_elem
-  )
-{
-  PortableServer::IdUniquenessPolicy_ptr _tao_objptr =
-    PortableServer::IdUniquenessPolicy::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableServer::IdUniquenessPolicy_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<PortableServer::IdUniquenessPolicy>::insert (
-      _tao_any,
-      PortableServer::IdUniquenessPolicy::_tao_any_destructor,
-      PortableServer::_tc_IdUniquenessPolicy,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    PortableServer::IdUniquenessPolicy_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<PortableServer::IdUniquenessPolicy>::extract (
-        _tao_any,
-        PortableServer::IdUniquenessPolicy::_tao_any_destructor,
-        PortableServer::_tc_IdUniquenessPolicy,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/PortableServer/IdUniquenessPolicyA.h b/TAO/tao/PortableServer/IdUniquenessPolicyA.h
new file mode 100644
index 00000000000..22d04465329
--- /dev/null
+++ b/TAO/tao/PortableServer/IdUniquenessPolicyA.h
@@ -0,0 +1,70 @@
+// -*- C++ -*-
+//
+// $Id$
+
+// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       Irvine, CA
+//       USA
+//       http://doc.ece.uci.edu/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
+//
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
+
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:754
+
+#ifndef _TAO_IDL_IDUNIQUENESSPOLICYA_H_
+#define _TAO_IDL_IDUNIQUENESSPOLICYA_H_
+
+#include /**/ "ace/pre.h"
+
+#include "portableserver_export.h"
+#include "IdUniquenessPolicyC.h"
+#include "tao/AnyTypeCode/PolicyA.h"
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:59
+
+namespace PortableServer
+{
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+  
+  extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_IdUniquenessPolicyValue;
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+  
+  extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_IdUniquenessPolicy;
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:86
+
+} // module PortableServer
+
+// TAO_IDL - Generated from
+// be\be_visitor_enum/any_op_ch.cpp:52
+
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::IdUniquenessPolicyValue);
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::IdUniquenessPolicyValue &);
+
+#include /**/ "ace/post.h"
+
+#endif /* ifndef */
diff --git a/TAO/tao/PortableServer/IdUniquenessPolicyC.cpp b/TAO/tao/PortableServer/IdUniquenessPolicyC.cpp
index 2e2ab82386d..340160fd2fc 100644
--- a/TAO/tao/PortableServer/IdUniquenessPolicyC.cpp
+++ b/TAO/tao/PortableServer/IdUniquenessPolicyC.cpp
@@ -26,17 +26,13 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:291
+// be\be_codegen.cpp:277
 
 
 #include "IdUniquenessPolicyC.h"
 #include "tao/CDR.h"
 #include "ace/OS_NS_string.h"
 
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
@@ -88,14 +84,6 @@ PortableServer::IdUniquenessPolicy::IdUniquenessPolicy (void)
 PortableServer::IdUniquenessPolicy::~IdUniquenessPolicy (void)
 {}
 
-void 
-PortableServer::IdUniquenessPolicy::_tao_any_destructor (void *_tao_void_pointer)
-{
-  IdUniquenessPolicy *_tao_tmp_pointer =
-    static_cast<IdUniquenessPolicy *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
 PortableServer::IdUniquenessPolicy_ptr
 PortableServer::IdUniquenessPolicy::_narrow (
     CORBA::Object_ptr _tao_objref
diff --git a/TAO/tao/PortableServer/IdUniquenessPolicyC.h b/TAO/tao/PortableServer/IdUniquenessPolicyC.h
index 936c9f6270a..dbdeb5d2ed6 100644
--- a/TAO/tao/PortableServer/IdUniquenessPolicyC.h
+++ b/TAO/tao/PortableServer/IdUniquenessPolicyC.h
@@ -26,10 +26,10 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:153
+// be\be_codegen.cpp:154
 
-#ifndef _TAO_IDL_ORIG_IDUNIQUENESSPOLICYC_H_
-#define _TAO_IDL_ORIG_IDUNIQUENESSPOLICYC_H_
+#ifndef _TAO_IDL_IDUNIQUENESSPOLICYC_H_
+#define _TAO_IDL_IDUNIQUENESSPOLICYC_H_
 
 #include /**/ "ace/pre.h"
 
@@ -54,17 +54,8 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_PortableServer_Export
 
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:49
 
 namespace PortableServer
 {
@@ -81,11 +72,6 @@ namespace PortableServer
   typedef IdUniquenessPolicyValue &IdUniquenessPolicyValue_out;
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_IdUniquenessPolicyValue;
-  
-  // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_PORTABLESERVER_IDUNIQUENESSPOLICY__VAR_OUT_CH_)
@@ -141,7 +127,7 @@ namespace PortableServer
       return static_cast<IdUniquenessPolicy_ptr> (0);
     }
     
-    static void _tao_any_destructor (void *);
+    
     
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
@@ -198,14 +184,9 @@ namespace PortableServer
   };
 
 #endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_IdUniquenessPolicy;
 
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:78
 
 } // module PortableServer
 
@@ -216,8 +197,8 @@ namespace PortableServer
 namespace TAO
 {
 
-#if !defined (_PORTABLESERVER_IDUNIQUENESSPOLICY__TRAITS_CH_)
-#define _PORTABLESERVER_IDUNIQUENESSPOLICY__TRAITS_CH_
+#if !defined (_PORTABLESERVER_IDUNIQUENESSPOLICY__TRAITS_)
+#define _PORTABLESERVER_IDUNIQUENESSPOLICY__TRAITS_
   
   template<>
   struct TAO_PortableServer_Export Objref_Traits< ::PortableServer::IdUniquenessPolicy>
@@ -239,34 +220,13 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_enum/any_op_ch.cpp:51
-
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::IdUniquenessPolicyValue);
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::IdUniquenessPolicyValue &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::IdUniquenessPolicy_ptr); // copying
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::IdUniquenessPolicy_ptr *); // non-copying
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::IdUniquenessPolicy_ptr &);
-
-// TAO_IDL - Generated from
 // be\be_visitor_enum/cdr_op_ch.cpp:50
 
 TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, PortableServer::IdUniquenessPolicyValue);
 TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::IdUniquenessPolicyValue &);
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
+// be\be_codegen.cpp:1028
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/tao/PortableServer/ImplicitActivationPolicyA.cpp b/TAO/tao/PortableServer/ImplicitActivationPolicyA.cpp
index 0ce2d782e30..9db229c2063 100644
--- a/TAO/tao/PortableServer/ImplicitActivationPolicyA.cpp
+++ b/TAO/tao/PortableServer/ImplicitActivationPolicyA.cpp
@@ -25,16 +25,16 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "ImplicitActivationPolicyC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Enum_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
+#include "ImplicitActivationPolicyA.h"
+#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Enum_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
 #include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
-#include "tao/Any_Basic_Impl_T.h"
+#include "tao/AnyTypeCode/Any.h"
+#include "tao/AnyTypeCode/Any_Impl_T.h"
+#include "tao/AnyTypeCode/Any_Basic_Impl_T.h"
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
@@ -111,79 +111,4 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableServer::ImplicitActivationPolicy>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableServer::ImplicitActivationPolicy>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-  
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableServer::ImplicitActivationPolicy>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableServer::ImplicitActivationPolicy_ptr _tao_elem
-  )
-{
-  PortableServer::ImplicitActivationPolicy_ptr _tao_objptr =
-    PortableServer::ImplicitActivationPolicy::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableServer::ImplicitActivationPolicy_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<PortableServer::ImplicitActivationPolicy>::insert (
-      _tao_any,
-      PortableServer::ImplicitActivationPolicy::_tao_any_destructor,
-      PortableServer::_tc_ImplicitActivationPolicy,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    PortableServer::ImplicitActivationPolicy_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<PortableServer::ImplicitActivationPolicy>::extract (
-        _tao_any,
-        PortableServer::ImplicitActivationPolicy::_tao_any_destructor,
-        PortableServer::_tc_ImplicitActivationPolicy,
-        _tao_elem
-      );
-}
-
 #endif /* TAO_HAS_MINIMUM_CORBA == 0 */
diff --git a/TAO/tao/PortableServer/ImplicitActivationPolicyA.h b/TAO/tao/PortableServer/ImplicitActivationPolicyA.h
new file mode 100644
index 00000000000..70e35ef75ac
--- /dev/null
+++ b/TAO/tao/PortableServer/ImplicitActivationPolicyA.h
@@ -0,0 +1,70 @@
+// -*- C++ -*-
+//
+// $Id$
+
+// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       Irvine, CA
+//       USA
+//       http://doc.ece.uci.edu/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
+//
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
+
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:754
+
+#ifndef _TAO_IDL_IMPLICITACTIVATIONPOLICYA_H_
+#define _TAO_IDL_IMPLICITACTIVATIONPOLICYA_H_
+
+#include /**/ "ace/pre.h"
+
+#include "portableserver_export.h"
+#include "ImplicitActivationPolicyC.h"
+#include "tao/AnyTypeCode/PolicyA.h"
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:59
+
+namespace PortableServer
+{
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+  
+  extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_ImplicitActivationPolicyValue;
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+  
+  extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_ImplicitActivationPolicy;
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:86
+
+} // module PortableServer
+
+// TAO_IDL - Generated from
+// be\be_visitor_enum/any_op_ch.cpp:52
+
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ImplicitActivationPolicyValue);
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ImplicitActivationPolicyValue &);
+
+#include /**/ "ace/post.h"
+
+#endif /* ifndef */
diff --git a/TAO/tao/PortableServer/ImplicitActivationPolicyC.cpp b/TAO/tao/PortableServer/ImplicitActivationPolicyC.cpp
index b837fe536a1..825dd9af720 100644
--- a/TAO/tao/PortableServer/ImplicitActivationPolicyC.cpp
+++ b/TAO/tao/PortableServer/ImplicitActivationPolicyC.cpp
@@ -26,17 +26,13 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:291
+// be\be_codegen.cpp:277
 
 
 #include "ImplicitActivationPolicyC.h"
 #include "tao/CDR.h"
 #include "ace/OS_NS_string.h"
 
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
@@ -90,14 +86,6 @@ PortableServer::ImplicitActivationPolicy::ImplicitActivationPolicy (void)
 PortableServer::ImplicitActivationPolicy::~ImplicitActivationPolicy (void)
 {}
 
-void 
-PortableServer::ImplicitActivationPolicy::_tao_any_destructor (void *_tao_void_pointer)
-{
-  ImplicitActivationPolicy *_tao_tmp_pointer =
-    static_cast<ImplicitActivationPolicy *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
 PortableServer::ImplicitActivationPolicy_ptr
 PortableServer::ImplicitActivationPolicy::_narrow (
     CORBA::Object_ptr _tao_objref
diff --git a/TAO/tao/PortableServer/ImplicitActivationPolicyC.h b/TAO/tao/PortableServer/ImplicitActivationPolicyC.h
index d91ea7858f4..3f849791505 100644
--- a/TAO/tao/PortableServer/ImplicitActivationPolicyC.h
+++ b/TAO/tao/PortableServer/ImplicitActivationPolicyC.h
@@ -26,10 +26,10 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:153
+// be\be_codegen.cpp:154
 
-#ifndef _TAO_IDL_ORIG_IMPLICITACTIVATIONPOLICYC_H_
-#define _TAO_IDL_ORIG_IMPLICITACTIVATIONPOLICYC_H_
+#ifndef _TAO_IDL_IMPLICITACTIVATIONPOLICYC_H_
+#define _TAO_IDL_IMPLICITACTIVATIONPOLICYC_H_
 
 #include /**/ "ace/pre.h"
 
@@ -54,17 +54,8 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_PortableServer_Export
 
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:49
 
 namespace PortableServer
 {
@@ -82,11 +73,6 @@ namespace PortableServer
   typedef ImplicitActivationPolicyValue &ImplicitActivationPolicyValue_out;
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_ImplicitActivationPolicyValue;
-  
-  // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_PORTABLESERVER_IMPLICITACTIVATIONPOLICY__VAR_OUT_CH_)
@@ -142,7 +128,7 @@ namespace PortableServer
       return static_cast<ImplicitActivationPolicy_ptr> (0);
     }
     
-    static void _tao_any_destructor (void *);
+    
     
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
@@ -199,14 +185,9 @@ namespace PortableServer
   };
 
 #endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_ImplicitActivationPolicy;
 
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:78
 
 #endif /* TAO_HAS_MINIMUM_CORBA == 0 */
 
@@ -220,8 +201,8 @@ namespace TAO
 {
 #if (TAO_HAS_MINIMUM_POA == 0)
 
-#if !defined (_PORTABLESERVER_IMPLICITACTIVATIONPOLICY__TRAITS_CH_)
-#define _PORTABLESERVER_IMPLICITACTIVATIONPOLICY__TRAITS_CH_
+#if !defined (_PORTABLESERVER_IMPLICITACTIVATIONPOLICY__TRAITS_)
+#define _PORTABLESERVER_IMPLICITACTIVATIONPOLICY__TRAITS_
   
   template<>
   struct TAO_PortableServer_Export Objref_Traits< ::PortableServer::ImplicitActivationPolicy>
@@ -240,26 +221,9 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-
-#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_enum/any_op_ch.cpp:51
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ImplicitActivationPolicyValue);
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ImplicitActivationPolicyValue &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ImplicitActivationPolicy_ptr); // copying
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ImplicitActivationPolicy_ptr *); // non-copying
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ImplicitActivationPolicy_ptr &);
-
-// TAO_IDL - Generated from
 // be\be_visitor_enum/cdr_op_ch.cpp:50
 
 TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, PortableServer::ImplicitActivationPolicyValue);
@@ -268,15 +232,7 @@ TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableSer
 #endif /* TAO_HAS_MINIMUM_CORBA == 0 */
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
+// be\be_codegen.cpp:1028
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/tao/PortableServer/LifespanPolicyA.cpp b/TAO/tao/PortableServer/LifespanPolicyA.cpp
index 7aa2788a380..d9cd21d3b48 100644
--- a/TAO/tao/PortableServer/LifespanPolicyA.cpp
+++ b/TAO/tao/PortableServer/LifespanPolicyA.cpp
@@ -25,16 +25,16 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "LifespanPolicyC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Enum_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
+#include "LifespanPolicyA.h"
+#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Enum_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
 #include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
-#include "tao/Any_Basic_Impl_T.h"
+#include "tao/AnyTypeCode/Any.h"
+#include "tao/AnyTypeCode/Any_Impl_T.h"
+#include "tao/AnyTypeCode/Any_Basic_Impl_T.h"
 
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/enum_typecode.cpp:34
@@ -108,78 +108,3 @@ CORBA::Boolean operator>>= (
         _tao_elem 
       );
 }
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableServer::LifespanPolicy>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableServer::LifespanPolicy>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-  
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableServer::LifespanPolicy>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableServer::LifespanPolicy_ptr _tao_elem
-  )
-{
-  PortableServer::LifespanPolicy_ptr _tao_objptr =
-    PortableServer::LifespanPolicy::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableServer::LifespanPolicy_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<PortableServer::LifespanPolicy>::insert (
-      _tao_any,
-      PortableServer::LifespanPolicy::_tao_any_destructor,
-      PortableServer::_tc_LifespanPolicy,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    PortableServer::LifespanPolicy_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<PortableServer::LifespanPolicy>::extract (
-        _tao_any,
-        PortableServer::LifespanPolicy::_tao_any_destructor,
-        PortableServer::_tc_LifespanPolicy,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/PortableServer/LifespanPolicyA.h b/TAO/tao/PortableServer/LifespanPolicyA.h
new file mode 100644
index 00000000000..cd12e1ef5b5
--- /dev/null
+++ b/TAO/tao/PortableServer/LifespanPolicyA.h
@@ -0,0 +1,70 @@
+// -*- C++ -*-
+//
+// $Id$
+
+// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       Irvine, CA
+//       USA
+//       http://doc.ece.uci.edu/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
+//
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
+
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:754
+
+#ifndef _TAO_IDL_LIFESPANPOLICYA_H_
+#define _TAO_IDL_LIFESPANPOLICYA_H_
+
+#include /**/ "ace/pre.h"
+
+#include "portableserver_export.h"
+#include "LifespanPolicyC.h"
+#include "tao/AnyTypeCode/PolicyA.h"
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:59
+
+namespace PortableServer
+{
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+  
+  extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_LifespanPolicyValue;
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+  
+  extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_LifespanPolicy;
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:86
+
+} // module PortableServer
+
+// TAO_IDL - Generated from
+// be\be_visitor_enum/any_op_ch.cpp:52
+
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::LifespanPolicyValue);
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::LifespanPolicyValue &);
+
+#include /**/ "ace/post.h"
+
+#endif /* ifndef */
diff --git a/TAO/tao/PortableServer/LifespanPolicyC.cpp b/TAO/tao/PortableServer/LifespanPolicyC.cpp
index b53023fc5af..832e35bf202 100644
--- a/TAO/tao/PortableServer/LifespanPolicyC.cpp
+++ b/TAO/tao/PortableServer/LifespanPolicyC.cpp
@@ -26,17 +26,13 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:291
+// be\be_codegen.cpp:277
 
 
 #include "LifespanPolicyC.h"
 #include "tao/CDR.h"
 #include "ace/OS_NS_string.h"
 
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
@@ -88,14 +84,6 @@ PortableServer::LifespanPolicy::LifespanPolicy (void)
 PortableServer::LifespanPolicy::~LifespanPolicy (void)
 {}
 
-void 
-PortableServer::LifespanPolicy::_tao_any_destructor (void *_tao_void_pointer)
-{
-  LifespanPolicy *_tao_tmp_pointer =
-    static_cast<LifespanPolicy *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
 PortableServer::LifespanPolicy_ptr
 PortableServer::LifespanPolicy::_narrow (
     CORBA::Object_ptr _tao_objref
diff --git a/TAO/tao/PortableServer/LifespanPolicyC.h b/TAO/tao/PortableServer/LifespanPolicyC.h
index b3eb4d69ed9..6863d502a76 100644
--- a/TAO/tao/PortableServer/LifespanPolicyC.h
+++ b/TAO/tao/PortableServer/LifespanPolicyC.h
@@ -26,10 +26,10 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:153
+// be\be_codegen.cpp:154
 
-#ifndef _TAO_IDL_ORIG_LIFESPANPOLICYC_H_
-#define _TAO_IDL_ORIG_LIFESPANPOLICYC_H_
+#ifndef _TAO_IDL_LIFESPANPOLICYC_H_
+#define _TAO_IDL_LIFESPANPOLICYC_H_
 
 #include /**/ "ace/pre.h"
 
@@ -54,17 +54,8 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_PortableServer_Export
 
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:49
 
 namespace PortableServer
 {
@@ -81,11 +72,6 @@ namespace PortableServer
   typedef LifespanPolicyValue &LifespanPolicyValue_out;
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_LifespanPolicyValue;
-  
-  // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_PORTABLESERVER_LIFESPANPOLICY__VAR_OUT_CH_)
@@ -141,7 +127,7 @@ namespace PortableServer
       return static_cast<LifespanPolicy_ptr> (0);
     }
     
-    static void _tao_any_destructor (void *);
+    
     
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
@@ -198,14 +184,9 @@ namespace PortableServer
   };
 
 #endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_LifespanPolicy;
 
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:78
 
 } // module PortableServer
 
@@ -216,8 +197,8 @@ namespace PortableServer
 namespace TAO
 {
 
-#if !defined (_PORTABLESERVER_LIFESPANPOLICY__TRAITS_CH_)
-#define _PORTABLESERVER_LIFESPANPOLICY__TRAITS_CH_
+#if !defined (_PORTABLESERVER_LIFESPANPOLICY__TRAITS_)
+#define _PORTABLESERVER_LIFESPANPOLICY__TRAITS_
   
   template<>
   struct TAO_PortableServer_Export Objref_Traits< ::PortableServer::LifespanPolicy>
@@ -239,34 +220,13 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_enum/any_op_ch.cpp:51
-
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::LifespanPolicyValue);
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::LifespanPolicyValue &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::LifespanPolicy_ptr); // copying
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::LifespanPolicy_ptr *); // non-copying
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::LifespanPolicy_ptr &);
-
-// TAO_IDL - Generated from
 // be\be_visitor_enum/cdr_op_ch.cpp:50
 
 TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, PortableServer::LifespanPolicyValue);
 TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableServer::LifespanPolicyValue &);
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
+// be\be_codegen.cpp:1028
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/tao/PortableServer/Object_SArg_Traits.h b/TAO/tao/PortableServer/Object_SArg_Traits.h
index f67ee690ea3..1e60217f11d 100644
--- a/TAO/tao/PortableServer/Object_SArg_Traits.h
+++ b/TAO/tao/PortableServer/Object_SArg_Traits.h
@@ -22,8 +22,9 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/PortableServer/Object_SArgument_T.h"
+#include "tao/PortableServer/SArg_Traits_T.h"
 #include "tao/Pseudo_VarOut_T.h"
-
+#include "tao/Any_Insert_Policy_T.h"
 
 namespace CORBA
 {
@@ -38,15 +39,14 @@ namespace CORBA
 
 namespace TAO
 {
-  template <typename T> class SArg_Traits;
-
   /// Used in generated code if CORBA::Object is an argument or
   /// return type.
   template<>
   class TAO_PortableServer_Export SArg_Traits<CORBA::Object>
     : public Object_SArg_Traits_T<CORBA::Object_ptr,
                                   CORBA::Object_var,
-                                  CORBA::Object_out>
+                                  CORBA::Object_out,
+                                  TAO::Any_Insert_Policy_Stream <CORBA::Object_ptr> >
   {
   };
 }
diff --git a/TAO/tao/PortableServer/Object_SArgument_T.cpp b/TAO/tao/PortableServer/Object_SArgument_T.cpp
index 9a0c2906035..2146062474a 100644
--- a/TAO/tao/PortableServer/Object_SArgument_T.cpp
+++ b/TAO/tao/PortableServer/Object_SArgument_T.cpp
@@ -4,105 +4,117 @@
 #define TAO_OBJECT_SARGUMENT_T_CPP
 
 #include "tao/PortableServer/Object_SArgument_T.h"
-#include "tao/Dynamic_ParameterC.h"
 
 #if !defined (__ACE_INLINE__)
 #include "tao/PortableServer/Object_SArgument_T.inl"
 #endif /* __ACE_INLINE__ */
 
 
-template<typename S_ptr, typename S_var>
+template<typename S_ptr,
+         typename S_var,
+         typename Insert_Policy>
 CORBA::Boolean
-TAO::In_Object_SArgument_T<S_ptr,S_var>::demarshal (TAO_InputCDR &cdr)
+TAO::In_Object_SArgument_T<S_ptr,S_var,Insert_Policy>::demarshal (TAO_InputCDR &cdr)
 {
   return cdr >> this->x_.out ();
 }
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S_ptr, typename S_var>
+template<typename S_ptr,
+         typename S_var,
+         typename Insert_Policy>
 void
-TAO::In_Object_SArgument_T<S_ptr,S_var>::interceptor_param (
-    Dynamic::Parameter & p
-  )
+TAO::In_Object_SArgument_T<S_ptr,S_var,Insert_Policy>::interceptor_value (
+  CORBA::Any *any) const
 {
-  p.argument <<= this->x_.in ();
-  p.mode = CORBA::PARAM_IN;
+  this->Insert_Policy::any_insert (any, this->x_.in ());
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // ===========================================================
 
-template<typename S_ptr, typename S_var>
+template<typename S_ptr,
+         typename S_var,
+         typename Insert_Policy>
 CORBA::Boolean
-TAO::Inout_Object_SArgument_T<S_ptr,S_var>::marshal (TAO_OutputCDR & cdr)
+TAO::Inout_Object_SArgument_T<S_ptr,S_var,Insert_Policy>::marshal (TAO_OutputCDR &cdr)
 {
   return cdr << this->x_.in ();
 }
 
-template<typename S_ptr, typename S_var>
+template<typename S_ptr,
+         typename S_var,
+         typename Insert_Policy>
 CORBA::Boolean
-TAO::Inout_Object_SArgument_T<S_ptr,S_var>::demarshal (TAO_InputCDR & cdr)
+TAO::Inout_Object_SArgument_T<S_ptr,S_var,Insert_Policy>::demarshal (TAO_InputCDR & cdr)
 {
   return cdr >> this->x_.out ();
 }
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S_ptr, typename S_var>
+template<typename S_ptr,
+         typename S_var,
+         typename Insert_Policy>
 void
-TAO::Inout_Object_SArgument_T<S_ptr,S_var>::interceptor_param (
-    Dynamic::Parameter & p
-  )
+TAO::Inout_Object_SArgument_T<S_ptr,S_var,Insert_Policy>::interceptor_value (
+  CORBA::Any *any) const
 {
-  p.argument <<= this->x_.in ();
-  p.mode = CORBA::PARAM_INOUT;
+  this->Insert_Policy::any_insert (any, this->x_.in ());
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // ==============================================================
 
-template<typename S_ptr, typename S_var, typename S_out>
+template<typename S_ptr,
+         typename S_var,
+         typename S_out,
+         typename Insert_Policy>
 CORBA::Boolean
-TAO::Out_Object_SArgument_T<S_ptr,S_var,S_out>::marshal (TAO_OutputCDR &cdr)
+TAO::Out_Object_SArgument_T<S_ptr,S_var,S_out,Insert_Policy>::marshal (TAO_OutputCDR &cdr)
 {
   return cdr << this->x_.in ();
 }
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S_ptr, typename S_var, typename S_out>
+template<typename S_ptr,
+         typename S_var,
+         typename S_out,
+         typename Insert_Policy>
 void
-TAO::Out_Object_SArgument_T<S_ptr,S_var,S_out>::interceptor_param (
-    Dynamic::Parameter & p
-  )
+TAO::Out_Object_SArgument_T<S_ptr,S_var,S_out,Insert_Policy>::interceptor_value (
+  CORBA::Any *any) const
 {
-  p.argument <<= this->x_.in ();
-  p.mode = CORBA::PARAM_OUT;
+  this->Insert_Policy::any_insert (any, this->x_.in ());
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // ============================================================
 
-template<typename S_ptr, typename S_var>
+template<typename S_ptr,
+         typename S_var,
+         typename Insert_Policy>
 CORBA::Boolean
-TAO::Ret_Object_SArgument_T<S_ptr,S_var>::marshal (TAO_OutputCDR & cdr)
+TAO::Ret_Object_SArgument_T<S_ptr,S_var,Insert_Policy>::marshal (TAO_OutputCDR &cdr)
 {
   return cdr << this->x_.in ();
 }
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S_ptr, typename S_var>
+template<typename S_ptr,
+         typename S_var,
+         typename Insert_Policy>
 void
-TAO::Ret_Object_SArgument_T<S_ptr,S_var>::interceptor_result (
-    CORBA::Any * any
-  )
+TAO::Ret_Object_SArgument_T<S_ptr,S_var,Insert_Policy>::interceptor_value (
+  CORBA::Any *any) const
 {
-  (*any) <<= this->x_.in ();
+  this->Insert_Policy::any_insert (any, this->x_.in ());
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
diff --git a/TAO/tao/PortableServer/Object_SArgument_T.h b/TAO/tao/PortableServer/Object_SArgument_T.h
index b1e5e1a864e..733beda2955 100644
--- a/TAO/tao/PortableServer/Object_SArgument_T.h
+++ b/TAO/tao/PortableServer/Object_SArgument_T.h
@@ -35,14 +35,16 @@ namespace TAO
    * @brief Template class for IN skeleton object argument.
    *
    */
-  template<typename S_ptr, typename S_var>
-  class In_Object_SArgument_T : public Argument
+  template<typename S_ptr,
+           typename S_var,
+           typename Insert_Policy>
+  class In_Object_SArgument_T : public InArgument, private Insert_Policy
   {
   public:
 
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S_ptr arg (void) const;
 
@@ -56,16 +58,18 @@ namespace TAO
    * @brief Template class for INOUT skeleton object argument.
    *
    */
-  template<typename S_ptr, typename S_var>
-  class Inout_Object_SArgument_T : public Argument
+  template<typename S_ptr,
+           typename S_var,
+           typename Insert_Policy>
+  class Inout_Object_SArgument_T : public InoutArgument, private Insert_Policy
   {
   public:
     Inout_Object_SArgument_T (void);
 
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S_ptr & arg (void);
 
@@ -79,15 +83,18 @@ namespace TAO
    * @brief Template class for INOUT skeleton object argument.
    *
    */
-  template<typename S_ptr, typename S_var, typename S_out>
-  class Out_Object_SArgument_T : public Argument
+  template<typename S_ptr,
+           typename S_var,
+           typename S_out,
+           typename Insert_Policy>
+  class Out_Object_SArgument_T : public OutArgument, private Insert_Policy
   {
   public:
     Out_Object_SArgument_T (void);
 
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S_out arg (void);
 
@@ -101,15 +108,17 @@ namespace TAO
    * @brief Template class for return skeleton value of object.
    *
    */
-  template<typename S_ptr, typename S_var>
-  class Ret_Object_SArgument_T : public Argument
+  template<typename S_ptr,
+           typename S_var,
+           typename Insert_Policy>
+  class Ret_Object_SArgument_T : public RetArgument, private Insert_Policy
   {
   public:
     Ret_Object_SArgument_T (void);
 
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_result (CORBA::Any *);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S_ptr & arg (void);
 
@@ -123,7 +132,10 @@ namespace TAO
    * @brief Template class for skeleton argument traits of objects.
    *
    */
-  template<typename T_ptr, typename T_var, typename T_out>
+  template<typename T_ptr,
+           typename T_var,
+           typename T_out,
+           typename Insert_Policy>
   struct Object_SArg_Traits_T
   {
     typedef T_ptr                                         ret_type;
@@ -131,10 +143,10 @@ namespace TAO
     typedef T_ptr &                                       inout_type;
     typedef T_out                                         out_type;
 
-    typedef In_Object_SArgument_T<T_ptr,T_var>            in_arg_val;
-    typedef Inout_Object_SArgument_T<T_ptr,T_var>         inout_arg_val;
-    typedef Out_Object_SArgument_T<T_ptr,T_var,T_out>     out_arg_val;
-    typedef Ret_Object_SArgument_T<T_ptr,T_var>           ret_val;
+    typedef In_Object_SArgument_T<T_ptr,T_var,Insert_Policy>        in_arg_val;
+    typedef Inout_Object_SArgument_T<T_ptr,T_var,Insert_Policy>     inout_arg_val;
+    typedef Out_Object_SArgument_T<T_ptr,T_var,T_out,Insert_Policy> out_arg_val;
+    typedef Ret_Object_SArgument_T<T_ptr,T_var,Insert_Policy>       ret_val;
 
     // Typedefs corresponding to return value of arg() method in both
     // the client and server side argument class templates.
diff --git a/TAO/tao/PortableServer/Object_SArgument_T.inl b/TAO/tao/PortableServer/Object_SArgument_T.inl
index 9588e14e67b..a202807a59d 100644
--- a/TAO/tao/PortableServer/Object_SArgument_T.inl
+++ b/TAO/tao/PortableServer/Object_SArgument_T.inl
@@ -3,57 +3,77 @@
 // $Id$
 
 
-template<typename S_ptr, typename S_var>
+template<typename S_ptr,
+         typename S_var,
+         typename Insert_Policy>
 ACE_INLINE
 S_ptr
-TAO::In_Object_SArgument_T<S_ptr,S_var>::arg (void) const
+TAO::In_Object_SArgument_T<S_ptr,S_var,Insert_Policy>::arg (void) const
 {
   return this->x_.in ();
 }
 
 // ==========================================================================
 
-template<typename S_ptr, typename S_var>
+template<typename S_ptr,
+         typename S_var,
+         typename Insert_Policy>
 ACE_INLINE
-TAO::Inout_Object_SArgument_T<S_ptr,S_var>::Inout_Object_SArgument_T (void)
-{}
+TAO::Inout_Object_SArgument_T<S_ptr,S_var,Insert_Policy>::
+Inout_Object_SArgument_T (void)
+{
+}
 
-template<typename S_ptr, typename S_var>
+template<typename S_ptr,
+         typename S_var,
+         typename Insert_Policy>
 ACE_INLINE
 S_ptr&
-TAO::Inout_Object_SArgument_T<S_ptr,S_var>::arg (void)
+TAO::Inout_Object_SArgument_T<S_ptr,S_var,Insert_Policy>::arg (void)
 {
   return this->x_.inout ();
 }
 
 // ==========================================================================
 
-template<typename S_ptr, typename S_var, typename S_out>
+template<typename S_ptr,
+         typename S_var,
+         typename S_out,
+         typename Insert_Policy>
 ACE_INLINE
-TAO::Out_Object_SArgument_T<S_ptr,S_var,S_out>::Out_Object_SArgument_T (
-    void
-  )
-{}
+TAO::Out_Object_SArgument_T<S_ptr,S_var,S_out,Insert_Policy>::
+Out_Object_SArgument_T (void)
+{
+}
 
-template<typename S_ptr, typename S_var, typename S_out>
+template<typename S_ptr,
+         typename S_var,
+         typename S_out,
+         typename Insert_Policy>
 ACE_INLINE
 S_out
-TAO::Out_Object_SArgument_T<S_ptr,S_var,S_out>::arg (void)
+TAO::Out_Object_SArgument_T<S_ptr,S_var,S_out,Insert_Policy>::arg (void)
 {
   return this->x_.out ();
 }
 
 // ==========================================================================
 
-template<typename S_ptr, typename S_var>
+template<typename S_ptr,
+         typename S_var,
+         typename Insert_Policy>
 ACE_INLINE
-TAO::Ret_Object_SArgument_T<S_ptr,S_var>::Ret_Object_SArgument_T (void)
-{}
+TAO::Ret_Object_SArgument_T<S_ptr,S_var,Insert_Policy>::
+Ret_Object_SArgument_T (void)
+{
+}
 
-template<typename S_ptr, typename S_var>
+template<typename S_ptr,
+         typename S_var,
+         typename Insert_Policy>
 ACE_INLINE
 S_ptr &
-TAO::Ret_Object_SArgument_T<S_ptr,S_var>::arg (void)
+TAO::Ret_Object_SArgument_T<S_ptr,S_var,Insert_Policy>::arg (void)
 {
   return this->x_.out ();
 }
diff --git a/TAO/tao/PortableServer/POAManagerA.cpp b/TAO/tao/PortableServer/POAManagerA.cpp
deleted file mode 100644
index 086da1ec2da..00000000000
--- a/TAO/tao/PortableServer/POAManagerA.cpp
+++ /dev/null
@@ -1,296 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "POAManagerC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Enum_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
-#include "tao/Struct_TypeCode_Static.h"
-#include "tao/TypeCode_Struct_Field.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
-#include "tao/Any_Dual_Impl_T.h"
-#include "tao/Any_Basic_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/struct_typecode.cpp:74
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const * const _tao_fields_PortableServer_POAManager_AdapterInactive = 0;
-static TAO::TypeCode::Struct<char const *,
-                             CORBA::TypeCode_ptr const *,
-                             TAO::TypeCode::Struct_Field<char const *,
-                                                         CORBA::TypeCode_ptr const *> const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_PortableServer_POAManager_AdapterInactive (
-    CORBA::tk_except,
-    "IDL:omg.org/PortableServer/POAManager/AdapterInactive:2.3",
-    "AdapterInactive",
-    _tao_fields_PortableServer_POAManager_AdapterInactive,
-    0);
-  
-::CORBA::TypeCode_ptr const PortableServer::POAManager::_tc_AdapterInactive =
-  &_tao_tc_PortableServer_POAManager_AdapterInactive;
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/enum_typecode.cpp:34
-
-static char const * const _tao_enumerators_PortableServer_POAManager_State[] =
-  {
-    "HOLDING",
-    "ACTIVE",
-    "DISCARDING",
-    "INACTIVE"
-    
-  };
-
-static TAO::TypeCode::Enum<char const *,
-                           char const * const *,
-                           TAO::Null_RefCount_Policy>
-  _tao_tc_PortableServer_POAManager_State (
-    "IDL:omg.org/PortableServer/POAManager/State:2.3",
-    "State",
-    _tao_enumerators_PortableServer_POAManager_State,
-    4);
-  
-::CORBA::TypeCode_ptr const PortableServer::POAManager::_tc_State =
-  &_tao_tc_PortableServer_POAManager_State;
-
-// TAO_IDL - Generated from
-// be/be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_PortableServer_POAManager (
-    CORBA::tk_local_interface,
-    "IDL:omg.org/PortableServer/POAManager:2.3",
-    "POAManager");
-  
-namespace PortableServer
-{
-  ::CORBA::TypeCode_ptr const _tc_POAManager =
-    &_tao_tc_PortableServer_POAManager;
-}
-
-
-
-// TAO_IDL - Generated from
-// be/be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableServer::POAManager>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableServer::POAManager>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-  
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableServer::POAManager>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableServer::POAManager_ptr _tao_elem
-  )
-{
-  PortableServer::POAManager_ptr _tao_objptr =
-    PortableServer::POAManager::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableServer::POAManager_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<PortableServer::POAManager>::insert (
-      _tao_any,
-      PortableServer::POAManager::_tao_any_destructor,
-      PortableServer::_tc_POAManager,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    PortableServer::POAManager_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<PortableServer::POAManager>::extract (
-        _tao_any,
-        PortableServer::POAManager::_tao_any_destructor,
-        PortableServer::_tc_POAManager,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be/be_visitor_exception/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Dual_Impl_T<PortableServer::POAManager::AdapterInactive>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-  
-  template<>
-  CORBA::Boolean
-  Any_Dual_Impl_T<PortableServer::POAManager::AdapterInactive>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const PortableServer::POAManager::AdapterInactive &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<PortableServer::POAManager::AdapterInactive>::insert_copy (
-      _tao_any,
-      PortableServer::POAManager::AdapterInactive::_tao_any_destructor,
-      PortableServer::POAManager::_tc_AdapterInactive,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    PortableServer::POAManager::AdapterInactive *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<PortableServer::POAManager::AdapterInactive>::insert (
-      _tao_any,
-      PortableServer::POAManager::AdapterInactive::_tao_any_destructor,
-      PortableServer::POAManager::_tc_AdapterInactive,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    PortableServer::POAManager::AdapterInactive *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const PortableServer::POAManager::AdapterInactive *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const PortableServer::POAManager::AdapterInactive *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<PortableServer::POAManager::AdapterInactive>::extract (
-        _tao_any,
-        PortableServer::POAManager::AdapterInactive::_tao_any_destructor,
-        PortableServer::POAManager::_tc_AdapterInactive,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be/be_visitor_enum/any_op_cs.cpp:52
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Basic_Impl_T<PortableServer::POAManager::State>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-  
-  template<>
-  CORBA::Boolean
-  Any_Basic_Impl_T<PortableServer::POAManager::State>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-void operator<<= (
-    CORBA::Any &_tao_any,
-    PortableServer::POAManager::State _tao_elem
-  )
-{
-  TAO::Any_Basic_Impl_T<PortableServer::POAManager::State>::insert (
-      _tao_any,
-      PortableServer::POAManager::_tc_State,
-      _tao_elem
-    );
-}
-
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    PortableServer::POAManager::State &_tao_elem
-  )
-{
-  return
-    TAO::Any_Basic_Impl_T<PortableServer::POAManager::State>::extract (
-        _tao_any,
-        PortableServer::POAManager::_tc_State,
-        _tao_elem 
-      );
-}
diff --git a/TAO/tao/PortableServer/POAManagerC.cpp b/TAO/tao/PortableServer/POAManagerC.cpp
index b4ea95318c3..45f95ccca10 100644
--- a/TAO/tao/PortableServer/POAManagerC.cpp
+++ b/TAO/tao/PortableServer/POAManagerC.cpp
@@ -26,19 +26,25 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:291
+// be\be_codegen.cpp:277
 
 
 #include "POAManagerC.h"
 #include "tao/CDR.h"
+#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Enum_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Struct_TypeCode_Static.h"
+#include "tao/AnyTypeCode/TypeCode_Struct_Field.h"
+#include "tao/AnyTypeCode/Any_Impl_T.h"
+#include "tao/AnyTypeCode/Any_Dual_Impl_T.h"
+#include "tao/AnyTypeCode/Any_Basic_Impl_T.h"
 #include "ace/OS_NS_string.h"
 
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
-// be\be_visitor_arg_traits.cpp:69
+// be\be_visitor_arg_traits.cpp:70
 
 // Arg traits specializations.
 namespace TAO
@@ -82,7 +88,7 @@ TAO::Objref_Traits<PortableServer::POAManager>::marshal (
   return CORBA::Object::marshal (p, cdr);
 }
 
-// TAO_IDL - Generated from
+// TAO_IDL - Generated from 
 // be\be_visitor_exception/exception_cs.cpp:63
 
 PortableServer::POAManager::AdapterInactive::AdapterInactive (void)
@@ -177,20 +183,54 @@ CORBA::TypeCode_ptr PortableServer::POAManager::AdapterInactive::_tao_type (void
   return ::PortableServer::POAManager::_tc_AdapterInactive;
 }
 
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/struct_typecode.cpp:87
+
+static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const * const _tao_fields_PortableServer_POAManager_AdapterInactive = 0;
+static TAO::TypeCode::Struct<char const *,
+                      CORBA::TypeCode_ptr const *,
+                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
+                      TAO::Null_RefCount_Policy>
+  _tao_tc_PortableServer_POAManager_AdapterInactive (
+    CORBA::tk_except,
+    "IDL:omg.org/PortableServer/POAManager/AdapterInactive:2.3",
+    "AdapterInactive",
+    _tao_fields_PortableServer_POAManager_AdapterInactive,
+    0);
+  
+::CORBA::TypeCode_ptr const PortableServer::POAManager::_tc_AdapterInactive =
+  &_tao_tc_PortableServer_POAManager_AdapterInactive;
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/enum_typecode.cpp:34
+
+static char const * const _tao_enumerators_PortableServer_POAManager_State[] =
+  {
+    "HOLDING",
+    "ACTIVE",
+    "DISCARDING",
+    "INACTIVE"
+    
+  };
+
+static TAO::TypeCode::Enum<char const *,
+                           char const * const *,
+                           TAO::Null_RefCount_Policy>
+  _tao_tc_PortableServer_POAManager_State (
+    "IDL:omg.org/PortableServer/POAManager/State:2.3",
+    "State",
+    _tao_enumerators_PortableServer_POAManager_State,
+    4);
+  
+::CORBA::TypeCode_ptr const PortableServer::POAManager::_tc_State =
+  &_tao_tc_PortableServer_POAManager_State;
+
 PortableServer::POAManager::POAManager (void)
 {}
 
 PortableServer::POAManager::~POAManager (void)
 {}
 
-void
-PortableServer::POAManager::_tao_any_destructor (void *_tao_void_pointer)
-{
-  POAManager *_tao_tmp_pointer =
-    static_cast<POAManager *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
 PortableServer::POAManager_ptr
 PortableServer::POAManager::_narrow (
     CORBA::Object_ptr _tao_objref
@@ -198,7 +238,8 @@ PortableServer::POAManager::_narrow (
   )
 {
   return POAManager::_duplicate (
-    dynamic_cast<POAManager_ptr> (_tao_objref));
+      dynamic_cast<POAManager_ptr> (_tao_objref)
+    );
 }
 
 PortableServer::POAManager_ptr
@@ -207,7 +248,9 @@ PortableServer::POAManager::_unchecked_narrow (
     ACE_ENV_ARG_DECL_NOT_USED
   )
 {
-  return POAManager::_duplicate (dynamic_cast<POAManager_ptr> (_tao_objref));
+  return POAManager::_duplicate (
+      dynamic_cast<POAManager_ptr> (_tao_objref)
+    );
 }
 
 PortableServer::POAManager_ptr
@@ -217,7 +260,7 @@ PortableServer::POAManager::_duplicate (POAManager_ptr obj)
     {
       obj->_add_ref ();
     }
-
+  
   return obj;
 }
 
@@ -266,3 +309,21 @@ PortableServer::POAManager::marshal (TAO_OutputCDR &)
 {
   return false;
 }
+
+// TAO_IDL - Generated from
+// be\be_visitor_typecode/objref_typecode.cpp:76
+
+static TAO::TypeCode::Objref<char const *,
+                             TAO::Null_RefCount_Policy>
+  _tao_tc_PortableServer_POAManager (
+    CORBA::tk_local_interface,
+    "IDL:omg.org/PortableServer/POAManager:2.3",
+    "POAManager");
+  
+namespace PortableServer
+{
+  ::CORBA::TypeCode_ptr const _tc_POAManager =
+    &_tao_tc_PortableServer_POAManager;
+}
+
+
diff --git a/TAO/tao/PortableServer/POAManagerC.h b/TAO/tao/PortableServer/POAManagerC.h
index 52606904b70..d3ecf299d88 100644
--- a/TAO/tao/PortableServer/POAManagerC.h
+++ b/TAO/tao/PortableServer/POAManagerC.h
@@ -26,10 +26,10 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:153
+// be\be_codegen.cpp:154
 
-#ifndef _TAO_IDL_ORIG_POAMANAGERC_H_
-#define _TAO_IDL_ORIG_POAMANAGERC_H_
+#ifndef _TAO_IDL_POAMANAGERC_H_
+#define _TAO_IDL_POAMANAGERC_H_
 
 #include /**/ "ace/pre.h"
 
@@ -52,17 +52,8 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_PortableServer_Export
 
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:49
 
 namespace PortableServer
 {
@@ -123,10 +114,10 @@ namespace PortableServer
       return static_cast<POAManager_ptr> (0);
     }
     
-    static void _tao_any_destructor (void *);
+    
     
     // TAO_IDL - Generated from
-    // be\be_visitor_exception/exception_ch.cpp:51
+    // be\be_visitor_exception/exception_ch.cpp:53
 
 #if !defined (_PORTABLESERVER_POAMANAGER_ADAPTERINACTIVE_CH_)
 #define _PORTABLESERVER_POAMANAGER_ADAPTERINACTIVE_CH_
@@ -163,13 +154,13 @@ namespace PortableServer
         );
       
       // TAO_IDL - Generated from
-      // be\be_visitor_exception/exception_ch.cpp:127
+      // be\be_visitor_exception/exception_ch.cpp:129
       
       virtual CORBA::TypeCode_ptr _tao_type (void) const;
     };
     
     // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:44
+    // be\be_visitor_typecode/typecode_decl.cpp:49
     
     static ::CORBA::TypeCode_ptr const _tc_AdapterInactive;
 
@@ -189,7 +180,7 @@ namespace PortableServer
     typedef State &State_out;
     
     // TAO_IDL - Generated from
-    // be\be_visitor_typecode/typecode_decl.cpp:44
+    // be\be_visitor_typecode/typecode_decl.cpp:49
     
     static ::CORBA::TypeCode_ptr const _tc_State;
     
@@ -207,8 +198,6 @@ namespace PortableServer
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
     
-#if (TAO_HAS_MINIMUM_POA == 0)
-
     virtual void hold_requests (
         ::CORBA::Boolean wait_for_completion
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -243,8 +232,6 @@ namespace PortableServer
         ::PortableServer::POAManager::AdapterInactive
       )) = 0;
     
-#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
-
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
     
@@ -282,12 +269,12 @@ namespace PortableServer
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
+  // be\be_visitor_typecode/typecode_decl.cpp:49
   
   extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_POAManager;
 
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:78
 
 } // module PortableServer
 
@@ -298,8 +285,8 @@ namespace PortableServer
 namespace TAO
 {
 
-#if !defined (_PORTABLESERVER_POAMANAGER__TRAITS_CH_)
-#define _PORTABLESERVER_POAMANAGER__TRAITS_CH_
+#if !defined (_PORTABLESERVER_POAMANAGER__TRAITS_)
+#define _PORTABLESERVER_POAMANAGER__TRAITS_
   
   template<>
   struct TAO_PortableServer_Export Objref_Traits< ::PortableServer::POAManager>
@@ -321,36 +308,7 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::POAManager_ptr); // copying
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::POAManager_ptr *); // non-copying
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::POAManager_ptr &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_exception/any_op_ch.cpp:52
-
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, const PortableServer::POAManager::AdapterInactive &); // copying version
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::POAManager::AdapterInactive*); // noncopying version
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::POAManager::AdapterInactive *&); // deprecated
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, const PortableServer::POAManager::AdapterInactive *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_enum/any_op_ch.cpp:51
-
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::POAManager::State);
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::POAManager::State &);
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
+// be\be_codegen.cpp:1028
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/tao/PortableServer/POA_Current_Impl.cpp b/TAO/tao/PortableServer/POA_Current_Impl.cpp
index d692a3cba9e..3d51448e37f 100644
--- a/TAO/tao/PortableServer/POA_Current_Impl.cpp
+++ b/TAO/tao/PortableServer/POA_Current_Impl.cpp
@@ -39,7 +39,7 @@ namespace TAO
       this->object_key_ = &key;
 
       // Set the current context and remember the old one.
-      this->tss_resources_ = TAO_TSS_RESOURCES::instance ();
+      this->tss_resources_ = TAO_TSS_Resources::instance ();
 
       this->previous_current_impl_ =
         static_cast <POA_Current_Impl *>
diff --git a/TAO/tao/PortableServer/PS_ForwardA.cpp b/TAO/tao/PortableServer/PS_ForwardA.cpp
index 114d8f413ad..c9ba5596b79 100644
--- a/TAO/tao/PortableServer/PS_ForwardA.cpp
+++ b/TAO/tao/PortableServer/PS_ForwardA.cpp
@@ -25,12 +25,12 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "PS_ForwardC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
+#include "PS_ForwardA.h"
+#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
 #include "tao/CDR.h"
-#include "tao/Any.h"
+#include "tao/AnyTypeCode/Any.h"
 
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/alias_typecode.cpp:50
diff --git a/TAO/examples/Kokyu_dsrt_schedulers/EDF_SchedulingC.i b/TAO/tao/PortableServer/PS_ForwardA.h
index bdc25a22993..7818c218778 100644
--- a/TAO/examples/Kokyu_dsrt_schedulers/EDF_SchedulingC.i
+++ b/TAO/tao/PortableServer/PS_ForwardA.h
@@ -25,33 +25,35 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:754
+
+#ifndef _TAO_IDL_PS_FORWARDA_H_
+#define _TAO_IDL_PS_FORWARDA_H_
+
+#include /**/ "ace/pre.h"
+
+#include "portableserver_export.h"
+#include "PS_ForwardC.h"
+#include "tao/AnyTypeCode/OctetSeqA.h"
+
 
 // TAO_IDL - Generated from
-// be/be_visitor_structure/cdr_op_ci.cpp:70
+// be\be_visitor_module/module_ch.cpp:59
 
-ACE_INLINE
-CORBA::Boolean operator<< (
-    TAO_OutputCDR &strm,
-    const EDF_Scheduling::SchedulingParameter &_tao_aggregate
-  )
+namespace PortableServer
 {
-  return
-    (strm << _tao_aggregate.deadline) &&
-    (strm << _tao_aggregate.importance) &&
-    (strm << _tao_aggregate.period) &&
-    (strm << _tao_aggregate.task_id);
-}
-
-ACE_INLINE
-CORBA::Boolean operator>> (
-    TAO_InputCDR &strm,
-    EDF_Scheduling::SchedulingParameter &_tao_aggregate
-  )
-{
-  return
-    (strm >> _tao_aggregate.deadline) &&
-    (strm >> _tao_aggregate.importance) &&
-    (strm >> _tao_aggregate.period) &&
-    (strm >> _tao_aggregate.task_id);
-}
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+  
+  extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_ObjectId;
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:86
+
+} // module PortableServer
+
+#include /**/ "ace/post.h"
 
+#endif /* ifndef */
diff --git a/TAO/tao/PortableServer/PS_ForwardC.cpp b/TAO/tao/PortableServer/PS_ForwardC.cpp
index f788c63a7a5..c39046225ac 100644
--- a/TAO/tao/PortableServer/PS_ForwardC.cpp
+++ b/TAO/tao/PortableServer/PS_ForwardC.cpp
@@ -26,17 +26,13 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:291
+// be\be_codegen.cpp:277
 
 
 #include "PS_ForwardC.h"
 #include "tao/CDR.h"
 #include "tao/ORB_Core.h"
 
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
diff --git a/TAO/tao/PortableServer/PS_ForwardC.h b/TAO/tao/PortableServer/PS_ForwardC.h
index afded66da78..24cb55a00f1 100644
--- a/TAO/tao/PortableServer/PS_ForwardC.h
+++ b/TAO/tao/PortableServer/PS_ForwardC.h
@@ -26,10 +26,10 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:153
+// be\be_codegen.cpp:154
 
-#ifndef _TAO_IDL_ORIG_PS_FORWARDC_H_
-#define _TAO_IDL_ORIG_PS_FORWARDC_H_
+#ifndef _TAO_IDL_PS_FORWARDC_H_
+#define _TAO_IDL_PS_FORWARDC_H_
 
 #include /**/ "ace/pre.h"
 
@@ -52,15 +52,6 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_PortableServer_Export
 
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
 class TAO_ServantBase;
 class TAO_ServantBase_var;
 class TAO_Local_ServantBase;
@@ -68,7 +59,7 @@ class TAO_Root_POA;
 class TAO_DynamicImplementation;
 
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:49
 
 namespace PortableServer
 {
@@ -79,34 +70,29 @@ namespace PortableServer
 
     typedef TAO_Local_ServantBase LocalServantBase;
     typedef TAO_DynamicImplementation DynamicImplementation;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typedef/typedef_ch.cpp:472
-  
+
   typedef CORBA::OctetSeq ObjectId;
   typedef CORBA::OctetSeq_var ObjectId_var;
   typedef CORBA::OctetSeq_out ObjectId_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_ObjectId;
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_PORTABLESERVER_POA__VAR_OUT_CH_)
 #define _PORTABLESERVER_POA__VAR_OUT_CH_
-  
+
   class POA;
   typedef POA *POA_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         POA
       >
     POA_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         POA
@@ -116,7 +102,7 @@ namespace PortableServer
 #endif /* end #if !defined */
 
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:78
 
 } // module PortableServer
 
@@ -129,15 +115,7 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
+// be\be_codegen.cpp:1028
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/tao/PortableServer/PolicyS.cpp b/TAO/tao/PortableServer/PolicyS.cpp
index 5f07633ff5c..a6ce46ed3dc 100644
--- a/TAO/tao/PortableServer/PolicyS.cpp
+++ b/TAO/tao/PortableServer/PolicyS.cpp
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_codegen.cpp:599
 
 #ifndef _TAO_IDL_ORIG_POLICYS_CPP_
@@ -53,8 +53,8 @@
 #include "tao/Stub.h"
 #include "tao/IFR_Client_Adapter.h"
 #include "tao/Object_T.h"
-#include "tao/TypeCode.h"
-#include "tao/DynamicC.h"
+#include "tao/AnyTypeCode/TypeCode.h"
+#include "tao/AnyTypeCode/Any.h"
 #include "tao/CDR.h"
 #include "tao/operation_details.h"
 #include "tao/PortableInterceptor.h"
@@ -76,14 +76,15 @@ namespace TAO
 
 #if !defined (_CORBA_POLICY__SARG_TRAITS_SS_)
 #define _CORBA_POLICY__SARG_TRAITS_SS_
-  
+
   template<>
   class  SArg_Traits<CORBA::Policy>
     : public
         Object_SArg_Traits_T<
             CORBA::Policy_ptr,
             CORBA::Policy_var,
-            CORBA::Policy_out
+            CORBA::Policy_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::Policy_ptr>
           >
   {
   };
@@ -101,7 +102,7 @@ namespace TAO
 
 #if !defined (_CORBA_POLICY__ARG_TRAITS_SS_)
 #define _CORBA_POLICY__ARG_TRAITS_SS_
-  
+
   template<>
   class  Arg_Traits<CORBA::Policy>
     : public
@@ -109,7 +110,8 @@ namespace TAO
             CORBA::Policy_ptr,
             CORBA::Policy_var,
             CORBA::Policy_out,
-            TAO::Objref_Traits<CORBA::Policy>
+            TAO::Objref_Traits<CORBA::Policy>,
+            TAO::Any_Insert_Policy_Stream <CORBA::Policy_ptr>
           >
   {
   };
@@ -245,7 +247,7 @@ POA_CORBA::_TAO_Policy_Strategized_Proxy_Broker::the_TAO_Policy_Strategized_Prox
 {
   static POA_CORBA::_TAO_Policy_Strategized_Proxy_Broker
   strategized_proxy_broker;
-  
+
   return &strategized_proxy_broker;
 }
 
@@ -267,7 +269,7 @@ POA_CORBA::_TAO_Policy_Strategized_Proxy_Broker::get_strategy (
   TAO::Collocation_Strategy strategy =
     TAO_ORB_Core::collocation_strategy (obj ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (TAO::TAO_CS_REMOTE_STRATEGY);
-  
+
   return strategy;
 }
 
@@ -286,13 +288,13 @@ POA_CORBA::_TAO_Policy_Strategized_Proxy_Broker::dispatch (
 {
   TAO::Direct_Collocation_Upcall_Wrapper collocation_upcall_wrapper;
   collocation_upcall_wrapper.upcall (
-    obj, 
-    forward_obj, 
-    args, 
-    num_args, 
-    op, 
-    op_len, 
-    strategy 
+    obj,
+    forward_obj,
+    args,
+    num_args,
+    op,
+    op_len,
+    strategy
     ACE_ENV_ARG_PARAMETER);
 }
 
@@ -313,9 +315,9 @@ CORBA__TAO_Policy_Proxy_Broker_Factory_function (CORBA::Object_ptr)
 int
 CORBA__TAO_Policy_Proxy_Broker_Factory_Initializer (size_t)
 {
-  CORBA__TAO_Policy_Proxy_Broker_Factory_function_pointer = 
+  CORBA__TAO_Policy_Proxy_Broker_Factory_function_pointer =
     CORBA__TAO_Policy_Proxy_Broker_Factory_function;
-  
+
   return 0;
 }
 
@@ -337,14 +339,14 @@ POA_CORBA::_TAO_Policy_Direct_Proxy_Impl::_TAO_Policy_Direct_Proxy_Impl (void)
 POA_CORBA::_TAO_Policy_Direct_Proxy_Impl::~_TAO_Policy_Direct_Proxy_Impl (void)
 {}
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
 
 void
 POA_CORBA::_TAO_Policy_Direct_Proxy_Impl::_get_policy_type (
     TAO_Abstract_ServantBase  *servant,
     TAO::Argument ** args,
-    int 
+    int
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -359,14 +361,14 @@ POA_CORBA::_TAO_Policy_Direct_Proxy_Impl::_get_policy_type (
         );
   ACE_CHECK;
 }
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
 
 void
 POA_CORBA::_TAO_Policy_Direct_Proxy_Impl::copy (
     TAO_Abstract_ServantBase  *servant,
     TAO::Argument ** args,
-    int 
+    int
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -381,14 +383,14 @@ POA_CORBA::_TAO_Policy_Direct_Proxy_Impl::copy (
         );
   ACE_CHECK;
 }
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/direct_proxy_impl_ss.cpp:42
 
 void
 POA_CORBA::_TAO_Policy_Direct_Proxy_Impl::destroy (
     TAO_Abstract_ServantBase  *servant,
     TAO::Argument **,
-    int 
+    int
     ACE_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
@@ -408,7 +410,7 @@ POA_CORBA::_TAO_Policy_Direct_Proxy_Impl::destroy (
 //           End Direct Proxy Implementation
 ///////////////////////////////////////////////////////////////////////
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:103
 
 POA_CORBA::Policy::Policy (void)
@@ -428,11 +430,11 @@ POA_CORBA::Policy::~Policy (void)
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_policy_type_Policy
     : public TAO::Upcall_Command
   {
@@ -446,31 +448,31 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::PolicyType>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::PolicyType, TAO::SArg_Traits< ::CORBA::PolicyType>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
-      
+
+
       retval =
         this->servant_->policy_type (
           ACE_ENV_SINGLE_ARG_PARAMETER);
-        
+
     }
-  
+
   private:
     POA_CORBA::Policy * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::Policy::_get_policy_type_skel (
@@ -480,22 +482,22 @@ void POA_CORBA::Policy::_get_policy_type_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static CORBA::TypeCode_ptr const * const exceptions = 0;
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::PolicyType>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::Policy * const impl =
     static_cast<POA_CORBA::Policy *> (servant);
 
@@ -503,7 +505,7 @@ void POA_CORBA::Policy::_get_policy_type_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -516,15 +518,15 @@ void POA_CORBA::Policy::_get_policy_type_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class copy_Policy
     : public TAO::Upcall_Command
   {
@@ -538,31 +540,31 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< CORBA::Policy>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< CORBA::Policy, TAO::SArg_Traits< CORBA::Policy>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
-      
+
+
       retval =
         this->servant_->copy (
           ACE_ENV_SINGLE_ARG_PARAMETER);
-        
+
     }
-  
+
   private:
     POA_CORBA::Policy * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::Policy::copy_skel (
@@ -572,22 +574,22 @@ void POA_CORBA::Policy::copy_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static CORBA::TypeCode_ptr const * const exceptions = 0;
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< CORBA::Policy>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::Policy * const impl =
     static_cast<POA_CORBA::Policy *> (servant);
 
@@ -595,7 +597,7 @@ void POA_CORBA::Policy::copy_skel (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -608,15 +610,15 @@ void POA_CORBA::Policy::copy_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class destroy_Policy
     : public TAO::Upcall_Command
   {
@@ -626,22 +628,22 @@ namespace POA_CORBA
       : servant_ (servant)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       this->servant_->destroy (
         ACE_ENV_SINGLE_ARG_PARAMETER);
-      
+
     }
-  
+
   private:
     POA_CORBA::Policy * const servant_;
   };
-  
+
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_operation/operation_ss.cpp:192
 
 void POA_CORBA::Policy::destroy_skel (
@@ -651,28 +653,28 @@ void POA_CORBA::Policy::destroy_skel (
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static CORBA::TypeCode_ptr const * const exceptions = 0;
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< void>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::Policy * const impl =
     static_cast<POA_CORBA::Policy *> (servant);
 
   destroy_Policy command (
     impl);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -685,19 +687,19 @@ void POA_CORBA::Policy::destroy_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:169
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _is_a_Policy_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -711,68 +713,68 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
+
       TAO::SArg_Traits< CORBA::Char *>::in_arg_type arg_1 =
         TAO::Portable_Server::get_in_arg< CORBA::Char *, TAO::SArg_Traits< CORBA::Char *>::in_arg_type> (
           this->operation_details_,
           this->args_,
           1);
-        
-      
+
+
       retval =
         this->servant_-> _is_a (
           arg_1
           ACE_ENV_ARG_PARAMETER);
-        
+
     }
-  
+
   private:
     POA_CORBA::Policy * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::Policy::_is_a_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static CORBA::TypeCode_ptr const * const exceptions = 0;
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
   TAO::SArg_Traits< CORBA::Char *>::in_arg_val _tao_repository_id;
-  
+
   TAO::Argument * const args[] =
     {
       &retval,
       &_tao_repository_id
     };
-  
+
   static size_t const nargs = 2;
-  
+
   POA_CORBA::Policy * const impl =
     static_cast<POA_CORBA::Policy *> (servant);
-  
+
   _is_a_Policy_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -785,16 +787,16 @@ void POA_CORBA::Policy::_is_a_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _non_existent_Policy_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -808,59 +810,59 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean, TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
-      
+
+
       retval =
         this->servant_-> _non_existent (
           ACE_ENV_SINGLE_ARG_PARAMETER);
-        
+
     }
-  
+
   private:
     POA_CORBA::Policy * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::Policy::_non_existent_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static CORBA::TypeCode_ptr const * const exceptions = 0;
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::Policy * const impl =
     static_cast<POA_CORBA::Policy *> (servant);
-  
+
   _non_existent_Policy_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -873,18 +875,18 @@ void POA_CORBA::Policy::_non_existent_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_interface/interface_ss.cpp:393
 
 
 
 void POA_CORBA::Policy::_interface_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * /* servant_upcall */,
     void * servant
     ACE_ENV_ARG_DECL
@@ -894,30 +896,30 @@ void POA_CORBA::Policy::_interface_skel (
     ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
         TAO_ORB_Core::ifr_client_adapter_name ()
       );
-    
+
   if (_tao_adapter == 0)
     {
       ACE_THROW (CORBA::INTF_REPOS (CORBA::OMGVMCID | 1,
                                     CORBA::COMPLETED_NO));
     }
-  
+
   POA_CORBA::Policy * const impl =
     static_cast<POA_CORBA::Policy *> (servant);
-  CORBA::InterfaceDef_ptr _tao_retval = 
+  CORBA::InterfaceDef_ptr _tao_retval =
     impl->_get_interface (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-  
+
   server_request.init_reply ();
   TAO_OutputCDR &_tao_out = *server_request.outgoing ();
-  
+
   CORBA::Boolean const _tao_result =
     _tao_adapter->interfacedef_cdr_insert (
         _tao_out,
         _tao_retval
       );
-  
+
   _tao_adapter->dispose (_tao_retval);
-  
+
   if (_tao_result == 0)
     {
       ACE_THROW (CORBA::MARSHAL ());
@@ -926,11 +928,11 @@ void POA_CORBA::Policy::_interface_skel (
 
 namespace POA_CORBA
 {
-  
-  
+
+
   // TAO_IDL - Generated from
   // be\be_visitor_operation/upcall_command_ss.cpp:127
-  
+
   class _get_component_Policy_Upcall_Command
     : public TAO::Upcall_Command
   {
@@ -944,59 +946,59 @@ namespace POA_CORBA
       , args_ (args)
     {
     }
-    
+
     virtual void execute (ACE_ENV_SINGLE_ARG_DECL)
     {
       TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval =
         TAO::Portable_Server::get_ret_arg< ::CORBA::Object, TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type> (
           this->operation_details_,
           this->args_);
-      
-      
+
+
       retval =
         this->servant_-> _get_component (
           ACE_ENV_SINGLE_ARG_PARAMETER);
-        
+
     }
-  
+
   private:
     POA_CORBA::Policy * const servant_;
     TAO_Operation_Details const * const operation_details_;
     TAO::Argument * const * const args_;
   };
-  
+
 }
 void POA_CORBA::Policy::_component_skel (
-    TAO_ServerRequest & server_request, 
+    TAO_ServerRequest & server_request,
     void * TAO_INTERCEPTOR (servant_upcall),
     void * servant
     ACE_ENV_ARG_DECL
   )
 {
-  
-  
+
+
 #if TAO_HAS_INTERCEPTORS == 1
   static CORBA::TypeCode_ptr const * const exceptions = 0;
   static size_t const nexceptions = 0;
 #endif /* TAO_HAS_INTERCEPTORS */
-  
+
   TAO::SArg_Traits< ::CORBA::Object>::ret_val retval;
-  
+
   TAO::Argument * const args[] =
     {
       &retval
     };
-  
+
   static size_t const nargs = 1;
-  
+
   POA_CORBA::Policy * const impl =
     static_cast<POA_CORBA::Policy *> (servant);
-  
+
   _get_component_Policy_Upcall_Command command (
     impl,
     server_request.operation_details (),
     args);
-  
+
   TAO::Upcall_Wrapper upcall_wrapper;
   upcall_wrapper.upcall (server_request
                          , args
@@ -1009,7 +1011,7 @@ void POA_CORBA::Policy::_component_skel (
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
                          ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  
+
 }
 
 CORBA::Boolean POA_CORBA::Policy::_is_a (
@@ -1058,22 +1060,22 @@ POA_CORBA::Policy::_this (ACE_ENV_SINGLE_ARG_DECL)
 {
   TAO_Stub *stub = this->_create_stub (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   TAO_Stub_Auto_Ptr safe_stub (stub);
   CORBA::Object_ptr tmp = CORBA::Object::_nil ();
-  
+
   CORBA::Boolean _tao_opt_colloc =
     stub->servant_orb_var ()->orb_core ()->optimize_collocation_objects ();
-  
+
   ACE_NEW_RETURN (
       tmp,
       CORBA::Object (stub, _tao_opt_colloc, this),
       0
     );
-  
+
   CORBA::Object_var obj = tmp;
   (void) safe_stub.release ();
-  
+
   typedef ::CORBA::Policy STUB_SCOPED_NAME;
   return
     TAO::Narrow_Utils<STUB_SCOPED_NAME>::unchecked_narrow (
@@ -1082,48 +1084,5 @@ POA_CORBA::Policy::_this (ACE_ENV_SINGLE_ARG_DECL)
       );
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_root/root.cpp:1582
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-#if !defined (_CORBA_POLICY__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_POLICY__SARG_TRAITS_TMPLINST_SS_
-
-  template class TAO::SArg_Traits<CORBA::Policy>;
-
-  template class
-    TAO::Object_SArg_Traits_T<
-        CORBA::Policy_ptr,
-        CORBA::Policy_var,
-        CORBA::Policy_out,
-      >;
-
-#endif /* end #if !defined */
-
-  template class
-    TAO::Ret_Object_SArgument_T<
-        CORBA::Policy_ptr,
-        CORBA::Policy_var
-      >;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#if !defined (_CORBA_POLICY__SARG_TRAITS_TMPLINST_SS_)
-#define _CORBA_POLICY__SARG_TRAITS_TMPLINST_SS_
-
-# pragma instantiate TAO::SArg_Traits<CORBA::Policy>
-
-# pragma instantiate \
-    TAO::Object_SArg_Traits_T< \
-        CORBA::Policy_ptr, \
-        CORBA::Policy_var, \
-        CORBA::Policy_out, \
-      >
-
-#endif /* end #if !defined */
-
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
-
 #endif /* ifndef */
 
diff --git a/TAO/tao/PortableServer/PortableServer.h b/TAO/tao/PortableServer/PortableServer.h
index a02ed5baa1a..22bbb1dece3 100644
--- a/TAO/tao/PortableServer/PortableServer.h
+++ b/TAO/tao/PortableServer/PortableServer.h
@@ -37,6 +37,14 @@ TAO_Requires_POA_Initializer = TAO_POA_Initializer::init ();
 #include "POAManagerC.h"
 #include "PortableServer_Functions.h"
 #include "PortableServer_WFunctions.h"
+#include "PS_ForwardA.h"
+#include "IdAssignmentPolicyA.h"
+#include "IdUniquenessPolicyA.h"
+#include "ImplicitActivationPolicyA.h"
+#include "LifespanPolicyA.h"
+#include "RequestProcessingPolicyA.h"
+#include "ServantRetentionPolicyA.h"
+#include "ThreadPolicyA.h"
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/tao/PortableServer/PortableServerA.cpp b/TAO/tao/PortableServer/PortableServerA.cpp
index 9860625baec..0950e1449b4 100644
--- a/TAO/tao/PortableServer/PortableServerA.cpp
+++ b/TAO/tao/PortableServer/PortableServerA.cpp
@@ -26,18 +26,18 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "PortableServer.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
-#include "tao/Sequence_TypeCode_Static.h"
-#include "tao/String_TypeCode_Static.h"
-#include "tao/Struct_TypeCode_Static.h"
-#include "tao/TypeCode_Struct_Field.h"
+#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Sequence_TypeCode_Static.h"
+#include "tao/AnyTypeCode/String_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Struct_TypeCode_Static.h"
+#include "tao/AnyTypeCode/TypeCode_Struct_Field.h"
 #include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
-#include "tao/Any_Dual_Impl_T.h"
+#include "tao/AnyTypeCode/Any.h"
+#include "tao/AnyTypeCode/Any_Impl_T.h"
+#include "tao/AnyTypeCode/Any_Dual_Impl_T.h"
 
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/alias_typecode.cpp:50
diff --git a/TAO/tao/PortableServer/PortableServerC.cpp b/TAO/tao/PortableServer/PortableServerC.cpp
index 55d4fb81498..4c59d1769ad 100644
--- a/TAO/tao/PortableServer/PortableServerC.cpp
+++ b/TAO/tao/PortableServer/PortableServerC.cpp
@@ -47,7 +47,7 @@ namespace TAO
 {
 #if !defined (_PORTABLESERVER_ADAPTERACTIVATOR__ARG_TRAITS_CS_)
 #define _PORTABLESERVER_ADAPTERACTIVATOR__ARG_TRAITS_CS_
-  
+
   template<>
   class  Arg_Traits<PortableServer::AdapterActivator>
     : public
@@ -55,7 +55,8 @@ namespace TAO
             PortableServer::AdapterActivator_ptr,
             PortableServer::AdapterActivator_var,
             PortableServer::AdapterActivator_out,
-            TAO::Objref_Traits<PortableServer::AdapterActivator>
+            TAO::Objref_Traits<PortableServer::AdapterActivator>,
+            TAO::Any_Insert_Policy_Stream <PortableServer::AdapterActivator_ptr>
           >
   {
   };
@@ -63,7 +64,7 @@ namespace TAO
 #endif /* end #if !defined */
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_PORTABLESERVER_POALIST_CS_)
@@ -155,7 +156,7 @@ TAO::Objref_Traits<PortableServer::POA>::marshal (
   return CORBA::Object::marshal (p, cdr);
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_exception/exception_cs.cpp:63
 
 PortableServer::POA::AdapterAlreadyExists::AdapterAlreadyExists (void)
@@ -250,7 +251,7 @@ CORBA::TypeCode_ptr PortableServer::POA::AdapterAlreadyExists::_tao_type (void)
   return ::PortableServer::POA::_tc_AdapterAlreadyExists;
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_exception/exception_cs.cpp:63
 
 PortableServer::POA::AdapterNonExistent::AdapterNonExistent (void)
@@ -345,7 +346,7 @@ CORBA::TypeCode_ptr PortableServer::POA::AdapterNonExistent::_tao_type (void) co
   return ::PortableServer::POA::_tc_AdapterNonExistent;
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_exception/exception_cs.cpp:63
 
 PortableServer::POA::InvalidPolicy::InvalidPolicy (void)
@@ -458,7 +459,7 @@ CORBA::TypeCode_ptr PortableServer::POA::InvalidPolicy::_tao_type (void) const
   return ::PortableServer::POA::_tc_InvalidPolicy;
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_exception/exception_cs.cpp:63
 
 #if (TAO_HAS_MINIMUM_POA == 0)
@@ -557,7 +558,7 @@ CORBA::TypeCode_ptr PortableServer::POA::NoServant::_tao_type (void) const
 
 #endif /* TAO_HAS_MINIMUM_CORBA == 0 */
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_exception/exception_cs.cpp:63
 
 PortableServer::POA::ObjectAlreadyActive::ObjectAlreadyActive (void)
@@ -652,7 +653,7 @@ CORBA::TypeCode_ptr PortableServer::POA::ObjectAlreadyActive::_tao_type (void) c
   return ::PortableServer::POA::_tc_ObjectAlreadyActive;
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_exception/exception_cs.cpp:63
 
 PortableServer::POA::ObjectNotActive::ObjectNotActive (void)
@@ -747,7 +748,7 @@ CORBA::TypeCode_ptr PortableServer::POA::ObjectNotActive::_tao_type (void) const
   return ::PortableServer::POA::_tc_ObjectNotActive;
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_exception/exception_cs.cpp:63
 
 PortableServer::POA::ServantAlreadyActive::ServantAlreadyActive (void)
@@ -842,7 +843,7 @@ CORBA::TypeCode_ptr PortableServer::POA::ServantAlreadyActive::_tao_type (void)
   return ::PortableServer::POA::_tc_ServantAlreadyActive;
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_exception/exception_cs.cpp:63
 
 PortableServer::POA::ServantNotActive::ServantNotActive (void)
@@ -937,7 +938,7 @@ CORBA::TypeCode_ptr PortableServer::POA::ServantNotActive::_tao_type (void) cons
   return ::PortableServer::POA::_tc_ServantNotActive;
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_exception/exception_cs.cpp:63
 
 PortableServer::POA::WrongAdapter::WrongAdapter (void)
@@ -1032,7 +1033,7 @@ CORBA::TypeCode_ptr PortableServer::POA::WrongAdapter::_tao_type (void) const
   return ::PortableServer::POA::_tc_WrongAdapter;
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_exception/exception_cs.cpp:63
 
 PortableServer::POA::WrongPolicy::WrongPolicy (void)
@@ -1133,7 +1134,7 @@ PortableServer::POA::POA (void)
 PortableServer::POA::~POA (void)
 {}
 
-void 
+void
 PortableServer::POA::_tao_any_destructor (void *_tao_void_pointer)
 {
   POA *_tao_tmp_pointer =
@@ -1170,7 +1171,7 @@ PortableServer::POA::_duplicate (POA_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
diff --git a/TAO/tao/PortableServer/PortableServerC.h b/TAO/tao/PortableServer/PortableServerC.h
index 6bd28fe3dc2..1287ed243e3 100644
--- a/TAO/tao/PortableServer/PortableServerC.h
+++ b/TAO/tao/PortableServer/PortableServerC.h
@@ -85,15 +85,15 @@
 
 namespace PortableServer
 {
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_PORTABLESERVER_POALIST_CH_)
 #define _PORTABLESERVER_POALIST_CH_
-  
+
   class POAList;
-  
+
   typedef
     TAO_MngSeq_Var_T<
         POAList,
@@ -103,7 +103,7 @@ namespace PortableServer
           >
       >
     POAList_var;
-  
+
   typedef
     TAO_MngSeq_Out_T<
         POAList,
@@ -114,7 +114,7 @@ namespace PortableServer
           >
       >
     POAList_out;
-  
+
   class TAO_PortableServer_Export POAList
     : public
         TAO_Unbounded_Object_Sequence<
@@ -128,74 +128,74 @@ namespace PortableServer
     POAList (
         CORBA::ULong max,
         CORBA::ULong length,
-        POA_ptr* buffer, 
+        POA_ptr* buffer,
         CORBA::Boolean release = 0
       );
     POAList (const POAList &);
     ~POAList (void);
-    
+
     static void _tao_any_destructor (void *);
-    
+
     typedef POAList_var _var_type;
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_POAList;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-  
+
   const CORBA::PolicyType THREAD_POLICY_ID = 16U;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-  
+
   const CORBA::PolicyType LIFESPAN_POLICY_ID = 17U;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-  
+
   const CORBA::PolicyType ID_UNIQUENESS_POLICY_ID = 18U;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-  
+
   const CORBA::PolicyType ID_ASSIGNMENT_POLICY_ID = 19U;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-  
+
   const CORBA::PolicyType IMPLICIT_ACTIVATION_POLICY_ID = 20U;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-  
+
   const CORBA::PolicyType SERVANT_RETENTION_POLICY_ID = 21U;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
-  
+
   const CORBA::PolicyType REQUEST_PROCESSING_POLICY_ID = 22U;
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_PORTABLESERVER_POAMANAGER__VAR_OUT_CH_)
 #define _PORTABLESERVER_POAMANAGER__VAR_OUT_CH_
-  
+
   class POAManager;
   typedef POAManager *POAManager_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         POAManager
       >
     POAManager_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         POAManager
@@ -203,22 +203,22 @@ namespace PortableServer
     POAManager_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_PORTABLESERVER_ADAPTERACTIVATOR__VAR_OUT_CH_)
 #define _PORTABLESERVER_ADAPTERACTIVATOR__VAR_OUT_CH_
-  
+
   class AdapterActivator;
   typedef AdapterActivator *AdapterActivator_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         AdapterActivator
       >
     AdapterActivator_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         AdapterActivator
@@ -226,22 +226,22 @@ namespace PortableServer
     AdapterActivator_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_PORTABLESERVER_SERVANTMANAGER__VAR_OUT_CH_)
 #define _PORTABLESERVER_SERVANTMANAGER__VAR_OUT_CH_
-  
+
   class ServantManager;
   typedef ServantManager *ServantManager_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         ServantManager
       >
     ServantManager_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         ServantManager
@@ -249,22 +249,22 @@ namespace PortableServer
     ServantManager_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_PORTABLESERVER_POA__VAR_OUT_CH_)
 #define _PORTABLESERVER_POA__VAR_OUT_CH_
-  
+
   class POA;
   typedef POA *POA_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         POA
       >
     POA_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         POA
@@ -272,65 +272,65 @@ namespace PortableServer
     POA_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_PORTABLESERVER_POA_CH_)
 #define _PORTABLESERVER_POA_CH_
-  
+
   class TAO_PortableServer_Export POA
     : public virtual CORBA::Object
   {
   public:
     typedef POA_ptr _ptr_type;
     typedef POA_var _var_type;
-    
+
     // The static operations.
     static POA_ptr _duplicate (POA_ptr obj);
-    
+
     static void _tao_release (POA_ptr obj);
-    
+
     static POA_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static POA_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static POA_ptr _nil (void)
     {
       return static_cast<POA_ptr> (0);
     }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_exception/exception_ch.cpp:53
 
 #if !defined (_PORTABLESERVER_POA_ADAPTERALREADYEXISTS_CH_)
 #define _PORTABLESERVER_POA_ADAPTERALREADYEXISTS_CH_
-    
+
     class TAO_PortableServer_Export AdapterAlreadyExists : public CORBA::UserException
     {
     public:
-      
+
       AdapterAlreadyExists (void);
       AdapterAlreadyExists (const AdapterAlreadyExists &);
       ~AdapterAlreadyExists (void);
 
       AdapterAlreadyExists &operator= (const AdapterAlreadyExists &);
-      
+
       static void _tao_any_destructor (void *);
-      
+
       static AdapterAlreadyExists *_downcast (CORBA::Exception *);
       static const AdapterAlreadyExists *_downcast (CORBA::Exception const *);
-      
+
       static CORBA::Exception *_alloc (void);
-      
+
       virtual CORBA::Exception *_tao_duplicate (void) const;
 
       virtual void _raise (void) const;
@@ -339,48 +339,48 @@ namespace PortableServer
           TAO_OutputCDR &
           ACE_ENV_ARG_DECL
         ) const;
-      
+
       virtual void _tao_decode (
           TAO_InputCDR &
           ACE_ENV_ARG_DECL
         );
-      
+
       // TAO_IDL - Generated from
       // be\be_visitor_exception/exception_ch.cpp:129
-      
+
       virtual CORBA::TypeCode_ptr _tao_type (void) const;
     };
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_typecode/typecode_decl.cpp:44
-    
+
     static ::CORBA::TypeCode_ptr const _tc_AdapterAlreadyExists;
 
 #endif /* end #if !defined */
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_exception/exception_ch.cpp:53
 
 #if !defined (_PORTABLESERVER_POA_ADAPTERNONEXISTENT_CH_)
 #define _PORTABLESERVER_POA_ADAPTERNONEXISTENT_CH_
-    
+
     class TAO_PortableServer_Export AdapterNonExistent : public CORBA::UserException
     {
     public:
-      
+
       AdapterNonExistent (void);
       AdapterNonExistent (const AdapterNonExistent &);
       ~AdapterNonExistent (void);
 
       AdapterNonExistent &operator= (const AdapterNonExistent &);
-      
+
       static void _tao_any_destructor (void *);
-      
+
       static AdapterNonExistent *_downcast (CORBA::Exception *);
       static const AdapterNonExistent *_downcast (CORBA::Exception const *);
-      
+
       static CORBA::Exception *_alloc (void);
-      
+
       virtual CORBA::Exception *_tao_duplicate (void) const;
 
       virtual void _raise (void) const;
@@ -389,49 +389,49 @@ namespace PortableServer
           TAO_OutputCDR &
           ACE_ENV_ARG_DECL
         ) const;
-      
+
       virtual void _tao_decode (
           TAO_InputCDR &
           ACE_ENV_ARG_DECL
         );
-      
+
       // TAO_IDL - Generated from
       // be\be_visitor_exception/exception_ch.cpp:129
-      
+
       virtual CORBA::TypeCode_ptr _tao_type (void) const;
     };
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_typecode/typecode_decl.cpp:44
-    
+
     static ::CORBA::TypeCode_ptr const _tc_AdapterNonExistent;
 
 #endif /* end #if !defined */
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_exception/exception_ch.cpp:53
 
 #if !defined (_PORTABLESERVER_POA_INVALIDPOLICY_CH_)
 #define _PORTABLESERVER_POA_INVALIDPOLICY_CH_
-    
+
     class TAO_PortableServer_Export InvalidPolicy : public CORBA::UserException
     {
     public:
-      
+
       CORBA::UShort index;
       InvalidPolicy (void);
       InvalidPolicy (const InvalidPolicy &);
       ~InvalidPolicy (void);
 
       InvalidPolicy &operator= (const InvalidPolicy &);
-      
+
       static void _tao_any_destructor (void *);
-      
+
       static InvalidPolicy *_downcast (CORBA::Exception *);
       static const InvalidPolicy *_downcast (CORBA::Exception const *);
-      
+
       static CORBA::Exception *_alloc (void);
-      
+
       virtual CORBA::Exception *_tao_duplicate (void) const;
 
       virtual void _raise (void) const;
@@ -440,32 +440,32 @@ namespace PortableServer
           TAO_OutputCDR &
           ACE_ENV_ARG_DECL
         ) const;
-      
+
       virtual void _tao_decode (
           TAO_InputCDR &
           ACE_ENV_ARG_DECL
         );
-      
+
       // TAO_IDL - Generated from
       // be\be_visitor_exception/exception_ctor.cpp:66
-      
+
       InvalidPolicy (
           CORBA::UShort _tao_index
         );
-      
+
       // TAO_IDL - Generated from
       // be\be_visitor_exception/exception_ch.cpp:129
-      
+
       virtual CORBA::TypeCode_ptr _tao_type (void) const;
     };
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_typecode/typecode_decl.cpp:44
-    
+
     static ::CORBA::TypeCode_ptr const _tc_InvalidPolicy;
 
 #endif /* end #if !defined */
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_exception/exception_ch.cpp:53
 
@@ -473,24 +473,24 @@ namespace PortableServer
 
 #if !defined (_PORTABLESERVER_POA_NOSERVANT_CH_)
 #define _PORTABLESERVER_POA_NOSERVANT_CH_
-    
+
     class TAO_PortableServer_Export NoServant : public CORBA::UserException
     {
     public:
-      
+
       NoServant (void);
       NoServant (const NoServant &);
       ~NoServant (void);
 
       NoServant &operator= (const NoServant &);
-      
+
       static void _tao_any_destructor (void *);
-      
+
       static NoServant *_downcast (CORBA::Exception *);
       static const NoServant *_downcast (CORBA::Exception const *);
-      
+
       static CORBA::Exception *_alloc (void);
-      
+
       virtual CORBA::Exception *_tao_duplicate (void) const;
 
       virtual void _raise (void) const;
@@ -499,25 +499,25 @@ namespace PortableServer
           TAO_OutputCDR &
           ACE_ENV_ARG_DECL
         ) const;
-      
+
       virtual void _tao_decode (
           TAO_InputCDR &
           ACE_ENV_ARG_DECL
         );
-      
+
       // TAO_IDL - Generated from
       // be\be_visitor_exception/exception_ch.cpp:129
-      
+
       virtual CORBA::TypeCode_ptr _tao_type (void) const;
     };
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_typecode/typecode_decl.cpp:44
-    
+
     static ::CORBA::TypeCode_ptr const _tc_NoServant;
 
 #endif /* end #if !defined */
-    
+
 #endif /* TAO_HAS_MINIMUM_CORBA == 0 */
 
     // TAO_IDL - Generated from
@@ -525,24 +525,24 @@ namespace PortableServer
 
 #if !defined (_PORTABLESERVER_POA_OBJECTALREADYACTIVE_CH_)
 #define _PORTABLESERVER_POA_OBJECTALREADYACTIVE_CH_
-    
+
     class TAO_PortableServer_Export ObjectAlreadyActive : public CORBA::UserException
     {
     public:
-      
+
       ObjectAlreadyActive (void);
       ObjectAlreadyActive (const ObjectAlreadyActive &);
       ~ObjectAlreadyActive (void);
 
       ObjectAlreadyActive &operator= (const ObjectAlreadyActive &);
-      
+
       static void _tao_any_destructor (void *);
-      
+
       static ObjectAlreadyActive *_downcast (CORBA::Exception *);
       static const ObjectAlreadyActive *_downcast (CORBA::Exception const *);
-      
+
       static CORBA::Exception *_alloc (void);
-      
+
       virtual CORBA::Exception *_tao_duplicate (void) const;
 
       virtual void _raise (void) const;
@@ -551,48 +551,48 @@ namespace PortableServer
           TAO_OutputCDR &
           ACE_ENV_ARG_DECL
         ) const;
-      
+
       virtual void _tao_decode (
           TAO_InputCDR &
           ACE_ENV_ARG_DECL
         );
-      
+
       // TAO_IDL - Generated from
       // be\be_visitor_exception/exception_ch.cpp:129
-      
+
       virtual CORBA::TypeCode_ptr _tao_type (void) const;
     };
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_typecode/typecode_decl.cpp:44
-    
+
     static ::CORBA::TypeCode_ptr const _tc_ObjectAlreadyActive;
 
 #endif /* end #if !defined */
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_exception/exception_ch.cpp:53
 
 #if !defined (_PORTABLESERVER_POA_OBJECTNOTACTIVE_CH_)
 #define _PORTABLESERVER_POA_OBJECTNOTACTIVE_CH_
-    
+
     class TAO_PortableServer_Export ObjectNotActive : public CORBA::UserException
     {
     public:
-      
+
       ObjectNotActive (void);
       ObjectNotActive (const ObjectNotActive &);
       ~ObjectNotActive (void);
 
       ObjectNotActive &operator= (const ObjectNotActive &);
-      
+
       static void _tao_any_destructor (void *);
-      
+
       static ObjectNotActive *_downcast (CORBA::Exception *);
       static const ObjectNotActive *_downcast (CORBA::Exception const *);
-      
+
       static CORBA::Exception *_alloc (void);
-      
+
       virtual CORBA::Exception *_tao_duplicate (void) const;
 
       virtual void _raise (void) const;
@@ -601,48 +601,48 @@ namespace PortableServer
           TAO_OutputCDR &
           ACE_ENV_ARG_DECL
         ) const;
-      
+
       virtual void _tao_decode (
           TAO_InputCDR &
           ACE_ENV_ARG_DECL
         );
-      
+
       // TAO_IDL - Generated from
       // be\be_visitor_exception/exception_ch.cpp:129
-      
+
       virtual CORBA::TypeCode_ptr _tao_type (void) const;
     };
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_typecode/typecode_decl.cpp:44
-    
+
     static ::CORBA::TypeCode_ptr const _tc_ObjectNotActive;
 
 #endif /* end #if !defined */
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_exception/exception_ch.cpp:53
 
 #if !defined (_PORTABLESERVER_POA_SERVANTALREADYACTIVE_CH_)
 #define _PORTABLESERVER_POA_SERVANTALREADYACTIVE_CH_
-    
+
     class TAO_PortableServer_Export ServantAlreadyActive : public CORBA::UserException
     {
     public:
-      
+
       ServantAlreadyActive (void);
       ServantAlreadyActive (const ServantAlreadyActive &);
       ~ServantAlreadyActive (void);
 
       ServantAlreadyActive &operator= (const ServantAlreadyActive &);
-      
+
       static void _tao_any_destructor (void *);
-      
+
       static ServantAlreadyActive *_downcast (CORBA::Exception *);
       static const ServantAlreadyActive *_downcast (CORBA::Exception const *);
-      
+
       static CORBA::Exception *_alloc (void);
-      
+
       virtual CORBA::Exception *_tao_duplicate (void) const;
 
       virtual void _raise (void) const;
@@ -651,48 +651,48 @@ namespace PortableServer
           TAO_OutputCDR &
           ACE_ENV_ARG_DECL
         ) const;
-      
+
       virtual void _tao_decode (
           TAO_InputCDR &
           ACE_ENV_ARG_DECL
         );
-      
+
       // TAO_IDL - Generated from
       // be\be_visitor_exception/exception_ch.cpp:129
-      
+
       virtual CORBA::TypeCode_ptr _tao_type (void) const;
     };
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_typecode/typecode_decl.cpp:44
-    
+
     static ::CORBA::TypeCode_ptr const _tc_ServantAlreadyActive;
 
 #endif /* end #if !defined */
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_exception/exception_ch.cpp:53
 
 #if !defined (_PORTABLESERVER_POA_SERVANTNOTACTIVE_CH_)
 #define _PORTABLESERVER_POA_SERVANTNOTACTIVE_CH_
-    
+
     class TAO_PortableServer_Export ServantNotActive : public CORBA::UserException
     {
     public:
-      
+
       ServantNotActive (void);
       ServantNotActive (const ServantNotActive &);
       ~ServantNotActive (void);
 
       ServantNotActive &operator= (const ServantNotActive &);
-      
+
       static void _tao_any_destructor (void *);
-      
+
       static ServantNotActive *_downcast (CORBA::Exception *);
       static const ServantNotActive *_downcast (CORBA::Exception const *);
-      
+
       static CORBA::Exception *_alloc (void);
-      
+
       virtual CORBA::Exception *_tao_duplicate (void) const;
 
       virtual void _raise (void) const;
@@ -701,48 +701,48 @@ namespace PortableServer
           TAO_OutputCDR &
           ACE_ENV_ARG_DECL
         ) const;
-      
+
       virtual void _tao_decode (
           TAO_InputCDR &
           ACE_ENV_ARG_DECL
         );
-      
+
       // TAO_IDL - Generated from
       // be\be_visitor_exception/exception_ch.cpp:129
-      
+
       virtual CORBA::TypeCode_ptr _tao_type (void) const;
     };
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_typecode/typecode_decl.cpp:44
-    
+
     static ::CORBA::TypeCode_ptr const _tc_ServantNotActive;
 
 #endif /* end #if !defined */
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_exception/exception_ch.cpp:53
 
 #if !defined (_PORTABLESERVER_POA_WRONGADAPTER_CH_)
 #define _PORTABLESERVER_POA_WRONGADAPTER_CH_
-    
+
     class TAO_PortableServer_Export WrongAdapter : public CORBA::UserException
     {
     public:
-      
+
       WrongAdapter (void);
       WrongAdapter (const WrongAdapter &);
       ~WrongAdapter (void);
 
       WrongAdapter &operator= (const WrongAdapter &);
-      
+
       static void _tao_any_destructor (void *);
-      
+
       static WrongAdapter *_downcast (CORBA::Exception *);
       static const WrongAdapter *_downcast (CORBA::Exception const *);
-      
+
       static CORBA::Exception *_alloc (void);
-      
+
       virtual CORBA::Exception *_tao_duplicate (void) const;
 
       virtual void _raise (void) const;
@@ -751,48 +751,48 @@ namespace PortableServer
           TAO_OutputCDR &
           ACE_ENV_ARG_DECL
         ) const;
-      
+
       virtual void _tao_decode (
           TAO_InputCDR &
           ACE_ENV_ARG_DECL
         );
-      
+
       // TAO_IDL - Generated from
       // be\be_visitor_exception/exception_ch.cpp:129
-      
+
       virtual CORBA::TypeCode_ptr _tao_type (void) const;
     };
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_typecode/typecode_decl.cpp:44
-    
+
     static ::CORBA::TypeCode_ptr const _tc_WrongAdapter;
 
 #endif /* end #if !defined */
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_exception/exception_ch.cpp:53
 
 #if !defined (_PORTABLESERVER_POA_WRONGPOLICY_CH_)
 #define _PORTABLESERVER_POA_WRONGPOLICY_CH_
-    
+
     class TAO_PortableServer_Export WrongPolicy : public CORBA::UserException
     {
     public:
-      
+
       WrongPolicy (void);
       WrongPolicy (const WrongPolicy &);
       ~WrongPolicy (void);
 
       WrongPolicy &operator= (const WrongPolicy &);
-      
+
       static void _tao_any_destructor (void *);
-      
+
       static WrongPolicy *_downcast (CORBA::Exception *);
       static const WrongPolicy *_downcast (CORBA::Exception const *);
-      
+
       static CORBA::Exception *_alloc (void);
-      
+
       virtual CORBA::Exception *_tao_duplicate (void) const;
 
       virtual void _raise (void) const;
@@ -801,28 +801,28 @@ namespace PortableServer
           TAO_OutputCDR &
           ACE_ENV_ARG_DECL
         ) const;
-      
+
       virtual void _tao_decode (
           TAO_InputCDR &
           ACE_ENV_ARG_DECL
         );
-      
+
       // TAO_IDL - Generated from
       // be\be_visitor_exception/exception_ch.cpp:129
-      
+
       virtual CORBA::TypeCode_ptr _tao_type (void) const;
     };
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_typecode/typecode_decl.cpp:44
-    
+
     static ::CORBA::TypeCode_ptr const _tc_WrongPolicy;
 
 #endif /* end #if !defined */
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::PortableServer::POA_ptr create_POA (
         const char * adapter_name,
         ::PortableServer::POAManager_ptr a_POAManager,
@@ -834,10 +834,10 @@ namespace PortableServer
         ::PortableServer::POA::AdapterAlreadyExists,
         ::PortableServer::POA::InvalidPolicy
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::PortableServer::POA_ptr find_POA (
         const char * adapter_name,
         ::CORBA::Boolean activate_it
@@ -847,10 +847,10 @@ namespace PortableServer
         CORBA::SystemException,
         ::PortableServer::POA::AdapterNonExistent
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void destroy (
         ::CORBA::Boolean etherealize_objects,
         ::CORBA::Boolean wait_for_completion
@@ -859,10 +859,10 @@ namespace PortableServer
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
 #if (TAO_HAS_MINIMUM_POA == 0)
     virtual ::PortableServer::ThreadPolicy_ptr create_thread_policy (
         ::PortableServer::ThreadPolicyValue value
@@ -872,10 +872,10 @@ namespace PortableServer
         CORBA::SystemException
       )) = 0;
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::PortableServer::LifespanPolicy_ptr create_lifespan_policy (
         ::PortableServer::LifespanPolicyValue value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -883,10 +883,10 @@ namespace PortableServer
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::PortableServer::IdUniquenessPolicy_ptr create_id_uniqueness_policy (
         ::PortableServer::IdUniquenessPolicyValue value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -894,10 +894,10 @@ namespace PortableServer
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::PortableServer::IdAssignmentPolicy_ptr create_id_assignment_policy (
         ::PortableServer::IdAssignmentPolicyValue value
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -905,10 +905,10 @@ namespace PortableServer
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
 #if (TAO_HAS_MINIMUM_POA == 0)
     virtual ::PortableServer::ImplicitActivationPolicy_ptr create_implicit_activation_policy (
         ::PortableServer::ImplicitActivationPolicyValue value
@@ -918,10 +918,10 @@ namespace PortableServer
         CORBA::SystemException
       )) = 0;
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
 #if (TAO_HAS_MINIMUM_POA == 0)
     virtual ::PortableServer::ServantRetentionPolicy_ptr create_servant_retention_policy (
         ::PortableServer::ServantRetentionPolicyValue value
@@ -931,10 +931,10 @@ namespace PortableServer
         CORBA::SystemException
       )) = 0;
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
 #if (TAO_HAS_MINIMUM_POA == 0)
     virtual ::PortableServer::RequestProcessingPolicy_ptr create_request_processing_policy (
         ::PortableServer::RequestProcessingPolicyValue value
@@ -944,50 +944,50 @@ namespace PortableServer
         CORBA::SystemException
       )) = 0;
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual char * the_name (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::PortableServer::POA_ptr the_parent (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::PortableServer::POAList * the_children (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::PortableServer::POAManager_ptr the_POAManager (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
 #if (TAO_HAS_MINIMUM_POA == 0)
 
     virtual ::PortableServer::AdapterActivator_ptr the_activator (
@@ -996,10 +996,10 @@ namespace PortableServer
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void the_activator (
         ::PortableServer::AdapterActivator_ptr the_activator
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1008,10 +1008,10 @@ namespace PortableServer
         CORBA::SystemException
       )) = 0;
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
 #if (TAO_HAS_MINIMUM_POA == 0)
     virtual ::PortableServer::ServantManager_ptr get_servant_manager (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
@@ -1020,10 +1020,10 @@ namespace PortableServer
         CORBA::SystemException,
         ::PortableServer::POA::WrongPolicy
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void set_servant_manager (
         ::PortableServer::ServantManager_ptr imgr
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1033,10 +1033,10 @@ namespace PortableServer
         ::PortableServer::POA::WrongPolicy
       )) = 0;
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
 #if (TAO_HAS_MINIMUM_POA == 0)
 
     virtual ::PortableServer::Servant get_servant (
@@ -1047,10 +1047,10 @@ namespace PortableServer
         ::PortableServer::POA::NoServant,
         ::PortableServer::POA::WrongPolicy
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void set_servant (
         ::PortableServer::Servant p_servant
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1059,12 +1059,12 @@ namespace PortableServer
         CORBA::SystemException,
         ::PortableServer::POA::WrongPolicy
       )) = 0;
-    
+
 #endif /* TAO_HAS_MINIMUM_CORBA == 0 */
 
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::PortableServer::ObjectId * activate_object (
         ::PortableServer::Servant p_servant
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1074,10 +1074,10 @@ namespace PortableServer
         ::PortableServer::POA::ServantAlreadyActive,
         ::PortableServer::POA::WrongPolicy
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void activate_object_with_id (
         const ::PortableServer::ObjectId & id,
         ::PortableServer::Servant p_servant
@@ -1089,10 +1089,10 @@ namespace PortableServer
         ::PortableServer::POA::ObjectAlreadyActive,
         ::PortableServer::POA::WrongPolicy
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void deactivate_object (
         const ::PortableServer::ObjectId & oid
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1102,10 +1102,10 @@ namespace PortableServer
         ::PortableServer::POA::ObjectNotActive,
         ::PortableServer::POA::WrongPolicy
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::Object_ptr create_reference (
         const char * intf
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1114,10 +1114,10 @@ namespace PortableServer
         CORBA::SystemException,
         ::PortableServer::POA::WrongPolicy
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::Object_ptr create_reference_with_id (
         const ::PortableServer::ObjectId & oid,
         const char * intf
@@ -1126,10 +1126,10 @@ namespace PortableServer
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::PortableServer::ObjectId * servant_to_id (
         ::PortableServer::Servant p_servant
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1139,10 +1139,10 @@ namespace PortableServer
         ::PortableServer::POA::ServantNotActive,
         ::PortableServer::POA::WrongPolicy
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::Object_ptr servant_to_reference (
         ::PortableServer::Servant p_servant
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1152,10 +1152,10 @@ namespace PortableServer
         ::PortableServer::POA::ServantNotActive,
         ::PortableServer::POA::WrongPolicy
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::PortableServer::Servant reference_to_servant (
         ::CORBA::Object_ptr reference
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1166,10 +1166,10 @@ namespace PortableServer
         ::PortableServer::POA::WrongAdapter,
         ::PortableServer::POA::WrongPolicy
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::PortableServer::ObjectId * reference_to_id (
         ::CORBA::Object_ptr reference
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1179,10 +1179,10 @@ namespace PortableServer
         ::PortableServer::POA::WrongAdapter,
         ::PortableServer::POA::WrongPolicy
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::PortableServer::Servant id_to_servant (
         const ::PortableServer::ObjectId & oid
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1192,10 +1192,10 @@ namespace PortableServer
         ::PortableServer::POA::ObjectNotActive,
         ::PortableServer::POA::WrongPolicy
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::Object_ptr id_to_reference (
         const ::PortableServer::ObjectId & oid
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -1205,46 +1205,46 @@ namespace PortableServer
         ::PortableServer::POA::ObjectNotActive,
         ::PortableServer::POA::WrongPolicy
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::OctetSeq * id (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
-    
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
+
   protected:
     // Abstract or local interface only.
     POA (void);
-    
+
     virtual ~POA (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     POA (const POA &);
-    
+
     void operator= (const POA &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_POA;
 
 // TAO_IDL - Generated from
@@ -1259,9 +1259,9 @@ namespace PortableServer
 namespace TAO
 {
 
-#if !defined (_PORTABLESERVER_POAMANAGER__TRAITS_CH_)
-#define _PORTABLESERVER_POAMANAGER__TRAITS_CH_
-  
+#if !defined (_PORTABLESERVER_POAMANAGER__TRAITS_)
+#define _PORTABLESERVER_POAMANAGER__TRAITS_
+
   template<>
   struct TAO_PortableServer_Export Objref_Traits< ::PortableServer::POAManager>
   {
@@ -1280,9 +1280,9 @@ namespace TAO
 
 #endif /* end #if !defined */
 
-#if !defined (_PORTABLESERVER_ADAPTERACTIVATOR__TRAITS_CH_)
-#define _PORTABLESERVER_ADAPTERACTIVATOR__TRAITS_CH_
-  
+#if !defined (_PORTABLESERVER_ADAPTERACTIVATOR__TRAITS_)
+#define _PORTABLESERVER_ADAPTERACTIVATOR__TRAITS_
+
   template<>
   struct TAO_PortableServer_Export Objref_Traits< ::PortableServer::AdapterActivator>
   {
@@ -1301,9 +1301,9 @@ namespace TAO
 
 #endif /* end #if !defined */
 
-#if !defined (_PORTABLESERVER_SERVANTMANAGER__TRAITS_CH_)
-#define _PORTABLESERVER_SERVANTMANAGER__TRAITS_CH_
-  
+#if !defined (_PORTABLESERVER_SERVANTMANAGER__TRAITS_)
+#define _PORTABLESERVER_SERVANTMANAGER__TRAITS_
+
   template<>
   struct TAO_PortableServer_Export Objref_Traits< ::PortableServer::ServantManager>
   {
@@ -1322,9 +1322,9 @@ namespace TAO
 
 #endif /* end #if !defined */
 
-#if !defined (_PORTABLESERVER_POA__TRAITS_CH_)
-#define _PORTABLESERVER_POA__TRAITS_CH_
-  
+#if !defined (_PORTABLESERVER_POA__TRAITS_)
+#define _PORTABLESERVER_POA__TRAITS_
+
   template<>
   struct TAO_PortableServer_Export Objref_Traits< ::PortableServer::POA>
   {
diff --git a/TAO/tao/PortableServer/PortableServerS.h b/TAO/tao/PortableServer/PortableServerS.h
index c52e7d0ecc5..5b1c718ab1c 100644
--- a/TAO/tao/PortableServer/PortableServerS.h
+++ b/TAO/tao/PortableServer/PortableServerS.h
@@ -1,11 +1,76 @@
-/*  @file PortableServerS.h
- *
- * $Id$
- *
- *  @author Matt Murphy <murphym@cs.uri.edu>
- *
- *  This file is here and is empty because code generated from pidl files with
- *  local interfaces incorrectly includes this file.  It is not needed but
- *  will caouse compile errors with local interface generated code.
- *
- */
+// -*- C++ -*-
+//
+// $Id$
+
+// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       Irvine, CA
+//       USA
+//       http://doc.ece.uci.edu/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
+//
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
+
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:373
+
+#ifndef _TAO_IDL_PORTABLESERVERS_H_
+#define _TAO_IDL_PORTABLESERVERS_H_
+
+#include /**/ "ace/pre.h"
+
+#include "PortableServerC.h"
+#include "tao/Policy_ForwardS.h"
+#include "tao/OctetSeqS.h"
+#include "tao/orb_typesS.h"
+#include "tao/PortableServer/PS_ForwardS.h"
+#include "tao/PortableServer/IdAssignmentPolicyS.h"
+#include "tao/PortableServer/IdUniquenessPolicyS.h"
+#include "tao/PortableServer/ImplicitActivationPolicyS.h"
+#include "tao/PortableServer/LifespanPolicyS.h"
+#include "tao/PortableServer/RequestProcessingPolicyS.h"
+#include "tao/PortableServer/ServantRetentionPolicyS.h"
+#include "tao/PortableServer/ThreadPolicyS.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_sh.cpp:49
+
+namespace POA_PortableServer
+{
+  
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_sh.cpp:80
+
+} // module PortableServer
+
+// TAO_IDL - Generated from 
+// be\be_codegen.cpp:1060
+
+
+#if defined (__ACE_INLINE__)
+#include "PortableServerS.inl"
+#endif /* defined INLINE */
+
+#include /**/ "ace/post.h"
+#endif /* ifndef */
+
diff --git a/TAO/tao/PortableServer/PortableServer_includeA.h b/TAO/tao/PortableServer/PortableServer_includeA.h
new file mode 100644
index 00000000000..2874993878d
--- /dev/null
+++ b/TAO/tao/PortableServer/PortableServer_includeA.h
@@ -0,0 +1,44 @@
+// -*- C++ -*-
+//
+// $Id$
+
+// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       Irvine, CA
+//       USA
+//       http://doc.ece.uci.edu/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
+//
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
+
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:390
+
+#ifndef _TAO_IDL_ORIG_PORTABLESERVER_INCLUDEA_H_
+#define _TAO_IDL_ORIG_PORTABLESERVER_INCLUDEA_H_
+
+#include /**/ "ace/pre.h"
+
+#include "tao/PortableServer/PortableServer_includeC.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include /**/ "ace/post.h"
+#endif /* ifndef */
+
diff --git a/TAO/tao/PortableServer/PortableServer_includeC.h b/TAO/tao/PortableServer/PortableServer_includeC.h
index 38649c85687..152ccaf4f6a 100644
--- a/TAO/tao/PortableServer/PortableServer_includeC.h
+++ b/TAO/tao/PortableServer/PortableServer_includeC.h
@@ -26,10 +26,10 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:153
+// be\be_codegen.cpp:154
 
-#ifndef _TAO_IDL_ORIG_PORTABLESERVER_INCLUDEC_H_
-#define _TAO_IDL_ORIG_PORTABLESERVER_INCLUDEC_H_
+#ifndef _TAO_IDL_PORTABLESERVER_INCLUDEC_H_
+#define _TAO_IDL_PORTABLESERVER_INCLUDEC_H_
 
 #include /**/ "ace/pre.h"
 
@@ -52,15 +52,6 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_PortableServer_Export
 
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
 // be\be_visitor_traits.cpp:61
 
@@ -70,15 +61,7 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
+// be\be_codegen.cpp:1028
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/tao/PortableServer/PortableServer_includeS.h b/TAO/tao/PortableServer/PortableServer_includeS.h
index ef06f9a4ce2..17b1360599e 100644
--- a/TAO/tao/PortableServer/PortableServer_includeS.h
+++ b/TAO/tao/PortableServer/PortableServer_includeS.h
@@ -25,43 +25,4 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:390
-
-#ifndef _TAO_IDL_ORIG_PORTABLESERVER_INCLUDES_H_
-#define _TAO_IDL_ORIG_PORTABLESERVER_INCLUDES_H_
-
-#include /**/ "ace/pre.h"
-
-#include "tao/PortableServer/PortableServerS.h"
-#include "PortableServer_includeC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
-// TAO_IDL - Generated from
-// be\be_codegen.cpp:997
-
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
-#include /**/ "ace/post.h"
-#endif /* ifndef */
-
+// Skeleton file generation suppressed with command line option -SS
diff --git a/TAO/tao/PortableServer/RequestProcessingPolicyA.cpp b/TAO/tao/PortableServer/RequestProcessingPolicyA.cpp
index 7abf259932d..542527f8a7b 100644
--- a/TAO/tao/PortableServer/RequestProcessingPolicyA.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingPolicyA.cpp
@@ -25,16 +25,16 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "RequestProcessingPolicyC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Enum_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
+#include "RequestProcessingPolicyA.h"
+#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Enum_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
 #include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
-#include "tao/Any_Basic_Impl_T.h"
+#include "tao/AnyTypeCode/Any.h"
+#include "tao/AnyTypeCode/Any_Impl_T.h"
+#include "tao/AnyTypeCode/Any_Basic_Impl_T.h"
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
@@ -112,79 +112,4 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableServer::RequestProcessingPolicy>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableServer::RequestProcessingPolicy>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-  
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableServer::RequestProcessingPolicy>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableServer::RequestProcessingPolicy_ptr _tao_elem
-  )
-{
-  PortableServer::RequestProcessingPolicy_ptr _tao_objptr =
-    PortableServer::RequestProcessingPolicy::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableServer::RequestProcessingPolicy_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<PortableServer::RequestProcessingPolicy>::insert (
-      _tao_any,
-      PortableServer::RequestProcessingPolicy::_tao_any_destructor,
-      PortableServer::_tc_RequestProcessingPolicy,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    PortableServer::RequestProcessingPolicy_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<PortableServer::RequestProcessingPolicy>::extract (
-        _tao_any,
-        PortableServer::RequestProcessingPolicy::_tao_any_destructor,
-        PortableServer::_tc_RequestProcessingPolicy,
-        _tao_elem
-      );
-}
-
 #endif /* TAO_HAS_MINIMUM_CORBA == 0 */
diff --git a/TAO/tao/PortableServer/RequestProcessingPolicyA.h b/TAO/tao/PortableServer/RequestProcessingPolicyA.h
new file mode 100644
index 00000000000..a00d7522145
--- /dev/null
+++ b/TAO/tao/PortableServer/RequestProcessingPolicyA.h
@@ -0,0 +1,70 @@
+// -*- C++ -*-
+//
+// $Id$
+
+// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       Irvine, CA
+//       USA
+//       http://doc.ece.uci.edu/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
+//
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
+
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:754
+
+#ifndef _TAO_IDL_REQUESTPROCESSINGPOLICYA_H_
+#define _TAO_IDL_REQUESTPROCESSINGPOLICYA_H_
+
+#include /**/ "ace/pre.h"
+
+#include "portableserver_export.h"
+#include "RequestProcessingPolicyC.h"
+#include "tao/AnyTypeCode/PolicyA.h"
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:59
+
+namespace PortableServer
+{
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+  
+  extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_RequestProcessingPolicyValue;
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+  
+  extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_RequestProcessingPolicy;
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:86
+
+} // module PortableServer
+
+// TAO_IDL - Generated from
+// be\be_visitor_enum/any_op_ch.cpp:52
+
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::RequestProcessingPolicyValue);
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::RequestProcessingPolicyValue &);
+
+#include /**/ "ace/post.h"
+
+#endif /* ifndef */
diff --git a/TAO/tao/PortableServer/RequestProcessingPolicyC.cpp b/TAO/tao/PortableServer/RequestProcessingPolicyC.cpp
index 0cf4d5d6df0..c33d79df47f 100644
--- a/TAO/tao/PortableServer/RequestProcessingPolicyC.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingPolicyC.cpp
@@ -26,17 +26,13 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:291
+// be\be_codegen.cpp:277
 
 
 #include "RequestProcessingPolicyC.h"
 #include "tao/CDR.h"
 #include "ace/OS_NS_string.h"
 
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
@@ -90,14 +86,6 @@ PortableServer::RequestProcessingPolicy::RequestProcessingPolicy (void)
 PortableServer::RequestProcessingPolicy::~RequestProcessingPolicy (void)
 {}
 
-void 
-PortableServer::RequestProcessingPolicy::_tao_any_destructor (void *_tao_void_pointer)
-{
-  RequestProcessingPolicy *_tao_tmp_pointer =
-    static_cast<RequestProcessingPolicy *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
 PortableServer::RequestProcessingPolicy_ptr
 PortableServer::RequestProcessingPolicy::_narrow (
     CORBA::Object_ptr _tao_objref
diff --git a/TAO/tao/PortableServer/RequestProcessingPolicyC.h b/TAO/tao/PortableServer/RequestProcessingPolicyC.h
index 467d161657d..6cb0d952943 100644
--- a/TAO/tao/PortableServer/RequestProcessingPolicyC.h
+++ b/TAO/tao/PortableServer/RequestProcessingPolicyC.h
@@ -26,10 +26,10 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:153
+// be\be_codegen.cpp:154
 
-#ifndef _TAO_IDL_ORIG_REQUESTPROCESSINGPOLICYC_H_
-#define _TAO_IDL_ORIG_REQUESTPROCESSINGPOLICYC_H_
+#ifndef _TAO_IDL_REQUESTPROCESSINGPOLICYC_H_
+#define _TAO_IDL_REQUESTPROCESSINGPOLICYC_H_
 
 #include /**/ "ace/pre.h"
 
@@ -54,54 +54,40 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_PortableServer_Export
 
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:49
 
 namespace PortableServer
 {
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_enum/enum_ch.cpp:57
-  
+
   enum RequestProcessingPolicyValue
   {
     USE_ACTIVE_OBJECT_MAP_ONLY,
     USE_DEFAULT_SERVANT,
     USE_SERVANT_MANAGER
   };
-  
+
 #if (TAO_HAS_MINIMUM_POA == 0)
   typedef RequestProcessingPolicyValue &RequestProcessingPolicyValue_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_RequestProcessingPolicyValue;
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_PORTABLESERVER_REQUESTPROCESSINGPOLICY__VAR_OUT_CH_)
 #define _PORTABLESERVER_REQUESTPROCESSINGPOLICY__VAR_OUT_CH_
-  
+
   class RequestProcessingPolicy;
   typedef RequestProcessingPolicy *RequestProcessingPolicy_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         RequestProcessingPolicy
       >
     RequestProcessingPolicy_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         RequestProcessingPolicy
@@ -109,121 +95,116 @@ namespace PortableServer
     RequestProcessingPolicy_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_PORTABLESERVER_REQUESTPROCESSINGPOLICY_CH_)
 #define _PORTABLESERVER_REQUESTPROCESSINGPOLICY_CH_
-  
+
   class TAO_PortableServer_Export RequestProcessingPolicy
     : public virtual ::CORBA::Policy
   {
   public:
     typedef RequestProcessingPolicy_ptr _ptr_type;
     typedef RequestProcessingPolicy_var _var_type;
-    
+
     // The static operations.
     static RequestProcessingPolicy_ptr _duplicate (RequestProcessingPolicy_ptr obj);
-    
+
     static void _tao_release (RequestProcessingPolicy_ptr obj);
-    
+
     static RequestProcessingPolicy_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static RequestProcessingPolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static RequestProcessingPolicy_ptr _nil (void)
     {
       return static_cast<RequestProcessingPolicy_ptr> (0);
     }
-    
-    static void _tao_any_destructor (void *);
-    
+
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::PortableServer::RequestProcessingPolicyValue value (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::Policy_ptr copy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void destroy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
-    
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
+
   protected:
     // Abstract or local interface only.
     RequestProcessingPolicy (void);
-    
+
     virtual ~RequestProcessingPolicy (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     RequestProcessingPolicy (const RequestProcessingPolicy &);
-    
+
     void operator= (const RequestProcessingPolicy &);
   };
 
 #endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_RequestProcessingPolicy;
 
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:78
 
 } // module PortableServer
 
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
 // TAO_IDL - Generated from
 // be\be_visitor_traits.cpp:61
 
+#if (TAO_HAS_MINIMUM_POA == 0)
+
 // Traits specializations.
 namespace TAO
 {
 
-#if (TAO_HAS_MINIMUM_POA == 0)
+#if !defined (_PORTABLESERVER_REQUESTPROCESSINGPOLICY__TRAITS_)
+#define _PORTABLESERVER_REQUESTPROCESSINGPOLICY__TRAITS_
 
-#if !defined (_PORTABLESERVER_REQUESTPROCESSINGPOLICY__TRAITS_CH_)
-#define _PORTABLESERVER_REQUESTPROCESSINGPOLICY__TRAITS_CH_
-  
   template<>
   struct TAO_PortableServer_Export Objref_Traits< ::PortableServer::RequestProcessingPolicy>
   {
@@ -241,27 +222,9 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_enum/any_op_ch.cpp:51
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::RequestProcessingPolicyValue);
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::RequestProcessingPolicyValue &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::RequestProcessingPolicy_ptr); // copying
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::RequestProcessingPolicy_ptr *); // non-copying
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::RequestProcessingPolicy_ptr &);
-
-// TAO_IDL - Generated from
 // be\be_visitor_enum/cdr_op_ch.cpp:50
 
 TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, PortableServer::RequestProcessingPolicyValue);
@@ -270,15 +233,7 @@ TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableSer
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
+// be\be_codegen.cpp:1028
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp
index fa1c2d85b29..1d5954cd800 100644
--- a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp
+++ b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp
@@ -252,7 +252,7 @@ namespace TAO
           // upcall.
           TAO::Portable_Server::POA_Current_Impl *poa_current_impl =
             static_cast <TAO::Portable_Server::POA_Current_Impl *>
-                        (TAO_TSS_RESOURCES::instance ()->poa_current_impl_);
+                        (TAO_TSS_Resources::instance ()->poa_current_impl_);
           // If we are in an upcall on the default servant, return the
           // ObjectId associated with the current invocation.
           if (poa_current_impl != 0 &&
diff --git a/TAO/tao/PortableServer/Root_POA.cpp b/TAO/tao/PortableServer/Root_POA.cpp
index e3413f94fea..bf155ab378d 100644
--- a/TAO/tao/PortableServer/Root_POA.cpp
+++ b/TAO/tao/PortableServer/Root_POA.cpp
@@ -1295,7 +1295,7 @@ TAO_Root_POA::check_for_valid_wait_for_completions (const TAO_ORB_Core &orb_core
     {
       TAO::Portable_Server::POA_Current_Impl *poa_current_impl =
         static_cast <TAO::Portable_Server::POA_Current_Impl *>
-                    (TAO_TSS_RESOURCES::instance ()->poa_current_impl_);
+                    (TAO_TSS_Resources::instance ()->poa_current_impl_);
 
       while (1)
         {
diff --git a/TAO/tao/PortableServer/SArg_Traits_T.h b/TAO/tao/PortableServer/SArg_Traits_T.h
new file mode 100644
index 00000000000..4287b2d2765
--- /dev/null
+++ b/TAO/tao/PortableServer/SArg_Traits_T.h
@@ -0,0 +1,38 @@
+// This may look like C, but it's really -*- C++ -*-
+
+//=============================================================================
+/**
+ *  @file    SArg_Traits_T.h
+ *
+ *  $Id$
+ *
+ *  @authors Jeff Parsons and Carlos O'Ryan
+ */
+//=============================================================================
+
+
+#ifndef TAO_SARG_TRAITS_T_H
+#define TAO_SARG_TRAITS_T_H
+
+#include /**/ "ace/pre.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+namespace TAO
+{
+  /**
+   *
+   * @brief Base class for all skeleton arg traits specializations.
+   *
+   */
+  template<typename T>
+  class SArg_Traits
+  {
+  };
+}
+
+#include /**/ "ace/post.h"
+
+#endif /* TAO_SARG_TRAITS_T_H */
diff --git a/TAO/tao/PortableServer/ServantActivatorA.cpp b/TAO/tao/PortableServer/ServantActivatorA.cpp
index a0db16f7902..95230e368af 100644
--- a/TAO/tao/PortableServer/ServantActivatorA.cpp
+++ b/TAO/tao/PortableServer/ServantActivatorA.cpp
@@ -25,14 +25,14 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "ServantActivatorC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
+#include "ServantActivatorA.h"
+#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
 #include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
+#include "tao/AnyTypeCode/Any.h"
+#include "tao/AnyTypeCode/Any_Impl_T.h"
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
@@ -45,88 +45,11 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:omg.org/PortableServer/ServantActivator:2.3",
     "ServantActivator");
-  
+
 namespace PortableServer
 {
   ::CORBA::TypeCode_ptr const _tc_ServantActivator =
     &_tao_tc_PortableServer_ServantActivator;
 }
 
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableServer::ServantActivator>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableServer::ServantActivator>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-  
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableServer::ServantActivator>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableServer::ServantActivator_ptr _tao_elem
-  )
-{
-  PortableServer::ServantActivator_ptr _tao_objptr =
-    PortableServer::ServantActivator::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableServer::ServantActivator_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<PortableServer::ServantActivator>::insert (
-      _tao_any,
-      PortableServer::ServantActivator::_tao_any_destructor,
-      PortableServer::_tc_ServantActivator,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    PortableServer::ServantActivator_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<PortableServer::ServantActivator>::extract (
-        _tao_any,
-        PortableServer::ServantActivator::_tao_any_destructor,
-        PortableServer::_tc_ServantActivator,
-        _tao_elem
-      );
-}
-
 #endif /* TAO_HAS_MINIMUM_CORBA == 0 */
diff --git a/TAO/tao/PortableServer/ServantActivatorA.h b/TAO/tao/PortableServer/ServantActivatorA.h
new file mode 100644
index 00000000000..da5bc2387bf
--- /dev/null
+++ b/TAO/tao/PortableServer/ServantActivatorA.h
@@ -0,0 +1,61 @@
+// -*- C++ -*-
+//
+// $Id$
+
+// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       Irvine, CA
+//       USA
+//       http://doc.ece.uci.edu/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
+//
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
+
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:754
+
+#ifndef _TAO_IDL_SERVANTACTIVATORA_H_
+#define _TAO_IDL_SERVANTACTIVATORA_H_
+
+#include /**/ "ace/pre.h"
+
+#include "portableserver_export.h"
+#include "ServantActivatorC.h"
+#include "tao/PortableServer/PS_ForwardA.h"
+#include "tao/PortableServer/ServantManagerA.h"
+#include "tao/PortableServer/ForwardRequestA.h"
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:59
+
+namespace PortableServer
+{
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+  
+  extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_ServantActivator;
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:86
+
+} // module PortableServer
+
+#include /**/ "ace/post.h"
+
+#endif /* ifndef */
diff --git a/TAO/tao/PortableServer/ServantActivatorC.cpp b/TAO/tao/PortableServer/ServantActivatorC.cpp
index 22d57868f4b..2a2333d0567 100644
--- a/TAO/tao/PortableServer/ServantActivatorC.cpp
+++ b/TAO/tao/PortableServer/ServantActivatorC.cpp
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:291
+// be\be_codegen.cpp:277
 
 
 #include "ServantActivatorC.h"
@@ -34,10 +34,6 @@
 #include "tao/ORB_Core.h"
 #include "ace/OS_NS_string.h"
 
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
@@ -91,14 +87,6 @@ PortableServer::ServantActivator::ServantActivator (void)
 PortableServer::ServantActivator::~ServantActivator (void)
 {}
 
-void 
-PortableServer::ServantActivator::_tao_any_destructor (void *_tao_void_pointer)
-{
-  ServantActivator *_tao_tmp_pointer =
-    static_cast<ServantActivator *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
 PortableServer::ServantActivator_ptr
 PortableServer::ServantActivator::_narrow (
     CORBA::Object_ptr _tao_objref
diff --git a/TAO/tao/PortableServer/ServantActivatorC.h b/TAO/tao/PortableServer/ServantActivatorC.h
index 64de4071d28..53e28b18c8a 100644
--- a/TAO/tao/PortableServer/ServantActivatorC.h
+++ b/TAO/tao/PortableServer/ServantActivatorC.h
@@ -26,10 +26,10 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:153
+// be\be_codegen.cpp:154
 
-#ifndef _TAO_IDL_ORIG_SERVANTACTIVATORC_H_
-#define _TAO_IDL_ORIG_SERVANTACTIVATORC_H_
+#ifndef _TAO_IDL_SERVANTACTIVATORC_H_
+#define _TAO_IDL_SERVANTACTIVATORC_H_
 
 #include /**/ "ace/pre.h"
 
@@ -56,17 +56,8 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_PortableServer_Export
 
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:49
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
@@ -129,7 +120,7 @@ namespace PortableServer
       return static_cast<ServantActivator_ptr> (0);
     }
     
-    static void _tao_any_destructor (void *);
+    
     
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
@@ -184,14 +175,9 @@ namespace PortableServer
   };
 
 #endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_ServantActivator;
 
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:78
 
 } // module PortableServer
 
@@ -202,8 +188,8 @@ namespace PortableServer
 namespace TAO
 {
 
-#if !defined (_PORTABLESERVER_SERVANTACTIVATOR__TRAITS_CH_)
-#define _PORTABLESERVER_SERVANTACTIVATOR__TRAITS_CH_
+#if !defined (_PORTABLESERVER_SERVANTACTIVATOR__TRAITS_)
+#define _PORTABLESERVER_SERVANTACTIVATOR__TRAITS_
   
   template<>
   struct TAO_PortableServer_Export Objref_Traits< ::PortableServer::ServantActivator>
@@ -224,25 +210,10 @@ namespace TAO
 #endif /* end #if !defined */
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ServantActivator_ptr); // copying
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ServantActivator_ptr *); // non-copying
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ServantActivator_ptr &);
-
 #endif /* TAO_HAS_MINIMUM_CORBA == 0 */
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
+// be\be_codegen.cpp:1028
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/tao/PortableServer/ServantLocatorA.cpp b/TAO/tao/PortableServer/ServantLocatorA.cpp
index 83257e5771f..fed82639ced 100644
--- a/TAO/tao/PortableServer/ServantLocatorA.cpp
+++ b/TAO/tao/PortableServer/ServantLocatorA.cpp
@@ -25,15 +25,15 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "ServantLocatorC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
-#include "tao/String_TypeCode_Static.h"
+#include "ServantLocatorA.h"
+#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
+#include "tao/AnyTypeCode/String_TypeCode_Static.h"
 #include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
+#include "tao/AnyTypeCode/Any.h"
+#include "tao/AnyTypeCode/Any_Impl_T.h"
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
@@ -46,88 +46,11 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:omg.org/PortableServer/ServantLocator:2.3",
     "ServantLocator");
-  
+
 namespace PortableServer
 {
   ::CORBA::TypeCode_ptr const _tc_ServantLocator =
     &_tao_tc_PortableServer_ServantLocator;
 }
 
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableServer::ServantLocator>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableServer::ServantLocator>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-  
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableServer::ServantLocator>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableServer::ServantLocator_ptr _tao_elem
-  )
-{
-  PortableServer::ServantLocator_ptr _tao_objptr =
-    PortableServer::ServantLocator::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableServer::ServantLocator_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<PortableServer::ServantLocator>::insert (
-      _tao_any,
-      PortableServer::ServantLocator::_tao_any_destructor,
-      PortableServer::_tc_ServantLocator,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    PortableServer::ServantLocator_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<PortableServer::ServantLocator>::extract (
-        _tao_any,
-        PortableServer::ServantLocator::_tao_any_destructor,
-        PortableServer::_tc_ServantLocator,
-        _tao_elem
-      );
-}
-
 #endif /* TAO_HAS_MINIMUM_CORBA == 0 */
diff --git a/TAO/tao/PortableServer/ServantLocatorA.h b/TAO/tao/PortableServer/ServantLocatorA.h
new file mode 100644
index 00000000000..223062154e4
--- /dev/null
+++ b/TAO/tao/PortableServer/ServantLocatorA.h
@@ -0,0 +1,62 @@
+// -*- C++ -*-
+//
+// $Id$
+
+// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       Irvine, CA
+//       USA
+//       http://doc.ece.uci.edu/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
+//
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
+
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:754
+
+#ifndef _TAO_IDL_SERVANTLOCATORA_H_
+#define _TAO_IDL_SERVANTLOCATORA_H_
+
+#include /**/ "ace/pre.h"
+
+#include "portableserver_export.h"
+#include "ServantLocatorC.h"
+#include "tao/AnyTypeCode/orb_typesA.h"
+#include "tao/PortableServer/PS_ForwardA.h"
+#include "tao/PortableServer/ServantManagerA.h"
+#include "tao/PortableServer/ForwardRequestA.h"
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:59
+
+namespace PortableServer
+{
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+  
+  extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_ServantLocator;
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:86
+
+} // module PortableServer
+
+#include /**/ "ace/post.h"
+
+#endif /* ifndef */
diff --git a/TAO/tao/PortableServer/ServantLocatorC.cpp b/TAO/tao/PortableServer/ServantLocatorC.cpp
index b1a9623c479..e20acbb995d 100644
--- a/TAO/tao/PortableServer/ServantLocatorC.cpp
+++ b/TAO/tao/PortableServer/ServantLocatorC.cpp
@@ -26,7 +26,7 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:291
+// be\be_codegen.cpp:277
 
 
 #include "ServantLocatorC.h"
@@ -34,10 +34,6 @@
 #include "tao/ORB_Core.h"
 #include "ace/OS_NS_string.h"
 
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
@@ -91,14 +87,6 @@ PortableServer::ServantLocator::ServantLocator (void)
 PortableServer::ServantLocator::~ServantLocator (void)
 {}
 
-void 
-PortableServer::ServantLocator::_tao_any_destructor (void *_tao_void_pointer)
-{
-  ServantLocator *_tao_tmp_pointer =
-    static_cast<ServantLocator *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
 PortableServer::ServantLocator_ptr
 PortableServer::ServantLocator::_narrow (
     CORBA::Object_ptr _tao_objref
diff --git a/TAO/tao/PortableServer/ServantLocatorC.h b/TAO/tao/PortableServer/ServantLocatorC.h
index be2020ff060..d0333809f29 100644
--- a/TAO/tao/PortableServer/ServantLocatorC.h
+++ b/TAO/tao/PortableServer/ServantLocatorC.h
@@ -26,10 +26,10 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:153
+// be\be_codegen.cpp:154
 
-#ifndef _TAO_IDL_ORIG_SERVANTLOCATORC_H_
-#define _TAO_IDL_ORIG_SERVANTLOCATORC_H_
+#ifndef _TAO_IDL_SERVANTLOCATORC_H_
+#define _TAO_IDL_SERVANTLOCATORC_H_
 
 #include /**/ "ace/pre.h"
 
@@ -57,17 +57,8 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_PortableServer_Export
 
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:49
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
@@ -132,7 +123,7 @@ namespace PortableServer
       return static_cast<ServantLocator_ptr> (0);
     }
     
-    static void _tao_any_destructor (void *);
+    
     
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
@@ -189,14 +180,9 @@ namespace PortableServer
   };
 
 #endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_ServantLocator;
 
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:78
 
 } // module PortableServer
 
@@ -207,8 +193,8 @@ namespace PortableServer
 namespace TAO
 {
 
-#if !defined (_PORTABLESERVER_SERVANTLOCATOR__TRAITS_CH_)
-#define _PORTABLESERVER_SERVANTLOCATOR__TRAITS_CH_
+#if !defined (_PORTABLESERVER_SERVANTLOCATOR__TRAITS_)
+#define _PORTABLESERVER_SERVANTLOCATOR__TRAITS_
   
   template<>
   struct TAO_PortableServer_Export Objref_Traits< ::PortableServer::ServantLocator>
@@ -229,25 +215,10 @@ namespace TAO
 #endif /* end #if !defined */
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ServantLocator_ptr); // copying
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ServantLocator_ptr *); // non-copying
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ServantLocator_ptr &);
-
 #endif /* TAO_HAS_MINIMUM_CORBA == 0 */
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
+// be\be_codegen.cpp:1028
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/tao/PortableServer/ServantManagerA.cpp b/TAO/tao/PortableServer/ServantManagerA.cpp
index d2d95363f7c..5f6d30238b9 100644
--- a/TAO/tao/PortableServer/ServantManagerA.cpp
+++ b/TAO/tao/PortableServer/ServantManagerA.cpp
@@ -25,14 +25,14 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "ServantManagerC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
+#include "ServantManagerA.h"
+#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
 #include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
+#include "tao/AnyTypeCode/Any.h"
+#include "tao/AnyTypeCode/Any_Impl_T.h"
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
@@ -45,88 +45,11 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:omg.org/PortableServer/ServantManager:2.3",
     "ServantManager");
-  
+
 namespace PortableServer
 {
   ::CORBA::TypeCode_ptr const _tc_ServantManager =
     &_tao_tc_PortableServer_ServantManager;
 }
 
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableServer::ServantManager>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableServer::ServantManager>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-  
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableServer::ServantManager>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableServer::ServantManager_ptr _tao_elem
-  )
-{
-  PortableServer::ServantManager_ptr _tao_objptr =
-    PortableServer::ServantManager::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableServer::ServantManager_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<PortableServer::ServantManager>::insert (
-      _tao_any,
-      PortableServer::ServantManager::_tao_any_destructor,
-      PortableServer::_tc_ServantManager,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    PortableServer::ServantManager_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<PortableServer::ServantManager>::extract (
-        _tao_any,
-        PortableServer::ServantManager::_tao_any_destructor,
-        PortableServer::_tc_ServantManager,
-        _tao_elem
-      );
-}
-
 #endif /* TAO_HAS_MINIMUM_CORBA == 0 */
diff --git a/TAO/tao/PortableServer/ServantManagerA.h b/TAO/tao/PortableServer/ServantManagerA.h
new file mode 100644
index 00000000000..a3b630bc035
--- /dev/null
+++ b/TAO/tao/PortableServer/ServantManagerA.h
@@ -0,0 +1,58 @@
+// -*- C++ -*-
+//
+// $Id$
+
+// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       Irvine, CA
+//       USA
+//       http://doc.ece.uci.edu/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
+//
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
+
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:754
+
+#ifndef _TAO_IDL_SERVANTMANAGERA_H_
+#define _TAO_IDL_SERVANTMANAGERA_H_
+
+#include /**/ "ace/pre.h"
+
+#include "portableserver_export.h"
+#include "ServantManagerC.h"
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:59
+
+namespace PortableServer
+{
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+  
+  extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_ServantManager;
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:86
+
+} // module PortableServer
+
+#include /**/ "ace/post.h"
+
+#endif /* ifndef */
diff --git a/TAO/tao/PortableServer/ServantManagerC.cpp b/TAO/tao/PortableServer/ServantManagerC.cpp
index da86770afba..a870d15bb09 100644
--- a/TAO/tao/PortableServer/ServantManagerC.cpp
+++ b/TAO/tao/PortableServer/ServantManagerC.cpp
@@ -26,17 +26,13 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:291
+// be\be_codegen.cpp:277
 
 
 #include "ServantManagerC.h"
 #include "tao/CDR.h"
 #include "ace/OS_NS_string.h"
 
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
@@ -89,14 +85,6 @@ PortableServer::ServantManager::ServantManager (void)
 PortableServer::ServantManager::~ServantManager (void)
 {}
 
-void 
-PortableServer::ServantManager::_tao_any_destructor (void *_tao_void_pointer)
-{
-  ServantManager *_tao_tmp_pointer =
-    static_cast<ServantManager *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
 PortableServer::ServantManager_ptr
 PortableServer::ServantManager::_narrow (
     CORBA::Object_ptr _tao_objref
diff --git a/TAO/tao/PortableServer/ServantManagerC.h b/TAO/tao/PortableServer/ServantManagerC.h
index 564ed3ac737..bc6f82dc2ce 100644
--- a/TAO/tao/PortableServer/ServantManagerC.h
+++ b/TAO/tao/PortableServer/ServantManagerC.h
@@ -26,10 +26,10 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:153
+// be\be_codegen.cpp:154
 
-#ifndef _TAO_IDL_ORIG_SERVANTMANAGERC_H_
-#define _TAO_IDL_ORIG_SERVANTMANAGERC_H_
+#ifndef _TAO_IDL_SERVANTMANAGERC_H_
+#define _TAO_IDL_SERVANTMANAGERC_H_
 
 #include /**/ "ace/pre.h"
 
@@ -51,17 +51,8 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_PortableServer_Export
 
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:49
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
@@ -124,7 +115,7 @@ namespace PortableServer
       return static_cast<ServantManager_ptr> (0);
     }
     
-    static void _tao_any_destructor (void *);
+    
     
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
@@ -151,14 +142,9 @@ namespace PortableServer
   };
 
 #endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_ServantManager;
 
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:78
 
 } // module PortableServer
 
@@ -169,8 +155,8 @@ namespace PortableServer
 namespace TAO
 {
 
-#if !defined (_PORTABLESERVER_SERVANTMANAGER__TRAITS_CH_)
-#define _PORTABLESERVER_SERVANTMANAGER__TRAITS_CH_
+#if !defined (_PORTABLESERVER_SERVANTMANAGER__TRAITS_)
+#define _PORTABLESERVER_SERVANTMANAGER__TRAITS_
   
   template<>
   struct TAO_PortableServer_Export Objref_Traits< ::PortableServer::ServantManager>
@@ -191,25 +177,10 @@ namespace TAO
 #endif /* end #if !defined */
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ServantManager_ptr); // copying
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ServantManager_ptr *); // non-copying
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ServantManager_ptr &);
-
 #endif /* TAO_HAS_MINIMUM_CORBA == 0 */
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
+// be\be_codegen.cpp:1028
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/tao/PortableServer/ServantRetentionPolicyA.cpp b/TAO/tao/PortableServer/ServantRetentionPolicyA.cpp
index 1906815b004..70f4a4512e1 100644
--- a/TAO/tao/PortableServer/ServantRetentionPolicyA.cpp
+++ b/TAO/tao/PortableServer/ServantRetentionPolicyA.cpp
@@ -25,16 +25,16 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "ServantRetentionPolicyC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Enum_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
+#include "ServantRetentionPolicyA.h"
+#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Enum_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
 #include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
-#include "tao/Any_Basic_Impl_T.h"
+#include "tao/AnyTypeCode/Any.h"
+#include "tao/AnyTypeCode/Any_Impl_T.h"
+#include "tao/AnyTypeCode/Any_Basic_Impl_T.h"
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
@@ -111,79 +111,4 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableServer::ServantRetentionPolicy>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableServer::ServantRetentionPolicy>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-  
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableServer::ServantRetentionPolicy>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableServer::ServantRetentionPolicy_ptr _tao_elem
-  )
-{
-  PortableServer::ServantRetentionPolicy_ptr _tao_objptr =
-    PortableServer::ServantRetentionPolicy::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableServer::ServantRetentionPolicy_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<PortableServer::ServantRetentionPolicy>::insert (
-      _tao_any,
-      PortableServer::ServantRetentionPolicy::_tao_any_destructor,
-      PortableServer::_tc_ServantRetentionPolicy,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    PortableServer::ServantRetentionPolicy_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<PortableServer::ServantRetentionPolicy>::extract (
-        _tao_any,
-        PortableServer::ServantRetentionPolicy::_tao_any_destructor,
-        PortableServer::_tc_ServantRetentionPolicy,
-        _tao_elem
-      );
-}
-
 #endif /* TAO_HAS_MINIMUM_CORBA == 0 */
diff --git a/TAO/tao/PortableServer/ServantRetentionPolicyA.h b/TAO/tao/PortableServer/ServantRetentionPolicyA.h
new file mode 100644
index 00000000000..0ffcf36340c
--- /dev/null
+++ b/TAO/tao/PortableServer/ServantRetentionPolicyA.h
@@ -0,0 +1,70 @@
+// -*- C++ -*-
+//
+// $Id$
+
+// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       Irvine, CA
+//       USA
+//       http://doc.ece.uci.edu/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
+//
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
+
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:754
+
+#ifndef _TAO_IDL_SERVANTRETENTIONPOLICYA_H_
+#define _TAO_IDL_SERVANTRETENTIONPOLICYA_H_
+
+#include /**/ "ace/pre.h"
+
+#include "portableserver_export.h"
+#include "ServantRetentionPolicyC.h"
+#include "tao/AnyTypeCode/PolicyA.h"
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:59
+
+namespace PortableServer
+{
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+  
+  extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_ServantRetentionPolicyValue;
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+  
+  extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_ServantRetentionPolicy;
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:86
+
+} // module PortableServer
+
+// TAO_IDL - Generated from
+// be\be_visitor_enum/any_op_ch.cpp:52
+
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ServantRetentionPolicyValue);
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ServantRetentionPolicyValue &);
+
+#include /**/ "ace/post.h"
+
+#endif /* ifndef */
diff --git a/TAO/tao/PortableServer/ServantRetentionPolicyC.cpp b/TAO/tao/PortableServer/ServantRetentionPolicyC.cpp
index 4af9830fee6..a1593b6f7a5 100644
--- a/TAO/tao/PortableServer/ServantRetentionPolicyC.cpp
+++ b/TAO/tao/PortableServer/ServantRetentionPolicyC.cpp
@@ -26,17 +26,13 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:291
+// be\be_codegen.cpp:277
 
 
 #include "ServantRetentionPolicyC.h"
 #include "tao/CDR.h"
 #include "ace/OS_NS_string.h"
 
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
@@ -90,14 +86,6 @@ PortableServer::ServantRetentionPolicy::ServantRetentionPolicy (void)
 PortableServer::ServantRetentionPolicy::~ServantRetentionPolicy (void)
 {}
 
-void 
-PortableServer::ServantRetentionPolicy::_tao_any_destructor (void *_tao_void_pointer)
-{
-  ServantRetentionPolicy *_tao_tmp_pointer =
-    static_cast<ServantRetentionPolicy *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
 PortableServer::ServantRetentionPolicy_ptr
 PortableServer::ServantRetentionPolicy::_narrow (
     CORBA::Object_ptr _tao_objref
diff --git a/TAO/tao/PortableServer/ServantRetentionPolicyC.h b/TAO/tao/PortableServer/ServantRetentionPolicyC.h
index 7e34b498328..5aac210495d 100644
--- a/TAO/tao/PortableServer/ServantRetentionPolicyC.h
+++ b/TAO/tao/PortableServer/ServantRetentionPolicyC.h
@@ -26,10 +26,10 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:153
+// be\be_codegen.cpp:154
 
-#ifndef _TAO_IDL_ORIG_SERVANTRETENTIONPOLICYC_H_
-#define _TAO_IDL_ORIG_SERVANTRETENTIONPOLICYC_H_
+#ifndef _TAO_IDL_SERVANTRETENTIONPOLICYC_H_
+#define _TAO_IDL_SERVANTRETENTIONPOLICYC_H_
 
 #include /**/ "ace/pre.h"
 
@@ -54,53 +54,39 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_PortableServer_Export
 
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:49
 
 namespace PortableServer
 {
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_enum/enum_ch.cpp:57
-  
+
   enum ServantRetentionPolicyValue
   {
     RETAIN,
     NON_RETAIN
   };
-  
+
 #if (TAO_HAS_MINIMUM_POA == 0)
   typedef ServantRetentionPolicyValue &ServantRetentionPolicyValue_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_ServantRetentionPolicyValue;
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_PORTABLESERVER_SERVANTRETENTIONPOLICY__VAR_OUT_CH_)
 #define _PORTABLESERVER_SERVANTRETENTIONPOLICY__VAR_OUT_CH_
-  
+
   class ServantRetentionPolicy;
   typedef ServantRetentionPolicy *ServantRetentionPolicy_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         ServantRetentionPolicy
       >
     ServantRetentionPolicy_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         ServantRetentionPolicy
@@ -108,105 +94,100 @@ namespace PortableServer
     ServantRetentionPolicy_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_PORTABLESERVER_SERVANTRETENTIONPOLICY_CH_)
 #define _PORTABLESERVER_SERVANTRETENTIONPOLICY_CH_
-  
+
   class TAO_PortableServer_Export ServantRetentionPolicy
     : public virtual ::CORBA::Policy
   {
   public:
     typedef ServantRetentionPolicy_ptr _ptr_type;
     typedef ServantRetentionPolicy_var _var_type;
-    
+
     // The static operations.
     static ServantRetentionPolicy_ptr _duplicate (ServantRetentionPolicy_ptr obj);
-    
+
     static void _tao_release (ServantRetentionPolicy_ptr obj);
-    
+
     static ServantRetentionPolicy_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static ServantRetentionPolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static ServantRetentionPolicy_ptr _nil (void)
     {
       return static_cast<ServantRetentionPolicy_ptr> (0);
     }
-    
-    static void _tao_any_destructor (void *);
-    
+
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::PortableServer::ServantRetentionPolicyValue value (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::Policy_ptr copy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void destroy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
-    
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
+
   protected:
     // Abstract or local interface only.
     ServantRetentionPolicy (void);
-    
+
     virtual ~ServantRetentionPolicy (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     ServantRetentionPolicy (const ServantRetentionPolicy &);
-    
+
     void operator= (const ServantRetentionPolicy &);
   };
 
 #endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_ServantRetentionPolicy;
 
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:78
 
 #endif /* TAO_HAS_MINIMUM_CORBA == 0 */
 
@@ -215,15 +196,15 @@ namespace PortableServer
 // TAO_IDL - Generated from
 // be\be_visitor_traits.cpp:61
 
+#if (TAO_HAS_MINIMUM_POA == 0)
+
 // Traits specializations.
 namespace TAO
 {
 
-#if (TAO_HAS_MINIMUM_POA == 0)
+#if !defined (_PORTABLESERVER_SERVANTRETENTIONPOLICY__TRAITS_)
+#define _PORTABLESERVER_SERVANTRETENTIONPOLICY__TRAITS_
 
-#if !defined (_PORTABLESERVER_SERVANTRETENTIONPOLICY__TRAITS_CH_)
-#define _PORTABLESERVER_SERVANTRETENTIONPOLICY__TRAITS_CH_
-  
   template<>
   struct TAO_PortableServer_Export Objref_Traits< ::PortableServer::ServantRetentionPolicy>
   {
@@ -241,26 +222,9 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-
-#endif /* TAO_HAS_MINIMUM_CORBA == 0 */
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_enum/any_op_ch.cpp:51
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ServantRetentionPolicyValue);
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ServantRetentionPolicyValue &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ServantRetentionPolicy_ptr); // copying
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ServantRetentionPolicy_ptr *); // non-copying
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ServantRetentionPolicy_ptr &);
-
-// TAO_IDL - Generated from
 // be\be_visitor_enum/cdr_op_ch.cpp:50
 
 TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, PortableServer::ServantRetentionPolicyValue);
@@ -269,15 +233,7 @@ TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableSer
 #endif /* TAO_HAS_MINIMUM_CORBA == 0 */
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
+// be\be_codegen.cpp:1028
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/tao/PortableServer/Servant_Base.cpp b/TAO/tao/PortableServer/Servant_Base.cpp
index 3cd3e4e7508..1959e73cbef 100644
--- a/TAO/tao/PortableServer/Servant_Base.cpp
+++ b/TAO/tao/PortableServer/Servant_Base.cpp
@@ -153,7 +153,7 @@ TAO_ServantBase::_create_stub (ACE_ENV_SINGLE_ARG_DECL)
 
   TAO::Portable_Server::POA_Current_Impl *poa_current_impl =
     static_cast<TAO::Portable_Server::POA_Current_Impl *>
-                    (TAO_TSS_RESOURCES::instance ()->poa_current_impl_);
+                    (TAO_TSS_Resources::instance ()->poa_current_impl_);
 
   CORBA::ORB_ptr servant_orb = 0;
 
diff --git a/TAO/tao/PortableServer/Special_Basic_SArgument_T.cpp b/TAO/tao/PortableServer/Special_Basic_SArgument_T.cpp
index 956563d9ce3..991f39a5bab 100644
--- a/TAO/tao/PortableServer/Special_Basic_SArgument_T.cpp
+++ b/TAO/tao/PortableServer/Special_Basic_SArgument_T.cpp
@@ -4,7 +4,6 @@
 #define TAO_SPECIAL_BASIC_SARGUMENT_T_CPP
 
 #include "tao/PortableServer/Special_Basic_SArgument_T.h"
-#include "tao/Dynamic_ParameterC.h"
 
 #if !defined (__ACE_INLINE__)
 #include "tao/PortableServer/Special_Basic_SArgument_T.inl"
@@ -13,9 +12,12 @@
 
 // ============================================================
 
-template<typename S, typename to_S, typename from_S>
+template<typename S,
+         typename to_S,
+         typename from_S,
+         typename Insert_Policy>
 CORBA::Boolean
-TAO::In_Special_Basic_SArgument_T<S,to_S,from_S>::demarshal (
+TAO::In_Special_Basic_SArgument_T<S,to_S,from_S,Insert_Policy>::demarshal (
     TAO_InputCDR & cdr
   )
 {
@@ -24,32 +26,39 @@ TAO::In_Special_Basic_SArgument_T<S,to_S,from_S>::demarshal (
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S, typename to_S, typename from_S>
+template<typename S,
+         typename to_S,
+         typename from_S,
+         typename Insert_Policy>
 void
-TAO::In_Special_Basic_SArgument_T<S,to_S,from_S>::interceptor_param (
-    Dynamic::Parameter & p
-  )
+TAO::In_Special_Basic_SArgument_T<S,to_S,from_S,Insert_Policy>::
+interceptor_value (CORBA::Any *any) const
 {
-  p.argument <<= from_S (this->x_);
-  p.mode = CORBA::PARAM_IN;
+  this->Insert_Policy::any_insert (any, from_S (this->x_));
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // ===========================================================
 
-template<typename S, typename to_S, typename from_S>
+template<typename S,
+         typename to_S,
+         typename from_S,
+         typename Insert_Policy>
 CORBA::Boolean
-TAO::Inout_Special_Basic_SArgument_T<S,to_S,from_S>::marshal (
+TAO::Inout_Special_Basic_SArgument_T<S,to_S,from_S,Insert_Policy>::marshal (
     TAO_OutputCDR & cdr
   )
 {
   return cdr << from_S (this->x_);
 }
 
-template<typename S, typename to_S, typename from_S>
+template<typename S,
+         typename to_S,
+         typename from_S,
+         typename Insert_Policy>
 CORBA::Boolean
-TAO::Inout_Special_Basic_SArgument_T<S,to_S,from_S>::demarshal (
+TAO::Inout_Special_Basic_SArgument_T<S,to_S,from_S,Insert_Policy>::demarshal (
     TAO_InputCDR & cdr
   )
 {
@@ -58,23 +67,27 @@ TAO::Inout_Special_Basic_SArgument_T<S,to_S,from_S>::demarshal (
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S, typename to_S, typename from_S>
+template<typename S,
+         typename to_S,
+         typename from_S,
+         typename Insert_Policy>
 void
-TAO::Inout_Special_Basic_SArgument_T<S,to_S,from_S>::interceptor_param (
-    Dynamic::Parameter & p
-  )
+TAO::Inout_Special_Basic_SArgument_T<S,to_S,from_S,Insert_Policy>::
+interceptor_value (CORBA::Any *any) const
 {
-  p.argument <<= from_S (this->x_);
-  p.mode = CORBA::PARAM_INOUT;
+  this->Insert_Policy::any_insert (any, from_S (this->x_));
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // ==============================================================
 
-template<typename S, typename to_S, typename from_S>
+template<typename S,
+         typename to_S,
+         typename from_S,
+         typename Insert_Policy>
 CORBA::Boolean
-TAO::Out_Special_Basic_SArgument_T<S,to_S,from_S>::marshal (
+TAO::Out_Special_Basic_SArgument_T<S,to_S,from_S,Insert_Policy>::marshal (
     TAO_OutputCDR & cdr
   )
 {
@@ -83,23 +96,27 @@ TAO::Out_Special_Basic_SArgument_T<S,to_S,from_S>::marshal (
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S, typename to_S, typename from_S>
+template<typename S,
+         typename to_S,
+         typename from_S,
+         typename Insert_Policy>
 void
-TAO::Out_Special_Basic_SArgument_T<S,to_S,from_S>::interceptor_param (
-    Dynamic::Parameter & p
-  )
+TAO::Out_Special_Basic_SArgument_T<S,to_S,from_S,Insert_Policy>::
+interceptor_value (CORBA::Any *any) const
 {
-  p.argument <<= from_S (this->x_);
-  p.mode = CORBA::PARAM_OUT;
+  this->Insert_Policy::any_insert (any, from_S (this->x_));
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // ==============================================================
 
-template<typename S, typename to_S, typename from_S>
+template<typename S,
+         typename to_S,
+         typename from_S,
+         typename Insert_Policy>
 CORBA::Boolean
-TAO::Ret_Special_Basic_SArgument_T<S,to_S,from_S>::marshal (
+TAO::Ret_Special_Basic_SArgument_T<S,to_S,from_S,Insert_Policy>::marshal (
     TAO_OutputCDR & cdr
   )
 {
@@ -108,13 +125,15 @@ TAO::Ret_Special_Basic_SArgument_T<S,to_S,from_S>::marshal (
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S, typename to_S, typename from_S>
+template<typename S,
+         typename to_S,
+         typename from_S,
+         typename Insert_Policy>
 void
-TAO::Ret_Special_Basic_SArgument_T<S,to_S,from_S>::interceptor_result (
-    CORBA::Any * any
-  )
+TAO::Ret_Special_Basic_SArgument_T<S,to_S,from_S,Insert_Policy>::
+interceptor_value (CORBA::Any *any) const
 {
-  (*any) <<= from_S (this->x_);
+  this->Insert_Policy::any_insert (any, from_S (this->x_));
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
diff --git a/TAO/tao/PortableServer/Special_Basic_SArgument_T.h b/TAO/tao/PortableServer/Special_Basic_SArgument_T.h
index 3e3499ced40..e7d34f8494b 100644
--- a/TAO/tao/PortableServer/Special_Basic_SArgument_T.h
+++ b/TAO/tao/PortableServer/Special_Basic_SArgument_T.h
@@ -30,15 +30,18 @@ namespace TAO
    * @brief Template class for IN skeleton argument of (w)char/boolean/octet.
    *
    */
-  template<typename S, typename to_S, typename from_S>
-  class In_Special_Basic_SArgument_T : public Argument
+  template<typename S,
+           typename to_S,
+           typename from_S,
+           typename Insert_Policy>
+  class In_Special_Basic_SArgument_T : public InArgument, private Insert_Policy
   {
   public:
     In_Special_Basic_SArgument_T (void);
 
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S const & arg (void) const;
 
@@ -52,16 +55,19 @@ namespace TAO
    * @brief Template class for INOUT (w)char/boolean/octet skeleton argument.
    *
    */
-  template<typename S, typename to_S, typename from_S>
-  class Inout_Special_Basic_SArgument_T : public Argument
+  template<typename S,
+           typename to_S,
+           typename from_S,
+           typename Insert_Policy>
+  class Inout_Special_Basic_SArgument_T : public InoutArgument, private Insert_Policy
   {
   public:
     Inout_Special_Basic_SArgument_T (void);
 
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S & arg (void);
 
@@ -75,15 +81,18 @@ namespace TAO
    * @brief Template class for OUT skeleton argument of (w)char/boolean/octet.
    *
    */
-  template<typename S, typename to_S, typename from_S>
-  class Out_Special_Basic_SArgument_T : public Argument
+  template<typename S,
+           typename to_S,
+           typename from_S,
+           typename Insert_Policy>
+  class Out_Special_Basic_SArgument_T : public OutArgument, private Insert_Policy
   {
   public:
     Out_Special_Basic_SArgument_T (void);
 
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S & arg (void);
 
@@ -97,15 +106,18 @@ namespace TAO
    * @brief Template class for return skeleton value of (w)char/boolean/octet.
    *
    */
-  template<typename S, typename to_S, typename from_S>
-  class Ret_Special_Basic_SArgument_T : public Argument
+  template<typename S,
+           typename to_S,
+           typename from_S,
+           typename Insert_Policy>
+  class Ret_Special_Basic_SArgument_T : public RetArgument, private Insert_Policy
   {
   public:
     Ret_Special_Basic_SArgument_T (void);
 
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_result (CORBA::Any *);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S & arg (void);
 
@@ -114,13 +126,13 @@ namespace TAO
   };
 
   /**
-   * @struct Special_Basic_Traits_T
+   * @struct Special_Basic_SArg_Traits_T
    *
    * @brief Template class for skeleton argument traits
    *  of (w)char/boolean/octet.
    *
    */
-  template<typename T, typename to_T, typename from_T>
+  template<typename T, typename to_T, typename from_T, typename Insert_Policy>
   struct Special_Basic_SArg_Traits_T
   {
     typedef T                                               ret_type;
@@ -128,10 +140,10 @@ namespace TAO
     typedef T &                                             inout_type;
     typedef T &                                             out_type;
 
-    typedef In_Special_Basic_SArgument_T<T,to_T,from_T>     in_arg_val;
-    typedef Inout_Special_Basic_SArgument_T<T,to_T,from_T>  inout_arg_val;
-    typedef Out_Special_Basic_SArgument_T<T,to_T,from_T>    out_arg_val;
-    typedef Ret_Special_Basic_SArgument_T<T,to_T,from_T>    ret_val;
+    typedef In_Special_Basic_SArgument_T<T,to_T,from_T,Insert_Policy>     in_arg_val;
+    typedef Inout_Special_Basic_SArgument_T<T,to_T,from_T,Insert_Policy>  inout_arg_val;
+    typedef Out_Special_Basic_SArgument_T<T,to_T,from_T,Insert_Policy>    out_arg_val;
+    typedef Ret_Special_Basic_SArgument_T<T,to_T,from_T,Insert_Policy>    ret_val;
 
     // Typedefs corresponding to return value of arg() method in both
     // the client and server side argument class templates.
diff --git a/TAO/tao/PortableServer/Special_Basic_SArgument_T.inl b/TAO/tao/PortableServer/Special_Basic_SArgument_T.inl
index a0fd902d4fd..38d18635683 100644
--- a/TAO/tao/PortableServer/Special_Basic_SArgument_T.inl
+++ b/TAO/tao/PortableServer/Special_Basic_SArgument_T.inl
@@ -2,64 +2,91 @@
 //
 // $Id$
 
-template<typename S, typename to_S, typename from_S>
+template<typename S,
+         typename to_S,
+         typename from_S,
+         typename Insert_Policy>
 ACE_INLINE
-TAO::In_Special_Basic_SArgument_T<S,to_S,from_S>::
+TAO::In_Special_Basic_SArgument_T<S,to_S,from_S,Insert_Policy>::
 In_Special_Basic_SArgument_T (void)
-{}
+{
+}
 
-template<typename S, typename to_S, typename from_S>
+template<typename S,
+         typename to_S,
+         typename from_S,
+         typename Insert_Policy>
 ACE_INLINE
 S const &
-TAO::In_Special_Basic_SArgument_T<S,to_S,from_S>::arg (void) const
+TAO::In_Special_Basic_SArgument_T<S,to_S,from_S,Insert_Policy>::arg (void) const
 {
   return this->x_;
 }
 
 // ===========================================================================
 
-template<typename S, typename to_S, typename from_S>
+template<typename S,
+         typename to_S,
+         typename from_S,
+         typename Insert_Policy>
 ACE_INLINE
-TAO::Inout_Special_Basic_SArgument_T<S,to_S,from_S>::
+TAO::Inout_Special_Basic_SArgument_T<S,to_S,from_S,Insert_Policy>::
 Inout_Special_Basic_SArgument_T (void)
-{}
+{
+}
 
-template<typename S, typename to_S, typename from_S>
+template<typename S,
+         typename to_S,
+         typename from_S,
+         typename Insert_Policy>
 ACE_INLINE
 S &
-TAO::Inout_Special_Basic_SArgument_T<S,to_S,from_S>::arg (void)
+TAO::Inout_Special_Basic_SArgument_T<S,to_S,from_S,Insert_Policy>::arg (void)
 {
   return this->x_;
 }
 
 // ===========================================================================
 
-template<typename S, typename to_S, typename from_S>
+template<typename S,
+         typename to_S,
+         typename from_S,
+         typename Insert_Policy>
 ACE_INLINE
-TAO::Out_Special_Basic_SArgument_T<S,to_S,from_S>::
+TAO::Out_Special_Basic_SArgument_T<S,to_S,from_S,Insert_Policy>::
 Out_Special_Basic_SArgument_T (void)
-{}
+{
+}
 
-template<typename S, typename to_S, typename from_S>
+template<typename S,
+         typename to_S,
+         typename from_S,
+         typename Insert_Policy>
 S &
-TAO::Out_Special_Basic_SArgument_T<S,to_S,from_S>::arg (void)
+TAO::Out_Special_Basic_SArgument_T<S,to_S,from_S,Insert_Policy>::arg (void)
 {
   return this->x_;
 }
 
 // ===========================================================================
 
-template<typename S, typename to_S, typename from_S>
+template<typename S,
+         typename to_S,
+         typename from_S,
+         typename Insert_Policy>
 ACE_INLINE
-TAO::Ret_Special_Basic_SArgument_T<S,to_S,from_S>::
+TAO::Ret_Special_Basic_SArgument_T<S,to_S,from_S,Insert_Policy>::
 Ret_Special_Basic_SArgument_T (void)
 {
 }
 
-template<typename S, typename to_S, typename from_S>
+template<typename S,
+         typename to_S,
+         typename from_S,
+         typename Insert_Policy>
 ACE_INLINE
 S &
-TAO::Ret_Special_Basic_SArgument_T<S,to_S,from_S>::arg (void)
+TAO::Ret_Special_Basic_SArgument_T<S,to_S,from_S,Insert_Policy>::arg (void)
 {
   return this->x_;
 }
diff --git a/TAO/tao/PortableServer/Special_Basic_SArguments.h b/TAO/tao/PortableServer/Special_Basic_SArguments.h
index 80ff01a5331..29708781603 100644
--- a/TAO/tao/PortableServer/Special_Basic_SArguments.h
+++ b/TAO/tao/PortableServer/Special_Basic_SArguments.h
@@ -23,7 +23,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/PortableServer/Special_Basic_SArgument_T.h"
-#include "tao/Arg_Traits_T.h"
+#include "tao/PortableServer/SArg_Traits_T.h"
 
 #include "ace/CDR_Stream.h"
 
@@ -40,7 +40,8 @@ namespace TAO
   class TAO_PortableServer_Export SArg_Traits<ACE_InputCDR::to_char>
     : public Special_Basic_SArg_Traits_T<CORBA::Char,
                                          ACE_InputCDR::to_char,
-                                         ACE_OutputCDR::from_char>
+                                         ACE_OutputCDR::from_char,
+                                         TAO::Any_Insert_Policy_Stream <ACE_OutputCDR::from_char> >
   {
   };
 
@@ -48,7 +49,8 @@ namespace TAO
   class TAO_PortableServer_Export SArg_Traits<ACE_InputCDR::to_wchar>
     : public Special_Basic_SArg_Traits_T<CORBA::WChar,
                                          ACE_InputCDR::to_wchar,
-                                         ACE_OutputCDR::from_wchar>
+                                         ACE_OutputCDR::from_wchar,
+                                         TAO::Any_Insert_Policy_Stream <ACE_OutputCDR::from_wchar> >
   {
   };
 
@@ -56,7 +58,8 @@ namespace TAO
   class TAO_PortableServer_Export SArg_Traits<ACE_InputCDR::to_octet>
     : public Special_Basic_SArg_Traits_T<CORBA::Octet,
                                          ACE_InputCDR::to_octet,
-                                         ACE_OutputCDR::from_octet>
+                                         ACE_OutputCDR::from_octet,
+                                         TAO::Any_Insert_Policy_Stream <ACE_OutputCDR::from_octet> >
   {
   };
 
@@ -64,7 +67,9 @@ namespace TAO
   class TAO_PortableServer_Export SArg_Traits<ACE_InputCDR::to_boolean>
     : public Special_Basic_SArg_Traits_T<CORBA::Boolean,
                                          ACE_InputCDR::to_boolean,
-                                         ACE_OutputCDR::from_boolean>
+                                         ACE_OutputCDR::from_boolean,
+                                         TAO::Any_Insert_Policy_Stream <ACE_OutputCDR::from_boolean> >
+
   {
   };
 }
diff --git a/TAO/tao/PortableServer/ThreadPolicyA.cpp b/TAO/tao/PortableServer/ThreadPolicyA.cpp
index ddd3f3e7662..aac6c73f79a 100644
--- a/TAO/tao/PortableServer/ThreadPolicyA.cpp
+++ b/TAO/tao/PortableServer/ThreadPolicyA.cpp
@@ -25,16 +25,16 @@
 // Information about TAO is available at:
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
-#include "ThreadPolicyC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Enum_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
+#include "ThreadPolicyA.h"
+#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Enum_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
 #include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
-#include "tao/Any_Basic_Impl_T.h"
+#include "tao/AnyTypeCode/Any.h"
+#include "tao/AnyTypeCode/Any_Impl_T.h"
+#include "tao/AnyTypeCode/Any_Basic_Impl_T.h"
 
 #if (TAO_HAS_MINIMUM_POA == 0)
 
@@ -111,79 +111,4 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableServer::ThreadPolicy>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableServer::ThreadPolicy>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-  
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<PortableServer::ThreadPolicy>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableServer::ThreadPolicy_ptr _tao_elem
-  )
-{
-  PortableServer::ThreadPolicy_ptr _tao_objptr =
-    PortableServer::ThreadPolicy::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    PortableServer::ThreadPolicy_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<PortableServer::ThreadPolicy>::insert (
-      _tao_any,
-      PortableServer::ThreadPolicy::_tao_any_destructor,
-      PortableServer::_tc_ThreadPolicy,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    PortableServer::ThreadPolicy_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<PortableServer::ThreadPolicy>::extract (
-        _tao_any,
-        PortableServer::ThreadPolicy::_tao_any_destructor,
-        PortableServer::_tc_ThreadPolicy,
-        _tao_elem
-      );
-}
-
 #endif /* TAO_HAS_MINIMUM_POA == 0 */
diff --git a/TAO/tao/PortableServer/ThreadPolicyA.h b/TAO/tao/PortableServer/ThreadPolicyA.h
new file mode 100644
index 00000000000..0f5c471402b
--- /dev/null
+++ b/TAO/tao/PortableServer/ThreadPolicyA.h
@@ -0,0 +1,70 @@
+// -*- C++ -*-
+//
+// $Id$
+
+// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       Irvine, CA
+//       USA
+//       http://doc.ece.uci.edu/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
+//
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
+
+// TAO_IDL - Generated from
+// be\be_codegen.cpp:754
+
+#ifndef _TAO_IDL_THREADPOLICYA_H_
+#define _TAO_IDL_THREADPOLICYA_H_
+
+#include /**/ "ace/pre.h"
+
+#include "portableserver_export.h"
+#include "ThreadPolicyC.h"
+#include "tao/AnyTypeCode/PolicyA.h"
+
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:59
+
+namespace PortableServer
+{
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+  
+  extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_ThreadPolicyValue;
+  
+  // TAO_IDL - Generated from
+  // be\be_visitor_typecode/typecode_decl.cpp:49
+  
+  extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_ThreadPolicy;
+
+// TAO_IDL - Generated from
+// be\be_visitor_module/module_ch.cpp:86
+
+} // module PortableServer
+
+// TAO_IDL - Generated from
+// be\be_visitor_enum/any_op_ch.cpp:52
+
+TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ThreadPolicyValue);
+TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ThreadPolicyValue &);
+
+#include /**/ "ace/post.h"
+
+#endif /* ifndef */
diff --git a/TAO/tao/PortableServer/ThreadPolicyC.cpp b/TAO/tao/PortableServer/ThreadPolicyC.cpp
index 413cdbcdfcd..ac2f91049f7 100644
--- a/TAO/tao/PortableServer/ThreadPolicyC.cpp
+++ b/TAO/tao/PortableServer/ThreadPolicyC.cpp
@@ -26,17 +26,13 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:291
+// be\be_codegen.cpp:277
 
 
 #include "ThreadPolicyC.h"
 #include "tao/CDR.h"
 #include "ace/OS_NS_string.h"
 
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
@@ -90,14 +86,6 @@ PortableServer::ThreadPolicy::ThreadPolicy (void)
 PortableServer::ThreadPolicy::~ThreadPolicy (void)
 {}
 
-void 
-PortableServer::ThreadPolicy::_tao_any_destructor (void *_tao_void_pointer)
-{
-  ThreadPolicy *_tao_tmp_pointer =
-    static_cast<ThreadPolicy *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
 PortableServer::ThreadPolicy_ptr
 PortableServer::ThreadPolicy::_narrow (
     CORBA::Object_ptr _tao_objref
diff --git a/TAO/tao/PortableServer/ThreadPolicyC.h b/TAO/tao/PortableServer/ThreadPolicyC.h
index 16481e23122..aad589c4fb3 100644
--- a/TAO/tao/PortableServer/ThreadPolicyC.h
+++ b/TAO/tao/PortableServer/ThreadPolicyC.h
@@ -26,10 +26,10 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:153
+// be\be_codegen.cpp:154
 
-#ifndef _TAO_IDL_ORIG_THREADPOLICYC_H_
-#define _TAO_IDL_ORIG_THREADPOLICYC_H_
+#ifndef _TAO_IDL_THREADPOLICYC_H_
+#define _TAO_IDL_THREADPOLICYC_H_
 
 #include /**/ "ace/pre.h"
 
@@ -54,53 +54,39 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_PortableServer_Export
 
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:49
 
 namespace PortableServer
 {
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_enum/enum_ch.cpp:57
-  
+
   enum ThreadPolicyValue
   {
     ORB_CTRL_MODEL,
     SINGLE_THREAD_MODEL
   };
-  
+
 #if (TAO_HAS_MINIMUM_POA == 0)
   typedef ThreadPolicyValue &ThreadPolicyValue_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_ThreadPolicyValue;
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_PORTABLESERVER_THREADPOLICY__VAR_OUT_CH_)
 #define _PORTABLESERVER_THREADPOLICY__VAR_OUT_CH_
-  
+
   class ThreadPolicy;
   typedef ThreadPolicy *ThreadPolicy_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         ThreadPolicy
       >
     ThreadPolicy_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         ThreadPolicy
@@ -108,122 +94,116 @@ namespace PortableServer
     ThreadPolicy_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_PORTABLESERVER_THREADPOLICY_CH_)
 #define _PORTABLESERVER_THREADPOLICY_CH_
-  
+
   class TAO_PortableServer_Export ThreadPolicy
     : public virtual ::CORBA::Policy
   {
   public:
     typedef ThreadPolicy_ptr _ptr_type;
     typedef ThreadPolicy_var _var_type;
-    
+
     // The static operations.
     static ThreadPolicy_ptr _duplicate (ThreadPolicy_ptr obj);
-    
+
     static void _tao_release (ThreadPolicy_ptr obj);
-    
+
     static ThreadPolicy_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static ThreadPolicy_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static ThreadPolicy_ptr _nil (void)
     {
       return static_cast<ThreadPolicy_ptr> (0);
     }
-    
-    static void _tao_any_destructor (void *);
-    
+
+
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::PortableServer::ThreadPolicyValue value (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual ::CORBA::Policy_ptr copy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual void destroy (
         ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
-    
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
+
   protected:
     // Abstract or local interface only.
     ThreadPolicy (void);
-    
+
     virtual ~ThreadPolicy (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     ThreadPolicy (const ThreadPolicy &);
-    
+
     void operator= (const ThreadPolicy &);
   };
 
 #endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_PortableServer_Export ::CORBA::TypeCode_ptr const _tc_ThreadPolicy;
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
 
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:78
 
 } // module PortableServer
 
+#endif /* TAO_HAS_MINIMUM_POA == 0 */
+
 // TAO_IDL - Generated from
 // be\be_visitor_traits.cpp:61
 
+#if (TAO_HAS_MINIMUM_POA == 0)
 // Traits specializations.
 namespace TAO
 {
 
-#if (TAO_HAS_MINIMUM_POA == 0)
+#if !defined (_PORTABLESERVER_THREADPOLICY__TRAITS_)
+#define _PORTABLESERVER_THREADPOLICY__TRAITS_
 
-#if !defined (_PORTABLESERVER_THREADPOLICY__TRAITS_CH_)
-#define _PORTABLESERVER_THREADPOLICY__TRAITS_CH_
-  
   template<>
   struct TAO_PortableServer_Export Objref_Traits< ::PortableServer::ThreadPolicy>
   {
@@ -241,27 +221,9 @@ namespace TAO
   };
 
 #endif /* end #if !defined */
-
-#endif /* TAO_HAS_MINIMUM_POA == 0 */
-
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_enum/any_op_ch.cpp:51
-
-#if (TAO_HAS_MINIMUM_POA == 0)
-
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ThreadPolicyValue);
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ThreadPolicyValue &);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ThreadPolicy_ptr); // copying
-TAO_PortableServer_Export void operator<<= (CORBA::Any &, PortableServer::ThreadPolicy_ptr *); // non-copying
-TAO_PortableServer_Export CORBA::Boolean operator>>= (const CORBA::Any &, PortableServer::ThreadPolicy_ptr &);
-
-// TAO_IDL - Generated from
 // be\be_visitor_enum/cdr_op_ch.cpp:50
 
 TAO_PortableServer_Export CORBA::Boolean operator<< (TAO_OutputCDR &, PortableServer::ThreadPolicyValue);
@@ -270,15 +232,7 @@ TAO_PortableServer_Export CORBA::Boolean operator>> (TAO_InputCDR &, PortableSer
 #endif /* TAO_HAS_MINIMUM_CORBA == 0 */
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
+// be\be_codegen.cpp:1028
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/tao/PortableServer/TypeCode_SArg_Traits.h b/TAO/tao/PortableServer/TypeCode_SArg_Traits.h
index 1960033a44a..0314b900e76 100644
--- a/TAO/tao/PortableServer/TypeCode_SArg_Traits.h
+++ b/TAO/tao/PortableServer/TypeCode_SArg_Traits.h
@@ -46,7 +46,11 @@ namespace TAO
   class TAO_PortableServer_Export SArg_Traits<CORBA::TypeCode>
     : public Object_SArg_Traits_T<CORBA::TypeCode_ptr,
                                   CORBA::TypeCode_var,
-                                  CORBA::TypeCode_out>
+                                  CORBA::TypeCode_out,
+                                  TAO::Any_Insert_Policy_Stream <
+                                    CORBA::TypeCode_ptr
+                                  >
+                                 >
   {
   };
 }
diff --git a/TAO/tao/PortableServer/UB_String_SArgument_T.cpp b/TAO/tao/PortableServer/UB_String_SArgument_T.cpp
index d73fa550b34..c5d7730469f 100644
--- a/TAO/tao/PortableServer/UB_String_SArgument_T.cpp
+++ b/TAO/tao/PortableServer/UB_String_SArgument_T.cpp
@@ -4,7 +4,6 @@
 #define TAO_UB_STRING_SARGUMENT_T_CPP
 
 #include "tao/PortableServer/UB_String_SArgument_T.h"
-#include "tao/Dynamic_ParameterC.h"
 
 #if !defined (__ACE_INLINE__)
 #include "tao/PortableServer/UB_String_SArgument_T.inl"
@@ -22,12 +21,10 @@ TAO::In_UB_String_SArgument_T<S,S_var>::demarshal (TAO_InputCDR &cdr)
 
 template<typename S, typename S_var>
 void
-TAO::In_UB_String_SArgument_T<S,S_var>::interceptor_param (
-    Dynamic::Parameter & p
-  )
+TAO::In_UB_String_SArgument_T<S,S_var>::interceptor_value (
+  CORBA::Any *any) const
 {
-  p.argument <<= this->x_.in ();
-  p.mode = CORBA::PARAM_IN;
+  (*any) <<= this->x_.in ();
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -36,7 +33,7 @@ TAO::In_UB_String_SArgument_T<S,S_var>::interceptor_param (
 
 template<typename S, typename S_var>
 CORBA::Boolean
-TAO::Inout_UB_String_SArgument_T<S,S_var>::marshal (TAO_OutputCDR & cdr)
+TAO::Inout_UB_String_SArgument_T<S,S_var>::marshal (TAO_OutputCDR &cdr)
 {
   return cdr << this->x_.in ();
 }
@@ -52,12 +49,10 @@ TAO::Inout_UB_String_SArgument_T<S,S_var>::demarshal (TAO_InputCDR & cdr)
 
 template<typename S, typename S_var>
 void
-TAO::Inout_UB_String_SArgument_T<S,S_var>::interceptor_param (
-    Dynamic::Parameter & p
-  )
+TAO::Inout_UB_String_SArgument_T<S,S_var>::interceptor_value (
+  CORBA::Any *any) const
 {
-  p.argument <<= this->x_.in ();
-  p.mode = CORBA::PARAM_INOUT;
+  (*any) <<= this->x_.in ();
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -75,12 +70,10 @@ TAO::Out_UB_String_SArgument_T<S,S_var>::marshal (TAO_OutputCDR &cdr)
 
 template<typename S, typename S_var>
 void
-TAO::Out_UB_String_SArgument_T<S,S_var>::interceptor_param (
-    Dynamic::Parameter & p
-  )
+TAO::Out_UB_String_SArgument_T<S,S_var>::interceptor_value (
+  CORBA::Any *any) const
 {
-  p.argument <<= this->x_.in ();
-  p.mode = CORBA::PARAM_OUT;
+  (*any) <<= this->x_.in ();
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -89,7 +82,7 @@ TAO::Out_UB_String_SArgument_T<S,S_var>::interceptor_param (
 
 template<typename S, typename S_var>
 CORBA::Boolean
-TAO::Ret_UB_String_SArgument_T<S,S_var>::marshal (TAO_OutputCDR & cdr)
+TAO::Ret_UB_String_SArgument_T<S,S_var>::marshal (TAO_OutputCDR &cdr)
 {
   return cdr << this->x_.in ();
 }
@@ -98,7 +91,8 @@ TAO::Ret_UB_String_SArgument_T<S,S_var>::marshal (TAO_OutputCDR & cdr)
 
 template<typename S, typename S_var>
 void
-TAO::Ret_UB_String_SArgument_T<S,S_var>::interceptor_result (CORBA::Any * any)
+TAO::Ret_UB_String_SArgument_T<S,S_var>::interceptor_value (
+  CORBA::Any *any) const
 {
   (*any) <<= this->x_.in ();
 }
diff --git a/TAO/tao/PortableServer/UB_String_SArgument_T.h b/TAO/tao/PortableServer/UB_String_SArgument_T.h
index d79a4728266..3d681d3e0d9 100644
--- a/TAO/tao/PortableServer/UB_String_SArgument_T.h
+++ b/TAO/tao/PortableServer/UB_String_SArgument_T.h
@@ -30,14 +30,14 @@ namespace TAO
    *
    */
   template<typename S, typename S_var>
-  class In_UB_String_SArgument_T : public Argument
+  class In_UB_String_SArgument_T : public InArgument
   {
   public:
     In_UB_String_SArgument_T (void);
 
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S const * arg (void) const;
 
@@ -52,15 +52,15 @@ namespace TAO
    *
    */
   template<typename S, typename S_var>
-  class Inout_UB_String_SArgument_T : public Argument
+  class Inout_UB_String_SArgument_T : public InoutArgument
   {
   public:
     Inout_UB_String_SArgument_T (void);
 
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S *& arg (void);
 
@@ -75,14 +75,14 @@ namespace TAO
    *
    */
   template<typename S, typename S_var>
-  class Out_UB_String_SArgument_T : public Argument
+  class Out_UB_String_SArgument_T : public OutArgument
   {
   public:
     Out_UB_String_SArgument_T (void);
 
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S *& arg (void);
 
@@ -97,14 +97,14 @@ namespace TAO
    *
    */
   template<typename S, typename S_var>
-  class Ret_UB_String_SArgument_T : public Argument
+  class Ret_UB_String_SArgument_T : public RetArgument
   {
   public:
     Ret_UB_String_SArgument_T (void);
 
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_result (CORBA::Any *);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S *& arg (void);
 
diff --git a/TAO/tao/PortableServer/UB_String_SArguments.h b/TAO/tao/PortableServer/UB_String_SArguments.h
index 4f4194fe8cf..fd3440e5804 100644
--- a/TAO/tao/PortableServer/UB_String_SArguments.h
+++ b/TAO/tao/PortableServer/UB_String_SArguments.h
@@ -22,7 +22,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/PortableServer/UB_String_SArgument_T.h"
-#include "tao/Arg_Traits_T.h"
+#include "tao/PortableServer/SArg_Traits_T.h"
 
 namespace TAO
 {
diff --git a/TAO/tao/PortableServer/Upcall_Wrapper.cpp b/TAO/tao/PortableServer/Upcall_Wrapper.cpp
index 82d0931b8a7..8443f73dd0e 100644
--- a/TAO/tao/PortableServer/Upcall_Wrapper.cpp
+++ b/TAO/tao/PortableServer/Upcall_Wrapper.cpp
@@ -4,7 +4,6 @@
 #include "Upcall_Command.h"
 
 #if TAO_HAS_INTERCEPTORS == 1
-# include "PICurrent_Guard.h"
 # include "tao/ServerRequestInterceptor_Adapter.h"
 # include "tao/PortableInterceptorC.h"
 # include "tao/ORB_Core.h"
@@ -54,9 +53,6 @@ TAO::Upcall_Wrapper::upcall (TAO_ServerRequest & server_request,
   ACE_TRY
     {
       {
-        TAO::PICurrent_Guard pi_guard (server_request,
-                                       true  /* Copy TSC to RSC */);
-
         if (interceptor_adapter != 0)
           {
             // Invoke intermediate server side interception points.
@@ -75,11 +71,20 @@ TAO::Upcall_Wrapper::upcall (TAO_ServerRequest & server_request,
         CORBA::Object_var forward_to = server_request.forward_location ();
         if (CORBA::is_nil (forward_to.in ()))
           {
+            if (interceptor_adapter != 0)
+              {
+                interceptor_adapter->execute_command (server_request,
+                                                      command
+                                                      ACE_ENV_ARG_PARAMETER);
+                ACE_TRY_CHECK;
+              }
+            else
 #endif /* TAO_HAS_INTERCEPTORS */
-
-            // The actual upcall.
-            command.execute (ACE_ENV_SINGLE_ARG_PARAMETER);
-            TAO_INTERCEPTOR_CHECK;
+              {
+                // The actual upcall.
+                command.execute (ACE_ENV_SINGLE_ARG_PARAMETER);
+                TAO_INTERCEPTOR_CHECK;
+              }
 
 #if TAO_HAS_INTERCEPTORS == 1
           }
diff --git a/TAO/tao/PortableServer/Var_Array_SArgument_T.cpp b/TAO/tao/PortableServer/Var_Array_SArgument_T.cpp
index 8197c3fb819..60218a2d35c 100644
--- a/TAO/tao/PortableServer/Var_Array_SArgument_T.cpp
+++ b/TAO/tao/PortableServer/Var_Array_SArgument_T.cpp
@@ -4,18 +4,21 @@
 #define TAO_VAR_ARRAY_SARGUMENT_T_CPP
 
 #include "tao/PortableServer/Var_Array_SArgument_T.h"
-#include "tao/Dynamic_ParameterC.h"
 
 #if !defined (__ACE_INLINE__)
 #include "tao/PortableServer/Var_Array_SArgument_T.inl"
 #endif /* __ACE_INLINE__ */
 
 
-template<typename S, typename S_slice, typename S_forany>
+template<typename S,
+         typename S_slice,
+         typename S_forany,
+         typename Insert_Policy>
 CORBA::Boolean
 TAO::In_Var_Array_SArgument_T<S,
                               S_slice,
-                              S_forany>::demarshal (TAO_InputCDR & cdr)
+                              S_forany,
+                              Insert_Policy>::demarshal (TAO_InputCDR & cdr)
 {
   S_forany tmp (this->x_);
   return cdr >> tmp;
@@ -23,36 +26,46 @@ TAO::In_Var_Array_SArgument_T<S,
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S, typename S_slice, typename S_forany>
+template<typename S,
+         typename S_slice,
+         typename S_forany,
+         typename Insert_Policy>
 void
 TAO::In_Var_Array_SArgument_T<S,
                               S_slice,
-                              S_forany>::interceptor_param (
-    Dynamic::Parameter & p)
+                              S_forany,
+                              Insert_Policy>::interceptor_value (
+    CORBA::Any *any) const
 {
-
-  p.argument <<= S_forany (this->x_);
-  p.mode = CORBA::PARAM_IN;
+  this->Insert_Policy::any_insert (any, S_forany (this->x_));
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // ===========================================================
 
-template<typename S, typename S_slice, typename S_forany>
+template<typename S,
+         typename S_slice,
+         typename S_forany,
+         typename Insert_Policy>
 CORBA::Boolean
 TAO::Inout_Var_Array_SArgument_T<S,
                                  S_slice,
-                                 S_forany>::marshal (TAO_OutputCDR & cdr)
+                                 S_forany,
+                                 Insert_Policy>::marshal (TAO_OutputCDR &cdr)
 {
   return cdr << this->x_;
 }
 
-template<typename S, typename S_slice, typename S_forany>
+template<typename S,
+         typename S_slice,
+         typename S_forany,
+         typename Insert_Policy>
 CORBA::Boolean
 TAO::Inout_Var_Array_SArgument_T<S,
                                  S_slice,
-                                 S_forany>::demarshal (TAO_InputCDR & cdr)
+                                 S_forany,
+                                 Insert_Policy>::demarshal (TAO_InputCDR & cdr)
 {
   S_forany tmp (this->x_);
   return cdr >> tmp;
@@ -60,22 +73,33 @@ TAO::Inout_Var_Array_SArgument_T<S,
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S, typename S_slice, typename S_forany>
+template<typename S,
+         typename S_slice,
+         typename S_forany,
+         typename Insert_Policy>
 void
-TAO::Inout_Var_Array_SArgument_T<S, S_slice, S_forany>::interceptor_param (
-  Dynamic::Parameter & p)
+TAO::Inout_Var_Array_SArgument_T<S,
+                                 S_slice,
+                                 S_forany,
+                                 Insert_Policy>::interceptor_value (
+  CORBA::Any *any) const
 {
-  p.argument <<= S_forany (this->x_);
-  p.mode = CORBA::PARAM_INOUT;
+  this->Insert_Policy::any_insert (any, S_forany (this->x_));
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // ==============================================================
 
-template<typename S_slice, typename S_var, typename S_forany>
+template<typename S_slice,
+         typename S_var,
+         typename S_forany,
+         typename Insert_Policy>
 CORBA::Boolean
-TAO::Out_Var_Array_SArgument_T<S_slice,S_var,S_forany>::marshal (
+TAO::Out_Var_Array_SArgument_T<S_slice,
+                               S_var,
+                               S_forany,
+                               Insert_Policy>::marshal (
     TAO_OutputCDR & cdr
   )
 {
@@ -85,23 +109,33 @@ TAO::Out_Var_Array_SArgument_T<S_slice,S_var,S_forany>::marshal (
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S_slice, typename S_var, typename S_forany>
+template<typename S_slice,
+         typename S_var,
+         typename S_forany,
+         typename Insert_Policy>
 void
-TAO::Out_Var_Array_SArgument_T<S_slice,S_var,S_forany>::interceptor_param (
-    Dynamic::Parameter & p
-  )
+TAO::Out_Var_Array_SArgument_T<S_slice,
+                               S_var,
+                               S_forany,
+                               Insert_Policy>::interceptor_value (
+  CORBA::Any *any) const
 {
-  p.argument <<= S_forany (this->x_.ptr ());
-  p.mode = CORBA::PARAM_OUT;
+  this->Insert_Policy::any_insert (any, S_forany (this->x_.ptr ()));
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // ============================================================
 
-template<typename S_slice, typename S_var, typename S_forany>
+template<typename S_slice,
+         typename S_var,
+         typename S_forany,
+         typename Insert_Policy>
 CORBA::Boolean
-TAO::Ret_Var_Array_SArgument_T<S_slice,S_var,S_forany>::marshal (
+TAO::Ret_Var_Array_SArgument_T<S_slice,
+                               S_var,
+                               S_forany,
+                               Insert_Policy>::marshal (
     TAO_OutputCDR & cdr
   )
 {
@@ -110,13 +144,18 @@ TAO::Ret_Var_Array_SArgument_T<S_slice,S_var,S_forany>::marshal (
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S_slice, typename S_var, typename S_forany>
+template<typename S_slice,
+         typename S_var,
+         typename S_forany,
+         typename Insert_Policy>
 void
-TAO::Ret_Var_Array_SArgument_T<S_slice,S_var,S_forany>::interceptor_result (
-    CORBA::Any * any
-  )
+TAO::Ret_Var_Array_SArgument_T<S_slice,
+                               S_var,
+                               S_forany,
+                               Insert_Policy>::interceptor_value (
+  CORBA::Any *any) const
 {
-  (*any) <<= S_forany (this->x_.ptr ());
+  this->Insert_Policy::any_insert (any, S_forany (this->x_.ptr ()));
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
diff --git a/TAO/tao/PortableServer/Var_Array_SArgument_T.h b/TAO/tao/PortableServer/Var_Array_SArgument_T.h
index a3eb5572772..d5f607cba2f 100644
--- a/TAO/tao/PortableServer/Var_Array_SArgument_T.h
+++ b/TAO/tao/PortableServer/Var_Array_SArgument_T.h
@@ -29,8 +29,11 @@ namespace TAO
    * @brief IN skeleton argument of variable size element array.
    *
    */
-  template<typename S, typename S_slice, typename S_forany>
-  class In_Var_Array_SArgument_T : public Argument
+  template<typename S,
+           typename S_slice,
+           typename S_forany,
+           typename Insert_Policy>
+  class In_Var_Array_SArgument_T : public InArgument, private Insert_Policy
   {
   public:
 
@@ -38,7 +41,7 @@ namespace TAO
 
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S_slice const * arg (void) const;
 
@@ -52,21 +55,24 @@ namespace TAO
    * @brief INOUT skeleton argument of variable size element array.
    *
    */
-  template<typename S, typename S_slice, typename S_forany>
-  class Inout_Var_Array_SArgument_T : public Argument
+  template<typename S,
+           typename S_slice,
+           typename S_forany,
+           typename Insert_Policy>
+  class Inout_Var_Array_SArgument_T : public InoutArgument, private Insert_Policy
   {
   public:
     Inout_Var_Array_SArgument_T (void);
 
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S_slice * arg (void);
 
   private:
-    S x_;
+    mutable S x_;
   };
 
   /**
@@ -75,15 +81,18 @@ namespace TAO
    * @brief OUT skeleton argument of variable size element array.
    *
    */
-  template<typename S_slice, typename S_var, typename S_forany>
-  class Out_Var_Array_SArgument_T : public Argument
+  template<typename S_slice,
+           typename S_var,
+           typename S_forany,
+           typename Insert_Policy>
+  class Out_Var_Array_SArgument_T : public OutArgument, private Insert_Policy
   {
   public:
     Out_Var_Array_SArgument_T (void);
 
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S_slice *& arg (void);
 
@@ -97,15 +106,18 @@ namespace TAO
    * @brief Skeleton value of variable size element array.
    *
    */
-  template<typename S_slice, typename S_var, typename S_forany>
-  class Ret_Var_Array_SArgument_T : public Argument
+  template<typename S_slice,
+           typename S_var,
+           typename S_forany,
+           typename Insert_Policy>
+  class Ret_Var_Array_SArgument_T : public RetArgument, private Insert_Policy
   {
   public:
     Ret_Var_Array_SArgument_T (void);
 
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_result (CORBA::Any *);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S_slice *& arg (void);
 
@@ -123,7 +135,8 @@ namespace TAO
            typename T_slice,
            typename T_var,
            typename T_out,
-           typename T_forany>
+           typename T_forany,
+           typename Insert_Policy>
   struct Var_Array_SArg_Traits_T
   {
     typedef T_slice *                                   ret_type;
@@ -133,16 +146,20 @@ namespace TAO
 
     typedef In_Var_Array_SArgument_T<T,
                                      T_slice,
-                                     T_forany>          in_arg_val;
+                                     T_forany,
+                                     Insert_Policy>          in_arg_val;
     typedef Inout_Var_Array_SArgument_T<T,
                                         T_slice,
-                                        T_forany>       inout_arg_val;
+                                        T_forany,
+                                        Insert_Policy>       inout_arg_val;
     typedef Out_Var_Array_SArgument_T<T_slice,
                                       T_var,
-                                      T_forany>         out_arg_val;
+                                      T_forany,
+                                      Insert_Policy>         out_arg_val;
     typedef Ret_Var_Array_SArgument_T<T_slice,
                                       T_var,
-                                      T_forany>         ret_val;
+                                      T_forany,
+                                      Insert_Policy>         ret_val;
 
     // Typedefs corresponding to return value of arg() method in both
     // the client and server side argument class templates.
diff --git a/TAO/tao/PortableServer/Var_Array_SArgument_T.inl b/TAO/tao/PortableServer/Var_Array_SArgument_T.inl
index fe3a700ffa5..30674cca189 100644
--- a/TAO/tao/PortableServer/Var_Array_SArgument_T.inl
+++ b/TAO/tao/PortableServer/Var_Array_SArgument_T.inl
@@ -3,19 +3,27 @@
 // $Id$
 
 
-template<typename S, typename S_slice, typename S_forany>
+template<typename S,
+         typename S_slice,
+         typename S_forany,
+         typename Insert_Policy>
 ACE_INLINE
 TAO::In_Var_Array_SArgument_T<S,
                               S_slice,
-                              S_forany>::In_Var_Array_SArgument_T (void)
+                              S_forany,
+                              Insert_Policy>::In_Var_Array_SArgument_T (void)
 {}
 
-template<typename S, typename S_slice, typename S_forany>
+template<typename S,
+         typename S_slice,
+         typename S_forany,
+         typename Insert_Policy>
 ACE_INLINE
 S_slice const *
 TAO::In_Var_Array_SArgument_T<S,
                               S_slice,
-                              S_forany>::arg (void) const
+                              S_forany,
+                              Insert_Policy>::arg (void) const
 {
   S_forany tmp (this->x_);
   return tmp.in ();
@@ -23,18 +31,28 @@ TAO::In_Var_Array_SArgument_T<S,
 
 // ==========================================================================
 
-template<typename S, typename S_slice, typename S_forany>
+template<typename S,
+         typename S_slice,
+         typename S_forany,
+         typename Insert_Policy>
 ACE_INLINE
 TAO::Inout_Var_Array_SArgument_T<S,
                                  S_slice,
-                                 S_forany>::Inout_Var_Array_SArgument_T (void)
-{}
+                                 S_forany,
+                                 Insert_Policy>::
+Inout_Var_Array_SArgument_T (void)
+{
+}
 
-template<typename S, typename S_slice, typename S_forany>
+template<typename S,
+         typename S_slice,
+         typename S_forany,
+         typename Insert_Policy>
 S_slice *
 TAO::Inout_Var_Array_SArgument_T<S,
                                  S_slice,
-                                 S_forany>::arg (void)
+                                 S_forany,
+                                 Insert_Policy>::arg (void)
 {
   S_forany tmp (this->x_);
   return tmp.inout ();
@@ -42,31 +60,57 @@ TAO::Inout_Var_Array_SArgument_T<S,
 
 // ==========================================================================
 
-template<typename S_slice, typename S_var, typename S_forany>
+template<typename S_slice,
+         typename S_var,
+         typename S_forany,
+         typename Insert_Policy>
 ACE_INLINE
-TAO::Out_Var_Array_SArgument_T<S_slice,S_var,S_forany>::
+TAO::Out_Var_Array_SArgument_T<S_slice,
+                               S_var,
+                               S_forany,
+                               Insert_Policy>::
 Out_Var_Array_SArgument_T (void)
-{}
+{
+}
 
-template<typename S_slice, typename S_var, typename S_forany>
+template<typename S_slice,
+         typename S_var,
+         typename S_forany,
+         typename Insert_Policy>
 S_slice *&
-TAO::Out_Var_Array_SArgument_T<S_slice,S_var,S_forany>::arg (void)
+TAO::Out_Var_Array_SArgument_T<S_slice,
+                               S_var,
+                               S_forany,
+                               Insert_Policy>::arg (void)
 {
   return this->x_.out ();
 }
 
 // ==========================================================================
 
-template<typename S_slice, typename S_var, typename S_forany>
+template<typename S_slice,
+         typename S_var,
+         typename S_forany,
+         typename Insert_Policy>
 ACE_INLINE
-TAO::Ret_Var_Array_SArgument_T<S_slice,S_var,S_forany>::
+TAO::Ret_Var_Array_SArgument_T<S_slice,
+                               S_var,
+                               S_forany,
+                               Insert_Policy>::
 Ret_Var_Array_SArgument_T (void)
-{}
+{
+}
 
-template<typename S_slice, typename S_var, typename S_forany>
+template<typename S_slice,
+         typename S_var,
+         typename S_forany,
+         typename Insert_Policy>
 ACE_INLINE
 S_slice *&
-TAO::Ret_Var_Array_SArgument_T<S_slice,S_var,S_forany>::arg (void)
+TAO::Ret_Var_Array_SArgument_T<S_slice,
+                               S_var,
+                               S_forany,
+                               Insert_Policy>::arg (void)
 {
   return this->x_.out ();
 }
diff --git a/TAO/tao/PortableServer/Var_Size_SArgument_T.cpp b/TAO/tao/PortableServer/Var_Size_SArgument_T.cpp
index 43209797b21..64b6229bd10 100644
--- a/TAO/tao/PortableServer/Var_Size_SArgument_T.cpp
+++ b/TAO/tao/PortableServer/Var_Size_SArgument_T.cpp
@@ -4,99 +4,108 @@
 #define TAO_VAR_SIZE_SARGUMENT_T_CPP
 
 #include "tao/PortableServer/Var_Size_SArgument_T.h"
-#include "tao/Dynamic_ParameterC.h"
 
 #if !defined (__ACE_INLINE__)
 #include "tao/PortableServer/Var_Size_SArgument_T.inl"
 #endif /* __ACE_INLINE__ */
 
 
-template<typename S>
+template<typename S,
+         typename Insert_Policy>
 CORBA::Boolean
-TAO::In_Var_Size_SArgument_T<S>::demarshal (TAO_InputCDR &cdr)
+TAO::In_Var_Size_SArgument_T<S,Insert_Policy>::demarshal (TAO_InputCDR &cdr)
 {
   return cdr >> this->x_;
 }
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S>
+template<typename S,
+         typename Insert_Policy>
 void
-TAO::In_Var_Size_SArgument_T<S>::interceptor_param (Dynamic::Parameter & p)
+TAO::In_Var_Size_SArgument_T<S,Insert_Policy>::interceptor_value (CORBA::Any *any) const
 {
-  p.argument <<= this->x_;
-  p.mode = CORBA::PARAM_IN;
+  this->Insert_Policy::any_insert (any, this->x_);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // ===========================================================
 
-template<typename S>
+template<typename S,
+         typename Insert_Policy>
 CORBA::Boolean
-TAO::Inout_Var_Size_SArgument_T<S>::marshal (TAO_OutputCDR & cdr)
+TAO::Inout_Var_Size_SArgument_T<S,Insert_Policy>::marshal (TAO_OutputCDR &cdr)
 {
   return cdr << this->x_;
 }
 
-template<typename S>
+template<typename S,
+         typename Insert_Policy>
 CORBA::Boolean
-TAO::Inout_Var_Size_SArgument_T<S>::demarshal (TAO_InputCDR & cdr)
+TAO::Inout_Var_Size_SArgument_T<S,Insert_Policy>::demarshal (TAO_InputCDR & cdr)
 {
   return cdr >> this->x_;
 }
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S>
+template<typename S,
+         typename Insert_Policy>
 void
-TAO::Inout_Var_Size_SArgument_T<S>::interceptor_param (Dynamic::Parameter & p)
+TAO::Inout_Var_Size_SArgument_T<S,Insert_Policy>::interceptor_value (CORBA::Any *any) const
 {
-  p.argument <<= this->x_;
-  p.mode = CORBA::PARAM_INOUT;
+  this->Insert_Policy::any_insert (any, this->x_);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // ==============================================================
 
-template<typename S, typename S_var>
+template<typename S,
+         typename S_var,
+         typename Insert_Policy>
 CORBA::Boolean
-TAO::Out_Var_Size_SArgument_T<S,S_var>::marshal (TAO_OutputCDR &cdr)
+TAO::Out_Var_Size_SArgument_T<S,S_var,Insert_Policy>::marshal (TAO_OutputCDR &cdr)
 {
   return cdr << this->x_.in ();
 }
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S, typename S_var>
+template<typename S,
+         typename S_var,
+         typename Insert_Policy>
 void
-TAO::Out_Var_Size_SArgument_T<S,S_var>::interceptor_param (
-    Dynamic::Parameter & p
-  )
+TAO::Out_Var_Size_SArgument_T<S,S_var,Insert_Policy>::interceptor_value (
+  CORBA::Any *any) const
 {
-  p.argument <<= this->x_.in ();
-  p.mode = CORBA::PARAM_OUT;
+  this->Insert_Policy::any_insert (any, this->x_.in ());
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // ============================================================
 
-template<typename S, typename S_var>
+template<typename S,
+         typename S_var,
+         typename Insert_Policy>
 CORBA::Boolean
-TAO::Ret_Var_Size_SArgument_T<S,S_var>::marshal (TAO_OutputCDR & cdr)
+TAO::Ret_Var_Size_SArgument_T<S,S_var,Insert_Policy>::marshal (TAO_OutputCDR &cdr)
 {
   return cdr << this->x_.in ();
 }
-#if TAO_HAS_INTERCEPTORS == 1
 
+#if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S, typename S_var>
+template<typename S,
+         typename S_var,
+         typename Insert_Policy>
 void
-TAO::Ret_Var_Size_SArgument_T<S,S_var>::interceptor_result (CORBA::Any * any)
+TAO::Ret_Var_Size_SArgument_T<S,S_var,Insert_Policy>::interceptor_value (
+  CORBA::Any *any) const
 {
-  (*any) <<= this->x_.in ();
+  this->Insert_Policy::any_insert (any, this->x_.in ());
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
diff --git a/TAO/tao/PortableServer/Var_Size_SArgument_T.h b/TAO/tao/PortableServer/Var_Size_SArgument_T.h
index 29c5ef58dd5..14585cc096a 100644
--- a/TAO/tao/PortableServer/Var_Size_SArgument_T.h
+++ b/TAO/tao/PortableServer/Var_Size_SArgument_T.h
@@ -28,14 +28,15 @@ namespace TAO
    * @brief Template class for IN skeleton argument of fixed size IDL types.
    *
    */
-  template<typename S>
-  class In_Var_Size_SArgument_T : public Argument
+  template<typename S,
+           typename Insert_Policy>
+  class In_Var_Size_SArgument_T : public InArgument, private Insert_Policy
   {
   public:
 
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S const & arg (void) const;
 
@@ -49,16 +50,17 @@ namespace TAO
    * @brief Template class for INOUT skeleton arg of fixed size IDL types.
    *
    */
-  template<typename S>
-  class Inout_Var_Size_SArgument_T : public Argument
+  template<typename S,
+           typename Insert_Policy>
+  class Inout_Var_Size_SArgument_T : public InoutArgument, private Insert_Policy
   {
   public:
     Inout_Var_Size_SArgument_T (void);
 
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S & arg (void);
 
@@ -72,15 +74,17 @@ namespace TAO
    * @brief Template class for OUT skeleton argument of fixed size IDL types.
    *
    */
-  template<typename S, typename S_var>
-  class Out_Var_Size_SArgument_T : public Argument
+  template<typename S,
+           typename S_var,
+           typename Insert_Policy>
+  class Out_Var_Size_SArgument_T : public OutArgument, private Insert_Policy
   {
   public:
     Out_Var_Size_SArgument_T (void);
 
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S *& arg (void);
 
@@ -94,15 +98,17 @@ namespace TAO
    * @brief Template class for return skeleton value of fixed size IDL types.
    *
    */
-  template<typename S, typename S_var>
-  class Ret_Var_Size_SArgument_T : public Argument
+  template<typename S,
+           typename S_var,
+           typename Insert_Policy>
+  class Ret_Var_Size_SArgument_T : public RetArgument, private Insert_Policy
   {
   public:
     Ret_Var_Size_SArgument_T (void);
 
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_result (CORBA::Any *);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S *& arg (void);
 
@@ -111,31 +117,34 @@ namespace TAO
   };
 
   /**
-   * @struct Basic_SArg_Traits_T
+   * @struct Var_Size_SArg_Traits_T
    *
    * @brief Template class for skeleton argument traits of
    *  variable size IDL types.
    *
    */
-  template<typename T, typename T_var, typename T_out>
+  template<typename T,
+           typename T_var,
+           typename T_out,
+           typename Insert_Policy>
   struct Var_Size_SArg_Traits_T
   {
-    typedef T *                                         ret_type;
-    typedef const T &                                   in_type;
-    typedef T &                                         inout_type;
-    typedef T_out                                       out_type;
+    typedef T *                                             ret_type;
+    typedef const T &                                       in_type;
+    typedef T &                                             inout_type;
+    typedef T_out                                           out_type;
 
-    typedef In_Var_Size_SArgument_T<T>                  in_arg_val;
-    typedef Inout_Var_Size_SArgument_T<T>               inout_arg_val;
-    typedef Out_Var_Size_SArgument_T<T,T_var>           out_arg_val;
-    typedef Ret_Var_Size_SArgument_T<T,T_var>           ret_val;
+    typedef In_Var_Size_SArgument_T<T,Insert_Policy>        in_arg_val;
+    typedef Inout_Var_Size_SArgument_T<T,Insert_Policy>     inout_arg_val;
+    typedef Out_Var_Size_SArgument_T<T,T_var,Insert_Policy> out_arg_val;
+    typedef Ret_Var_Size_SArgument_T<T,T_var,Insert_Policy> ret_val;
 
     // Typedefs corresponding to return value of arg() method in both
     // the client and server side argument class templates.
-    typedef in_type                                     in_arg_type;
-    typedef inout_type                                  inout_arg_type;
-    typedef ret_type &                                  out_arg_type;
-    typedef ret_type &                                  ret_arg_type;
+    typedef in_type                                         in_arg_type;
+    typedef inout_type                                      inout_arg_type;
+    typedef ret_type &                                      out_arg_type;
+    typedef ret_type &                                      ret_arg_type;
 
   };
 }
diff --git a/TAO/tao/PortableServer/Var_Size_SArgument_T.inl b/TAO/tao/PortableServer/Var_Size_SArgument_T.inl
index ba15bec73ac..7c516b117ec 100644
--- a/TAO/tao/PortableServer/Var_Size_SArgument_T.inl
+++ b/TAO/tao/PortableServer/Var_Size_SArgument_T.inl
@@ -2,53 +2,66 @@
 //
 // $Id$
 
-
-template<typename S>
+template<typename S,
+         typename Insert_Policy>
 S const &
-TAO::In_Var_Size_SArgument_T<S>::arg (void) const
+TAO::In_Var_Size_SArgument_T<S,Insert_Policy>::arg (void) const
 {
   return this->x_;
 }
 
 // ==========================================================================
 
-template<typename S>
+template<typename S,
+         typename Insert_Policy>
 ACE_INLINE
-TAO::Inout_Var_Size_SArgument_T<S>::Inout_Var_Size_SArgument_T (void)
-{}
+TAO::Inout_Var_Size_SArgument_T<S,Insert_Policy>::Inout_Var_Size_SArgument_T (void)
+{
+}
 
-template<typename S>
+template<typename S,
+         typename Insert_Policy>
 S &
-TAO::Inout_Var_Size_SArgument_T<S>::arg (void)
+TAO::Inout_Var_Size_SArgument_T<S,Insert_Policy>::arg (void)
 {
   return this->x_;
 }
 
 // ==========================================================================
 
-template<typename S, typename S_var>
+template<typename S,
+         typename S_var,
+         typename Insert_Policy>
 ACE_INLINE
-TAO::Out_Var_Size_SArgument_T<S,S_var>::Out_Var_Size_SArgument_T (void)
-{}
+TAO::Out_Var_Size_SArgument_T<S,S_var,Insert_Policy>::Out_Var_Size_SArgument_T (void)
+{
+}
 
-template<typename S, typename S_var>
+template<typename S,
+         typename S_var,
+         typename Insert_Policy>
 S *&
-TAO::Out_Var_Size_SArgument_T<S,S_var>::arg (void)
+TAO::Out_Var_Size_SArgument_T<S,S_var,Insert_Policy>::arg (void)
 {
   return this->x_.out ();
 }
 
 // ==========================================================================
 
-template<typename S, typename S_var>
+template<typename S,
+         typename S_var,
+         typename Insert_Policy>
 ACE_INLINE
-TAO::Ret_Var_Size_SArgument_T<S,S_var>::Ret_Var_Size_SArgument_T (void)
-{}
+TAO::Ret_Var_Size_SArgument_T<S,S_var,Insert_Policy>::Ret_Var_Size_SArgument_T (void)
+{
+}
 
-template<typename S, typename S_var>
+template<typename S,
+         typename S_var,
+         typename Insert_Policy>
 ACE_INLINE
 S *&
-TAO::Ret_Var_Size_SArgument_T<S,S_var>::arg (void)
+TAO::Ret_Var_Size_SArgument_T<S,S_var,Insert_Policy>::arg (void)
 {
   return this->x_.out ();
 }
diff --git a/TAO/tao/Profile.h b/TAO/tao/Profile.h
index 6821ee1a5f6..016d17ce1d7 100644
--- a/TAO/tao/Profile.h
+++ b/TAO/tao/Profile.h
@@ -60,7 +60,6 @@ public:
   /**
    * @name Non virtual methods for the profile classes.
   */
-
   //@{
   /// The tag, each concrete class will have a specific tag value.
   CORBA::ULong tag (void) const;
diff --git a/TAO/tao/Profile_Transport_Resolver.h b/TAO/tao/Profile_Transport_Resolver.h
index 4c09b20d327..0dd849a04a5 100644
--- a/TAO/tao/Profile_Transport_Resolver.h
+++ b/TAO/tao/Profile_Transport_Resolver.h
@@ -89,7 +89,7 @@ namespace TAO
 
     //@{
     /**
-     * Accessors and mutators for this class. The following methods
+     * @name Accessors and mutators for this class. The following methods
      * are used by the clients of this class to access strategies and
      * other internal workings.
      */
diff --git a/TAO/tao/Protocols_Hooks.h b/TAO/tao/Protocols_Hooks.h
index ba64e7a1c42..c176aa2bc44 100644
--- a/TAO/tao/Protocols_Hooks.h
+++ b/TAO/tao/Protocols_Hooks.h
@@ -174,7 +174,7 @@ public:
                                                int &in_range) = 0;
 
   /**
-   * Accessor and modifier to the current thread priority, used to
+   * @name Accessor and modifier to the current thread priority, used to
    * implement the RTCORBA::Current interface, but it is faster for
    * some critical components.  If the RTCORBA library isn't used,
    * these operations are no-ops.
diff --git a/TAO/tao/RTCORBA.mpc b/TAO/tao/RTCORBA.mpc
index b2f52e02b67..b409840f159 100644
--- a/TAO/tao/RTCORBA.mpc
+++ b/TAO/tao/RTCORBA.mpc
@@ -28,6 +28,9 @@ project : taolib, core, pi {
     RTCORBA
   }
 
+  IDL_Files {
+  }
+
   Pkgconfig_Files {
     RTCORBA/TAO_RTCORBA.pc.in
   }
diff --git a/TAO/tao/RTCORBA/RTCORBAA.cpp b/TAO/tao/RTCORBA/RTCORBAA.cpp
index 8611ac7c104..024e8b87aac 100644
--- a/TAO/tao/RTCORBA/RTCORBAA.cpp
+++ b/TAO/tao/RTCORBA/RTCORBAA.cpp
@@ -26,21 +26,22 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "RTCORBA.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Enum_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
-#include "tao/Sequence_TypeCode_Static.h"
-#include "tao/String_TypeCode_Static.h"
-#include "tao/Struct_TypeCode_Static.h"
-#include "tao/TypeCode_Struct_Field.h"
-#include "tao/Recursive_Type_TypeCode.h"
+#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Enum_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Sequence_TypeCode_Static.h"
+#include "tao/AnyTypeCode/String_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Struct_TypeCode_Static.h"
+#include "tao/AnyTypeCode/TypeCode_Struct_Field.h"
+#include "tao/AnyTypeCode/Recursive_Type_TypeCode.h"
 #include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
-#include "tao/Any_Dual_Impl_T.h"
-#include "tao/Any_Basic_Impl_T.h"
+#include "tao/AnyTypeCode/Any.h"
+#include "tao/AnyTypeCode/Any_Impl_T.h"
+#include "tao/AnyTypeCode/Any_Dual_Impl_T.h"
+#include "tao/AnyTypeCode/Any_Basic_Impl_T.h"
+#include "tao/AnyTypeCode/IOP_IORA.h"
 
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/alias_typecode.cpp:50
@@ -53,7 +54,7 @@ static TAO::TypeCode::Alias<char const *,
     "IDL:omg.org/RTCORBA/NativePriority:1.0",
     "NativePriority",
     &CORBA::_tc_short);
-  
+
 namespace RTCORBA
 {
   ::CORBA::TypeCode_ptr const _tc_NativePriority =
@@ -73,7 +74,7 @@ static TAO::TypeCode::Alias<char const *,
     "IDL:omg.org/RTCORBA/Priority:1.0",
     "Priority",
     &CORBA::_tc_short);
-  
+
 namespace RTCORBA
 {
   ::CORBA::TypeCode_ptr const _tc_Priority =
@@ -93,7 +94,7 @@ static TAO::TypeCode::Alias<char const *,
     "IDL:omg.org/RTCORBA/NetworkPriority:1.0",
     "NetworkPriority",
     &CORBA::_tc_long);
-  
+
 namespace RTCORBA
 {
   ::CORBA::TypeCode_ptr const _tc_NetworkPriority =
@@ -113,7 +114,7 @@ static TAO::TypeCode::Alias<char const *,
     "IDL:omg.org/RTCORBA/ThreadpoolId:1.0",
     "ThreadpoolId",
     &CORBA::_tc_ulong);
-  
+
 namespace RTCORBA
 {
   ::CORBA::TypeCode_ptr const _tc_ThreadpoolId =
@@ -130,7 +131,7 @@ static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> co
     { "lane_priority", &RTCORBA::_tc_Priority },
     { "static_threads", &CORBA::_tc_ulong },
     { "dynamic_threads", &CORBA::_tc_ulong }
-    
+
   };
 static TAO::TypeCode::Struct<char const *,
                       CORBA::TypeCode_ptr const *,
@@ -142,7 +143,7 @@ static TAO::TypeCode::Struct<char const *,
     "ThreadpoolLane",
     _tao_fields_RTCORBA_ThreadpoolLane,
     3);
-  
+
 namespace RTCORBA
 {
   ::CORBA::TypeCode_ptr const _tc_ThreadpoolLane =
@@ -172,10 +173,10 @@ namespace TAO
         CORBA::tk_sequence,
         &RTCORBA::_tc_ThreadpoolLane,
         0U);
-      
+
     ::CORBA::TypeCode_ptr const tc_RTCORBA_ThreadpoolLanes_0 =
       &RTCORBA_ThreadpoolLanes_0;
-    
+
   }
 }
 
@@ -190,7 +191,7 @@ static TAO::TypeCode::Alias<char const *,
     "IDL:omg.org/RTCORBA/ThreadpoolLanes:1.0",
     "ThreadpoolLanes",
     &TAO::TypeCode::tc_RTCORBA_ThreadpoolLanes_0);
-  
+
 namespace RTCORBA
 {
   ::CORBA::TypeCode_ptr const _tc_ThreadpoolLanes =
@@ -206,7 +207,7 @@ static char const * const _tao_enumerators_RTCORBA_PriorityModel[] =
   {
     "CLIENT_PROPAGATED",
     "SERVER_DECLARED"
-    
+
   };
 
 static TAO::TypeCode::Enum<char const *,
@@ -217,7 +218,7 @@ static TAO::TypeCode::Enum<char const *,
     "PriorityModel",
     _tao_enumerators_RTCORBA_PriorityModel,
     2);
-  
+
 namespace RTCORBA
 {
   ::CORBA::TypeCode_ptr const _tc_PriorityModel =
@@ -235,7 +236,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:omg.org/RTCORBA/PriorityModelPolicy:1.0",
     "PriorityModelPolicy");
-  
+
 namespace RTCORBA
 {
   ::CORBA::TypeCode_ptr const _tc_PriorityModelPolicy =
@@ -253,7 +254,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:omg.org/RTCORBA/ThreadpoolPolicy:1.0",
     "ThreadpoolPolicy");
-  
+
 namespace RTCORBA
 {
   ::CORBA::TypeCode_ptr const _tc_ThreadpoolPolicy =
@@ -271,7 +272,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:omg.org/RTCORBA/ProtocolProperties:1.0",
     "ProtocolProperties");
-  
+
 namespace RTCORBA
 {
   ::CORBA::TypeCode_ptr const _tc_ProtocolProperties =
@@ -288,7 +289,7 @@ static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> co
     { "protocol_type", &IOP::_tc_ProfileId },
     { "orb_protocol_properties", &RTCORBA::_tc_ProtocolProperties },
     { "transport_protocol_properties", &RTCORBA::_tc_ProtocolProperties }
-    
+
   };
 static TAO::TypeCode::Struct<char const *,
                       CORBA::TypeCode_ptr const *,
@@ -300,7 +301,7 @@ static TAO::TypeCode::Struct<char const *,
     "Protocol",
     _tao_fields_RTCORBA_Protocol,
     3);
-  
+
 namespace RTCORBA
 {
   ::CORBA::TypeCode_ptr const _tc_Protocol =
@@ -330,10 +331,10 @@ namespace TAO
         CORBA::tk_sequence,
         &RTCORBA::_tc_Protocol,
         0U);
-      
+
     ::CORBA::TypeCode_ptr const tc_RTCORBA_ProtocolList_0 =
       &RTCORBA_ProtocolList_0;
-    
+
   }
 }
 
@@ -348,7 +349,7 @@ static TAO::TypeCode::Alias<char const *,
     "IDL:omg.org/RTCORBA/ProtocolList:1.0",
     "ProtocolList",
     &TAO::TypeCode::tc_RTCORBA_ProtocolList_0);
-  
+
 namespace RTCORBA
 {
   ::CORBA::TypeCode_ptr const _tc_ProtocolList =
@@ -366,7 +367,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:omg.org/RTCORBA/ServerProtocolPolicy:1.0",
     "ServerProtocolPolicy");
-  
+
 namespace RTCORBA
 {
   ::CORBA::TypeCode_ptr const _tc_ServerProtocolPolicy =
@@ -384,7 +385,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:omg.org/RTCORBA/ClientProtocolPolicy:1.0",
     "ClientProtocolPolicy");
-  
+
 namespace RTCORBA
 {
   ::CORBA::TypeCode_ptr const _tc_ClientProtocolPolicy =
@@ -402,7 +403,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:omg.org/RTCORBA/PrivateConnectionPolicy:1.0",
     "PrivateConnectionPolicy");
-  
+
 namespace RTCORBA
 {
   ::CORBA::TypeCode_ptr const _tc_PrivateConnectionPolicy =
@@ -420,7 +421,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:omg.org/RTCORBA/TCPProtocolProperties:1.0",
     "TCPProtocolProperties");
-  
+
 namespace RTCORBA
 {
   ::CORBA::TypeCode_ptr const _tc_TCPProtocolProperties =
@@ -438,7 +439,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:omg.org/RTCORBA/GIOPProtocolProperties:1.0",
     "GIOPProtocolProperties");
-  
+
 namespace RTCORBA
 {
   ::CORBA::TypeCode_ptr const _tc_GIOPProtocolProperties =
@@ -456,7 +457,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:omg.org/RTCORBA/UnixDomainProtocolProperties:1.0",
     "UnixDomainProtocolProperties");
-  
+
 namespace RTCORBA
 {
   ::CORBA::TypeCode_ptr const _tc_UnixDomainProtocolProperties =
@@ -474,7 +475,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:omg.org/RTCORBA/SharedMemoryProtocolProperties:1.0",
     "SharedMemoryProtocolProperties");
-  
+
 namespace RTCORBA
 {
   ::CORBA::TypeCode_ptr const _tc_SharedMemoryProtocolProperties =
@@ -492,7 +493,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:omg.org/RTCORBA/UserDatagramProtocolProperties:1.0",
     "UserDatagramProtocolProperties");
-  
+
 namespace RTCORBA
 {
   ::CORBA::TypeCode_ptr const _tc_UserDatagramProtocolProperties =
@@ -510,7 +511,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:omg.org/RTCORBA/StreamControlProtocolProperties:1.0",
     "StreamControlProtocolProperties");
-  
+
 namespace RTCORBA
 {
   ::CORBA::TypeCode_ptr const _tc_StreamControlProtocolProperties =
@@ -526,7 +527,7 @@ static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> co
   {
     { "low", &RTCORBA::_tc_Priority },
     { "high", &RTCORBA::_tc_Priority }
-    
+
   };
 static TAO::TypeCode::Struct<char const *,
                       CORBA::TypeCode_ptr const *,
@@ -538,7 +539,7 @@ static TAO::TypeCode::Struct<char const *,
     "PriorityBand",
     _tao_fields_RTCORBA_PriorityBand,
     2);
-  
+
 namespace RTCORBA
 {
   ::CORBA::TypeCode_ptr const _tc_PriorityBand =
@@ -568,10 +569,10 @@ namespace TAO
         CORBA::tk_sequence,
         &RTCORBA::_tc_PriorityBand,
         0U);
-      
+
     ::CORBA::TypeCode_ptr const tc_RTCORBA_PriorityBands_0 =
       &RTCORBA_PriorityBands_0;
-    
+
   }
 }
 
@@ -586,7 +587,7 @@ static TAO::TypeCode::Alias<char const *,
     "IDL:omg.org/RTCORBA/PriorityBands:1.0",
     "PriorityBands",
     &TAO::TypeCode::tc_RTCORBA_PriorityBands_0);
-  
+
 namespace RTCORBA
 {
   ::CORBA::TypeCode_ptr const _tc_PriorityBands =
@@ -604,7 +605,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:omg.org/RTCORBA/PriorityBandedConnectionPolicy:1.0",
     "PriorityBandedConnectionPolicy");
-  
+
 namespace RTCORBA
 {
   ::CORBA::TypeCode_ptr const _tc_PriorityBandedConnectionPolicy =
@@ -622,7 +623,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:omg.org/RTCORBA/Current:1.0",
     "Current");
-  
+
 namespace RTCORBA
 {
   ::CORBA::TypeCode_ptr const _tc_Current =
@@ -640,7 +641,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:omg.org/RTCORBA/Mutex:1.0",
     "Mutex");
-  
+
 namespace RTCORBA
 {
   ::CORBA::TypeCode_ptr const _tc_Mutex =
@@ -663,7 +664,7 @@ static TAO::TypeCode::Struct<char const *,
     "MutexNotFound",
     _tao_fields_RTCORBA_RTORB_MutexNotFound,
     0);
-  
+
 ::CORBA::TypeCode_ptr const RTCORBA::RTORB::_tc_MutexNotFound =
   &_tao_tc_RTCORBA_RTORB_MutexNotFound;
 
@@ -681,7 +682,7 @@ static TAO::TypeCode::Struct<char const *,
     "InvalidThreadpool",
     _tao_fields_RTCORBA_RTORB_InvalidThreadpool,
     0);
-  
+
 ::CORBA::TypeCode_ptr const RTCORBA::RTORB::_tc_InvalidThreadpool =
   &_tao_tc_RTCORBA_RTORB_InvalidThreadpool;
 
@@ -694,7 +695,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:omg.org/RTCORBA/RTORB:1.0",
     "RTORB");
-  
+
 namespace RTCORBA
 {
   ::CORBA::TypeCode_ptr const _tc_RTORB =
@@ -703,7 +704,7 @@ namespace RTCORBA
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -761,7 +762,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
 
@@ -844,7 +845,7 @@ CORBA::Boolean operator>>= (
     TAO::Any_Basic_Impl_T<RTCORBA::PriorityModel>::extract (
         _tao_any,
         RTCORBA::_tc_PriorityModel,
-        _tao_elem 
+        _tao_elem
       );
 }
 
@@ -872,7 +873,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Impl_T<RTCORBA::PriorityModelPolicy>::demarshal_value (TAO_InputCDR &)
@@ -947,7 +948,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Impl_T<RTCORBA::ThreadpoolPolicy>::demarshal_value (TAO_InputCDR &)
@@ -1022,7 +1023,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Impl_T<RTCORBA::ProtocolProperties>::demarshal_value (TAO_InputCDR &)
@@ -1073,7 +1074,7 @@ operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_structure/any_op_cs.cpp:54
 
 
@@ -1086,7 +1087,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Dual_Impl_T<RTCORBA::Protocol>::demarshal_value (TAO_InputCDR &)
@@ -1148,7 +1149,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
 namespace TAO
@@ -1159,7 +1160,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Dual_Impl_T<RTCORBA::ProtocolList>::demarshal_value (TAO_InputCDR &)
@@ -1247,7 +1248,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Impl_T<RTCORBA::ServerProtocolPolicy>::demarshal_value (TAO_InputCDR &)
@@ -1322,7 +1323,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Impl_T<RTCORBA::ClientProtocolPolicy>::demarshal_value (TAO_InputCDR &)
@@ -1397,7 +1398,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Impl_T<RTCORBA::PrivateConnectionPolicy>::demarshal_value (TAO_InputCDR &)
@@ -1472,7 +1473,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Impl_T<RTCORBA::TCPProtocolProperties>::demarshal_value (TAO_InputCDR &)
@@ -1547,7 +1548,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Impl_T<RTCORBA::GIOPProtocolProperties>::demarshal_value (TAO_InputCDR &)
@@ -1622,7 +1623,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Impl_T<RTCORBA::UnixDomainProtocolProperties>::demarshal_value (TAO_InputCDR &)
@@ -1697,7 +1698,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Impl_T<RTCORBA::SharedMemoryProtocolProperties>::demarshal_value (TAO_InputCDR &)
@@ -1772,7 +1773,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Impl_T<RTCORBA::UserDatagramProtocolProperties>::demarshal_value (TAO_InputCDR &)
@@ -1847,7 +1848,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Impl_T<RTCORBA::StreamControlProtocolProperties>::demarshal_value (TAO_InputCDR &)
@@ -1898,7 +1899,7 @@ operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_structure/any_op_cs.cpp:54
 
 // Copying insertion.
@@ -1956,7 +1957,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_sequence/any_op_cs.cpp:54
 
 
@@ -2039,7 +2040,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Impl_T<RTCORBA::PriorityBandedConnectionPolicy>::demarshal_value (TAO_InputCDR &)
@@ -2114,7 +2115,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Impl_T<RTCORBA::Current>::demarshal_value (TAO_InputCDR &)
@@ -2189,7 +2190,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Impl_T<RTCORBA::Mutex>::demarshal_value (TAO_InputCDR &)
@@ -2264,7 +2265,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Impl_T<RTCORBA::RTORB>::demarshal_value (TAO_InputCDR &)
@@ -2315,7 +2316,7 @@ operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_exception/any_op_cs.cpp:50
 
 namespace TAO
@@ -2326,7 +2327,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Dual_Impl_T<RTCORBA::RTORB::MutexNotFound>::demarshal_value (TAO_InputCDR &)
@@ -2390,7 +2391,7 @@ CORBA::Boolean operator>>= (
       );
 }
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_exception/any_op_cs.cpp:50
 
 namespace TAO
@@ -2401,7 +2402,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Dual_Impl_T<RTCORBA::RTORB::InvalidThreadpool>::demarshal_value (TAO_InputCDR &)
diff --git a/TAO/tao/RTCORBA/RTCORBA_includeA.h b/TAO/tao/RTCORBA/RTCORBA_includeA.h
new file mode 100644
index 00000000000..e0779b11bc4
--- /dev/null
+++ b/TAO/tao/RTCORBA/RTCORBA_includeA.h
@@ -0,0 +1,4 @@
+//$Id$
+/**
+* Just a place holder for files that include RTCORBA_include.pidl
+*/
diff --git a/TAO/tao/RTCORBA/RT_Policy_i.cpp b/TAO/tao/RTCORBA/RT_Policy_i.cpp
index abcc9239638..3cd3f89a885 100644
--- a/TAO/tao/RTCORBA/RT_Policy_i.cpp
+++ b/TAO/tao/RTCORBA/RT_Policy_i.cpp
@@ -8,6 +8,7 @@
 #include "tao/Policy_Manager.h"
 #include "tao/debug.h"
 #include "tao/CDR.h"
+#include "tao/AnyTypeCode/Any.h"
 
 #include "ace/OS_NS_string.h"
 
diff --git a/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.cpp b/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.cpp
index 8b580a178fe..fbde6dd0101 100644
--- a/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.cpp
+++ b/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.cpp
@@ -110,7 +110,7 @@ TAO_RT_Thread_Lane_Resources_Manager::lane_resources (void)
 
   // Get the lane for this thread.
   TAO_Thread_Lane *lane =
-    (TAO_Thread_Lane *) tss.lane_;
+    static_cast <TAO_Thread_Lane *> (tss.lane_);
 
   // If we have a valid lane, use that lane's resources.
   if (lane)
diff --git a/TAO/tao/RTPortableServer.mpc b/TAO/tao/RTPortableServer.mpc
index db280bc5b09..9f6206d879e 100644
--- a/TAO/tao/RTPortableServer.mpc
+++ b/TAO/tao/RTPortableServer.mpc
@@ -27,6 +27,9 @@ project : taolib, core, rtcorba, portableserver {
     RTPortableServer
   }
 
+  IDL_Files {
+  }
+
   Pkgconfig_Files {
     RTPortableServer/TAO_RTPortableServer.pc.in
   }
diff --git a/TAO/tao/RTPortableServer/RTPortableServerA.cpp b/TAO/tao/RTPortableServer/RTPortableServerA.cpp
index 268d914e6f7..7ebc2fb5586 100644
--- a/TAO/tao/RTPortableServer/RTPortableServerA.cpp
+++ b/TAO/tao/RTPortableServer/RTPortableServerA.cpp
@@ -26,14 +26,14 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "RTPortableServer.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
-#include "tao/String_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
+#include "tao/AnyTypeCode/String_TypeCode_Static.h"
 #include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
+#include "tao/AnyTypeCode/Any.h"
+#include "tao/AnyTypeCode/Any_Impl_T.h"
 
 // TAO_IDL - Generated from
 // be/be_visitor_typecode/objref_typecode.cpp:76
@@ -44,7 +44,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:omg.org/RTPortableServer/POA:1.0",
     "POA");
-  
+
 namespace RTPortableServer
 {
   ::CORBA::TypeCode_ptr const _tc_POA =
@@ -77,7 +77,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Impl_T<RTPortableServer::POA>::demarshal_value (TAO_InputCDR &)
diff --git a/TAO/tao/RTScheduler.mpc b/TAO/tao/RTScheduler.mpc
index cf7725ce8e0..d1f544763f0 100644
--- a/TAO/tao/RTScheduler.mpc
+++ b/TAO/tao/RTScheduler.mpc
@@ -27,6 +27,9 @@ project : taolib, rtcorba, pi, pi_server, portableserver, core, corba_messaging
     RTScheduling
   }
 
+  IDL_Files {
+  }
+
   Pkgconfig_Files {
     RTScheduling/TAO_RTScheduler.pc.in
   }
diff --git a/TAO/tao/RTScheduling/Current.cpp b/TAO/tao/RTScheduling/Current.cpp
index 139f52609f6..d8074e83f99 100644
--- a/TAO/tao/RTScheduling/Current.cpp
+++ b/TAO/tao/RTScheduling/Current.cpp
@@ -251,7 +251,7 @@ TAO_RTScheduler_Current_i*
 TAO_RTScheduler_Current::implementation (TAO_RTScheduler_Current_i* new_current)
 {
   TAO_TSS_Resources *tss =
-    TAO_TSS_RESOURCES::instance ();
+    TAO_TSS_Resources::instance ();
 
   TAO_RTScheduler_Current_i *old =
     static_cast<TAO_RTScheduler_Current_i *> (tss->rtscheduler_current_impl_);
@@ -264,7 +264,7 @@ TAO_RTScheduler_Current_i*
 TAO_RTScheduler_Current::implementation (void)
 {
   TAO_TSS_Resources *tss =
-    TAO_TSS_RESOURCES::instance ();
+    TAO_TSS_Resources::instance ();
 
   TAO_RTScheduler_Current_i* impl =
     static_cast<TAO_RTScheduler_Current_i *> (tss->rtscheduler_current_impl_);
@@ -407,9 +407,9 @@ TAO_RTScheduler_Current_i::begin_scheduling_segment(
       ACE_CHECK;
 
       TAO_TSS_Resources *tss =
-        TAO_TSS_RESOURCES::instance ();
+        TAO_TSS_Resources::instance ();
 
-      TAO_RTScheduler_Current_i* new_current;
+      TAO_RTScheduler_Current_i* new_current = 0;
         ACE_NEW_THROW_EX (new_current,
                           TAO_RTScheduler_Current_i (this->orb_,
                                                      this->dt_hash_,
@@ -640,7 +640,7 @@ DTTask::svc (void)
     {
 
       TAO_TSS_Resources *tss =
-        TAO_TSS_RESOURCES::instance ();
+        TAO_TSS_Resources::instance ();
 
       tss->rtscheduler_current_impl_ = this->current_;
 
@@ -765,7 +765,7 @@ void
 TAO_RTScheduler_Current_i::cleanup_current (void)
 {
   TAO_TSS_Resources *tss =
-    TAO_TSS_RESOURCES::instance ();
+    TAO_TSS_Resources::instance ();
 
   tss->rtscheduler_current_impl_ = this->previous_current_;
 
@@ -786,7 +786,7 @@ TAO_RTScheduler_Current_i::delete_all_currents (void)
     }
 
   TAO_TSS_Resources *tss =
-    TAO_TSS_RESOURCES::instance ();
+    TAO_TSS_Resources::instance ();
 
   tss->rtscheduler_current_impl_ = tss->rtscheduler_previous_current_impl_;
 }
diff --git a/TAO/tao/RTScheduling/RTSchedulerA.cpp b/TAO/tao/RTScheduling/RTSchedulerA.cpp
index 0f18cf7b3b9..a3cfd02e3c4 100644
--- a/TAO/tao/RTScheduling/RTSchedulerA.cpp
+++ b/TAO/tao/RTScheduling/RTSchedulerA.cpp
@@ -26,15 +26,15 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "RTScheduler.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Enum_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
-#include "tao/Sequence_TypeCode_Static.h"
-#include "tao/String_TypeCode_Static.h"
-#include "tao/Struct_TypeCode_Static.h"
-#include "tao/TypeCode_Struct_Field.h"
+#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Enum_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Sequence_TypeCode_Static.h"
+#include "tao/AnyTypeCode/String_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Struct_TypeCode_Static.h"
+#include "tao/AnyTypeCode/TypeCode_Struct_Field.h"
 
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/objref_typecode.cpp:76
@@ -45,7 +45,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:RTScheduling/ThreadAction:1.0",
     "ThreadAction");
-  
+
 namespace RTScheduling
 {
   ::CORBA::TypeCode_ptr const _tc_ThreadAction =
@@ -61,7 +61,7 @@ static char const * const _tao_enumerators_RTScheduling_DistributableThread_DT_S
   {
     "ACTIVE",
     "CANCELLED"
-    
+
   };
 
 static TAO::TypeCode::Enum<char const *,
@@ -72,7 +72,7 @@ static TAO::TypeCode::Enum<char const *,
     "DT_State",
     _tao_enumerators_RTScheduling_DistributableThread_DT_State,
     2);
-  
+
 ::CORBA::TypeCode_ptr const RTScheduling::DistributableThread::_tc_DT_State =
   &_tao_tc_RTScheduling_DistributableThread_DT_State;
 
@@ -85,7 +85,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:RTScheduling/DistributableThread:1.0",
     "DistributableThread");
-  
+
 namespace RTScheduling
 {
   ::CORBA::TypeCode_ptr const _tc_DistributableThread =
@@ -108,7 +108,7 @@ static TAO::TypeCode::Struct<char const *,
     "UNSUPPORTED_SCHEDULING_DISCIPLINE",
     _tao_fields_RTScheduling_Current_UNSUPPORTED_SCHEDULING_DISCIPLINE,
     0);
-  
+
 ::CORBA::TypeCode_ptr const RTScheduling::Current::_tc_UNSUPPORTED_SCHEDULING_DISCIPLINE =
   &_tao_tc_RTScheduling_Current_UNSUPPORTED_SCHEDULING_DISCIPLINE;
 
@@ -133,10 +133,10 @@ namespace TAO
         CORBA::tk_sequence,
         &CORBA::_tc_octet,
         0U);
-      
+
     ::CORBA::TypeCode_ptr const tc_RTScheduling_Current_IdType_0 =
       &RTScheduling_Current_IdType_0;
-    
+
   }
 }
 
@@ -151,7 +151,7 @@ static TAO::TypeCode::Alias<char const *,
     "IDL:RTScheduling/Current/IdType:1.0",
     "IdType",
     &TAO::TypeCode::tc_RTScheduling_Current_IdType_0);
-  
+
 ::CORBA::TypeCode_ptr const RTScheduling::Current::_tc_IdType =
   &_tao_tc_RTScheduling_Current_IdType;
 
@@ -176,10 +176,10 @@ namespace TAO
         CORBA::tk_sequence,
         &CORBA::_tc_string,
         0U);
-      
+
     ::CORBA::TypeCode_ptr const tc_RTScheduling_Current_NameList_0 =
       &RTScheduling_Current_NameList_0;
-    
+
   }
 }
 
@@ -194,7 +194,7 @@ static TAO::TypeCode::Alias<char const *,
     "IDL:RTScheduling/Current/NameList:1.0",
     "NameList",
     &TAO::TypeCode::tc_RTScheduling_Current_NameList_0);
-  
+
 ::CORBA::TypeCode_ptr const RTScheduling::Current::_tc_NameList =
   &_tao_tc_RTScheduling_Current_NameList;
 
@@ -207,7 +207,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:RTScheduling/Current:1.0",
     "Current");
-  
+
 namespace RTScheduling
 {
   ::CORBA::TypeCode_ptr const _tc_Current =
@@ -225,7 +225,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:RTScheduling/ResourceManager:1.0",
     "ResourceManager");
-  
+
 namespace RTScheduling
 {
   ::CORBA::TypeCode_ptr const _tc_ResourceManager =
@@ -248,7 +248,7 @@ static TAO::TypeCode::Struct<char const *,
     "INCOMPATIBLE_SCHEDULING_DISCIPLINES",
     _tao_fields_RTScheduling_Scheduler_INCOMPATIBLE_SCHEDULING_DISCIPLINES,
     0);
-  
+
 ::CORBA::TypeCode_ptr const RTScheduling::Scheduler::_tc_INCOMPATIBLE_SCHEDULING_DISCIPLINES =
   &_tao_tc_RTScheduling_Scheduler_INCOMPATIBLE_SCHEDULING_DISCIPLINES;
 
@@ -261,7 +261,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:RTScheduling/Scheduler:1.0",
     "Scheduler");
-  
+
 namespace RTScheduling
 {
   ::CORBA::TypeCode_ptr const _tc_Scheduler =
diff --git a/TAO/tao/RTScheduling/RTSchedulerC.cpp b/TAO/tao/RTScheduling/RTSchedulerC.cpp
index e21d1a8c523..464069748a1 100644
--- a/TAO/tao/RTScheduling/RTSchedulerC.cpp
+++ b/TAO/tao/RTScheduling/RTSchedulerC.cpp
@@ -45,20 +45,21 @@
 // Arg traits specializations.
 namespace TAO
 {
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_arg_traits.cpp:539
 
 #if !defined (_CORBA_POLICYLIST__ARG_TRAITS_CS_)
 #define _CORBA_POLICYLIST__ARG_TRAITS_CS_
-  
+
   template<>
   class Arg_Traits<CORBA::PolicyList>
     : public
         Var_Size_Arg_Traits_T<
             CORBA::PolicyList,
             CORBA::PolicyList_var,
-            CORBA::PolicyList_out
+            CORBA::PolicyList_out,
+            TAO::Any_Insert_Policy_Stream <CORBA::PolicyList>
           >
   {
   };
@@ -138,7 +139,7 @@ RTScheduling::ThreadAction::_duplicate (ThreadAction_ptr obj)
     {
       obj->_add_ref ();
     }
-  
+
   return obj;
 }
 
diff --git a/TAO/tao/RTScheduling/RTScheduler_includeA.h b/TAO/tao/RTScheduling/RTScheduler_includeA.h
new file mode 100644
index 00000000000..d5d3403e8ef
--- /dev/null
+++ b/TAO/tao/RTScheduling/RTScheduler_includeA.h
@@ -0,0 +1,96 @@
+// -*- C++ -*-
+//
+// $Id$
+
+// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+// TAO and the TAO IDL Compiler have been developed by:
+//       Center for Distributed Object Computing
+//       Washington University
+//       St. Louis, MO
+//       USA
+//       http://www.cs.wustl.edu/~schmidt/doc-center.html
+// and
+//       Distributed Object Computing Laboratory
+//       University of California at Irvine
+//       Irvine, CA
+//       USA
+//       http://doc.ece.uci.edu/
+// and
+//       Institute for Software Integrated Systems
+//       Vanderbilt University
+//       Nashville, TN
+//       USA
+//       http://www.isis.vanderbilt.edu/
+//
+// Information about TAO is available at:
+//     http://www.cs.wustl.edu/~schmidt/TAO.html
+
+// TAO_IDL - Generated from
+// C:\ACElatest\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:186
+
+#ifndef _TAO_IDL_RTSCHEDULER_INCLUDEA_H_
+#define _TAO_IDL_RTSCHEDULER_INCLUDEA_H_
+
+#include "tao/ORB.h"
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+#include "tao/CDR.h"
+#include "tao/Environment.h"
+
+#include "../RTScheduling/RTScheduler.h"
+
+#if defined (TAO_EXPORT_MACRO)
+#undef TAO_EXPORT_MACRO
+#endif
+#define TAO_EXPORT_MACRO
+
+#if defined (TAO_EXPORT_NESTED_CLASSES)
+#  if defined (TAO_EXPORT_NESTED_MACRO)
+#    undef TAO_EXPORT_NESTED_MACRO
+#  endif /* defined (TAO_EXPORT_NESTED_MACRO) */
+#  define TAO_EXPORT_NESTED_MACRO
+#endif /* TAO_EXPORT_NESTED_CLASSES */
+
+#if defined(_MSC_VER)
+#pragma warning(push)
+#pragma warning(disable:4250)
+#endif /* _MSC_VER */
+
+#if defined (__BORLANDC__)
+#pragma option push -w-rvl -w-rch -w-ccc -w-inl
+#endif /* __BORLANDC__ */
+
+// TAO_IDL - Generated from
+// C:\ACElatest\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_traits.cpp:58
+
+// Traits specializations.
+namespace TAO
+{
+}
+
+// TAO_IDL - Generated from
+// C:\ACElatest\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:48
+
+#ifndef __ACE_INLINE__
+
+// TAO_IDL - Generated from
+// C:\ACElatest\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_root/cdr_op.cpp:64
+
+#endif /* __ACE_INLINE__ */
+
+// TAO_IDL - Generated from
+// C:\ACElatest\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:1050
+
+#if defined(_MSC_VER)
+#pragma warning(pop)
+#endif /* _MSC_VER */
+
+#if defined (__BORLANDC__)
+#pragma option pop
+#endif /* __BORLANDC__ */
+
+#endif /* ifndef */
+
diff --git a/TAO/tao/RTScheduling/Request_Interceptor.cpp b/TAO/tao/RTScheduling/Request_Interceptor.cpp
index fcff3bf6ec9..2b5358489a6 100644
--- a/TAO/tao/RTScheduling/Request_Interceptor.cpp
+++ b/TAO/tao/RTScheduling/Request_Interceptor.cpp
@@ -5,8 +5,8 @@
 #include "Distributable_Thread.h"
 #include "tao/TSS_Resources.h"
 #include "tao/debug.h"
-#include "tao/Any.h"
-#include "tao/TypeCode.h"
+#include "tao/AnyTypeCode/Any.h"
+#include "tao/AnyTypeCode/TypeCode.h"
 #include "tao/ORB_Constants.h"
 #include "ace/OS_NS_string.h"
 
@@ -36,7 +36,7 @@ Client_Interceptor::send_request (PortableInterceptor::ClientRequestInfo_ptr ri
   TAO_RTScheduler_Current_i *new_current = 0;
   TAO_RTScheduler_Current_i *current = 0;
 
-  TAO_TSS_Resources *tss = TAO_TSS_RESOURCES::instance ();
+  TAO_TSS_Resources *tss = TAO_TSS_Resources::instance ();
 
   current = static_cast<TAO_RTScheduler_Current_i *> (tss->rtscheduler_current_impl_);
 
@@ -129,7 +129,7 @@ Client_Interceptor::send_poll (PortableInterceptor::ClientRequestInfo_ptr ri
 
     TAO_RTScheduler_Current_i *current = 0;
 
-    TAO_TSS_Resources *tss = TAO_TSS_RESOURCES::instance ();
+    TAO_TSS_Resources *tss = TAO_TSS_Resources::instance ();
 
     current = static_cast<TAO_RTScheduler_Current_i *> (tss->rtscheduler_current_impl_);
     if (current != 0)
@@ -148,7 +148,7 @@ Client_Interceptor::receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri
 
   TAO_RTScheduler_Current_i *current = 0;
 
-  TAO_TSS_Resources *tss = TAO_TSS_RESOURCES::instance ();
+  TAO_TSS_Resources *tss = TAO_TSS_Resources::instance ();
 
   current = static_cast<TAO_RTScheduler_Current_i *> (tss->rtscheduler_current_impl_);
   if (current != 0)
@@ -168,7 +168,7 @@ Client_Interceptor::receive_exception (PortableInterceptor::ClientRequestInfo_pt
 
   TAO_RTScheduler_Current_i *current = 0;
 
-  TAO_TSS_Resources *tss = TAO_TSS_RESOURCES::instance ();
+  TAO_TSS_Resources *tss = TAO_TSS_Resources::instance ();
 
   current = static_cast<TAO_RTScheduler_Current_i *> (tss->rtscheduler_current_impl_);
 
@@ -232,7 +232,7 @@ Client_Interceptor::receive_other (PortableInterceptor::ClientRequestInfo_ptr ri
 
   TAO_RTScheduler_Current_i *current = 0;
 
-  TAO_TSS_Resources *tss = TAO_TSS_RESOURCES::instance ();
+  TAO_TSS_Resources *tss = TAO_TSS_Resources::instance ();
 
   current = static_cast<TAO_RTScheduler_Current_i *> (tss->rtscheduler_current_impl_);
   if (current != 0)
@@ -376,7 +376,7 @@ Server_Interceptor::receive_request (PortableInterceptor::ServerRequestInfo_ptr
   // Install new current in the ORB and store the previous current
   // implementation
   // current->implementation (new_current)
-  TAO_TSS_Resources *tss = TAO_TSS_RESOURCES::instance ();
+  TAO_TSS_Resources *tss = TAO_TSS_Resources::instance ();
 
   tss->rtscheduler_previous_current_impl_ = this->current_->implementation (new_current);
 }
@@ -393,7 +393,7 @@ Server_Interceptor::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri
   TAO_RTScheduler_Current_i *current = 0;
   TAO_RTScheduler_Current_i *prev_current = 0;
 
-  TAO_TSS_Resources *tss = TAO_TSS_RESOURCES::instance ();
+  TAO_TSS_Resources *tss = TAO_TSS_Resources::instance ();
 
   current = static_cast<TAO_RTScheduler_Current_i *> (tss->rtscheduler_current_impl_);
   if (current != 0)
@@ -444,7 +444,7 @@ Server_Interceptor::send_exception (PortableInterceptor::ServerRequestInfo_ptr r
 
   TAO_RTScheduler_Current_i *current = 0;
 
-  TAO_TSS_Resources *tss = TAO_TSS_RESOURCES::instance ();
+  TAO_TSS_Resources *tss = TAO_TSS_Resources::instance ();
 
   current = static_cast<TAO_RTScheduler_Current_i *> (tss->rtscheduler_current_impl_);
   if (current != 0)
@@ -469,7 +469,7 @@ Server_Interceptor::send_other (PortableInterceptor::ServerRequestInfo_ptr ri
 
   TAO_RTScheduler_Current_i *current = 0;
 
-  TAO_TSS_Resources *tss = TAO_TSS_RESOURCES::instance ();
+  TAO_TSS_Resources *tss = TAO_TSS_Resources::instance ();
 
   current = static_cast<TAO_RTScheduler_Current_i *> (tss->rtscheduler_current_impl_);
   if (current != 0)
diff --git a/TAO/tao/Reactive_Flushing_Strategy.h b/TAO/tao/Reactive_Flushing_Strategy.h
index 66b78566556..27041a0be5a 100644
--- a/TAO/tao/Reactive_Flushing_Strategy.h
+++ b/TAO/tao/Reactive_Flushing_Strategy.h
@@ -26,7 +26,7 @@
  *
  * @brief Implement a flushing strategy that uses the reactor.
  */
-class TAO_Export TAO_Reactive_Flushing_Strategy : public TAO_Flushing_Strategy
+class TAO_Reactive_Flushing_Strategy : public TAO_Flushing_Strategy
 {
 public:
   virtual int schedule_output (TAO_Transport *transport);
diff --git a/TAO/tao/Recursive_Type_TypeCode.cpp b/TAO/tao/Recursive_Type_TypeCode.cpp
deleted file mode 100644
index abe5b4df051..00000000000
--- a/TAO/tao/Recursive_Type_TypeCode.cpp
+++ /dev/null
@@ -1,140 +0,0 @@
-// $Id$
-
-#include "tao/Recursive_Type_TypeCode.h"
-
-#ifndef __ACE_INLINE__
-# include "tao/Recursive_Type_TypeCode.inl"
-#endif  /* __ACE_INLINE__ */
-
-#include "tao/CDR.h"
-
-
-template <class TypeCodeBase, typename TypeCodeType, typename MemberArrayType>
-bool
-TAO::TypeCode::Recursive_Type<TypeCodeBase,
-                              TypeCodeType,
-                              MemberArrayType>::tao_marshal (
-  TAO_OutputCDR & cdr,
-  CORBA::ULong offset) const
-{
-  ACE_GUARD_RETURN (TAO_SYNCH_RECURSIVE_MUTEX,
-                    guard,
-                    this->lock_,
-                    false);
-
-  // Top-level TypeCode case.
-  if (!(this->in_recursion_))
-    {
-      this->in_recursion_ = true;
-
-      // Starting offset should point to the CORBA::TCKind value.
-
-      // Note that this doesn't need to take into account alignment
-      // padding since CORBA::TCKind (encoded as a CORBA::ULong) is
-      // already aligned on the appropriate boundary, and since the
-      // CORBA::TCKind was the last thing marshaled into the CDR
-      // stream before getting here.
-      offset = sizeof (CORBA::ULong);
-
-      // Reset recursion flag to false in an exception-safe manner once
-      // marshaling is done.
-      //
-      // Only reset the recursion flag at the top-level.
-      Reset flag (this->in_recursion_);
-
-      return this->TypeCodeBase::tao_marshal (cdr, offset);
-    }
-
-  // Recursive/indirected TypeCode case.
-
-//   ACE_ASSERT (offset > 4
-//               && offset < static_cast<CORBA::ULong> (ACE_INT32_MAX));
-
-  return (cdr << -static_cast<CORBA::Long> (offset));
-}
-
-template <class TypeCodeBase, typename TypeCodeType, typename MemberArrayType>
-CORBA::Boolean
-TAO::TypeCode::Recursive_Type<TypeCodeBase,
-                              TypeCodeType,
-                              MemberArrayType>::equal_i (
-  CORBA::TypeCode_ptr tc
-  ACE_ENV_ARG_DECL) const
-{
-  ACE_GUARD_RETURN (TAO_SYNCH_RECURSIVE_MUTEX,
-                    guard,
-                    this->lock_,
-                    false);
-
-  // Top-level TypeCode case.
-  if (!(this->in_recursion_))
-    {
-      this->in_recursion_ = true;
-
-      // Reset recursion flag to false in an exception-safe manner once
-      // equality determination is done.
-      //
-      // Only reset the recursion flag at the top-level.
-      Reset flag (this->in_recursion_);
-
-      return this->TypeCodeBase::equal_i (tc
-                                          ACE_ENV_ARG_PARAMETER);
-    }
-
-  // Nothing else to do.
-  return true;
-}
-
-template <class TypeCodeBase, typename TypeCodeType, typename MemberArrayType>
-CORBA::Boolean
-TAO::TypeCode::Recursive_Type<TypeCodeBase,
-                              TypeCodeType,
-                              MemberArrayType>::equivalent_i (
-  CORBA::TypeCode_ptr tc
-  ACE_ENV_ARG_DECL) const
-{
-  ACE_GUARD_RETURN (TAO_SYNCH_RECURSIVE_MUTEX,
-                    guard,
-                    this->lock_,
-                    false);
-
-  // Top-level TypeCode case.
-  if (!(this->in_recursion_))
-    {
-      this->in_recursion_ = true;
-
-      // Reset recursion flag to false in an exception-safe manner once
-      // equivalence determination is done.
-      //
-      // Only reset the recursion flag at the top-level.
-      Reset flag (this->in_recursion_);
-
-      return this->TypeCodeBase::equivalent_i (tc
-                                               ACE_ENV_ARG_PARAMETER);
-    }
-
-  // Nothing else to do.
-  return true;
-}
-
-template <class TypeCodeBase, typename TypeCodeType, typename MemberArrayType>
-bool
-TAO::TypeCode::Recursive_Type<TypeCodeBase,
-                              TypeCodeType,
-                              MemberArrayType>::tao_marshal_kind (
-  TAO_OutputCDR & cdr) const
-{
-  ACE_GUARD_RETURN (TAO_SYNCH_RECURSIVE_MUTEX,
-                    guard,
-                    this->lock_,
-                    false);
-
-  // Top-level TypeCode case.
-  if (!(this->in_recursion_))
-    return this->ACE_NESTED_CLASS (CORBA, TypeCode)::tao_marshal_kind (cdr);
-
-  // Recursive/indirected TypeCode case.
-  CORBA::ULong const indirection_kind = 0xffffffff;
-
-  return (cdr << indirection_kind);
-}
diff --git a/TAO/tao/Recursive_Type_TypeCode.h b/TAO/tao/Recursive_Type_TypeCode.h
deleted file mode 100644
index 742a51c87a0..00000000000
--- a/TAO/tao/Recursive_Type_TypeCode.h
+++ /dev/null
@@ -1,214 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Recursive_Type_TypeCode.h
- *
- *  $Id$
- *
- *  Header file for a recursive type (@c struct, @c union or
- *  @c valuetype) CORBA::TypeCode.
- *
- *  @author Ossama Othman
- */
-//=============================================================================
-
-#ifndef TAO_RECURSIVE_TYPE_TYPECODE_H
-#define TAO_RECURSIVE_TYPE_TYPECODE_H
-
-#include /**/ "ace/pre.h"
-
-#include "ace/Recursive_Thread_Mutex.h"
-
-namespace TAO
-{
-  namespace TypeCode
-  {
-
-    /**
-     * @class Recursive_Type
-     *
-     * @brief Recursive type @c TypeCode decorator template.
-     *
-     * This class template decorates the underlying @c TypeCode
-     * implementation @a TypeCodeBase to provide support for IDL
-     * defined recursive types.  Only IDL an @c struct, @c union or
-     * @c valuetype may be recursive, which is why this decorator only
-     * supports constructors for the corresponding @c TypeCode
-     * implementations.
-     */
-    template <class TypeCodeBase,
-              typename TypeCodeType,
-              typename MemberArrayType>
-    class Recursive_Type
-      : public TypeCodeBase
-    {
-    public:
-
-      /// Recursive @c struct constructor.
-      Recursive_Type (CORBA::TCKind kind,
-                      char const * id,
-                      char const * name,
-                      MemberArrayType const & fields,
-                      CORBA::ULong nfields);
-
-      /// Recursive @c union constructor.
-      Recursive_Type (char const * id,
-                      char const * name,
-#if defined (__BORLANDC__) && (__BORLANDC__ < 0x572)
-                      // Borland C++ currently can't handle a
-                      // reference to const pointer to const
-                      // CORBA::TypeCode_ptr.
-                      TypeCodeType discriminant_type,
-#else
-                      TypeCodeType const & discriminant_type,
-#endif
-                      MemberArrayType const & cases,
-                      CORBA::ULong ncases,
-                      CORBA::Long default_index);
-
-      /// Recursive @c valuetype constructor.
-      Recursive_Type (CORBA::TCKind kind,
-                      char const * id,
-                      char const * name,
-                      CORBA::ValueModifier modifier,
-#if defined (__BORLANDC__) && (__BORLANDC__ < 0x572)
-                      // Borland C++ currently can't handle a
-                      // reference to const pointer to const
-                      // CORBA::TypeCode_ptr.
-                      TypeCodeType concrete_base,
-#else
-                      TypeCodeType const & concrete_base,
-#endif
-                      MemberArrayType const & fields,
-                      CORBA::ULong nfields);
-
-      /// Dynamic @c Recursive_Type TypeCode constructor.
-      Recursive_Type (CORBA::TCKind kind,
-                      char const * id);
-
-      /**
-       * @name TAO-specific @c CORBA::TypeCode Methods
-       *
-       * Methods required by TAO's implementation of the
-       * @c CORBA::TypeCode class.
-       *
-       * @par
-       *
-       * These are recursive type @c TypeCode marshaling operation
-       * overrides.
-       *
-       * @see @c CORBA::TypeCode
-       */
-      //@{
-      virtual bool tao_marshal_kind (TAO_OutputCDR & cdr) const;
-      virtual bool tao_marshal (TAO_OutputCDR & cdr,
-                                CORBA::ULong offset) const;
-      //@}
-
-    protected:
-
-      /**
-       * @name TAO @c CORBA::TypeCode Template Methods
-       *
-       * Recursive type @c CORBA::TypeCode -specific
-       * template methods.
-       *
-       * @see @c CORBA::TypeCode
-       */
-      //@{
-      virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc
-                                      ACE_ENV_ARG_DECL) const;
-      virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc
-                                           ACE_ENV_ARG_DECL) const;
-      //@}
-
-
-    public:
-
-      /// Set @c struct @c TypeCode parameters.
-      void struct_parameters (char const * name,
-                              MemberArrayType const & fields,
-                              CORBA::ULong nfields);
-
-      /// Set @c union @c TypeCode parameters.
-      void union_parameters (
-                             char const * name,
-#if defined (__BORLANDC__) && (__BORLANDC__ < 0x572)
-                             // Borland C++ currently can't handle a
-                             // reference to const pointer to const
-                             // CORBA::TypeCode_ptr.
-                             TypeCodeType discriminant_type,
-#else
-                             TypeCodeType const & discriminant_type,
-#endif
-                             MemberArrayType const & cases,
-                             CORBA::ULong ncases,
-                             CORBA::Long default_index);
-
-      /// Set @c valuetype or @c eventtype @c TypeCode parameters.
-      void valuetype_parameters (char const * name,
-                                 CORBA::ValueModifier modifier,
-#if defined (__BORLANDC__) && (__BORLANDC__ < 0x572)
-                                 // Borland C++ currently can't handle a
-                                 // reference to const pointer to const
-                                 // CORBA::TypeCode_ptr.
-                                 TypeCodeType concrete_base,
-#else
-                                 TypeCodeType const & concrete_base,
-#endif
-                                 MemberArrayType const & fields,
-                                 CORBA::ULong nfields);
-
-    private:
-
-      /**
-       * @class Reset
-       *
-       * @brief Reset flag to false in an exception-safe manner.
-       *
-       * Reset flag to false in an exception-safe manner.
-       */
-      class Reset
-      {
-      public:
-        Reset (bool & flag) : flag_ (flag) { }
-        ~Reset (void) { this->flag_ = false; }
-      private:
-        bool & flag_;
-      };
-
-    private:
-
-      /// Internal state thread synchronization mutex.
-      mutable TAO_SYNCH_RECURSIVE_MUTEX lock_;
-
-      /// @c true if equality or equivalence is being determined
-      /// recursively.
-      /**
-       * This flag is used to prevent @c TypeCode equality and
-       * equivalence operations from recursing indefinitely.
-       */
-      mutable bool in_recursion_;
-
-    };
-
-  }  // End namespace TypeCode
-}  // End namespace TAO
-
-
-#ifdef __ACE_INLINE__
-# include "tao/Recursive_Type_TypeCode.inl"
-#endif  /* __ACE_INLINE__ */
-
-#ifdef ACE_TEMPLATES_REQUIRE_SOURCE
-# include "tao/Recursive_Type_TypeCode.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#ifdef ACE_TEMPLATES_REQUIRE_PRAGMA
-# pragma implementation ("Recursive_Type_TypeCode.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-#include /**/ "ace/post.h"
-
-#endif  /* TAO_RECURSIVE_TYPE_TYPECODE_H */
diff --git a/TAO/tao/Recursive_Type_TypeCode.inl b/TAO/tao/Recursive_Type_TypeCode.inl
deleted file mode 100644
index 7f7a5ea6fe8..00000000000
--- a/TAO/tao/Recursive_Type_TypeCode.inl
+++ /dev/null
@@ -1,149 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-template <class TypeCodeBase, typename TypeCodeType, typename MemberArrayType>
-ACE_INLINE
-TAO::TypeCode::Recursive_Type<TypeCodeBase,
-                              TypeCodeType,
-                              MemberArrayType>::Recursive_Type (
-  CORBA::TCKind kind,
-  char const * id,
-  char const * name,
-  MemberArrayType const & fields,
-  CORBA::ULong nfields)
-  : TypeCodeBase (kind, id, name, fields, nfields)
-  , lock_ ()
-  , in_recursion_ (false)
-{
-  // ACE_ASSERT (kind != CORBA::tk_except);
-}
-
-template <class TypeCodeBase, typename TypeCodeType, typename MemberArrayType>
-ACE_INLINE
-TAO::TypeCode::Recursive_Type<TypeCodeBase,
-                              TypeCodeType,
-                              MemberArrayType>::Recursive_Type (
-  char const * id,
-  char const * name,
-#if defined (__BORLANDC__) && (__BORLANDC__ < 0x572)
-  TypeCodeType discriminant_type,
-#else
-  TypeCodeType const & discriminant_type,
-#endif
-  MemberArrayType const & cases,
-  CORBA::ULong ncases,
-  CORBA::Long default_index)
-  : TypeCodeBase (id,
-                  name,
-                  discriminant_type,
-                  cases,
-                  ncases,
-                  default_index)
-  , lock_ ()
-  , in_recursion_ (false)
-{
-}
-
-template <class TypeCodeBase, typename TypeCodeType, typename MemberArrayType>
-ACE_INLINE
-TAO::TypeCode::Recursive_Type<TypeCodeBase,
-                              TypeCodeType,
-                              MemberArrayType>::Recursive_Type (
-  CORBA::TCKind kind,
-  char const * id,
-  char const * name,
-  CORBA::ValueModifier modifier,
-#if defined (__BORLANDC__) && (__BORLANDC__ < 0x572)
-  TypeCodeType concrete_base,
-#else
-  TypeCodeType const & concrete_base,
-#endif
-  MemberArrayType const & fields,
-  CORBA::ULong nfields)
-  : TypeCodeBase (kind,
-                  id,
-                  name,
-                  modifier,
-                  concrete_base,
-                  fields,
-                  nfields)
-  , lock_ ()
-  , in_recursion_ (false)
-{
-}
-
-template <class TypeCodeBase, typename TypeCodeType, typename MemberArrayType>
-ACE_INLINE
-TAO::TypeCode::Recursive_Type<TypeCodeBase,
-                              TypeCodeType,
-                              MemberArrayType>::Recursive_Type (
-  CORBA::TCKind kind,
-  char const * id)
-  : TypeCodeBase (kind, id)
-  , lock_ ()
-  , in_recursion_ (false)
-{
-//   ACE_ASSERT (kind == CORBA::tk_struct
-//               || kind == CORBA::tk_union
-//               || kind == CORBA::tk_value
-//               || kind == CORBA::tk_event);
-}
-
-template <class TypeCodeBase, typename TypeCodeType, typename MemberArrayType>
-ACE_INLINE void
-TAO::TypeCode::Recursive_Type<TypeCodeBase,
-                              TypeCodeType,
-                              MemberArrayType>::struct_parameters (
-  char const * name,
-  MemberArrayType const & fields,
-  CORBA::ULong nfields)
-{
-  this->base_attributes_.name (name);
-  this->fields_  = fields;
-  this->nfields_ = nfields;
-}
-
-template <class TypeCodeBase, typename TypeCodeType, typename MemberArrayType>
-ACE_INLINE void
-TAO::TypeCode::Recursive_Type<TypeCodeBase,
-                              TypeCodeType,
-                              MemberArrayType>::union_parameters (
-  char const * name,
-#if defined (__BORLANDC__) && (__BORLANDC__ < 0x572)
-  TypeCodeType discriminant_type,
-#else
-  TypeCodeType const & discriminant_type,
-#endif
-  MemberArrayType const & cases,
-  CORBA::ULong ncases,
-  CORBA::Long default_index)
-{
-  this->base_attributes_.name (name);
-  this->discriminant_type_ = discriminant_type;
-  this->cases_             = cases;
-  this->ncases_            = ncases;
-  this->default_index_     = default_index;
-}
-
-template <class TypeCodeBase, typename TypeCodeType, typename MemberArrayType>
-ACE_INLINE void
-TAO::TypeCode::Recursive_Type<TypeCodeBase,
-                              TypeCodeType,
-                              MemberArrayType>::valuetype_parameters (
-  char const * name,
-  CORBA::ValueModifier modifier,
-#if defined (__BORLANDC__) && (__BORLANDC__ < 0x572)
-  TypeCodeType concrete_base,
-#else
-  TypeCodeType const & concrete_base,
-#endif
-  MemberArrayType const & fields,
-  CORBA::ULong nfields)
-{
-  this->base_attributes_.name (name);
-  this->type_modifier_ = modifier;
-  this->concrete_base_ = concrete_base;
-  this->fields_        = fields;
-  this->nfields_       = nfields;
-}
diff --git a/TAO/tao/RefCount_Policy_Traits.h b/TAO/tao/RefCount_Policy_Traits.h
deleted file mode 100644
index 6f4ea6a2e00..00000000000
--- a/TAO/tao/RefCount_Policy_Traits.h
+++ /dev/null
@@ -1,107 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    RefCount_Policy_Traits.h
- *
- *  $Id$
- *
- *  Header file for TAO's reference count policy (unrelated to CORBA
- *  policies) traits.
- *
- *  @author Ossama Othman <ossama@dre.vanderbilt.edu>
- */
-//=============================================================================
-
-#ifndef TAO_REFCOUNT_POLICY_TRAITS_H
-#define TAO_REFCOUNT_POLICY_TRAITS_H
-
-#include /**/ "ace/pre.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/CORBA_methods.h"
-
-
-namespace TAO
-{
-  class Null_RefCount_Policy;
-  class True_RefCount_Policy;
-
-#if !defined (_MSC_VER) || (_MSC_VER >= 1310)
-  /**
-   * @struct RefCount_Policy_Traits
-   *
-   * @brief Compile-time selection of RefCount_Policy operations,
-   *        etc.
-   *
-   * This primary template is used to select RefCount_Policy
-   * operations, etc at compile-time based on the reference counting
-   * policy and type being operated on.
-   *
-   * @note This merely a forward declaration since we really only care
-   *       about the partial specializations below.
-   */
-  template<class RefCountPolicy, typename TypePtr>
-  struct RefCount_Policy_Traits;
-
-  /**
-   * @struct RefCount_Policy_Traits
-   *
-   * @brief No-op reference count policy traits.
-   *
-   * This partial specialization performs no-op reference counting
-   * operations on values of type @a TypePtr if the @a RefCountPolicy
-   * first argument is @c Null_RefCount_Policy.
-   */
-  template<typename TypePtr>
-  struct RefCount_Policy_Traits<Null_RefCount_Policy, TypePtr>
-  {
-    /// No-op "release" operation.
-    static void release (TypePtr) { }
-  };
-
-  template<typename TypePtr>
-  struct RefCount_Policy_Traits<True_RefCount_Policy, TypePtr>
-  {
-    /// Call actual "release" operation on @a ptr value.
-    static void release (TypePtr ptr)
-    {
-      CORBA::release (ptr);
-    }
-  };
-
-#else
-
-  // MSVC++ 6 can't handle partial template specializations so fall
-  // back on an alternate implementation.
-
-  template<class RefCountPolicy> struct RefCount_Policy_Traits;
-
-  template<>
-  struct RefCount_Policy_Traits<Null_RefCount_Policy>
-  {
-    static bool is_refcounted (void)
-    {
-      return false;
-    }
-  };
-
-  template<>
-  struct RefCount_Policy_Traits<True_RefCount_Policy>
-  {
-    static bool is_refcounted (void)
-    {
-      return true;
-    }
-  };
-
-#endif  /* !_MSC_VER || _MSC_VER >= 1310 */
-
-}  // End namespace TAO
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_REFCOUNT_POLICY_TRAITS_H */
diff --git a/TAO/tao/Refcounted_ObjectKey.h b/TAO/tao/Refcounted_ObjectKey.h
index a001a56f4b5..297ec6fd654 100644
--- a/TAO/tao/Refcounted_ObjectKey.h
+++ b/TAO/tao/Refcounted_ObjectKey.h
@@ -15,12 +15,14 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/Object_KeyC.h"
+#include "tao/TAO_Export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/Object_KeyC.h"
+
 namespace TAO
 {
   /**
@@ -29,8 +31,8 @@ namespace TAO
    * @brief A wrapper class that ties together a refcount to an
    * ObjectKey.
    *
-   * The refounts in this class is manipulated within the context of
-   * the lock in the TAO::ObjectKey_Table. Manipulating the refcounts
+   * The refcount in this class is manipulated within the context of
+   * the lock in the TAO::ObjectKey_Table. Manipulating the refcount
    * from anywhere else is strictly forbidden.
    */
   class TAO_Export Refcounted_ObjectKey
diff --git a/TAO/tao/Remote_Object_Proxy_Broker.cpp b/TAO/tao/Remote_Object_Proxy_Broker.cpp
index d90e709d899..3ec43f69ed7 100644
--- a/TAO/tao/Remote_Object_Proxy_Broker.cpp
+++ b/TAO/tao/Remote_Object_Proxy_Broker.cpp
@@ -1,4 +1,5 @@
 #include "Remote_Object_Proxy_Broker.h"
+#include "CORBA_String.h"
 #include "UB_String_Arguments.h"
 #include "Special_Basic_Arguments.h"
 #include "Invocation_Adapter.h"
diff --git a/TAO/tao/Sequence_TypeCode.cpp b/TAO/tao/Sequence_TypeCode.cpp
deleted file mode 100644
index dcf7b3d72ca..00000000000
--- a/TAO/tao/Sequence_TypeCode.cpp
+++ /dev/null
@@ -1,148 +0,0 @@
-// $Id$
-
-#ifndef TAO_SEQUENCE_TYPECODE_CPP
-#define TAO_SEQUENCE_TYPECODE_CPP
-
-#include "tao/Sequence_TypeCode.h"
-#include "tao/CDR.h"
-#include "tao/TypeCode_Traits.h"
-
-#ifndef __ACE_INLINE__
-# include "tao/Sequence_TypeCode.inl"
-#endif  /* !__ACE_INLINE__ */
-
-
-template <typename TypeCodeType, class RefCountPolicy>
-bool
-TAO::TypeCode::Sequence<TypeCodeType, RefCountPolicy>::tao_marshal (
-  TAO_OutputCDR & cdr,
-  CORBA::ULong offset) const
-{
-  // A tk_array or tk_sequence TypeCode has a "complex" parameter list
-  // type (see Table 15-2 in Section 15.3.5.1 "TypeCode" in the CDR
-  // section of the CORBA specification), meaning that it must be
-  // marshaled into a CDR encapsulation.
-
-  // Create a CDR encapsulation.
-  TAO_OutputCDR enc;
-
-  // Account for the encoded CDR encapsulation length and byte order.
-  //
-  // Aligning on an octet since the next value after the CDR
-  // encapsulation length will always be the byte order octet/boolean
-  // in this case.
-  offset = ACE_align_binary (offset + 4,
-                             ACE_CDR::OCTET_ALIGN);
-
-  return
-    enc << TAO_OutputCDR::from_boolean (TAO_ENCAP_BYTE_ORDER)
-    && marshal (enc,
-                Traits<TypeCodeType>::get_typecode (this->content_type_),
-                offset + enc.total_length ())
-    && enc << this->length_
-    && cdr << static_cast<CORBA::ULong> (enc.total_length ())
-    && cdr.write_octet_array_mb (enc.begin ());
-}
-
-template <typename TypeCodeType, class RefCountPolicy>
-void
-TAO::TypeCode::Sequence<TypeCodeType, RefCountPolicy>::tao_duplicate (void)
-{
-  this->RefCountPolicy::add_ref ();
-}
-
-template <typename TypeCodeType, class RefCountPolicy>
-void
-TAO::TypeCode::Sequence<TypeCodeType, RefCountPolicy>::tao_release (void)
-{
-  this->RefCountPolicy::remove_ref ();
-}
-
-template <typename TypeCodeType, class RefCountPolicy>
-CORBA::Boolean
-TAO::TypeCode::Sequence<TypeCodeType,
-                        RefCountPolicy>::equal_i (CORBA::TypeCode_ptr tc
-                                                  ACE_ENV_ARG_DECL) const
-{
-  // The following calls won't throw since CORBA::TypeCode::equal()
-  // has already established the kind of tc is the same as our kind.
-  CORBA::ULong const tc_length = tc->length (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (this->length_ != tc_length)
-    return 0;
-
-  CORBA::TypeCode_var rhs_content_type =
-    tc->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  return
-    Traits<TypeCodeType>::get_typecode (this->content_type_)->equal (
-      rhs_content_type.in ()
-      ACE_ENV_ARG_PARAMETER);
-}
-
-template <typename TypeCodeType, class RefCountPolicy>
-CORBA::Boolean
-TAO::TypeCode::Sequence<TypeCodeType,
-                        RefCountPolicy>::equivalent_i (CORBA::TypeCode_ptr tc
-                                                       ACE_ENV_ARG_DECL) const
-{
-  // The following calls won't throw since CORBA::TypeCode::equal()
-  // has already established the kind of tc is the same as our kind.
-  CORBA::ULong const tc_length = tc->length (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (this->length_ != tc_length)
-    return 0;
-
-  CORBA::TypeCode_var rhs_content_type =
-    tc->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  return
-    Traits<TypeCodeType>::get_typecode (this->content_type_)->equivalent (
-      rhs_content_type.in ()
-      ACE_ENV_ARG_PARAMETER);
-}
-
-template <typename TypeCodeType, class RefCountPolicy>
-CORBA::TypeCode_ptr
-TAO::TypeCode::Sequence<TypeCodeType, RefCountPolicy>::get_compact_typecode_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  // Already compact since tk_sequence and tk_array TypeCodes have no
-  // name or member names, meaning that we can simply call
-  // _duplicate() on this TypeCode.
-
-  // @@ There is a potential problem here if this TypeCode is a static
-  //    and const since it may have been placed in read-only memory by
-  //    the compiler.  A const_cast<> can return undefined results in
-  //    that case.
-
-  CORBA::TypeCode_ptr mutable_tc =
-    const_cast<TAO::TypeCode::Sequence<TypeCodeType, RefCountPolicy> *> (this);
-
-  return CORBA::TypeCode::_duplicate (mutable_tc);
-}
-
-template <typename TypeCodeType, class RefCountPolicy>
-CORBA::ULong
-TAO::TypeCode::Sequence<TypeCodeType, RefCountPolicy>::length_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  return this->length_;
-}
-
-template <typename TypeCodeType, class RefCountPolicy>
-CORBA::TypeCode_ptr
-TAO::TypeCode::Sequence<TypeCodeType, RefCountPolicy>::content_type_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  return
-    CORBA::TypeCode::_duplicate (
-      Traits<TypeCodeType>::get_typecode (this->content_type_));
-}
-
-
-#endif  /* TAO_SEQUENCE_TYPECODE_CPP */
diff --git a/TAO/tao/Sequence_TypeCode.h b/TAO/tao/Sequence_TypeCode.h
deleted file mode 100644
index 63b576bd216..00000000000
--- a/TAO/tao/Sequence_TypeCode.h
+++ /dev/null
@@ -1,134 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Sequence_TypeCode.h
- *
- *  $Id$
- *
- *  Header file for @c tk_sequence and @c tk_array @c CORBA::TypeCodes.
- *
- *  @author Ossama Othman <ossama@dre.vanderbilt.edu>
- */
-//=============================================================================
-
-#ifndef TAO_SEQUENCE_TYPECODE_H
-#define TAO_SEQUENCE_TYPECODE_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/TypeCode.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-namespace TAO
-{
-  namespace TypeCode
-  {
-
-    /**
-     * @class Sequence
-     *
-     * @brief @c CORBA::TypeCode implementation for OMG IDL
-     *        @c sequence and @c array types.
-     *
-     * This class implements a @c CORBA::TypeCode for OMG IDL
-     * @c sequence and array types.
-     */
-    template <typename TypeCodeType, class RefCountPolicy>
-    class Sequence
-      : public CORBA::TypeCode
-      , private RefCountPolicy
-    {
-    public:
-
-      /// Constructor.
-      Sequence (CORBA::TCKind kind,
-#if defined (__BORLANDC__) && (__BORLANDC__ < 0x572)
-                // Borland C++ currently can't handle a reference to
-                // const pointer to const CORBA::TypeCode_ptr
-                TypeCodeType content_type,
-#else
-                TypeCodeType const & content_type,
-#endif
-                CORBA::ULong length);
-
-      /**
-       * @name TAO-specific @c CORBA::TypeCode Methods
-       *
-       * Methods required by TAO's implementation of the
-       * @c CORBA::TypeCode class.
-       *
-       * @see @c CORBA::TypeCode
-       */
-      //@{
-      virtual bool tao_marshal (TAO_OutputCDR & cdr,
-                                CORBA::ULong offset) const;
-      virtual void tao_duplicate (void);
-      virtual void tao_release (void);
-      //@}
-
-    protected:
-
-      /**
-       * @name @c TAO CORBA::TypeCode Template Methods
-       *
-       * @c CORBA::TypeCode template methods specific to @c tk_sequence
-       * @c TypeCodes.
-       *
-       * @see @c CORBA::TypeCode
-       */
-      //@{
-      virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc
-                                      ACE_ENV_ARG_DECL) const;
-      virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc
-                                           ACE_ENV_ARG_DECL) const;
-      virtual CORBA::TypeCode_ptr get_compact_typecode_i (
-        ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual CORBA::ULong length_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual CORBA::TypeCode_ptr content_type_i (
-        ACE_ENV_SINGLE_ARG_DECL) const;
-
-    private:
-
-      /// Element type of the sequence.
-      /**
-       * A pointer to the @c CORBA::TypeCode_ptr rather than the
-       * @c CORBA::TypeCode_ptr itself is stored since that address is
-       * well-defined.  We may not know the value of the @c
-       * CORBA::TypeCode_ptr when creating this @c Field statically at
-       * compile-time, hence the indirection.
-       *
-       * @note This @c TypeCode is released upon destruction of this
-       *       @c TypeCode::Sequence.
-       */
-      TypeCodeType const content_type_;
-
-      /// Length of the @c sequence or array.  A length of zero
-      /// indicates an unbounded @c sequence.
-      CORBA::ULong const length_;
-
-    };
-
-  }  // End namespace TypeCode
-}  // End namespace TAO
-
-
-#ifdef __ACE_INLINE__
-# include "tao/Sequence_TypeCode.inl"
-#endif  /* __ACE_INLINE__ */
-
-#ifdef ACE_TEMPLATES_REQUIRE_SOURCE
-# include "tao/Sequence_TypeCode.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#ifdef ACE_TEMPLATES_REQUIRE_PRAGMA
-# pragma implementation ("Sequence_TypeCode.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_SEQUENCE_TYPECODE_H */
diff --git a/TAO/tao/Sequence_TypeCode.inl b/TAO/tao/Sequence_TypeCode.inl
deleted file mode 100644
index 81e7add5646..00000000000
--- a/TAO/tao/Sequence_TypeCode.inl
+++ /dev/null
@@ -1,23 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-template <typename TypeCodeType, class RefCountPolicy>
-ACE_INLINE
-TAO::TypeCode::Sequence<TypeCodeType, RefCountPolicy>::Sequence (
-  CORBA::TCKind kind,
-#if defined (__BORLANDC__) && (__BORLANDC__ < 0x572)
-  // Borland C++ currently can't handle a reference to
-  // const pointer to const CORBA::TypeCode_ptr
-  TypeCodeType content_type,
-#else
-  TypeCodeType const & content_type,
-#endif
-  CORBA::ULong length)
-  : CORBA::TypeCode (kind)
-  , RefCountPolicy ()
-  , content_type_ (content_type)
-  , length_ (length)
-{
-  // ACE_ASSERT (kind == CORBA::tk_array || kind == CORBA::tk_sequence);
-}
diff --git a/TAO/tao/Sequence_TypeCode_Static.cpp b/TAO/tao/Sequence_TypeCode_Static.cpp
deleted file mode 100644
index c9548ddf64f..00000000000
--- a/TAO/tao/Sequence_TypeCode_Static.cpp
+++ /dev/null
@@ -1,147 +0,0 @@
-// $Id$
-
-#include "tao/Sequence_TypeCode_Static.h"
-#include "tao/CDR.h"
-#include "tao/TypeCode_Traits.h"
-
-#ifndef __ACE_INLINE__
-# include "tao/Sequence_TypeCode_Static.inl"
-#endif  /* !__ACE_INLINE__ */
-
-
-ACE_RCSID (tao,
-           Sequence_TypeCode_Static,
-           "$Id$")
-
-
-bool
-TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *,
-                        TAO::Null_RefCount_Policy>::tao_marshal (
-  TAO_OutputCDR & cdr,
-  CORBA::ULong offset) const
-{
-  // A tk_array or tk_sequence TypeCode has a "complex" parameter list
-  // type (see Table 15-2 in Section 15.3.5.1 "TypeCode" in the CDR
-  // section of the CORBA specification), meaning that it must be
-  // marshaled into a CDR encapsulation.
-
-  // Create a CDR encapsulation.
-  TAO_OutputCDR enc;
-
-  // Account for the encoded CDR encapsulation length and byte order.
-  //
-  // Aligning on an octet since the next value after the CDR
-  // encapsulation length will always be the byte order octet/boolean
-  // in this case.
-  offset = ACE_align_binary (offset + 4,
-                             ACE_CDR::OCTET_ALIGN);
-
-  return
-    enc << TAO_OutputCDR::from_boolean (TAO_ENCAP_BYTE_ORDER)
-    && marshal (enc,
-                Traits<CORBA::TypeCode_ptr const *>::get_typecode (
-                  this->content_type_),
-                offset + enc.total_length ())
-    && enc << this->length_
-    && cdr << static_cast<CORBA::ULong> (enc.total_length ())
-    && cdr.write_octet_array_mb (enc.begin ());
-}
-
-void
-TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *,
-                        TAO::Null_RefCount_Policy>::tao_duplicate (void)
-{
-}
-
-void
-TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *,
-                        TAO::Null_RefCount_Policy>::tao_release (void)
-{
-}
-
-CORBA::Boolean
-TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *,
-                        TAO::Null_RefCount_Policy>::equal_i (
-  CORBA::TypeCode_ptr tc
-  ACE_ENV_ARG_DECL) const
-{
-  // The following calls won't throw since CORBA::TypeCode::equal()
-  // has already established the kind of tc is the same as our kind.
-  CORBA::ULong const tc_length = tc->length (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (this->length_ != tc_length)
-    return 0;
-
-  CORBA::TypeCode_var rhs_content_type =
-    tc->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  return
-    Traits<CORBA::TypeCode_ptr const *>::get_typecode (this->content_type_)->equal (
-      rhs_content_type.in ()
-      ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::Boolean
-TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *,
-                        TAO::Null_RefCount_Policy>::equivalent_i (
-  CORBA::TypeCode_ptr tc
-  ACE_ENV_ARG_DECL) const
-{
-  // The following calls won't throw since CORBA::TypeCode::equal()
-  // has already established the kind of tc is the same as our kind.
-  CORBA::ULong const tc_length = tc->length (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (this->length_ != tc_length)
-    return 0;
-
-  CORBA::TypeCode_var rhs_content_type =
-    tc->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  return
-    Traits<CORBA::TypeCode_ptr const *>::get_typecode (this->content_type_)->equivalent (
-      rhs_content_type.in ()
-      ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::TypeCode_ptr
-TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *,
-                        TAO::Null_RefCount_Policy>::get_compact_typecode_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  // Already compact since tk_sequence and tk_array TypeCodes have no
-  // name or member names, meaning that we can simply call
-  // _duplicate() on this TypeCode.
-
-  // @@ There is a potential problem here if this TypeCode is a static
-  //    and const since it may have been placed in read-only memory by
-  //    the compiler.  A const_cast<> can return undefined results in
-  //    that case.
-
-  CORBA::TypeCode_ptr mutable_tc =
-    const_cast<TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *,
-    TAO::Null_RefCount_Policy> *> (this);
-
-  return CORBA::TypeCode::_duplicate (mutable_tc);
-}
-
-CORBA::ULong
-TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *,
-                        TAO::Null_RefCount_Policy>::length_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  return this->length_;
-}
-
-CORBA::TypeCode_ptr
-TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *,
-                        TAO::Null_RefCount_Policy>::content_type_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  return
-    CORBA::TypeCode::_duplicate (
-      Traits<CORBA::TypeCode_ptr const *>::get_typecode (this->content_type_));
-}
diff --git a/TAO/tao/Sequence_TypeCode_Static.h b/TAO/tao/Sequence_TypeCode_Static.h
deleted file mode 100644
index 43219b335fe..00000000000
--- a/TAO/tao/Sequence_TypeCode_Static.h
+++ /dev/null
@@ -1,125 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Sequence_TypeCode_Static.h
- *
- *  $Id$
- *
- *  Header file for static @c tk_sequence and @c tk_array
- *  @c CORBA::TypeCodes.
- *
- *  @author Ossama Othman <ossama@dre.vanderbilt.edu>
- */
-//=============================================================================
-
-#ifndef TAO_SEQUENCE_TYPECODE_STATIC_H
-#define TAO_SEQUENCE_TYPECODE_STATIC_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/TypeCode.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Null_RefCount_Policy.h"
-
-
-namespace TAO
-{
-  namespace TypeCode
-  {
-    template <typename TypeCodeType, class RefCountPolicy> class Sequence;
-
-    /**
-     * @class Sequence
-     *
-     * @brief @c CORBA::TypeCode implementation for OMG IDL
-     *        @c sequence and @c array types.
-     *
-     * This class implements a @c CORBA::TypeCode for OMG IDL
-     * @c sequence and array types.
-     */
-    template<>
-    class TAO_Export Sequence<CORBA::TypeCode_ptr const *,
-                              TAO::Null_RefCount_Policy>
-      : public CORBA::TypeCode
-      , private TAO::Null_RefCount_Policy
-    {
-    public:
-
-      /// Constructor.
-      Sequence (CORBA::TCKind kind,
-                CORBA::TypeCode_ptr const * content_type,
-                CORBA::ULong length);
-
-      /**
-       * @name TAO-specific @c CORBA::TypeCode Methods
-       *
-       * Methods required by TAO's implementation of the
-       * @c CORBA::TypeCode class.
-       *
-       * @see @c CORBA::TypeCode
-       */
-      //@{
-      virtual bool tao_marshal (TAO_OutputCDR & cdr,
-                                CORBA::ULong offset) const;
-      virtual void tao_duplicate (void);
-      virtual void tao_release (void);
-      //@}
-
-    protected:
-
-      /**
-       * @name @c TAO CORBA::TypeCode Template Methods
-       *
-       * @c CORBA::TypeCode template methods specific to @c tk_sequence
-       * @c TypeCodes.
-       *
-       * @see @c CORBA::TypeCode
-       */
-      //@{
-      virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc
-                                      ACE_ENV_ARG_DECL) const;
-      virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc
-                                           ACE_ENV_ARG_DECL) const;
-      virtual CORBA::TypeCode_ptr get_compact_typecode_i (
-        ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual CORBA::ULong length_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual CORBA::TypeCode_ptr content_type_i (
-        ACE_ENV_SINGLE_ARG_DECL) const;
-
-    private:
-
-      /// Element type of the sequence.
-      /**
-       * A pointer to the @c CORBA::TypeCode_ptr rather than the
-       * @c CORBA::TypeCode_ptr itself is stored since that address is
-       * well-defined.  We may not know the value of the @c
-       * CORBA::TypeCode_ptr when creating this @c Field statically at
-       * compile-time, hence the indirection.
-       *
-       * @note This @c TypeCode is released upon destruction of this
-       *       @c TypeCode::Sequence.
-       */
-      CORBA::TypeCode_ptr const * const content_type_;
-
-      /// Length of the @c sequence or array.  A length of zero
-      /// indicates an unbounded @c sequence.
-      CORBA::ULong const length_;
-
-    };
-
-  }  // End namespace TypeCode
-}  // End namespace TAO
-
-
-#ifdef __ACE_INLINE__
-# include "tao/Sequence_TypeCode_Static.inl"
-#endif  /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_SEQUENCE_TYPECODE_STATIC_H */
diff --git a/TAO/tao/Sequence_TypeCode_Static.inl b/TAO/tao/Sequence_TypeCode_Static.inl
deleted file mode 100644
index 27e98729656..00000000000
--- a/TAO/tao/Sequence_TypeCode_Static.inl
+++ /dev/null
@@ -1,16 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-ACE_INLINE
-TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *,
-                        TAO::Null_RefCount_Policy>::Sequence (
-  CORBA::TCKind kind,
-  CORBA::TypeCode_ptr const * content_type,
-  CORBA::ULong length)
-  : CORBA::TypeCode (kind)
-  , ACE_NESTED_CLASS (TAO, Null_RefCount_Policy) ()
-  , content_type_ (content_type)
-  , length_ (length)
-{
-}
diff --git a/TAO/tao/ServerRequestInterceptor_Adapter.h b/TAO/tao/ServerRequestInterceptor_Adapter.h
index 3b065394909..02b5b9657d7 100644
--- a/TAO/tao/ServerRequestInterceptor_Adapter.h
+++ b/TAO/tao/ServerRequestInterceptor_Adapter.h
@@ -41,6 +41,9 @@ namespace TAO
 {
   class ServerRequestInfo;
   class Argument;
+  class PICurrent_Impl;
+  class PICurrent_Copy_Callback;
+  class Upcall_Command;
 
   /**
    * @class ServerRequestInterceptor_Adapter
@@ -139,7 +142,23 @@ namespace TAO
       ACE_ENV_ARG_DECL) = 0;
 
     virtual void destroy_interceptors (ACE_ENV_SINGLE_ARG_DECL) = 0;
-  };
+
+    virtual TAO::PICurrent_Impl *allocate_pi_current (void) = 0;
+
+    virtual TAO::PICurrent_Copy_Callback *
+        allocate_pi_current_callback (void) = 0;
+
+    virtual void deallocate_pi_current (
+        TAO::PICurrent_Impl *picurrent) = 0;
+
+    virtual void deallocate_pi_current_callback (
+        TAO::PICurrent_Copy_Callback *callback) = 0;
+
+    virtual void execute_command (
+        TAO_ServerRequest &server_request,
+        TAO::Upcall_Command &command
+        ACE_ENV_ARG_DECL) = 0;
+};
 
 }
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/Services.pidl b/TAO/tao/Services.pidl
index dece1ce7bbb..c855d525ca0 100644
--- a/TAO/tao/Services.pidl
+++ b/TAO/tao/Services.pidl
@@ -22,7 +22,7 @@
 #ifndef TAO_CORBA_SERVICES_IDL
 #define TAO_CORBA_SERVICES_IDL
 
-#include "OctetSeq.pidl"
+#include "tao/OctetSeq.pidl"
 
 #pragma prefix "omg.org"
 
diff --git a/TAO/tao/ServicesA.cpp b/TAO/tao/ServicesA.cpp
deleted file mode 100644
index 19e890423f4..00000000000
--- a/TAO/tao/ServicesA.cpp
+++ /dev/null
@@ -1,519 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "ServicesC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Sequence_TypeCode_Static.h"
-#include "tao/Struct_TypeCode_Static.h"
-#include "tao/TypeCode_Struct_Field.h"
-#include "tao/Recursive_Type_TypeCode.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Dual_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ServiceType (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/ServiceType:1.0",
-    "ServiceType",
-    &CORBA::_tc_ushort);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ServiceType =
-    &_tao_tc_CORBA_ServiceType;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ServiceOption (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/ServiceOption:1.0",
-    "ServiceOption",
-    &CORBA::_tc_ulong);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ServiceOption =
-    &_tao_tc_CORBA_ServiceOption;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ServiceDetailType (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/ServiceDetailType:1.0",
-    "ServiceDetailType",
-    &CORBA::_tc_ulong);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ServiceDetailType =
-    &_tao_tc_CORBA_ServiceDetailType;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ServiceDetailData (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/ServiceDetailData:1.0",
-    "ServiceDetailData",
-    &CORBA::_tc_OctetSeq);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ServiceDetailData =
-    &_tao_tc_CORBA_ServiceDetailData;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:937
-
-
-#ifndef _TAO_TYPECODE_CORBA_ServiceOptionSeq_GUARD
-#define _TAO_TYPECODE_CORBA_ServiceOptionSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_ServiceOptionSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_ServiceOption,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_ServiceOptionSeq_0 =
-      &CORBA_ServiceOptionSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_ServiceOptionSeq_GUARD */
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ServiceOptionSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/ServiceOptionSeq:1.0",
-    "ServiceOptionSeq",
-    &TAO::TypeCode::tc_CORBA_ServiceOptionSeq_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ServiceOptionSeq =
-    &_tao_tc_CORBA_ServiceOptionSeq;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/struct_typecode.cpp:87
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:937
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_ServiceDetail[] =
-  {
-    { "service_detail_type", &CORBA::_tc_ServiceDetailType },
-    { "service_detail", &CORBA::_tc_ServiceDetailData }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                      CORBA::TypeCode_ptr const *,
-                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
-                      TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ServiceDetail (
-    CORBA::tk_struct,
-    "IDL:omg.org/CORBA/ServiceDetail:1.0",
-    "ServiceDetail",
-    _tao_fields_CORBA_ServiceDetail,
-    2);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ServiceDetail =
-    &_tao_tc_CORBA_ServiceDetail;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:937
-
-
-#ifndef _TAO_TYPECODE_CORBA_ServiceDetailSeq_GUARD
-#define _TAO_TYPECODE_CORBA_ServiceDetailSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_ServiceDetailSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_ServiceDetail,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_ServiceDetailSeq_0 =
-      &CORBA_ServiceDetailSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_ServiceDetailSeq_GUARD */
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ServiceDetailSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/ServiceDetailSeq:1.0",
-    "ServiceDetailSeq",
-    &TAO::TypeCode::tc_CORBA_ServiceDetailSeq_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ServiceDetailSeq =
-    &_tao_tc_CORBA_ServiceDetailSeq;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/struct_typecode.cpp:87
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:937
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:937
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_ServiceInformation[] =
-  {
-    { "service_options", &CORBA::_tc_ServiceOptionSeq },
-    { "service_details", &CORBA::_tc_ServiceDetailSeq }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                      CORBA::TypeCode_ptr const *,
-                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
-                      TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ServiceInformation (
-    CORBA::tk_struct,
-    "IDL:omg.org/CORBA/ServiceInformation:1.0",
-    "ServiceInformation",
-    _tao_fields_CORBA_ServiceInformation,
-    2);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ServiceInformation =
-    &_tao_tc_CORBA_ServiceInformation;
-}
-
-
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::ServiceOptionSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ServiceOptionSeq>::insert_copy (
-      _tao_any,
-      CORBA::ServiceOptionSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_ServiceOptionSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ServiceOptionSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ServiceOptionSeq>::insert (
-      _tao_any,
-      CORBA::ServiceOptionSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_ServiceOptionSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ServiceOptionSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::ServiceOptionSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::ServiceOptionSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::ServiceOptionSeq>::extract (
-        _tao_any,
-        CORBA::ServiceOptionSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_ServiceOptionSeq_0,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::ServiceDetail &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ServiceDetail>::insert_copy (
-      _tao_any,
-      CORBA::ServiceDetail::_tao_any_destructor,
-      CORBA::_tc_ServiceDetail,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ServiceDetail *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ServiceDetail>::insert (
-      _tao_any,
-      CORBA::ServiceDetail::_tao_any_destructor,
-      CORBA::_tc_ServiceDetail,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ServiceDetail *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::ServiceDetail *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::ServiceDetail *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::ServiceDetail>::extract (
-        _tao_any,
-        CORBA::ServiceDetail::_tao_any_destructor,
-        CORBA::_tc_ServiceDetail,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::ServiceDetailSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ServiceDetailSeq>::insert_copy (
-      _tao_any,
-      CORBA::ServiceDetailSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_ServiceDetailSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ServiceDetailSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ServiceDetailSeq>::insert (
-      _tao_any,
-      CORBA::ServiceDetailSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_ServiceDetailSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ServiceDetailSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::ServiceDetailSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::ServiceDetailSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::ServiceDetailSeq>::extract (
-        _tao_any,
-        CORBA::ServiceDetailSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_ServiceDetailSeq_0,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::ServiceInformation &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ServiceInformation>::insert_copy (
-      _tao_any,
-      CORBA::ServiceInformation::_tao_any_destructor,
-      CORBA::_tc_ServiceInformation,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ServiceInformation *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ServiceInformation>::insert (
-      _tao_any,
-      CORBA::ServiceInformation::_tao_any_destructor,
-      CORBA::_tc_ServiceInformation,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ServiceInformation *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::ServiceInformation *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::ServiceInformation *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::ServiceInformation>::extract (
-        _tao_any,
-        CORBA::ServiceInformation::_tao_any_destructor,
-        CORBA::_tc_ServiceInformation,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/ServicesC.cpp b/TAO/tao/ServicesC.cpp
index 839958233b4..765d9c8e576 100644
--- a/TAO/tao/ServicesC.cpp
+++ b/TAO/tao/ServicesC.cpp
@@ -26,17 +26,13 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:291
+// be\be_codegen.cpp:288
 
 
 #include "ServicesC.h"
 #include "tao/CDR.h"
 #include "tao/ORB_Core.h"
 
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
@@ -59,7 +55,7 @@ CORBA::ServiceOptionSeq::ServiceOptionSeq (
     CORBA::ULong max
   )
   : TAO_Unbounded_Sequence<
-        CORBA::ServiceOption
+        ServiceOption
       >
     (max)
 {}
@@ -71,7 +67,7 @@ CORBA::ServiceOptionSeq::ServiceOptionSeq (
     CORBA::Boolean release
   )
   : TAO_Unbounded_Sequence<
-        CORBA::ServiceOption
+        ServiceOption
       >
     (max, length, buffer, release)
 {}
@@ -80,7 +76,7 @@ CORBA::ServiceOptionSeq::ServiceOptionSeq (
     const ServiceOptionSeq &seq
   )
   : TAO_Unbounded_Sequence<
-        CORBA::ServiceOption
+        ServiceOption
       >
     (seq)
 {}
@@ -125,7 +121,7 @@ CORBA::ServiceDetailSeq::ServiceDetailSeq (
     CORBA::ULong max
   )
   : TAO_Unbounded_Sequence<
-        CORBA::ServiceDetail
+        ServiceDetail
       >
     (max)
 {}
@@ -137,7 +133,7 @@ CORBA::ServiceDetailSeq::ServiceDetailSeq (
     CORBA::Boolean release
   )
   : TAO_Unbounded_Sequence<
-        CORBA::ServiceDetail
+        ServiceDetail
       >
     (max, length, buffer, release)
 {}
@@ -146,7 +142,7 @@ CORBA::ServiceDetailSeq::ServiceDetailSeq (
     const ServiceDetailSeq &seq
   )
   : TAO_Unbounded_Sequence<
-        CORBA::ServiceDetail
+        ServiceDetail
       >
     (seq)
 {}
diff --git a/TAO/tao/ServicesC.h b/TAO/tao/ServicesC.h
index 1df591e569d..5e24beb739a 100644
--- a/TAO/tao/ServicesC.h
+++ b/TAO/tao/ServicesC.h
@@ -26,10 +26,10 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:153
+// be\be_codegen.cpp:154
 
-#ifndef _TAO_IDL_ORIG_SERVICESC_H_
-#define _TAO_IDL_ORIG_SERVICESC_H_
+#ifndef _TAO_IDL_SERVICESC_H_
+#define _TAO_IDL_SERVICESC_H_
 
 #include /**/ "ace/pre.h"
 
@@ -60,12 +60,8 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:49
 
 namespace CORBA
 {
@@ -77,33 +73,18 @@ namespace CORBA
   typedef CORBA::UShort_out ServiceType_out;
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ServiceType;
-  
-  // TAO_IDL - Generated from
   // be\be_visitor_typedef/typedef_ch.cpp:379
   
   typedef CORBA::ULong ServiceOption;
   typedef CORBA::ULong_out ServiceOption_out;
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ServiceOption;
-  
-  // TAO_IDL - Generated from
   // be\be_visitor_typedef/typedef_ch.cpp:379
   
   typedef CORBA::ULong ServiceDetailType;
   typedef CORBA::ULong_out ServiceDetailType_out;
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ServiceDetailType;
-  
-  // TAO_IDL - Generated from
   // be\be_visitor_typedef/typedef_ch.cpp:472
   
   typedef OctetSeq ServiceDetailData;
@@ -111,11 +92,6 @@ namespace CORBA
   typedef OctetSeq_out ServiceDetailData_out;
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ServiceDetailData;
-  
-  // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_SERVICEOPTIONSEQ_CH_)
@@ -164,11 +140,6 @@ namespace CORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ServiceOptionSeq;
-  
-  // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
   
   const CORBA::ServiceType Security = 1U;
@@ -192,7 +163,7 @@ namespace CORBA
     ServiceDetail_out;
   
   // TAO_IDL - Generated from
-  // be\be_visitor_structure/structure_ch.cpp:52
+  // be\be_visitor_structure/structure_ch.cpp:57
   
   struct TAO_Export ServiceDetail
   {
@@ -204,11 +175,6 @@ namespace CORBA
   };
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ServiceDetail;
-  
-  // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_SERVICEDETAILSEQ_CH_)
@@ -257,11 +223,6 @@ namespace CORBA
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ServiceDetailSeq;
-  
-  // TAO_IDL - Generated from
   // be\be_type.cpp:258
   
   struct ServiceInformation;
@@ -280,7 +241,7 @@ namespace CORBA
     ServiceInformation_out;
   
   // TAO_IDL - Generated from
-  // be\be_visitor_structure/structure_ch.cpp:52
+  // be\be_visitor_structure/structure_ch.cpp:57
   
   struct TAO_Export ServiceInformation
   {
@@ -290,14 +251,9 @@ namespace CORBA
     CORBA::ServiceOptionSeq service_options;
     CORBA::ServiceDetailSeq service_details;
   };
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ServiceInformation;
 
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:78
 
 } // module CORBA
 
@@ -310,38 +266,6 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const CORBA::ServiceOptionSeq &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, CORBA::ServiceOptionSeq*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ServiceOptionSeq *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ServiceOptionSeq *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const CORBA::ServiceDetail &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, CORBA::ServiceDetail*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ServiceDetail *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ServiceDetail *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const CORBA::ServiceDetailSeq &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, CORBA::ServiceDetailSeq*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ServiceDetailSeq *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ServiceDetailSeq *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const CORBA::ServiceInformation &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, CORBA::ServiceInformation*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ServiceInformation *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ServiceInformation *&);
-
-// TAO_IDL - Generated from
 // be\be_visitor_sequence/cdr_op_ch.cpp:71
 
 #if !defined _TAO_CDR_OP_CORBA_ServiceOptionSeq_H_
@@ -388,16 +312,12 @@ TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::ServiceInfor
 TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, CORBA::ServiceInformation &);
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:955
+// be\be_codegen.cpp:1062
 
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
diff --git a/TAO/tao/ShortSeqA.cpp b/TAO/tao/ShortSeqA.cpp
deleted file mode 100644
index 82cd3336f0f..00000000000
--- a/TAO/tao/ShortSeqA.cpp
+++ /dev/null
@@ -1,142 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "ShortSeqC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Sequence_TypeCode_Static.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Dual_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:937
-
-
-#ifndef _TAO_TYPECODE_CORBA_ShortSeq_GUARD
-#define _TAO_TYPECODE_CORBA_ShortSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_ShortSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_short,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_ShortSeq_0 =
-      &CORBA_ShortSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_ShortSeq_GUARD */
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ShortSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/ShortSeq:1.0",
-    "ShortSeq",
-    &TAO::TypeCode::tc_CORBA_ShortSeq_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ShortSeq =
-    &_tao_tc_CORBA_ShortSeq;
-}
-
-
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::ShortSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ShortSeq>::insert_copy (
-      _tao_any,
-      CORBA::ShortSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_ShortSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ShortSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ShortSeq>::insert (
-      _tao_any,
-      CORBA::ShortSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_ShortSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ShortSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::ShortSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::ShortSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::ShortSeq>::extract (
-        _tao_any,
-        CORBA::ShortSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_ShortSeq_0,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/ShortSeqC.cpp b/TAO/tao/ShortSeqC.cpp
index ef3a5aeb545..5b4df566b26 100644
--- a/TAO/tao/ShortSeqC.cpp
+++ b/TAO/tao/ShortSeqC.cpp
@@ -26,16 +26,12 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:291
+// be\be_codegen.cpp:277
 
 
 #include "ShortSeqC.h"
 #include "tao/CDR.h"
 
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
diff --git a/TAO/tao/ShortSeqC.h b/TAO/tao/ShortSeqC.h
index 08034a23bc8..79b6809bd5a 100644
--- a/TAO/tao/ShortSeqC.h
+++ b/TAO/tao/ShortSeqC.h
@@ -26,10 +26,10 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:153
+// be\be_codegen.cpp:154
 
-#ifndef _TAO_IDL_ORIG_SHORTSEQC_H_
-#define _TAO_IDL_ORIG_SHORTSEQC_H_
+#ifndef _TAO_IDL_SHORTSEQC_H_
+#define _TAO_IDL_SHORTSEQC_H_
 
 #include /**/ "ace/pre.h"
 
@@ -52,17 +52,8 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_Export
 
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:49
 
 namespace CORBA
 {
@@ -114,14 +105,9 @@ namespace CORBA
   };
 
 #endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ShortSeq;
 
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:78
 
 } // module CORBA
 
@@ -134,14 +120,6 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const CORBA::ShortSeq &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, CORBA::ShortSeq*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ShortSeq *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ShortSeq *&);
-
-// TAO_IDL - Generated from
 // be\be_visitor_sequence/cdr_op_ch.cpp:71
 
 #if !defined _TAO_CDR_OP_CORBA_ShortSeq_H_
@@ -159,15 +137,7 @@ TAO_Export CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_CORBA_ShortSeq_H_ */
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
+// be\be_codegen.cpp:1028
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/tao/Special_Basic_Argument_T.cpp b/TAO/tao/Special_Basic_Argument_T.cpp
index 3fe67efa366..ee973ea75ec 100644
--- a/TAO/tao/Special_Basic_Argument_T.cpp
+++ b/TAO/tao/Special_Basic_Argument_T.cpp
@@ -4,7 +4,6 @@
 #define TAO_SPECIAL_BASIC_ARGUMENT_T_C
 
 #include "tao/Special_Basic_Argument_T.h"
-#include "tao/Dynamic_ParameterC.h"
 
 #if !defined (__ACE_INLINE__)
 #include "tao/Special_Basic_Argument_T.inl"
@@ -14,41 +13,38 @@ ACE_RCSID (tao,
            Special_Basic_Argument_T,
            "$Id$")
 
-template<typename S, typename to_S, typename from_S>
+template<typename S, typename to_S, typename from_S, typename Insert_Policy>
 CORBA::Boolean
-TAO::In_Special_Basic_Argument_T<S,to_S,from_S>::marshal (TAO_OutputCDR & cdr)
+TAO::In_Special_Basic_Argument_T<S,to_S,from_S,Insert_Policy>::marshal (TAO_OutputCDR &cdr)
 {
   return cdr << from_S (this->x_);
 }
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S, typename to_S, typename from_S>
+template<typename S, typename to_S, typename from_S, typename Insert_Policy>
 void
-TAO::In_Special_Basic_Argument_T<S,to_S,from_S>::interceptor_param (
-    Dynamic::Parameter & p
-  )
+TAO::In_Special_Basic_Argument_T<S,to_S,from_S,Insert_Policy>::interceptor_value (
+  CORBA::Any *any) const
 {
-  p.argument <<= from_S (this->x_);
-  p.mode = CORBA::PARAM_IN;
+  this->Insert_Policy::any_insert (any, from_S (this->x_));
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // ===========================================================
 
-template<typename S, typename to_S, typename from_S>
+template<typename S, typename to_S, typename from_S, typename Insert_Policy>
 CORBA::Boolean
-TAO::Inout_Special_Basic_Argument_T<S,to_S,from_S>::marshal (
-    TAO_OutputCDR & cdr
-  )
+TAO::Inout_Special_Basic_Argument_T<S,to_S,from_S,Insert_Policy>::marshal (
+    TAO_OutputCDR & cdr)
 {
   return cdr << from_S (this->x_);
 }
 
-template<typename S, typename to_S, typename from_S>
+template<typename S, typename to_S, typename from_S, typename Insert_Policy>
 CORBA::Boolean
-TAO::Inout_Special_Basic_Argument_T<S,to_S,from_S>::demarshal (
+TAO::Inout_Special_Basic_Argument_T<S,to_S,from_S,Insert_Policy>::demarshal (
     TAO_InputCDR & cdr
   )
 {
@@ -57,23 +53,21 @@ TAO::Inout_Special_Basic_Argument_T<S,to_S,from_S>::demarshal (
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S, typename to_S, typename from_S>
+template<typename S, typename to_S, typename from_S, typename Insert_Policy>
 void
-TAO::Inout_Special_Basic_Argument_T<S,to_S,from_S>::interceptor_param (
-    Dynamic::Parameter & p
-  )
+TAO::Inout_Special_Basic_Argument_T<S,to_S,from_S,Insert_Policy>::interceptor_value (
+  CORBA::Any *any) const
 {
-  p.argument <<= from_S (this->x_);
-  p.mode = CORBA::PARAM_INOUT;
+  this->Insert_Policy::any_insert (any, from_S (this->x_));
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // ==============================================================
 
-template<typename S, typename to_S, typename from_S>
+template<typename S, typename to_S, typename from_S, typename Insert_Policy>
 CORBA::Boolean
-TAO::Out_Special_Basic_Argument_T<S,to_S,from_S>::demarshal (
+TAO::Out_Special_Basic_Argument_T<S,to_S,from_S,Insert_Policy>::demarshal (
     TAO_InputCDR & cdr
   )
 {
@@ -82,23 +76,21 @@ TAO::Out_Special_Basic_Argument_T<S,to_S,from_S>::demarshal (
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S, typename to_S, typename from_S>
+template<typename S, typename to_S, typename from_S, typename Insert_Policy>
 void
-TAO::Out_Special_Basic_Argument_T<S,to_S,from_S>::interceptor_param (
-    Dynamic::Parameter & p
-  )
+TAO::Out_Special_Basic_Argument_T<S,to_S,from_S,Insert_Policy>::interceptor_value (
+  CORBA::Any *any) const
 {
-  p.argument <<= from_S (this->x_);
-  p.mode = CORBA::PARAM_OUT;
+  this->Insert_Policy::any_insert (any, from_S (this->x_));
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // ============================================================
 
-template<typename S, typename to_S, typename from_S>
+template<typename S, typename to_S, typename from_S, typename Insert_Policy>
 CORBA::Boolean
-TAO::Ret_Special_Basic_Argument_T<S,to_S,from_S>::demarshal (
+TAO::Ret_Special_Basic_Argument_T<S,to_S,from_S,Insert_Policy>::demarshal (
     TAO_InputCDR & cdr
   )
 {
@@ -107,13 +99,12 @@ TAO::Ret_Special_Basic_Argument_T<S,to_S,from_S>::demarshal (
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S, typename to_S, typename from_S>
+template<typename S, typename to_S, typename from_S, typename Insert_Policy>
 void
-TAO::Ret_Special_Basic_Argument_T<S,to_S,from_S>::interceptor_result (
-    CORBA::Any * any
-  )
+TAO::Ret_Special_Basic_Argument_T<S,to_S,from_S,Insert_Policy>::interceptor_value (
+  CORBA::Any *any) const
 {
-  (*any) <<= from_S (this->x_);
+  this->Insert_Policy::any_insert (any, from_S (this->x_));
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
diff --git a/TAO/tao/Special_Basic_Argument_T.h b/TAO/tao/Special_Basic_Argument_T.h
index 456e5d9a9d8..e113596d8a3 100644
--- a/TAO/tao/Special_Basic_Argument_T.h
+++ b/TAO/tao/Special_Basic_Argument_T.h
@@ -31,15 +31,15 @@ namespace TAO
    * @brief Template class for IN stub argument of (w)char/boolean/octet.
    *
    */
-  template<typename S, typename to_S, typename from_S>
-  class In_Special_Basic_Argument_T : public Argument
+  template<typename S, typename to_S, typename from_S, typename Insert_Policy>
+  class In_Special_Basic_Argument_T : public InArgument, private Insert_Policy
   {
   public:
     In_Special_Basic_Argument_T (S const &);
 
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S const & arg (void) const;
 
@@ -53,16 +53,16 @@ namespace TAO
    * @brief Template class for INOUT stub argument of (w)char/boolean/octet.
    *
    */
-  template<typename S, typename to_S, typename from_S>
-  class Inout_Special_Basic_Argument_T : public Argument
+  template<typename S, typename to_S, typename from_S, typename Insert_Policy>
+  class Inout_Special_Basic_Argument_T : public InoutArgument, private Insert_Policy
   {
   public:
     Inout_Special_Basic_Argument_T (S & x);
 
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S & arg (void);
 
@@ -76,15 +76,15 @@ namespace TAO
    * @brief Template class for OUT stub argument of (w)char/boolean/octet.
    *
    */
-  template<typename S, typename to_S, typename from_S>
-  class Out_Special_Basic_Argument_T : public Argument
+  template<typename S, typename to_S, typename from_S, typename Insert_Policy>
+  class Out_Special_Basic_Argument_T : public OutArgument, private Insert_Policy
   {
   public:
     Out_Special_Basic_Argument_T (S & x);
 
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S & arg (void);
 
@@ -98,15 +98,15 @@ namespace TAO
    * @brief Template class for return stub value of (w)char/boolean/octet.
    *
    */
-  template<typename S, typename to_S, typename from_S>
-  class Ret_Special_Basic_Argument_T : public Argument
+  template<typename S, typename to_S, typename from_S, typename Insert_Policy>
+  class Ret_Special_Basic_Argument_T : public RetArgument, private Insert_Policy
   {
   public:
     Ret_Special_Basic_Argument_T (void);
 
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_result (CORBA::Any *);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S & arg (void);
 
@@ -126,12 +126,12 @@ namespace TAO
   struct TAO_Export Special_Basic_Tag {};
 
   /**
-   * @struct Special_Basic_Traits_T
+   * @struct Special_Basic_Arg_Traits_T
    *
    * @brief Template class for stub argument traits of (w)char/boolean/octet.
    *
    */
-  template<typename T, typename to_T, typename from_T>
+  template<typename T, typename to_T, typename from_T, typename Insert_Policy>
   struct Special_Basic_Arg_Traits_T
   {
     typedef T                                               ret_type;
@@ -139,10 +139,10 @@ namespace TAO
     typedef T &                                             inout_type;
     typedef T &                                             out_type;
 
-    typedef In_Special_Basic_Argument_T<T,to_T,from_T>      in_arg_val;
-    typedef Inout_Special_Basic_Argument_T<T,to_T,from_T>   inout_arg_val;
-    typedef Out_Special_Basic_Argument_T<T,to_T,from_T>     out_arg_val;
-    typedef Ret_Special_Basic_Argument_T<T,to_T,from_T>     ret_val;
+    typedef In_Special_Basic_Argument_T<T,to_T,from_T,Insert_Policy>      in_arg_val;
+    typedef Inout_Special_Basic_Argument_T<T,to_T,from_T,Insert_Policy>   inout_arg_val;
+    typedef Out_Special_Basic_Argument_T<T,to_T,from_T,Insert_Policy>     out_arg_val;
+    typedef Ret_Special_Basic_Argument_T<T,to_T,from_T,Insert_Policy>     ret_val;
 
     typedef Special_Basic_Tag                               idl_tag;
   };
diff --git a/TAO/tao/Special_Basic_Argument_T.inl b/TAO/tao/Special_Basic_Argument_T.inl
index 66887ab09a3..850c2209cbb 100644
--- a/TAO/tao/Special_Basic_Argument_T.inl
+++ b/TAO/tao/Special_Basic_Argument_T.inl
@@ -2,85 +2,85 @@
 //
 // $Id$
 
-template<typename S, typename to_S, typename from_S>
+template<typename S, typename to_S, typename from_S, typename Insert_Policy>
 ACE_INLINE
-TAO::In_Special_Basic_Argument_T<S,to_S,from_S>::In_Special_Basic_Argument_T (
+TAO::In_Special_Basic_Argument_T<S,to_S,from_S,Insert_Policy>::In_Special_Basic_Argument_T (
      S const & x
   )
   : x_ (x)
 {}
 
-template<typename S, typename to_S, typename from_S>
+template<typename S, typename to_S, typename from_S, typename Insert_Policy>
 ACE_INLINE
 S const &
-TAO::In_Special_Basic_Argument_T<S,to_S,from_S>::arg (void) const
+TAO::In_Special_Basic_Argument_T<S,to_S,from_S,Insert_Policy>::arg (void) const
 {
   return this->x_;
 }
 
 // ===========================================================================
 
-template<typename S, typename to_S, typename from_S>
+template<typename S, typename to_S, typename from_S, typename Insert_Policy>
 ACE_INLINE
-TAO::Inout_Special_Basic_Argument_T<S,to_S,from_S>::
+TAO::Inout_Special_Basic_Argument_T<S,to_S,from_S,Insert_Policy>::
 Inout_Special_Basic_Argument_T (S & x)
   : x_ (x)
 {}
 
-template<typename S, typename to_S, typename from_S>
+template<typename S, typename to_S, typename from_S, typename Insert_Policy>
 ACE_INLINE
 S &
-TAO::Inout_Special_Basic_Argument_T<S,to_S,from_S>::arg (void)
+TAO::Inout_Special_Basic_Argument_T<S,to_S,from_S,Insert_Policy>::arg (void)
 {
   return this->x_;
 }
 
 // ===========================================================================
 
-template<typename S, typename to_S, typename from_S>
+template<typename S, typename to_S, typename from_S, typename Insert_Policy>
 ACE_INLINE
-TAO::Out_Special_Basic_Argument_T<S,to_S,from_S>::
+TAO::Out_Special_Basic_Argument_T<S,to_S,from_S,Insert_Policy>::
 Out_Special_Basic_Argument_T (S & x)
   : x_ (x)
 {}
 
-template<typename S, typename to_S, typename from_S>
+template<typename S, typename to_S, typename from_S, typename Insert_Policy>
 ACE_INLINE
 S &
-TAO::Out_Special_Basic_Argument_T<S,to_S,from_S>::arg (void)
+TAO::Out_Special_Basic_Argument_T<S,to_S,from_S,Insert_Policy>::arg (void)
 {
   return this->x_;
 }
 
 // ===========================================================================
 
-template<typename S, typename to_S, typename from_S>
+template<typename S, typename to_S, typename from_S, typename Insert_Policy>
 ACE_INLINE
-TAO::Ret_Special_Basic_Argument_T<S,to_S,from_S>::
+TAO::Ret_Special_Basic_Argument_T<S,to_S,from_S,Insert_Policy>::
 Ret_Special_Basic_Argument_T (void)
 {
 }
 
-template<typename S, typename to_S, typename from_S>
+template<typename S, typename to_S, typename from_S, typename Insert_Policy>
 ACE_INLINE
 S &
-TAO::Ret_Special_Basic_Argument_T<S,to_S,from_S>::arg (void)
+TAO::Ret_Special_Basic_Argument_T<S,to_S,from_S,Insert_Policy>::arg (void)
 {
   return this->x_;
 }
 
-template<typename S, typename to_S, typename from_S>
+template<typename S, typename to_S, typename from_S, typename Insert_Policy>
 ACE_INLINE
 S
-TAO::Ret_Special_Basic_Argument_T<S,to_S,from_S>::excp (void)
+TAO::Ret_Special_Basic_Argument_T<S,to_S,from_S,Insert_Policy>::excp (void)
 {
   return this->x_;
 }
 
-template<typename S, typename to_S, typename from_S>
+template<typename S, typename to_S, typename from_S, typename Insert_Policy>
 ACE_INLINE
 S
-TAO::Ret_Special_Basic_Argument_T<S,to_S,from_S>::retn (void)
+TAO::Ret_Special_Basic_Argument_T<S,to_S,from_S,Insert_Policy>::retn (void)
 {
   return this->x_;
 }
diff --git a/TAO/tao/Special_Basic_Arguments.h b/TAO/tao/Special_Basic_Arguments.h
index 487354abb36..49e8e16e9e6 100644
--- a/TAO/tao/Special_Basic_Arguments.h
+++ b/TAO/tao/Special_Basic_Arguments.h
@@ -15,6 +15,7 @@
 #define TAO_SPECIAL_BASIC_ARGUMENTS_H
 
 #include /**/ "ace/pre.h"
+
 #include "ace/CDR_Stream.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
@@ -36,7 +37,8 @@ namespace TAO
   class TAO_Export Arg_Traits<ACE_InputCDR::to_char>
     : public Special_Basic_Arg_Traits_T<CORBA::Char,
                                         ACE_InputCDR::to_char,
-                                        ACE_OutputCDR::from_char>
+                                        ACE_OutputCDR::from_char,
+                                        TAO::Any_Insert_Policy_AnyTypeCode_Adapter <ACE_OutputCDR::from_char> >
   {
   };
 
@@ -44,7 +46,8 @@ namespace TAO
   class TAO_Export Arg_Traits<ACE_InputCDR::to_wchar>
     : public Special_Basic_Arg_Traits_T<CORBA::WChar,
                                         ACE_InputCDR::to_wchar,
-                                        ACE_OutputCDR::from_wchar>
+                                        ACE_OutputCDR::from_wchar,
+                                        TAO::Any_Insert_Policy_AnyTypeCode_Adapter <ACE_OutputCDR::from_wchar> >
   {
   };
 
@@ -52,7 +55,8 @@ namespace TAO
   class TAO_Export Arg_Traits<ACE_InputCDR::to_octet>
     : public Special_Basic_Arg_Traits_T<CORBA::Octet,
                                         ACE_InputCDR::to_octet,
-                                        ACE_OutputCDR::from_octet>
+                                        ACE_OutputCDR::from_octet,
+                                        TAO::Any_Insert_Policy_AnyTypeCode_Adapter <ACE_OutputCDR::from_octet> >
   {
   };
 
@@ -60,7 +64,8 @@ namespace TAO
   class TAO_Export Arg_Traits<ACE_InputCDR::to_boolean>
     : public Special_Basic_Arg_Traits_T<CORBA::Boolean,
                                         ACE_InputCDR::to_boolean,
-                                        ACE_OutputCDR::from_boolean>
+                                        ACE_OutputCDR::from_boolean,
+                                        TAO::Any_Insert_Policy_AnyTypeCode_Adapter <ACE_OutputCDR::from_boolean> >
   {
   };
 }
diff --git a/TAO/tao/Strategies.mpc b/TAO/tao/Strategies.mpc
index d4ae5aa3c54..4e30d8c78ab 100644
--- a/TAO/tao/Strategies.mpc
+++ b/TAO/tao/Strategies.mpc
@@ -1,6 +1,6 @@
 //$Id$
 
-project : taolib, core {
+project : taolib, core, anytypecode {
   sharedname   = TAO_Strategies
   dynamicflags = TAO_STRATEGIES_BUILD_DLL
 
@@ -28,6 +28,9 @@ project : taolib, core {
     Strategies
   }
 
+  IDL_Files {
+  }
+
   Pkgconfig_Files {
     Strategies/TAO_Strategies.pc.in
   }
diff --git a/TAO/tao/Strategies/sciop_endpointsC.cpp b/TAO/tao/Strategies/sciop_endpointsC.cpp
index b88f306beae..1624ec7940a 100644
--- a/TAO/tao/Strategies/sciop_endpointsC.cpp
+++ b/TAO/tao/Strategies/sciop_endpointsC.cpp
@@ -31,13 +31,13 @@
 
 #include "sciop_endpointsC.h"
 #include "tao/CDR.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Sequence_TypeCode_Static.h"
-#include "tao/String_TypeCode_Static.h"
-#include "tao/Struct_TypeCode_Static.h"
-#include "tao/TypeCode_Struct_Field.h"
+#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Sequence_TypeCode_Static.h"
+#include "tao/AnyTypeCode/String_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Struct_TypeCode_Static.h"
+#include "tao/AnyTypeCode/TypeCode_Struct_Field.h"
 
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
@@ -60,7 +60,7 @@ static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> co
     { "host", &CORBA::_tc_string },
     { "port", &CORBA::_tc_short },
     { "priority", &CORBA::_tc_short }
-    
+
   };
 static TAO::TypeCode::Struct<char const *,
                              CORBA::TypeCode_ptr const *,
@@ -73,16 +73,16 @@ static TAO::TypeCode::Struct<char const *,
     "TAO_SCIOP_Endpoint_Info",
     _tao_fields_TAO_SCIOP_Endpoint_Info,
     3);
-  
+
 ::CORBA::TypeCode_ptr const _tc_TAO_SCIOP_Endpoint_Info =
   &_tao_tc_TAO_SCIOP_Endpoint_Info;
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be/be_visitor_structure/structure_cs.cpp:66
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be/be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_TAO_SCIOPENDPOINTSEQUENCE_CS_)
@@ -147,10 +147,10 @@ namespace TAO
         CORBA::tk_sequence,
         &_tc_TAO_SCIOP_Endpoint_Info,
         0U);
-      
+
     ::CORBA::TypeCode_ptr const tc_TAO_SCIOPEndpointSequence_0 =
       &TAO_SCIOPEndpointSequence_0;
-    
+
   }
 }
 
@@ -164,7 +164,7 @@ static TAO::TypeCode::Alias<char const *,
     "IDL:TAO_SCIOPEndpointSequence:1.0",
     "TAO_SCIOPEndpointSequence",
     &TAO::TypeCode::tc_TAO_SCIOPEndpointSequence_0);
-  
+
 ::CORBA::TypeCode_ptr const _tc_TAO_SCIOPEndpointSequence =
   &_tao_tc_TAO_SCIOPEndpointSequence;
 
@@ -205,20 +205,20 @@ CORBA::Boolean operator<< (
   )
 {
   const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
+
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
       CORBA::Boolean _tao_marshal_flag = true;
-      
+
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm << _tao_sequence[i]);
         }
-      
+
       return _tao_marshal_flag;
     }
-  
+
   return false;
 }
 
@@ -228,7 +228,7 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
-  
+
   if (strm >> _tao_seq_len)
     {
       // Add a check to the length of the sequence
@@ -238,28 +238,28 @@ CORBA::Boolean operator>> (
         {
           return false;
         }
-      
+
       // Set the length of the sequence.
       _tao_sequence.length (_tao_seq_len);
-      
+
       // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
+      if (0 >= _tao_seq_len)
         {
           return true;
         }
-      
+
       // Retrieve all the elements.
       CORBA::Boolean _tao_marshal_flag = true;
-      
+
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm >> _tao_sequence[i]);
         }
-      
+
       return _tao_marshal_flag;
-    
+
     }
-  
+
   return false;
 }
 
diff --git a/TAO/tao/Strategies/uiop_endpointsC.cpp b/TAO/tao/Strategies/uiop_endpointsC.cpp
index 47b181cab77..293514fbdec 100644
--- a/TAO/tao/Strategies/uiop_endpointsC.cpp
+++ b/TAO/tao/Strategies/uiop_endpointsC.cpp
@@ -31,13 +31,13 @@
 
 #include "uiop_endpointsC.h"
 #include "tao/CDR.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Sequence_TypeCode_Static.h"
-#include "tao/String_TypeCode_Static.h"
-#include "tao/Struct_TypeCode_Static.h"
-#include "tao/TypeCode_Struct_Field.h"
+#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Sequence_TypeCode_Static.h"
+#include "tao/AnyTypeCode/String_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Struct_TypeCode_Static.h"
+#include "tao/AnyTypeCode/TypeCode_Struct_Field.h"
 
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
@@ -59,7 +59,7 @@ static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> co
   {
     { "rendezvous_point", &CORBA::_tc_string },
     { "priority", &CORBA::_tc_short }
-    
+
   };
 static TAO::TypeCode::Struct<char const *,
                              CORBA::TypeCode_ptr const *,
@@ -72,16 +72,16 @@ static TAO::TypeCode::Struct<char const *,
     "TAO_UIOP_Endpoint_Info",
     _tao_fields_TAO_UIOP_Endpoint_Info,
     2);
-  
+
 ::CORBA::TypeCode_ptr const _tc_TAO_UIOP_Endpoint_Info =
   &_tao_tc_TAO_UIOP_Endpoint_Info;
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be/be_visitor_structure/structure_cs.cpp:66
 
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be/be_visitor_sequence/sequence_cs.cpp:65
 
 #if !defined (_TAO_UIOPENDPOINTSEQUENCE_CS_)
@@ -146,10 +146,10 @@ namespace TAO
         CORBA::tk_sequence,
         &_tc_TAO_UIOP_Endpoint_Info,
         0U);
-      
+
     ::CORBA::TypeCode_ptr const tc_TAO_UIOPEndpointSequence_0 =
       &TAO_UIOPEndpointSequence_0;
-    
+
   }
 }
 
@@ -163,7 +163,7 @@ static TAO::TypeCode::Alias<char const *,
     "IDL:TAO_UIOPEndpointSequence:1.0",
     "TAO_UIOPEndpointSequence",
     &TAO::TypeCode::tc_TAO_UIOPEndpointSequence_0);
-  
+
 ::CORBA::TypeCode_ptr const _tc_TAO_UIOPEndpointSequence =
   &_tao_tc_TAO_UIOPEndpointSequence;
 
@@ -202,20 +202,20 @@ CORBA::Boolean operator<< (
   )
 {
   const CORBA::ULong _tao_seq_len = _tao_sequence.length ();
-  
+
   if (strm << _tao_seq_len)
     {
       // Encode all elements.
       CORBA::Boolean _tao_marshal_flag = true;
-      
+
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm << _tao_sequence[i]);
         }
-      
+
       return _tao_marshal_flag;
     }
-  
+
   return false;
 }
 
@@ -225,7 +225,7 @@ CORBA::Boolean operator>> (
   )
 {
   CORBA::ULong _tao_seq_len;
-  
+
   if (strm >> _tao_seq_len)
     {
       // Add a check to the length of the sequence
@@ -235,28 +235,28 @@ CORBA::Boolean operator>> (
         {
           return false;
         }
-      
+
       // Set the length of the sequence.
       _tao_sequence.length (_tao_seq_len);
-      
+
       // If length is 0 we return true.
-      if (0 >= _tao_seq_len) 
+      if (0 >= _tao_seq_len)
         {
           return true;
         }
-      
+
       // Retrieve all the elements.
       CORBA::Boolean _tao_marshal_flag = true;
-      
+
       for (CORBA::ULong i = 0; i < _tao_seq_len && _tao_marshal_flag; ++i)
         {
           _tao_marshal_flag = (strm >> _tao_sequence[i]);
         }
-      
+
       return _tao_marshal_flag;
-    
+
     }
-  
+
   return false;
 }
 
diff --git a/TAO/tao/StringSeqA.cpp b/TAO/tao/StringSeqA.cpp
deleted file mode 100644
index 625c670659c..00000000000
--- a/TAO/tao/StringSeqA.cpp
+++ /dev/null
@@ -1,143 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "StringSeqC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Sequence_TypeCode_Static.h"
-#include "tao/String_TypeCode_Static.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Dual_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:937
-
-
-#ifndef _TAO_TYPECODE_CORBA_StringSeq_GUARD
-#define _TAO_TYPECODE_CORBA_StringSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_StringSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_string,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_StringSeq_0 =
-      &CORBA_StringSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_StringSeq_GUARD */
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_StringSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/StringSeq:1.0",
-    "StringSeq",
-    &TAO::TypeCode::tc_CORBA_StringSeq_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_StringSeq =
-    &_tao_tc_CORBA_StringSeq;
-}
-
-
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::StringSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::StringSeq>::insert_copy (
-      _tao_any,
-      CORBA::StringSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_StringSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::StringSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::StringSeq>::insert (
-      _tao_any,
-      CORBA::StringSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_StringSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::StringSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::StringSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::StringSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::StringSeq>::extract (
-        _tao_any,
-        CORBA::StringSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_StringSeq_0,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/StringSeqC.cpp b/TAO/tao/StringSeqC.cpp
index 4ee23832b66..5e3db1770bc 100644
--- a/TAO/tao/StringSeqC.cpp
+++ b/TAO/tao/StringSeqC.cpp
@@ -26,16 +26,12 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:291
+// be\be_codegen.cpp:277
 
 
 #include "StringSeqC.h"
 #include "tao/CDR.h"
 
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
diff --git a/TAO/tao/StringSeqC.h b/TAO/tao/StringSeqC.h
index e039c5b516c..9cfebe0ca70 100644
--- a/TAO/tao/StringSeqC.h
+++ b/TAO/tao/StringSeqC.h
@@ -26,10 +26,10 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:153
+// be\be_codegen.cpp:154
 
-#ifndef _TAO_IDL_ORIG_STRINGSEQC_H_
-#define _TAO_IDL_ORIG_STRINGSEQC_H_
+#ifndef _TAO_IDL_STRINGSEQC_H_
+#define _TAO_IDL_STRINGSEQC_H_
 
 #include /**/ "ace/pre.h"
 
@@ -52,17 +52,8 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_Export
 
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:49
 
 namespace CORBA
 {
@@ -112,14 +103,9 @@ namespace CORBA
   };
 
 #endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_StringSeq;
 
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:78
 
 } // module CORBA
 
@@ -132,14 +118,6 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const CORBA::StringSeq &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, CORBA::StringSeq*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::StringSeq *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::StringSeq *&);
-
-// TAO_IDL - Generated from
 // be\be_visitor_sequence/cdr_op_ch.cpp:71
 
 #if !defined _TAO_CDR_OP_CORBA_StringSeq_H_
@@ -157,15 +135,7 @@ TAO_Export CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_CORBA_StringSeq_H_ */
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
+// be\be_codegen.cpp:1028
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/tao/String_TypeCode.cpp b/TAO/tao/String_TypeCode.cpp
deleted file mode 100644
index ecf53573cfd..00000000000
--- a/TAO/tao/String_TypeCode.cpp
+++ /dev/null
@@ -1,91 +0,0 @@
-// $Id$
-
-#ifndef TAO_STRING_TYPECODE_CPP
-#define TAO_STRING_TYPECODE_CPP
-
-#include "tao/String_TypeCode.h"
-#include "tao/CDR.h"
-
-#ifndef __ACE_INLINE__
-# include "tao/String_TypeCode.inl"
-#endif  /* !__ACE_INLINE__ */
-
-
-template <class RefCountPolicy>
-bool
-TAO::TypeCode::String<RefCountPolicy>::tao_marshal (TAO_OutputCDR & cdr,
-                                                    CORBA::ULong) const
-{
-  // A tk_string TypeCode has a "simple" parameter list type (see
-  // Table 15-2 in Section 15.3.5.1 "TypeCode" in the CDR section of
-  // the CORBA specification), meaning that its parameter(s) must be
-  // marshaled immediately following the TCKind.  No CDR encapsulation
-  // is to be created.
-
-  return (cdr << this->length_);
-}
-
-template <class RefCountPolicy>
-void
-TAO::TypeCode::String<RefCountPolicy>::tao_duplicate (void)
-{
-  this->RefCountPolicy::add_ref ();
-}
-
-template <class RefCountPolicy>
-void
-TAO::TypeCode::String<RefCountPolicy>::tao_release (void)
-{
-  this->RefCountPolicy::remove_ref ();
-}
-
-template <class RefCountPolicy>
-CORBA::Boolean
-TAO::TypeCode::String<RefCountPolicy>::equal_i (CORBA::TypeCode_ptr tc
-                                                ACE_ENV_ARG_DECL) const
-{
-  // The following call won't throw since CORBA::TypeCode::equal() has
-  // already established the kind of tc is the same as our kind.
-  CORBA::ULong const tc_length = tc->length (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  return (this->length_ == tc_length);
-}
-
-template <class RefCountPolicy>
-CORBA::Boolean
-TAO::TypeCode::String<RefCountPolicy>::equivalent_i (CORBA::TypeCode_ptr tc
-                                                     ACE_ENV_ARG_DECL) const
-{
-  // Since TCKind comparisons must be performed before equal_i() is
-  // called, we can also call it to determine equivalence of
-  // tk_string-based TypeCodes.
-  return this->equal_i (tc
-                        ACE_ENV_ARG_PARAMETER);
-}
-
-template <class RefCountPolicy>
-CORBA::TypeCode_ptr
-TAO::TypeCode::String<RefCountPolicy>::get_compact_typecode_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  // Already compact since tk_string and tk_wstring TypeCodes have no
-  // name or member names, meaning that we can simply call
-  // _duplicate() on this TypeCode.
-
-  CORBA::TypeCode_ptr mutable_tc =
-    const_cast<TAO::TypeCode::String<RefCountPolicy> *> (this);
-
-  return CORBA::TypeCode::_duplicate (mutable_tc);
-}
-
-template <class RefCountPolicy>
-CORBA::ULong
-TAO::TypeCode::String<RefCountPolicy>::length_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  return this->length_;
-}
-
-
-#endif  /* TAO_STRING_TYPECODE_CPP */
diff --git a/TAO/tao/String_TypeCode.h b/TAO/tao/String_TypeCode.h
deleted file mode 100644
index 5a3161c9a64..00000000000
--- a/TAO/tao/String_TypeCode.h
+++ /dev/null
@@ -1,111 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    String_TypeCode.h
- *
- *  $Id$
- *
- *  Header file for @c CORBA::tk_string or @c CORBA::tk_wstring
- *  @c CORBA::TypeCodes.
- *
- *  @author Ossama Othman <ossama@dre.vanderbilt.edu>
- */
-//=============================================================================
-
-#ifndef TAO_STRING_TYPECODE_H
-#define TAO_STRING_TYPECODE_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/TypeCode.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-namespace TAO
-{
-  namespace TypeCode
-  {
-
-    /**
-     * @class String
-     *
-     * @brief @c CORBA::TypeCode implementation for OMG IDL string
-     *        types.
-     *
-     * This class implements a @c CORBA::TypeCode for OMG IDL string
-     * types, including @c wstring.
-     */
-    template <class RefCountPolicy>
-    class String
-      : public CORBA::TypeCode,
-        private RefCountPolicy
-    {
-    public:
-
-      /// Constructor.
-      String (CORBA::TCKind kind, CORBA::ULong length);
-
-      /**
-       * @name TAO-specific @c CORBA::TypeCode Methods
-       *
-       * Methods required by TAO's implementation of the
-       * @c CORBA::TypeCode class.
-       *
-       * @see @c CORBA::TypeCode
-       */
-      //@{
-      virtual bool tao_marshal (TAO_OutputCDR & cdr,
-                                CORBA::ULong offset) const;
-      virtual void tao_duplicate (void);
-      virtual void tao_release (void);
-      //@}
-
-    protected:
-
-      /**
-       * @name @c TAO CORBA::TypeCode Template Methods
-       *
-       * @c CORBA::TypeCode template methods specific to @c tk_string
-       * @c TypeCodes.
-       *
-       * @see @c CORBA::TypeCode
-       */
-      //@{
-      virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc
-                                      ACE_ENV_ARG_DECL) const;
-      virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc
-                                           ACE_ENV_ARG_DECL) const;
-      virtual CORBA::TypeCode_ptr get_compact_typecode_i (
-        ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual CORBA::ULong length_i (ACE_ENV_SINGLE_ARG_DECL) const;
-
-    private:
-
-      /// Length of the @c string.  A length of zero indicates an
-      /// unbounded @c string.
-      CORBA::ULong const length_;
-
-    };
-
-  }  // End namespace TypeCode
-}  // End namespace TAO
-
-
-#ifdef __ACE_INLINE__
-# include "tao/String_TypeCode.inl"
-#endif  /* __ACE_INLINE__ */
-
-#ifdef ACE_TEMPLATES_REQUIRE_SOURCE
-# include "tao/String_TypeCode.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#ifdef ACE_TEMPLATES_REQUIRE_PRAGMA
-# pragma implementation ("String_TypeCode.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_STRING_TYPECODE_H */
diff --git a/TAO/tao/String_TypeCode.inl b/TAO/tao/String_TypeCode.inl
deleted file mode 100644
index 90e8e887c3b..00000000000
--- a/TAO/tao/String_TypeCode.inl
+++ /dev/null
@@ -1,14 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-template <class RefCountPolicy>
-ACE_INLINE
-TAO::TypeCode::String<RefCountPolicy>::String (CORBA::TCKind kind,
-                                               CORBA::ULong length)
-  : CORBA::TypeCode (kind)
-  , RefCountPolicy ()
-  , length_ (length)
-{
-  // ACE_ASSERT (kind == CORBA::tk_string || kind == CORBA::tk_wstring);
-}
diff --git a/TAO/tao/String_TypeCode_Static.cpp b/TAO/tao/String_TypeCode_Static.cpp
deleted file mode 100644
index 2a5064570a7..00000000000
--- a/TAO/tao/String_TypeCode_Static.cpp
+++ /dev/null
@@ -1,84 +0,0 @@
-// $Id$
-
-#include "tao/String_TypeCode_Static.h"
-#include "tao/CDR.h"
-
-#ifndef __ACE_INLINE__
-# include "tao/String_TypeCode_Static.inl"
-#endif  /* !__ACE_INLINE__ */
-
-
-ACE_RCSID (tao,
-           String_TypeCode_Static,
-           "$Id$")
-
-
-bool
-TAO::TypeCode::String<TAO::Null_RefCount_Policy>::tao_marshal (
-  TAO_OutputCDR & cdr,
-  CORBA::ULong) const
-{
-  // A tk_string TypeCode has a "simple" parameter list type (see
-  // Table 15-2 in Section 15.3.5.1 "TypeCode" in the CDR section of
-  // the CORBA specification), meaning that its parameter(s) must be
-  // marshaled immediately following the TCKind.  No CDR encapsulation
-  // is to be created.
-
-  return (cdr << this->length_);
-}
-
-void
-TAO::TypeCode::String<TAO::Null_RefCount_Policy>::tao_duplicate (void)
-{
-}
-
-void
-TAO::TypeCode::String<TAO::Null_RefCount_Policy>::tao_release (void)
-{
-}
-
-CORBA::Boolean
-TAO::TypeCode::String<TAO::Null_RefCount_Policy>::equal_i (
-  CORBA::TypeCode_ptr tc
-  ACE_ENV_ARG_DECL) const
-{
-  // The following call won't throw since CORBA::TypeCode::equal() has
-  // already established the kind of tc is the same as our kind.
-  CORBA::ULong const tc_length = tc->length (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  return (this->length_ == tc_length);
-}
-
-CORBA::Boolean
-TAO::TypeCode::String<TAO::Null_RefCount_Policy>::equivalent_i (
-  CORBA::TypeCode_ptr tc
-  ACE_ENV_ARG_DECL) const
-{
-  // Since TCKind comparisons must be performed before equal_i() is
-  // called, we can also call it to determine equivalence of
-  // tk_string-based TypeCodes.
-  return this->equal_i (tc
-                        ACE_ENV_ARG_PARAMETER);
-}
-
-CORBA::TypeCode_ptr
-TAO::TypeCode::String<TAO::Null_RefCount_Policy>::get_compact_typecode_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  // Already compact since tk_string and tk_wstring TypeCodes have no
-  // name or member names, meaning that we can simply call
-  // _duplicate() on this TypeCode.
-
-  CORBA::TypeCode_ptr mutable_tc =
-    const_cast<TAO::TypeCode::String<TAO::Null_RefCount_Policy> *> (this);
-
-  return CORBA::TypeCode::_duplicate (mutable_tc);
-}
-
-CORBA::ULong
-TAO::TypeCode::String<TAO::Null_RefCount_Policy>::length_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  return this->length_;
-}
diff --git a/TAO/tao/String_TypeCode_Static.h b/TAO/tao/String_TypeCode_Static.h
deleted file mode 100644
index 4ceedbdf135..00000000000
--- a/TAO/tao/String_TypeCode_Static.h
+++ /dev/null
@@ -1,107 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    String_TypeCode_Static.h
- *
- *  $Id$
- *
- *  Header file for static @c CORBA::tk_string or @c CORBA::tk_wstring
- *  @c CORBA::TypeCodes.
- *
- *  @author Ossama Othman <ossama@dre.vanderbilt.edu>
- */
-//=============================================================================
-
-#ifndef TAO_STRING_TYPECODE_STATIC_H
-#define TAO_STRING_TYPECODE_STATIC_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/TypeCode.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/Null_RefCount_Policy.h"
-
-
-namespace TAO
-{
-  namespace TypeCode
-  {
-    template <class RefCountPolicy> class String;
-
-    /**
-     * @class String
-     *
-     * @brief @c CORBA::TypeCode implementation for OMG IDL string
-     *        types.
-     *
-     * This class implements a @c CORBA::TypeCode for OMG IDL string
-     * types, including @c wstring.
-     */
-    template<>
-    class TAO_Export String<TAO::Null_RefCount_Policy>
-      : public CORBA::TypeCode,
-        private TAO::Null_RefCount_Policy
-    {
-    public:
-
-      /// Constructor.
-      String (CORBA::TCKind kind, CORBA::ULong length);
-
-      /**
-       * @name TAO-specific @c CORBA::TypeCode Methods
-       *
-       * Methods required by TAO's implementation of the
-       * @c CORBA::TypeCode class.
-       *
-       * @see @c CORBA::TypeCode
-       */
-      //@{
-      virtual bool tao_marshal (TAO_OutputCDR & cdr,
-                                CORBA::ULong offset) const;
-      virtual void tao_duplicate (void);
-      virtual void tao_release (void);
-      //@}
-
-    protected:
-
-      /**
-       * @name @c TAO CORBA::TypeCode Template Methods
-       *
-       * @c CORBA::TypeCode template methods specific to @c tk_string
-       * @c TypeCodes.
-       *
-       * @see @c CORBA::TypeCode
-       */
-      //@{
-      virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc
-                                      ACE_ENV_ARG_DECL) const;
-      virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc
-                                           ACE_ENV_ARG_DECL) const;
-      virtual CORBA::TypeCode_ptr get_compact_typecode_i (
-        ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual CORBA::ULong length_i (ACE_ENV_SINGLE_ARG_DECL) const;
-
-    private:
-
-      /// Length of the @c string.  A length of zero indicates an
-      /// unbounded @c string.
-      CORBA::ULong const length_;
-
-    };
-
-  }  // End namespace TypeCode
-}  // End namespace TAO
-
-
-#ifdef __ACE_INLINE__
-# include "tao/String_TypeCode_Static.inl"
-#endif  /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_STRING_TYPECODE_STATIC_H */
diff --git a/TAO/tao/String_TypeCode_Static.inl b/TAO/tao/String_TypeCode_Static.inl
deleted file mode 100644
index 4d42413daa1..00000000000
--- a/TAO/tao/String_TypeCode_Static.inl
+++ /dev/null
@@ -1,14 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-ACE_INLINE
-TAO::TypeCode::String<TAO::Null_RefCount_Policy>::String (
-  CORBA::TCKind kind,
-  CORBA::ULong length)
-  : CORBA::TypeCode (kind)
-  , ACE_NESTED_CLASS (TAO, Null_RefCount_Policy) ()
-  , length_ (length)
-{
-  // ACE_ASSERT (kind == CORBA::tk_string || kind == CORBA::tk_wstring);
-}
diff --git a/TAO/tao/String_TypeCode_Traits.h b/TAO/tao/String_TypeCode_Traits.h
deleted file mode 100644
index fe287367100..00000000000
--- a/TAO/tao/String_TypeCode_Traits.h
+++ /dev/null
@@ -1,77 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    String_TypeCode_Traits.h
- *
- *  $Id$
- *
- *  Header file for bound
- *    @c tk_string,
- *    @c tk_wstring,
- *  @c CORBA::TypeCode factories.
- *
- *  @author Ossama Othman <ossama@dre.vanderbilt.edu>
- */
-//=============================================================================
-
-#ifndef TAO_STRING_TYPECODE_TRAITS_H
-#define TAO_STRING_TYPECODE_TRAITS_H
-
-#include /**/ "ace/pre.h"
-
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/String_TypeCode.h"
-#include "tao/True_RefCount_Policy.h"
-
-namespace TAO
-{
-  namespace TypeCodeFactory
-  {
-    template <typename T> struct String_Traits;
-
-    template<>
-    struct String_Traits<CORBA::Any::from_string>
-    {
-      static CORBA::TypeCode_ptr create_typecode (CORBA::TCKind kind,
-                                                  CORBA::ULong bound)
-      {
-        typedef TAO::TypeCode::String<TAO::True_RefCount_Policy> typecode_type;
-
-        CORBA::TypeCode_ptr tc = CORBA::TypeCode::_nil ();
-        ACE_NEW_RETURN (tc,
-                        typecode_type (kind, bound),
-                        tc);
-
-        return tc;
-      }
-    };
-
-    template <>
-    struct String_Traits<CORBA::Any::from_wstring>
-    {
-      static CORBA::TypeCode_ptr create_typecode (CORBA::TCKind kind,
-                                                  CORBA::ULong bound)
-      {
-        typedef TAO::TypeCode::String<TAO::True_RefCount_Policy> typecode_type;
-
-        CORBA::TypeCode_ptr tc = CORBA::TypeCode::_nil ();
-        ACE_NEW_RETURN (tc,
-                        typecode_type (kind, bound),
-                        tc);
-
-        return tc;
-      }
-    };
-
-  }  // End namespace TypeCodeFactory
-}  // End namespace TAO
-
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_STRING_TYPECODE_TRAITS_H */
diff --git a/TAO/tao/Struct_TypeCode.cpp b/TAO/tao/Struct_TypeCode.cpp
deleted file mode 100644
index ccbdf3940a5..00000000000
--- a/TAO/tao/Struct_TypeCode.cpp
+++ /dev/null
@@ -1,346 +0,0 @@
-// $Id$
-
-#ifndef TAO_STRUCT_TYPECODE_CPP
-#define TAO_STRUCT_TYPECODE_CPP
-
-#include "tao/Struct_TypeCode.h"
-#include "tao/TypeCode_Struct_Field.h"
-#include "tao/TypeCode_Traits.h"
-#include "tao/ORB_Core.h"
-#include "tao/TypeCodeFactory_Adapter.h"
-#include "tao/CDR.h"
-
-
-#ifndef __ACE_INLINE__
-# include "tao/Struct_TypeCode.inl"
-#endif  /* !__ACE_INLINE__ */
-
-#include "ace/Dynamic_Service.h"
-
-
-template <typename StringType,
-          typename TypeCodeType,
-          class FieldArrayType,
-          class RefCountPolicy>
-bool
-TAO::TypeCode::Struct<StringType,
-                      TypeCodeType,
-                      FieldArrayType,
-                      RefCountPolicy>::tao_marshal (TAO_OutputCDR & cdr,
-                                                    CORBA::ULong offset) const
-{
-  // A tk_struct TypeCode has a "complex" parameter list type (see
-  // Table 15-2 in Section 15.3.5.1 "TypeCode" in the CDR section of
-  // the CORBA specification), meaning that it must be marshaled into
-  // a CDR encapsulation.
-
-  // Create a CDR encapsulation.
-  TAO_OutputCDR enc;
-
-  // Account for the encoded CDR encapsulation length and byte order.
-  //
-  // Aligning on an octet since the next value after the CDR
-  // encapsulation length will always be the byte order octet/boolean
-  // in this case.
-  offset = ACE_align_binary (offset + 4,
-                             ACE_CDR::OCTET_ALIGN);
-
-  bool const success =
-    (enc << TAO_OutputCDR::from_boolean (TAO_ENCAP_BYTE_ORDER))
-    && (enc << TAO_OutputCDR::from_string (this->base_attributes_.id (), 0))
-    && (enc << TAO_OutputCDR::from_string (this->base_attributes_.name (), 0))
-    && (enc << this->nfields_);
-
-  if (!success)
-    return false;
-
-  Struct_Field<StringType, TypeCodeType> const * const begin =
-    &this->fields_[0];
-  Struct_Field<StringType, TypeCodeType> const * const end =
-    begin + this->nfields_;
-
-  for (Struct_Field<StringType, TypeCodeType> const * i = begin; i != end; ++i)
-    {
-      Struct_Field<StringType, TypeCodeType> const & field = *i;
-
-      if (!(enc << TAO_OutputCDR::from_string (
-                       Traits<StringType>::get_string (field.name), 0))
-          || !marshal (enc,
-                       Traits<StringType>::get_typecode (field.type),
-                       offset + enc.total_length ()))
-        return false;
-    }
-
-  return
-    cdr << static_cast<CORBA::ULong> (enc.total_length ())
-    && cdr.write_octet_array_mb (enc.begin ());
-}
-
-template <typename StringType,
-          typename TypeCodeType,
-          class FieldArrayType,
-          class RefCountPolicy>
-void
-TAO::TypeCode::Struct<StringType,
-                      TypeCodeType,
-                      FieldArrayType,
-                      RefCountPolicy>::tao_duplicate (void)
-{
-  this->RefCountPolicy::add_ref ();
-}
-
-template <typename StringType,
-          typename TypeCodeType,
-          class FieldArrayType,
-          class RefCountPolicy>
-void
-TAO::TypeCode::Struct<StringType,
-                      TypeCodeType,
-                      FieldArrayType,
-                      RefCountPolicy>::tao_release (void)
-{
-  this->RefCountPolicy::remove_ref ();
-}
-
-template <typename StringType,
-          typename TypeCodeType,
-          class FieldArrayType,
-          class RefCountPolicy>
-CORBA::Boolean
-TAO::TypeCode::Struct<StringType,
-                      TypeCodeType,
-                      FieldArrayType,
-                      RefCountPolicy>::equal_i (
-  CORBA::TypeCode_ptr tc
-  ACE_ENV_ARG_DECL) const
-{
-  // This call shouldn't throw since CORBA::TypeCode::equal() verified
-  // that the TCKind is the same as our's prior to invoking this
-  // method, meaning that member_count() is supported.
-
-  CORBA::ULong const tc_nfields =
-    tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
-
-  if (tc_nfields != this->nfields_)
-    return false;
-
-  for (CORBA::ULong i = 0; i < this->nfields_; ++i)
-    {
-      Struct_Field<StringType, TypeCodeType> const & lhs_field =
-        this->fields_[i];
-
-      char const * const lhs_name =
-        Traits<StringType>::get_string (lhs_field.name);
-      char const * const rhs_name = tc->member_name (i
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (false);
-
-      if (ACE_OS::strcmp (lhs_name, rhs_name) != 0)
-        return false;
-
-      CORBA::TypeCode_ptr const lhs_tc =
-        Traits<StringType>::get_typecode (lhs_field.type);
-      CORBA::TypeCode_var const rhs_tc =
-        tc->member_type (i
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (false);
-
-      CORBA::Boolean const equal_members =
-        lhs_tc->equal (rhs_tc.in ()
-                       ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (false);
-
-      if (!equal_members)
-        return false;
-    }
-
-  return true;
-}
-
-template <typename StringType,
-          typename TypeCodeType,
-          class FieldArrayType,
-          class RefCountPolicy>
-CORBA::Boolean
-TAO::TypeCode::Struct<StringType,
-                      TypeCodeType,
-                      FieldArrayType,
-                      RefCountPolicy>::equivalent_i (
-  CORBA::TypeCode_ptr tc
-  ACE_ENV_ARG_DECL) const
-{
-  // Perform a structural comparison, excluding the name() and
-  // member_name() operations.
-
-  CORBA::ULong const tc_nfields =
-    tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
-
-  if (tc_nfields != this->nfields_)
-    return false;
-
-  for (CORBA::ULong i = 0; i < this->nfields_; ++i)
-    {
-      CORBA::TypeCode_ptr const lhs =
-        Traits<StringType>::get_typecode (this->fields_[i].type);
-      CORBA::TypeCode_var const rhs =
-        tc->member_type (i
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (false);
-
-      CORBA::Boolean const equiv_members =
-        lhs->equivalent (rhs.in ()
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (false);
-
-      if (!equiv_members)
-        return false;
-    }
-
-  return true;
-}
-
-template <typename StringType,
-          typename TypeCodeType,
-          class FieldArrayType,
-          class RefCountPolicy>
-CORBA::TypeCode_ptr
-TAO::TypeCode::Struct<StringType,
-                      TypeCodeType,
-                      FieldArrayType,
-                      RefCountPolicy>::get_compact_typecode_i (
-  ACE_ENV_SINGLE_ARG_DECL) const
-{
-  ACE_Array_Base<Struct_Field<CORBA::String_var,
-                              CORBA::TypeCode_var> >
-    tc_fields (this->nfields_);
-
-  if (this->nfields_ > 0)
-    {
-      // Dynamically construct a new array of fields stripped of
-      // member names.
-
-      static char const empty_name[] = "";
-
-      for (CORBA::ULong i = 0; i < this->nfields_; ++i)
-        {
-          // Member names will be stripped, i.e. not embedded within
-          // the compact TypeCode.
-
-          tc_fields[i].name = empty_name;
-          tc_fields[i].type =
-            Traits<StringType>::get_typecode (
-              this->fields_[i].type)->get_compact_typecode (
-                ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
-        }
-    }
-
-  TAO_TypeCodeFactory_Adapter * const adapter =
-    ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
-      TAO_ORB_Core::typecodefactory_adapter_name ());
-
-  if (adapter == 0)
-    {
-      ACE_THROW_RETURN (CORBA::INTERNAL (),
-                        CORBA::TypeCode::_nil ());
-    }
-
-  return
-    adapter->create_struct_except_tc (this->kind_,
-                                      this->base_attributes_.id (),
-                                      ""  /* empty name */,
-                                      tc_fields,
-                                      this->nfields_
-                                      ACE_ENV_ARG_PARAMETER);
-}
-
-template <typename StringType,
-          typename TypeCodeType,
-          class FieldArrayType,
-          class RefCountPolicy>
-char const *
-TAO::TypeCode::Struct<StringType,
-                      TypeCodeType,
-                      FieldArrayType,
-                      RefCountPolicy>::id_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  // Ownership is retained by the TypeCode, as required by the C++
-  // mapping.
-  return this->base_attributes_.id ();
-}
-
-template <typename StringType,
-          typename TypeCodeType,
-          class FieldArrayType,
-          class RefCountPolicy>
-char const *
-TAO::TypeCode::Struct<StringType,
-                      TypeCodeType,
-                      FieldArrayType,
-                      RefCountPolicy>::name_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  // Ownership is retained by the TypeCode, as required by the C++
-  // mapping.
-  return this->base_attributes_.name ();
-}
-
-template <typename StringType,
-          typename TypeCodeType,
-          class FieldArrayType,
-          class RefCountPolicy>
-CORBA::ULong
-TAO::TypeCode::Struct<StringType,
-                      TypeCodeType,
-                      FieldArrayType,
-                      RefCountPolicy>::member_count_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  return this->nfields_;
-}
-
-template <typename StringType,
-          typename TypeCodeType,
-          class FieldArrayType,
-          class RefCountPolicy>
-char const *
-TAO::TypeCode::Struct<StringType,
-                      TypeCodeType,
-                      FieldArrayType,
-                      RefCountPolicy>::member_name_i (
-  CORBA::ULong index
-  ACE_ENV_ARG_DECL) const
-{
-  // Ownership is retained by the TypeCode, as required by the C++
-  // mapping.
-  if (index >= this->nfields_)
-    ACE_THROW_RETURN (CORBA::TypeCode::Bounds (), 0);
-
-  return Traits<StringType>::get_string (this->fields_[index].name);
-}
-
-template <typename StringType,
-          typename TypeCodeType,
-          class FieldArrayType,
-          class RefCountPolicy>
-CORBA::TypeCode_ptr
-TAO::TypeCode::Struct<StringType,
-                      TypeCodeType,
-                      FieldArrayType,
-                      RefCountPolicy>::member_type_i (
-  CORBA::ULong index
-  ACE_ENV_ARG_DECL) const
-{
-  if (index >= this->nfields_)
-    ACE_THROW_RETURN (CORBA::TypeCode::Bounds (),
-                      CORBA::TypeCode::_nil ());
-
-  return
-    CORBA::TypeCode::_duplicate (
-      Traits<StringType>::get_typecode (this->fields_[index].type));
-}
-
-#endif  /* TAO_STRUCT_TYPECODE_CPP */
diff --git a/TAO/tao/Struct_TypeCode.h b/TAO/tao/Struct_TypeCode.h
deleted file mode 100644
index 30420bca0a1..00000000000
--- a/TAO/tao/Struct_TypeCode.h
+++ /dev/null
@@ -1,156 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Struct_TypeCode.h
- *
- *  $Id$
- *
- *  Header file for a @c tk_struct and @c tk_except
- *  @c CORBA::TypeCodes.
- *
- *  @author Ossama Othman <ossama@dre.vanderbilt.edu>
- *  @author Carlos O'Ryan
- */
-//=============================================================================
-
-#ifndef TAO_STRUCT_TYPECODE_H
-#define TAO_STRUCT_TYPECODE_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/TypeCode.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TypeCode_Base_Attributes.h"
-
-
-namespace TAO
-{
-  namespace TypeCode
-  {
-    template<typename StringType, typename TypeCodeType> struct Struct_Field;
-
-    /**
-     * @class Struct
-     *
-     * @brief @c CORBA::TypeCode implementation for an OMG IDL
-     *        @c struct or @c exception.
-     *
-     * This class implements a @c CORBA::TypeCode for an OMG IDL
-     * @c struct or @c exception.
-     */
-    template <typename StringType,
-              typename TypeCodeType,
-              class FieldArrayType,
-              class RefCountPolicy>
-    class Struct
-      : public CORBA::TypeCode,
-        private RefCountPolicy
-    {
-    public:
-
-      /// Constructor.
-      Struct (CORBA::TCKind kind,
-              char const * id,
-              char const * name,
-              FieldArrayType const & fields,
-              CORBA::ULong nfields);
-
-      /// Constructor used for recursive TypeCodes.
-      Struct (CORBA::TCKind kind,
-              char const * id);
-
-      /**
-       * @name TAO-specific @c CORBA::TypeCode Methods
-       *
-       * Methods required by TAO's implementation of the
-       * @c CORBA::TypeCode class.
-       *
-       * @see @c CORBA::TypeCode
-       */
-      //@{
-      virtual bool tao_marshal (TAO_OutputCDR & cdr,
-                                CORBA::ULong offset) const;
-      virtual void tao_duplicate (void);
-      virtual void tao_release (void);
-      //@}
-
-    protected:
-
-      /**
-       * @name @c TAO CORBA::TypeCode Template Methods
-       *
-       * @c tk_struct or @c tk_except @c CORBA::TypeCode -specific
-       * template methods.
-       *
-       * @see @c CORBA::TypeCode
-       */
-      //@{
-      virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc
-                                      ACE_ENV_ARG_DECL) const;
-      virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc
-                                           ACE_ENV_ARG_DECL) const;
-      virtual CORBA::TypeCode_ptr get_compact_typecode_i (
-        ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual char const * id_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual char const * name_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual CORBA::ULong member_count_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual char const * member_name_i (CORBA::ULong index
-                                          ACE_ENV_ARG_DECL) const;
-      virtual CORBA::TypeCode_ptr member_type_i (CORBA::ULong index
-                                                 ACE_ENV_ARG_DECL) const;
-      //@}
-
-    protected:
-
-      /**
-       * @c Struct Attributes
-       *
-       * Attributes representing the structure of an OMG IDL
-       * @c struct or @c exception.
-       *
-       * @note These attributes are declared in the order in which
-       *       they are marshaled into a CDR stream in order to
-       *       increase cache hits by improving spatial locality.
-       */
-      //@{
-
-      /// Base attributes containing repository ID and name of
-      /// structure type.
-      Base_Attributes<StringType> base_attributes_;
-
-      /// The number of fields in the OMG IDL structure.
-      CORBA::ULong nfields_;
-
-      /// Array of @c TAO::TypeCode fields representing structure of the
-      /// OMG IDL defined @c struct.
-      FieldArrayType fields_;
-
-      //@}
-
-    };
-
-  }  // End namespace TypeCode
-}  // End namespace TAO
-
-
-#ifdef __ACE_INLINE__
-# include "tao/Struct_TypeCode.inl"
-#endif  /* __ACE_INLINE__ */
-
-#ifdef ACE_TEMPLATES_REQUIRE_SOURCE
-# include "tao/Struct_TypeCode.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#ifdef ACE_TEMPLATES_REQUIRE_PRAGMA
-# pragma implementation ("Struct_TypeCode.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_STRUCT_TYPECODE_H */
diff --git a/TAO/tao/Struct_TypeCode.inl b/TAO/tao/Struct_TypeCode.inl
deleted file mode 100644
index eb3da52ae7e..00000000000
--- a/TAO/tao/Struct_TypeCode.inl
+++ /dev/null
@@ -1,47 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-
-template <typename StringType,
-          typename TypeCodeType,
-          class FieldArrayType,
-          class RefCountPolicy>
-ACE_INLINE
-TAO::TypeCode::Struct<StringType,
-                      TypeCodeType,
-                      FieldArrayType,
-                      RefCountPolicy>::Struct (
-  CORBA::TCKind kind,
-  char const * id,
-  char const * name,
-  FieldArrayType const & fields,
-  CORBA::ULong nfields)
-  : CORBA::TypeCode (kind)
-  , RefCountPolicy ()
-  , base_attributes_ (id, name)
-  , nfields_ (nfields)
-  , fields_ (fields)
-{
-}
-
-template <typename StringType,
-          typename TypeCodeType,
-          class FieldArrayType,
-          class RefCountPolicy>
-ACE_INLINE
-TAO::TypeCode::Struct<StringType,
-                      TypeCodeType,
-                      FieldArrayType,
-                      RefCountPolicy>::Struct (
-  CORBA::TCKind kind,
-  char const * id)
-  : CORBA::TypeCode (kind)
-  , RefCountPolicy ()
-  , base_attributes_ (id)
-  , nfields_ (0)
-  , fields_ ()
-{
-  // CORBA::tk_except is not allowed in the recursive TypeCode case.
-  // ACE_ASSERT (kind == CORBA::tk_struct);
-}
diff --git a/TAO/tao/Struct_TypeCode_Static.cpp b/TAO/tao/Struct_TypeCode_Static.cpp
deleted file mode 100644
index 0cbe55aa344..00000000000
--- a/TAO/tao/Struct_TypeCode_Static.cpp
+++ /dev/null
@@ -1,316 +0,0 @@
-// $Id$
-
-#include "tao/Struct_TypeCode_Static.h"
-#include "tao/TypeCode_Struct_Field.h"
-#include "tao/TypeCode_Traits.h"
-#include "tao/ORB_Core.h"
-#include "tao/TypeCodeFactory_Adapter.h"
-#include "tao/CDR.h"
-
-
-#ifndef __ACE_INLINE__
-# include "tao/Struct_TypeCode_Static.inl"
-#endif  /* !__ACE_INLINE__ */
-
-#include "ace/Dynamic_Service.h"
-
-
-ACE_RCSID (tao,
-           Struct_TypeCode_Static,
-           "$Id$")
-
-
-bool
-TAO::TypeCode::Struct<char const *,
-                      CORBA::TypeCode_ptr const *,
-                      TAO::TypeCode::Struct_Field<char const *,
-                                                  CORBA::TypeCode_ptr const *> const *,
-                      TAO::Null_RefCount_Policy>::tao_marshal (
-  TAO_OutputCDR & cdr,
-  CORBA::ULong offset) const
-{
-  // A tk_struct TypeCode has a "complex" parameter list type (see
-  // Table 15-2 in Section 15.3.5.1 "TypeCode" in the CDR section of
-  // the CORBA specification), meaning that it must be marshaled into
-  // a CDR encapsulation.
-
-  // Create a CDR encapsulation.
-  TAO_OutputCDR enc;
-
-  // Account for the encoded CDR encapsulation length and byte order.
-  //
-  // Aligning on an octet since the next value after the CDR
-  // encapsulation length will always be the byte order octet/boolean
-  // in this case.
-  offset = ACE_align_binary (offset + 4,
-                             ACE_CDR::OCTET_ALIGN);
-
-  bool const success =
-    (enc << TAO_OutputCDR::from_boolean (TAO_ENCAP_BYTE_ORDER))
-    && (enc << TAO_OutputCDR::from_string (this->base_attributes_.id (), 0))
-    && (enc << TAO_OutputCDR::from_string (this->base_attributes_.name (), 0))
-    && (enc << this->nfields_);
-
-  if (!success)
-    return false;
-
-  Struct_Field<char const *, CORBA::TypeCode_ptr const *> const * const begin =
-    &this->fields_[0];
-  Struct_Field<char const *, CORBA::TypeCode_ptr const *> const * const end =
-    begin + this->nfields_;
-
-  for (Struct_Field<char const *, CORBA::TypeCode_ptr const *> const * i =
-         begin;
-       i != end;
-       ++i)
-    {
-      Struct_Field<char const *, CORBA::TypeCode_ptr const *> const & field =
-        *i;
-
-      if (!(enc << TAO_OutputCDR::from_string (
-                       Traits<char const *>::get_string (field.name), 0))
-          || !marshal (enc,
-                       Traits<char const *>::get_typecode (field.type),
-                       offset + enc.total_length ()))
-        return false;
-    }
-
-  return
-    cdr << static_cast<CORBA::ULong> (enc.total_length ())
-    && cdr.write_octet_array_mb (enc.begin ());
-}
-
-void
-TAO::TypeCode::Struct<char const *,
-                      CORBA::TypeCode_ptr const *,
-                      TAO::TypeCode::Struct_Field<char const *,
-                                                  CORBA::TypeCode_ptr const *> const *,
-                      TAO::Null_RefCount_Policy>::tao_duplicate (void)
-{
-}
-
-void
-TAO::TypeCode::Struct<char const *,
-                      CORBA::TypeCode_ptr const *,
-                      TAO::TypeCode::Struct_Field<char const *,
-                                                  CORBA::TypeCode_ptr const *> const *,
-                      TAO::Null_RefCount_Policy>::tao_release (void)
-{
-}
-
-CORBA::Boolean
-TAO::TypeCode::Struct<char const *,
-                      CORBA::TypeCode_ptr const *,
-                      TAO::TypeCode::Struct_Field<char const *,
-                                                  CORBA::TypeCode_ptr const *> const *,
-                      TAO::Null_RefCount_Policy>::equal_i (
-  CORBA::TypeCode_ptr tc
-  ACE_ENV_ARG_DECL) const
-{
-  // This call shouldn't throw since CORBA::TypeCode::equal() verified
-  // that the TCKind is the same as our's prior to invoking this
-  // method, meaning that member_count() is supported.
-
-  CORBA::ULong const tc_nfields =
-    tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
-
-  if (tc_nfields != this->nfields_)
-    return false;
-
-  for (CORBA::ULong i = 0; i < this->nfields_; ++i)
-    {
-      Struct_Field<char const *, CORBA::TypeCode_ptr const *> const &
-        lhs_field = this->fields_[i];
-
-      char const * const lhs_name =
-        Traits<char const *>::get_string (lhs_field.name);
-      char const * const rhs_name = tc->member_name (i
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (false);
-
-      if (ACE_OS::strcmp (lhs_name, rhs_name) != 0)
-        return false;
-
-      CORBA::TypeCode_ptr const lhs_tc =
-        Traits<char const *>::get_typecode (lhs_field.type);
-      CORBA::TypeCode_var const rhs_tc =
-        tc->member_type (i
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (false);
-
-      CORBA::Boolean const equal_members =
-        lhs_tc->equal (rhs_tc.in ()
-                       ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (false);
-
-      if (!equal_members)
-        return false;
-    }
-
-  return true;
-}
-
-CORBA::Boolean
-TAO::TypeCode::Struct<char const *,
-                      CORBA::TypeCode_ptr const *,
-                      TAO::TypeCode::Struct_Field<char const *,
-                                                  CORBA::TypeCode_ptr const *> const *,
-                      TAO::Null_RefCount_Policy>::equivalent_i (
-  CORBA::TypeCode_ptr tc
-  ACE_ENV_ARG_DECL) const
-{
-  // Perform a structural comparison, excluding the name() and
-  // member_name() operations.
-
-  CORBA::ULong const tc_nfields =
-    tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
-
-  if (tc_nfields != this->nfields_)
-    return false;
-
-  for (CORBA::ULong i = 0; i < this->nfields_; ++i)
-    {
-      CORBA::TypeCode_ptr const lhs =
-        Traits<char const *>::get_typecode (this->fields_[i].type);
-      CORBA::TypeCode_var const rhs =
-        tc->member_type (i
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (false);
-
-      CORBA::Boolean const equiv_members =
-        lhs->equivalent (rhs.in ()
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (false);
-
-      if (!equiv_members)
-        return false;
-    }
-
-  return true;
-}
-
-CORBA::TypeCode_ptr
-TAO::TypeCode::Struct<char const *,
-                      CORBA::TypeCode_ptr const *,
-                      TAO::TypeCode::Struct_Field<char const *,
-                                                  CORBA::TypeCode_ptr const *> const *,
-                      TAO::Null_RefCount_Policy>::get_compact_typecode_i (
-  ACE_ENV_SINGLE_ARG_DECL) const
-{
-  ACE_Array_Base<Struct_Field<CORBA::String_var,
-                              CORBA::TypeCode_var> >
-    tc_fields (this->nfields_);
-
-  if (this->nfields_ > 0)
-    {
-      // Dynamically construct a new array of fields stripped of
-      // member names.
-
-      static char const empty_name[] = "";
-
-      for (CORBA::ULong i = 0; i < this->nfields_; ++i)
-        {
-          // Member names will be stripped, i.e. not embedded within
-          // the compact TypeCode.
-
-          tc_fields[i].name = empty_name;
-          tc_fields[i].type =
-            Traits<char const *>::get_typecode (
-              this->fields_[i].type)->get_compact_typecode (
-                ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
-        }
-    }
-
-  TAO_TypeCodeFactory_Adapter * const adapter =
-    ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
-      TAO_ORB_Core::typecodefactory_adapter_name ());
-
-  if (adapter == 0)
-    {
-      ACE_THROW_RETURN (CORBA::INTERNAL (),
-                        CORBA::TypeCode::_nil ());
-    }
-
-  return
-    adapter->create_struct_except_tc (this->kind_,
-                                      this->base_attributes_.id (),
-                                      ""  /* empty name */,
-                                      tc_fields,
-                                      this->nfields_
-                                      ACE_ENV_ARG_PARAMETER);
-}
-
-char const *
-TAO::TypeCode::Struct<char const *,
-                      CORBA::TypeCode_ptr const *,
-                      TAO::TypeCode::Struct_Field<char const *,
-                                                  CORBA::TypeCode_ptr const *> const *,
-                      TAO::Null_RefCount_Policy>::id_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  // Ownership is retained by the TypeCode, as required by the C++
-  // mapping.
-  return this->base_attributes_.id ();
-}
-
-char const *
-TAO::TypeCode::Struct<char const *,
-                      CORBA::TypeCode_ptr const *,
-                      TAO::TypeCode::Struct_Field<char const *,
-                                                  CORBA::TypeCode_ptr const *> const *,
-                      TAO::Null_RefCount_Policy>::name_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  // Ownership is retained by the TypeCode, as required by the C++
-  // mapping.
-  return this->base_attributes_.name ();
-}
-
-CORBA::ULong
-TAO::TypeCode::Struct<char const *,
-                      CORBA::TypeCode_ptr const *,
-                      TAO::TypeCode::Struct_Field<char const *,
-                                                  CORBA::TypeCode_ptr const *> const *,
-                      TAO::Null_RefCount_Policy>::member_count_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  return this->nfields_;
-}
-
-char const *
-TAO::TypeCode::Struct<char const *,
-                      CORBA::TypeCode_ptr const *,
-                      TAO::TypeCode::Struct_Field<char const *,
-                                                  CORBA::TypeCode_ptr const *> const *,
-                      TAO::Null_RefCount_Policy>::member_name_i (
-  CORBA::ULong index
-  ACE_ENV_ARG_DECL) const
-{
-  // Ownership is retained by the TypeCode, as required by the C++
-  // mapping.
-  if (index >= this->nfields_)
-    ACE_THROW_RETURN (CORBA::TypeCode::Bounds (), 0);
-
-  return Traits<char const *>::get_string (this->fields_[index].name);
-}
-
-CORBA::TypeCode_ptr
-TAO::TypeCode::Struct<char const *,
-                      CORBA::TypeCode_ptr const *,
-                      TAO::TypeCode::Struct_Field<char const *,
-                                                  CORBA::TypeCode_ptr const *> const *,
-                      TAO::Null_RefCount_Policy>::member_type_i (
-  CORBA::ULong index
-  ACE_ENV_ARG_DECL) const
-{
-  if (index >= this->nfields_)
-    ACE_THROW_RETURN (CORBA::TypeCode::Bounds (),
-                      CORBA::TypeCode::_nil ());
-
-  return
-    CORBA::TypeCode::_duplicate (
-      Traits<char const *>::get_typecode (this->fields_[index].type));
-}
diff --git a/TAO/tao/Struct_TypeCode_Static.h b/TAO/tao/Struct_TypeCode_Static.h
deleted file mode 100644
index 8c87e1390ea..00000000000
--- a/TAO/tao/Struct_TypeCode_Static.h
+++ /dev/null
@@ -1,152 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Struct_TypeCode_Static.h
- *
- *  $Id$
- *
- *  Header file for static @c tk_struct and @c tk_except
- *  @c CORBA::TypeCodes.
- *
- *  @author Ossama Othman <ossama@dre.vanderbilt.edu>
- *  @author Carlos O'Ryan
- */
-//=============================================================================
-
-#ifndef TAO_STRUCT_TYPECODE_STATIC_H
-#define TAO_STRUCT_TYPECODE_STATIC_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/TypeCode.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TypeCode_Base_Attributes.h"
-#include "tao/Null_RefCount_Policy.h"
-
-
-namespace TAO
-{
-  namespace TypeCode
-  {
-    template<typename StringType, typename TypeCodeType> struct Struct_Field;
-    template <typename StringType,
-              typename TypeCodeType,
-              class FieldArrayType,
-              class RefCountPolicy> class Struct;
-
-
-    /**
-     * @class Struct
-     *
-     * @brief @c CORBA::TypeCode implementation for an OMG IDL
-     *        @c struct or @c exception.
-     *
-     * This class implements a @c CORBA::TypeCode for an OMG IDL
-     * @c struct or @c exception.
-     */
-    template<>
-    class TAO_Export Struct<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            Struct_Field<char const *,
-                                         CORBA::TypeCode_ptr const *> const *,
-                            TAO::Null_RefCount_Policy>
-      : public CORBA::TypeCode,
-        private TAO::Null_RefCount_Policy
-    {
-    public:
-
-      /// Constructor.
-      Struct (CORBA::TCKind kind,
-              char const * id,
-              char const * name,
-              Struct_Field<char const *,
-                           CORBA::TypeCode_ptr const *> const * fields,
-              CORBA::ULong nfields);
-
-      /**
-       * @name TAO-specific @c CORBA::TypeCode Methods
-       *
-       * Methods required by TAO's implementation of the
-       * @c CORBA::TypeCode class.
-       *
-       * @see @c CORBA::TypeCode
-       */
-      //@{
-      virtual bool tao_marshal (TAO_OutputCDR & cdr,
-                                CORBA::ULong offset) const;
-      virtual void tao_duplicate (void);
-      virtual void tao_release (void);
-      //@}
-
-    protected:
-
-      /**
-       * @name @c TAO CORBA::TypeCode Template Methods
-       *
-       * @c tk_struct or @c tk_except @c CORBA::TypeCode -specific
-       * template methods.
-       *
-       * @see @c CORBA::TypeCode
-       */
-      //@{
-      virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc
-                                      ACE_ENV_ARG_DECL) const;
-      virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc
-                                           ACE_ENV_ARG_DECL) const;
-      virtual CORBA::TypeCode_ptr get_compact_typecode_i (
-        ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual char const * id_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual char const * name_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual CORBA::ULong member_count_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual char const * member_name_i (CORBA::ULong index
-                                          ACE_ENV_ARG_DECL) const;
-      virtual CORBA::TypeCode_ptr member_type_i (CORBA::ULong index
-                                                 ACE_ENV_ARG_DECL) const;
-      //@}
-
-    private:
-
-      /**
-       * @c Struct Attributes
-       *
-       * Attributes representing the structure of an OMG IDL
-       * @c struct or @c exception.
-       *
-       * @note These attributes are declared in the order in which
-       *       they are marshaled into a CDR stream in order to
-       *       increase cache hits by improving spatial locality.
-       */
-      //@{
-
-      /// Base attributes containing repository ID and name of
-      /// structure type.
-      Base_Attributes<char const *> const base_attributes_;
-
-      /// The number of fields in the OMG IDL structure.
-      CORBA::ULong const nfields_;
-
-      /// Array of @c TAO::TypeCode fields representing structure of the
-      /// OMG IDL defined @c struct.
-      Struct_Field<char const *,
-                   CORBA::TypeCode_ptr const *> const * const fields_;
-
-      //@}
-
-    };
-
-  }  // End namespace TypeCode
-}  // End namespace TAO
-
-
-#ifdef __ACE_INLINE__
-# include "tao/Struct_TypeCode_Static.inl"
-#endif  /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_STRUCT_TYPECODE_H */
diff --git a/TAO/tao/Struct_TypeCode_Static.inl b/TAO/tao/Struct_TypeCode_Static.inl
deleted file mode 100644
index f32a858b845..00000000000
--- a/TAO/tao/Struct_TypeCode_Static.inl
+++ /dev/null
@@ -1,23 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-
-ACE_INLINE
-TAO::TypeCode::Struct<char const *,
-                      CORBA::TypeCode_ptr const *,
-                      TAO::TypeCode::Struct_Field<char const *,
-                                                  CORBA::TypeCode_ptr const *> const *,
-                      TAO::Null_RefCount_Policy>::Struct (
-  CORBA::TCKind kind,
-  char const * id,
-  char const * name,
-  Struct_Field<char const *, CORBA::TypeCode_ptr const *> const * fields,
-  CORBA::ULong nfields)
-  : CORBA::TypeCode (kind)
-  , ACE_NESTED_CLASS (TAO, Null_RefCount_Policy) ()
-  , base_attributes_ (id, name)
-  , nfields_ (nfields)
-  , fields_ (fields)
-{
-}
diff --git a/TAO/tao/Synch_Invocation.cpp b/TAO/tao/Synch_Invocation.cpp
index c0964e0c51c..8abaa8326b7 100644
--- a/TAO/tao/Synch_Invocation.cpp
+++ b/TAO/tao/Synch_Invocation.cpp
@@ -610,9 +610,7 @@ namespace TAO
       }
 
     CORBA::SystemException *ex =
-      TAO_Exceptions::create_system_exception (type_id.in ()
-                                               ACE_ENV_ARG_PARAMETER);
-    ACE_CHECK_RETURN (TAO_INVOKE_FAILURE);
+      TAO_Exceptions::create_system_exception (type_id.in ());
 
     if (ex == 0)
       {
diff --git a/TAO/tao/Synch_Invocation.h b/TAO/tao/Synch_Invocation.h
index 4517d2bb32c..b4ff18b1a1a 100644
--- a/TAO/tao/Synch_Invocation.h
+++ b/TAO/tao/Synch_Invocation.h
@@ -38,7 +38,7 @@ namespace TAO
    * @brief All the action for a synchronous twoway invocation happen
    * here.
    *
-   * An object of this is type is created by TAO::Invocation_Adapter
+   * An object of this type is created by TAO::Invocation_Adapter
    * and invokes a method on this class. The method takes care of
    * creating and sending a request, waiting for a reply and
    * demarshalling the reply for the client.
diff --git a/TAO/tao/Synch_Queued_Message.h b/TAO/tao/Synch_Queued_Message.h
index 928883487be..84d768866c3 100644
--- a/TAO/tao/Synch_Queued_Message.h
+++ b/TAO/tao/Synch_Queued_Message.h
@@ -61,7 +61,7 @@ public:
 
   const ACE_Message_Block *current_block (void) const;
 
-  /** Implement the Template Methods from TAO_Queued_Message
+  /** @name Implement the Template Methods from TAO_Queued_Message
    */
   //@{
   virtual size_t message_length (void) const;
diff --git a/TAO/tao/Synch_Reply_Dispatcher.h b/TAO/tao/Synch_Reply_Dispatcher.h
index f103dd2779a..6774d5c2d87 100644
--- a/TAO/tao/Synch_Reply_Dispatcher.h
+++ b/TAO/tao/Synch_Reply_Dispatcher.h
@@ -37,7 +37,7 @@ namespace IOP
 /**
  * @class TAO_Synch_Reply_Dispatcher
  *
- * @brief Reply dispatcher for Synchoronous Method Invocation (SMI)s.
+ * @brief Reply dispatcher for Synchronous Method Invocation (SMI)s.
  *
  */
 class TAO_Export TAO_Synch_Reply_Dispatcher
diff --git a/TAO/tao/SystemException.cpp b/TAO/tao/SystemException.cpp
index 1dd155c7e51..677f507c50c 100644
--- a/TAO/tao/SystemException.cpp
+++ b/TAO/tao/SystemException.cpp
@@ -1,18 +1,18 @@
 // $Id$
 
 #include "SystemException.h"
-#include "Any_SystemException.h"
 #include "Environment.h"
 #include "ORB_Constants.h"
 #include "CORBA_String.h"
 #include "CDR.h"
 #include "debug.h"
+#include "AnyTypeCode_Adapter.h"
 
 #include "ace/Malloc.h"
 #include "ace/SString.h"
 #include "ace/OS_NS_string.h"
 #include "ace/OS_NS_stdio.h"
-
+#include "ace/Dynamic_Service.h"
 
 #if !defined (ACE_LACKS_IOSTREAM_TOTALLY)
 // Needed for ostream& operator<< (ostream &os, const CORBA::Exception &e)
@@ -86,7 +86,6 @@ CORBA::SystemException::SystemException (CORBA::ULong code,
 {
 }
 
-
 CORBA::SystemException::SystemException (const CORBA::SystemException &src)
   : CORBA::Exception (src),
     minor_ (src.minor_),
@@ -109,16 +108,6 @@ CORBA::SystemException::operator= (const CORBA::SystemException &src)
   return *this;
 }
 
-
-int
-CORBA::SystemException::_is_a (const char* interface_id) const
-{
-  return ((ACE_OS::strcmp (interface_id, this->_rep_id ()) == 0) ||
-          (ACE_OS::strcmp (interface_id,
-                           "IDL:omg.org/CORBA/SystemException:1.0") == 0)
-          || this->Exception::_is_a (interface_id));
-}
-
 void
 CORBA::SystemException::_tao_encode (TAO_OutputCDR &cdr
                                      ACE_ENV_ARG_DECL) const
@@ -574,7 +563,7 @@ CORBA::SystemException::_tao_get_omg_exception_description (
       "Operation not implemented in local object"   // 8
     };
 
-  static const char *NO_RESOURCE_TABLE[] =
+  static const char *NO_RESOURCES_TABLE[] =
     {
       "Portable Interceptor operation not support in this binding.", // 1
       "No connection for request's priority."                        // 2
@@ -691,87 +680,129 @@ CORBA::SystemException::_tao_get_omg_exception_description (
 
   minor_code--;  // Adjust to match table offset.
 
-  if (exc._is_a ("IDL:omg.org/CORBA/UNKNOWN:1.0")
+  CORBA::UNKNOWN const * unknown_exception =
+    dynamic_cast <const CORBA::UNKNOWN *> (&exc);
+  if (unknown_exception != 0
       && minor_code < sizeof UNKNOWN_TABLE / sizeof (char *))
     return UNKNOWN_TABLE[minor_code];
 
-  if (exc._is_a ("IDL:omg.org/CORBA/BAD_PARAM:1.0")
+  CORBA::BAD_PARAM const * bad_param__exception =
+    dynamic_cast <const CORBA::BAD_PARAM *> (&exc);
+  if (bad_param__exception != 0
       && minor_code < sizeof BAD_PARAM_TABLE / sizeof (char *))
     return BAD_PARAM_TABLE[minor_code];
 
-  if (exc._is_a ("IDL:omg.org/CORBA/IMP_LIMIT:1.0")
+  CORBA::IMP_LIMIT const * imp_limit_exception =
+    dynamic_cast <const CORBA::IMP_LIMIT *> (&exc);
+  if (imp_limit_exception != 0
       && minor_code < sizeof IMP_LIMIT_TABLE / sizeof (char *))
     return IMP_LIMIT_TABLE[minor_code];
 
-  if (exc._is_a ("IDL:omg.org/CORBA/INITIALIZE:1.0")
+  CORBA::INITIALIZE const * initialize_exception =
+    dynamic_cast <const CORBA::INITIALIZE *> (&exc);
+  if (initialize_exception != 0
       && minor_code < sizeof INITIALIZE_TABLE / sizeof (char *))
     return INITIALIZE_TABLE[minor_code];
 
-  if (exc._is_a ("IDL:omg.org/CORBA/INV_OBJREF:1.0")
+  CORBA::INV_OBJREF const * inv_objref_exception =
+    dynamic_cast <const CORBA::INV_OBJREF *> (&exc);
+  if (inv_objref_exception != 0
       && minor_code < sizeof INV_OBJREF_TABLE / sizeof (char *))
     return INV_OBJREF_TABLE[minor_code];
 
-  if (exc._is_a ("IDL:omg.org/CORBA/MARSHAL:1.0")
+  CORBA::MARSHAL const * marshal_exception =
+    dynamic_cast <const CORBA::MARSHAL *> (&exc);
+  if (marshal_exception != 0
       && minor_code < sizeof MARSHAL_TABLE / sizeof (char *))
     return MARSHAL_TABLE[minor_code];
 
-  if (exc._is_a ("IDL:omg.org/CORBA/BAD_TYPECODE:1.0")
+  CORBA::BAD_TYPECODE const * bad_typecode_exception =
+    dynamic_cast <const CORBA::BAD_TYPECODE *> (&exc);
+  if (bad_typecode_exception != 0
       && minor_code < sizeof BAD_TYPECODE_TABLE / sizeof (char *))
     return BAD_TYPECODE_TABLE[minor_code];
 
-  if (exc._is_a ("IDL:omg.org/CORBA/NO_IMPLEMENT:1.0")
+  CORBA::NO_IMPLEMENT const * no_implement_exception =
+    dynamic_cast <const CORBA::NO_IMPLEMENT *> (&exc);
+  if (no_implement_exception != 0
       && minor_code < sizeof NO_IMPLEMENT_TABLE / sizeof (char *))
     return NO_IMPLEMENT_TABLE[minor_code];
 
-  if (exc._is_a ("IDL:omg.org/CORBA/NO_RESOURCE:1.0")
-      && minor_code < sizeof NO_RESOURCE_TABLE / sizeof (char *))
-    return NO_RESOURCE_TABLE[minor_code];
+  CORBA::NO_RESOURCES const * no_resource_exception =
+    dynamic_cast <const CORBA::NO_RESOURCES *> (&exc);
+  if (no_resource_exception != 0
+      && minor_code < sizeof NO_RESOURCES_TABLE / sizeof (char *))
+    return NO_RESOURCES_TABLE[minor_code];
 
-  if (exc._is_a ("IDL:omg.org/CORBA/BAD_INV_ORDER:1.0")
+  CORBA::BAD_INV_ORDER const * bad_inv_order_exception =
+    dynamic_cast <const CORBA::BAD_INV_ORDER *> (&exc);
+  if (bad_inv_order_exception != 0
       && minor_code < sizeof BAD_INV_ORDER_TABLE / sizeof (char *))
     return BAD_INV_ORDER_TABLE[minor_code];
 
-  if (exc._is_a ("IDL:omg.org/CORBA/TRANSIENT:1.0")
+  CORBA::TRANSIENT const * transient_exception =
+    dynamic_cast <const CORBA::TRANSIENT *> (&exc);
+  if (transient_exception != 0
       && minor_code < sizeof TRANSIENT_TABLE / sizeof (char *))
     return TRANSIENT_TABLE[minor_code];
 
-  if (exc._is_a ("IDL:omg.org/CORBA/OBJ_ADAPTER:1.0")
+  CORBA::OBJ_ADAPTER const * obj_adapter_exception =
+    dynamic_cast <const CORBA::OBJ_ADAPTER *> (&exc);
+  if (obj_adapter_exception != 0
       && minor_code < sizeof OBJ_ADAPTER_TABLE / sizeof (char *))
     return OBJ_ADAPTER_TABLE[minor_code];
 
-  if (exc._is_a ("IDL:omg.org/CORBA/DATA_CONVERSION:1.0")
+  CORBA::DATA_CONVERSION const * data_conversion_exception =
+    dynamic_cast <const CORBA::DATA_CONVERSION *> (&exc);
+  if (data_conversion_exception != 0
       && minor_code < sizeof DATA_CONVERSION_TABLE / sizeof (char *))
     return DATA_CONVERSION_TABLE[minor_code];
 
-  if (exc._is_a ("IDL:omg.org/CORBA/OBJECT_NOT_EXIST:1.0")
+  CORBA::OBJECT_NOT_EXIST const * object_not_exist_exception =
+    dynamic_cast <const CORBA::OBJECT_NOT_EXIST *> (&exc);
+  if (object_not_exist_exception != 0
       && minor_code < sizeof OBJECT_NOT_EXIST_TABLE / sizeof (char *))
     return OBJECT_NOT_EXIST_TABLE[minor_code];
 
-  if (exc._is_a ("IDL:omg.org/CORBA/INV_POLICY:1.0")
+  CORBA::INV_POLICY const * inv_policy_exception =
+    dynamic_cast <const CORBA::INV_POLICY *> (&exc);
+  if (inv_policy_exception != 0
       && minor_code < sizeof INV_POLICY_TABLE / sizeof (char *))
     return INV_POLICY_TABLE[minor_code];
 
-  if (exc._is_a ("IDL:omg.org/CORBA/ACTIVITY_COMPLETED:1.0")
+  CORBA::ACTIVITY_COMPLETED const * activity_completed_exception =
+    dynamic_cast <const CORBA::ACTIVITY_COMPLETED *> (&exc);
+  if (activity_completed_exception != 0
       && minor_code < sizeof ACTIVITY_COMPLETED_TABLE / sizeof (char *))
     return ACTIVITY_COMPLETED_TABLE[minor_code];
 
-  if (exc._is_a ("IDL:omg.org/CORBA/ACTIVITY_REQUIRED:1.0")
+  CORBA::ACTIVITY_REQUIRED const * activity_required_exception =
+    dynamic_cast <const CORBA::ACTIVITY_REQUIRED *> (&exc);
+  if (activity_required_exception != 0
       && minor_code < sizeof ACTIVITY_REQUIRED_TABLE / sizeof (char *))
     return ACTIVITY_REQUIRED_TABLE[minor_code];
 
-  if (exc._is_a ("IDL:omg.org/CORBA/BAD_OPERATION:1.0")
+  CORBA::BAD_OPERATION const * bad_operation_exception =
+    dynamic_cast <const CORBA::BAD_OPERATION *> (&exc);
+  if (bad_operation_exception != 0
       && minor_code < sizeof BAD_OPERATION_TABLE / sizeof (char *))
     return BAD_OPERATION_TABLE[minor_code];
 
-  if (exc._is_a ("IDL:omg.org/CORBA/BAD_CONTEXT:1.0")
+  CORBA::BAD_CONTEXT const * bad_context_exception =
+    dynamic_cast <const CORBA::BAD_CONTEXT *> (&exc);
+  if (bad_context_exception != 0
       && minor_code < sizeof BAD_CONTEXT_TABLE / sizeof (char *))
     return BAD_CONTEXT_TABLE[minor_code];
 
-  if (exc._is_a ("IDL:omg.org/CORBA/CODESET_INCOMPATIBLE:1.0")
+  CORBA::CODESET_INCOMPATIBLE const * codeset_incompatible_exception =
+    dynamic_cast <const CORBA::CODESET_INCOMPATIBLE *> (&exc);
+  if (codeset_incompatible_exception != 0
       && minor_code < sizeof CODESET_INCOMPATIBLE_TABLE / sizeof (char *))
     return CODESET_INCOMPATIBLE_TABLE[minor_code];
 
-  if (exc._is_a ("IDL:omg.org/CORBA/INTF_REPOS:1.0")
+  CORBA::INTF_REPOS const * intf_repos_exception =
+    dynamic_cast <const CORBA::INTF_REPOS *> (&exc);
+  if (intf_repos_exception != 0
       && minor_code < sizeof INTF_REPOS_TABLE / sizeof (char *))
     return INTF_REPOS_TABLE[minor_code];
 
@@ -846,6 +877,7 @@ static const char *repo_id_array[] = {
 static const CORBA::ULong array_sz =
   (sizeof (repo_id_array) / sizeof (char const *)) - 1;
 
+
 TAO::excp_factory excp_array [] = {
 #define TAO_SYSTEM_EXCEPTION(name) \
       &CORBA::name::_tao_create,
@@ -854,9 +886,41 @@ TAO::excp_factory excp_array [] = {
       0
 };
 
+#define TAO_SYSTEM_EXCEPTION(name) \
+CORBA::TypeCode_ptr \
+CORBA::name ::_tao_type (void) const \
+{ \
+  TAO_AnyTypeCode_Adapter *adapter = \
+    ACE_Dynamic_Service<TAO_AnyTypeCode_Adapter>::instance ( \
+        "AnyTypeCode_Adapter" \
+      ); \
+  if (adapter != 0) \
+    return adapter->_tao_type_ ## name (); \
+  else \
+    { \
+      ACE_ERROR ((LM_ERROR, \
+                  ACE_TEXT ("(%P|%t) %p\n"), \
+                  ACE_TEXT ("Unable to find the ") \
+                  ACE_TEXT ("AnyTypeCode Adapter instance"))); \
+      return 0; \
+    } \
+}
+
+STANDARD_EXCEPTION_LIST
+#undef  TAO_SYSTEM_EXCEPTION
+
+#define TAO_SYSTEM_EXCEPTION(name) \
+void \
+CORBA::name ::_tao_any_destructor (void * x) \
+{ \
+  delete static_cast<CORBA::name *> (x); \
+}
+
+STANDARD_EXCEPTION_LIST
+#undef TAO_SYSTEM_EXCEPTION
+
 CORBA::SystemException *
-TAO_Exceptions::create_system_exception (const char *id
-                                         ACE_ENV_ARG_DECL_NOT_USED)
+TAO_Exceptions::create_system_exception (const char *id)
 {
   for (CORBA::ULong i = 0; i < array_sz; ++i)
     {
diff --git a/TAO/tao/SystemException.h b/TAO/tao/SystemException.h
index cb34d66a6fb..abfc5f4165d 100644
--- a/TAO/tao/SystemException.h
+++ b/TAO/tao/SystemException.h
@@ -45,13 +45,17 @@ class TAO_InputCDR;
 
 namespace CORBA
 {
-  class TypeCode;
-  typedef TypeCode *TypeCode_ptr;
+  class SystemException;
+}
 
-  class Environment;
+namespace TAO
+{
+  typedef CORBA::SystemException* (*excp_factory)(void);
+}
 
-  class Any;
-  typedef Any *Any_ptr;
+namespace CORBA
+{
+  class Environment;
 
   /**
    * @enum CompletionStatus
@@ -84,7 +88,7 @@ namespace CORBA
     SystemException (const SystemException & src);
 
     /// Destructor.
-    ~SystemException (void);
+    virtual ~SystemException (void);
 
     /// Get the minor status.
     ULong minor (void) const;
@@ -101,31 +105,26 @@ namespace CORBA
     /// Narrow to a SystemException.
     static SystemException *_downcast (CORBA::Exception *exception);
 
-        /// The const version of narrow operation to a SystemException
+    /// The const version of narrow operation to a SystemException
     static const SystemException *_downcast(const CORBA::Exception *exception);
 
     virtual void _raise (void) const = 0;
 
     // = TAO-specific extension.
 
-    /// Helper for the _downcast operation.
-    virtual int _is_a (const char *type_id) const;
-
     /// Print the system exception @c ex to output determined by @c f.
     /// This function is not CORBA compliant.
     void _tao_print_system_exception (FILE *f = stdout) const;
 
-    /// Create an exception from the available exception
-    /// virtual CORBA::Exception *_tao_duplicate (void) const;
-
     /// Returns a string containing information about the exception. This
     /// function is not CORBA compliant.
     virtual ACE_CString _info (void) const;
 
     virtual void _tao_encode (TAO_OutputCDR &cdr
-                              ACE_ENV_ARG_DECL_NOT_USED) const;
+                              ACE_ENV_ARG_DECL) const;
+
     virtual void _tao_decode (TAO_InputCDR &cdr
-                              ACE_ENV_ARG_DECL_NOT_USED);
+                              ACE_ENV_ARG_DECL);
 
     /// Helper to create a minor status value.
     static CORBA::ULong _tao_minor_code (u_int location,
@@ -135,8 +134,7 @@ namespace CORBA
     /// value.
     static CORBA::ULong _tao_errno (int errno_value);
 
-    /// Overridden base class method to help compilers that use
-    /// explicit template instantiations get going.
+    /// Deep copy
     virtual CORBA::Exception *_tao_duplicate (void) const;
 
   protected:
@@ -192,11 +190,6 @@ namespace CORBA
       virtual CORBA::Exception *_tao_duplicate (void) const; \
       static CORBA::SystemException *_tao_create (void); \
     }; \
-  TAO_Export void operator<<= (CORBA::Any &, const CORBA::name &); \
-  TAO_Export void operator<<= (CORBA::Any &, CORBA::name *); \
-  TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, \
-                                         const CORBA::name *&); \
-  extern TAO_Export TypeCode_ptr const _tc_ ## name
 
   TAO_SYSTEM_EXCEPTION(UNKNOWN);          // the unknown exception
   TAO_SYSTEM_EXCEPTION(BAD_PARAM);        // an invalid parameter was passed
diff --git a/TAO/tao/SystemExceptionA.cpp b/TAO/tao/SystemExceptionA.cpp
deleted file mode 100644
index 1ec437e599a..00000000000
--- a/TAO/tao/SystemExceptionA.cpp
+++ /dev/null
@@ -1,202 +0,0 @@
-// $Id$
-
-#include "SystemException.h"
-#include "Any_SystemException.h"
-#include "Any_Dual_Impl_T.h"
-#include "TypeCode.h"
-#include "TypeCode_Constants.h"
-#include "Enum_TypeCode_Static.h"
-#include "TypeCode_Struct_Field.h"
-#include "Struct_TypeCode_Static.h"
-#include "Null_RefCount_Policy.h"
-#include "CORBA_String.h"
-
-
-ACE_RCSID (tao,
-           SystemExceptionA,
-           "$Id$")
-
-
-#if defined (ACE_HAS_PREDEFINED_THREAD_CANCELLED_MACRO)
-#undef THREAD_CANCELLED
-#endif /* ACE_HAS_PREDEFINED_THREAD_CANCELLED_MACRO */
-
-// List of standard/system exceptions ... used to create static
-// storage for their typecodes.
-
-#define STANDARD_EXCEPTION_LIST \
-    TAO_SYSTEM_EXCEPTION (UNKNOWN) \
-    TAO_SYSTEM_EXCEPTION (BAD_PARAM) \
-    TAO_SYSTEM_EXCEPTION (NO_MEMORY) \
-    TAO_SYSTEM_EXCEPTION (IMP_LIMIT) \
-    TAO_SYSTEM_EXCEPTION (COMM_FAILURE) \
-    TAO_SYSTEM_EXCEPTION (INV_OBJREF) \
-    TAO_SYSTEM_EXCEPTION (OBJECT_NOT_EXIST) \
-    TAO_SYSTEM_EXCEPTION (NO_PERMISSION) \
-    TAO_SYSTEM_EXCEPTION (INTERNAL) \
-    TAO_SYSTEM_EXCEPTION (MARSHAL) \
-    TAO_SYSTEM_EXCEPTION (INITIALIZE) \
-    TAO_SYSTEM_EXCEPTION (NO_IMPLEMENT) \
-    TAO_SYSTEM_EXCEPTION (BAD_TYPECODE) \
-    TAO_SYSTEM_EXCEPTION (BAD_OPERATION) \
-    TAO_SYSTEM_EXCEPTION (NO_RESOURCES) \
-    TAO_SYSTEM_EXCEPTION (NO_RESPONSE) \
-    TAO_SYSTEM_EXCEPTION (PERSIST_STORE) \
-    TAO_SYSTEM_EXCEPTION (BAD_INV_ORDER) \
-    TAO_SYSTEM_EXCEPTION (TRANSIENT) \
-    TAO_SYSTEM_EXCEPTION (FREE_MEM) \
-    TAO_SYSTEM_EXCEPTION (INV_IDENT) \
-    TAO_SYSTEM_EXCEPTION (INV_FLAG) \
-    TAO_SYSTEM_EXCEPTION (INTF_REPOS) \
-    TAO_SYSTEM_EXCEPTION (BAD_CONTEXT) \
-    TAO_SYSTEM_EXCEPTION (OBJ_ADAPTER) \
-    TAO_SYSTEM_EXCEPTION (DATA_CONVERSION) \
-    TAO_SYSTEM_EXCEPTION (INV_POLICY) \
-    TAO_SYSTEM_EXCEPTION (REBIND) \
-    TAO_SYSTEM_EXCEPTION (TIMEOUT) \
-    TAO_SYSTEM_EXCEPTION (TRANSACTION_UNAVAILABLE) \
-    TAO_SYSTEM_EXCEPTION (TRANSACTION_MODE) \
-    TAO_SYSTEM_EXCEPTION (TRANSACTION_REQUIRED) \
-    TAO_SYSTEM_EXCEPTION (TRANSACTION_ROLLEDBACK) \
-    TAO_SYSTEM_EXCEPTION (INVALID_TRANSACTION) \
-    TAO_SYSTEM_EXCEPTION (CODESET_INCOMPATIBLE) \
-    TAO_SYSTEM_EXCEPTION (BAD_QOS) \
-    TAO_SYSTEM_EXCEPTION (INVALID_ACTIVITY) \
-    TAO_SYSTEM_EXCEPTION (ACTIVITY_COMPLETED) \
-    TAO_SYSTEM_EXCEPTION (ACTIVITY_REQUIRED) \
-    TAO_SYSTEM_EXCEPTION (THREAD_CANCELLED)
-
-#define TAO_SYSTEM_EXCEPTION(name) \
-CORBA::TypeCode_ptr \
-CORBA::name ::_tao_type (void) const \
-{ \
-  return CORBA::_tc_ ## name; \
-}
-
-STANDARD_EXCEPTION_LIST
-#undef TAO_SYSTEM_EXCEPTION
-
-#define TAO_SYSTEM_EXCEPTION(name) \
-void \
-CORBA::name ::_tao_any_destructor (void * x) \
-{ \
-  delete static_cast<CORBA::name *> (x); \
-}
-
-STANDARD_EXCEPTION_LIST
-#undef TAO_SYSTEM_EXCEPTION
-
-
-namespace TAO
-{
-  namespace TypeCode
-  {
-    char const * const enumerators_CORBA_CompletionStatus[] =
-      {
-        "COMPLETED_YES",
-        "COMPLETED_NO",
-        "COMPLETED_MAYBE"
-      };
-
-    Enum<char const *,
-         char const * const *,
-         TAO::Null_RefCount_Policy>
-      tc_CompletionStatus ("IDL:omg.org/CORBA/CompletionStatus:1.0",
-                           "CompletionStatus",
-                           enumerators_CORBA_CompletionStatus,
-                           3 /* # of enumerators */);
-  }
-}
-
-namespace CORBA
-{
-  // An internal TypeCode.
-  TypeCode_ptr const _tc_CompletionStatus =
-    &TAO::TypeCode::tc_CompletionStatus;
-}
-
-namespace TAO
-{
-  namespace TypeCode
-  {
-    Struct_Field<char const *,
-                 CORBA::TypeCode_ptr const *> const
-    fields_CORBA_SystemException[] =
-      {
-        { "minor",     &CORBA::_tc_ulong },
-        { "completed", &CORBA::_tc_CompletionStatus }
-      };
-
-    typedef TAO::TypeCode::Struct<char const *,
-                                  CORBA::TypeCode_ptr const *,
-                                  TAO::TypeCode::Struct_Field<char const *,
-                                                              CORBA::TypeCode_ptr const *> const *,
-                                  TAO::Null_RefCount_Policy> tc_SystemException;
-  }
-}
-
-#define TAO_SYSTEM_EXCEPTION(name) \
-namespace TAO \
-{ \
-  namespace TypeCode \
-  { \
-    tc_SystemException tc_CORBA_ ## name ( \
-      CORBA::tk_except, \
-      "IDL:omg.org/CORBA/" #name ":1.0", \
-      #name, \
-      TAO::TypeCode::fields_CORBA_SystemException, \
-      2 /* # of fields */); \
-  } \
-} \
-CORBA::TypeCode_ptr const CORBA::_tc_ ## name = \
-    &TAO::TypeCode::tc_CORBA_ ## name;
-
-STANDARD_EXCEPTION_LIST
-#undef  TAO_SYSTEM_EXCEPTION
-
-
-#define TAO_SYSTEM_EXCEPTION(name) \
-void \
-CORBA::operator<<= (CORBA::Any &any, const CORBA::name &ex) \
-{ \
-  TAO::Any_SystemException::insert_copy ( \
-      any, \
-      CORBA::name ::_tao_any_destructor, \
-      CORBA::_tc_ ## name, \
-      ex \
-    ); \
-}
-
-STANDARD_EXCEPTION_LIST
-#undef TAO_SYSTEM_EXCEPTION
-
-#define TAO_SYSTEM_EXCEPTION(name) \
-void \
-CORBA::operator<<= (CORBA::Any &any, CORBA::name *ex) \
-{ \
-  TAO::Any_SystemException::insert ( \
-      any, \
-      CORBA::name ::_tao_any_destructor, \
-      CORBA::_tc_ ## name, \
-      ex \
-    ); \
-}
-
-STANDARD_EXCEPTION_LIST
-#undef TAO_SYSTEM_EXCEPTION
-
-#define TAO_SYSTEM_EXCEPTION(name) \
-CORBA::Boolean operator>>= (const CORBA::Any &any, \
-                            const CORBA::name *&ex) \
-{ \
-  return \
-    TAO::Any_SystemException::extract ( \
-        any, \
-        CORBA::name ::_tao_any_destructor, \
-        CORBA::_tc_ ## name, \
-        (const CORBA::SystemException *&) ex, \
-        &CORBA::name ::_tao_create); \
-}
-
-STANDARD_EXCEPTION_LIST
-#undef TAO_SYSTEM_EXCEPTION
diff --git a/TAO/tao/TAOA.cpp b/TAO/tao/TAOA.cpp
deleted file mode 100644
index fec81c09e9c..00000000000
--- a/TAO/tao/TAOA.cpp
+++ /dev/null
@@ -1,240 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "TAOC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
-#include "tao/Struct_TypeCode_Static.h"
-#include "tao/TypeCode_Struct_Field.h"
-#include "tao/Recursive_Type_TypeCode.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
-#include "tao/Any_Dual_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_TAO_BufferingConstraintMode (
-    CORBA::tk_alias,
-    "IDL:tao/TAO/BufferingConstraintMode:1.0",
-    "BufferingConstraintMode",
-    &CORBA::_tc_ushort);
-  
-namespace TAO
-{
-  ::CORBA::TypeCode_ptr const _tc_BufferingConstraintMode =
-    &_tao_tc_TAO_BufferingConstraintMode;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/struct_typecode.cpp:87
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_TAO_BufferingConstraint[] =
-  {
-    { "mode", &TAO::_tc_BufferingConstraintMode },
-    { "timeout", &TimeBase::_tc_TimeT },
-    { "message_count", &CORBA::_tc_ulong },
-    { "message_bytes", &CORBA::_tc_ulong }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                      CORBA::TypeCode_ptr const *,
-                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
-                      TAO::Null_RefCount_Policy>
-  _tao_tc_TAO_BufferingConstraint (
-    CORBA::tk_struct,
-    "IDL:tao/TAO/BufferingConstraint:1.0",
-    "BufferingConstraint",
-    _tao_fields_TAO_BufferingConstraint,
-    4);
-  
-namespace TAO
-{
-  ::CORBA::TypeCode_ptr const _tc_BufferingConstraint =
-    &_tao_tc_TAO_BufferingConstraint;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/objref_typecode.cpp:76
-
-static TAO::TypeCode::Objref<char const *,
-                             TAO::Null_RefCount_Policy>
-  _tao_tc_TAO_BufferingConstraintPolicy (
-    CORBA::tk_local_interface,
-    "IDL:tao/TAO/BufferingConstraintPolicy:1.0",
-    "BufferingConstraintPolicy");
-  
-namespace TAO
-{
-  ::CORBA::TypeCode_ptr const _tc_BufferingConstraintPolicy =
-    &_tao_tc_TAO_BufferingConstraintPolicy;
-}
-
-
-
-// TAO_IDL - Generated from 
-// be\be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const TAO::BufferingConstraint &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<TAO::BufferingConstraint>::insert_copy (
-      _tao_any,
-      TAO::BufferingConstraint::_tao_any_destructor,
-      TAO::_tc_BufferingConstraint,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    TAO::BufferingConstraint *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<TAO::BufferingConstraint>::insert (
-      _tao_any,
-      TAO::BufferingConstraint::_tao_any_destructor,
-      TAO::_tc_BufferingConstraint,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    TAO::BufferingConstraint *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const TAO::BufferingConstraint *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const TAO::BufferingConstraint *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<TAO::BufferingConstraint>::extract (
-        _tao_any,
-        TAO::BufferingConstraint::_tao_any_destructor,
-        TAO::_tc_BufferingConstraint,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<TAO::BufferingConstraintPolicy>::to_object (
-      CORBA::Object_ptr &_tao_elem
-    ) const
-  {
-    _tao_elem = CORBA::Object::_duplicate (this->value_);
-    return true;
-  }
-}
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<TAO::BufferingConstraintPolicy>::marshal_value (TAO_OutputCDR &)
-  {
-    return false;
-  }
-  
-  template<>
-  CORBA::Boolean
-  Any_Impl_T<TAO::BufferingConstraintPolicy>::demarshal_value (TAO_InputCDR &)
-  {
-    return false;
-  }
-}
-
-// Copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    TAO::BufferingConstraintPolicy_ptr _tao_elem
-  )
-{
-  TAO::BufferingConstraintPolicy_ptr _tao_objptr =
-    TAO::BufferingConstraintPolicy::_duplicate (_tao_elem);
-  _tao_any <<= &_tao_objptr;
-}
-
-// Non-copying insertion.
-void
-operator<<= (
-    CORBA::Any &_tao_any,
-    TAO::BufferingConstraintPolicy_ptr *_tao_elem
-  )
-{
-  TAO::Any_Impl_T<TAO::BufferingConstraintPolicy>::insert (
-      _tao_any,
-      TAO::BufferingConstraintPolicy::_tao_any_destructor,
-      TAO::_tc_BufferingConstraintPolicy,
-      *_tao_elem
-    );
-}
-
-CORBA::Boolean
-operator>>= (
-    const CORBA::Any &_tao_any,
-    TAO::BufferingConstraintPolicy_ptr &_tao_elem
-  )
-{
-  return
-    TAO::Any_Impl_T<TAO::BufferingConstraintPolicy>::extract (
-        _tao_any,
-        TAO::BufferingConstraintPolicy::_tao_any_destructor,
-        TAO::_tc_BufferingConstraintPolicy,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/TAOC.cpp b/TAO/tao/TAOC.cpp
index 72b89820afc..9ec2b85fff5 100644
--- a/TAO/tao/TAOC.cpp
+++ b/TAO/tao/TAOC.cpp
@@ -26,17 +26,13 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:291
+// be\be_codegen.cpp:277
 
 
 #include "TAOC.h"
 #include "tao/CDR.h"
 #include "ace/OS_NS_string.h"
 
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
@@ -101,14 +97,6 @@ TAO::BufferingConstraintPolicy::BufferingConstraintPolicy (void)
 TAO::BufferingConstraintPolicy::~BufferingConstraintPolicy (void)
 {}
 
-void 
-TAO::BufferingConstraintPolicy::_tao_any_destructor (void *_tao_void_pointer)
-{
-  BufferingConstraintPolicy *_tao_tmp_pointer =
-    static_cast<BufferingConstraintPolicy *> (_tao_void_pointer);
-  CORBA::release (_tao_tmp_pointer);
-}
-
 TAO::BufferingConstraintPolicy_ptr
 TAO::BufferingConstraintPolicy::_narrow (
     CORBA::Object_ptr _tao_objref
diff --git a/TAO/tao/TAOC.h b/TAO/tao/TAOC.h
index 188db5dc4cb..72e9467c9ef 100644
--- a/TAO/tao/TAOC.h
+++ b/TAO/tao/TAOC.h
@@ -26,10 +26,10 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:153
+// be\be_codegen.cpp:154
 
-#ifndef _TAO_IDL_ORIG_TAOC_H_
-#define _TAO_IDL_ORIG_TAOC_H_
+#ifndef _TAO_IDL_TAOC_H_
+#define _TAO_IDL_TAOC_H_
 
 #include /**/ "ace/pre.h"
 
@@ -57,17 +57,8 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_Export
 
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:49
 
 namespace TAO
 {
@@ -79,11 +70,6 @@ namespace TAO
   typedef CORBA::UShort_out BufferingConstraintMode_out;
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_BufferingConstraintMode;
-  
-  // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
   
   const TAO::BufferingConstraintMode BUFFER_FLUSH = 0U;
@@ -119,7 +105,7 @@ namespace TAO
     BufferingConstraint_out;
   
   // TAO_IDL - Generated from
-  // be\be_visitor_structure/structure_ch.cpp:52
+  // be\be_visitor_structure/structure_ch.cpp:57
   
   struct TAO_Export BufferingConstraint
   {
@@ -133,11 +119,6 @@ namespace TAO
   };
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_BufferingConstraint;
-  
-  // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
   
   const CORBA::PolicyType BUFFERING_CONSTRAINT_POLICY_TYPE = 1413545985U;
@@ -198,7 +179,7 @@ namespace TAO
       return static_cast<BufferingConstraintPolicy_ptr> (0);
     }
     
-    static void _tao_any_destructor (void *);
+    
     
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
@@ -257,11 +238,6 @@ namespace TAO
 #endif /* end #if !defined */
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_BufferingConstraintPolicy;
-  
-  // TAO_IDL - Generated from
   // be\be_visitor_constant/constant_ch.cpp:52
   
   const Messaging::SyncScope SYNC_EAGER_BUFFERING = 0;
@@ -272,7 +248,7 @@ namespace TAO
   const Messaging::SyncScope SYNC_DELAYED_BUFFERING = -2;
 
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:78
 
 } // module TAO
 
@@ -283,8 +259,8 @@ namespace TAO
 namespace TAO
 {
 
-#if !defined (_TAO_BUFFERINGCONSTRAINTPOLICY__TRAITS_CH_)
-#define _TAO_BUFFERINGCONSTRAINTPOLICY__TRAITS_CH_
+#if !defined (_TAO_BUFFERINGCONSTRAINTPOLICY__TRAITS_)
+#define _TAO_BUFFERINGCONSTRAINTPOLICY__TRAITS_
   
   template<>
   struct TAO_Export Objref_Traits< ::TAO::BufferingConstraintPolicy>
@@ -306,36 +282,13 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_structure/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const TAO::BufferingConstraint &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, TAO::BufferingConstraint*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, TAO::BufferingConstraint *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const TAO::BufferingConstraint *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_interface/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, TAO::BufferingConstraintPolicy_ptr); // copying
-TAO_Export void operator<<= (CORBA::Any &, TAO::BufferingConstraintPolicy_ptr *); // non-copying
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, TAO::BufferingConstraintPolicy_ptr &);
-
-// TAO_IDL - Generated from
 // be\be_visitor_structure/cdr_op_ch.cpp:54
 
 TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const TAO::BufferingConstraint &);
 TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, TAO::BufferingConstraint &);
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
+// be\be_codegen.cpp:1028
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/tao/TAO_Server_Request.cpp b/TAO/tao/TAO_Server_Request.cpp
index b95b1b41038..c7075d34bf7 100644
--- a/TAO/tao/TAO_Server_Request.cpp
+++ b/TAO/tao/TAO_Server_Request.cpp
@@ -14,6 +14,7 @@
 
 #if TAO_HAS_INTERCEPTORS == 1
 #include "PortableInterceptorC.h"
+#include "ServerRequestInterceptor_Adapter.h"
 #endif
 
 #if !defined (__ACE_INLINE__)
@@ -72,8 +73,8 @@ TAO_ServerRequest::TAO_ServerRequest (TAO_Pluggable_Messaging *mesg_base,
     argument_flag_ (1)
 #if TAO_HAS_INTERCEPTORS == 1
     , interceptor_count_ (0)
-    , rs_pi_current_ ()
-    , pi_current_copy_callback_ ()
+    , rs_pi_current_ (0)
+    , pi_current_copy_callback_ (0)
     , result_seq_ (0)
     , caught_exception_ (0)
     , reply_status_ (-1)
@@ -115,7 +116,8 @@ TAO_ServerRequest::TAO_ServerRequest (TAO_Pluggable_Messaging *mesg_base,
     argument_flag_ (true)
 #if TAO_HAS_INTERCEPTORS == 1
   , interceptor_count_ (0)
-  , rs_pi_current_ ()
+  , rs_pi_current_ (0)
+  , pi_current_copy_callback_ (0)
   , result_seq_ (0)
   , caught_exception_ (0)
   , reply_status_ (-1)
@@ -150,7 +152,8 @@ TAO_ServerRequest::TAO_ServerRequest (TAO_ORB_Core * orb_core,
     argument_flag_ (false)
 #if TAO_HAS_INTERCEPTORS == 1
   , interceptor_count_ (0)
-  , rs_pi_current_ ()
+  , rs_pi_current_ (0)
+  , pi_current_copy_callback_ (0)
   , result_seq_ (0)
   , caught_exception_ (0)
   , reply_status_ (-1)
@@ -179,6 +182,31 @@ TAO_ServerRequest::TAO_ServerRequest (TAO_ORB_Core * orb_core,
 
 TAO_ServerRequest::~TAO_ServerRequest (void)
 {
+#if TAO_HAS_INTERCEPTORS == 1
+  if (this->pi_current_copy_callback_)
+    {
+      TAO::ServerRequestInterceptor_Adapter *interceptor_adapter =
+        this->orb_core_->serverrequestinterceptor_adapter ();
+
+      if (interceptor_adapter)
+        {
+          interceptor_adapter->deallocate_pi_current_callback (
+            this->pi_current_copy_callback_);
+        }
+    }
+
+  if (this->rs_pi_current_)
+    {
+      TAO::ServerRequestInterceptor_Adapter *interceptor_adapter =
+        this->orb_core_->serverrequestinterceptor_adapter ();
+
+      if (interceptor_adapter)
+        {
+          interceptor_adapter->deallocate_pi_current (
+            this->rs_pi_current_);
+        }
+    }
+#endif  /* TAO_HAS_INTERCEPTORS == 1 */
 }
 
 CORBA::ORB_ptr
@@ -499,4 +527,39 @@ TAO_ServerRequest::caught_exception (CORBA::Exception *exception)
   this->caught_exception_ = exception;
 }
 
+TAO::PICurrent_Impl *
+TAO_ServerRequest::rs_pi_current (void)
+{
+  if (!this->rs_pi_current_)
+    {
+      TAO::ServerRequestInterceptor_Adapter *interceptor_adapter =
+        this->orb_core_->serverrequestinterceptor_adapter ();
+
+      if (interceptor_adapter)
+        {
+          this->rs_pi_current_ = interceptor_adapter->allocate_pi_current ();
+        }
+    }
+
+  return this->rs_pi_current_;
+}
+
+TAO::PICurrent_Copy_Callback *
+TAO_ServerRequest::pi_current_copy_callback (void)
+{
+  if (!this->pi_current_copy_callback_)
+    {
+      TAO::ServerRequestInterceptor_Adapter *interceptor_adapter =
+        this->orb_core_->serverrequestinterceptor_adapter ();
+
+      if (interceptor_adapter)
+        {
+          this->pi_current_copy_callback_ =
+            interceptor_adapter->allocate_pi_current_callback ();
+        }
+    }
+
+  return this->pi_current_copy_callback_;
+}
+
 #endif /*TAO_HAS_INTERCEPTORS*/
diff --git a/TAO/tao/TAO_Server_Request.h b/TAO/tao/TAO_Server_Request.h
index 5cf6c3b8758..288fd4a2723 100644
--- a/TAO/tao/TAO_Server_Request.h
+++ b/TAO/tao/TAO_Server_Request.h
@@ -31,8 +31,13 @@
 #include "Object.h"
 
 #if TAO_HAS_INTERCEPTORS == 1
-#include "PICurrent_Impl.h"
-#include "PICurrent_Copy_Callback.h"
+namespace TAO
+{
+  class PICurrent;
+  class PICurrent_Impl;
+  class PICurrent_Copy_Callback;
+}
+#include "PortableInterceptorC.h"
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 
 class TAO_Pluggable_Messaging;
@@ -238,10 +243,10 @@ public:
   size_t & interceptor_count (void);
 
   /// Return a reference to the "request scope" PICurrent object.
-  TAO::PICurrent_Impl & rs_pi_current (void);
+  TAO::PICurrent_Impl *rs_pi_current (void);
 
   /// Return a reference to the PICurrent copy callback object.
-  TAO::PICurrent_Copy_Callback & pi_current_copy_callback (void);
+  TAO::PICurrent_Copy_Callback *pi_current_copy_callback (void);
 
   CORBA::Exception *caught_exception (void);
 
@@ -331,11 +336,11 @@ private:
 
   /// The "Request Scope Current" (RSC) object, as required by
   /// Portable Interceptors.
-  TAO::PICurrent_Impl rs_pi_current_;
+  TAO::PICurrent_Impl *rs_pi_current_;
 
   /// PICurrent callback object responsible for copying slot table
   /// between PICurrents in different scopes (i.e. thread or request).
-  TAO::PICurrent_Copy_Callback pi_current_copy_callback_;
+  TAO::PICurrent_Copy_Callback *pi_current_copy_callback_;
 
   /// Used by the FTORB
   CORBA::OctetSeq_var result_seq_;
diff --git a/TAO/tao/TAO_Server_Request.i b/TAO/tao/TAO_Server_Request.i
index 1f9c0007cc9..a75efcab263 100644
--- a/TAO/tao/TAO_Server_Request.i
+++ b/TAO/tao/TAO_Server_Request.i
@@ -200,18 +200,6 @@ TAO_ServerRequest::interceptor_count (void)
   return this->interceptor_count_;
 }
 
-ACE_INLINE TAO::PICurrent_Impl &
-TAO_ServerRequest::rs_pi_current (void)
-{
-  return this->rs_pi_current_;
-}
-
-ACE_INLINE TAO::PICurrent_Copy_Callback &
-TAO_ServerRequest::pi_current_copy_callback (void)
-{
-  return this->pi_current_copy_callback_;
-}
-
 ACE_INLINE int
 TAO_ServerRequest::got_result (void)
 {
diff --git a/TAO/tao/TC_Constants_Forward.h b/TAO/tao/TC_Constants_Forward.h
deleted file mode 100644
index 72c27451a1c..00000000000
--- a/TAO/tao/TC_Constants_Forward.h
+++ /dev/null
@@ -1,110 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file   TC_Constants_Forward.h
- *
- *  $Id$
- *
- *  Forward declare the type code constants used in the ORB.
- *
- *  @author Jeff Parsons
- */
-//=============================================================================
-
-#ifndef TAO_TC_CONSTANTS_FORWARD_H
-#define TAO_TC_CONSTANTS_FORWARD_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/TAO_Export.h"
-
-namespace CORBA
-{
-  /**
-   * @name TypeCode Constants
-   *
-   * All the TypeCode constants
-   */
-  //@{
-  extern TAO_Export TypeCode_ptr const _tc_null;
-  extern TAO_Export TypeCode_ptr const _tc_void;
-  extern TAO_Export TypeCode_ptr const _tc_short;
-  extern TAO_Export TypeCode_ptr const _tc_long;
-  extern TAO_Export TypeCode_ptr const _tc_ushort;
-  extern TAO_Export TypeCode_ptr const _tc_ulong;
-  extern TAO_Export TypeCode_ptr const _tc_float;
-  extern TAO_Export TypeCode_ptr const _tc_double;
-  extern TAO_Export TypeCode_ptr const _tc_boolean;
-  extern TAO_Export TypeCode_ptr const _tc_char;
-  extern TAO_Export TypeCode_ptr const _tc_octet;
-  extern TAO_Export TypeCode_ptr const _tc_any;
-  extern TAO_Export TypeCode_ptr const _tc_TypeCode;
-  extern TAO_Export TypeCode_ptr const _tc_Principal;
-  extern TAO_Export TypeCode_ptr const _tc_Object;
-  extern TAO_Export TypeCode_ptr const _tc_string;
-  extern TAO_Export TypeCode_ptr const _tc_longlong;
-  extern TAO_Export TypeCode_ptr const _tc_ulonglong;
-  extern TAO_Export TypeCode_ptr const _tc_longdouble;
-  extern TAO_Export TypeCode_ptr const _tc_wchar;
-  extern TAO_Export TypeCode_ptr const _tc_wstring;
-
-#define TAO_SYSTEM_EXCEPTION_LIST \
-  TAO_SYSTEM_EXCEPTION(UNKNOWN); \
-  TAO_SYSTEM_EXCEPTION(BAD_PARAM); \
-  TAO_SYSTEM_EXCEPTION(NO_MEMORY); \
-  TAO_SYSTEM_EXCEPTION(IMP_LIMIT); \
-  TAO_SYSTEM_EXCEPTION(COMM_FAILURE); \
-  TAO_SYSTEM_EXCEPTION(INV_OBJREF); \
-  TAO_SYSTEM_EXCEPTION(OBJECT_NOT_EXIST); \
-  TAO_SYSTEM_EXCEPTION(NO_PERMISSION); \
-  TAO_SYSTEM_EXCEPTION(INTERNAL); \
-  TAO_SYSTEM_EXCEPTION(MARSHAL); \
-  TAO_SYSTEM_EXCEPTION(INITIALIZE); \
-  TAO_SYSTEM_EXCEPTION(NO_IMPLEMENT); \
-  TAO_SYSTEM_EXCEPTION(BAD_TYPECODE); \
-  TAO_SYSTEM_EXCEPTION(BAD_OPERATION); \
-  TAO_SYSTEM_EXCEPTION(NO_RESOURCES); \
-  TAO_SYSTEM_EXCEPTION(NO_RESPONSE); \
-  TAO_SYSTEM_EXCEPTION(PERSIST_STORE); \
-  TAO_SYSTEM_EXCEPTION(BAD_INV_ORDER); \
-  TAO_SYSTEM_EXCEPTION(TRANSIENT); \
-  TAO_SYSTEM_EXCEPTION(FREE_MEM); \
-  TAO_SYSTEM_EXCEPTION(INV_IDENT); \
-  TAO_SYSTEM_EXCEPTION(INV_FLAG); \
-  TAO_SYSTEM_EXCEPTION(INTF_REPOS); \
-  TAO_SYSTEM_EXCEPTION(BAD_CONTEXT); \
-  TAO_SYSTEM_EXCEPTION(OBJ_ADAPTER); \
-  TAO_SYSTEM_EXCEPTION(DATA_CONVERSION); \
-  TAO_SYSTEM_EXCEPTION(INV_POLICY); \
-  TAO_SYSTEM_EXCEPTION(REBIND); \
-  TAO_SYSTEM_EXCEPTION(TIMEOUT); \
-  TAO_SYSTEM_EXCEPTION(TRANSACTION_UNAVAILABLE); \
-  TAO_SYSTEM_EXCEPTION(TRANSACTION_MODE); \
-  TAO_SYSTEM_EXCEPTION(TRANSACTION_REQUIRED); \
-  TAO_SYSTEM_EXCEPTION(TRANSACTION_ROLLEDBACK); \
-  TAO_SYSTEM_EXCEPTION(INVALID_TRANSACTION); \
-  TAO_SYSTEM_EXCEPTION(CODESET_INCOMPATIBLE); \
-  TAO_SYSTEM_EXCEPTION(BAD_QOS); \
-  TAO_SYSTEM_EXCEPTION(INVALID_ACTIVITY); \
-  TAO_SYSTEM_EXCEPTION(ACTIVITY_COMPLETED); \
-  TAO_SYSTEM_EXCEPTION(ACTIVITY_REQUIRED); \
-  TAO_SYSTEM_EXCEPTION(THREAD_CANCELLED);
-
-  // = Typecode constants for system exceptions.
-#define TAO_SYSTEM_EXCEPTION(name) \
-  extern TAO_Export TypeCode_ptr const _tc_ ## name
-  TAO_SYSTEM_EXCEPTION_LIST
-#undef  TAO_SYSTEM_EXCEPTION
-  //@}
-
-  extern TAO_Export TypeCode_ptr const _tc_UnknownUserException;
-
-  extern TAO_Export TypeCode_ptr const _tc_Current;
-
-  extern TAO_Export TypeCode_ptr const _tc_NamedValue;
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_TC_CONSTANTS_FORWARD_H */
diff --git a/TAO/tao/TSS_Resources.h b/TAO/tao/TSS_Resources.h
index 39fa2038898..49d73a60f63 100644
--- a/TAO/tao/TSS_Resources.h
+++ b/TAO/tao/TSS_Resources.h
@@ -105,12 +105,6 @@ public:
   TAO::GUIResource_Factory * gui_resource_factory_;
 };
 
-/**
- * @todo TAO_TSS_RESOURCES typedef should go away.  It is deprecated,
- *       and only exists for backward compatibility.
- */
-typedef TAO_TSS_Resources TAO_TSS_RESOURCES;
-
 #include /**/ "ace/post.h"
 
 #endif /* TAO_TSS_RESOURCES_H */
diff --git a/TAO/tao/TimeBaseA.cpp b/TAO/tao/TimeBaseA.cpp
deleted file mode 100644
index 93f2ddacf31..00000000000
--- a/TAO/tao/TimeBaseA.cpp
+++ /dev/null
@@ -1,271 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "TimeBaseC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Struct_TypeCode_Static.h"
-#include "tao/TypeCode_Struct_Field.h"
-#include "tao/Recursive_Type_TypeCode.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Dual_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_TimeBase_TimeT (
-    CORBA::tk_alias,
-    "IDL:omg.org/TimeBase/TimeT:1.0",
-    "TimeT",
-    &CORBA::_tc_ulonglong);
-  
-namespace TimeBase
-{
-  ::CORBA::TypeCode_ptr const _tc_TimeT =
-    &_tao_tc_TimeBase_TimeT;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_TimeBase_InaccuracyT (
-    CORBA::tk_alias,
-    "IDL:omg.org/TimeBase/InaccuracyT:1.0",
-    "InaccuracyT",
-    &TimeBase::_tc_TimeT);
-  
-namespace TimeBase
-{
-  ::CORBA::TypeCode_ptr const _tc_InaccuracyT =
-    &_tao_tc_TimeBase_InaccuracyT;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_TimeBase_TdfT (
-    CORBA::tk_alias,
-    "IDL:omg.org/TimeBase/TdfT:1.0",
-    "TdfT",
-    &CORBA::_tc_short);
-  
-namespace TimeBase
-{
-  ::CORBA::TypeCode_ptr const _tc_TdfT =
-    &_tao_tc_TimeBase_TdfT;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/struct_typecode.cpp:87
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_TimeBase_UtcT[] =
-  {
-    { "time", &TimeBase::_tc_TimeT },
-    { "inacclo", &CORBA::_tc_ulong },
-    { "inacchi", &CORBA::_tc_ushort },
-    { "tdf", &TimeBase::_tc_TdfT }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                      CORBA::TypeCode_ptr const *,
-                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
-                      TAO::Null_RefCount_Policy>
-  _tao_tc_TimeBase_UtcT (
-    CORBA::tk_struct,
-    "IDL:omg.org/TimeBase/UtcT:1.0",
-    "UtcT",
-    _tao_fields_TimeBase_UtcT,
-    4);
-  
-namespace TimeBase
-{
-  ::CORBA::TypeCode_ptr const _tc_UtcT =
-    &_tao_tc_TimeBase_UtcT;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/struct_typecode.cpp:87
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_TimeBase_IntervalT[] =
-  {
-    { "lower_bound", &TimeBase::_tc_TimeT },
-    { "upper_bound", &TimeBase::_tc_TimeT }
-    
-  };
-static TAO::TypeCode::Struct<char const *,
-                      CORBA::TypeCode_ptr const *,
-                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
-                      TAO::Null_RefCount_Policy>
-  _tao_tc_TimeBase_IntervalT (
-    CORBA::tk_struct,
-    "IDL:omg.org/TimeBase/IntervalT:1.0",
-    "IntervalT",
-    _tao_fields_TimeBase_IntervalT,
-    2);
-  
-namespace TimeBase
-{
-  ::CORBA::TypeCode_ptr const _tc_IntervalT =
-    &_tao_tc_TimeBase_IntervalT;
-}
-
-
-
-// TAO_IDL - Generated from 
-// be\be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const TimeBase::UtcT &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<TimeBase::UtcT>::insert_copy (
-      _tao_any,
-      TimeBase::UtcT::_tao_any_destructor,
-      TimeBase::_tc_UtcT,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    TimeBase::UtcT *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<TimeBase::UtcT>::insert (
-      _tao_any,
-      TimeBase::UtcT::_tao_any_destructor,
-      TimeBase::_tc_UtcT,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    TimeBase::UtcT *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const TimeBase::UtcT *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const TimeBase::UtcT *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<TimeBase::UtcT>::extract (
-        _tao_any,
-        TimeBase::UtcT::_tao_any_destructor,
-        TimeBase::_tc_UtcT,
-        _tao_elem
-      );
-}
-
-// TAO_IDL - Generated from 
-// be\be_visitor_structure/any_op_cs.cpp:54
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const TimeBase::IntervalT &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<TimeBase::IntervalT>::insert_copy (
-      _tao_any,
-      TimeBase::IntervalT::_tao_any_destructor,
-      TimeBase::_tc_IntervalT,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    TimeBase::IntervalT *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<TimeBase::IntervalT>::insert (
-      _tao_any,
-      TimeBase::IntervalT::_tao_any_destructor,
-      TimeBase::_tc_IntervalT,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    TimeBase::IntervalT *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const TimeBase::IntervalT *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const TimeBase::IntervalT *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<TimeBase::IntervalT>::extract (
-        _tao_any,
-        TimeBase::IntervalT::_tao_any_destructor,
-        TimeBase::_tc_IntervalT,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/TimeBaseC.h b/TAO/tao/TimeBaseC.h
index d14e6e08e52..a5846a67720 100644
--- a/TAO/tao/TimeBaseC.h
+++ b/TAO/tao/TimeBaseC.h
@@ -64,105 +64,80 @@
 
 namespace TimeBase
 {
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typedef/typedef_ch.cpp:379
-  
+
   typedef CORBA::ULongLong TimeT;
   typedef CORBA::ULongLong_out TimeT_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_TimeT;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typedef/typedef_ch.cpp:379
-  
+
   typedef TimeT InaccuracyT;
   typedef TimeT_out InaccuracyT_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_InaccuracyT;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typedef/typedef_ch.cpp:379
-  
+
   typedef CORBA::Short TdfT;
   typedef CORBA::Short_out TdfT_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_TdfT;
-  
+
   // TAO_IDL - Generated from
   // be\be_type.cpp:258
-  
+
   struct UtcT;
-  
+
   typedef
     TAO_Fixed_Var_T<
         UtcT
       >
     UtcT_var;
-  
+
   typedef
     UtcT &
     UtcT_out;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_structure/structure_ch.cpp:52
-  
+
   struct TAO_Export UtcT
   {
     typedef UtcT_var _var_type;
-    
+
     static void _tao_any_destructor (void *);
     TimeBase::TimeT time;
     CORBA::ULong inacclo;
     CORBA::UShort inacchi;
     TimeBase::TdfT tdf;
   };
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_UtcT;
-  
+
   // TAO_IDL - Generated from
   // be\be_type.cpp:258
-  
+
   struct IntervalT;
-  
+
   typedef
     TAO_Fixed_Var_T<
         IntervalT
       >
     IntervalT_var;
-  
+
   typedef
     IntervalT &
     IntervalT_out;
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_structure/structure_ch.cpp:52
-  
+
   struct TAO_Export IntervalT
   {
     typedef IntervalT_var _var_type;
-    
+
     static void _tao_any_destructor (void *);
     TimeBase::TimeT lower_bound;
     TimeBase::TimeT upper_bound;
   };
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_IntervalT;
 
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:66
@@ -178,22 +153,6 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_structure/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const TimeBase::UtcT &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, TimeBase::UtcT*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, TimeBase::UtcT *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const TimeBase::UtcT *&);
-
-// TAO_IDL - Generated from
-// be\be_visitor_structure/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const TimeBase::IntervalT &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, TimeBase::IntervalT*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, TimeBase::IntervalT *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const TimeBase::IntervalT *&);
-
-// TAO_IDL - Generated from
 // be\be_visitor_structure/cdr_op_ch.cpp:54
 
 TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const TimeBase::UtcT &);
diff --git a/TAO/tao/Transport.cpp b/TAO/tao/Transport.cpp
index 17b7e2cad92..d1b70a2da54 100644
--- a/TAO/tao/Transport.cpp
+++ b/TAO/tao/Transport.cpp
@@ -822,7 +822,11 @@ TAO_Transport::drain_queue_i (void)
   // the loop because after the loop there may still be data to be
   // sent
   int iovcnt = 0;
+#if defined (ACE_INITIALIZE_MEMORY_BEFORE_USE)
+  iovec iov[ACE_IOV_MAX] = { 0 };
+#else
   iovec iov[ACE_IOV_MAX];
+#endif /* ACE_INITIALIZE_MEMORY_BEFORE_USE */
 
   // We loop over all the elements in the queue ...
   TAO_Queued_Message *i = this->head_;
@@ -1452,7 +1456,6 @@ TAO_Transport::parse_consolidate_messages (ACE_Message_Block &block,
   // Check whether we have a complete message for processing
   const ssize_t missing_data = this->missing_data (block);
 
-
   if (missing_data < 0)
     {
       // If we have more than one message
@@ -1501,7 +1504,7 @@ TAO_Transport::parse_incoming_messages (ACE_Message_Block &block)
 }
 
 
-size_t
+ssize_t
 TAO_Transport::missing_data (ACE_Message_Block &incoming)
 {
   // If we have a incomplete message in the queue then find out how
diff --git a/TAO/tao/Transport.h b/TAO/tao/Transport.h
index be7b5573629..e70f72e0a0b 100644
--- a/TAO/tao/Transport.h
+++ b/TAO/tao/Transport.h
@@ -647,7 +647,7 @@ protected:
   /// Return if we have any missing data in the queue of messages
   /// or determine if we have more information left out in the
   /// presently read message to make it complete.
-  size_t missing_data (ACE_Message_Block &message_block);
+  ssize_t missing_data (ACE_Message_Block &message_block);
 
   /// Consolidate the currently read message or consolidate the last
   /// message in the queue. The consolidation of the last message in
diff --git a/TAO/tao/True_RefCount_Policy.cpp b/TAO/tao/True_RefCount_Policy.cpp
deleted file mode 100644
index 3b5b3fab354..00000000000
--- a/TAO/tao/True_RefCount_Policy.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-// $Id$
-
-#include "True_RefCount_Policy.h"
-
-#ifndef  __ACE_INLINE__
-# include  "True_RefCount_Policy.inl"
-#endif  /* !__ACE_INLINE__ */
-
-
-ACE_RCSID (tao,
-           True_RefCount_Policy,
-           "$Id$")
-
-
-TAO::True_RefCount_Policy::~True_RefCount_Policy (void)
-{
-}
diff --git a/TAO/tao/True_RefCount_Policy.h b/TAO/tao/True_RefCount_Policy.h
deleted file mode 100644
index fb2ce06f2e6..00000000000
--- a/TAO/tao/True_RefCount_Policy.h
+++ /dev/null
@@ -1,116 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    True_RefCount_Policy.h
- *
- *  $Id$
- *
- *  Header file for TAO's true reference count policy (unrelated to
- *  CORBA policies).
- *
- *  @author Ossama Othman <ossama@dre.vanderbilt.edu>
- */
-//=============================================================================
-
-#ifndef TAO_TRUE_REFCOUNT_POLICY_H
-#define TAO_TRUE_REFCOUNT_POLICY_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/TAO_Export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/orbconf.h"
-
-#include "ace/Thread_Mutex.h"
-#include "ace/Atomic_Op.h"
-
-namespace TAO
-{
-  /**
-   * @class True_RefCount_Policy
-   *
-   * @brief True reference counting policy.
-   *
-   * This class is intended to be used as a "policy" argument to a
-   * host class template that requires true/functional reference
-   * counting.  That class would then inherit privately from it like
-   * so:
-   *
-   * @code
-   *   template <class RefCountPolicy>
-   *   class MyHostClass : private RefCountPolicy
-   *   {
-   *   public:
-   *     void my_add_ref (void)    { this->RefCountPolicy::add_ref (); }
-   *     void my_remove_ref (void) { this->RefCountPolicy::remove_ref (); }
-   *   };
-   * @endcode
-   *
-   * and use it like so:
-   *
-   * @code
-   *   typedef MyHostClass<TAO::True_RefCount_Policy> MyRefCountedClass;
-   *   MyRefCountedClass * p = new MyRefCountedClass;
-   *   ...
-   *   p->my_remove_ref ();
-   * @endcode
-   *
-   * @note Ideally, the host class should declare a protected
-   *       destructor to enforce proper memory management through the
-   *       reference counting mechanism, i.e. to prevent clients from
-   *       calling @c operator @c delete() directly on the host class
-   *       object.
-   */
-  class TAO_Export True_RefCount_Policy
-  {
-  public:
-
-    /// Increase the reference count on this object.
-    void add_ref (void);
-
-    /// Decrease the reference count on this object.
-    /**
-     * Decrease the reference count on this object.  Once the
-     * reference count drops to zero, call @c operator @c delete()
-     * on this object.
-     */
-    void remove_ref (void);
-
-  protected:
-
-    /// Constructor.
-    /**
-     * @note This constructor is protected since it not meant to be
-     *       instantiated/used as a standalone object.
-     */
-    True_RefCount_Policy (void);
-
-    /// Destructor.
-    /**
-     * @note The destructor must be virtual to ensure that subclass
-     *       destructors are called when the reference count drops to
-     *       zero, i.e. when @c remove_ref() calls @c operator
-     *       @c delete @c this.
-     */
-    virtual ~True_RefCount_Policy (void);
-
-  private:
-    /// Reference counter.
-    ACE_Atomic_Op<TAO_SYNCH_MUTEX, unsigned long> refcount_;
-  };
-
-}  // End namespace TAO
-
-
-#ifdef __ACE_INLINE__
-# include "tao/True_RefCount_Policy.inl"
-#endif  /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_TRUE_REFCOUNT_POLICY_H */
diff --git a/TAO/tao/True_RefCount_Policy.inl b/TAO/tao/True_RefCount_Policy.inl
deleted file mode 100644
index 87b1b1b9159..00000000000
--- a/TAO/tao/True_RefCount_Policy.inl
+++ /dev/null
@@ -1,25 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-
-ACE_INLINE
-TAO::True_RefCount_Policy::True_RefCount_Policy (void)
-  : refcount_ (1)
-{
-}
-
-ACE_INLINE void
-TAO::True_RefCount_Policy::add_ref (void)
-{
-  ++this->refcount_;
-}
-
-ACE_INLINE void
-TAO::True_RefCount_Policy::remove_ref (void)
-{
-  const unsigned long new_count = --this->refcount_;
-
-  if (new_count == 0)
-    delete this;
-}
diff --git a/TAO/tao/TypeCode.h b/TAO/tao/TypeCode.h
deleted file mode 100644
index 373104e4ca6..00000000000
--- a/TAO/tao/TypeCode.h
+++ /dev/null
@@ -1,580 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    TypeCode.h
- *
- *  $Id$
- *
- *  Header file the @c CORBA::TypeCode class.
- *
- *  @author Ossama Othman <ossama@dre.vanderbilt.edu>
- *  @author DOC group at Vanderbilt University, Washington University
- *          and the University of California at Irvine.
- */
-//=============================================================================
-
-#ifndef TAO_TYPECODE_H
-#define TAO_TYPECODE_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/TAO_Export.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/UserException.h"
-#include "tao/Basic_Types.h"
-#include "tao/ValueModifierC.h"
-#include "tao/VisibilityC.h"
-#include "tao/Typecode_typesC.h"
-#include "tao/CORBA_methods.h"
-#include "tao/Pseudo_VarOut_T.h"
-#include "tao/Object_Argument_T.h"
-#include "tao/Arg_Traits_T.h"
-
-
-namespace CORBA
-{
-  typedef TAO_Pseudo_Var_T<TypeCode> TypeCode_var;
-  typedef TAO_Pseudo_Out_T<TypeCode, TypeCode_var> TypeCode_out;
-
-  /**
-   * @class TypeCode
-   *
-   * @brief A representation of the structure of a given OMG
-   *        IDL-declared type.
-   *
-   * @c TypeCodes are primarily used by @c CORBA::Anys, the CORBA
-   * Interface Repository and the CORBA Dynamic Invocation Interface.
-   */
-  class TAO_Export TypeCode
-  {
-  public:
-
-    /**
-     * @class Bounds
-     *
-     * @brief Out-of-bounds member index exception.
-     *
-     * Exception thrown when attempting to pass an out-of-bounds index
-     * value to a @c TypeCode operation that accepts a member index
-     * argument.
-     */
-    class TAO_Export Bounds : public UserException
-    {
-    public:
-
-      /// Constructor.
-      Bounds (void);
-
-      static Bounds * _downcast (CORBA::Exception * ex);
-      static CORBA::Exception * _alloc (void);
-
-      virtual CORBA::Exception * _tao_duplicate (void) const;
-
-      virtual void _raise (void) const;
-
-      virtual void _tao_encode (TAO_OutputCDR & cdr
-                                ACE_ENV_ARG_DECL) const;
-      virtual void _tao_decode (TAO_InputCDR & cdr
-                                ACE_ENV_ARG_DECL);
-
-    };
-
-    /**
-     * @class BadKind
-     *
-     * @brief Invalid @c TypeCode operation exception.
-     *
-     * Exception thrown when attempting to invoke a @c TypeCode
-     * operation that is not valid for the type represented by the
-     * @c TypeCode.
-     */
-    class TAO_Export BadKind : public CORBA::UserException
-    {
-    public:
-
-      BadKind (void);
-
-      static BadKind * _downcast (CORBA::Exception * ex);
-      static CORBA::Exception * _alloc (void);
-
-      virtual CORBA::Exception * _tao_duplicate (void) const;
-
-      virtual void _raise (void) const;
-
-      virtual void _tao_encode (TAO_OutputCDR & cdr
-                                ACE_ENV_ARG_DECL) const;
-      virtual void _tao_decode (TAO_InputCDR & cdr
-                                ACE_ENV_ARG_DECL);
-
-    };
-
-    static CORBA::TypeCode_ptr const _tc_Bounds;
-    static CORBA::TypeCode_ptr const _tc_BadKind;
-
-    /// Duplicate this @c TypeCode.
-    /**
-     * Statically instantiated @c TypeCodes incur no reference count
-     * manipulation, i.e. reference counting is a no-op.
-     *
-     * Dynamically instantiated @c TypeCodes will have their reference
-     * count incremented by one each time this function is called.
-     */
-    static CORBA::TypeCode_ptr _duplicate (CORBA::TypeCode_ptr tc);
-
-    /// Returns a NULL typecode.
-    static CORBA::TypeCode_ptr _nil (void);
-
-    /**
-     * @name @c CORBA::TypeCode Methods
-     *
-     * These methods are part of the public interface of @c
-     * CORBA::TypeCode class, as defined by the OMG CORBA
-     * specification and C++ mapping.
-     *
-     * The C++ mapping does not declare the methods in the public
-     * @c CORBA::TypeCode API as @c virtual, so work around that by
-     * making these methods inlined to forward all calls to the
-     * corresponding protected template method (i.e. the design
-     * pattern, not the C++ feature) listed below in the @c protected
-     * block.
-     */
-    //@{
-    /// Equality of two @c TypeCodes.
-    /**
-     * @return @c true if and only if the set of legal operations is
-     *         the same and invoking any operation on the this
-     *         @c TypeCode and @a tc returns identical results.
-     */
-    Boolean equal (TypeCode_ptr tc
-                   ACE_ENV_ARG_DECL) const;
-
-    /// Equivalence of two @c TypeCodes.
-    /**
-     * Equivalence of two @c TypeCodes satisfies a subset of the
-     * requirements necessary for equality.
-     *
-     * @see equal
-     */
-    Boolean equivalent (TypeCode_ptr tc
-                        ACE_ENV_ARG_DECL) const;
-
-    /// The kind of @c TypeCode.
-    TCKind kind (ACE_ENV_SINGLE_ARG_DECL) const;
-
-    /// Return @c TypeCode stripped of optional @c name and
-    /// @c member_name fields.
-    /**
-     * @note Calling this method will incur additional run-time memory
-     *       consumption since TAO's implementation relies on the
-     *       TypeCodeFactory to dynamically create a compact @c
-     *       TypeCode; the exception being @c TypeCodes with empty
-     *       parameter lists.  Those @c TypeCodes are already compact,
-     *       meaning that call this method on such @c TypeCodes incurs
-     *       no additional run-time memory requirements.
-     *
-     *       Unless you need to send compact @c TypeCodes
-     *       "over-the-wire" or your @c TypeCode corresponds to a
-     *       type with a large number of members, try to stick with
-     *       the existing potentially non-compact @c TypeCode.
-     *
-     * @note Compact @c TypeCodes may also be generated statically by
-     *       the TAO_IDL compiler by invoking it with its "-Gt"
-     *       (i.e. enable optimized TypeCodes) command line option.
-     */
-    TypeCode_ptr get_compact_typecode (ACE_ENV_SINGLE_ARG_DECL) const;
-
-    /// The @c RepositoryId globally identifying the type.
-    /**
-     * This method is valid for the following kinds of @c TypeCodes:
-     *
-     * @li @c tk_objref
-     * @li @c tk_struct
-     * @li @c tk_union
-     * @li @c tk_enum
-     * @li @c tk_alias
-     * @li @c tk_value
-     * @li @c tk_value_box
-     * @li @c tk_native
-     * @li @c tk_abstract_interface
-     * @li @c tk_local_interface
-     * @li @c tk_except
-     * @li @c tk_component
-     * @li @c tk_home
-     * @li @c tk_event
-     *
-     * @note CORBA::TypeCode::id() does not follow the usual parameter
-     *       passing rules defined by the C++ mapping.  This behavior
-     *       is required by the C++ mapping.  In particular, ownership
-     *       is maintained by the @c TypeCode.
-     */
-    char const * id (ACE_ENV_SINGLE_ARG_DECL) const;
-
-    /// The simple name identifying the type within its enclosing
-    /// scope.
-    /**
-     * This method is valid for the following kinds of @c TypeCodes:
-     *
-     * @li @c tk_objref
-     * @li @c tk_struct
-     * @li @c tk_union
-     * @li @c tk_enum
-     * @li @c tk_alias
-     * @li @c tk_value
-     * @li @c tk_value_box
-     * @li @c tk_native
-     * @li @c tk_abstract_interface
-     * @li @c tk_local_interface
-     * @li @c tk_except
-     * @li @c tk_component
-     * @li @c tk_home
-     * @li @c tk_event
-     *
-     * @note CORBA::TypeCode::name() does not follow the usual
-     *       parameter passing rules defined by the C++ mapping.  This
-     *       behavior is required by the C++ mapping.  In particular,
-     *       ownership is maintained by the @c TypeCode.
-     */
-    char const * name (ACE_ENV_SINGLE_ARG_DECL) const;
-
-    /// The type member count.
-    /**
-     * This method is valid for the following kinds of @c TypeCodes:
-     *
-     * @li @c tk_struct
-     * @li @c tk_union
-     * @li @c tk_enum
-     * @li @c tk_value
-     * @li @c tk_except
-     * @li @c tk_event
-     */
-    ULong member_count (ACE_ENV_SINGLE_ARG_DECL) const;
-
-    /// The type member name.
-    /**
-     * This method is valid for the following kinds of @c TypeCodes:
-     *
-     * @li @c tk_struct
-     * @li @c tk_union
-     * @li @c tk_enum
-     * @li @c tk_value
-     * @li @c tk_except
-     * @li @c tk_event
-     *
-     * @note CORBA::TypeCode::member_name() does not follow the usual
-     *       parameter passing rules defined by the C++ mapping.  This
-     *       behavior is required by the C++ mapping.  In particular,
-     *       ownership is maintained by the @c TypeCode.
-     */
-    char const * member_name (ULong index
-                              ACE_ENV_ARG_DECL) const;
-
-    /// The type member @c TypeCode.
-    /**
-     * This method is valid for the following kinds of @c TypeCodes:
-     *
-     * @li @c tk_struct
-     * @li @c tk_union
-     * @li @c tk_value
-     * @li @c tk_except
-     * @li @c tk_event
-     */
-    TypeCode_ptr member_type (ULong index
-                              ACE_ENV_ARG_DECL) const;
-
-    /// The union member label.
-    /**
-     * This method is valid for the following kinds of @c TypeCodes:
-     *
-     * @li @c tk_union
-     */
-    Any * member_label (ULong index
-                        ACE_ENV_ARG_DECL) const;
-
-    /// The type of all non-default union member labels.
-    /**
-     * This method is valid for the following kinds of @c TypeCodes:
-     *
-     * @li @c tk_union
-     */
-    TypeCode_ptr discriminator_type (ACE_ENV_SINGLE_ARG_DECL) const;
-
-    /// The index of the default union member.
-    /**
-     * This method is valid for the following kinds of @c TypeCodes:
-     *
-     * @li @c tk_union
-     */
-    Long default_index (ACE_ENV_SINGLE_ARG_DECL) const;
-
-    /// The length of the type.
-    /**
-     * This method is valid for the following kinds of @c TypeCodes:
-     *
-     * @li @c tk_string
-     * @li @c tk_wstring
-     * @li @c tk_sequence
-     * @li @c tk_array
-     */
-    ULong length (ACE_ENV_SINGLE_ARG_DECL) const;
-
-    /// The underlying content type.
-    /**
-     * This method is valid for the following kinds of @c TypeCodes:
-     *
-     * @li @c tk_sequence
-     * @li @c tk_array
-     * @li @c tk_value_box
-     * @li @c tk_alias
-     */
-    TypeCode_ptr content_type (ACE_ENV_SINGLE_ARG_DECL) const;
-
-    /// The number of significant digits.
-    /**
-     * This method is valid for the following kinds of @c TypeCodes:
-     *
-     * @li @c tk_fixed
-     */
-    UShort fixed_digits (ACE_ENV_SINGLE_ARG_DECL) const;
-
-    /// The scale factor.
-    /**
-     * This method is valid for the following kinds of @c TypeCodes:
-     *
-     * @li @c tk_fixed
-     */
-    UShort fixed_scale (ACE_ENV_SINGLE_ARG_DECL) const;
-
-    /// The @c Visibility of the @c valuetype or @c eventtype member
-    /// corresponding to index @a index.
-    /**
-     * This method is valid for the following kinds of @c TypeCodes:
-     *
-     * @li @c tk_value
-     * @li @c tk_event
-     */
-    Visibility member_visibility (ULong index
-                                  ACE_ENV_ARG_DECL) const;
-
-    /// The @c ValueModifier of the @c valuetype of @c eventtype
-    /// represented by this @c TypeCode.
-    /**
-     * This method is valid for the following kinds of @c TypeCodes:
-     *
-     * @li @c tk_value
-     * @li @c tk_event
-     */
-    ValueModifier type_modifier (ACE_ENV_SINGLE_ARG_DECL) const;
-
-    /// The @c TypeCode corresponding to the concrete base
-    /// @c valuetype or @c eventtype.
-    /**
-     * This method is valid for the following kinds of @c TypeCodes:
-     *
-     * @li @c tk_value
-     * @li @c tk_event
-     *
-     * @return @c TypeCode corresponding to the concrete base
-     *         @c valuetype or @c eventtype.
-     *         @c CORBA::TypeCode::_nil() if no concrete base exists.
-     */
-    TypeCode_ptr concrete_base_type (ACE_ENV_SINGLE_ARG_DECL) const;
-    //@}
-
-    /// Marshal the @c TypeCode @c TCKind.
-    /**
-     *
-     */
-    virtual bool tao_marshal_kind (TAO_OutputCDR & cdr) const;
-
-    /// Marshal this @c TypeCode into a CDR output stream.
-    /**
-     * Marshal this @c TypeCode into the @a cdr output CDR stream,
-     * excluding the @c TypeCode kind.  Existing @a cdr contents will
-     * not be altered.  The marshaled @c TypeCode will be appended to
-     * the given @a cdr CDR output stream.
-     *
-     * @param cdr    Output CDR stream into which the @c TypeCode will be
-     *               marshaled.
-     *
-     * @param offset Number of bytes currently in the output CDR
-     *               stream, including the top-level TypeCode @c
-     *               TCKind.  This argument is useful for recursive
-     *               @c TypeCodes.  @c TypeCodes that contain other
-     *               @c TypeCodes should pass an updated @a offset
-     *               value to the marshaling operation for those
-     *               contained @c TypeCodes.
-     *
-     * @return @c true if marshaling was successful.
-     *
-     * @note This is a TAO-specific method that is not part of the
-     *       standard @c CORBA::TypeCode interface.
-     *
-     * @note If this method returns @false, the contents of the @a cdr
-     *       output CDR stream are undefined.
-     */
-    virtual bool tao_marshal (TAO_OutputCDR & cdr,
-                              CORBA::ULong offset) const = 0;
-
-    /// Increase the reference count on this @c TypeCode.
-    virtual void tao_duplicate (void) = 0;
-
-    /// Decrease the reference count on this object.
-    virtual void tao_release (void) = 0;
-
-    /// Destruction callback for Anys.
-    static void _tao_any_destructor (void * x);
-
-    typedef CORBA::TypeCode_var _var_type;
-
-  protected:
-
-    /// Constructor.
-    TypeCode (CORBA::TCKind kind);
-
-    /// Destructor.
-    /**
-     * Protected destructor to enforce proper memory management
-     * through the reference counting mechanism.
-     */
-    virtual ~TypeCode (void);
-
-    /**
-     * @name @c TypeCode Template Methods
-     *
-     * Methods that must be implemented by @c CORBA::TypeCode
-     * subclasses if valid for those subclasses.
-     *
-     * The default implementations of the non-pure virtual methods
-     * throw the @c CORBA::TypeCode::BadKind exception since many of
-     * these methods are @c TypeCode type-specific.  This reduces code
-     * duplication and bloat.
-     *
-     * The @c TypeCode @c equal(), @c equivalent(), @c kind() and
-     * @c get_compact_typecode() methods are valid for all
-     * @c TypeCodes which is why their template method "@c _i"
-     * counterparts are pure virtual.
-     */
-    //@{
-    virtual Boolean equal_i (TypeCode_ptr tc
-                             ACE_ENV_ARG_DECL) const = 0;
-    virtual Boolean equivalent_i (TypeCode_ptr tc
-                                  ACE_ENV_ARG_DECL) const = 0;
-    virtual TypeCode_ptr get_compact_typecode_i (
-      ACE_ENV_SINGLE_ARG_DECL) const = 0;
-
-    virtual char const * id_i (ACE_ENV_SINGLE_ARG_DECL) const;
-    virtual char const * name_i (ACE_ENV_SINGLE_ARG_DECL) const;
-    virtual ULong member_count_i (ACE_ENV_SINGLE_ARG_DECL) const;
-    virtual char const * member_name_i (ULong index
-                                        ACE_ENV_ARG_DECL) const;
-    virtual TypeCode_ptr member_type_i (ULong index
-                                        ACE_ENV_ARG_DECL) const;
-    virtual Any * member_label_i (ULong index
-                                  ACE_ENV_ARG_DECL) const;
-    virtual TypeCode_ptr discriminator_type_i (
-      ACE_ENV_SINGLE_ARG_DECL) const;
-    virtual Long default_index_i (ACE_ENV_SINGLE_ARG_DECL) const;
-    virtual ULong length_i (ACE_ENV_SINGLE_ARG_DECL) const;
-    virtual TypeCode_ptr content_type_i (ACE_ENV_SINGLE_ARG_DECL) const;
-    virtual UShort fixed_digits_i (ACE_ENV_SINGLE_ARG_DECL) const;
-    virtual UShort fixed_scale_i (ACE_ENV_SINGLE_ARG_DECL) const;
-    virtual Visibility member_visibility_i (ULong index
-                                            ACE_ENV_ARG_DECL) const;
-    virtual ValueModifier type_modifier_i (ACE_ENV_SINGLE_ARG_DECL) const;
-    virtual TypeCode_ptr concrete_base_type_i (
-      ACE_ENV_SINGLE_ARG_DECL) const;
-    //@}
-
-  private:
-
-    // Prevent copying and assignment.
-    TypeCode (TypeCode const &);
-    void operator= (TypeCode const &);
-
-  protected:
-
-    /// The kind of TypeCode.
-    TCKind const kind_;
-
-  };
-
-}  // End namespace CORBA
-
-
-TAO_NAMESPACE_INLINE_FUNCTION
-bool operator<< (TAO_OutputCDR & cdr,
-                            CORBA::TypeCode_ptr tc);
-
-TAO_Export bool operator>> (TAO_InputCDR & cdr,
-                            CORBA::TypeCode_ptr & tc);
-
-namespace TAO
-{
-  namespace TypeCode
-  {
-    /// Marshal the @c TypeCode @a tc in to the output CDR stream @a
-    /// cdr.
-    /**
-     * @see @CORBA::TypeCode::tao_marshal() description for details.
-     */
-
-    TAO_Export bool marshal (TAO_OutputCDR & cdr,
-                             CORBA::TypeCode_ptr tc,
-                             CORBA::ULong offset);
-
-    /// Return @a offset aligned on the appropriate CDR boundary.
-    TAO_Export CORBA::ULong aligned_offset (CORBA::ULong offset);
-  }
-
-  /// Return the unaliased content @c TypeCode of the given
-  /// @c TypeCode.
-  TAO_Export CORBA::TypeCode_ptr unaliased_typecode (CORBA::TypeCode_ptr tc
-                                                     ACE_ENV_ARG_DECL);
-
-  /// Return the unaliased @c TCKind of the given @c TypeCode.
-  /**
-   * @note This is a convenience function that simply calls @c kind()
-   *       on the unaliased @c TypeCode returned from
-   *       @c unaliased_typecode().
-   */
-  TAO_NAMESPACE_INLINE_FUNCTION
-  CORBA::TCKind unaliased_kind (CORBA::TypeCode_ptr tc
-                                ACE_ENV_ARG_DECL);
-
-  // ---------------------------------------------------------------
-
-  // Used in generated code if CORBA::TypeCode is an argument or
-  // return type.
-  template<>
-  class TAO_Export Arg_Traits<CORBA::TypeCode>
-    : public Object_Arg_Traits_T<CORBA::TypeCode_ptr,
-                                 CORBA::TypeCode_var,
-                                 CORBA::TypeCode_out,
-                                 TAO::Objref_Traits<CORBA::TypeCode> >
-  {
-  };
-
-  template<>
-  struct TAO_Export Objref_Traits< ::CORBA::TypeCode>
-  {
-    static ::CORBA::TypeCode_ptr duplicate (::CORBA::TypeCode_ptr);
-    static void release (::CORBA::TypeCode_ptr);
-    static ::CORBA::TypeCode_ptr nil (void);
-    static CORBA::Boolean marshal (::CORBA::TypeCode_ptr p,
-                                   TAO_OutputCDR & cdr);
-  };
-}
-
-
-#if defined (__ACE_INLINE__)
-# include "tao/TypeCode.inl"
-#endif /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_TYPECODE_H */
diff --git a/TAO/tao/TypeCode.inl b/TAO/tao/TypeCode.inl
deleted file mode 100644
index 4126fdb565c..00000000000
--- a/TAO/tao/TypeCode.inl
+++ /dev/null
@@ -1,183 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-
-#include "tao/CORBA_methods.h"
-#include "tao/Environment.h"
-
-
-ACE_INLINE CORBA::Boolean
-CORBA::is_nil (CORBA::TypeCode_ptr obj)
-{
-  return obj == 0;
-}
-
-ACE_INLINE void
-CORBA::release (CORBA::TypeCode_ptr obj)
-{
-  if (obj)
-    obj->tao_release ();
-}
-
-// --------------------------------------------------------------
-
-ACE_INLINE
-CORBA::TypeCode::TypeCode (CORBA::TCKind k)
-  : kind_ (k)
-{
-}
-
-ACE_INLINE CORBA::TypeCode_ptr
-CORBA::TypeCode::_duplicate (CORBA::TypeCode_ptr tc)
-{
-  if (!CORBA::is_nil (tc))
-    tc->tao_duplicate ();
-
-  return tc;
-}
-
-ACE_INLINE CORBA::TypeCode_ptr
-CORBA::TypeCode::_nil (void)
-{
-  return static_cast<CORBA::TypeCode_ptr> (0);
-}
-
-ACE_INLINE CORBA::TCKind
-CORBA::TypeCode::kind (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  return this->kind_;
-}
-
-ACE_INLINE CORBA::TypeCode_ptr
-CORBA::TypeCode::get_compact_typecode (ACE_ENV_SINGLE_ARG_DECL) const
-{
-  return this->get_compact_typecode_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-ACE_INLINE char const *
-CORBA::TypeCode::id (ACE_ENV_SINGLE_ARG_DECL) const
-{
-  return this->id_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-ACE_INLINE char const *
-CORBA::TypeCode::name (ACE_ENV_SINGLE_ARG_DECL) const
-{
-  return this->name_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-ACE_INLINE CORBA::ULong
-CORBA::TypeCode::member_count (ACE_ENV_SINGLE_ARG_DECL) const
-{
-  return this->member_count_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-ACE_INLINE char const *
-CORBA::TypeCode::member_name (ULong index
-                              ACE_ENV_ARG_DECL) const
-{
-  return this->member_name_i (index
-                              ACE_ENV_ARG_PARAMETER);
-}
-
-ACE_INLINE CORBA::TypeCode_ptr
-CORBA::TypeCode::member_type (ULong index
-                              ACE_ENV_ARG_DECL) const
-{
-  return this->member_type_i (index
-                              ACE_ENV_ARG_PARAMETER);
-}
-
-ACE_INLINE CORBA::Any *
-CORBA::TypeCode::member_label (ULong index
-                               ACE_ENV_ARG_DECL) const
-{
-  return this->member_label_i (index
-                               ACE_ENV_ARG_PARAMETER);
-}
-
-ACE_INLINE CORBA::TypeCode_ptr
-CORBA::TypeCode::discriminator_type (ACE_ENV_SINGLE_ARG_DECL) const
-{
-  return this->discriminator_type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-ACE_INLINE CORBA::Long
-CORBA::TypeCode::default_index (ACE_ENV_SINGLE_ARG_DECL) const
-{
-  return this->default_index_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-ACE_INLINE CORBA::ULong
-CORBA::TypeCode::length (ACE_ENV_SINGLE_ARG_DECL) const
-{
-  return this->length_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-ACE_INLINE CORBA::TypeCode_ptr
-CORBA::TypeCode::content_type (ACE_ENV_SINGLE_ARG_DECL) const
-{
-  return this->content_type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-ACE_INLINE CORBA::UShort
-CORBA::TypeCode::fixed_digits (ACE_ENV_SINGLE_ARG_DECL) const
-{
-  return this->fixed_digits_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-ACE_INLINE CORBA::UShort
-CORBA::TypeCode::fixed_scale (ACE_ENV_SINGLE_ARG_DECL) const
-{
-  return this->fixed_scale_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-ACE_INLINE CORBA::Visibility
-CORBA::TypeCode::member_visibility (ULong index
-                                    ACE_ENV_ARG_DECL) const
-{
-  return this->member_visibility_i (index
-                                    ACE_ENV_ARG_PARAMETER);
-}
-
-ACE_INLINE CORBA::ValueModifier
-CORBA::TypeCode::type_modifier (ACE_ENV_SINGLE_ARG_DECL) const
-{
-  return this->type_modifier_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-ACE_INLINE CORBA::TypeCode_ptr
-CORBA::TypeCode::concrete_base_type (ACE_ENV_SINGLE_ARG_DECL) const
-{
-  return this->concrete_base_type_i (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-ACE_INLINE void
-CORBA::TypeCode::_tao_any_destructor (void * x)
-{
-  CORBA::release (static_cast <CORBA::TypeCode_ptr> (x));
-}
-
-// --------------------------------------------------------------
-
-ACE_INLINE bool
-operator<< (TAO_OutputCDR & cdr,
-            CORBA::TypeCode_ptr tc)
-{
-  return TAO::TypeCode::marshal (cdr, tc, 0);
-}
-
-// ---------------------------------------------------------------
-
-ACE_INLINE CORBA::TCKind
-TAO::unaliased_kind (CORBA::TypeCode_ptr tc
-                     ACE_ENV_ARG_DECL)
-{
-  CORBA::TypeCode_var unaliased_tc =
-    TAO::unaliased_typecode (tc
-                             ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (CORBA::TAO_TC_KIND_COUNT);
-
-  return unaliased_tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
diff --git a/TAO/tao/TypeCodeA.cpp b/TAO/tao/TypeCodeA.cpp
deleted file mode 100644
index 6ff09fdf2cc..00000000000
--- a/TAO/tao/TypeCodeA.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
-// $Id$
-
-#include "Struct_TypeCode_Static.h"
-#include "Null_RefCount_Policy.h"
-
-
-ACE_RCSID (tao,
-           TypeCode,
-           "$Id$")
-
-
-namespace TAO
-{
-  namespace TypeCode
-  {
-    // Notice that these are all statically instantiated and not
-    // exported.
-
-    char const tc_bounds_id[]   = "IDL:omg.org/CORBA/TypeCode/Bounds:1.0";
-    char const tc_bounds_name[] = "Bounds";
-    Struct<char const *,
-           CORBA::TypeCode_ptr const *,
-           Struct_Field<char const *,
-                        CORBA::TypeCode_ptr const *> const *,
-           TAO::Null_RefCount_Policy> tc_Bounds (CORBA::tk_except,
-                                                 tc_bounds_id,
-                                                 tc_bounds_name,
-                                                 0,
-                                                 0);
-
-    char const tc_bad_kind_id[]   = "IDL:omg.org/CORBA/TypeCode/BadKind:1.0";
-    char const tc_bad_kind_name[] = "BadKind";
-    Struct<char const *,
-           CORBA::TypeCode_ptr const *,
-           Struct_Field<char const *,
-                        CORBA::TypeCode_ptr const *> const *,
-           TAO::Null_RefCount_Policy> tc_BadKind (CORBA::tk_except,
-                                                  tc_bad_kind_id,
-                                                  tc_bad_kind_name,
-                                                  0,
-                                                  0);
-  }
-}
-
-
-// ------------------------------------------------------------------
-// OMG defined TypeCode constants
-// ------------------------------------------------------------------
-
-// Notice that these are constant TypeCode references/pointers, not
-// constant TypeCodes.  TypeCodes are effectively read-only since
-// all non-static TypeCode operations are const.
-
-
-CORBA::TypeCode_ptr const CORBA::TypeCode::_tc_BadKind =
-  &TAO::TypeCode::tc_BadKind;
-CORBA::TypeCode_ptr const CORBA::TypeCode::_tc_Bounds =
-  &TAO::TypeCode::tc_Bounds;
-
diff --git a/TAO/tao/TypeCodeFactory.mpc b/TAO/tao/TypeCodeFactory.mpc
index 2b4b00c59bb..d84aece5bf6 100644
--- a/TAO/tao/TypeCodeFactory.mpc
+++ b/TAO/tao/TypeCodeFactory.mpc
@@ -27,6 +27,9 @@ project : taolib, core, ifr_client {
     TypeCodeFactory
   }
 
+  IDL_Files {
+  }
+
   Pkgconfig_Files {
     TypeCodeFactory/TAO_TypeCodeFactory.pc.in
   }
diff --git a/TAO/tao/TypeCodeFactory/Recursive_TypeCode.h b/TAO/tao/TypeCodeFactory/Recursive_TypeCode.h
index d9ca30b3758..1636cb666ad 100644
--- a/TAO/tao/TypeCodeFactory/Recursive_TypeCode.h
+++ b/TAO/tao/TypeCodeFactory/Recursive_TypeCode.h
@@ -17,8 +17,8 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/TypeCode.h"
-#include "tao/True_RefCount_Policy.h"
+#include "tao/AnyTypeCode/TypeCode.h"
+#include "tao/AnyTypeCode/True_RefCount_Policy.h"
 
 namespace TAO
 {
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactoryA.cpp b/TAO/tao/TypeCodeFactory/TypeCodeFactoryA.cpp
index 4111fe39297..0952ee4202b 100644
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactoryA.cpp
+++ b/TAO/tao/TypeCodeFactory/TypeCodeFactoryA.cpp
@@ -26,14 +26,14 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 #include "TypeCodeFactoryC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Objref_TypeCode_Static.h"
-#include "tao/String_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Objref_TypeCode_Static.h"
+#include "tao/AnyTypeCode/String_TypeCode_Static.h"
 #include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Impl_T.h"
+#include "tao/AnyTypeCode/Any.h"
+#include "tao/AnyTypeCode/Any_Impl_T.h"
 
 // TAO_IDL - Generated from
 // be\be_visitor_typecode/objref_typecode.cpp:76
@@ -44,7 +44,7 @@ static TAO::TypeCode::Objref<char const *,
     CORBA::tk_local_interface,
     "IDL:omg.org/CORBA/TypeCodeFactory:1.0",
     "TypeCodeFactory");
-  
+
 namespace CORBA
 {
   ::CORBA::TypeCode_ptr const _tc_TypeCodeFactory =
@@ -77,7 +77,7 @@ namespace TAO
   {
     return false;
   }
-  
+
   template<>
   CORBA::Boolean
   Any_Impl_T<CORBA::TypeCodeFactory>::demarshal_value (TAO_InputCDR &)
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.h b/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.h
index e5f114a4261..1de9b8c30c0 100644
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.h
+++ b/TAO/tao/TypeCodeFactory/TypeCodeFactoryC.h
@@ -45,8 +45,8 @@
 #include "tao/SystemException.h"
 #include "tao/Environment.h"
 #include "tao/Object.h"
-#include "tao/TypeCode.h"
-#include "tao/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/TypeCode.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/Objref_VarOut_T.h"
 
 #include "tao/IFR_Client/IFR_ExtendedC.h"
@@ -70,22 +70,22 @@
 
 namespace CORBA
 {
-  
+
   // TAO_IDL - Generated from
   // be\be_interface.cpp:598
 
 #if !defined (_CORBA_TYPECODEFACTORY__VAR_OUT_CH_)
 #define _CORBA_TYPECODEFACTORY__VAR_OUT_CH_
-  
+
   class TypeCodeFactory;
   typedef TypeCodeFactory *TypeCodeFactory_ptr;
-  
+
   typedef
     TAO_Objref_Var_T<
         TypeCodeFactory
       >
     TypeCodeFactory_var;
-  
+
   typedef
     TAO_Objref_Out_T<
         TypeCodeFactory
@@ -93,45 +93,45 @@ namespace CORBA
     TypeCodeFactory_out;
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_interface/interface_ch.cpp:54
 
 #if !defined (_CORBA_TYPECODEFACTORY_CH_)
 #define _CORBA_TYPECODEFACTORY_CH_
-  
+
   class TAO_TypeCodeFactory_Export TypeCodeFactory
     : public virtual CORBA::Object
   {
   public:
     typedef TypeCodeFactory_ptr _ptr_type;
     typedef TypeCodeFactory_var _var_type;
-    
+
     // The static operations.
     static TypeCodeFactory_ptr _duplicate (TypeCodeFactory_ptr obj);
-    
+
     static void _tao_release (TypeCodeFactory_ptr obj);
-    
+
     static TypeCodeFactory_ptr _narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static TypeCodeFactory_ptr _unchecked_narrow (
         CORBA::Object_ptr obj
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     static TypeCodeFactory_ptr _nil (void)
     {
       return static_cast<TypeCodeFactory_ptr> (0);
     }
-    
+
     static void _tao_any_destructor (void *);
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::TypeCode_ptr create_struct_tc (
         const char * id,
         const char * name,
@@ -141,10 +141,10 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::TypeCode_ptr create_union_tc (
         const char * id,
         const char * name,
@@ -155,10 +155,10 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::TypeCode_ptr create_enum_tc (
         const char * id,
         const char * name,
@@ -168,10 +168,10 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::TypeCode_ptr create_alias_tc (
         const char * id,
         const char * name,
@@ -181,10 +181,10 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::TypeCode_ptr create_exception_tc (
         const char * id,
         const char * name,
@@ -194,10 +194,10 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::TypeCode_ptr create_interface_tc (
         const char * id,
         const char * name
@@ -206,10 +206,10 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::TypeCode_ptr create_string_tc (
         ::CORBA::ULong bound
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -217,10 +217,10 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::TypeCode_ptr create_wstring_tc (
         ::CORBA::ULong bound
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -228,10 +228,10 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::TypeCode_ptr create_fixed_tc (
         ::CORBA::UShort digits,
         ::CORBA::UShort scale
@@ -240,10 +240,10 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::TypeCode_ptr create_sequence_tc (
         ::CORBA::ULong bound,
         ::CORBA::TypeCode_ptr element_type
@@ -252,10 +252,10 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::TypeCode_ptr create_array_tc (
         ::CORBA::ULong length,
         ::CORBA::TypeCode_ptr element_type
@@ -264,10 +264,10 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::TypeCode_ptr create_value_tc (
         const char * id,
         const char * name,
@@ -279,10 +279,10 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::TypeCode_ptr create_value_box_tc (
         const char * id,
         const char * name,
@@ -292,10 +292,10 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::TypeCode_ptr create_native_tc (
         const char * id,
         const char * name
@@ -304,10 +304,10 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::TypeCode_ptr create_recursive_tc (
         const char * id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
@@ -315,10 +315,10 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::TypeCode_ptr create_abstract_interface_tc (
         const char * id,
         const char * name
@@ -327,10 +327,10 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::TypeCode_ptr create_local_interface_tc (
         const char * id,
         const char * name
@@ -339,10 +339,10 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::TypeCode_ptr create_component_tc (
         const char * id,
         const char * name
@@ -351,10 +351,10 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::TypeCode_ptr create_home_tc (
         const char * id,
         const char * name
@@ -363,10 +363,10 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_operation/operation_ch.cpp:46
-    
+
     virtual CORBA::TypeCode_ptr create_event_tc (
         const char * id,
         const char * name,
@@ -378,36 +378,36 @@ namespace CORBA
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_interface/interface_ch.cpp:210
-    
+
     virtual CORBA::Boolean _is_a (
         const char *type_id
         ACE_ENV_ARG_DECL_WITH_DEFAULTS
       );
-    
+
     virtual const char* _interface_repository_id (void) const;
     virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
-  
+
   protected:
     // Abstract or local interface only.
     TypeCodeFactory (void);
-    
+
     virtual ~TypeCodeFactory (void);
-  
+
   private:
     // Private and unimplemented for concrete interfaces.
     TypeCodeFactory (const TypeCodeFactory &);
-    
+
     void operator= (const TypeCodeFactory &);
   };
 
 #endif /* end #if !defined */
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_typecode/typecode_decl.cpp:44
-  
+
   extern TAO_TypeCodeFactory_Export ::CORBA::TypeCode_ptr const _tc_TypeCodeFactory;
 
 // TAO_IDL - Generated from
@@ -424,7 +424,7 @@ namespace TAO
 
 #if !defined (_CORBA_TYPECODEFACTORY__TRAITS_CH_)
 #define _CORBA_TYPECODEFACTORY__TRAITS_CH_
-  
+
   template<>
   struct TAO_TypeCodeFactory_Export Objref_Traits< ::CORBA::TypeCodeFactory>
   {
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp
index 02772abddb2..dcbfab24c9e 100644
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp
+++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp
@@ -4,29 +4,29 @@
 #include "Recursive_TypeCode.h"
 
 #include "tao/IFR_Client/IFR_BasicC.h"
-#include "tao/Marshal.h"
+#include "tao/AnyTypeCode/Marshal.h"
 #include "tao/ORB_Constants.h"
 #include "tao/CDR.h"
-#include "tao/Any_Unknown_IDL_Type.h"
+#include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h"
 #include "tao/SystemException.h"
 
-#include "tao/Alias_TypeCode.h"
-#include "tao/Enum_TypeCode.h"
-#include "tao/Fixed_TypeCode.h"
-#include "tao/Objref_TypeCode.h"
-#include "tao/Sequence_TypeCode.h"
-#include "tao/String_TypeCode.h"
-#include "tao/Struct_TypeCode.h"
-#include "tao/Union_TypeCode.h"
-#include "tao/Value_TypeCode.h"
+#include "tao/AnyTypeCode/Alias_TypeCode.h"
+#include "tao/AnyTypeCode/Enum_TypeCode.h"
+#include "tao/AnyTypeCode/Fixed_TypeCode.h"
+#include "tao/AnyTypeCode/Objref_TypeCode.h"
+#include "tao/AnyTypeCode/Sequence_TypeCode.h"
+#include "tao/AnyTypeCode/String_TypeCode.h"
+#include "tao/AnyTypeCode/Struct_TypeCode.h"
+#include "tao/AnyTypeCode/Union_TypeCode.h"
+#include "tao/AnyTypeCode/Value_TypeCode.h"
 
-#include "tao/Recursive_Type_TypeCode.h"
+#include "tao/AnyTypeCode/Recursive_Type_TypeCode.h"
 
-#include "tao/TypeCode_Case_T.h"
-#include "tao/TypeCode_Struct_Field.h"
-#include "tao/TypeCode_Value_Field.h"
+#include "tao/AnyTypeCode/TypeCode_Case_T.h"
+#include "tao/AnyTypeCode/TypeCode_Struct_Field.h"
+#include "tao/AnyTypeCode/TypeCode_Value_Field.h"
 
-#include "tao/True_RefCount_Policy.h"
+#include "tao/AnyTypeCode/True_RefCount_Policy.h"
 
 
 #include "ace/SString.h"
diff --git a/TAO/tao/TypeCodeFactory_Adapter.cpp b/TAO/tao/TypeCodeFactory_Adapter.cpp
index da87219834c..1dbec9f2dea 100644
--- a/TAO/tao/TypeCodeFactory_Adapter.cpp
+++ b/TAO/tao/TypeCodeFactory_Adapter.cpp
@@ -4,22 +4,11 @@
 
 #include "ace/Dynamic_Service.h"
 
-ACE_RCSID (tao, 
-           TypeCodeFactory_Adapter, 
+ACE_RCSID (tao,
+           TypeCodeFactory_Adapter,
            "$Id$")
 
 TAO_TypeCodeFactory_Adapter::~TAO_TypeCodeFactory_Adapter (void)
 {
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-
diff --git a/TAO/tao/TypeCodeFactory_Adapter.h b/TAO/tao/TypeCodeFactory_Adapter.h
index 2b266ba61c0..1e6e09eb1ff 100644
--- a/TAO/tao/TypeCodeFactory_Adapter.h
+++ b/TAO/tao/TypeCodeFactory_Adapter.h
@@ -22,10 +22,8 @@
 
 #include "tao/SystemException.h"
 #include "tao/Environment.h"
-#include "tao/ValueModifierC.h"
 #include "tao/Typecode_typesC.h"
 
-
 template<class T> class ACE_Array_Base;
 
 namespace CORBA
@@ -37,6 +35,8 @@ namespace CORBA
 
   typedef TAO_Pseudo_Var_T<TypeCode> TypeCode_var;
   typedef TAO_Pseudo_Out_T<TypeCode, TypeCode_var> TypeCode_out;
+
+  typedef CORBA::Short ValueModifier;
 }
 
 namespace TAO
diff --git a/TAO/tao/TypeCode_Base_Attributes.cpp b/TAO/tao/TypeCode_Base_Attributes.cpp
deleted file mode 100644
index 9a8728a12e8..00000000000
--- a/TAO/tao/TypeCode_Base_Attributes.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-// $Id$
-
-#ifndef TAO_TYPECODE_BASE_ATTRIBUTES_CPP
-#define TAO_TYPECODE_BASE_ATTRIBUTES_CPP
-
-#include "tao/TypeCode_Base_Attributes.h"
-
-#ifndef __ACE_INLINE__
-# include "tao/TypeCode_Base_Attributes.inl"
-#endif /* !__ACE_INLINE__ */
-
-#endif  /* TAO_TYPECODE_BASE_ATTRIBUTES_CPP */
diff --git a/TAO/tao/TypeCode_Base_Attributes.h b/TAO/tao/TypeCode_Base_Attributes.h
deleted file mode 100644
index 797c4373f47..00000000000
--- a/TAO/tao/TypeCode_Base_Attributes.h
+++ /dev/null
@@ -1,96 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    TypeCode_Base_Attributes.h
- *
- *  $Id$
- *
- *  @author Ossama Othman <ossama@dre.vanderbilt.edu>
- */
-//=============================================================================
-
-#ifndef TAO_TYPECODE_BASE_ATTRIBUTES_H
-#define TAO_TYPECODE_BASE_ATTRIBUTES_H
-
-#include /**/ "ace/pre.h"
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-namespace TAO
-{
-  namespace TypeCode
-  {
-
-    /**
-     * @class Base_Attributes
-     *
-     * @brief Attributes contained by most @c TypeCodes with complex
-     *        parameter lists.
-     *
-     * Most @c TypeCodes with complex parameter lists (see Section
-     * 15.3.5.1 "TypeCode" in the CORBA specification) contain these
-     * attributes, namely a repository ID and a name.
-     */
-    template <typename STRING_TYPE>
-    class Base_Attributes
-    {
-    public:
-
-      /// Constructor.
-      Base_Attributes (char const * id,
-                       char const * name);
-
-      /// Constructor used by recursive @c TypeCodes.
-      Base_Attributes (char const * id);
-
-      /// Get the @c RepositoryId globally identifying the type.
-      char const * id (void) const;
-
-      /// Get the simple name identifying the type within its
-      /// enclosing scope.
-      char const * name (void) const;
-
-      /// Set the simple name identifying the type within its
-      /// enclosing scope.
-      /**
-       * @note This method only used when creating a recursive
-       *       TypeCode.
-       */
-      void name (char const * the_name);
-
-    private:
-
-      /// The @c RepositoryId globally identifying the type.
-      STRING_TYPE const id_;
-
-      /// The simple name identifying the type within its enclosing
-      /// scope.
-      STRING_TYPE name_;
-
-    };
-
-  }  // End namespace TypeCode
-}  // End namespace TAO
-
-
-#ifdef __ACE_INLINE__
-# include "tao/TypeCode_Base_Attributes.inl"
-#endif /* __ACE_INLINE__ */
-
-#ifdef ACE_TEMPLATES_REQUIRE_SOURCE
-# include "tao/TypeCode_Base_Attributes.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#ifdef ACE_TEMPLATES_REQUIRE_PRAGMA
-# pragma implementation ("TypeCode_Base_Attributes.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_TYPECODE_BASE_ATTRIBUTES_H */
diff --git a/TAO/tao/TypeCode_Base_Attributes.inl b/TAO/tao/TypeCode_Base_Attributes.inl
deleted file mode 100644
index 0582fb7352f..00000000000
--- a/TAO/tao/TypeCode_Base_Attributes.inl
+++ /dev/null
@@ -1,51 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-#include "tao/TypeCode_Traits.h"
-
-
-template <typename STRING_TYPE>
-ACE_INLINE
-TAO::TypeCode::Base_Attributes<STRING_TYPE>::Base_Attributes (
-  char const * id,
-  char const * name)
-  : id_ (id),
-    name_ (name)
-{
-}
-
-template <typename STRING_TYPE>
-ACE_INLINE
-TAO::TypeCode::Base_Attributes<STRING_TYPE>::Base_Attributes (
-  char const * id)
-  : id_ (id),
-    name_ ()
-{
-  // Only used in the dynamic (when STRING_TYPE == CORBA::String_var)
-  // recursive TypeCode case.
-}
-
-template <typename STRING_TYPE>
-ACE_INLINE char const *
-TAO::TypeCode::Base_Attributes<STRING_TYPE>::id (void) const
-{
-  return Traits<STRING_TYPE>::get_string (this->id_);
-}
-
-template <typename STRING_TYPE>
-ACE_INLINE char const *
-TAO::TypeCode::Base_Attributes<STRING_TYPE>::name (void) const
-{
-  return Traits<STRING_TYPE>::get_string (this->name_);
-}
-
-template <typename STRING_TYPE>
-ACE_INLINE void
-TAO::TypeCode::Base_Attributes<STRING_TYPE>::name (char const * the_name)
-{
-  // This method will only be instantiated in the dynamic TypeCode
-  // case, i.e. when STRING_TYPE is CORBA::String_var.
-
-  this->name_ = the_name;
-}
diff --git a/TAO/tao/TypeCode_CDR_Extraction.cpp b/TAO/tao/TypeCode_CDR_Extraction.cpp
deleted file mode 100644
index 4ce1faadfb3..00000000000
--- a/TAO/tao/TypeCode_CDR_Extraction.cpp
+++ /dev/null
@@ -1,1325 +0,0 @@
-// $Id$
-
-#include "TypeCode_CDR_Extraction.h"
-
-#include "tao/CDR.h"
-
-#include "tao/TypeCode_Constants.h"
-#include "tao/True_RefCount_Policy.h"
-
-#include "tao/Alias_TypeCode.h"
-#include "tao/Enum_TypeCode.h"
-#include "tao/Fixed_TypeCode.h"
-#include "Objref_TypeCode.h"
-#include "tao/Sequence_TypeCode.h"
-#include "tao/String_TypeCode.h"
-#include "tao/Struct_TypeCode.h"
-#include "tao/Union_TypeCode.h"
-#include "tao/Value_TypeCode.h"
-
-#include "tao/Recursive_Type_TypeCode.h"
-
-#include "tao/TypeCode_Case_T.h"
-#include "tao/TypeCode_Struct_Field.h"
-#include "tao/TypeCode_Value_Field.h"
-
-#include "ace/Array_Base.h"
-
-
-ACE_RCSID (tao,
-           TypeCode_CDR_Extraction,
-           "$Id$")
-
-
-namespace TAO
-{
-  namespace TypeCodeFactory
-  {
-    // An array of TC_Info objects is used instead of a map of
-    // repository IDs to TypeCodes since it is presumed that the
-    // number of directly or indirectly embedded types in a TypeCode
-    // capable of holding another TypeCode will be small enough to
-    // make traversing a list faster than performing a map lookup.
-    // Use a simple array also reduces static and run-time footprint.
-
-    struct TC_Info
-    {
-      /// Constructor.
-      TC_Info (void) : id (0), type () {}
-
-      /// Repository ID.
-      char const * id;
-
-      /// TypeCode
-      CORBA::TypeCode_ptr type;
-    };
-
-    typedef ACE_Array_Base<TC_Info> TC_Info_List;
-  }
-}
-
-namespace
-{
-  bool start_cdr_encap_extraction (TAO_InputCDR & cdr)
-  {
-    CORBA::Boolean byte_order;
-
-    // Don't bother demarshaling the encapsulation length.  Prefer
-    // speed over early error checking.  Any CDR length related
-    // failures will be detected when demarshaling the remainder of
-    // the complex parameter list TypeCode.
-
-    if (!(cdr.skip_ulong () // Skip encapsulation length.
-          && cdr >> TAO_InputCDR::to_boolean (byte_order)))
-      return false;
-
-    cdr.reset_byte_order (byte_order);
-
-    return true;
-  }
-
-  // ---------------------------------------------------------
-
-  CORBA::ULong const TYPECODE_INDIRECTION = 0xffffffff;
-
-  // ---------------------------------------------------------
-
-  // Use an ACE::Value_Ptr to provide exception safety and proper
-  // copying semantics.
-  typedef ACE::Value_Ptr<TAO::TypeCode::Case<CORBA::String_var, CORBA::TypeCode_var> > union_elem_type;
-  typedef ACE_Array_Base<union_elem_type> union_case_array_type;
-
-  // ------------------------------------------------------------
-
-  /// Demarshal a TypeCode.
-  bool tc_demarshal (TAO_InputCDR & cdr,
-                     CORBA::TypeCode_ptr & tc,
-                     TAO::TypeCodeFactory::TC_Info_List & infos);
-
-  /// Demarshal an indirected TypeCode.
-  bool tc_demarshal_indirection (TAO_InputCDR & cdr,
-                                 CORBA::TypeCode_ptr & tc,
-                                 TAO::TypeCodeFactory::TC_Info_List & infos);
-
-  bool find_recursive_tc (char const * id,
-                          CORBA::TypeCode_ptr & tc,
-                          TAO::TypeCodeFactory::TC_Info_List & infos)
-  {
-    // See comments above for rationale behind using an array instead
-    // of a map.
-
-    size_t const len = infos.size ();
-
-    for (size_t i = 0; i < len; ++i)
-      {
-        TAO::TypeCodeFactory::TC_Info & info = infos[i];
-
-        if (ACE_OS::strcmp (info.id, id) == 0)
-          {
-            tc = info.type;
-            return true;
-          }
-      }
-
-    return false;
-  }
-}
-
-bool
-TAO::TypeCodeFactory::tc_null_factory (CORBA::TCKind,
-                                       TAO_InputCDR &,
-                                       CORBA::TypeCode_ptr & tc,
-                                       TC_Info_List &)
-{
-  tc = CORBA::TypeCode::_duplicate (CORBA::_tc_null);
-
-  return true;
-}
-
-bool
-TAO::TypeCodeFactory::tc_void_factory (CORBA::TCKind,
-                                       TAO_InputCDR &,
-                                       CORBA::TypeCode_ptr & tc,
-                                       TC_Info_List &)
-{
-  tc = CORBA::TypeCode::_duplicate (CORBA::_tc_void);
-
-  return true;
-}
-
-bool
-TAO::TypeCodeFactory::tc_short_factory (CORBA::TCKind,
-                                        TAO_InputCDR &,
-                                        CORBA::TypeCode_ptr & tc,
-                                        TC_Info_List &)
-{
-  tc = CORBA::TypeCode::_duplicate (CORBA::_tc_short);
-
-  return true;
-}
-
-bool
-TAO::TypeCodeFactory::tc_long_factory (CORBA::TCKind,
-                                       TAO_InputCDR &,
-                                       CORBA::TypeCode_ptr & tc,
-                                       TC_Info_List &)
-{
-  tc = CORBA::TypeCode::_duplicate (CORBA::_tc_long);
-
-  return true;
-}
-
-bool
-TAO::TypeCodeFactory::tc_ushort_factory (CORBA::TCKind,
-                                         TAO_InputCDR &,
-                                         CORBA::TypeCode_ptr & tc,
-                                         TC_Info_List &)
-{
-  tc = CORBA::TypeCode::_duplicate (CORBA::_tc_ushort);
-
-  return true;
-}
-
-bool
-TAO::TypeCodeFactory::tc_ulong_factory (CORBA::TCKind,
-                                        TAO_InputCDR &,
-                                        CORBA::TypeCode_ptr & tc,
-                                        TC_Info_List &)
-{
-  tc = CORBA::TypeCode::_duplicate (CORBA::_tc_ulong);
-
-  return true;
-}
-
-bool
-TAO::TypeCodeFactory::tc_float_factory (CORBA::TCKind,
-                                        TAO_InputCDR &,
-                                        CORBA::TypeCode_ptr & tc,
-                                        TC_Info_List &)
-{
-  tc = CORBA::TypeCode::_duplicate (CORBA::_tc_float);
-
-  return true;
-}
-
-bool
-TAO::TypeCodeFactory::tc_double_factory (CORBA::TCKind,
-                                         TAO_InputCDR &,
-                                         CORBA::TypeCode_ptr & tc,
-                                         TC_Info_List &)
-{
-  tc = CORBA::TypeCode::_duplicate (CORBA::_tc_double);
-
-  return true;
-}
-
-bool
-TAO::TypeCodeFactory::tc_boolean_factory (CORBA::TCKind,
-                                          TAO_InputCDR &,
-                                          CORBA::TypeCode_ptr & tc,
-                                          TC_Info_List &)
-{
-  tc = CORBA::TypeCode::_duplicate (CORBA::_tc_boolean);
-
-  return true;
-}
-
-bool
-TAO::TypeCodeFactory::tc_char_factory (CORBA::TCKind,
-                                       TAO_InputCDR &,
-                                       CORBA::TypeCode_ptr & tc,
-                                       TC_Info_List &)
-{
-  tc = CORBA::TypeCode::_duplicate (CORBA::_tc_char);
-
-  return true;
-}
-
-bool
-TAO::TypeCodeFactory::tc_octet_factory (CORBA::TCKind,
-                                        TAO_InputCDR &,
-                                        CORBA::TypeCode_ptr & tc,
-                                        TC_Info_List &)
-{
-  tc = CORBA::TypeCode::_duplicate (CORBA::_tc_octet);
-
-  return true;
-}
-
-bool
-TAO::TypeCodeFactory::tc_any_factory (CORBA::TCKind,
-                                      TAO_InputCDR &,
-                                      CORBA::TypeCode_ptr & tc,
-                                      TC_Info_List &)
-{
-  tc = CORBA::TypeCode::_duplicate (CORBA::_tc_any);
-
-  return true;
-}
-
-bool
-TAO::TypeCodeFactory::tc_TypeCode_factory (CORBA::TCKind,
-                                           TAO_InputCDR &,
-                                           CORBA::TypeCode_ptr & tc,
-                                           TC_Info_List &)
-{
-  tc = CORBA::TypeCode::_duplicate (CORBA::_tc_TypeCode);
-
-  return true;
-}
-
-bool
-TAO::TypeCodeFactory::tc_Principal_factory (CORBA::TCKind,
-                                            TAO_InputCDR &,
-                                            CORBA::TypeCode_ptr & tc,
-                                            TC_Info_List &)
-{
-  tc = CORBA::TypeCode::_duplicate (CORBA::_tc_Principal);
-
-  return true;
-}
-
-bool
-TAO::TypeCodeFactory::tc_objref_factory (CORBA::TCKind kind,
-                                         TAO_InputCDR & cdr,
-                                         CORBA::TypeCode_ptr & tc,
-                                         TC_Info_List &)
-{
-  // The remainder of a tk_objref TypeCode is encoded in a CDR
-  // encapsulation.
-  if (!start_cdr_encap_extraction (cdr))
-    return false;
-
-  // Extract the repository ID and name.
-  CORBA::String_var id;
-  if (!(cdr >> TAO_InputCDR::to_string (id.out (), 0)))
-    return false;
-
-  static char const Object_id[]    = "IDL:omg.org/CORBA/Object:1.0";
-  static char const CCMObject_id[] = "IDL:omg.org/CORBA/CCMObject:1.0";
-  static char const CCMHome_id[]   = "IDL:omg.org/CORBA/CCMHome:1.0";
-
-  char const * tc_constant_id = "";
-
-  switch (kind)
-    {
-    case CORBA::tk_component:
-      tc_constant_id = CCMObject_id;
-      break;
-    case CORBA::tk_home:
-      tc_constant_id = CCMHome_id;
-      break;
-    case CORBA::tk_objref:
-      tc_constant_id = Object_id;
-      break;
-    default:
-      break;
-    }
-
-  if (ACE_OS::strcmp (id.in (),  // len >= 0!!!
-                      tc_constant_id) == 0)
-    {
-      if (!cdr.skip_string ())  // No need to demarshal the name.
-        return false;
-
-      CORBA::TypeCode_ptr tc_constant = CORBA::TypeCode::_nil ();
-      switch (kind)
-        {
-        case CORBA::tk_component:
-          tc_constant = CORBA::_tc_Component;
-          break;
-        case CORBA::tk_home:
-          tc_constant = CORBA::_tc_Home;
-          break;
-        case CORBA::tk_objref:
-          tc_constant = CORBA::_tc_Object;
-          break;
-        default:
-          break;
-        }
-
-      // No need to create a TypeCode.  Just use the TypeCode
-      // constant.
-      tc =
-        CORBA::TypeCode::_duplicate (tc_constant);
-    }
-  else
-    {
-      CORBA::String_var name;
-
-      if (!(cdr >> TAO_InputCDR::to_string (name.out (), 0)))
-        return false;
-
-      typedef TAO::TypeCode::Objref<CORBA::String_var,
-                                    TAO::True_RefCount_Policy> typecode_type;
-
-      ACE_NEW_RETURN (tc,
-                      typecode_type (kind,
-                                     id.in (),
-                                     name.in ()),
-                      false);
-    }
-
-  return true;
-}
-
-bool
-TAO::TypeCodeFactory::tc_struct_factory (CORBA::TCKind kind,
-                                         TAO_InputCDR & cdr,
-                                         CORBA::TypeCode_ptr & tc,
-                                         TC_Info_List & infos)
-{
-  ACE_ASSERT (kind == CORBA::tk_struct || kind == CORBA::tk_except);
-
-  // The remainder of a tk_struct/tk_except TypeCode is encoded in
-  // a CDR encapsulation.
-  if (!start_cdr_encap_extraction (cdr))
-    return false;
-
-  // Extract the repository ID, name and number of fields.
-  CORBA::String_var id, name;
-  CORBA::ULong nfields;
-
-  if (!(cdr >> TAO_InputCDR::to_string (id.out (), 0)
-        && cdr >> TAO_InputCDR::to_string (name.out (), 0)
-        && cdr >> nfields))
-    return false;
-
-  typedef ACE_Array_Base<TAO::TypeCode::Struct_Field<CORBA::String_var,
-                                                     CORBA::TypeCode_var> >
-    member_array_type;
-
-  member_array_type fields (nfields);
-
-  for (CORBA::ULong i = 0; i < nfields; ++i)
-    {
-      if (!(cdr >> TAO_InputCDR::to_string (fields[i].name.out (), 0)
-            && tc_demarshal (cdr, fields[i].type.out (), infos)))
-        return false;
-    }
-
-  typedef TAO::TypeCode::Struct<
-    CORBA::String_var,
-    CORBA::TypeCode_var,
-    member_array_type,
-    TAO::True_RefCount_Policy> typecode_type;
-
-
-  // Check if struct TypeCode is recursive.
-  if (kind == CORBA::tk_struct && find_recursive_tc (id.in (), tc, infos))
-    {
-      // Set remaining parameters.
-
-      typedef TAO::TypeCode::Recursive_Type<typecode_type,
-                                            CORBA::TypeCode_var,
-                                            member_array_type>
-        recursive_typecode_type;
-
-      recursive_typecode_type * const rtc =
-        dynamic_cast<recursive_typecode_type *> (tc);
-
-      ACE_ASSERT (rtc);
-
-      rtc->struct_parameters (name.in (),
-                              fields,
-                              nfields);
-    }
-  else
-    {
-      ACE_NEW_RETURN (tc,
-                      typecode_type (kind,
-                                     id.in (),
-                                     name.in (),
-                                     fields,     // Will be copied.
-                                     nfields),
-                      false);
-    }
-
-  return true;
-}
-
-bool
-TAO::TypeCodeFactory::tc_union_factory (CORBA::TCKind /* kind */,
-                                        TAO_InputCDR & cdr,
-                                        CORBA::TypeCode_ptr & tc,
-                                        TC_Info_List & infos)
-{
-  // The remainder of a tk_enum TypeCode is encoded in a CDR
-  // encapsulation.
-
-  if (!start_cdr_encap_extraction (cdr))
-    return false;
-
-  // Extract the repository ID, name, discriminant type, default index
-  // and case count.
-  CORBA::String_var id, name;
-  CORBA::TypeCode_var discriminant_type;
-  CORBA::Long default_index = -1;
-  CORBA::ULong ncases = 0;  // Just 'n case :-)
-
-  if (!(cdr >> TAO_InputCDR::to_string (id.out (), 0)
-        && cdr >> TAO_InputCDR::to_string (name.out (), 0)
-        && cdr >> discriminant_type.out ())) // No need to use tc_demarshal()
-    return false;
-
-  ACE_DECLARE_NEW_CORBA_ENV;
-  CORBA::TCKind const discriminant_kind =
-    discriminant_type->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
-
-  // Check for valid discriminant type.
-  if (!(discriminant_kind == CORBA::tk_enum
-        || discriminant_kind == CORBA::tk_ulong
-        || discriminant_kind == CORBA::tk_long
-        || discriminant_kind == CORBA::tk_ushort
-        || discriminant_kind == CORBA::tk_short
-        || discriminant_kind == CORBA::tk_char
-        || discriminant_kind == CORBA::tk_boolean
-        || discriminant_kind == CORBA::tk_longlong
-        || discriminant_kind == CORBA::tk_ulonglong))
-    return false;
-
-  if (!(cdr >> default_index
-        && default_index >= -1
-        && cdr >> ncases))
-    return false;
-
-  typedef union_elem_type       elem_type;
-  typedef union_case_array_type case_array_type;
-
-  case_array_type cases (ncases);
-
-  for (CORBA::ULong i = 0; i < ncases; ++i)
-    {
-      elem_type & member = cases[i];
-
-      TAO::TypeCode::Case<CORBA::String_var, CORBA::TypeCode_var> * the_case;
-
-      // Ugly.  *sigh*
-      switch (discriminant_kind)
-        {
-        case CORBA::tk_enum:  // Enumerators are encoded as unsigned longs.
-        case CORBA::tk_ulong:
-          {
-            CORBA::ULong label;
-            if (!(cdr >> label))
-              return false;
-
-            typedef TypeCode::Case_T<CORBA::ULong,
-                                     CORBA::String_var,
-                                     CORBA::TypeCode_var> case_type;
-
-            ACE_NEW_RETURN (the_case,
-                            case_type (label),
-                            false);
-          }
-          break;
-        case CORBA::tk_long:
-          {
-            CORBA::Long label;
-            if (!(cdr >> label))
-              return false;
-
-            typedef TypeCode::Case_T<CORBA::Long,
-                                     CORBA::String_var,
-                                     CORBA::TypeCode_var> case_type;
-
-            ACE_NEW_RETURN (the_case,
-                            case_type (label),
-                            false);
-          }
-          break;
-        case CORBA::tk_ushort:
-          {
-            CORBA::UShort label;
-            if (!(cdr >> label))
-              return false;
-
-            typedef TypeCode::Case_T<CORBA::UShort,
-                                     CORBA::String_var,
-                                     CORBA::TypeCode_var> case_type;
-
-            ACE_NEW_RETURN (the_case,
-                            case_type (label),
-                            false);
-          }
-          break;
-        case CORBA::tk_short:
-          {
-            CORBA::Short label;
-            if (!(cdr >> label))
-              return false;
-
-            typedef TypeCode::Case_T<CORBA::Short,
-                                     CORBA::String_var,
-                                     CORBA::TypeCode_var> case_type;
-
-            ACE_NEW_RETURN (the_case,
-                            case_type (label),
-                            false);
-          }
-          break;
-        case CORBA::tk_char:
-          {
-            CORBA::Char label;
-            if (!(cdr >> CORBA::Any::to_char (label)))
-              return false;
-
-            typedef TypeCode::Case_T<CORBA::Char,
-                                     CORBA::String_var,
-                                     CORBA::TypeCode_var> case_type;
-
-            ACE_NEW_RETURN (the_case,
-                            case_type (label),
-                            false);
-          }
-          break;
-        case CORBA::tk_boolean:
-          {
-            CORBA::Boolean label;
-            if (!(cdr >> CORBA::Any::to_boolean (label)))
-              return false;
-
-            typedef TypeCode::Case_T<CORBA::Boolean,
-                                     CORBA::String_var,
-                                     CORBA::TypeCode_var> case_type;
-
-            ACE_NEW_RETURN (the_case,
-                            case_type (label),
-                            false);
-          }
-          break;
-        case CORBA::tk_longlong:
-          {
-            CORBA::LongLong label;
-            if (!(cdr >> label))
-              return false;
-
-            typedef TypeCode::Case_T<CORBA::LongLong,
-                                     CORBA::String_var,
-                                     CORBA::TypeCode_var> case_type;
-
-            ACE_NEW_RETURN (the_case,
-                            case_type (label),
-                            false);
-          }
-          break;
-#if !defined (ACE_LACKS_LONGLONG_T)
-        case CORBA::tk_ulonglong:
-          {
-            CORBA::ULongLong label;
-            if (!(cdr >> label))
-              return false;
-
-            typedef TypeCode::Case_T<CORBA::ULongLong,
-                                     CORBA::String_var,
-                                     CORBA::TypeCode_var> case_type;
-
-            ACE_NEW_RETURN (the_case,
-                            case_type (label),
-                            false);
-          }
-          break;
-#endif  /* !ACE_LACKS_LONGLONG_T */
-        default:
-          return false;
-        }
-
-      elem_type case_value (the_case);
-      member.swap (case_value);  // Exception-safe
-
-      CORBA::String_var the_name;
-      CORBA::TypeCode_var the_type;
-
-      if (!(cdr >> TAO_InputCDR::to_string (the_name.out (), 0)
-            && tc_demarshal (cdr, the_type.out (), infos)))
-        return false;
-
-      member->name (the_name.in ());
-      member->type (the_type.in ());
-    }
-
-  typedef TAO::TypeCode::Union<CORBA::String_var,
-                               CORBA::TypeCode_var,
-                               case_array_type,
-                               TAO::True_RefCount_Policy> typecode_type;
-
-  // Check if union TypeCode is recursive.
-  if (find_recursive_tc (id.in (), tc, infos))
-    {
-      // Set remaining parameters.
-
-      typedef TAO::TypeCode::Recursive_Type<typecode_type,
-                                            CORBA::TypeCode_var,
-                                            case_array_type>
-        recursive_typecode_type;
-
-      recursive_typecode_type * const rtc =
-        dynamic_cast<recursive_typecode_type *> (tc);
-
-      ACE_ASSERT (rtc);
-
-      rtc->union_parameters (name.in (),
-                             discriminant_type,
-                             cases,     // Will be copied.
-                             ncases,
-                             default_index);
-    }
-  else
-    {
-      ACE_NEW_RETURN (tc,
-                      typecode_type (id.in (),
-                                     name.in (),
-                                     discriminant_type,
-                                     cases,     // Will be copied.
-                                     ncases,
-                                     default_index),
-                      false);
-    }
-
-  return true;
-}
-
-bool
-TAO::TypeCodeFactory::tc_enum_factory (CORBA::TCKind /* kind */,
-                                       TAO_InputCDR & cdr,
-                                       CORBA::TypeCode_ptr & tc,
-                                       TC_Info_List &)
-{
-  // The remainder of a tk_enum TypeCode is encoded in a CDR
-  // encapsulation.
-
-  if (!start_cdr_encap_extraction (cdr))
-    return false;
-
-  // Extract the repository ID, name and number of fields.
-  CORBA::String_var id, name;
-  CORBA::ULong nenumerators;
-
-  if (!(cdr >> TAO_InputCDR::to_string (id.out (), 0)
-        && cdr >> TAO_InputCDR::to_string (name.out (), 0)
-        && cdr >> nenumerators))
-    return false;
-
-  ACE_Array_Base<CORBA::String_var> enumerators (nenumerators);
-
-  for (CORBA::ULong i = 0; i < nenumerators; ++i)
-    {
-      if (!(cdr >> TAO_InputCDR::to_string (enumerators[i].out (), 0)))
-        return false;
-    }
-
-  typedef TAO::TypeCode::Enum<
-    CORBA::String_var,
-    ACE_Array_Base<CORBA::String_var>,
-    TAO::True_RefCount_Policy> typecode_type;
-
-  ACE_NEW_RETURN (tc,
-                  typecode_type (id.in (),
-                                 name.in (),
-                                 enumerators,     // Will be copied.
-                                 nenumerators),
-                  false);
-
-  return true;
-}
-
-bool
-TAO::TypeCodeFactory::tc_string_factory (CORBA::TCKind kind,
-                                         TAO_InputCDR & cdr,
-                                         CORBA::TypeCode_ptr & tc,
-                                         TC_Info_List &)
-{
-  // A tk_string/tk_wstring TypeCode has a simple parameter list,
-  // i.e. it is not encoded in a CDR encapsulation.
-
-  CORBA::ULong bound;
-  if (!(cdr >> bound))
-    return false;
-
-  if (bound == 0)
-    {
-      // Just use the TypeCode constant.
-      if (kind == CORBA::tk_string)
-        tc = CORBA::TypeCode::_duplicate (CORBA::_tc_string);
-      else if (kind == CORBA::tk_wstring)
-        tc = CORBA::TypeCode::_duplicate (CORBA::_tc_wstring);
-      else
-        return false;
-
-      return true;
-    }
-
-  typedef TAO::TypeCode::String<TAO::True_RefCount_Policy> typecode_type;
-
-  ACE_NEW_RETURN (tc,
-                  typecode_type (kind, bound),
-                  false);
-
-  return true;
-}
-
-bool
-TAO::TypeCodeFactory::tc_sequence_factory (CORBA::TCKind kind,
-                                           TAO_InputCDR & cdr,
-                                           CORBA::TypeCode_ptr & tc,
-                                           TC_Info_List & infos)
-{
-  ACE_ASSERT (kind == CORBA::tk_sequence || kind == CORBA::tk_array);
-
-  // The remainder of a tk_sequence TypeCode is encoded in a CDR
-  // encapsulation.
-
-  if (!start_cdr_encap_extraction (cdr))
-    return false;
-
-  // Extract the repository ID, name and content type.
-  CORBA::TypeCode_var content_type;
-  CORBA::ULong length;
-
-  if (!(tc_demarshal (cdr, content_type.out (), infos)
-        && cdr >> length))
-    return false;
-
-  typedef TAO::TypeCode::Sequence<
-    CORBA::TypeCode_var,
-    TAO::True_RefCount_Policy> typecode_type;
-
-  ACE_NEW_RETURN (tc,
-                  typecode_type (kind, content_type, length),
-                  false);
-
-  return true;
-}
-
-bool
-TAO::TypeCodeFactory::tc_array_factory (CORBA::TCKind kind,
-                                        TAO_InputCDR & cdr,
-                                        CORBA::TypeCode_ptr & tc,
-                                        TC_Info_List & infos)
-{
-  return tc_sequence_factory (kind, cdr, tc, infos);
-}
-
-bool
-TAO::TypeCodeFactory::tc_alias_factory (CORBA::TCKind kind,
-                                        TAO_InputCDR & cdr,
-                                        CORBA::TypeCode_ptr & tc,
-                                        TC_Info_List & infos)
-{
-  // The remainder of a tk_alias or tk_value_box TypeCode is encoded
-  // in a CDR encapsulation.
-
-  if (!start_cdr_encap_extraction (cdr))
-    return false;
-
-  // Extract the repository ID, name and content type.
-  CORBA::String_var id, name;
-  CORBA::TypeCode_var content_type;
-  if (!(cdr >> TAO_InputCDR::to_string (id.out (), 0)
-        && cdr >> TAO_InputCDR::to_string (name.out (), 0)
-        && tc_demarshal (cdr, content_type.out (), infos)))
-    return false;
-
-  typedef TAO::TypeCode::Alias<
-    CORBA::String_var,
-    CORBA::TypeCode_var,
-    TAO::True_RefCount_Policy> typecode_type;
-
-  ACE_NEW_RETURN (tc,
-                  typecode_type (kind,
-                                 id.in (),
-                                 name.in (),
-                                 content_type),
-                  false);
-
-  return true;
-}
-
-bool
-TAO::TypeCodeFactory::tc_except_factory (CORBA::TCKind kind,
-                                         TAO_InputCDR & cdr,
-                                         CORBA::TypeCode_ptr & tc,
-                                         TC_Info_List & infos)
-{
-  return tc_struct_factory (kind, cdr, tc, infos);
-}
-
-bool
-TAO::TypeCodeFactory::tc_longlong_factory (CORBA::TCKind,
-                                           TAO_InputCDR &,
-                                           CORBA::TypeCode_ptr & tc,
-                                           TC_Info_List &)
-{
-  tc = CORBA::TypeCode::_duplicate (CORBA::_tc_longlong);
-
-  return true;
-}
-
-bool
-TAO::TypeCodeFactory::tc_ulonglong_factory (CORBA::TCKind,
-                                            TAO_InputCDR &,
-                                            CORBA::TypeCode_ptr & tc,
-                                            TC_Info_List &)
-{
-  tc = CORBA::TypeCode::_duplicate (CORBA::_tc_ulonglong);
-
-  return true;
-}
-
-bool
-TAO::TypeCodeFactory::tc_longdouble_factory (CORBA::TCKind,
-                                             TAO_InputCDR &,
-                                             CORBA::TypeCode_ptr & tc,
-                                             TC_Info_List &)
-{
-  tc = CORBA::TypeCode::_duplicate (CORBA::_tc_longdouble);
-
-  return true;
-}
-
-bool
-TAO::TypeCodeFactory::tc_wchar_factory (CORBA::TCKind,
-                                        TAO_InputCDR &,
-                                        CORBA::TypeCode_ptr & tc,
-                                        TC_Info_List &)
-{
-  tc = CORBA::TypeCode::_duplicate (CORBA::_tc_wchar);
-
-  return true;
-}
-
-bool
-TAO::TypeCodeFactory::tc_wstring_factory (CORBA::TCKind kind,
-                                          TAO_InputCDR & cdr,
-                                          CORBA::TypeCode_ptr & tc,
-                                          TC_Info_List & infos)
-{
-  return tc_string_factory (kind, cdr, tc, infos);
-}
-
-bool
-TAO::TypeCodeFactory::tc_fixed_factory (CORBA::TCKind,
-                                        TAO_InputCDR & cdr,
-                                        CORBA::TypeCode_ptr & tc,
-                                        TC_Info_List &)
-{
-  // A tk_fixed TypeCode has a simple parameter list, i.e. it is not
-  // encoded in a CDR encapsulation.
-
-  CORBA::UShort digits, scale;
-  if (!(cdr >> digits && cdr >> scale))
-    return false;
-
-  typedef TAO::TypeCode::Fixed<TAO::True_RefCount_Policy> typecode_type;
-
-  ACE_NEW_RETURN (tc,
-                  typecode_type (digits, scale),
-                  false);
-
-  return true;
-}
-
-bool
-TAO::TypeCodeFactory::tc_value_factory (CORBA::TCKind kind,
-                                        TAO_InputCDR & cdr,
-                                        CORBA::TypeCode_ptr & tc,
-                                        TC_Info_List & infos)
-{
-  // The remainder of a tk_value/tk_event TypeCode is encoded in a
-  // CDR encapsulation
-
-  if (!start_cdr_encap_extraction (cdr))
-    return false;
-
-  // Extract the repository ID, name and number of fields.
-  CORBA::String_var id;
-  if (!(cdr >> TAO_InputCDR::to_string (id.out (), 0)))
-    return false;
-
-//   if (ACE_OS::strcmp (id.in (), "IDL:omg.org/CORBA/ValueBase:1.0") == 0)
-//     {
-//       // No need to create a TypeCode.  Just use the TypeCode
-//       // constant.
-//       tc = CORBA::TypeCode::_duplicate (CORBA::_tc_ValueBase);
-
-//       return true;
-//     }
-//   else if (ACE_OS::strcmp (id.in (),
-//                            "IDL:omg.org/CORBA/EventBase:1.0") == 0)
-//     {
-//       // No need to create a TypeCode.  Just use the TypeCode
-//       // constant.
-//       tc = CORBA::TypeCode::_duplicate (CORBA::_tc_EventBase);
-
-//       return true;
-//     }
-
-  CORBA::String_var name;
-  CORBA::ValueModifier type_modifier;
-  CORBA::TypeCode_var concrete_base;
-  CORBA::ULong nfields;
-
-  if (!(cdr >> TAO_InputCDR::to_string (name.out (), 0)
-        && cdr >> type_modifier
-        && cdr >> concrete_base.out ()
-        && cdr >> nfields))
-    return false;
-
-  typedef ACE_Array_Base<TAO::TypeCode::Value_Field<CORBA::String_var,
-                                                    CORBA::TypeCode_var> >
-    member_array_type;
-
-  member_array_type fields (nfields);
-
-  for (CORBA::ULong i = 0; i < nfields; ++i)
-    {
-      TAO::TypeCode::Value_Field<CORBA::String_var,
-                                 CORBA::TypeCode_var> & field = fields[i];
-
-      if (!(cdr >> TAO_InputCDR::to_string (field.name.out (), 0)
-            && tc_demarshal (cdr, field.type.out (), infos)
-            && cdr >> field.visibility))
-        return false;
-    }
-
-  typedef TAO::TypeCode::Value<
-    CORBA::String_var,
-    CORBA::TypeCode_var,
-    member_array_type,
-    TAO::True_RefCount_Policy> typecode_type;
-
-  // Check if valuetype/eventtype TypeCode is recursive.
-  if (find_recursive_tc (id.in (), tc, infos))
-    {
-      // Set remaining parameters.
-
-      typedef TAO::TypeCode::Recursive_Type<typecode_type,
-                                            CORBA::TypeCode_var,
-                                            member_array_type>
-        recursive_typecode_type;
-
-      recursive_typecode_type * const rtc =
-        dynamic_cast<recursive_typecode_type *> (tc);
-
-      ACE_ASSERT (rtc);
-
-      rtc->valuetype_parameters (name.in (),
-                                 type_modifier,
-                                 concrete_base,
-                                 fields,     // Will be copied.
-                                 nfields);
-    }
-  else
-    {
-      ACE_NEW_RETURN (tc,
-                      typecode_type (kind,
-                                     id.in (),
-                                     name.in (),
-                                     type_modifier,
-                                     concrete_base,
-                                     fields,     // Will be copied.
-                                     nfields),
-                      false);
-    }
-
-  return true;
-}
-
-bool
-TAO::TypeCodeFactory::tc_value_box_factory (CORBA::TCKind kind,
-                                            TAO_InputCDR & cdr,
-                                            CORBA::TypeCode_ptr & tc,
-                                            TC_Info_List & infos)
-{
-  return tc_alias_factory (kind, cdr, tc, infos);
-}
-
-bool
-TAO::TypeCodeFactory::tc_native_factory (CORBA::TCKind,
-                                         TAO_InputCDR & cdr,
-                                         CORBA::TypeCode_ptr & tc,
-                                         TC_Info_List & infos)
-{
-  return tc_objref_factory (CORBA::tk_native, cdr, tc, infos);
-}
-
-bool
-TAO::TypeCodeFactory::tc_abstract_interface_factory (CORBA::TCKind,
-                                                     TAO_InputCDR & cdr,
-                                                     CORBA::TypeCode_ptr & tc,
-                                                     TC_Info_List & infos)
-{
-  return tc_objref_factory (CORBA::tk_abstract_interface, cdr, tc, infos);
-}
-
-bool
-TAO::TypeCodeFactory::tc_local_interface_factory (CORBA::TCKind,
-                                                  TAO_InputCDR & cdr,
-                                                  CORBA::TypeCode_ptr & tc,
-                                                  TC_Info_List & infos)
-{
-  return tc_objref_factory (CORBA::tk_local_interface, cdr, tc, infos);
-}
-
-bool
-TAO::TypeCodeFactory::tc_component_factory (CORBA::TCKind,
-                                            TAO_InputCDR & cdr,
-                                            CORBA::TypeCode_ptr & tc,
-                                            TC_Info_List & infos)
-{
-  return tc_objref_factory (CORBA::tk_component, cdr, tc, infos);
-}
-
-bool
-TAO::TypeCodeFactory::tc_home_factory (CORBA::TCKind,
-                                       TAO_InputCDR & cdr,
-                                       CORBA::TypeCode_ptr & tc,
-                                       TC_Info_List & infos)
-{
-  return tc_objref_factory (CORBA::tk_home, cdr, tc, infos);
-}
-
-bool
-TAO::TypeCodeFactory::tc_event_factory (CORBA::TCKind kind,
-                                        TAO_InputCDR & cdr,
-                                        CORBA::TypeCode_ptr & tc,
-                                        TC_Info_List & infos)
-{
-  return tc_value_factory (kind, cdr, tc, infos);
-}
-
-// ---------------------------------------------------------------
-
-namespace
-{
-  bool
-  tc_demarshal (TAO_InputCDR & cdr,
-                CORBA::TypeCode_ptr & tc,
-                TAO::TypeCodeFactory::TC_Info_List & infos)
-  {
-    // ULong since we need to detect indirected TypeCodes, too.
-
-    CORBA::ULong kind;
-    if (!(cdr >> kind)
-        || (kind >= static_cast<CORBA::ULong> (CORBA::TAO_TC_KIND_COUNT)
-            && kind != TYPECODE_INDIRECTION))
-      return false;
-
-    if (kind == TYPECODE_INDIRECTION)
-      return tc_demarshal_indirection (cdr, tc, infos);
-
-    using namespace TAO::TypeCodeFactory;
-
-    static factory const factory_map[] =
-      {
-        tc_null_factory,
-        tc_void_factory,
-        tc_short_factory,
-        tc_long_factory,
-        tc_ushort_factory,
-        tc_ulong_factory,
-        tc_float_factory,
-        tc_double_factory,
-        tc_boolean_factory,
-        tc_char_factory,
-        tc_octet_factory,
-        tc_any_factory,
-        tc_TypeCode_factory,
-        tc_Principal_factory,
-        tc_objref_factory,
-        tc_struct_factory,
-        tc_union_factory,
-        tc_enum_factory,
-        tc_string_factory,
-        tc_sequence_factory,
-        tc_array_factory,
-        tc_alias_factory,
-        tc_except_factory,
-        tc_longlong_factory,
-        tc_ulonglong_factory,
-        tc_longdouble_factory,
-        tc_wchar_factory,
-        tc_wstring_factory,
-        tc_fixed_factory,
-        tc_value_factory,
-        tc_value_box_factory,
-        tc_native_factory,
-        tc_abstract_interface_factory,
-        tc_local_interface_factory,
-        tc_component_factory,
-        tc_home_factory,
-        tc_event_factory
-      };
-
-    return factory_map[kind] (static_cast<CORBA::TCKind> (kind),
-                              cdr,
-                              tc,
-                              infos);
-  }
-
-  bool
-  tc_demarshal_indirection (TAO_InputCDR & cdr,
-                            CORBA::TypeCode_ptr & tc,
-                            TAO::TypeCodeFactory::TC_Info_List & infos)
-  {
-    CORBA::Long offset;
-
-    if (!(cdr >> offset) || offset >= -4)
-      {
-        // Offsets must be negative since they point back to a
-        // TypeCode found earlier in the CDR stream.  They must be
-        // less than -4 since an offset of -4 points back to the
-        // indirection TypeCode itself, meaning that it would be
-        // self-indirecting.
-        return false;
-      }
-
-//     ACE_Message_Block * const mb =
-//       const_cast<ACE_Message_Block *> (cdr.start ());
-
-//     TAO_InputCDR indir_stream (mb->rd_ptr () + offset - 4,
-    TAO_InputCDR indir_stream (cdr.rd_ptr () + offset - sizeof (CORBA::Long),
-                               (-offset) + sizeof (CORBA::Long),
-                               cdr.byte_order ());
-
-    if (!indir_stream.good_bit ())
-      {
-        return false;
-      }
-
-    CORBA::TCKind kind;
-    if (!(indir_stream >> kind)
-
-        // Indirected TypeCode must point to top-level TypeCode.
-        || static_cast<CORBA::ULong> (kind) == TYPECODE_INDIRECTION
-
-        // Only struct, union and valuetype TypeCodes may be recursive.
-        || !(kind == CORBA::tk_struct
-             || kind == CORBA::tk_union
-             || kind == CORBA::tk_value
-             || kind == CORBA::tk_event)
-
-        // Currently all recursive TypeCodes have complex parameter
-        // lists, meaning they are encoded as CDR encapsulations.
-        || !start_cdr_encap_extraction (indir_stream))
-      {
-        return false;
-      }
-
-    /**
-     * @todo Recursive TypeCode demarshaling is currently suboptimal
-     *       due to redundant demarshaling of TypeCode parameters,
-     *       such as repository ID, and excessive
-     *       allocations/copying.
-     */
-
-    CORBA::String_var id;
-    if (!(indir_stream >> TAO_InputCDR::to_string (id.out (), 0)))
-      return false;
-
-    // Don't bother demarshaling the rest of the parameters.  They will
-    // be handled by the top-level TypeCode demarshaling call.
-
-    switch (kind)
-      {
-      case CORBA::tk_struct:
-        {
-          typedef ACE_Array_Base<
-            TAO::TypeCode::Struct_Field<
-              CORBA::String_var,
-              CORBA::TypeCode_var> > member_array_type;
-
-          typedef TAO::TypeCode::Struct<
-            CORBA::String_var,
-            CORBA::TypeCode_var,
-            member_array_type,
-            TAO::True_RefCount_Policy> typecode_type;
-
-          typedef TAO::TypeCode::Recursive_Type<typecode_type,
-                                                CORBA::TypeCode_var,
-                                                member_array_type>
-            recursive_typecode_type;
-
-          ACE_NEW_RETURN (tc,
-                          recursive_typecode_type (kind,
-                                                   id.in ()),
-                          false);
-        }
-        break;
-      case CORBA::tk_union:
-        {
-          typedef union_case_array_type member_array_type;
-
-          typedef TAO::TypeCode::Union<
-            CORBA::String_var,
-            CORBA::TypeCode_var,
-            member_array_type,
-            TAO::True_RefCount_Policy> typecode_type;
-
-          typedef TAO::TypeCode::Recursive_Type<typecode_type,
-                                                CORBA::TypeCode_var,
-                                                member_array_type>
-            recursive_typecode_type;
-
-          ACE_NEW_RETURN (tc,
-                          recursive_typecode_type (kind,
-                                                   id.in ()),
-                          false);
-        }
-        break;
-      case CORBA::tk_value:
-      case CORBA::tk_event:
-        {
-          typedef ACE_Array_Base<
-            TAO::TypeCode::Value_Field<
-              CORBA::String_var,
-              CORBA::TypeCode_var> > member_array_type;
-
-          typedef TAO::TypeCode::Value<
-            CORBA::String_var,
-            CORBA::TypeCode_var,
-            member_array_type,
-            TAO::True_RefCount_Policy> typecode_type;
-
-          typedef TAO::TypeCode::Recursive_Type<typecode_type,
-                                                CORBA::TypeCode_var,
-                                                member_array_type>
-            recursive_typecode_type;
-
-          ACE_NEW_RETURN (tc,
-                          recursive_typecode_type (kind,
-                                                   id.in ()),
-                          false);
-        }
-        break;
-      default:
-        return false;  // We should never get here.
-      };
-
-    size_t const old_size = infos.size ();
-    if (infos.size (old_size + 1) == -1)  // Incremental growth -- *sigh*
-      return false;
-
-    TAO::TypeCodeFactory::TC_Info & info = infos[old_size];
-
-    ACE_DECLARE_NEW_CORBA_ENV;
-    info.id = tc->id (ACE_ENV_SINGLE_ARG_PARAMETER);
-    ACE_CHECK_RETURN (false);  // Should never throw!
-
-    info.type = tc;
-
-    return true;
-  }
-}
-
-// ----------------------------------------------------------------
-
-bool
-operator>> (TAO_InputCDR & cdr,
-            CORBA::TypeCode_ptr & tc)
-{
-  TAO::TypeCodeFactory::TC_Info_List infos;
-
-  return tc_demarshal (cdr, tc, infos);
-}
diff --git a/TAO/tao/TypeCode_CDR_Extraction.h b/TAO/tao/TypeCode_CDR_Extraction.h
deleted file mode 100644
index b7571fbfbf4..00000000000
--- a/TAO/tao/TypeCode_CDR_Extraction.h
+++ /dev/null
@@ -1,196 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    TypeCode_CDR_Extraction.h
- *
- *  $Id$
- *
- *  Header file for TAO TypeCode CDR extraction operations.
- *
- *  @author Ossama Othman <ossama@dre.vanderbilt.edu>
- */
-//=============================================================================
-
-#ifndef TAO_TYPECODE_CDR_EXTRACTION_H
-#define TAO_TYPECODE_CDR_EXTRACTION_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/Typecode_typesC.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-
-template <class T> class ACE_Array_Base;
-
-namespace TAO
-{
-  namespace TypeCodeFactory
-  {
-    struct TC_Info;
-    typedef ACE_Array_Base<TC_Info> TC_Info_List;
-
-    typedef bool (*factory) (CORBA::TCKind,
-                             TAO_InputCDR &,
-                             CORBA::TypeCode_ptr &,
-                             TC_Info_List &);
-
-    bool tc_null_factory       (CORBA::TCKind kind,
-                                TAO_InputCDR & cdr,
-                                CORBA::TypeCode_ptr & tc,
-                                TC_Info_List & infos);
-    bool tc_void_factory       (CORBA::TCKind kind,
-                                TAO_InputCDR & cdr,
-                                CORBA::TypeCode_ptr & tc,
-                                TC_Info_List & infos);
-    bool tc_short_factory      (CORBA::TCKind kind,
-                                TAO_InputCDR & cdr,
-                                CORBA::TypeCode_ptr & tc,
-                                TC_Info_List & infos);
-    bool tc_long_factory       (CORBA::TCKind kind,
-                                TAO_InputCDR & cdr,
-                                CORBA::TypeCode_ptr & tc,
-                                TC_Info_List & infos);
-    bool tc_ushort_factory     (CORBA::TCKind kind,
-                                TAO_InputCDR & cdr,
-                                CORBA::TypeCode_ptr & tc,
-                                TC_Info_List & infos);
-    bool tc_ulong_factory      (CORBA::TCKind kind,
-                                TAO_InputCDR & cdr,
-                                CORBA::TypeCode_ptr & tc,
-                                TC_Info_List & infos);
-    bool tc_float_factory      (CORBA::TCKind kind,
-                                TAO_InputCDR & cdr,
-                                CORBA::TypeCode_ptr & tc,
-                                TC_Info_List & infos);
-    bool tc_double_factory     (CORBA::TCKind kind,
-                                TAO_InputCDR & cdr,
-                                CORBA::TypeCode_ptr & tc,
-                                TC_Info_List & infos);
-    bool tc_boolean_factory    (CORBA::TCKind kind,
-                                TAO_InputCDR & cdr,
-                                CORBA::TypeCode_ptr & tc,
-                                TC_Info_List & infos);
-    bool tc_char_factory       (CORBA::TCKind kind,
-                                TAO_InputCDR & cdr,
-                                CORBA::TypeCode_ptr & tc,
-                                TC_Info_List & infos);
-    bool tc_octet_factory      (CORBA::TCKind kind,
-                                TAO_InputCDR & cdr,
-                                CORBA::TypeCode_ptr & tc,
-                                TC_Info_List & infos);
-    bool tc_any_factory        (CORBA::TCKind kind,
-                                TAO_InputCDR & cdr,
-                                CORBA::TypeCode_ptr & tc,
-                                TC_Info_List & infos);
-    bool tc_TypeCode_factory   (CORBA::TCKind kind,
-                                TAO_InputCDR & cdr,
-                                CORBA::TypeCode_ptr & tc,
-                                TC_Info_List & infos);
-    bool tc_Principal_factory  (CORBA::TCKind kind,
-                                TAO_InputCDR & cdr,
-                                CORBA::TypeCode_ptr & tc,
-                                TC_Info_List & infos);
-    bool tc_objref_factory     (CORBA::TCKind kind,
-                                TAO_InputCDR & cdr,
-                                CORBA::TypeCode_ptr & tc,
-                                TC_Info_List & infos);
-    bool tc_struct_factory     (CORBA::TCKind kind,
-                                TAO_InputCDR & cdr,
-                                CORBA::TypeCode_ptr & tc,
-                                TC_Info_List & infos);
-    bool tc_union_factory      (CORBA::TCKind kind,
-                                TAO_InputCDR & cdr,
-                                CORBA::TypeCode_ptr & tc,
-                                TC_Info_List & infos);
-    bool tc_enum_factory       (CORBA::TCKind kind,
-                                TAO_InputCDR & cdr,
-                                CORBA::TypeCode_ptr & tc,
-                                TC_Info_List & infos);
-    bool tc_string_factory     (CORBA::TCKind kind,
-                                TAO_InputCDR & cdr,
-                                CORBA::TypeCode_ptr & tc,
-                                TC_Info_List & infos);
-    bool tc_sequence_factory   (CORBA::TCKind kind,
-                                TAO_InputCDR & cdr,
-                                CORBA::TypeCode_ptr & tc,
-                                TC_Info_List & infos);
-    bool tc_array_factory      (CORBA::TCKind kind,
-                                TAO_InputCDR & cdr,
-                                CORBA::TypeCode_ptr & tc,
-                                TC_Info_List & infos);
-    bool tc_alias_factory      (CORBA::TCKind kind,
-                                TAO_InputCDR & cdr,
-                                CORBA::TypeCode_ptr & tc,
-                                TC_Info_List & infos);
-    bool tc_except_factory     (CORBA::TCKind kind,
-                                TAO_InputCDR & cdr,
-                                CORBA::TypeCode_ptr & tc,
-                                TC_Info_List & infos);
-    bool tc_longlong_factory   (CORBA::TCKind kind,
-                                TAO_InputCDR & cdr,
-                                CORBA::TypeCode_ptr & tc,
-                                TC_Info_List & infos);
-    bool tc_ulonglong_factory  (CORBA::TCKind kind,
-                                TAO_InputCDR & cdr,
-                                CORBA::TypeCode_ptr & tc,
-                                TC_Info_List & infos);
-    bool tc_longdouble_factory (CORBA::TCKind kind,
-                                TAO_InputCDR & cdr,
-                                CORBA::TypeCode_ptr & tc,
-                                TC_Info_List & infos);
-    bool tc_wchar_factory      (CORBA::TCKind kind,
-                                TAO_InputCDR & cdr,
-                                CORBA::TypeCode_ptr & tc,
-                                TC_Info_List & infos);
-    bool tc_wstring_factory    (CORBA::TCKind kind,
-                                TAO_InputCDR & cdr,
-                                CORBA::TypeCode_ptr & tc,
-                                TC_Info_List & infos);
-    bool tc_fixed_factory      (CORBA::TCKind kind,
-                                TAO_InputCDR & cdr,
-                                CORBA::TypeCode_ptr & tc,
-                                TC_Info_List & infos);
-    bool tc_value_factory      (CORBA::TCKind kind,
-                                TAO_InputCDR & cdr,
-                                CORBA::TypeCode_ptr & tc,
-                                TC_Info_List & infos);
-    bool tc_value_box_factory  (CORBA::TCKind kind,
-                                TAO_InputCDR & cdr,
-                                CORBA::TypeCode_ptr & tc,
-                                TC_Info_List & infos);
-    bool tc_native_factory     (CORBA::TCKind kind,
-                                TAO_InputCDR & cdr,
-                                CORBA::TypeCode_ptr & tc,
-                                TC_Info_List & infos);
-    bool tc_abstract_interface_factory (CORBA::TCKind kind,
-                                        TAO_InputCDR & cdr,
-                                        CORBA::TypeCode_ptr & tc,
-                                        TC_Info_List & infos);
-    bool tc_local_interface_factory (CORBA::TCKind kind,
-                                     TAO_InputCDR & cdr,
-                                     CORBA::TypeCode_ptr & tc,
-                                     TC_Info_List & infos);
-    bool tc_component_factory  (CORBA::TCKind kind,
-                                TAO_InputCDR & cdr,
-                                CORBA::TypeCode_ptr & tc,
-                                TC_Info_List & infos);
-    bool tc_home_factory       (CORBA::TCKind kind,
-                                TAO_InputCDR & cdr,
-                                CORBA::TypeCode_ptr & tc,
-                                TC_Info_List & infos);
-    bool tc_event_factory      (CORBA::TCKind kind,
-                                TAO_InputCDR & cdr,
-                                CORBA::TypeCode_ptr & tc,
-                                TC_Info_List & infos);
-
-  }  // End namespace TypeCodeFactory
-}  // End namespace TAO
-
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_TYPECODE_CDR_EXTRACTION_H */
diff --git a/TAO/tao/TypeCode_Case.cpp b/TAO/tao/TypeCode_Case.cpp
deleted file mode 100644
index 078071e2287..00000000000
--- a/TAO/tao/TypeCode_Case.cpp
+++ /dev/null
@@ -1,86 +0,0 @@
-// $Id$
-
-#ifndef TAO_TYPECODE_CASE_CPP
-#define TAO_TYPECODE_CASE_CPP
-
-#include "TypeCode_Case.h"
-#include "ace/OS_NS_string.h"
-
-#ifndef __ACE_INLINE__
-# include "tao/TypeCode_Case.inl"
-#endif /* __ACE_INLINE__ */
-
-
-template <typename StringType, typename TypeCodeType>
-TAO::TypeCode::Case<StringType, TypeCodeType>::~Case (void)
-{
-}
-
-template <typename StringType, typename TypeCodeType>
-bool
-TAO::TypeCode::Case<StringType, TypeCodeType>::equal (CORBA::ULong index,
-                                                      CORBA::TypeCode_ptr tc
-                                                      ACE_ENV_ARG_DECL) const
-{
-  // Check case names.
-  char const * const lhs_name = this->name ();
-  char const * const rhs_name = tc->member_name (index
-                                                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (ACE_OS::strcmp (lhs_name, rhs_name) != 0)
-    return 0;
-
-  // Check case TypeCodes.
-  CORBA::TypeCode_ptr const lhs_tc = this->type ();
-  CORBA::TypeCode_var const rhs_tc =
-    tc->member_type (index
-                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  CORBA::Boolean const equal_members =
-    lhs_tc->equal (rhs_tc.in ()
-                   ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (!equal_members)
-    return 0;
-
-  // Check case label.
-  return this->equal_label (index,
-                            tc
-                            ACE_ENV_ARG_PARAMETER);
-}
-
-template <typename StringType, typename TypeCodeType>
-bool
-TAO::TypeCode::Case<StringType, TypeCodeType>::equivalent (
-  CORBA::ULong index,
-  CORBA::TypeCode_ptr tc
-  ACE_ENV_ARG_DECL) const
-{
-  // Member names are ignore when determining equivalence.
-
-  // Check case TypeCodes.
-  CORBA::TypeCode_ptr const lhs_tc = this->type ();
-  CORBA::TypeCode_var const rhs_tc =
-    tc->member_type (index
-                     ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  CORBA::Boolean const equivalent_members =
-    lhs_tc->equivalent (rhs_tc.in ()
-                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (!equivalent_members)
-    return 0;
-
-  // Check case label.
-  // The label must be equal when determining equivalence, too.
-  return this->equal_label (index,
-                            tc
-                            ACE_ENV_ARG_PARAMETER);
-}
-
-#endif  /* TAO_TYPECODE_CASE_CPP */
diff --git a/TAO/tao/TypeCode_Case.h b/TAO/tao/TypeCode_Case.h
deleted file mode 100644
index 258b3ce299f..00000000000
--- a/TAO/tao/TypeCode_Case.h
+++ /dev/null
@@ -1,204 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    TypeCode_Case.h
- *
- *  $Id$
- *
- *  Header file for @c TAO::TypeCode::Case type.
- *
- *  @author Ossama Othman
- */
-//=============================================================================
-
-#ifndef TAO_TYPECODE_CASE_H
-#define TAO_TYPECODE_CASE_H
-
-#include /**/ "ace/pre.h"
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-
-namespace CORBA
-{
-  class TypeCode;
-  typedef TypeCode* TypeCode_ptr;
-
-  class Any;
-}
-
-namespace TAO
-{
-  namespace TypeCode
-  {
-
-    /**
-     * @class Case
-     *
-     * @brief Abstract base class for that represents an IDL @c union
-     *        case/member.
-     *
-     * This class hides the actual IDL @c union member label value
-     * from the @c TAO::TypeCode::Union class by relying on a
-     * CORBA::Any return value that corresponds to the @c
-     * CORBA::TypeCode::member_label() return type.  It also allows
-     * the @c TAO::TypeCode::Union class to marshal the member label
-     * values into a CDR stream without knowledge of the underlying
-     * member label values.
-     */
-    template <typename StringType, typename TypeCodeType>
-    class Case
-    {
-    public:
-
-      /// Constructor.
-      /**
-       * Constructor used when creating static @c union @c TypeCodes.
-       */
-      Case (char const * name,
-            TypeCodeType tc);
-
-      /// Constructor.
-      /**
-       * Constructor used when creating dynamic @c union @c TypeCodes.
-       */
-      Case (void);
-
-      /// Destructor.
-      virtual ~Case (void);
-
-      /// Cloning/copying operation.
-      virtual Case * clone (void) const = 0;
-
-      /// Return the IDL @c union case label value embedded within a
-      /// @c CORBA::Any.
-      virtual CORBA::Any * label (ACE_ENV_SINGLE_ARG_DECL) const = 0;
-
-      /// Get the name of the @c union case/member.
-      char const * name (void) const;
-
-      /// Set the name of the @c union case/member.
-      void name (char const * the_name);
-
-      /// Get the @c CORBA::TypeCode of the @c union case/member.
-      /**
-       * @note The reference count is not manipulated by this method,
-       *       i.e., ownership is retained by this class.
-       */
-      CORBA::TypeCode_ptr type (void) const;
-
-      /// Set the @c CORBA::TypeCode of the @c union case/member.
-      /**
-       * @note @c CORBA::TypeCode::_duplicate() is called on the
-       *       @c TypeCode @a tc.
-       */
-      void type (CORBA::TypeCode_ptr tc);
-
-      /// Marshal this IDL @c union member into the given output CDR
-      /// stream.
-      bool marshal (TAO_OutputCDR & cdr,
-                    CORBA::ULong offset) const;
-
-      /// Check for equality of the @c case attributes contained by this
-      /// class and the corresponding member attributes at index "@a
-      /// index" in the given @c TypeCode @a tc.
-      bool equal (CORBA::ULong index,
-                  CORBA::TypeCode_ptr tc
-                  ACE_ENV_ARG_DECL) const;
-
-      /// Check for equivalence of the @c case attributes contained by
-      /// this class and the corresponding member attributes at index
-      /// "@a index" in the given @c TypeCode @a tc.
-      bool equivalent (CORBA::ULong index,
-                       CORBA::TypeCode_ptr tc
-                       ACE_ENV_ARG_DECL) const;
-
-    protected:
-
-      /// Marshal the IDL @c union @c case label value into the given
-      /// output CDR stream.
-      virtual bool marshal_label (TAO_OutputCDR & cdr) const = 0;
-
-      /// Verify equality of member labels.
-      /**
-       * Performing member label equality comparisons in the @c Case
-       * subclass allows us to avoid performing interpretive
-       * extraction of the value from the @c Any returned from the
-       * "right hand side" operand @c TypeCode since the @c Case
-       * subclass already knows what type and value should be
-       * extracted from the @c Any.
-       *
-       * @param index Member index of given @c TypeCode @a tc being
-       *              tested.
-       * @param tc    The @c TypeCode whose member "@a index" label is
-       *              being tested.
-       */
-      virtual bool equal_label (CORBA::ULong index,
-                                CORBA::TypeCode_ptr tc
-                                ACE_ENV_ARG_DECL) const = 0;
-
-    private:
-
-      /// The name of the case.
-      StringType name_;
-
-      /// Pointer to the @c CORBA::TypeCode of the case.
-      /**
-       * A pointer to the @c CORBA::TypeCode_ptr rather than the
-       * @c CORBA::TypeCode_ptr itself is stored since that address is
-       * well-defined.  We may not know the value of the @c
-       * CORBA::TypeCode_ptr when creating this @c Case statically at
-       * compile-time, hence the indirection.
-       *
-       * @note This @c TypeCode is released upon destruction of this
-       *       @c Case.
-       */
-      TypeCodeType type_;
-
-    };
-
-    typedef Case<CORBA::String_var, CORBA::TypeCode_var> Case_Dynamic;
-
-  }  // End namespace TypeCode
-}  // End namespace TAO
-
-
-namespace ACE
-{
-  /// @see ace/Value_Ptr.h.
-  template <typename T> struct VP_traits;
-
-  template <>
-  struct TAO_Export VP_traits<TAO::TypeCode::Case_Dynamic>
-  {
-    /// Copy the given object.
-    static TAO::TypeCode::Case_Dynamic * clone (
-      TAO::TypeCode::Case_Dynamic const * p)
-    {
-      return p->clone ();
-    }
-  };
-
-} // End namespace ACE namespace.
-
-
-#ifdef __ACE_INLINE__
-# include "tao/TypeCode_Case.inl"
-#endif /* __ACE_INLINE__ */
-
-#ifdef ACE_TEMPLATES_REQUIRE_SOURCE
-# include "tao/TypeCode_Case.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#ifdef ACE_TEMPLATES_REQUIRE_PRAGMA
-# pragma implementation ("TypeCode_Case.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_TYPECODE_CASE_H */
diff --git a/TAO/tao/TypeCode_Case.inl b/TAO/tao/TypeCode_Case.inl
deleted file mode 100644
index 1601ec87967..00000000000
--- a/TAO/tao/TypeCode_Case.inl
+++ /dev/null
@@ -1,76 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-#include "tao/CDR.h"
-#include "tao/TypeCode_Traits.h"
-
-
-template <typename StringType, typename TypeCodeType>
-ACE_INLINE
-TAO::TypeCode::Case<StringType, TypeCodeType>::Case (
-  char const * member_name,
-  TypeCodeType member_type)
-  : name_ (member_name)
-  , type_ (member_type)
-{
-}
-
-template <typename StringType, typename TypeCodeType>
-ACE_INLINE
-TAO::TypeCode::Case<StringType, TypeCodeType>::Case (void)
-  : name_ ()
-  , type_ ()
-{
-  // Only used when StringType and TypeCodeType are CORBA::String_var
-  // and CORBA::TypeCode_var, respectively.
-}
-
-template <typename StringType, typename TypeCodeType>
-ACE_INLINE bool
-TAO::TypeCode::Case<StringType, TypeCodeType>::marshal (
-  TAO_OutputCDR & cdr,
-  CORBA::ULong offset) const
-{
-  return
-    this->marshal_label (cdr)
-    && (cdr << TAO_OutputCDR::from_string (
-         Traits<StringType>::get_string (this->name_), 0))
-    && TAO::TypeCode::marshal (cdr,
-                               Traits<StringType>::get_typecode (this->type_),
-                               offset + cdr.total_length ());
-}
-
-template <typename StringType, typename TypeCodeType>
-ACE_INLINE char const *
-TAO::TypeCode::Case<StringType, TypeCodeType>::name (void) const
-{
-  return
-    Traits<StringType>::get_string (this->name_);
-}
-
-template <typename StringType, typename TypeCodeType>
-ACE_INLINE void
-TAO::TypeCode::Case<StringType, TypeCodeType>::name (
-  char const * the_name)
-{
-  this->name_ = the_name;
-}
-
-template <typename StringType, typename TypeCodeType>
-ACE_INLINE CORBA::TypeCode_ptr
-TAO::TypeCode::Case<StringType, TypeCodeType>::type (void) const
-{
-  return
-    Traits<StringType>::get_typecode (this->type_);
-}
-
-template <typename StringType, typename TypeCodeType>
-ACE_INLINE void
-TAO::TypeCode::Case<StringType, TypeCodeType>::type (CORBA::TypeCode_ptr tc)
-{
-  // This assignment works since it is only used when TypeCodeType is
-  // "CORBA::TypeCode_var", not in the "CORBA::TypeCode_ptr const *"
-  // case.
-  this->type_ = CORBA::TypeCode::_duplicate (tc);
-}
diff --git a/TAO/tao/TypeCode_Case_T.cpp b/TAO/tao/TypeCode_Case_T.cpp
deleted file mode 100644
index 204f85a2a1a..00000000000
--- a/TAO/tao/TypeCode_Case_T.cpp
+++ /dev/null
@@ -1,162 +0,0 @@
-// $Id$
-
-#ifndef TAO_TYPECODE_CASE_T_CPP
-#define TAO_TYPECODE_CASE_T_CPP
-
-#include "TypeCode_Case_T.h"
-
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/SystemException.h"
-
-#ifndef __ACE_INLINE__
-# include "tao/TypeCode_Case_T.inl"
-#endif /* __ACE_INLINE__ */
-
-
-namespace TAO
-{
-  namespace TypeCode
-  {
-    template <typename T>
-    struct Case_Traits
-    {
-      inline static T any_from (T v)
-      {
-        return v;
-      }
-
-      inline static T & any_to (T & v)
-      {
-        return v;
-      }
-    };
-
-    // Specializations for types that require wrapper for Any
-    // insertion.  Note that we only define specializations for types
-    // that can be used in an IDL union discriminator.
-
-    template <>
-    struct Case_Traits<CORBA::Boolean>
-    {
-      inline static CORBA::Any::from_boolean any_from (CORBA::Boolean v)
-      {
-        return CORBA::Any::from_boolean (v);
-      }
-
-      inline static CORBA::Any::to_boolean any_to (CORBA::Boolean & v)
-      {
-        return CORBA::Any::to_boolean (v);
-      }
-    };
-
-    template <>
-    struct Case_Traits<CORBA::Char>
-    {
-      inline static CORBA::Any::from_char any_from (CORBA::Char v)
-      {
-        return CORBA::Any::from_char (v);
-      }
-
-      inline static CORBA::Any::to_char any_to (CORBA::Char & v)
-      {
-        return CORBA::Any::to_char (v);
-      }
-    };
-
-  } // End TypeCode namespace
-}  // End TAO namespace
-
-// ----------------------------------------------------------------
-
-
-template <typename DiscriminatorType,
-          typename StringType,
-          typename TypeCodeType>
-TAO::TypeCode::Case<StringType, TypeCodeType> *
-TAO::TypeCode::Case_T<DiscriminatorType,
-                      StringType,
-                      TypeCodeType>::clone (void) const
-{
-  Case<StringType, TypeCodeType> * p = 0;
-
-  typedef Case_T<DiscriminatorType,
-                 StringType,
-                 TypeCodeType> case_type;
-
-  // The compiler generated memberwise copy constructor is sufficient.
-  ACE_NEW_RETURN (p,
-                  case_type (*this),
-                  p);
-
-  return p;
-}
-
-template <typename DiscriminatorType,
-          typename StringType,
-          typename TypeCodeType>
-bool
-TAO::TypeCode::Case_T<DiscriminatorType,
-                      StringType,
-                      TypeCodeType>::marshal_label (TAO_OutputCDR & cdr) const
-{
-  return
-    (cdr <<
-     TAO::TypeCode::Case_Traits<DiscriminatorType>::any_from (this->label_));
-}
-
-template <typename DiscriminatorType,
-          typename StringType,
-          typename TypeCodeType>
-bool
-TAO::TypeCode::Case_T<DiscriminatorType,
-                      StringType,
-                      TypeCodeType>::equal_label (CORBA::ULong index,
-                                                  CORBA::TypeCode_ptr tc
-                                                  ACE_ENV_ARG_DECL) const
-{
-  CORBA::Any_var const any = tc->member_label (index
-                                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (false);
-
-  // The equality operator == below is guaranteed to be defined for
-  // the discriminator type since an IDL union discriminator type must
-  // be any of the following: (1) an integer, (2) a character, (3) a
-  // boolean, or (4) an enumeration.
-
-  DiscriminatorType tc_label;
-  if ((any.in ()
-       >>= TAO::TypeCode::Case_Traits<DiscriminatorType>::any_to (tc_label))
-      && this->label_ == tc_label)
-    {
-      return true;
-    }
-
-  return false;
-}
-
-template <typename DiscriminatorType,
-          typename StringType,
-          typename TypeCodeType>
-CORBA::Any *
-TAO::TypeCode::Case_T<DiscriminatorType,
-                      StringType,
-                      TypeCodeType>::label (ACE_ENV_SINGLE_ARG_DECL) const
-{
-  CORBA::Any * value;
-
-  ACE_NEW_THROW_EX (value,
-                    CORBA::Any,
-                    CORBA::NO_MEMORY ());
-  ACE_CHECK_RETURN (0);
-
-  CORBA::Any_var safe_value (value);
-
-  *value <<=
-    TAO::TypeCode::Case_Traits<DiscriminatorType>::any_from (this->label_);
-
-  return safe_value._retn ();
-}
-
-
-#endif  /* TAO_TYPECODE_CASE_T_CPP */
diff --git a/TAO/tao/TypeCode_Case_T.h b/TAO/tao/TypeCode_Case_T.h
deleted file mode 100644
index ea36c766bc7..00000000000
--- a/TAO/tao/TypeCode_Case_T.h
+++ /dev/null
@@ -1,145 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    TypeCode_Case_T.h
- *
- *  $Id$
- *
- *  Header file for @c TAO::TypeCode::Case_T template.
- *
- *  @author Ossama Othman
- */
-//=============================================================================
-
-#ifndef TAO_TYPECODE_CASE_T_H
-#define TAO_TYPECODE_CASE_T_H
-
-#include /**/ "ace/pre.h"
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TypeCode_Case.h"
-
-
-namespace TAO
-{
-  namespace TypeCode
-  {
-    /**
-     * @class Case_T
-     *
-     * @brief Representation of an OMG IDL defined @c union @c case.
-     *
-     * A @c Case_T contains the corresponding case label value, name and
-     * pointer to the @c CORBA::TypeCode for a given OMG IDL @c union
-     * @c case.  For
-     * example, the cases in following OMG IDL @c union:
-     *
-     * \code
-     *   union Foo switch (short)
-     *   {
-     *     case 0:
-     *     case 1:  short a;
-     *     case 2:  long  b;
-     *     default: octet c;
-     *   };
-     * \endcode
-     *
-     * would be represented using the following statically instantiated
-     * @c TAO::TypeCode::Case_T array:
-     *
-     * \code
-     *   typedef TAO::TypeCode::Case_T<CORBA::Short, char const *> Foo_Case;
-     *   Foo_Case _tao_cases_Foo[] =
-     *     {
-     *       Foo_Case (0, "a", &CORBA::_tc_short),
-     *       Foo_Case (1, "a", &CORBA::_tc_short),
-     *       Foo_Case (2, "b", &CORBA::_tc_long),
-     *       Foo_Case (0, "c", &CORBA::_tc_octet)
-     *     };
-     * \endcode
-     *
-     * The @c default index is passed directly to the
-     * @c TAO::TypeCode::Union constructor.
-     *
-     * The template parameter @a DISCRIMINATOR_TYPE is the
-     * corresponding C++ type for the IDL defined @c union
-     * discriminator type.  For example, a @c union with an IDL @c
-     * short discriminator will have a corresponding @c CORBA::Short
-     * C++ type.  This template parameter is necessary to allow the
-     * actual @c case label value to be stored as its actual type,
-     * which is particularly important when marshaling that value into
-     * a CDR stream.
-     *
-     * The template parameter @a StringType is either @c char @c
-     * const @c * or @c CORBA::String_var.  The latter is only used
-     * when creating @c CORBA::tk_union @c TypeCode dynamically, such
-     * as through the TypeCodeFactory.
-     */
-    template <typename DiscriminatorType,
-              typename StringType,
-              typename TypeCodeType>
-    class Case_T : public Case<StringType, TypeCodeType>
-    {
-    public:
-
-      /// Constructor.
-      Case_T (DiscriminatorType member_label,
-              char const * member_name,
-              TypeCodeType member_type);
-
-      /// Constructor.
-      /**
-       * Constructor only used in the dynamically constructed @c union
-       * @c TypeCode case.
-       */
-      Case_T (DiscriminatorType member_label);
-
-      /**
-       * @name @c TAO::TypeCode::Case Methods
-       *
-       * Methods required by the @c TAO::TypeCode::Case abstract base
-       * class.
-       *
-       * @see @c TAO::TypeCode::Case
-       */
-      //@{
-      Case<StringType, TypeCodeType> * clone (void) const;
-      virtual CORBA::Any * label (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual bool marshal_label (TAO_OutputCDR & cdr) const;
-      virtual bool equal_label (CORBA::ULong index,
-                                CORBA::TypeCode_ptr tc
-                                ACE_ENV_ARG_DECL) const;
-      //@}
-
-    private:
-
-      /// IDL @c union case/member label value.
-      DiscriminatorType const label_;
-
-    };
-
-  }  // End namespace TypeCode
-}  // End namespace TAO
-
-
-#ifdef __ACE_INLINE__
-# include "tao/TypeCode_Case_T.inl"
-#endif /* __ACE_INLINE__ */
-
-#ifdef ACE_TEMPLATES_REQUIRE_SOURCE
-# include "tao/TypeCode_Case_T.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#ifdef ACE_TEMPLATES_REQUIRE_PRAGMA
-# pragma implementation ("TypeCode_Case_T.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_TYPECODE_CASE_T_H */
diff --git a/TAO/tao/TypeCode_Case_T.inl b/TAO/tao/TypeCode_Case_T.inl
deleted file mode 100644
index b6ac33bd18e..00000000000
--- a/TAO/tao/TypeCode_Case_T.inl
+++ /dev/null
@@ -1,29 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-template <typename DiscriminatorType,
-          typename StringType,
-          typename TypeCodeType>
-ACE_INLINE
-TAO::TypeCode::Case_T<DiscriminatorType,
-                      StringType,
-                      TypeCodeType>::Case_T (DiscriminatorType member_label,
-                                             char const * member_name,
-                                             TypeCodeType member_type)
-  : Case<StringType, TypeCodeType> (member_name, member_type)
-  , label_ (member_label)
-{
-}
-
-template <typename DiscriminatorType,
-          typename StringType,
-          typename TypeCodeType>
-ACE_INLINE
-TAO::TypeCode::Case_T<DiscriminatorType,
-                      StringType,
-                      TypeCodeType>::Case_T (DiscriminatorType member_label)
-  : Case<StringType, TypeCodeType> ()
-  , label_ (member_label)
-{
-}
diff --git a/TAO/tao/TypeCode_Constants.cpp b/TAO/tao/TypeCode_Constants.cpp
deleted file mode 100644
index fe6b46d2c1f..00000000000
--- a/TAO/tao/TypeCode_Constants.cpp
+++ /dev/null
@@ -1,111 +0,0 @@
-// $Id$
-
-
-#include "TypeCode_Constants.h"
-
-
-ACE_RCSID (tao,
-           TypeCode_Constants,
-           "$Id$")
-
-
-#include "Null_RefCount_Policy.h"
-#include "Empty_Param_TypeCode.h"
-#include "Objref_TypeCode_Static.h"
-#include "String_TypeCode_Static.h"
-
-
-namespace TAO
-{
-  namespace TypeCode
-  {
-    // Notice that these are all statically instantiated and not
-    // exported.  There CORBA::TypeCode_ptr counterparts are, however,
-    // exported.
-
-    Empty_Param tc_null       (CORBA::tk_null);
-    Empty_Param tc_void       (CORBA::tk_void);
-    Empty_Param tc_boolean    (CORBA::tk_boolean);
-    Empty_Param tc_char       (CORBA::tk_char);
-    Empty_Param tc_wchar      (CORBA::tk_wchar);
-    Empty_Param tc_short      (CORBA::tk_short);
-    Empty_Param tc_ushort     (CORBA::tk_ushort);
-    Empty_Param tc_long       (CORBA::tk_long);
-    Empty_Param tc_ulong      (CORBA::tk_ulong);
-    Empty_Param tc_longlong   (CORBA::tk_longlong);
-    Empty_Param tc_ulonglong  (CORBA::tk_ulonglong);
-    Empty_Param tc_float      (CORBA::tk_float);
-    Empty_Param tc_double     (CORBA::tk_double);
-    Empty_Param tc_longdouble (CORBA::tk_longdouble);
-    Empty_Param tc_octet      (CORBA::tk_octet);
-    Empty_Param tc_any        (CORBA::tk_any);
-    Empty_Param tc_TypeCode   (CORBA::tk_TypeCode);
-    Empty_Param tc_Principal  (CORBA::tk_Principal);
-
-    // --------------
-
-    String<TAO::Null_RefCount_Policy> tc_string  (CORBA::tk_string, 0);
-    String<TAO::Null_RefCount_Policy> tc_wstring (CORBA::tk_wstring, 0);
-
-    // --------------
-
-    char const tc_object_id[]   = "IDL:omg.org/CORBA/Object:1.0";
-    char const tc_object_name[] = "Object";
-    Objref<char const *,
-           TAO::Null_RefCount_Policy> tc_Object (CORBA::tk_objref,
-                                                 tc_object_id,
-                                                 tc_object_name);
-
-    char const tc_component_id[]   = "IDL:omg.org/CORBA/CCMObject:1.0";
-    char const tc_component_name[] = "CCMObject";
-    Objref<char const *,
-           TAO::Null_RefCount_Policy> tc_Component (CORBA::tk_component,
-                                                    tc_component_id,
-                                                    tc_component_name);
-
-    char const tc_home_id[]   = "IDL:omg.org/CORBA/CCMHome:1.0";
-    char const tc_home_name[] = "CCMHome";
-    Objref<char const *,
-           TAO::Null_RefCount_Policy> tc_Home (CORBA::tk_home,
-                                               tc_home_id,
-                                               tc_home_name);
-  }  // End TypeCode namespace
-}  // End TAO namespace
-
-// ------------------------------------------------------------------
-// OMG defined TypeCode constants
-// ------------------------------------------------------------------
-
-namespace CORBA
-{
-  // Notice that these are constant TypeCode references/pointers, not
-  // constant TypeCodes.  TypeCodes are effectively read-only since
-  // all non-static TypeCode operations are const.
-
-  TypeCode_ptr const _tc_null       = &TAO::TypeCode::tc_null;
-  TypeCode_ptr const _tc_void       = &TAO::TypeCode::tc_void;
-  TypeCode_ptr const _tc_boolean    = &TAO::TypeCode::tc_boolean;
-  TypeCode_ptr const _tc_char       = &TAO::TypeCode::tc_char;
-  TypeCode_ptr const _tc_wchar      = &TAO::TypeCode::tc_wchar;
-  TypeCode_ptr const _tc_short      = &TAO::TypeCode::tc_short;
-  TypeCode_ptr const _tc_ushort     = &TAO::TypeCode::tc_ushort;
-  TypeCode_ptr const _tc_long       = &TAO::TypeCode::tc_long;
-  TypeCode_ptr const _tc_ulong      = &TAO::TypeCode::tc_ulong;
-  TypeCode_ptr const _tc_longlong   = &TAO::TypeCode::tc_longlong;
-  TypeCode_ptr const _tc_ulonglong  = &TAO::TypeCode::tc_ulonglong;
-  TypeCode_ptr const _tc_float      = &TAO::TypeCode::tc_float;
-  TypeCode_ptr const _tc_double     = &TAO::TypeCode::tc_double;
-  TypeCode_ptr const _tc_longdouble = &TAO::TypeCode::tc_longdouble;
-  TypeCode_ptr const _tc_octet      = &TAO::TypeCode::tc_octet;
-  TypeCode_ptr const _tc_any        = &TAO::TypeCode::tc_any;
-  TypeCode_ptr const _tc_TypeCode   = &TAO::TypeCode::tc_TypeCode;
-  TypeCode_ptr const _tc_Principal  = &TAO::TypeCode::tc_Principal;
-
-  TypeCode_ptr const _tc_string     = &TAO::TypeCode::tc_string;
-  TypeCode_ptr const _tc_wstring    = &TAO::TypeCode::tc_wstring;
-
-  TypeCode_ptr const _tc_Object     = &TAO::TypeCode::tc_Object;
-  TypeCode_ptr const _tc_Component  = &TAO::TypeCode::tc_Component;
-  TypeCode_ptr const _tc_Home       = &TAO::TypeCode::tc_Home;
-
-}
diff --git a/TAO/tao/TypeCode_Constants.h b/TAO/tao/TypeCode_Constants.h
deleted file mode 100644
index a5b29c32841..00000000000
--- a/TAO/tao/TypeCode_Constants.h
+++ /dev/null
@@ -1,65 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file   TypeCode_Constants.h
- *
- *  $Id$
- *
- *  Declare the @c TypeCode constants available to the ORB and user
- *  applications.
- *
- *  @author Jeff Parsons
- *  @author Ossama Othman
- */
-//=============================================================================
-
-#ifndef TAO_TYPECODE_CONSTANTS_H
-#define TAO_TYPECODE_CONSTANTS_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/TAO_Export.h"
-
-namespace CORBA
-{
-  class TypeCode;
-  typedef TypeCode * TypeCode_ptr;
-
-  /**
-   * @name TypeCode Constants
-   *
-   * All the TypeCode constants
-   */
-  //@{
-  extern TAO_Export TypeCode_ptr const _tc_null;
-  extern TAO_Export TypeCode_ptr const _tc_void;
-  extern TAO_Export TypeCode_ptr const _tc_boolean;
-  extern TAO_Export TypeCode_ptr const _tc_char;
-  extern TAO_Export TypeCode_ptr const _tc_wchar;
-  extern TAO_Export TypeCode_ptr const _tc_short;
-  extern TAO_Export TypeCode_ptr const _tc_ushort;
-  extern TAO_Export TypeCode_ptr const _tc_long;
-  extern TAO_Export TypeCode_ptr const _tc_ulong;
-  extern TAO_Export TypeCode_ptr const _tc_longlong;
-  extern TAO_Export TypeCode_ptr const _tc_ulonglong;
-  extern TAO_Export TypeCode_ptr const _tc_float;
-  extern TAO_Export TypeCode_ptr const _tc_double;
-  extern TAO_Export TypeCode_ptr const _tc_longdouble;
-  extern TAO_Export TypeCode_ptr const _tc_octet;
-  extern TAO_Export TypeCode_ptr const _tc_any;
-  extern TAO_Export TypeCode_ptr const _tc_TypeCode;
-  extern TAO_Export TypeCode_ptr const _tc_Principal;
-
-  extern TAO_Export TypeCode_ptr const _tc_string;
-  extern TAO_Export TypeCode_ptr const _tc_wstring;
-
-  extern TAO_Export TypeCode_ptr const _tc_Object;
-  extern TAO_Export TypeCode_ptr const _tc_Component;
-  extern TAO_Export TypeCode_ptr const _tc_Home;
-  //@}
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_TYPECODE_CONSTANTS_H */
diff --git a/TAO/tao/TypeCode_Struct_Field.h b/TAO/tao/TypeCode_Struct_Field.h
deleted file mode 100644
index ad1fb0b35c2..00000000000
--- a/TAO/tao/TypeCode_Struct_Field.h
+++ /dev/null
@@ -1,89 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    TypeCode_Struct_Field.h
- *
- *  $Id$
- *
- *  Header file for @c TAO::TypeCode::Struct_Field type.
- *
- *  @author Ossama Othman <ossama@dre.vanderbilt.edu>
- *  @author Carlos O'Ryan
- */
-//=============================================================================
-
-#ifndef TAO_TYPECODE_STRUCT_FIELD_H
-#define TAO_TYPECODE_STRUCT_FIELD_H
-
-#include /**/ "ace/pre.h"
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-
-namespace CORBA
-{
-  class TypeCode;
-  typedef TypeCode* TypeCode_ptr;
-}
-
-namespace TAO
-{
-  namespace TypeCode
-  {
-    /**
-     * @struct Struct_Field
-     *
-     * @brief Name/type pair for fields of an OMG IDL defined
-     *        structure or exception.
-     *
-     * A @c Struct_Field contains the corresponding name and pointer
-     * to the @c CORBA::TypeCode for a given OMG IDL defined type.
-     * For example, the fields in following OMG IDL structure:
-     *
-     * \code
-     *   struct Foo
-     *   {
-     *     long   the_number;
-     *     string the_string;
-     *   };
-     * \endcode
-     *
-     * would be represented using the following statically instantiated
-     * @c TAO::TypeCode::Struct_Field array:
-     *
-     * \code
-     *   TAO::TypeCode::Struct_Field<char const *> _tao_fields_Foo[] =
-     *     {
-     *       { "the_number", &CORBA::_tc_long },
-     *       { "the_string", &CORBA::_tc_string },
-     *     };
-     * \endcode
-     *
-     * The template parameter @a STRING_TYPE is either @c char
-     * @c const @c * or @c CORBA::String_var.  The latter is only used
-     * when creating @c CORBA::tk_struct or @c CORBA::tk_except
-     * @c TypeCodes dynamically, such as through the TypeCodeFactory.
-     */
-    template <typename StringType, typename TypeCodeType>
-    struct Struct_Field
-    {
-      /// The name of the field.
-      StringType name;
-
-      /// The @c CORBA::TypeCode of the field.
-      TypeCodeType type;
-
-    };
-
-  }  // End namespace TypeCode
-}  // End namespace TAO
-
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_TYPECODE_STRUCT_FIELD_H */
diff --git a/TAO/tao/TypeCode_Traits.h b/TAO/tao/TypeCode_Traits.h
deleted file mode 100644
index b1eae5d2c13..00000000000
--- a/TAO/tao/TypeCode_Traits.h
+++ /dev/null
@@ -1,122 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    TypeCode_Traits.h
- *
- *  $Id$
- *
- *  @author Ossama Othman <ossama@dre.vanderbilt.edu>
- */
-//=============================================================================
-
-#ifndef TAO_TYPECODE_TRAITS_H
-#define TAO_TYPECODE_TRAITS_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/CORBA_String.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-namespace TAO
-{
-  class Null_RefCount_Policy;
-  class True_RefCount_Policy;
-
-  namespace TypeCode
-  {
-
-//     enum Storage { STATIC_TYPECODE, DYNAMIC_TYPECODE };
-
-//     template<Storage S> struct Traits;
-
-    // ----
-    // @@ Work around limitations in MSVC++ 6.
-    typedef char const * STATIC_TYPECODE;
-    typedef CORBA::String_var DYNAMIC_TYPECODE;
-
-    template<typename S> struct Traits;
-    // ----
-
-    template<>
-    struct Traits<STATIC_TYPECODE>
-    {
-      typedef char const * string_type;
-
-      /**
-       * A pointer to the @c CORBA::TypeCode_ptr rather than the
-       * @c CORBA::TypeCode_ptr itself is stored since that address is
-       * well-defined.  We may not know the value of the
-       * @c CORBA::TypeCode_ptr when creating a static object that
-       * refers to it, hence the indirection.
-       */
-      typedef CORBA::TypeCode_ptr const * typecode_type;
-
-      typedef TAO::Null_RefCount_Policy refcount_policy_type;
-
-      static char const * get_string (string_type const & str)
-      {
-        return str;
-      }
-
-      static CORBA::TypeCode_ptr get_typecode (typecode_type const & tc)
-      {
-        return (tc == 0 ? CORBA::TypeCode::_nil () : *tc);
-      }
-    };
-
-    template<>
-    struct Traits<DYNAMIC_TYPECODE>
-    {
-      typedef CORBA::String_var string_type;
-      typedef CORBA::TypeCode_var typecode_type;
-      typedef TAO::True_RefCount_Policy refcount_policy_type;
-
-      static char const * get_string (string_type const & str)
-      {
-        return str.in ();
-      }
-
-      static CORBA::TypeCode_ptr get_typecode (typecode_type const & tc)
-      {
-        return tc.in ();
-      }
-    };
-
-    // ---------------
-
-    // Traits based on TypeCode type template parameters.
-
-    template<>
-    struct Traits<Traits<STATIC_TYPECODE>::typecode_type>
-    {
-      typedef Traits<STATIC_TYPECODE>::typecode_type typecode_type;
-
-      static CORBA::TypeCode_ptr get_typecode (typecode_type const & tc)
-      {
-        return (tc == 0 ? CORBA::TypeCode::_nil () : *tc);
-      }
-    };
-
-    template<>
-    struct Traits<Traits<DYNAMIC_TYPECODE>::typecode_type>
-    {
-      typedef Traits<DYNAMIC_TYPECODE>::typecode_type typecode_type;
-
-      static CORBA::TypeCode_ptr get_typecode (typecode_type const & tc)
-      {
-        return tc.in ();
-      }
-
-    };
-
-  }  // End namespace TypeCode
-}  // End namespace TAO
-
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_TYPECODE_TRAITS_H */
diff --git a/TAO/tao/TypeCode_Value_Field.h b/TAO/tao/TypeCode_Value_Field.h
deleted file mode 100644
index 7fbfcb20501..00000000000
--- a/TAO/tao/TypeCode_Value_Field.h
+++ /dev/null
@@ -1,91 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    TypeCode_Value_Field.h
- *
- *  $Id$
- *
- *  Header file for @c TAO::TypeCode::Value_Field type.
- *
- *  @author Ossama Othman <ossama@dre.vanderbilt.edu>
- */
-//=============================================================================
-
-#ifndef TAO_TYPECODE_VALUE_FIELD_H
-#define TAO_TYPECODE_VALUE_FIELD_H
-
-#include /**/ "ace/pre.h"
-
-#include "ace/config-all.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-
-namespace CORBA
-{
-  class TypeCode;
-  typedef TypeCode* TypeCode_ptr;
-}
-
-namespace TAO
-{
-  namespace TypeCode
-  {
-    /**
-     * @struct Value_Field
-     *
-     * @brief Name/type/visibility tuple fields of an OMG IDL defined
-     *        @c valuetype or @c eventtype.
-     *
-     * A @c Value_Field contains the corresponding name and pointer to the
-     * @c CORBA::TypeCode for a given OMG IDL defined type.  For
-     * example, the fields in following OMG IDL structure:
-     *
-     * \code
-     *   struct Foo
-     *   {
-     *     long   the_number;
-     *     string the_string;
-     *   };
-     * \endcode
-     *
-     * would be represented using the following statically instantiated
-     * @c TAO::TypeCode::Value_Field array:
-     *
-     * \code
-     *   TAO::TypeCode::Value_Field<char const *> _tao_fields_Foo[] =
-     *     {
-     *       { "the_number", &CORBA::_tc_long },
-     *       { "the_string", &CORBA::_tc_string },
-     *     };
-     * \endcode
-     *
-     * The template parameter @a STRING_TYPE is either @c char
-     * @c const @c * or @c CORBA::String_var.  The latter is only used
-     * when creating @c CORBA::tk_value or @c CORBA::tk_event
-     * @c TypeCodes dynamically, such as through the TypeCodeFactory.
-     */
-    template <typename StringType, typename TypeCodeType>
-    struct Value_Field
-    {
-      /// The name of the field.
-      StringType name;
-
-      /// The @c CORBA::TypeCode of the field.
-      TypeCodeType type;
-
-      /// The visibility of the field.
-      CORBA::Visibility visibility;
-
-    };
-
-  }  // End namespace TypeCode
-}  // End namespace TAO
-
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_TYPECODE_VALUE_FIELD_H */
diff --git a/TAO/tao/UB_String_Argument_T.cpp b/TAO/tao/UB_String_Argument_T.cpp
index a22d029b64c..a84a261ed85 100644
--- a/TAO/tao/UB_String_Argument_T.cpp
+++ b/TAO/tao/UB_String_Argument_T.cpp
@@ -4,50 +4,46 @@
 #define TAO_UB_STRING_ARGUMENT_T_C
 
 #include "tao/UB_String_Argument_T.h"
-#include "tao/Dynamic_ParameterC.h"
 #include "tao/CDR.h"
 
 #if !defined (__ACE_INLINE__)
 #include "tao/UB_String_Argument_T.inl"
 #endif /* __ACE_INLINE__ */
 
-//#include "tao/DynamicC.h"
-
 ACE_RCSID (tao,
            UB_String_Argument_T,
            "$Id$")
 
-template<typename S>
+template<typename S, typename Insert_Policy>
 CORBA::Boolean
-TAO::In_UB_String_Argument_T<S>::marshal (TAO_OutputCDR & cdr)
+TAO::In_UB_String_Argument_T<S,Insert_Policy>::marshal (TAO_OutputCDR &cdr)
 {
   return cdr << this->x_;
 }
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S>
+template<typename S, typename Insert_Policy>
 void
-TAO::In_UB_String_Argument_T<S>::interceptor_param (Dynamic::Parameter & p)
+TAO::In_UB_String_Argument_T<S,Insert_Policy>::interceptor_value (CORBA::Any *any) const
 {
-  p.argument <<= this->x_;
-  p.mode = CORBA::PARAM_IN;
+  this->Insert_Policy::any_insert (any, this->x_);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // ===========================================================
 
-template<typename S>
+template<typename S, typename Insert_Policy>
 CORBA::Boolean
-TAO::Inout_UB_String_Argument_T<S>::marshal (TAO_OutputCDR & cdr)
+TAO::Inout_UB_String_Argument_T<S,Insert_Policy>::marshal (TAO_OutputCDR &cdr)
 {
   return cdr << this->x_;
 }
 
-template<typename S>
+template<typename S, typename Insert_Policy>
 CORBA::Boolean
-TAO::Inout_UB_String_Argument_T<S>::demarshal (TAO_InputCDR & cdr)
+TAO::Inout_UB_String_Argument_T<S,Insert_Policy>::demarshal (TAO_InputCDR & cdr)
 {
   delete [] this->x_;
   return cdr >> this->x_;
@@ -55,55 +51,53 @@ TAO::Inout_UB_String_Argument_T<S>::demarshal (TAO_InputCDR & cdr)
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S>
+template<typename S, typename Insert_Policy>
 void
-TAO::Inout_UB_String_Argument_T<S>::interceptor_param (Dynamic::Parameter & p)
+TAO::Inout_UB_String_Argument_T<S,Insert_Policy>::interceptor_value (CORBA::Any *any) const
 {
-  p.argument <<= this->x_;
-  p.mode = CORBA::PARAM_INOUT;
+  this->Insert_Policy::any_insert (any, this->x_);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // ==============================================================
 
-template<typename S, typename S_out>
+template<typename S, typename S_out, typename Insert_Policy>
 CORBA::Boolean
-TAO::Out_UB_String_Argument_T<S,S_out>::demarshal (TAO_InputCDR & cdr)
+TAO::Out_UB_String_Argument_T<S,S_out,Insert_Policy>::demarshal (TAO_InputCDR & cdr)
 {
   return cdr >> this->x_;
 }
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S, typename S_out>
+template<typename S, typename S_out, typename Insert_Policy>
 void
-TAO::Out_UB_String_Argument_T<S,S_out>::interceptor_param (
-    Dynamic::Parameter & p
-  )
+TAO::Out_UB_String_Argument_T<S,S_out,Insert_Policy>::interceptor_value (
+  CORBA::Any *any) const
 {
-  p.argument <<= this->x_;
-  p.mode = CORBA::PARAM_OUT;
+  this->Insert_Policy::any_insert (any, this->x_);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // ============================================================
 
-template<typename S, typename S_var>
+template<typename S, typename S_var, typename Insert_Policy>
 CORBA::Boolean
-TAO::Ret_UB_String_Argument_T<S,S_var>::demarshal (TAO_InputCDR & cdr)
+TAO::Ret_UB_String_Argument_T<S,S_var,Insert_Policy>::demarshal (TAO_InputCDR & cdr)
 {
   return cdr >> this->x_.out ();
 }
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S, typename S_var>
+template<typename S, typename S_var, typename Insert_Policy>
 void
-TAO::Ret_UB_String_Argument_T<S,S_var>::interceptor_result (CORBA::Any * any)
+TAO::Ret_UB_String_Argument_T<S,S_var,Insert_Policy>::interceptor_value (
+  CORBA::Any *any) const
 {
-  (*any) <<= this->x_.in ();
+  this->Insert_Policy::any_insert (any, this->x_.in ());
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
diff --git a/TAO/tao/UB_String_Argument_T.h b/TAO/tao/UB_String_Argument_T.h
index 02c1c948b6c..2b4b3d25214 100644
--- a/TAO/tao/UB_String_Argument_T.h
+++ b/TAO/tao/UB_String_Argument_T.h
@@ -29,15 +29,15 @@ namespace TAO
    * @brief Template class for IN unbounded (w)string argument.
    *
    */
-  template<typename S>
-  class In_UB_String_Argument_T : public Argument
+  template<typename S, typename Insert_Policy>
+  class In_UB_String_Argument_T : public InArgument, private Insert_Policy
   {
   public:
     In_UB_String_Argument_T (const S * x);
 
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S const * arg (void) const;
 
@@ -51,16 +51,16 @@ namespace TAO
    * @brief Template class for INOUT unbounded (w)string argument.
    *
    */
-  template<typename S>
-  class Inout_UB_String_Argument_T : public Argument
+  template<typename S, typename Insert_Policy>
+  class Inout_UB_String_Argument_T : public InoutArgument, private Insert_Policy
   {
   public:
     Inout_UB_String_Argument_T (S *& x);
 
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S *& arg (void);
 
@@ -71,18 +71,18 @@ namespace TAO
   /**
    * @class Out_UB_String_Argument_T
    *
-   * @brief Template class for INOUT unbounded (w)string argument.
+   * @brief Template class for OUT unbounded (w)string argument.
    *
    */
-  template<typename S, typename S_out>
-  class Out_UB_String_Argument_T : public Argument
+  template<typename S, typename S_out, typename Insert_Policy>
+  class Out_UB_String_Argument_T : public OutArgument, private Insert_Policy
   {
   public:
     Out_UB_String_Argument_T (S_out & x);
 
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S *& arg (void);
 
@@ -96,15 +96,15 @@ namespace TAO
    * @brief Template class for return stub value of ub (w)string argument.
    *
    */
-  template<typename S, typename S_var>
-  class Ret_UB_String_Argument_T : public Argument
+  template<typename S, typename S_var, typename Insert_Policy>
+  class Ret_UB_String_Argument_T : public RetArgument, private Insert_Policy
   {
   public:
     Ret_UB_String_Argument_T (void);
 
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_result (CORBA::Any *);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S *& arg (void);
 
@@ -129,20 +129,20 @@ namespace TAO
    * @brief Template class for argument traits of unbounded (w)strings.
    *
    */
-  template<typename T, typename T_var, typename T_out>
+  template<typename T, typename T_var, typename T_out, typename Insert_Policy>
   struct UB_String_Arg_Traits_T
   {
-    typedef T *                                         ret_type;
-    typedef T const *                                   in_type;
-    typedef T *&                                        inout_type;
-    typedef T_out                                       out_type;
+    typedef T *                                              ret_type;
+    typedef T const *                                        in_type;
+    typedef T *&                                             inout_type;
+    typedef T_out                                            out_type;
 
-    typedef In_UB_String_Argument_T<T>                  in_arg_val;
-    typedef Inout_UB_String_Argument_T<T>               inout_arg_val;
-    typedef Out_UB_String_Argument_T<T,T_out>           out_arg_val;
-    typedef Ret_UB_String_Argument_T<T,T_var>           ret_val;
+    typedef In_UB_String_Argument_T<T, Insert_Policy>        in_arg_val;
+    typedef Inout_UB_String_Argument_T<T, Insert_Policy>     inout_arg_val;
+    typedef Out_UB_String_Argument_T<T,T_out, Insert_Policy> out_arg_val;
+    typedef Ret_UB_String_Argument_T<T,T_var, Insert_Policy> ret_val;
 
-    typedef UB_String_Tag                               idl_tag;
+    typedef UB_String_Tag                                    idl_tag;
   };
 }
 
diff --git a/TAO/tao/UB_String_Argument_T.inl b/TAO/tao/UB_String_Argument_T.inl
index b5fbd2a4b60..b6f6a97db6e 100644
--- a/TAO/tao/UB_String_Argument_T.inl
+++ b/TAO/tao/UB_String_Argument_T.inl
@@ -1,78 +1,78 @@
 // $Id$
 
-template<typename S>
+template<typename S, typename Insert_Policy>
 ACE_INLINE
-TAO::In_UB_String_Argument_T<S>::In_UB_String_Argument_T (const S * x)
+TAO::In_UB_String_Argument_T<S,Insert_Policy>::In_UB_String_Argument_T (const S * x)
   : x_ (x)
 {}
 
-template<typename S>
+template<typename S, typename Insert_Policy>
 ACE_INLINE
 const S *
-TAO::In_UB_String_Argument_T<S>::arg (void) const
+TAO::In_UB_String_Argument_T<S,Insert_Policy>::arg (void) const
 {
   return this->x_;
 }
 
 // ==========================================================================
 
-template<typename S>
+template<typename S, typename Insert_Policy>
 ACE_INLINE
-TAO::Inout_UB_String_Argument_T<S>::Inout_UB_String_Argument_T (S *& x)
+TAO::Inout_UB_String_Argument_T<S,Insert_Policy>::Inout_UB_String_Argument_T (S *& x)
   : x_ (x)
 {}
 
-template<typename S>
+template<typename S, typename Insert_Policy>
 ACE_INLINE
 S *&
-TAO::Inout_UB_String_Argument_T<S>::arg (void)
+TAO::Inout_UB_String_Argument_T<S,Insert_Policy>::arg (void)
 {
   return this->x_;
 }
 
 // ==========================================================================
 
-template<typename S, typename S_out>
+template<typename S, typename S_out, typename Insert_Policy>
 ACE_INLINE
-TAO::Out_UB_String_Argument_T<S,S_out>::Out_UB_String_Argument_T (S_out & x)
+TAO::Out_UB_String_Argument_T<S,S_out,Insert_Policy>::Out_UB_String_Argument_T (S_out & x)
   : x_ (x.ptr ())
 {}
 
-template<typename S, typename S_out>
+template<typename S, typename S_out, typename Insert_Policy>
 ACE_INLINE
 S *&
-TAO::Out_UB_String_Argument_T<S,S_out>::arg (void)
+TAO::Out_UB_String_Argument_T<S,S_out,Insert_Policy>::arg (void)
 {
   return this->x_;
 }
 
 // ==========================================================================
 
-template<typename S, typename S_var>
+template<typename S, typename S_var, typename Insert_Policy>
 ACE_INLINE
-TAO::Ret_UB_String_Argument_T<S,S_var>::Ret_UB_String_Argument_T (void)
+TAO::Ret_UB_String_Argument_T<S,S_var,Insert_Policy>::Ret_UB_String_Argument_T (void)
 {}
 
-template<typename S, typename S_var>
+template<typename S, typename S_var, typename Insert_Policy>
 ACE_INLINE
 S *&
-TAO::Ret_UB_String_Argument_T<S,S_var>::arg (void)
+TAO::Ret_UB_String_Argument_T<S,S_var,Insert_Policy>::arg (void)
 {
   return this->x_.out ();
 }
 
-template<typename S, typename S_var>
+template<typename S, typename S_var, typename Insert_Policy>
 ACE_INLINE
 S *
-TAO::Ret_UB_String_Argument_T<S,S_var>::excp (void)
+TAO::Ret_UB_String_Argument_T<S,S_var,Insert_Policy>::excp (void)
 {
   return this->x_.ptr ();
 }
 
-template<typename S, typename S_var>
+template<typename S, typename S_var, typename Insert_Policy>
 ACE_INLINE
 S *
-TAO::Ret_UB_String_Argument_T<S,S_var>::retn (void)
+TAO::Ret_UB_String_Argument_T<S,S_var,Insert_Policy>::retn (void)
 {
   return this->x_._retn ();
 }
diff --git a/TAO/tao/UB_String_Arguments.h b/TAO/tao/UB_String_Arguments.h
index 9da4c15be57..a5268d9a6d2 100644
--- a/TAO/tao/UB_String_Arguments.h
+++ b/TAO/tao/UB_String_Arguments.h
@@ -22,6 +22,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/Arg_Traits_T.h"
+#include "tao/Any_Insert_Policy_T.h"
 
 namespace TAO
 {
@@ -35,7 +36,8 @@ namespace TAO
   class TAO_Export Arg_Traits<CORBA::Char *>
     : public UB_String_Arg_Traits_T<CORBA::Char,
                                     CORBA::String_var,
-                                    CORBA::String_out>
+                                    CORBA::String_out,
+                                    TAO::Any_Insert_Policy_AnyTypeCode_Adapter <CORBA::Char const *> >
   {
   };
 
@@ -43,7 +45,8 @@ namespace TAO
   class TAO_Export Arg_Traits<CORBA::WChar *>
     : public UB_String_Arg_Traits_T<CORBA::WChar,
                                     CORBA::WString_var,
-                                    CORBA::WString_out>
+                                    CORBA::WString_out,
+                                    TAO::Any_Insert_Policy_AnyTypeCode_Adapter <CORBA::WChar const *> >
   {
   };
 }
diff --git a/TAO/tao/ULongLongSeqA.cpp b/TAO/tao/ULongLongSeqA.cpp
deleted file mode 100644
index 2144f0d1b09..00000000000
--- a/TAO/tao/ULongLongSeqA.cpp
+++ /dev/null
@@ -1,142 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "ULongLongSeqC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Sequence_TypeCode_Static.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Dual_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:937
-
-
-#ifndef _TAO_TYPECODE_CORBA_ULongLongSeq_GUARD
-#define _TAO_TYPECODE_CORBA_ULongLongSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_ULongLongSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_ulonglong,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_ULongLongSeq_0 =
-      &CORBA_ULongLongSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_ULongLongSeq_GUARD */
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ULongLongSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/ULongLongSeq:1.0",
-    "ULongLongSeq",
-    &TAO::TypeCode::tc_CORBA_ULongLongSeq_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ULongLongSeq =
-    &_tao_tc_CORBA_ULongLongSeq;
-}
-
-
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::ULongLongSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ULongLongSeq>::insert_copy (
-      _tao_any,
-      CORBA::ULongLongSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_ULongLongSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ULongLongSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ULongLongSeq>::insert (
-      _tao_any,
-      CORBA::ULongLongSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_ULongLongSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ULongLongSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::ULongLongSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::ULongLongSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::ULongLongSeq>::extract (
-        _tao_any,
-        CORBA::ULongLongSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_ULongLongSeq_0,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/ULongLongSeqC.cpp b/TAO/tao/ULongLongSeqC.cpp
index 6d9deb8b3e6..69cc5082433 100644
--- a/TAO/tao/ULongLongSeqC.cpp
+++ b/TAO/tao/ULongLongSeqC.cpp
@@ -26,16 +26,12 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:291
+// be\be_codegen.cpp:277
 
 
 #include "ULongLongSeqC.h"
 #include "tao/CDR.h"
 
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
diff --git a/TAO/tao/ULongLongSeqC.h b/TAO/tao/ULongLongSeqC.h
index b00d1dea657..523aaaee8f1 100644
--- a/TAO/tao/ULongLongSeqC.h
+++ b/TAO/tao/ULongLongSeqC.h
@@ -26,10 +26,10 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:153
+// be\be_codegen.cpp:154
 
-#ifndef _TAO_IDL_ORIG_ULONGLONGSEQC_H_
-#define _TAO_IDL_ORIG_ULONGLONGSEQC_H_
+#ifndef _TAO_IDL_ULONGLONGSEQC_H_
+#define _TAO_IDL_ULONGLONGSEQC_H_
 
 #include /**/ "ace/pre.h"
 
@@ -52,17 +52,8 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_Export
 
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:49
 
 namespace CORBA
 {
@@ -114,14 +105,9 @@ namespace CORBA
   };
 
 #endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ULongLongSeq;
 
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:78
 
 } // module CORBA
 
@@ -134,14 +120,6 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const CORBA::ULongLongSeq &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, CORBA::ULongLongSeq*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ULongLongSeq *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ULongLongSeq *&);
-
-// TAO_IDL - Generated from
 // be\be_visitor_sequence/cdr_op_ch.cpp:71
 
 #if !defined _TAO_CDR_OP_CORBA_ULongLongSeq_H_
@@ -159,15 +137,7 @@ TAO_Export CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_CORBA_ULongLongSeq_H_ */
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
+// be\be_codegen.cpp:1028
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/tao/ULongSeqA.cpp b/TAO/tao/ULongSeqA.cpp
deleted file mode 100644
index e3b8a0b711f..00000000000
--- a/TAO/tao/ULongSeqA.cpp
+++ /dev/null
@@ -1,142 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "ULongSeqC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Sequence_TypeCode_Static.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Dual_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:937
-
-
-#ifndef _TAO_TYPECODE_CORBA_ULongSeq_GUARD
-#define _TAO_TYPECODE_CORBA_ULongSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_ULongSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_ulong,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_ULongSeq_0 =
-      &CORBA_ULongSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_ULongSeq_GUARD */
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ULongSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/ULongSeq:1.0",
-    "ULongSeq",
-    &TAO::TypeCode::tc_CORBA_ULongSeq_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ULongSeq =
-    &_tao_tc_CORBA_ULongSeq;
-}
-
-
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::ULongSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ULongSeq>::insert_copy (
-      _tao_any,
-      CORBA::ULongSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_ULongSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::ULongSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::ULongSeq>::insert (
-      _tao_any,
-      CORBA::ULongSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_ULongSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::ULongSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::ULongSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::ULongSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::ULongSeq>::extract (
-        _tao_any,
-        CORBA::ULongSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_ULongSeq_0,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/ULongSeqC.cpp b/TAO/tao/ULongSeqC.cpp
index 76df5c16bb5..8fc6a35358a 100644
--- a/TAO/tao/ULongSeqC.cpp
+++ b/TAO/tao/ULongSeqC.cpp
@@ -26,16 +26,12 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:291
+// be\be_codegen.cpp:288
 
 
 #include "ULongSeqC.h"
 #include "tao/CDR.h"
 
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
diff --git a/TAO/tao/ULongSeqC.h b/TAO/tao/ULongSeqC.h
index 31621d2d610..07d71927c92 100644
--- a/TAO/tao/ULongSeqC.h
+++ b/TAO/tao/ULongSeqC.h
@@ -26,10 +26,10 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:153
+// be\be_codegen.cpp:154
 
-#ifndef _TAO_IDL_ORIG_ULONGSEQC_H_
-#define _TAO_IDL_ORIG_ULONGSEQC_H_
+#ifndef _TAO_IDL_ULONGSEQC_H_
+#define _TAO_IDL_ULONGSEQC_H_
 
 #include /**/ "ace/pre.h"
 
@@ -57,12 +57,8 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:49
 
 namespace CORBA
 {
@@ -114,14 +110,9 @@ namespace CORBA
   };
 
 #endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ULongSeq;
 
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:78
 
 } // module CORBA
 
@@ -134,14 +125,6 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const CORBA::ULongSeq &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, CORBA::ULongSeq*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::ULongSeq *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::ULongSeq *&);
-
-// TAO_IDL - Generated from
 // be\be_visitor_sequence/cdr_op_ch.cpp:71
 
 #if !defined _TAO_CDR_OP_CORBA_ULongSeq_H_
@@ -159,16 +142,12 @@ TAO_Export CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_CORBA_ULongSeq_H_ */
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:955
+// be\be_codegen.cpp:1062
 
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
diff --git a/TAO/tao/UShortSeqA.cpp b/TAO/tao/UShortSeqA.cpp
deleted file mode 100644
index 6259a96e1f9..00000000000
--- a/TAO/tao/UShortSeqA.cpp
+++ /dev/null
@@ -1,142 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "UShortSeqC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Sequence_TypeCode_Static.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Dual_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:937
-
-
-#ifndef _TAO_TYPECODE_CORBA_UShortSeq_GUARD
-#define _TAO_TYPECODE_CORBA_UShortSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_UShortSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_ushort,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_UShortSeq_0 =
-      &CORBA_UShortSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_UShortSeq_GUARD */
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_UShortSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/UShortSeq:1.0",
-    "UShortSeq",
-    &TAO::TypeCode::tc_CORBA_UShortSeq_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_UShortSeq =
-    &_tao_tc_CORBA_UShortSeq;
-}
-
-
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::UShortSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::UShortSeq>::insert_copy (
-      _tao_any,
-      CORBA::UShortSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_UShortSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::UShortSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::UShortSeq>::insert (
-      _tao_any,
-      CORBA::UShortSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_UShortSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::UShortSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::UShortSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::UShortSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::UShortSeq>::extract (
-        _tao_any,
-        CORBA::UShortSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_UShortSeq_0,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/UShortSeqC.h b/TAO/tao/UShortSeqC.h
index c7f63e0258a..33567017495 100644
--- a/TAO/tao/UShortSeqC.h
+++ b/TAO/tao/UShortSeqC.h
@@ -66,22 +66,22 @@
 
 namespace CORBA
 {
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_sequence/sequence_ch.cpp:101
 
 #if !defined (_CORBA_USHORTSEQ_CH_)
 #define _CORBA_USHORTSEQ_CH_
-  
+
   class UShortSeq;
-  
+
   typedef
     TAO_FixedSeq_Var_T<
         UShortSeq,
         CORBA::UShort
       >
     UShortSeq_var;
-  
+
   typedef
     TAO_Seq_Out_T<
         UShortSeq,
@@ -89,7 +89,7 @@ namespace CORBA
         CORBA::UShort
       >
     UShortSeq_out;
-  
+
   class TAO_Export UShortSeq
     : public
         TAO_Unbounded_Sequence<
@@ -102,23 +102,18 @@ namespace CORBA
     UShortSeq (
         CORBA::ULong max,
         CORBA::ULong length,
-        CORBA::UShort* buffer, 
+        CORBA::UShort* buffer,
         CORBA::Boolean release = 0
       );
     UShortSeq (const UShortSeq &);
     ~UShortSeq (void);
-    
+
     static void _tao_any_destructor (void *);
-    
+
     typedef UShortSeq_var _var_type;
   };
 
 #endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_UShortSeq;
 
 // TAO_IDL - Generated from
 // be\be_visitor_module/module_ch.cpp:66
@@ -146,14 +141,6 @@ namespace TAO
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT */
 
 // TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const CORBA::UShortSeq &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, CORBA::UShortSeq*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::UShortSeq *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::UShortSeq *&);
-
-// TAO_IDL - Generated from
 // be\be_visitor_sequence/cdr_op_ch.cpp:71
 
 #if !defined _TAO_CDR_OP_CORBA_UShortSeq_H_
diff --git a/TAO/tao/Union_TypeCode.cpp b/TAO/tao/Union_TypeCode.cpp
deleted file mode 100644
index 09f2d66958e..00000000000
--- a/TAO/tao/Union_TypeCode.cpp
+++ /dev/null
@@ -1,440 +0,0 @@
-// $Id$
-
-#ifndef TAO_UNION_TYPECODE_CPP
-#define TAO_UNION_TYPECODE_CPP
-
-#include "tao/Union_TypeCode.h"
-#include "tao/TypeCode_Case.h"
-
-#ifndef __ACE_INLINE__
-# include "tao/Union_TypeCode.inl"
-#endif  /* !__ACE_INLINE__ */
-
-#include "tao/SystemException.h"
-
-#include "ace/Value_Ptr.h"
-
-
-template <typename StringType,
-          typename TypeCodeType,
-          class CaseArrayType,
-          class RefCountPolicy>
-bool
-TAO::TypeCode::Union<StringType,
-                     TypeCodeType,
-                     CaseArrayType,
-                     RefCountPolicy>::tao_marshal (
-  TAO_OutputCDR & cdr,
-  CORBA::ULong offset) const
-{
-  // A tk_union TypeCode has a "complex" parameter list type (see
-  // Table 15-2 in Section 15.3.5.1 "TypeCode" in the CDR section of
-  // the CORBA specification), meaning that it must be marshaled into
-  // a CDR encapsulation.
-
-  // Create a CDR encapsulation.
-  TAO_OutputCDR enc;
-
-  bool const success =
-    (enc << TAO_OutputCDR::from_boolean (TAO_ENCAP_BYTE_ORDER))
-    && (enc << TAO_OutputCDR::from_string (this->base_attributes_.id (), 0))
-    && (enc << TAO_OutputCDR::from_string (this->base_attributes_.name (), 0))
-    && marshal (enc,
-                Traits<StringType>::get_typecode (this->discriminant_type_),
-                offset + enc.total_length ())
-    && (enc << this->default_index_)
-    && (enc << this->ncases_);
-
-  if (!success)
-    return false;
-
-  for (CORBA::ULong i = 0; i < this->ncases_; ++i)
-    {
-      case_type const & c = *this->cases_[i];
-
-      if (!c.marshal (enc, offset + enc.total_length ()))
-        return false;
-    }
-
-  return
-    cdr << static_cast<CORBA::ULong> (enc.total_length ())
-    && cdr.write_octet_array_mb (enc.begin ());
-}
-
-template <typename StringType,
-          typename TypeCodeType,
-          class CaseArrayType,
-          class RefCountPolicy>
-void
-TAO::TypeCode::Union<StringType,
-                     TypeCodeType,
-                     CaseArrayType,
-                     RefCountPolicy>::tao_duplicate (void)
-{
-  this->RefCountPolicy::add_ref ();
-}
-
-template <typename StringType,
-          typename TypeCodeType,
-          class CaseArrayType,
-          class RefCountPolicy>
-void
-TAO::TypeCode::Union<StringType,
-                     TypeCodeType,
-                     CaseArrayType,
-                     RefCountPolicy>::tao_release (void)
-{
-  this->RefCountPolicy::remove_ref ();
-}
-
-template <typename StringType,
-          typename TypeCodeType,
-          class CaseArrayType,
-          class RefCountPolicy>
-CORBA::Boolean
-TAO::TypeCode::Union<StringType,
-                     TypeCodeType,
-                     CaseArrayType,
-                     RefCountPolicy>::equal_i (
-  CORBA::TypeCode_ptr tc
-  ACE_ENV_ARG_DECL) const
-{
-  // These calls shouldn't throw since CORBA::TypeCode::equal()
-  // verified that the TCKind is the same as our's prior to invoking
-  // this method, meaning that the CORBA::tk_union TypeCode methods
-  // are supported.
-
-  CORBA::ULong const tc_count =
-    tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  CORBA::Long tc_def = tc->default_index (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (tc_count != this->ncases_
-      || tc_def != this->default_index_)
-    return 0;
-
-  // Check the discriminator type.
-  CORBA::TypeCode_var tc_discriminator =
-    tc->discriminator_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  CORBA::Boolean const equal_discriminators =
-    Traits<StringType>::get_typecode (this->discriminant_type_)->equal (
-      tc_discriminator.in ()
-      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (!equal_discriminators)
-    return 0;
-
-  for (CORBA::ULong i = 0; i < this->ncases_; ++i)
-    {
-      if (this->default_index_ > -1
-          && static_cast<CORBA::ULong> (this->default_index_) == i)
-        {
-          // Don't bother checking equality of default case label.  It
-          // will always be the zero octet (the CDR encoded value is
-          // ignored).
-          continue;
-        }
-
-      case_type const & lhs_case = *this->cases_[i];
-
-      bool const equal_case =
-        lhs_case.equal (i,
-                        tc
-                        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      if (!equal_case)
-        return 0;
-    }
-
-  return 1;
-}
-
-template <typename StringType,
-          typename TypeCodeType,
-          class CaseArrayType,
-          class RefCountPolicy>
-CORBA::Boolean
-TAO::TypeCode::Union<StringType,
-                     TypeCodeType,
-                     CaseArrayType,
-                     RefCountPolicy>::equivalent_i (
-  CORBA::TypeCode_ptr tc
-  ACE_ENV_ARG_DECL) const
-{
-  // Perform a structural comparison, excluding the name() and
-  // member_name() operations.
-
-  CORBA::ULong const tc_count =
-    tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  CORBA::Long tc_def = tc->default_index (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (tc_count != this->ncases_
-      || tc_def != this->default_index_)
-    return 0;
-
-  CORBA::TypeCode_var tc_discriminator =
-    tc->discriminator_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  CORBA::Boolean const equiv_discriminators =
-    Traits<StringType>::get_typecode (this->discriminant_type_)->equivalent (
-      tc_discriminator.in ()
-      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (!equiv_discriminators)
-    return 0;
-
-  for (CORBA::ULong i = 0; i < this->ncases_; ++i)
-    {
-      if (this->default_index_ > -1
-          && static_cast<CORBA::ULong> (this->default_index_) == i)
-        {
-          // Don't bother checking equality/equivalence of default
-          // case label.  It will always be the zero octet (the CDR
-          // encoded value is ignored).
-          continue;
-        }
-
-      case_type const & lhs_case = *this->cases_[i];
-
-      bool const equivalent_case =
-        lhs_case.equivalent (i,
-                             tc
-                             ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      if (!equivalent_case)
-        return 0;
-    }
-
-  return 1;
-}
-
-template <typename StringType,
-          typename TypeCodeType,
-          class CaseArrayType,
-          class RefCountPolicy>
-CORBA::TypeCode_ptr
-TAO::TypeCode::Union<StringType,
-                     TypeCodeType,
-                     CaseArrayType,
-                     RefCountPolicy>::get_compact_typecode_i (
-  ACE_ENV_SINGLE_ARG_DECL) const
-{
-//   typedef ACE::Value_Ptr<TAO::TypeCode::Case<CORBA::String_var,
-//                                              CORBA::TypeCode_var> > elem_type;
-
-//   ACE_Array_Base<elem_type> tc_cases (this->ncases_);
-
-//   if (this->ncases_ > 0)
-//     {
-//       // Dynamically construct a new array of cases stripped of
-//       // member names.
-
-//       static char const empty_name[] = "";
-
-//       for (CORBA::ULong i = 0; i < this->ncases_; ++i)
-//         {
-//           // Member names will be stripped, i.e. not embedded within
-//           // the compact TypeCode.
-//           tc_cases[i].name = empty_name;
-//           tc_cases[i].type =
-//             this->cases_[i]->type ()->get_compact_typecode (
-//               ACE_ENV_ARG_PARAMETER);
-//           ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
-//         }
-//     }
-
-//   // Create the compact union TypeCode.
-//   TAO_TypeCodeFactory_Adapter * adapter =
-//     ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
-//       TAO_ORB_Core::typecodefactory_adapter_name ());
-
-//   if (adapter == 0)
-//     {
-//       ACE_THROW_RETURN (CORBA::INTERNAL (),
-//                         CORBA::TypeCode::_nil ());
-//     }
-
-//   return
-//     adapter->create_union_tc (
-//       this->base_attributes_.id (),
-//       "",  /* empty name */
-//       Traits<StringType>::get_typecode (this->discriminant_type_),
-//       tc_cases,
-//       this->ncases_,
-//       this->default_index_,
-//       "",
-//       Traits<StringType>::get_typecode (this->default_case_.type)
-//       ACE_ENV_ARG_PARAMETER);
-//   ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
-
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), CORBA::TypeCode::_nil ());
-    
-  ACE_NOTREACHED (return CORBA::TypeCode::_nil ());
-}
-
-template <typename StringType,
-          typename TypeCodeType,
-          class CaseArrayType,
-          class RefCountPolicy>
-char const *
-TAO::TypeCode::Union<StringType,
-                     TypeCodeType,
-                     CaseArrayType,
-                     RefCountPolicy>::id_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  // Ownership is retained by the TypeCode, as required by the C++
-  // mapping.
-  return this->base_attributes_.id ();
-}
-
-template <typename StringType,
-          typename TypeCodeType,
-          class CaseArrayType,
-          class RefCountPolicy>
-char const *
-TAO::TypeCode::Union<StringType,
-                     TypeCodeType,
-                     CaseArrayType,
-                     RefCountPolicy>::name_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  // Ownership is retained by the TypeCode, as required by the C++
-  // mapping.
-  return this->base_attributes_.name ();
-}
-
-template <typename StringType,
-          typename TypeCodeType,
-          class CaseArrayType,
-          class RefCountPolicy>
-CORBA::ULong
-TAO::TypeCode::Union<StringType,
-                     TypeCodeType,
-                      CaseArrayType,
-                      RefCountPolicy>::member_count_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  return this->ncases_;
-}
-
-template <typename StringType,
-          typename TypeCodeType,
-          class CaseArrayType,
-          class RefCountPolicy>
-char const *
-TAO::TypeCode::Union<StringType,
-                     TypeCodeType,
-                     CaseArrayType,
-                     RefCountPolicy>::member_name_i (CORBA::ULong index
-                                                     ACE_ENV_ARG_DECL) const
-{
-  // Ownership is retained by the TypeCode, as required by the C++
-  // mapping.
-  if (index >= this->ncases_)
-    ACE_THROW_RETURN (CORBA::TypeCode::Bounds (), 0);
-
-  return this->cases_[index]->name ();
-}
-
-template <typename StringType,
-          typename TypeCodeType,
-          class CaseArrayType,
-          class RefCountPolicy>
-CORBA::TypeCode_ptr
-TAO::TypeCode::Union<StringType,
-                     TypeCodeType,
-                     CaseArrayType,
-                     RefCountPolicy>::member_type_i (CORBA::ULong index
-                                                     ACE_ENV_ARG_DECL) const
-{
-  if (index >= this->ncases_)
-    ACE_THROW_RETURN (CORBA::TypeCode::Bounds (),
-                      CORBA::TypeCode::_nil ());
-
-  return CORBA::TypeCode::_duplicate (this->cases_[index]->type ());
-}
-
-template <typename StringType,
-          typename TypeCodeType,
-          class CaseArrayType,
-          class RefCountPolicy>
-CORBA::Any *
-TAO::TypeCode::Union<StringType,
-                     TypeCodeType,
-                     CaseArrayType,
-                     RefCountPolicy>::member_label_i (CORBA::ULong index
-                                                      ACE_ENV_ARG_DECL) const
-{
-  if (index >= this->ncases_)
-    ACE_THROW_RETURN (CORBA::TypeCode::Bounds (),
-                      0);
-
-  // Default case.
-  if (this->default_index_ > -1
-      && static_cast<CORBA::ULong> (this->default_index_) == index)
-    {
-      CORBA::Any * any;
-      ACE_NEW_THROW_EX (any,
-                        CORBA::Any,
-                        CORBA::NO_MEMORY ());
-      ACE_CHECK_RETURN (0);
-
-      CORBA::Any_var safe_any (any);
-
-      // Default case's label is a zero octet.
-      CORBA::Any::from_octet const zero_octet (0);
-
-      // Default case/member has a zero octet label value.
-      (*any) <<= zero_octet;
-
-      return safe_any._retn ();
-    }
-
-  // Non-default cases.
-  return this->cases_[index]->label (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-template <typename StringType,
-          typename TypeCodeType,
-          class CaseArrayType,
-          class RefCountPolicy>
-CORBA::TypeCode_ptr
-TAO::TypeCode::Union<StringType,
-                     TypeCodeType,
-                     CaseArrayType,
-                     RefCountPolicy>::discriminator_type_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  return
-    CORBA::TypeCode::_duplicate (
-      Traits<StringType>::get_typecode (this->discriminant_type_));
-}
-
-template <typename StringType,
-          typename TypeCodeType,
-          class CaseArrayType,
-          class RefCountPolicy>
-CORBA::Long
-TAO::TypeCode::Union<StringType,
-                     TypeCodeType,
-                     CaseArrayType,
-                     RefCountPolicy>::default_index_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  return this->default_index_;
-}
-
-#endif  /* TAO_UNION_TYPECODE_CPP */
diff --git a/TAO/tao/Union_TypeCode.h b/TAO/tao/Union_TypeCode.h
deleted file mode 100644
index 6890f3776a5..00000000000
--- a/TAO/tao/Union_TypeCode.h
+++ /dev/null
@@ -1,179 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Union_TypeCode.h
- *
- *  $Id$
- *
- *  Header file for a @c tk_union CORBA::TypeCode.
- *
- *  @author Ossama Othman
- */
-//=============================================================================
-
-#ifndef TAO_UNION_TYPECODE_H
-#define TAO_UNION_TYPECODE_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/TypeCode.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TypeCode_Base_Attributes.h"
-
-
-namespace TAO
-{
-  namespace TypeCode
-  {
-
-    /**
-     * @class Union
-     *
-     * @brief @c CORBA::TypeCode implementation for an OMG IDL
-     *        @c union.
-     *
-     * This class implements a @c CORBA::TypeCode for an OMG IDL
-     * @c union.
-     */
-    template <typename StringType,
-              typename TypeCodeType,
-              class CaseArrayType,
-              class RefCountPolicy>
-    class Union
-      : public CORBA::TypeCode,
-        private RefCountPolicy
-    {
-    public:
-
-      /// @typedef Type of individual case array element, not the
-      ///          array itself.
-      typedef TAO::TypeCode::Case<StringType, TypeCodeType> case_type;
-
-      /// Constructor.
-      Union (char const * id,
-             char const * name,
-#if defined (__BORLANDC__) && (__BORLANDC__ < 0x572)
-             // Borland C++ currently can't handle a reference to
-             // const pointer to const CORBA::TypeCode_ptr
-             TypeCodeType discriminant_type,
-#else
-             TypeCodeType const & discriminant_type,
-#endif
-             CaseArrayType const & cases,
-             CORBA::ULong ncases,
-             CORBA::Long default_index);
-
-      /// Constructor used for recursive TypeCodes.
-      Union (CORBA::TCKind kind,
-             char const * id);
-
-      /**
-       * @name TAO-specific @c CORBA::TypeCode Methods
-       *
-       * Methods required by TAO's implementation of the
-       * @c CORBA::TypeCode class.
-       *
-       * @see @c CORBA::TypeCode
-       */
-      //@{
-      virtual bool tao_marshal (TAO_OutputCDR & cdr,
-                                CORBA::ULong offset) const;
-      virtual void tao_duplicate (void);
-      virtual void tao_release (void);
-      //@}
-
-    protected:
-
-      /**
-       * @name @c TAO CORBA::TypeCode Template Methods
-       *
-       * @c tk_union @c CORBA::TypeCode -specific template methods.
-       *
-       * @see @c CORBA::TypeCode
-       */
-      //@{
-      virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc
-                                      ACE_ENV_ARG_DECL) const;
-      virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc
-                                           ACE_ENV_ARG_DECL) const;
-      virtual CORBA::TypeCode_ptr get_compact_typecode_i (
-        ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual char const * id_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual char const * name_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual CORBA::ULong member_count_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual char const * member_name_i (CORBA::ULong index
-                                          ACE_ENV_ARG_DECL) const;
-      virtual CORBA::TypeCode_ptr member_type_i (CORBA::ULong index
-                                                 ACE_ENV_ARG_DECL) const;
-      virtual CORBA::Any * member_label_i (CORBA::ULong index
-                                           ACE_ENV_ARG_DECL) const;
-      virtual CORBA::TypeCode_ptr discriminator_type_i (
-        ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual CORBA::Long default_index_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      //@}
-
-    protected:
-
-      /**
-       * @c Union Attributes
-       *
-       * Attributes representing the structure of an OMG IDL
-       * @c union.
-       *
-       * @note These attributes are declared in the order in which
-       *       they are marshaled into a CDR stream in order to
-       *       increase cache hits by improving spatial locality.
-       */
-      //@{
-
-      /// Base attributes containing repository ID and name of
-      /// union type.
-      Base_Attributes<StringType> base_attributes_;
-
-      /// Type of IDL @c union discriminant.
-      TypeCodeType discriminant_type_;
-
-      /// Index of the default union case.
-      /**
-       * This value will be -1 if no default case is found in the
-       * union.
-       */
-      CORBA::Long default_index_;
-
-      /// The number of cases in the OMG IDL union, excluding the
-      /// @c default case.
-      CORBA::ULong ncases_;
-
-      /// Array of @c TAO::TypeCode::Case representing structure of
-      /// the OMG IDL defined @c union.
-      CaseArrayType cases_;
-
-      //@}
-
-    };
-
-  }  // End namespace TypeCode
-}  // End namespace TAO
-
-
-#ifdef __ACE_INLINE__
-# include "tao/Union_TypeCode.inl"
-#endif  /* __ACE_INLINE__ */
-
-#ifdef ACE_TEMPLATES_REQUIRE_SOURCE
-# include "tao/Union_TypeCode.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#ifdef ACE_TEMPLATES_REQUIRE_PRAGMA
-# pragma implementation ("Union_TypeCode.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_UNION_TYPECODE_H */
diff --git a/TAO/tao/Union_TypeCode.inl b/TAO/tao/Union_TypeCode.inl
deleted file mode 100644
index 84dfb32fa0b..00000000000
--- a/TAO/tao/Union_TypeCode.inl
+++ /dev/null
@@ -1,55 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-template <typename StringType,
-          typename TypeCodeType,
-          class CaseArrayType,
-          class RefCountPolicy>
-ACE_INLINE
-TAO::TypeCode::Union<StringType,
-                     TypeCodeType,
-                     CaseArrayType,
-                     RefCountPolicy>::Union (
-  char const * id,
-  char const * name,
-#if defined (__BORLANDC__) && (__BORLANDC__ < 0x572)
-  // Borland C++ currently can't handle a reference to
-  // const pointer to const CORBA::TypeCode_ptr
-  TypeCodeType discriminant_type,
-#else
-  TypeCodeType const & discriminant_type,
-#endif
-  CaseArrayType const & cases,
-  CORBA::ULong ncases,
-  CORBA::Long default_index)
-  : CORBA::TypeCode (CORBA::tk_union)
-  , RefCountPolicy ()
-  , base_attributes_ (id, name)
-  , discriminant_type_ (discriminant_type)
-  , default_index_ (default_index)
-  , ncases_ (ncases)
-  , cases_ (cases)
-{
-}
-
-template <typename StringType,
-          typename TypeCodeType,
-          class CaseArrayType,
-          class RefCountPolicy>
-ACE_INLINE
-TAO::TypeCode::Union<StringType,
-                     TypeCodeType,
-                     CaseArrayType,
-                     RefCountPolicy>::Union (
-  CORBA::TCKind,
-  char const * id)
-  : CORBA::TypeCode (CORBA::tk_union)
-  , RefCountPolicy ()
-  , base_attributes_ (id)
-  , discriminant_type_ (0)
-  , default_index_ (-1)
-  , ncases_ (0)
-  , cases_ ()
-{
-}
diff --git a/TAO/tao/Union_TypeCode_Static.cpp b/TAO/tao/Union_TypeCode_Static.cpp
deleted file mode 100644
index 6bb5888f2ca..00000000000
--- a/TAO/tao/Union_TypeCode_Static.cpp
+++ /dev/null
@@ -1,399 +0,0 @@
-// $Id$
-
-#include "tao/Union_TypeCode_Static.h"
-#include "tao/TypeCode_Case.h"
-
-#ifndef __ACE_INLINE__
-# include "tao/Union_TypeCode_Static.inl"
-#endif  /* !__ACE_INLINE__ */
-
-#include "tao/SystemException.h"
-
-#include "ace/Value_Ptr.h"
-
-
-ACE_RCSID (tao,
-           Union_TypeCode_Static,
-           "$Id$")
-
-
-bool
-TAO::TypeCode::Union<char const *,
-                     CORBA::TypeCode_ptr const *,
-                     TAO::TypeCode::Case<char const *,
-                                         CORBA::TypeCode_ptr const *> const * const *,
-                     TAO::Null_RefCount_Policy>::tao_marshal (
-  TAO_OutputCDR & cdr,
-  CORBA::ULong offset) const
-{
-  // A tk_union TypeCode has a "complex" parameter list type (see
-  // Table 15-2 in Section 15.3.5.1 "TypeCode" in the CDR section of
-  // the CORBA specification), meaning that it must be marshaled into
-  // a CDR encapsulation.
-
-  // Create a CDR encapsulation.
-  TAO_OutputCDR enc;
-
-  bool const success =
-    (enc << TAO_OutputCDR::from_boolean (TAO_ENCAP_BYTE_ORDER))
-    && (enc << TAO_OutputCDR::from_string (this->base_attributes_.id (), 0))
-    && (enc << TAO_OutputCDR::from_string (this->base_attributes_.name (), 0))
-    && marshal (enc,
-                Traits<char const *>::get_typecode (this->discriminant_type_),
-                offset + enc.total_length ())
-    && (enc << this->default_index_)
-    && (enc << this->ncases_);
-
-  if (!success)
-    return false;
-
-  // Note that we handle the default case below, too.
-
-  for (unsigned int i = 0; i < this->ncases_; ++i)
-    {
-      case_type const & c = *this->cases_[i];
-
-      if (!c.marshal (enc, offset + enc.total_length ()))
-        return false;
-    }
-
-  return
-    cdr << static_cast<CORBA::ULong> (enc.total_length ())
-    && cdr.write_octet_array_mb (enc.begin ());
-}
-
-void
-TAO::TypeCode::Union<char const *,
-                     CORBA::TypeCode_ptr const *,
-                     TAO::TypeCode::Case<char const *,
-                                         CORBA::TypeCode_ptr const *> const * const *,
-                     TAO::Null_RefCount_Policy>::tao_duplicate (void)
-{
-}
-
-void
-TAO::TypeCode::Union<char const *,
-                     CORBA::TypeCode_ptr const *,
-                     TAO::TypeCode::Case<char const *,
-                                         CORBA::TypeCode_ptr const *> const * const *,
-                     TAO::Null_RefCount_Policy>::tao_release (void)
-{
-}
-
-CORBA::Boolean
-TAO::TypeCode::Union<char const *,
-                     CORBA::TypeCode_ptr const *,
-                     TAO::TypeCode::Case<char const *,
-                                         CORBA::TypeCode_ptr const *> const * const *,
-                     TAO::Null_RefCount_Policy>::equal_i (
-  CORBA::TypeCode_ptr tc
-  ACE_ENV_ARG_DECL) const
-{
-  // These calls shouldn't throw since CORBA::TypeCode::equal()
-  // verified that the TCKind is the same as our's prior to invoking
-  // this method, meaning that the CORBA::tk_union TypeCode methods
-  // are supported.
-
-  CORBA::ULong const tc_count =
-    tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  CORBA::Long tc_def = tc->default_index (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (tc_count != this->ncases_
-      || tc_def != this->default_index_)
-    return 0;
-
-  // Check the discriminator type.
-  CORBA::TypeCode_var tc_discriminator =
-    tc->discriminator_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  CORBA::Boolean const equal_discriminators =
-    Traits<char const *>::get_typecode (this->discriminant_type_)->equal (
-      tc_discriminator.in ()
-      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (!equal_discriminators)
-    return 0;
-
-  for (CORBA::ULong i = 0; i < this->ncases_; ++i)
-    {
-      if (this->default_index_ > -1
-          && static_cast<CORBA::ULong> (this->default_index_) == i)
-        {
-          // Don't bother checking equality of default case label.  It
-          // will always be the zero octet (the CDR encoded value is
-          // ignored).
-          continue;
-        }
-
-      case_type const & lhs_case = *this->cases_[i];
-
-      bool const equal_case =
-        lhs_case.equal (i,
-                        tc
-                        ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      if (!equal_case)
-        return 0;
-    }
-
-  return 1;
-}
-
-CORBA::Boolean
-TAO::TypeCode::Union<char const *,
-                     CORBA::TypeCode_ptr const *,
-                     TAO::TypeCode::Case<char const *,
-                                         CORBA::TypeCode_ptr const *> const * const *,
-                     TAO::Null_RefCount_Policy>::equivalent_i (
-  CORBA::TypeCode_ptr tc
-  ACE_ENV_ARG_DECL) const
-{
-  // Perform a structural comparison, excluding the name() and
-  // member_name() operations.
-
-  CORBA::ULong const tc_count =
-    tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  CORBA::Long tc_def = tc->default_index (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (tc_count != this->ncases_
-      || tc_def != this->default_index_)
-    return 0;
-
-  CORBA::TypeCode_var tc_discriminator =
-    tc->discriminator_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  CORBA::Boolean const equiv_discriminators =
-    Traits<char const *>::get_typecode (this->discriminant_type_)->equivalent (
-      tc_discriminator.in ()
-      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (!equiv_discriminators)
-    return 0;
-
-  for (CORBA::ULong i = 0; i < this->ncases_; ++i)
-    {
-      if (this->default_index_ > -1
-          && static_cast<CORBA::ULong> (this->default_index_) == i)
-        {
-          // Don't bother checking equality/equivalence of default
-          // case label.  It will always be the zero octet (the CDR
-          // encoded value is ignored).
-          continue;
-        }
-
-      case_type const & lhs_case = *this->cases_[i];
-
-      bool const equivalent_case =
-        lhs_case.equivalent (i,
-                             tc
-                             ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      if (!equivalent_case)
-        return 0;
-    }
-
-  return 1;
-}
-
-CORBA::TypeCode_ptr
-TAO::TypeCode::Union<char const *,
-                     CORBA::TypeCode_ptr const *,
-                     TAO::TypeCode::Case<char const *,
-                                         CORBA::TypeCode_ptr const *> const * const *,
-                     TAO::Null_RefCount_Policy>::get_compact_typecode_i (
-  ACE_ENV_SINGLE_ARG_DECL) const
-{
-//   typedef ACE::Value_Ptr<TAO::TypeCode::Case<CORBA::String_var,
-//                                              CORBA::TypeCode_var> > elem_type;
-
-//   ACE_Array_Base<elem_type> tc_cases (this->ncases_);
-
-//   if (this->ncases_ > 0)
-//     {
-//       // Dynamically construct a new array of cases stripped of
-//       // member names.
-
-//       static char const empty_name[] = "";
-
-//       for (CORBA::ULong i = 0; i < this->ncases_; ++i)
-//         {
-//           // Member names will be stripped, i.e. not embedded within
-//           // the compact TypeCode.
-//           tc_cases[i].name = empty_name;
-//           tc_cases[i].type =
-//             this->cases_[i]->type ()->get_compact_typecode (
-//               ACE_ENV_ARG_PARAMETER);
-//           ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
-//         }
-//     }
-
-//   // Create the compact union TypeCode.
-//   TAO_TypeCodeFactory_Adapter * adapter =
-//     ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
-//       TAO_ORB_Core::typecodefactory_adapter_name ());
-
-//   if (adapter == 0)
-//     {
-//       ACE_THROW_RETURN (CORBA::INTERNAL (),
-//                         CORBA::TypeCode::_nil ());
-//     }
-
-//   return
-//     adapter->create_union_tc (
-//       this->base_attributes_.id (),
-//       "",  /* empty name */
-//       Traits<char const *>::get_typecode (this->discriminant_type_),
-//       tc_cases,
-//       this->ncases_,
-//       this->default_index_,
-//       "",
-//       Traits<char const *>::get_typecode (this->default_case_.type)
-//       ACE_ENV_ARG_PARAMETER);
-//   ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
-
-  ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), CORBA::TypeCode::_nil ());
-}
-
-char const *
-TAO::TypeCode::Union<char const *,
-                     CORBA::TypeCode_ptr const *,
-                     TAO::TypeCode::Case<char const *,
-                                         CORBA::TypeCode_ptr const *> const * const *,
-                     TAO::Null_RefCount_Policy>::id_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  // Ownership is retained by the TypeCode, as required by the C++
-  // mapping.
-  return this->base_attributes_.id ();
-}
-
-char const *
-TAO::TypeCode::Union<char const *,
-                     CORBA::TypeCode_ptr const *,
-                     TAO::TypeCode::Case<char const *,
-                                         CORBA::TypeCode_ptr const *> const * const *,
-                     TAO::Null_RefCount_Policy>::name_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  // Ownership is retained by the TypeCode, as required by the C++
-  // mapping.
-  return this->base_attributes_.name ();
-}
-
-CORBA::ULong
-TAO::TypeCode::Union<char const *,
-                     CORBA::TypeCode_ptr const *,
-                     TAO::TypeCode::Case<char const *,
-                                         CORBA::TypeCode_ptr const *> const * const *,
-                     TAO::Null_RefCount_Policy>::member_count_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  return this->ncases_;
-}
-
-char const *
-TAO::TypeCode::Union<char const *,
-                     CORBA::TypeCode_ptr const *,
-                     TAO::TypeCode::Case<char const *,
-                                         CORBA::TypeCode_ptr const *> const * const *,
-                     TAO::Null_RefCount_Policy>::member_name_i (
-  CORBA::ULong index
-  ACE_ENV_ARG_DECL) const
-{
-  // Ownership is retained by the TypeCode, as required by the C++
-  // mapping.
-  if (index >= this->ncases_)
-    ACE_THROW_RETURN (CORBA::TypeCode::Bounds (), 0);
-
-  return this->cases_[index]->name ();
-}
-
-CORBA::TypeCode_ptr
-TAO::TypeCode::Union<char const *,
-                     CORBA::TypeCode_ptr const *,
-                     TAO::TypeCode::Case<char const *,
-                                         CORBA::TypeCode_ptr const *> const * const *,
-                     TAO::Null_RefCount_Policy>::member_type_i (
-  CORBA::ULong index
-  ACE_ENV_ARG_DECL) const
-{
-  if (index >= this->ncases_)
-    ACE_THROW_RETURN (CORBA::TypeCode::Bounds (),
-                      CORBA::TypeCode::_nil ());
-
-  return CORBA::TypeCode::_duplicate (this->cases_[index]->type ());
-}
-
-CORBA::Any *
-TAO::TypeCode::Union<char const *,
-                     CORBA::TypeCode_ptr const *,
-                     TAO::TypeCode::Case<char const *,
-                                         CORBA::TypeCode_ptr const *> const * const *,
-                     TAO::Null_RefCount_Policy>::member_label_i (
-  CORBA::ULong index
-  ACE_ENV_ARG_DECL) const
-{
-  if (index >= this->ncases_)
-    ACE_THROW_RETURN (CORBA::TypeCode::Bounds (),
-                      0);
-
-  // Default case.
-  if (this->default_index_ > -1
-      && static_cast<CORBA::ULong> (this->default_index_) == index)
-    {
-      CORBA::Any * any;
-      ACE_NEW_THROW_EX (any,
-                        CORBA::Any,
-                        CORBA::NO_MEMORY ());
-      ACE_CHECK_RETURN (0);
-
-      CORBA::Any_var safe_any (any);
-
-      // Default case's label is a zero octet.
-      CORBA::Any::from_octet const zero_octet (0);
-
-      // Default case/member has a zero octet label value.
-      (*any) <<= zero_octet;
-
-      return safe_any._retn ();
-    }
-
-  // Non-default cases.
-  return this->cases_[index]->label (ACE_ENV_SINGLE_ARG_PARAMETER);
-}
-
-CORBA::TypeCode_ptr
-TAO::TypeCode::Union<char const *,
-                     CORBA::TypeCode_ptr const *,
-                     TAO::TypeCode::Case<char const *,
-                                         CORBA::TypeCode_ptr const *> const * const *,
-                     TAO::Null_RefCount_Policy>::discriminator_type_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  return
-    CORBA::TypeCode::_duplicate (
-      Traits<char const *>::get_typecode (this->discriminant_type_));
-}
-
-CORBA::Long
-TAO::TypeCode::Union<char const *,
-                     CORBA::TypeCode_ptr const *,
-                     TAO::TypeCode::Case<char const *,
-                                         CORBA::TypeCode_ptr const *> const * const *,
-                     TAO::Null_RefCount_Policy>::default_index_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  return this->default_index_;
-}
diff --git a/TAO/tao/Union_TypeCode_Static.h b/TAO/tao/Union_TypeCode_Static.h
deleted file mode 100644
index 60bc6a77364..00000000000
--- a/TAO/tao/Union_TypeCode_Static.h
+++ /dev/null
@@ -1,169 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Union_TypeCode_Static.h
- *
- *  $Id$
- *
- *  Header file for a static @c tk_union CORBA::TypeCode.
- *
- *  @author Ossama Othman
- */
-//=============================================================================
-
-#ifndef TAO_UNION_TYPECODE_STATIC_H
-#define TAO_UNION_TYPECODE_STATIC_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/TypeCode.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TypeCode_Base_Attributes.h"
-#include "tao/Null_RefCount_Policy.h"
-
-
-namespace TAO
-{
-  namespace TypeCode
-  {
-    template <typename StringType,
-              typename TypeCodeType,
-              class CaseArrayType,
-              class RefCountPolicy> class Union;
-    template <typename StringType, typename TypeCodeType> class Case;
-    /**
-     * @class Union
-     *
-     * @brief @c CORBA::TypeCode implementation for an OMG IDL
-     *        @c union.
-     *
-     * This class implements a @c CORBA::TypeCode for an OMG IDL
-     * @c union.
-     */
-    template<>
-    class TAO_Export Union<char const *,
-                           CORBA::TypeCode_ptr const *,
-                           Case<char const *,
-                                CORBA::TypeCode_ptr const *> const * const *,
-                           TAO::Null_RefCount_Policy>
-      : public CORBA::TypeCode,
-        private TAO::Null_RefCount_Policy
-    {
-    public:
-
-      /// @typedef Type of individual case array element, not the
-      ///          array itself.
-      typedef TAO::TypeCode::Case<char const *,
-                                  CORBA::TypeCode_ptr const *> case_type;
-
-      /// Constructor.
-      Union (char const * id,
-             char const * name,
-             CORBA::TypeCode_ptr const * discriminant_type,
-             Case<char const *,
-                  CORBA::TypeCode_ptr const *> const * const * cases,
-             CORBA::ULong ncases,
-             CORBA::Long default_index);
-
-      /**
-       * @name TAO-specific @c CORBA::TypeCode Methods
-       *
-       * Methods required by TAO's implementation of the
-       * @c CORBA::TypeCode class.
-       *
-       * @see @c CORBA::TypeCode
-       */
-      //@{
-      virtual bool tao_marshal (TAO_OutputCDR & cdr,
-                                CORBA::ULong offset) const;
-      virtual void tao_duplicate (void);
-      virtual void tao_release (void);
-      //@}
-
-    protected:
-
-      /**
-       * @name @c TAO CORBA::TypeCode Template Methods
-       *
-       * @c tk_union @c CORBA::TypeCode -specific template methods.
-       *
-       * @see @c CORBA::TypeCode
-       */
-      //@{
-      virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc
-                                      ACE_ENV_ARG_DECL) const;
-      virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc
-                                           ACE_ENV_ARG_DECL) const;
-      virtual CORBA::TypeCode_ptr get_compact_typecode_i (
-        ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual char const * id_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual char const * name_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual CORBA::ULong member_count_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual char const * member_name_i (CORBA::ULong index
-                                          ACE_ENV_ARG_DECL) const;
-      virtual CORBA::TypeCode_ptr member_type_i (CORBA::ULong index
-                                                 ACE_ENV_ARG_DECL) const;
-      virtual CORBA::Any * member_label_i (CORBA::ULong index
-                                           ACE_ENV_ARG_DECL) const;
-      virtual CORBA::TypeCode_ptr discriminator_type_i (
-        ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual CORBA::Long default_index_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      //@}
-
-    private:
-
-      /**
-       * @c Union Attributes
-       *
-       * Attributes representing the structure of an OMG IDL
-       * @c union.
-       *
-       * @note These attributes are declared in the order in which
-       *       they are marshaled into a CDR stream in order to
-       *       increase cache hits by improving spatial locality.
-       */
-      //@{
-
-      /// Base attributes containing repository ID and name of
-      /// union type.
-      Base_Attributes<char const *> const base_attributes_;
-
-      /// Type of IDL @c union discriminant.
-      CORBA::TypeCode_ptr const * const discriminant_type_;
-
-      /// Index of the default union case.
-      /**
-       * This value will be -1 if no default case is found in the
-       * union.
-       */
-      CORBA::Long const default_index_;
-
-      /// The number of cases in the OMG IDL union, excluding the
-      /// @c default case.
-      CORBA::ULong const ncases_;
-
-      /// Array of @c TAO::TypeCode::Case representing structure of
-      /// the OMG IDL defined @c union.
-      Case<char const *,
-           CORBA::TypeCode_ptr const *> const * const * const cases_;
-
-      //@}
-
-    };
-
-  }  // End namespace TypeCode
-}  // End namespace TAO
-
-
-#ifdef __ACE_INLINE__
-# include "tao/Union_TypeCode_Static.inl"
-#endif  /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_UNION_TYPECODE_STATIC_H */
diff --git a/TAO/tao/Union_TypeCode_Static.inl b/TAO/tao/Union_TypeCode_Static.inl
deleted file mode 100644
index 019a8ba2a2f..00000000000
--- a/TAO/tao/Union_TypeCode_Static.inl
+++ /dev/null
@@ -1,25 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-ACE_INLINE
-TAO::TypeCode::Union<char const *,
-                     CORBA::TypeCode_ptr const *,
-                     TAO::TypeCode::Case<char const *,
-                                         CORBA::TypeCode_ptr const *> const * const *,
-                     TAO::Null_RefCount_Policy>::Union (
-  char const * id,
-  char const * name,
-  CORBA::TypeCode_ptr const * discriminant_type,
-  Case<char const *, CORBA::TypeCode_ptr const *> const * const * cases,
-  CORBA::ULong ncases,
-  CORBA::Long default_index)
-  : CORBA::TypeCode (CORBA::tk_union)
-  , ACE_NESTED_CLASS (TAO, Null_RefCount_Policy) ()
-  , base_attributes_ (id, name)
-  , discriminant_type_ (discriminant_type)
-  , default_index_ (default_index)
-  , ncases_ (ncases)
-  , cases_ (cases)
-{
-}
diff --git a/TAO/tao/UserException.cpp b/TAO/tao/UserException.cpp
index 73bc0efb5b8..241852cddae 100644
--- a/TAO/tao/UserException.cpp
+++ b/TAO/tao/UserException.cpp
@@ -36,14 +36,6 @@ CORBA::UserException::operator= (CORBA::UserException const & rhs)
   return *this;
 }
 
-int
-CORBA::UserException::_is_a (char const * interface_id) const
-{
-  return ACE_OS::strcmp (interface_id,
-                         "IDL:omg.org/CORBA/UserException:1.0") == 0
-    || this->Exception::_is_a (interface_id);
-}
-
 ACE_CString
 CORBA::UserException::_info (void) const
 {
diff --git a/TAO/tao/UserException.h b/TAO/tao/UserException.h
index 80b1c85ee1a..79aa80e8766 100644
--- a/TAO/tao/UserException.h
+++ b/TAO/tao/UserException.h
@@ -18,12 +18,13 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/Exception.h"
+#include "tao/TAO_Export.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/Exception.h"
 
 namespace CORBA
 {
@@ -43,7 +44,7 @@ namespace CORBA
     UserException (UserException const & rhs);
 
     /// Destructor.
-    ~UserException (void);
+    virtual ~UserException (void);
 
     /// Assignment operator.
     UserException & operator= (UserException const & rhs);
@@ -57,21 +58,19 @@ namespace CORBA
 
     virtual void _raise (void) const = 0;
 
+    virtual CORBA::TypeCode_ptr _tao_type (void) const;
+
     // = TAO specific extension.
 
     /// Constructor from a repository id.
     UserException (char const * repository_id,
                    char const * local_name);
 
-    virtual int _is_a (char const * interface_id) const;
-
-    // Used for narrowing
-
     /// Returns a string containing information about the exception. This
     /// function is not CORBA compliant.
     virtual ACE_CString _info (void) const;
 
-    //protected:
+    //protected: // when msvc6 is dropped we can make this protected
     /// Default constructor.
     UserException (void);
 
diff --git a/TAO/tao/UserException.inl b/TAO/tao/UserException.inl
index 4b3730615c8..a8ca0e78f23 100644
--- a/TAO/tao/UserException.inl
+++ b/TAO/tao/UserException.inl
@@ -19,3 +19,9 @@ CORBA::UserException::_downcast (CORBA::Exception const * exception)
 {
   return dynamic_cast<const CORBA::UserException *> (exception);
 }
+
+ACE_INLINE CORBA::TypeCode_ptr
+CORBA::UserException::_tao_type (void) const
+{
+  return 0;
+}
diff --git a/TAO/tao/Utils.mpc b/TAO/tao/Utils.mpc
index 1e7a57b467c..d5f8308c9a6 100644
--- a/TAO/tao/Utils.mpc
+++ b/TAO/tao/Utils.mpc
@@ -26,6 +26,9 @@ project : taolib, core, portableserver, pi {
   PIDL_Files {
   }
 
+  IDL_Files {
+  }
+
   Pkgconfig_Files {
     TAO_Utils.pc.in
   }
diff --git a/TAO/tao/ValueModifier.pidl b/TAO/tao/ValueModifier.pidl
deleted file mode 100644
index 4cd346c5049..00000000000
--- a/TAO/tao/ValueModifier.pidl
+++ /dev/null
@@ -1,36 +0,0 @@
-// -*- IDL -*-
-
-// ================================================================
-/**
- *  @file   ValueModifier.pidl
- *
- * $Id$
- *
- *   This file was used to generate the code in ValueModifierC.* The command
- *   used to generate code is:
- *
- *     tao_idl
- *        -o orig -Ge 1 -Sc -SS -Sci -St
- *          -Wb,export_macro=TAO_Export
- *          -Wb,export_include="tao/TAO_Export.h"
- *          -Wb,pre_include="ace/pre.h"
- *          -Wb,post_include="ace/post.h"
- *          ValueModifier.pidl
- */
-// ================================================================
-
-#ifndef TAO_VALUEMODIFIER_PIDL
-#define TAO_VALUEMODIFIER_PIDL
-
-#pragma prefix "omg.org"
-
-module CORBA
-{
-  typedef short ValueModifier;
-  const ValueModifier VM_NONE = 0;
-  const ValueModifier VM_CUSTOM = 1;
-  const ValueModifier VM_ABSTRACT = 2;
-  const ValueModifier VM_TRUNCATABLE = 3;
-};
-
-#endif /* TAO_VALUEMODIFIER_PIDL */
diff --git a/TAO/tao/ValueModifierS.h b/TAO/tao/ValueModifierS.h
deleted file mode 100644
index 17b1360599e..00000000000
--- a/TAO/tao/ValueModifierS.h
+++ /dev/null
@@ -1,28 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// Skeleton file generation suppressed with command line option -SS
diff --git a/TAO/tao/Value_TypeCode.cpp b/TAO/tao/Value_TypeCode.cpp
deleted file mode 100644
index 310cec78183..00000000000
--- a/TAO/tao/Value_TypeCode.cpp
+++ /dev/null
@@ -1,463 +0,0 @@
-// $Id$
-
-#ifndef TAO_VALUE_TYPECODE_CPP
-#define TAO_VALUE_TYPECODE_CPP
-
-#include "tao/Value_TypeCode.h"
-#include "tao/TypeCode_Value_Field.h"
-#include "tao/CDR.h"
-
-#include "tao/ORB_Core.h"
-#include "tao/TypeCodeFactory_Adapter.h"
-
-#include "ace/Dynamic_Service.h"
-
-#ifndef __ACE_INLINE__
-# include "tao/Value_TypeCode.inl"
-#endif  /* !__ACE_INLINE__ */
-
-
-template <typename StringType,
-          typename TypeCodeType,
-          class FieldArrayType,
-          class RefCountPolicy>
-bool
-TAO::TypeCode::Value<StringType,
-                     TypeCodeType,
-                     FieldArrayType,
-                     RefCountPolicy>::tao_marshal (
-  TAO_OutputCDR & cdr,
-  CORBA::ULong offset) const
-{
-  // A tk_value TypeCode has a "complex" parameter list type (see
-  // Table 15-2 in Section 15.3.5.1 "TypeCode" in the CDR section of
-  // the CORBA specification), meaning that it must be marshaled into
-  // a CDR encapsulation.
-
-  // Create a CDR encapsulation.
-  TAO_OutputCDR enc;
-
-  // Account for the encoded CDR encapsulation length and byte order.
-  //
-  // Aligning on an octet since the next value after the CDR
-  // encapsulation length will always be the byte order octet/boolean
-  // in this case.
-  offset = ACE_align_binary (offset + 4,
-                             ACE_CDR::OCTET_ALIGN);
-
-  bool const success =
-    (enc << TAO_OutputCDR::from_boolean (TAO_ENCAP_BYTE_ORDER))
-    && (enc << TAO_OutputCDR::from_string (this->base_attributes_.id (), 0))
-    && (enc << TAO_OutputCDR::from_string (this->base_attributes_.name (), 0))
-    && (enc << this->type_modifier_)
-    && marshal (enc,
-                Traits<StringType>::get_typecode (this->concrete_base_),
-                offset + enc.total_length ())
-    && (enc << this->nfields_);
-
-  if (!success)
-    return false;
-
-  Value_Field<StringType, TypeCodeType> const * const begin =
-    &this->fields_[0];
-  Value_Field<StringType, TypeCodeType> const * const end =
-    begin + this->nfields_;
-
-  for (Value_Field<StringType, TypeCodeType> const * i = begin; i != end; ++i)
-    {
-      Value_Field<StringType, TypeCodeType> const & field = *i;
-
-      if (!(enc << Traits<StringType>::get_string (field.name))
-          || !marshal (enc,
-                       Traits<StringType>::get_typecode (field.type),
-                       offset + enc.total_length ())
-          || !(enc << field.visibility))
-        return false;
-    }
-
-  return
-    cdr << static_cast<CORBA::ULong> (enc.total_length ())
-    && cdr.write_octet_array_mb (enc.begin ());
-}
-
-template <typename StringType,
-          typename TypeCodeType,
-          class FieldArrayType,
-          class RefCountPolicy>
-void
-TAO::TypeCode::Value<StringType,
-                     TypeCodeType,
-                     FieldArrayType,
-                     RefCountPolicy>::tao_duplicate (void)
-{
-  this->RefCountPolicy::add_ref ();
-}
-
-template <typename StringType,
-          typename TypeCodeType,
-          class FieldArrayType,
-          class RefCountPolicy>
-void
-TAO::TypeCode::Value<StringType,
-                     TypeCodeType,
-                     FieldArrayType,
-                     RefCountPolicy>::tao_release (void)
-{
-  this->RefCountPolicy::remove_ref ();
-}
-
-template <typename StringType,
-          typename TypeCodeType,
-          class FieldArrayType,
-          class RefCountPolicy>
-CORBA::Boolean
-TAO::TypeCode::Value<StringType,
-                     TypeCodeType,
-                     FieldArrayType,
-                     RefCountPolicy>::equal_i (
-  CORBA::TypeCode_ptr tc
-  ACE_ENV_ARG_DECL) const
-{
-  // None of these calls should throw since CORBA::TypeCode::equal()
-  // verified that the TCKind is the same as our's prior to invoking
-  // this method.
-
-  CORBA::ValueModifier const tc_type_modifier =
-    tc->type_modifier (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (tc_type_modifier != this->type_modifier_)
-    return 0;
-
-  CORBA::TypeCode_var rhs_concrete_base_type =
-    tc->concrete_base_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  CORBA::Boolean const equal_concrete_base_types =
-    this->equal (rhs_concrete_base_type.in ()
-                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (!equal_concrete_base_types)
-    return 0;
-
-  CORBA::ULong const tc_nfields =
-    tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (tc_nfields != this->nfields_)
-    return 0;
-
-  for (CORBA::ULong i = 0; i < this->nfields_; ++i)
-    {
-      Value_Field<StringType, TypeCodeType> const & lhs_field =
-        this->fields_[i];
-
-      CORBA::Visibility const lhs_visibility = lhs_field.visibility;
-      CORBA::Visibility const rhs_visibility =
-        tc->member_visibility (i
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      if (lhs_visibility != rhs_visibility)
-        return 0;
-
-      char const * const lhs_name =
-        Traits<StringType>::get_string (lhs_field.name);;
-      char const * const rhs_name = tc->member_name (i
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      if (ACE_OS::strcmp (lhs_name, rhs_name) != 0)
-        return 0;
-
-      CORBA::TypeCode_ptr const lhs_tc =
-        Traits<StringType>::get_typecode (lhs_field.type);
-      CORBA::TypeCode_var const rhs_tc =
-        tc->member_type (i
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      CORBA::Boolean const equal_members =
-        lhs_tc->equal (rhs_tc.in ()
-                       ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      if (!equal_members)
-        return 0;
-    }
-
-  return 1;
-}
-
-template <typename StringType,
-          typename TypeCodeType,
-          class FieldArrayType,
-          class RefCountPolicy>
-CORBA::Boolean
-TAO::TypeCode::Value<StringType,
-                     TypeCodeType,
-                     FieldArrayType,
-                     RefCountPolicy>::equivalent_i (
-  CORBA::TypeCode_ptr tc
-  ACE_ENV_ARG_DECL) const
-{
-  CORBA::ValueModifier const tc_type_modifier =
-    tc->type_modifier (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (tc_type_modifier != this->type_modifier_)
-    return 0;
-
-  CORBA::TypeCode_var rhs_concrete_base_type =
-    tc->concrete_base_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  CORBA::Boolean const equivalent_concrete_base_types =
-    this->equivalent (rhs_concrete_base_type.in ()
-                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (!equivalent_concrete_base_types)
-    return 0;
-
-  // Perform a structural comparison, excluding the name() and
-  // member_name() operations.
-
-  CORBA::ULong const tc_nfields =
-    tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (tc_nfields != this->nfields_)
-    return 0;
-
-  for (CORBA::ULong i = 0; i < this->nfields_; ++i)
-    {
-      Value_Field<StringType, TypeCodeType> const & lhs_field =
-        this->fields_[i];
-
-      CORBA::Visibility const lhs_visibility =
-        lhs_field.visibility;
-      CORBA::Visibility const rhs_visibility =
-        tc->member_visibility (i
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      if (lhs_visibility != rhs_visibility)
-        return 0;
-
-      CORBA::TypeCode_ptr const lhs_tc =
-        Traits<StringType>::get_typecode (lhs_field.type);
-      CORBA::TypeCode_var const rhs_tc =
-        tc->member_type (i
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      CORBA::Boolean const equiv_types =
-        lhs_tc->equivalent (rhs_tc.in ()
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      if (!equiv_types)
-        return 0;
-    }
-
-  return 1;
-}
-
-template <typename StringType,
-          typename TypeCodeType,
-          class FieldArrayType,
-          class RefCountPolicy>
-CORBA::TypeCode_ptr
-TAO::TypeCode::Value<StringType,
-                     TypeCodeType,
-                     FieldArrayType,
-                     RefCountPolicy>::get_compact_typecode_i (
-  ACE_ENV_SINGLE_ARG_DECL) const
-{
-  ACE_Array_Base<Value_Field<CORBA::String_var, CORBA::TypeCode_var> >
-    tc_fields (this->nfields_);
-
-  if (this->nfields_ > 0)
-    {
-      // Dynamically construct a new array of fields stripped of
-      // member names.
-
-      static char const empty_name[] = "";
-
-      for (CORBA::ULong i = 0; i < this->nfields_; ++i)
-        {
-          // Member names will be stripped, i.e. not embedded within
-          // the compact TypeCode.
-
-          tc_fields[i].name = empty_name;
-          tc_fields[i].type =
-            Traits<StringType>::get_typecode (
-              this->fields_[i].type)->get_compact_typecode (
-                ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
-          tc_fields[i].visibility = this->fields_[i].visibility;
-        }
-    }
-
-  TAO_TypeCodeFactory_Adapter * const adapter =
-    ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
-      TAO_ORB_Core::typecodefactory_adapter_name ());
-
-  if (adapter == 0)
-    {
-      ACE_THROW_RETURN (CORBA::INTERNAL (),
-                        CORBA::TypeCode::_nil ());
-    }
-
-  return
-    adapter->create_value_event_tc (
-      this->kind_,
-      this->base_attributes_.id (),
-      "", // empty name
-      this->type_modifier_,
-      Traits<StringType>::get_typecode (this->concrete_base_),
-      tc_fields,
-      this->nfields_
-      ACE_ENV_ARG_PARAMETER);
-}
-
-template <typename StringType,
-          typename TypeCodeType,
-          class FieldArrayType,
-          class RefCountPolicy>
-char const *
-TAO::TypeCode::Value<StringType,
-                     TypeCodeType,
-                     FieldArrayType,
-                     RefCountPolicy>::id_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  // Ownership is retained by the TypeCode, as required by the C++
-  // mapping.
-  return this->base_attributes_.id ();
-}
-
-template <typename StringType,
-          typename TypeCodeType,
-          class FieldArrayType,
-          class RefCountPolicy>
-char const *
-TAO::TypeCode::Value<StringType,
-                     TypeCodeType,
-                     FieldArrayType,
-                     RefCountPolicy>::name_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  // Ownership is retained by the TypeCode, as required by the C++
-  // mapping.
-  return this->base_attributes_.name ();
-}
-
-template <typename StringType,
-          typename TypeCodeType,
-          class FieldArrayType,
-          class RefCountPolicy>
-CORBA::ULong
-TAO::TypeCode::Value<StringType,
-                     TypeCodeType,
-                     FieldArrayType,
-                     RefCountPolicy>::member_count_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  return this->nfields_;
-}
-
-template <typename StringType,
-          typename TypeCodeType,
-          class FieldArrayType,
-          class RefCountPolicy>
-char const *
-TAO::TypeCode::Value<StringType,
-                     TypeCodeType,
-                     FieldArrayType,
-                     RefCountPolicy>::member_name_i (
-  CORBA::ULong index
-  ACE_ENV_ARG_DECL) const
-{
-  // Ownership is retained by the TypeCode, as required by the C++
-  // mapping.
-  if (index >= this->nfields_)
-    ACE_THROW_RETURN (CORBA::TypeCode::Bounds (), 0);
-
-  return Traits<StringType>::get_string (this->fields_[index].name);
-}
-
-template <typename StringType,
-          typename TypeCodeType,
-          class FieldArrayType,
-          class RefCountPolicy>
-CORBA::TypeCode_ptr
-TAO::TypeCode::Value<StringType,
-                     TypeCodeType,
-                     FieldArrayType,
-                     RefCountPolicy>::member_type_i (
-  CORBA::ULong index
-  ACE_ENV_ARG_DECL) const
-{
-  if (index >= this->nfields_)
-    ACE_THROW_RETURN (CORBA::TypeCode::Bounds (),
-                      CORBA::TypeCode::_nil ());
-
-  return
-    CORBA::TypeCode::_duplicate (
-      Traits<StringType>::get_typecode (this->fields_[index].type));
-}
-
-template <typename StringType,
-          typename TypeCodeType,
-          class FieldArrayType,
-          class RefCountPolicy>
-CORBA::Visibility
-TAO::TypeCode::Value<StringType,
-                     TypeCodeType,
-                     FieldArrayType,
-                     RefCountPolicy>::member_visibility_i (
-  CORBA::ULong index
-  ACE_ENV_ARG_DECL) const
-{
-  if (index >= this->nfields_)
-    ACE_THROW_RETURN (CORBA::TypeCode::Bounds (),
-                      CORBA::PRIVATE_MEMBER);
-
-  return this->fields_[index].visibility;
-}
-
-template <typename StringType,
-          typename TypeCodeType,
-          class FieldArrayType,
-          class RefCountPolicy>
-CORBA::ValueModifier
-TAO::TypeCode::Value<StringType,
-                     TypeCodeType,
-                     FieldArrayType,
-                     RefCountPolicy>::type_modifier_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  return this->type_modifier_;
-}
-
-template <typename StringType,
-          typename TypeCodeType,
-          class FieldArrayType,
-          class RefCountPolicy>
-CORBA::TypeCode_ptr
-TAO::TypeCode::Value<StringType,
-                     TypeCodeType,
-                     FieldArrayType,
-                     RefCountPolicy>::concrete_base_type_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  return
-    CORBA::TypeCode::_duplicate (
-      Traits<StringType>::get_typecode (this->concrete_base_));
-}
-
-
-#endif  /* TAO_VALUE_TYPECODE_CPP */
diff --git a/TAO/tao/Value_TypeCode.h b/TAO/tao/Value_TypeCode.h
deleted file mode 100644
index 7bb386579fc..00000000000
--- a/TAO/tao/Value_TypeCode.h
+++ /dev/null
@@ -1,179 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Value_TypeCode.h
- *
- *  $Id$
- *
- *  Header file for a @c tk_value and @c tk_event
- *  @c CORBA::TypeCodes.
- *
- *  @author Ossama Othman <ossama@dre.vanderbilt.edu>
- */
-//=============================================================================
-
-#ifndef TAO_VALUE_TYPECODE_H
-#define TAO_VALUE_TYPECODE_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/TypeCode.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TypeCode_Base_Attributes.h"
-#include "tao/ValueModifierC.h"
-#include "tao/VisibilityC.h"
-
-
-namespace TAO
-{
-  namespace TypeCode
-  {
-    template<typename StringType, typename TypeCodeType> struct Value_Field;
-
-    /**
-     * @class Value
-     *
-     * @brief @c CORBA::TypeCode implementation for an OMG IDL
-     *        @c valuetype or @c event.
-     *
-     * This class implements a @c CORBA::TypeCode for an OMG IDL
-     * @c valuetype or @c event.
-     */
-    template <typename StringType,
-              typename TypeCodeType,
-              class FieldArrayType,
-              class RefCountPolicy>
-    class Value
-      : public CORBA::TypeCode,
-        private RefCountPolicy
-    {
-    public:
-
-      /// Constructor.
-      Value (CORBA::TCKind kind,
-             char const * id,
-             char const * name,
-             CORBA::ValueModifier modifier,
-#if defined (__BORLANDC__) && (__BORLANDC__ < 0x572)
-             // Borland C++ currently can't handle a reference to
-             // const pointer to const CORBA::TypeCode_ptr
-             TypeCodeType concrete_base,
-#else
-             TypeCodeType const & concrete_base,
-#endif
-             FieldArrayType const & fields,
-             CORBA::ULong nfields);
-
-      /// Constructor used for recursive TypeCodes.
-      Value (CORBA::TCKind kind,
-              char const * id);
-
-      /**
-       * @name TAO-specific @c CORBA::TypeCode Methods
-       *
-       * Methods required by TAO's implementation of the
-       * @c CORBA::TypeCode class.
-       *
-       * @see @c CORBA::TypeCode
-       */
-      //@{
-      virtual bool tao_marshal (TAO_OutputCDR & cdr,
-                                CORBA::ULong offset) const;
-      virtual void tao_duplicate (void);
-      virtual void tao_release (void);
-      //@}
-
-    protected:
-
-      /**
-       * @name @c TAO CORBA::TypeCode Template Methods
-       *
-       * @c tk_value or @c tk_event @c CORBA::TypeCode -specific
-       * template methods.
-       *
-       * @see @c CORBA::TypeCode
-       */
-      //@{
-      virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc
-                                      ACE_ENV_ARG_DECL) const;
-      virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc
-                                           ACE_ENV_ARG_DECL) const;
-      virtual CORBA::TypeCode_ptr get_compact_typecode_i (
-        ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual char const * id_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual char const * name_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual CORBA::ULong member_count_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual char const * member_name_i (CORBA::ULong index
-                                          ACE_ENV_ARG_DECL) const;
-      virtual CORBA::TypeCode_ptr member_type_i (CORBA::ULong index
-                                                 ACE_ENV_ARG_DECL) const;
-      virtual CORBA::Visibility member_visibility_i (CORBA::ULong index
-                                                     ACE_ENV_ARG_DECL) const;
-      virtual CORBA::ValueModifier type_modifier_i (
-        ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual CORBA::TypeCode_ptr concrete_base_type_i (
-        ACE_ENV_SINGLE_ARG_DECL) const;
-      //@}
-
-    protected:
-
-      /**
-       * @c Valuetype Attributes
-       *
-       * Attributes representing the structure of an OMG IDL
-       * @c valuetype or @c event.
-       *
-       * @note These attributes are declared in the order in which
-       *       they are marshaled into a CDR stream in order to
-       *       increase cache hits by improving spatial locality.
-       */
-      //@{
-
-      /// Base attributes containing repository ID and name of
-      /// @c valuetype.
-      Base_Attributes<StringType> base_attributes_;
-
-      /// The @c ValueModifier of the @c valuetype of @c eventtype
-      /// represented by this @c TypeCode.
-      CORBA::ValueModifier type_modifier_;
-
-      /// The @c TypeCode corresponding to the concrete base
-      /// @c valuetype or @c eventtype.
-      TypeCodeType concrete_base_;
-
-      /// The number of fields in the OMG IDL value.
-      CORBA::ULong nfields_;
-
-      /// Array of @c TAO::TypeCode fields representing structure of the
-      /// OMG IDL defined @c value.
-      FieldArrayType fields_;
-
-      //@}
-
-    };
-
-  }  // End namespace TypeCode
-}  // End namespace TAO
-
-
-#ifdef __ACE_INLINE__
-# include "tao/Value_TypeCode.inl"
-#endif  /* __ACE_INLINE__ */
-
-#ifdef ACE_TEMPLATES_REQUIRE_SOURCE
-# include "tao/Value_TypeCode.cpp"
-#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */
-
-#ifdef ACE_TEMPLATES_REQUIRE_PRAGMA
-# pragma implementation ("Value_TypeCode.cpp")
-#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */
-
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_VALUE_TYPECODE_H */
diff --git a/TAO/tao/Value_TypeCode.inl b/TAO/tao/Value_TypeCode.inl
deleted file mode 100644
index 9a8b31f0ddb..00000000000
--- a/TAO/tao/Value_TypeCode.inl
+++ /dev/null
@@ -1,57 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-
-template <typename StringType,
-          typename TypeCodeType,
-          class FieldArrayType,
-          class RefCountPolicy>
-ACE_INLINE
-TAO::TypeCode::Value<StringType,
-                     TypeCodeType,
-                     FieldArrayType,
-                     RefCountPolicy>::Value (
-  CORBA::TCKind kind,
-  char const * id,
-  char const * name,
-  CORBA::ValueModifier modifier,
-#if defined (__BORLANDC__) && (__BORLANDC__ < 0x572)
-  // Borland C++ currently can't handle a reference to
-  // const pointer to const CORBA::TypeCode_ptr
-  TypeCodeType concrete_base,
-#else
-  TypeCodeType const & concrete_base,
-#endif
-  FieldArrayType const & fields,
-  CORBA::ULong nfields)
-  : CORBA::TypeCode (kind)
-  , RefCountPolicy ()
-  , base_attributes_ (id, name)
-  , type_modifier_ (modifier)
-  , concrete_base_ (concrete_base)
-  , nfields_ (nfields)
-  , fields_ (fields)
-{
-}
-
-template <typename StringType,
-          typename TypeCodeType,
-          class FieldArrayType,
-          class RefCountPolicy>
-ACE_INLINE
-TAO::TypeCode::Value<StringType,
-                     TypeCodeType,
-                     FieldArrayType,
-                     RefCountPolicy>::Value (
-  CORBA::TCKind kind,
-  char const * id)
-  : CORBA::TypeCode (kind)
-  , RefCountPolicy ()
-  , base_attributes_ (id)
-  , type_modifier_ (CORBA::VM_NONE)
-  , concrete_base_ ()
-  , nfields_ (0)
-  , fields_ ()
-{
-}
diff --git a/TAO/tao/Value_TypeCode_Static.cpp b/TAO/tao/Value_TypeCode_Static.cpp
deleted file mode 100644
index 4820610d9ad..00000000000
--- a/TAO/tao/Value_TypeCode_Static.cpp
+++ /dev/null
@@ -1,422 +0,0 @@
-// $Id$
-
-#include "tao/Value_TypeCode_Static.h"
-#include "tao/TypeCode_Value_Field.h"
-#include "tao/CDR.h"
-
-#include "tao/ORB_Core.h"
-#include "tao/TypeCodeFactory_Adapter.h"
-
-#include "ace/Dynamic_Service.h"
-
-#ifndef __ACE_INLINE__
-# include "tao/Value_TypeCode_Static.inl"
-#endif  /* !__ACE_INLINE__ */
-
-
-ACE_RCSID (tao,
-           Value_TypeCode_Static,
-           "$Id$")
-
-
-bool
-TAO::TypeCode::Value<char const *,
-                     CORBA::TypeCode_ptr const *,
-                     TAO::TypeCode::Value_Field<char const *,
-                                                CORBA::TypeCode_ptr const *> const *,
-                     TAO::Null_RefCount_Policy>::tao_marshal (
-  TAO_OutputCDR & cdr,
-  CORBA::ULong offset) const
-{
-  // A tk_value TypeCode has a "complex" parameter list type (see
-  // Table 15-2 in Section 15.3.5.1 "TypeCode" in the CDR section of
-  // the CORBA specification), meaning that it must be marshaled into
-  // a CDR encapsulation.
-
-  // Create a CDR encapsulation.
-  TAO_OutputCDR enc;
-
-  // Account for the encoded CDR encapsulation length and byte order.
-  //
-  // Aligning on an octet since the next value after the CDR
-  // encapsulation length will always be the byte order octet/boolean
-  // in this case.
-  offset = ACE_align_binary (offset + 4,
-                             ACE_CDR::OCTET_ALIGN);
-
-  bool const success =
-    (enc << TAO_OutputCDR::from_boolean (TAO_ENCAP_BYTE_ORDER))
-    && (enc << TAO_OutputCDR::from_string (this->base_attributes_.id (), 0))
-    && (enc << TAO_OutputCDR::from_string (this->base_attributes_.name (), 0))
-    && (enc << this->type_modifier_)
-    && marshal (enc,
-                Traits<char const *>::get_typecode (this->concrete_base_),
-                offset + enc.total_length ())
-    && (enc << this->nfields_);
-
-  if (!success)
-    return false;
-
-  Value_Field<char const *, CORBA::TypeCode_ptr const *> const * const begin =
-    &this->fields_[0];
-  Value_Field<char const *, CORBA::TypeCode_ptr const *> const * const end =
-    begin + this->nfields_;
-
-  for (Value_Field<char const *, CORBA::TypeCode_ptr const *> const * i =
-         begin;
-       i != end;
-       ++i)
-    {
-      Value_Field<char const *, CORBA::TypeCode_ptr const *> const & field = *i;
-
-      if (!(enc << Traits<char const *>::get_string (field.name))
-          || !marshal (enc,
-                       Traits<char const *>::get_typecode (field.type),
-                       offset + enc.total_length ())
-          || !(enc << field.visibility))
-        return false;
-    }
-
-  return
-    cdr << static_cast<CORBA::ULong> (enc.total_length ())
-    && cdr.write_octet_array_mb (enc.begin ());
-}
-
-void
-TAO::TypeCode::Value<char const *,
-                     CORBA::TypeCode_ptr const *,
-                     TAO::TypeCode::Value_Field<char const *,
-                                                CORBA::TypeCode_ptr const *> const *,
-                     TAO::Null_RefCount_Policy>::tao_duplicate (void)
-{
-}
-
-void
-TAO::TypeCode::Value<char const *,
-                     CORBA::TypeCode_ptr const *,
-                     TAO::TypeCode::Value_Field<char const *,
-                                                CORBA::TypeCode_ptr const *> const *,
-                     TAO::Null_RefCount_Policy>::tao_release (void)
-{
-}
-
-CORBA::Boolean
-TAO::TypeCode::Value<char const *,
-                     CORBA::TypeCode_ptr const *,
-                     TAO::TypeCode::Value_Field<char const *,
-                                                CORBA::TypeCode_ptr const *> const *,
-                     TAO::Null_RefCount_Policy>::equal_i (
-  CORBA::TypeCode_ptr tc
-  ACE_ENV_ARG_DECL) const
-{
-  // None of these calls should throw since CORBA::TypeCode::equal()
-  // verified that the TCKind is the same as our's prior to invoking
-  // this method.
-
-  CORBA::ValueModifier const tc_type_modifier =
-    tc->type_modifier (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (tc_type_modifier != this->type_modifier_)
-    return 0;
-
-  CORBA::TypeCode_var rhs_concrete_base_type =
-    tc->concrete_base_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  CORBA::Boolean const equal_concrete_base_types =
-    this->equal (rhs_concrete_base_type.in ()
-                 ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (!equal_concrete_base_types)
-    return 0;
-
-  CORBA::ULong const tc_nfields =
-    tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (tc_nfields != this->nfields_)
-    return 0;
-
-  for (CORBA::ULong i = 0; i < this->nfields_; ++i)
-    {
-      Value_Field<char const *, CORBA::TypeCode_ptr const *> const & lhs_field =
-        this->fields_[i];
-
-      CORBA::Visibility const lhs_visibility = lhs_field.visibility;
-      CORBA::Visibility const rhs_visibility =
-        tc->member_visibility (i
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      if (lhs_visibility != rhs_visibility)
-        return 0;
-
-      char const * const lhs_name =
-        Traits<char const *>::get_string (lhs_field.name);;
-      char const * const rhs_name = tc->member_name (i
-                                                     ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      if (ACE_OS::strcmp (lhs_name, rhs_name) != 0)
-        return 0;
-
-      CORBA::TypeCode_ptr const lhs_tc =
-        Traits<char const *>::get_typecode (lhs_field.type);
-      CORBA::TypeCode_var const rhs_tc =
-        tc->member_type (i
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      CORBA::Boolean const equal_members =
-        lhs_tc->equal (rhs_tc.in ()
-                       ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      if (!equal_members)
-        return 0;
-    }
-
-  return 1;
-}
-
-CORBA::Boolean
-TAO::TypeCode::Value<char const *,
-                     CORBA::TypeCode_ptr const *,
-                     TAO::TypeCode::Value_Field<char const *,
-                                                CORBA::TypeCode_ptr const *> const *,
-                     TAO::Null_RefCount_Policy>::equivalent_i (
-  CORBA::TypeCode_ptr tc
-  ACE_ENV_ARG_DECL) const
-{
-  CORBA::ValueModifier const tc_type_modifier =
-    tc->type_modifier (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (tc_type_modifier != this->type_modifier_)
-    return 0;
-
-  CORBA::TypeCode_var rhs_concrete_base_type =
-    tc->concrete_base_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  CORBA::Boolean const equivalent_concrete_base_types =
-    this->equivalent (rhs_concrete_base_type.in ()
-                      ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (!equivalent_concrete_base_types)
-    return 0;
-
-  // Perform a structural comparison, excluding the name() and
-  // member_name() operations.
-
-  CORBA::ULong const tc_nfields =
-    tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (0);
-
-  if (tc_nfields != this->nfields_)
-    return 0;
-
-  for (CORBA::ULong i = 0; i < this->nfields_; ++i)
-    {
-      Value_Field<char const *,
-                  CORBA::TypeCode_ptr const *> const & lhs_field =
-        this->fields_[i];
-
-      CORBA::Visibility const lhs_visibility =
-        lhs_field.visibility;
-      CORBA::Visibility const rhs_visibility =
-        tc->member_visibility (i
-                               ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      if (lhs_visibility != rhs_visibility)
-        return 0;
-
-      CORBA::TypeCode_ptr const lhs_tc =
-        Traits<char const *>::get_typecode (lhs_field.type);
-      CORBA::TypeCode_var const rhs_tc =
-        tc->member_type (i
-                         ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      CORBA::Boolean const equiv_types =
-        lhs_tc->equivalent (rhs_tc.in ()
-                            ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (0);
-
-      if (!equiv_types)
-        return 0;
-    }
-
-  return 1;
-}
-
-CORBA::TypeCode_ptr
-TAO::TypeCode::Value<char const *,
-                     CORBA::TypeCode_ptr const *,
-                     TAO::TypeCode::Value_Field<char const *,
-                                                CORBA::TypeCode_ptr const *> const *,
-                     TAO::Null_RefCount_Policy>::get_compact_typecode_i (
-  ACE_ENV_SINGLE_ARG_DECL) const
-{
-  ACE_Array_Base<Value_Field<CORBA::String_var, CORBA::TypeCode_var> >
-    tc_fields (this->nfields_);
-
-  if (this->nfields_ > 0)
-    {
-      // Dynamically construct a new array of fields stripped of
-      // member names.
-
-      static char const empty_name[] = "";
-
-      for (CORBA::ULong i = 0; i < this->nfields_; ++i)
-        {
-          // Member names will be stripped, i.e. not embedded within
-          // the compact TypeCode.
-
-          tc_fields[i].name = empty_name;
-          tc_fields[i].type =
-            Traits<char const *>::get_typecode (
-              this->fields_[i].type)->get_compact_typecode (
-                ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
-          tc_fields[i].visibility = this->fields_[i].visibility;
-        }
-    }
-
-  TAO_TypeCodeFactory_Adapter * const adapter =
-    ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance (
-      TAO_ORB_Core::typecodefactory_adapter_name ());
-
-  if (adapter == 0)
-    {
-      ACE_THROW_RETURN (CORBA::INTERNAL (),
-                        CORBA::TypeCode::_nil ());
-    }
-
-  return
-    adapter->create_value_event_tc (
-      this->kind_,
-      this->base_attributes_.id (),
-      "", // empty name
-      this->type_modifier_,
-      Traits<char const *>::get_typecode (this->concrete_base_),
-      tc_fields,
-      this->nfields_
-      ACE_ENV_ARG_PARAMETER);
-}
-
-char const *
-TAO::TypeCode::Value<char const *,
-                     CORBA::TypeCode_ptr const *,
-                     TAO::TypeCode::Value_Field<char const *,
-                                                CORBA::TypeCode_ptr const *> const *,
-                     TAO::Null_RefCount_Policy>::id_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  // Ownership is retained by the TypeCode, as required by the C++
-  // mapping.
-  return this->base_attributes_.id ();
-}
-
-char const *
-TAO::TypeCode::Value<char const *,
-                     CORBA::TypeCode_ptr const *,
-                     TAO::TypeCode::Value_Field<char const *,
-                                                CORBA::TypeCode_ptr const *> const *,
-                     TAO::Null_RefCount_Policy>::name_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  // Ownership is retained by the TypeCode, as required by the C++
-  // mapping.
-  return this->base_attributes_.name ();
-}
-
-CORBA::ULong
-TAO::TypeCode::Value<char const *,
-                     CORBA::TypeCode_ptr const *,
-                     TAO::TypeCode::Value_Field<char const *,
-                                                CORBA::TypeCode_ptr const *> const *,
-                     TAO::Null_RefCount_Policy>::member_count_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  return this->nfields_;
-}
-
-char const *
-TAO::TypeCode::Value<char const *,
-                     CORBA::TypeCode_ptr const *,
-                     TAO::TypeCode::Value_Field<char const *,
-                                                CORBA::TypeCode_ptr const *> const *,
-                     TAO::Null_RefCount_Policy>::member_name_i (
-  CORBA::ULong index
-  ACE_ENV_ARG_DECL) const
-{
-  // Ownership is retained by the TypeCode, as required by the C++
-  // mapping.
-  if (index >= this->nfields_)
-    ACE_THROW_RETURN (CORBA::TypeCode::Bounds (), 0);
-
-  return Traits<char const *>::get_string (this->fields_[index].name);
-}
-
-CORBA::TypeCode_ptr
-TAO::TypeCode::Value<char const *,
-                     CORBA::TypeCode_ptr const *,
-                     TAO::TypeCode::Value_Field<char const *,
-                                                CORBA::TypeCode_ptr const *> const *,
-                     TAO::Null_RefCount_Policy>::member_type_i (
-  CORBA::ULong index
-  ACE_ENV_ARG_DECL) const
-{
-  if (index >= this->nfields_)
-    ACE_THROW_RETURN (CORBA::TypeCode::Bounds (),
-                      CORBA::TypeCode::_nil ());
-
-  return
-    CORBA::TypeCode::_duplicate (
-      Traits<char const *>::get_typecode (this->fields_[index].type));
-}
-
-CORBA::Visibility
-TAO::TypeCode::Value<char const *,
-                     CORBA::TypeCode_ptr const *,
-                     TAO::TypeCode::Value_Field<char const *,
-                                                CORBA::TypeCode_ptr const *> const *,
-                     TAO::Null_RefCount_Policy>::member_visibility_i (
-  CORBA::ULong index
-  ACE_ENV_ARG_DECL) const
-{
-  if (index >= this->nfields_)
-    ACE_THROW_RETURN (CORBA::TypeCode::Bounds (),
-                      CORBA::PRIVATE_MEMBER);
-
-  return this->fields_[index].visibility;
-}
-
-CORBA::ValueModifier
-TAO::TypeCode::Value<char const *,
-                     CORBA::TypeCode_ptr const *,
-                     TAO::TypeCode::Value_Field<char const *,
-                                                CORBA::TypeCode_ptr const *> const *,
-                     TAO::Null_RefCount_Policy>::type_modifier_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  return this->type_modifier_;
-}
-
-CORBA::TypeCode_ptr
-TAO::TypeCode::Value<char const *,
-                     CORBA::TypeCode_ptr const *,
-                     TAO::TypeCode::Value_Field<char const *,
-                                                CORBA::TypeCode_ptr const *> const *,
-                     TAO::Null_RefCount_Policy>::concrete_base_type_i (
-  ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const
-{
-  return
-    CORBA::TypeCode::_duplicate (
-      Traits<char const *>::get_typecode (this->concrete_base_));
-}
diff --git a/TAO/tao/Value_TypeCode_Static.h b/TAO/tao/Value_TypeCode_Static.h
deleted file mode 100644
index 4c44af4d5d0..00000000000
--- a/TAO/tao/Value_TypeCode_Static.h
+++ /dev/null
@@ -1,168 +0,0 @@
-// -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Value_TypeCode_Static.h
- *
- *  $Id$
- *
- *  Header file for static @c tk_value and @c tk_event
- *  @c CORBA::TypeCodes.
- *
- *  @author Ossama Othman <ossama@dre.vanderbilt.edu>
- */
-//=============================================================================
-
-#ifndef TAO_VALUE_TYPECODE_STATIC_H
-#define TAO_VALUE_TYPECODE_STATIC_H
-
-#include /**/ "ace/pre.h"
-
-#include "tao/TypeCode.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-#include "tao/TypeCode_Base_Attributes.h"
-#include "tao/ValueModifierC.h"
-#include "tao/VisibilityC.h"
-#include "tao/Null_RefCount_Policy.h"
-
-
-namespace TAO
-{
-  namespace TypeCode
-  {
-    template<typename StringType, typename TypeCodeType> struct Value_Field;
-    template <typename StringType,
-              typename TypeCodeType,
-              class FieldArrayType,
-              class RefCountPolicy> class Value;
-
-    /**
-     * @class Value
-     *
-     * @brief @c CORBA::TypeCode implementation for an OMG IDL
-     *        @c valuetype or @c event.
-     *
-     * This class implements a @c CORBA::TypeCode for an OMG IDL
-     * @c valuetype or @c event.
-     */
-    template<>
-    class TAO_Export Value<char const *,
-                           CORBA::TypeCode_ptr const *,
-                           Value_Field<char const *,
-                                       CORBA::TypeCode_ptr const *> const *,
-                           TAO::Null_RefCount_Policy>
-      : public CORBA::TypeCode,
-        private TAO::Null_RefCount_Policy
-    {
-    public:
-
-      /// Constructor.
-      Value (CORBA::TCKind kind,
-             char const * id,
-             char const * name,
-             CORBA::ValueModifier modifier,
-             CORBA::TypeCode_ptr const * concrete_base,
-             Value_Field<char const *,
-                         CORBA::TypeCode_ptr const *> const * fields,
-             CORBA::ULong nfields);
-
-      /**
-       * @name TAO-specific @c CORBA::TypeCode Methods
-       *
-       * Methods required by TAO's implementation of the
-       * @c CORBA::TypeCode class.
-       *
-       * @see @c CORBA::TypeCode
-       */
-      //@{
-      virtual bool tao_marshal (TAO_OutputCDR & cdr,
-                                CORBA::ULong offset) const;
-      virtual void tao_duplicate (void);
-      virtual void tao_release (void);
-      //@}
-
-    protected:
-
-      /**
-       * @name @c TAO CORBA::TypeCode Template Methods
-       *
-       * @c tk_value or @c tk_event @c CORBA::TypeCode -specific
-       * template methods.
-       *
-       * @see @c CORBA::TypeCode
-       */
-      //@{
-      virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc
-                                      ACE_ENV_ARG_DECL) const;
-      virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc
-                                           ACE_ENV_ARG_DECL) const;
-      virtual CORBA::TypeCode_ptr get_compact_typecode_i (
-        ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual char const * id_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual char const * name_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual CORBA::ULong member_count_i (ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual char const * member_name_i (CORBA::ULong index
-                                          ACE_ENV_ARG_DECL) const;
-      virtual CORBA::TypeCode_ptr member_type_i (CORBA::ULong index
-                                                 ACE_ENV_ARG_DECL) const;
-      virtual CORBA::Visibility member_visibility_i (CORBA::ULong index
-                                                     ACE_ENV_ARG_DECL) const;
-      virtual CORBA::ValueModifier type_modifier_i (
-        ACE_ENV_SINGLE_ARG_DECL) const;
-      virtual CORBA::TypeCode_ptr concrete_base_type_i (
-        ACE_ENV_SINGLE_ARG_DECL) const;
-      //@}
-
-    private:
-
-      /**
-       * @c Valuetype Attributes
-       *
-       * Attributes representing the structure of an OMG IDL
-       * @c valuetype or @c event.
-       *
-       * @note These attributes are declared in the order in which
-       *       they are marshaled into a CDR stream in order to
-       *       increase cache hits by improving spatial locality.
-       */
-      //@{
-
-      /// Base attributes containing repository ID and name of
-      /// @c valuetype.
-      Base_Attributes<char const *> const base_attributes_;
-
-      /// The @c ValueModifier of the @c valuetype of @c eventtype
-      /// represented by this @c TypeCode.
-      CORBA::ValueModifier const type_modifier_;
-
-      /// The @c TypeCode corresponding to the concrete base
-      /// @c valuetype or @c eventtype.
-      CORBA::TypeCode_ptr const * const concrete_base_;
-
-      /// The number of fields in the OMG IDL value.
-      CORBA::ULong const nfields_;
-
-      /// Array of @c TAO::TypeCode fields representing structure of the
-      /// OMG IDL defined @c value.
-      Value_Field<char const *,
-                  CORBA::TypeCode_ptr const *> const * const fields_;
-
-      //@}
-
-    };
-
-  }  // End namespace TypeCode
-}  // End namespace TAO
-
-
-#ifdef __ACE_INLINE__
-# include "tao/Value_TypeCode_Static.inl"
-#endif  /* __ACE_INLINE__ */
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_VALUE_TYPECODE_STATIC_H */
diff --git a/TAO/tao/Value_TypeCode_Static.inl b/TAO/tao/Value_TypeCode_Static.inl
deleted file mode 100644
index 70c7d6cf1b1..00000000000
--- a/TAO/tao/Value_TypeCode_Static.inl
+++ /dev/null
@@ -1,26 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-ACE_INLINE
-TAO::TypeCode::Value<char const *,
-                     CORBA::TypeCode_ptr const *,
-                     TAO::TypeCode::Value_Field<char const *,
-                                                CORBA::TypeCode_ptr const *> const *,
-                     TAO::Null_RefCount_Policy>::Value (
-  CORBA::TCKind kind,
-  char const * id,
-  char const * name,
-  CORBA::ValueModifier modifier,
-  CORBA::TypeCode_ptr const * concrete_base,
-  Value_Field<char const *, CORBA::TypeCode_ptr const *> const * fields,
-  CORBA::ULong nfields)
-  : CORBA::TypeCode (kind)
-  , ACE_NESTED_CLASS (TAO, Null_RefCount_Policy) ()
-  , base_attributes_ (id, name)
-  , type_modifier_ (modifier)
-  , concrete_base_ (concrete_base)
-  , nfields_ (nfields)
-  , fields_ (fields)
-{
-}
diff --git a/TAO/tao/Valuetype.mpc b/TAO/tao/Valuetype.mpc
index 3d05f7a1d48..f7605c82852 100644
--- a/TAO/tao/Valuetype.mpc
+++ b/TAO/tao/Valuetype.mpc
@@ -1,5 +1,5 @@
 //$Id$
-project : taolib, core {
+project : taolib, core, anytypecode {
   sharedname    = TAO_Valuetype
   dynamicflags  = TAO_VALUETYPE_BUILD_DLL
 
@@ -26,6 +26,9 @@ project : taolib, core {
   PIDL_Files {
   }
 
+  IDL_Files {
+  }
+
   Pkgconfig_Files {
     Valuetype/TAO_Valuetype.pc.in
   }
diff --git a/TAO/tao/Valuetype/AbstractBase.h b/TAO/tao/Valuetype/AbstractBase.h
index 4ca2a514c75..a57c18bf05d 100644
--- a/TAO/tao/Valuetype/AbstractBase.h
+++ b/TAO/tao/Valuetype/AbstractBase.h
@@ -158,7 +158,9 @@ namespace TAO
     : public Object_Arg_Traits_T<CORBA::AbstractBase_ptr,
                                  CORBA::AbstractBase_var,
                                  CORBA::AbstractBase_out,
-                                 TAO::Objref_Traits<CORBA::AbstractBase> >
+                                 TAO::Objref_Traits<CORBA::AbstractBase>,
+                                 TAO::Any_Insert_Policy_Stream <CORBA::AbstractBase_ptr>
+                                >
   {
   };
 }
diff --git a/TAO/tao/Valuetype/Seq_Tmplinst.cpp b/TAO/tao/Valuetype/Seq_Tmplinst.cpp
deleted file mode 100644
index bd13c67cf9e..00000000000
--- a/TAO/tao/Valuetype/Seq_Tmplinst.cpp
+++ /dev/null
@@ -1,68 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    Seq_Tmplinst.cpp
-//
-// = DESCRIPTION
-//   Explicit instantiation of the TAO sequence template classes for ValueBase
-//   and AbstractBase. These instantiations free us from having to
-//   generate them over and over with the IDL compiler.
-//
-// = AUTHOR
-//     Jeff Parsons <j.parsons@vanderbilt.edu>
-//
-// ============================================================================
-#include "ace/config-all.h"
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) || \
-    defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#include "tao/Sequence_T.h"
-#include "tao/Any.h"
-#include "ValueBase.h"
-#include "AbstractBase.h"
-#include "Sequence_T.h"
-#include "ValueFactory.h"
-#endif /*if ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA*/
-
-ACE_RCSID (Valuetype,
-           Seq_Tmplinst,
-           "$Id$")
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class TAO_Valuetype_Manager<CORBA::ValueBase,
-                                     CORBA::ValueBase_var>;
-
-template class TAO_Unbounded_Valuetype_Sequence<CORBA::ValueBase,
-                                                CORBA::ValueBase_var>;
-
-template class TAO_Unbounded_Pseudo_Sequence<CORBA::AbstractBase>;
-
-template class TAO_Value_Var_T <CORBA::ValueFactoryBase>;
-
-
-template class TAO_Value_Var_T <CORBA::ValueBase>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate TAO_Valuetype_Manager<CORBA::ValueBase,
-                                          CORBA::ValueBase_var,
-                                          CORBA::tao_ValueBase_life>
-#pragma instantiate TAO_Unbounded_Valuetype_Sequence<CORBA::ValueBase, \
-                                                     CORBA::ValueBase_var, \
-                                                     CORBA::tao_ValueBase_life>
-#pragma instantiate TAO_Unbounded_Pseudo_Sequence<CORBA::AbstractBase, \
-                                                  CORBA::AbstractBase_var>
-
-#pragma instantiate TAO_Value_Var_T <CORBA::ValueFactoryBase,
-                                      CORBA::tao_ValueFactoryBase_life>
-
-#pragma instantiate TAO_Value_Var_T <CORBA::ValueBase,
-                                      CORBA::tao_ValueBase_life>
-
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/Valuetype/StringValueC.cpp b/TAO/tao/Valuetype/StringValueC.cpp
index a8cd8a67fbd..d1000576a47 100644
--- a/TAO/tao/Valuetype/StringValueC.cpp
+++ b/TAO/tao/Valuetype/StringValueC.cpp
@@ -32,14 +32,15 @@
 #include "StringValueC.h"
 #include "tao/CDR.h"
 #include "tao/Valuetype/ValueFactory.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/String_TypeCode_Static.h"
-#include "tao/Value_TypeCode_Static.h"
-#include "tao/TypeCode_Value_Field.h"
-#include "tao/Recursive_Type_TypeCode.h"
-#include "tao/Any_Impl_T.h"
+#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
+#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
+#include "tao/AnyTypeCode/String_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Value_TypeCode_Static.h"
+#include "tao/AnyTypeCode/TypeCode_Value_Field.h"
+#include "tao/AnyTypeCode/Recursive_Type_TypeCode.h"
+#include "tao/AnyTypeCode/Any_Impl_T.h"
+#include "tao/AnyTypeCode/Any.h"
 
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
@@ -69,7 +70,7 @@ static TAO::TypeCode::Alias<char const *,
     "IDL:omg.org/CORBA/StringValue:1.0",
     "StringValue",
     &CORBA::_tc_string);
-  
+
 namespace CORBA
 {
   ::CORBA::TypeCode_ptr const _tc_StringValue =
@@ -87,7 +88,7 @@ CORBA::StringValue::_downcast (CORBA::ValueBase *v)
     {
       return 0;
     }
-  
+
   return dynamic_cast< ::CORBA::StringValue * > (v);
 }
 
@@ -100,7 +101,7 @@ CORBA::StringValue::_copy_value (void)
     result,
     StringValue (*this),
     0);
-    
+
   return result;
 }
 
@@ -110,7 +111,7 @@ CORBA::StringValue::_tao_obv_repository_id (void) const
   return this->_tao_obv_static_repository_id ();
 }
 
-CORBA::Boolean 
+CORBA::Boolean
 CORBA::StringValue::_tao_unmarshal (
     TAO_InputCDR &strm,
     StringValue *&vb_object
@@ -125,18 +126,18 @@ CORBA::StringValue::_tao_unmarshal (
     {
       return 0;
     }
-  
+
   vb_object = 0;
   if (is_null_object)
     {
       return 1;
     }
-  
+
   ACE_NEW_RETURN (
     vb_object,
     StringValue,
     0);
-    
+
   return (strm >> vb_object->_pd_value);
 }
 
@@ -153,7 +154,7 @@ static TAO::TypeCode::Alias<char const *,
     "IDL:omg.org/CORBA/WStringValue:1.0",
     "WStringValue",
     &CORBA::_tc_wstring);
-  
+
 namespace CORBA
 {
   ::CORBA::TypeCode_ptr const _tc_WStringValue =
@@ -171,7 +172,7 @@ CORBA::WStringValue::_downcast (CORBA::ValueBase *v)
     {
       return 0;
     }
-  
+
   return dynamic_cast< ::CORBA::WStringValue * > (v);
 }
 
@@ -184,7 +185,7 @@ CORBA::WStringValue::_copy_value (void)
     result,
     WStringValue (*this),
     0);
-    
+
   return result;
 }
 
@@ -194,7 +195,7 @@ CORBA::WStringValue::_tao_obv_repository_id (void) const
   return this->_tao_obv_static_repository_id ();
 }
 
-CORBA::Boolean 
+CORBA::Boolean
 CORBA::WStringValue::_tao_unmarshal (
     TAO_InputCDR &strm,
     WStringValue *&vb_object
@@ -209,18 +210,18 @@ CORBA::WStringValue::_tao_unmarshal (
     {
       return 0;
     }
-  
+
   vb_object = 0;
   if (is_null_object)
     {
       return 1;
     }
-  
+
   ACE_NEW_RETURN (
     vb_object,
     WStringValue,
     0);
-    
+
   return (strm >> vb_object->_pd_value);
 }
 
@@ -415,13 +416,13 @@ operator>> (
   template class
     TAO_Value_Var_T<
         CORBA::StringValue
-        
+
       >;
-  
+
   template class
     TAO_Value_Out_T<
         CORBA::StringValue
-        
+
       >;
 
   template class
@@ -437,13 +438,13 @@ operator>> (
   template class
     TAO_Value_Var_T<
         CORBA::WStringValue
-        
+
       >;
-  
+
   template class
     TAO_Value_Out_T<
         CORBA::WStringValue
-        
+
       >;
 
   template class
@@ -461,13 +462,13 @@ operator>> (
 # pragma instantiate \
     TAO_Value_Var_T< \
         CORBA::StringValue \
-        
+
       >
-  
+
 # pragma instantiate \
     TAO_Value_Out_T< \
         CORBA::StringValue \
-        
+
       >
 
 # pragma instantiate \
@@ -483,13 +484,13 @@ operator>> (
 # pragma instantiate \
     TAO_Value_Var_T< \
         CORBA::WStringValue \
-        
+
       >
-  
+
 # pragma instantiate \
     TAO_Value_Out_T< \
         CORBA::WStringValue \
-        
+
       >
 
 # pragma instantiate \
@@ -497,4 +498,4 @@ operator>> (
         CORBA::WStringValue \
       >
 
-#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ 
+#endif /* !ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/Valuetype/ValueBase.cpp b/TAO/tao/Valuetype/ValueBase.cpp
index 055eea57e58..3c2e8e8a7aa 100644
--- a/TAO/tao/Valuetype/ValueBase.cpp
+++ b/TAO/tao/Valuetype/ValueBase.cpp
@@ -6,9 +6,10 @@
 #include "tao/ORB.h"
 #include "tao/ORB_Core.h"
 #include "tao/debug.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Value_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Null_RefCount_Policy.h"
+#include "tao/AnyTypeCode/Alias_TypeCode_Static.h"
+#include "tao/AnyTypeCode/Value_TypeCode_Static.h"
+#include "tao/AnyTypeCode/TypeCode_Constants.h"
 #include "tao/CDR.h"
 #include "ace/OS_NS_string.h"
 
diff --git a/TAO/tao/Valuetype/ValueBase.h b/TAO/tao/Valuetype/ValueBase.h
index 267f788b990..745bfad5d53 100644
--- a/TAO/tao/Valuetype/ValueBase.h
+++ b/TAO/tao/Valuetype/ValueBase.h
@@ -27,6 +27,7 @@
 
 #include "tao/Object_Argument_T.h"
 #include "tao/Arg_Traits_T.h"
+#include "tao/Any_Insert_Policy_T.h"
 
 #include "ace/Basic_Types.h"
 #include "ace/CORBA_macros.h"
@@ -224,7 +225,9 @@ namespace TAO
     : public Object_Arg_Traits_T<CORBA::ValueBase *,
                                  CORBA::ValueBase_var,
                                  CORBA::ValueBase_out,
-                                 TAO::Value_Traits<CORBA::ValueBase> >
+                                 TAO::Value_Traits<CORBA::ValueBase>,
+                                 TAO::Any_Insert_Policy_Stream <CORBA::ValueBase *>
+                                >
   {
   };
 
diff --git a/TAO/tao/Valuetype_Adapter.cpp b/TAO/tao/Valuetype_Adapter.cpp
index 5c01ab2e031..62594d81764 100644
--- a/TAO/tao/Valuetype_Adapter.cpp
+++ b/TAO/tao/Valuetype_Adapter.cpp
@@ -2,24 +2,11 @@
 
 #include "tao/Valuetype_Adapter.h"
 
-#include "ace/Dynamic_Service.h"
-
-ACE_RCSID (tao, 
-           Valuetype_Adapter, 
+ACE_RCSID (tao,
+           Valuetype_Adapter,
            "$Id$")
 
 TAO_Valuetype_Adapter::~TAO_Valuetype_Adapter (void)
 {
 }
 
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class ACE_Dynamic_Service<TAO_Valuetype_Adapter>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_Dynamic_Service<TAO_Valuetype_Adapter>
-
-#endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
-
-
diff --git a/TAO/tao/Var_Array_Argument_T.cpp b/TAO/tao/Var_Array_Argument_T.cpp
index c6116ff80f1..97d0b014e02 100644
--- a/TAO/tao/Var_Array_Argument_T.cpp
+++ b/TAO/tao/Var_Array_Argument_T.cpp
@@ -4,7 +4,6 @@
 #define TAO_VAR_ARRAY_ARGUMENT_T_C
 
 #include "tao/Var_Array_Argument_T.h"
-#include "tao/Dynamic_ParameterC.h"
 
 #if !defined (__ACE_INLINE__)
 #include "tao/Var_Array_Argument_T.inl"
@@ -14,9 +13,12 @@ ACE_RCSID (tao,
            Var_Array_Argument_T,
            "$Id$")
 
-template<typename S, typename S_slice, typename S_forany>
+template<typename S,
+         typename S_slice,
+         typename S_forany,
+         typename Insert_Policy>
 CORBA::Boolean
-TAO::In_Var_Array_Argument_T<S,S_slice,S_forany>::marshal (
+TAO::In_Var_Array_Argument_T<S,S_slice,S_forany,Insert_Policy>::marshal (
     TAO_OutputCDR & cdr
   )
 {
@@ -25,32 +27,39 @@ TAO::In_Var_Array_Argument_T<S,S_slice,S_forany>::marshal (
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S, typename S_slice, typename S_forany>
+template<typename S,
+         typename S_slice,
+         typename S_forany,
+         typename Insert_Policy>
 void
-TAO::In_Var_Array_Argument_T<S,S_slice,S_forany>::interceptor_param (
-    Dynamic::Parameter & p
-  )
+TAO::In_Var_Array_Argument_T<S,S_slice,S_forany,Insert_Policy>::interceptor_value (
+  CORBA::Any *any) const
 {
-  p.argument <<= this->x_;
-  p.mode = CORBA::PARAM_IN;
+  this->Insert_Policy::any_insert (any, this->x_);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // ===========================================================
 
-template<typename S, typename S_slice, typename S_forany>
+template<typename S,
+         typename S_slice,
+         typename S_forany,
+         typename Insert_Policy>
 CORBA::Boolean
-TAO::Inout_Var_Array_Argument_T<S,S_slice,S_forany>::marshal (
+TAO::Inout_Var_Array_Argument_T<S,S_slice,S_forany,Insert_Policy>::marshal (
     TAO_OutputCDR & cdr
   )
 {
   return cdr << this->x_;
 }
 
-template<typename S, typename S_slice, typename S_forany>
+template<typename S,
+         typename S_slice,
+         typename S_forany,
+         typename Insert_Policy>
 CORBA::Boolean
-TAO::Inout_Var_Array_Argument_T<S,S_slice,S_forany>::demarshal (
+TAO::Inout_Var_Array_Argument_T<S,S_slice,S_forany,Insert_Policy>::demarshal (
     TAO_InputCDR & cdr
   )
 {
@@ -59,14 +68,15 @@ TAO::Inout_Var_Array_Argument_T<S,S_slice,S_forany>::demarshal (
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S, typename S_slice, typename S_forany>
+template<typename S,
+         typename S_slice,
+         typename S_forany,
+         typename Insert_Policy>
 void
-TAO::Inout_Var_Array_Argument_T<S,S_slice,S_forany>::interceptor_param (
-    Dynamic::Parameter & p
-  )
+TAO::Inout_Var_Array_Argument_T<S,S_slice,S_forany,Insert_Policy>::interceptor_value (
+  CORBA::Any *any) const
 {
-  p.argument <<= this->x_;
-  p.mode = CORBA::PARAM_INOUT;
+  this->Insert_Policy::any_insert (any, this->x_);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -78,9 +88,10 @@ template<typename S,
          typename S_var,
          typename S_out,
          typename S_forany,
-         typename S_tag>
+         typename S_tag,
+         typename Insert_Policy>
 CORBA::Boolean
-TAO::Out_Var_Array_Argument_T<S,S_slice,S_var,S_out,S_forany,S_tag>::demarshal (
+TAO::Out_Var_Array_Argument_T<S,S_slice,S_var,S_out,S_forany,S_tag,Insert_Policy>::demarshal (
     TAO_InputCDR & cdr
   )
 {
@@ -99,14 +110,14 @@ template<typename S,
          typename S_var,
          typename S_out,
          typename S_forany,
-         typename S_tag>
+         typename S_tag,
+         typename Insert_Policy>
 void
-TAO::Out_Var_Array_Argument_T<S,S_slice,S_var,S_out,S_forany,S_tag>::
-interceptor_param (Dynamic::Parameter & p)
+TAO::Out_Var_Array_Argument_T<S,S_slice,S_var,S_out,S_forany,S_tag,Insert_Policy>::
+interceptor_value (CORBA::Any *any) const
 {
   S_forany tmp (this->x_);
-  p.argument <<= tmp;
-  p.mode = CORBA::PARAM_OUT;
+  this->Insert_Policy::any_insert (any, tmp);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -117,9 +128,10 @@ template<typename S,
          typename S_slice,
          typename S_var,
          typename S_forany,
-         typename S_tag>
+         typename S_tag,
+         typename Insert_Policy>
 CORBA::Boolean
-TAO::Ret_Var_Array_Argument_T<S,S_slice,S_var,S_forany,S_tag>::demarshal (
+TAO::Ret_Var_Array_Argument_T<S,S_slice,S_var,S_forany,S_tag,Insert_Policy>::demarshal (
     TAO_InputCDR & cdr
   )
 {
@@ -139,12 +151,13 @@ template<typename S,
          typename S_slice,
          typename S_var,
          typename S_forany,
-         typename S_tag>
+         typename S_tag,
+         typename Insert_Policy>
 void
-TAO::Ret_Var_Array_Argument_T<S,S_slice,S_var,S_forany,S_tag>::
-interceptor_result (CORBA::Any * any)
+TAO::Ret_Var_Array_Argument_T<S,S_slice,S_var,S_forany,S_tag,Insert_Policy>::
+interceptor_value (CORBA::Any *any) const
 {
-  (*any) <<= S_forany (this->x_.ptr ());
+  this->Insert_Policy::any_insert (any, S_forany (this->x_.ptr ()));
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
diff --git a/TAO/tao/Var_Array_Argument_T.h b/TAO/tao/Var_Array_Argument_T.h
index 0e411bf87dc..75cb050ecc2 100644
--- a/TAO/tao/Var_Array_Argument_T.h
+++ b/TAO/tao/Var_Array_Argument_T.h
@@ -29,15 +29,18 @@ namespace TAO
    * @brief IN stub argument of variable size element array.
    *
    */
-  template<typename S, typename S_slice, typename S_forany>
-  class In_Var_Array_Argument_T : public Argument
+  template<typename S,
+           typename S_slice,
+           typename S_forany,
+           typename Insert_Policy>
+  class In_Var_Array_Argument_T : public InArgument, private Insert_Policy
   {
   public:
     In_Var_Array_Argument_T (const S_slice * x);
 
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S_slice const * arg (void) const;
 
@@ -51,16 +54,19 @@ namespace TAO
    * @brief INOUT stub argument of variable size element array.
    *
    */
-  template<typename S, typename S_slice, typename S_forany>
-  class Inout_Var_Array_Argument_T : public Argument
+  template<typename S,
+           typename S_slice,
+           typename S_forany,
+           typename Insert_Policy>
+  class Inout_Var_Array_Argument_T : public InoutArgument, private Insert_Policy
   {
   public:
     Inout_Var_Array_Argument_T (S_slice *&x);
 
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S_slice * arg (void);
 
@@ -79,15 +85,16 @@ namespace TAO
            typename S_var,
            typename S_out,
            typename S_forany,
-           typename S_tag>
-  class Out_Var_Array_Argument_T : public Argument
+           typename S_tag,
+           typename Insert_Policy>
+  class Out_Var_Array_Argument_T : public OutArgument, private Insert_Policy
   {
   public:
     Out_Var_Array_Argument_T (S_out x);
 
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S_slice *& arg (void);
 
@@ -105,15 +112,16 @@ namespace TAO
            typename S_slice,
            typename S_var,
            typename S_forany,
-           typename S_tag>
-  class Ret_Var_Array_Argument_T : public Argument
+           typename S_tag,
+           typename Insert_Policy>
+  class Ret_Var_Array_Argument_T : public RetArgument, private Insert_Policy
   {
   public:
     Ret_Var_Array_Argument_T (void);
 
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_result (CORBA::Any *);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S_slice *& arg (void);
 
@@ -143,7 +151,8 @@ namespace TAO
            typename T_var,
            typename T_out,
            typename T_forany,
-           typename T_tag>
+           typename T_tag,
+           typename Insert_Policy>
   struct Var_Array_Arg_Traits_T
   {
     typedef T_slice *                                   ret_type;
@@ -153,21 +162,25 @@ namespace TAO
 
     typedef In_Var_Array_Argument_T<T,
                                     T_slice,
-                                    T_forany>           in_arg_val;
+                                    T_forany,
+                                    Insert_Policy>           in_arg_val;
     typedef Inout_Var_Array_Argument_T<T,
                                        T_slice,
-                                       T_forany>        inout_arg_val;
+                                       T_forany,
+                                       Insert_Policy>        inout_arg_val;
     typedef Out_Var_Array_Argument_T<T,
                                      T_slice,
                                      T_var,
                                      T_out,
                                      T_forany,
-                                     T_tag>             out_arg_val;
+                                     T_tag,
+                                     Insert_Policy>             out_arg_val;
     typedef Ret_Var_Array_Argument_T<T,
                                      T_slice,
                                      T_var,
                                      T_forany,
-                                     T_tag>             ret_val;
+                                     T_tag,
+                                     Insert_Policy>             ret_val;
 
     typedef Var_Array_Tag                               idl_tag;
   };
diff --git a/TAO/tao/Var_Array_Argument_T.inl b/TAO/tao/Var_Array_Argument_T.inl
index a189584da2e..072b68039fc 100644
--- a/TAO/tao/Var_Array_Argument_T.inl
+++ b/TAO/tao/Var_Array_Argument_T.inl
@@ -2,34 +2,48 @@
 //
 // $Id$
 
-template<typename S, typename S_slice, typename S_forany>
+template<typename S,
+         typename S_slice,
+         typename S_forany,
+         typename Insert_Policy>
 ACE_INLINE
-TAO::In_Var_Array_Argument_T<S,S_slice,S_forany>::
+TAO::In_Var_Array_Argument_T<S,S_slice,S_forany,Insert_Policy>::
 In_Var_Array_Argument_T (const S_slice * x)
   : x_ (const_cast<S_slice *> (x))
-{}
+{
+}
 
-template<typename S, typename S_slice, typename S_forany>
+template<typename S,
+         typename S_slice,
+         typename S_forany,
+         typename Insert_Policy>
 ACE_INLINE
 S_slice const *
-TAO::In_Var_Array_Argument_T<S,S_slice,S_forany>::arg (void) const
+TAO::In_Var_Array_Argument_T<S,S_slice,S_forany,Insert_Policy>::arg (void) const
 {
   return this->x_.in ();
 }
 
 // ==========================================================================
 
-template<typename S, typename S_slice, typename S_forany>
+template<typename S,
+         typename S_slice,
+         typename S_forany,
+         typename Insert_Policy>
 ACE_INLINE
-TAO::Inout_Var_Array_Argument_T<S,S_slice,S_forany>::
+TAO::Inout_Var_Array_Argument_T<S,S_slice,S_forany,Insert_Policy>::
 Inout_Var_Array_Argument_T (S_slice  *&x)
   : x_ (x)
-{}
+{
+}
 
-template<typename S, typename S_slice, typename S_forany>
+template<typename S,
+         typename S_slice,
+         typename S_forany,
+         typename Insert_Policy>
 ACE_INLINE
 S_slice *
-TAO::Inout_Var_Array_Argument_T<S,S_slice,S_forany>::arg (void)
+TAO::Inout_Var_Array_Argument_T<S,S_slice,S_forany,Insert_Policy>::arg (void)
 {
   return this->x_.inout ();
 }
@@ -41,9 +55,10 @@ template<typename S,
          typename S_var,
          typename S_out,
          typename S_forany,
-         typename S_tag>
+         typename S_tag,
+         typename Insert_Policy>
 ACE_INLINE
-TAO::Out_Var_Array_Argument_T<S,S_slice,S_var,S_out,S_forany,S_tag>::
+TAO::Out_Var_Array_Argument_T<S,S_slice,S_var,S_out,S_forany,S_tag,Insert_Policy>::
 Out_Var_Array_Argument_T (S_out x)
   : x_ (x.ptr ())
 {
@@ -54,10 +69,11 @@ template<typename S,
          typename S_var,
          typename S_out,
          typename S_forany,
-         typename S_tag>
+         typename S_tag,
+         typename Insert_Policy>
 ACE_INLINE
 S_slice *&
-TAO::Out_Var_Array_Argument_T<S,S_slice,S_var,S_out,S_forany,S_tag>::arg (void)
+TAO::Out_Var_Array_Argument_T<S,S_slice,S_var,S_out,S_forany,S_tag,Insert_Policy>::arg (void)
 {
   return this->x_;
 }
@@ -68,9 +84,10 @@ template<typename S,
          typename S_slice,
          typename S_var,
          typename S_forany,
-         typename S_tag>
+         typename S_tag,
+         typename Insert_Policy>
 ACE_INLINE
-TAO::Ret_Var_Array_Argument_T<S,S_slice,S_var,S_forany,S_tag>::
+TAO::Ret_Var_Array_Argument_T<S,S_slice,S_var,S_forany,S_tag,Insert_Policy>::
 Ret_Var_Array_Argument_T (void)
 {}
 
@@ -78,10 +95,11 @@ template<typename S,
          typename S_slice,
          typename S_var,
          typename S_forany,
-         typename S_tag>
+         typename S_tag,
+         typename Insert_Policy>
 ACE_INLINE
 S_slice *&
-TAO::Ret_Var_Array_Argument_T<S,S_slice,S_var,S_forany,S_tag>::arg (void)
+TAO::Ret_Var_Array_Argument_T<S,S_slice,S_var,S_forany,S_tag,Insert_Policy>::arg (void)
 {
   return this->x_.out ();
 }
@@ -90,10 +108,11 @@ template<typename S,
          typename S_slice,
          typename S_var,
          typename S_forany,
-         typename S_tag>
+         typename S_tag,
+         typename Insert_Policy>
 ACE_INLINE
 S_slice *
-TAO::Ret_Var_Array_Argument_T<S,S_slice,S_var,S_forany,S_tag>::excp (void)
+TAO::Ret_Var_Array_Argument_T<S,S_slice,S_var,S_forany,S_tag,Insert_Policy>::excp (void)
 {
   return this->x_.ptr ();
 }
@@ -102,10 +121,11 @@ template<typename S,
          typename S_slice,
          typename S_var,
          typename S_forany,
-         typename S_tag>
+         typename S_tag,
+         typename Insert_Policy>
 ACE_INLINE
 S_slice *
-TAO::Ret_Var_Array_Argument_T<S,S_slice,S_var,S_forany,S_tag>::retn (void)
+TAO::Ret_Var_Array_Argument_T<S,S_slice,S_var,S_forany,S_tag,Insert_Policy>::retn (void)
 {
   return this->x_._retn ();
 }
diff --git a/TAO/tao/Var_Size_Argument_T.cpp b/TAO/tao/Var_Size_Argument_T.cpp
index 5d28dae9742..290c17b4909 100644
--- a/TAO/tao/Var_Size_Argument_T.cpp
+++ b/TAO/tao/Var_Size_Argument_T.cpp
@@ -4,7 +4,6 @@
 #define TAO_VAR_SIZE_ARGUMENT_T_C
 
 #include "tao/Var_Size_Argument_T.h"
-#include "tao/Dynamic_ParameterC.h"
 
 #if !defined (__ACE_INLINE__)
 #include "tao/Var_Size_Argument_T.inl"
@@ -14,58 +13,63 @@ ACE_RCSID (tao,
            Var_Size_Argument_T,
            "$Id$")
 
-template<typename S>
+template<typename S,
+         typename Insert_Policy>
 CORBA::Boolean
-TAO::In_Var_Size_Argument_T<S>::marshal (TAO_OutputCDR & cdr)
+TAO::In_Var_Size_Argument_T<S,Insert_Policy>::marshal (TAO_OutputCDR &cdr)
 {
   return cdr << *this->x_;
 }
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S>
+template<typename S,
+         typename Insert_Policy>
 void
-TAO::In_Var_Size_Argument_T<S>::interceptor_param (Dynamic::Parameter & p)
+TAO::In_Var_Size_Argument_T<S,Insert_Policy>::interceptor_value (CORBA::Any *any) const
 {
-  p.argument <<= *this->x_;
-  p.mode = CORBA::PARAM_IN;
+  this->Insert_Policy::any_insert (any, *this->x_);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // ===========================================================
 
-template<typename S>
+template<typename S,
+         typename Insert_Policy>
 CORBA::Boolean
-TAO::Inout_Var_Size_Argument_T<S>::marshal (TAO_OutputCDR & cdr)
+TAO::Inout_Var_Size_Argument_T<S,Insert_Policy>::marshal (TAO_OutputCDR &cdr)
 {
   return cdr << *this->x_;
 }
 
-template<typename S>
+template<typename S,
+         typename Insert_Policy>
 CORBA::Boolean
-TAO::Inout_Var_Size_Argument_T<S>::demarshal (TAO_InputCDR & cdr)
+TAO::Inout_Var_Size_Argument_T<S,Insert_Policy>::demarshal (TAO_InputCDR & cdr)
 {
   return cdr >> *this->x_;
 }
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S>
+template<typename S,
+         typename Insert_Policy>
 void
-TAO::Inout_Var_Size_Argument_T<S>::interceptor_param (Dynamic::Parameter & p)
+TAO::Inout_Var_Size_Argument_T<S,Insert_Policy>::interceptor_value (CORBA::Any *any) const
 {
-  p.argument <<= *this->x_;
-  p.mode = CORBA::PARAM_INOUT;
+  this->Insert_Policy::any_insert (any, *this->x_);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // ==============================================================
 
-template<typename S, typename S_out>
+template<typename S,
+         typename S_out,
+         typename Insert_Policy>
 CORBA::Boolean
-TAO::Out_Var_Size_Argument_T<S,S_out>::demarshal (TAO_InputCDR & cdr)
+TAO::Out_Var_Size_Argument_T<S,S_out,Insert_Policy>::demarshal (TAO_InputCDR & cdr)
 {
   this->x_ = new S;
   return cdr >> *this->x_;
@@ -73,23 +77,24 @@ TAO::Out_Var_Size_Argument_T<S,S_out>::demarshal (TAO_InputCDR & cdr)
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S, typename S_out>
+template<typename S,
+         typename S_out,
+         typename Insert_Policy>
 void
-TAO::Out_Var_Size_Argument_T<S,S_out>::interceptor_param (
-    Dynamic::Parameter & p
-  )
+TAO::Out_Var_Size_Argument_T<S,S_out,Insert_Policy>::interceptor_value (CORBA::Any *any) const
 {
-  p.argument <<= *this->x_;
-  p.mode = CORBA::PARAM_OUT;
+  this->Insert_Policy::any_insert (any, *this->x_);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
 // ============================================================
 
-template<typename S, typename S_var>
+template<typename S,
+         typename S_var,
+         typename Insert_Policy>
 CORBA::Boolean
-TAO::Ret_Var_Size_Argument_T<S,S_var>::demarshal (TAO_InputCDR & cdr)
+TAO::Ret_Var_Size_Argument_T<S,S_var,Insert_Policy>::demarshal (TAO_InputCDR & cdr)
 {
   S * tmp = 0;
   ACE_NEW_RETURN (tmp,
@@ -101,11 +106,13 @@ TAO::Ret_Var_Size_Argument_T<S,S_var>::demarshal (TAO_InputCDR & cdr)
 
 #if TAO_HAS_INTERCEPTORS == 1
 
-template<typename S, typename S_var>
+template<typename S,
+         typename S_var,
+         typename Insert_Policy>
 void
-TAO::Ret_Var_Size_Argument_T<S,S_var>::interceptor_result (CORBA::Any * any)
+TAO::Ret_Var_Size_Argument_T<S,S_var,Insert_Policy>::interceptor_value (CORBA::Any *any) const
 {
-  (*any) <<= this->x_.in ();
+  this->Insert_Policy::any_insert (any, this->x_.in ());
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
diff --git a/TAO/tao/Var_Size_Argument_T.h b/TAO/tao/Var_Size_Argument_T.h
index e417f5b72fe..fa1afc31536 100644
--- a/TAO/tao/Var_Size_Argument_T.h
+++ b/TAO/tao/Var_Size_Argument_T.h
@@ -29,15 +29,15 @@ namespace TAO
    * @brief Template class for IN stub argument of fixed size IDL types.
    *
    */
-  template<typename S>
-  class In_Var_Size_Argument_T : public Argument
+  template<typename S, typename Insert_Policy>
+  class In_Var_Size_Argument_T : public InArgument, private Insert_Policy
   {
   public:
     In_Var_Size_Argument_T (S const & x);
 
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S const & arg (void) const;
 
@@ -51,16 +51,16 @@ namespace TAO
    * @brief Template class for INOUT stub argument of fixed size IDL types.
    *
    */
-  template<typename S>
-  class Inout_Var_Size_Argument_T : public Argument
+  template<typename S, typename Insert_Policy>
+  class Inout_Var_Size_Argument_T : public InoutArgument, private Insert_Policy
   {
   public:
     Inout_Var_Size_Argument_T (S & x);
 
-    virtual CORBA::Boolean marshal (TAO_OutputCDR &);
+    virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr);
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S & arg (void);
 
@@ -74,15 +74,15 @@ namespace TAO
    * @brief Template class for OUT stub argument of fixed size IDL types.
    *
    */
-  template<typename S, typename S_out>
-  class Out_Var_Size_Argument_T : public Argument
+  template<typename S, typename S_out, typename Insert_Policy>
+  class Out_Var_Size_Argument_T : public OutArgument, private Insert_Policy
   {
   public:
     Out_Var_Size_Argument_T (S_out x);
 
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_param (Dynamic::Parameter &);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S *& arg (void);
 
@@ -96,15 +96,15 @@ namespace TAO
    * @brief Template class for return stub value of fixed size IDL types.
    *
    */
-  template<typename S, typename S_var>
-  class Ret_Var_Size_Argument_T : public Argument
+  template<typename S, typename S_var, typename Insert_Policy>
+  class Ret_Var_Size_Argument_T : public RetArgument, private Insert_Policy
   {
   public:
     Ret_Var_Size_Argument_T (void);
 
     virtual CORBA::Boolean demarshal (TAO_InputCDR &);
 #if TAO_HAS_INTERCEPTORS == 1
-    virtual void interceptor_result (CORBA::Any *);
+    virtual void interceptor_value (CORBA::Any *any) const;
 #endif /* TAO_HAS_INTERCEPTORS == 1 */
     S *& arg (void);
 
@@ -124,13 +124,13 @@ namespace TAO
   struct TAO_Export Var_Size_Tag {};
 
   /**
-   * @struct Basic_Arg_Traits_T
+   * @struct Var_Size_Arg_Traits_T
    *
    * @brief Template class for stub argument traits of
    *  variable size IDL types.
    *
    */
-  template<typename T, typename T_var, typename T_out>
+  template<typename T, typename T_var, typename T_out, typename Insert_Policy>
   struct Var_Size_Arg_Traits_T
   {
     typedef T *                                         ret_type;
@@ -138,10 +138,10 @@ namespace TAO
     typedef T &                                         inout_type;
     typedef T_out                                       out_type;
 
-    typedef In_Var_Size_Argument_T<T>                   in_arg_val;
-    typedef Inout_Var_Size_Argument_T<T>                inout_arg_val;
-    typedef Out_Var_Size_Argument_T<T,T_out>            out_arg_val;
-    typedef Ret_Var_Size_Argument_T<T,T_var>            ret_val;
+    typedef In_Var_Size_Argument_T<T, Insert_Policy>          in_arg_val;
+    typedef Inout_Var_Size_Argument_T<T, Insert_Policy>       inout_arg_val;
+    typedef Out_Var_Size_Argument_T<T,T_out, Insert_Policy>   out_arg_val;
+    typedef Ret_Var_Size_Argument_T<T,T_var, Insert_Policy>   ret_val;
 
     typedef Var_Size_Tag                                idl_tag;
   };
diff --git a/TAO/tao/Var_Size_Argument_T.inl b/TAO/tao/Var_Size_Argument_T.inl
index 59ad3bdbbfa..b5c240dfa8a 100644
--- a/TAO/tao/Var_Size_Argument_T.inl
+++ b/TAO/tao/Var_Size_Argument_T.inl
@@ -1,78 +1,97 @@
 // $Id$
 
-template<typename S>
+template<typename S,
+         typename Insert_Policy>
 ACE_INLINE
-TAO::In_Var_Size_Argument_T<S>::In_Var_Size_Argument_T (S const & x)
+TAO::In_Var_Size_Argument_T<S,Insert_Policy>::In_Var_Size_Argument_T (S const & x)
   : x_ (&x)
-{}
+{
+}
 
-template<typename S>
+template<typename S,
+         typename Insert_Policy>
 ACE_INLINE
 const S &
-TAO::In_Var_Size_Argument_T<S>::arg (void) const
+TAO::In_Var_Size_Argument_T<S,Insert_Policy>::arg (void) const
 {
   return *this->x_;
 }
 
 // ==========================================================================
 
-template<typename S>
+template<typename S,
+         typename Insert_Policy>
 ACE_INLINE
-TAO::Inout_Var_Size_Argument_T<S>::Inout_Var_Size_Argument_T (S & x)
+TAO::Inout_Var_Size_Argument_T<S,Insert_Policy>::Inout_Var_Size_Argument_T (S & x)
   : x_ (&x)
-{}
+{
+}
 
-template<typename S>
+template<typename S,
+         typename Insert_Policy>
 ACE_INLINE
 S &
-TAO::Inout_Var_Size_Argument_T<S>::arg (void)
+TAO::Inout_Var_Size_Argument_T<S,Insert_Policy>::arg (void)
 {
   return *this->x_;
 }
 
 // ==========================================================================
 
-template<typename S, typename S_out>
+template<typename S,
+         typename S_out,
+         typename Insert_Policy>
 ACE_INLINE
-TAO::Out_Var_Size_Argument_T<S,S_out>::Out_Var_Size_Argument_T (S_out x)
+TAO::Out_Var_Size_Argument_T<S,S_out,Insert_Policy>::Out_Var_Size_Argument_T (S_out x)
   : x_ (x.ptr ())
 {}
 
-template<typename S, typename S_out>
+template<typename S,
+         typename S_out,
+         typename Insert_Policy>
 ACE_INLINE
 S *&
-TAO::Out_Var_Size_Argument_T<S,S_out>::arg (void)
+TAO::Out_Var_Size_Argument_T<S,S_out,Insert_Policy>::arg (void)
 {
   return this->x_;
 }
 
 // ==========================================================================
 
-template<typename S, typename S_var>
+template<typename S,
+         typename S_var,
+         typename Insert_Policy>
 ACE_INLINE
-TAO::Ret_Var_Size_Argument_T<S,S_var>::Ret_Var_Size_Argument_T (void)
-{}
+TAO::Ret_Var_Size_Argument_T<S,S_var,Insert_Policy>::Ret_Var_Size_Argument_T (void)
+{
+}
 
-template<typename S, typename S_var>
+template<typename S,
+         typename S_var,
+         typename Insert_Policy>
 ACE_INLINE
 S *&
-TAO::Ret_Var_Size_Argument_T<S,S_var>::arg (void)
+TAO::Ret_Var_Size_Argument_T<S,S_var,Insert_Policy>::arg (void)
 {
   return this->x_.out ();
 }
 
-template<typename S, typename S_var>
+template<typename S,
+         typename S_var,
+         typename Insert_Policy>
 ACE_INLINE
 S *
-TAO::Ret_Var_Size_Argument_T<S,S_var>::excp (void)
+TAO::Ret_Var_Size_Argument_T<S,S_var,Insert_Policy>::excp (void)
 {
   return this->x_.ptr ();
 }
 
-template<typename S, typename S_var>
+template<typename S,
+         typename S_var,
+         typename Insert_Policy>
 ACE_INLINE
 S *
-TAO::Ret_Var_Size_Argument_T<S,S_var>::retn (void)
+TAO::Ret_Var_Size_Argument_T<S,S_var,Insert_Policy>::retn (void)
 {
   return this->x_._retn ();
 }
diff --git a/TAO/tao/Visibility.pidl b/TAO/tao/Visibility.pidl
deleted file mode 100644
index 44cece777a3..00000000000
--- a/TAO/tao/Visibility.pidl
+++ /dev/null
@@ -1,34 +0,0 @@
-// -*- IDL -*-
-
-// ================================================================
-/**
- *  @file   Visibility.pidl
- *
- * $Id$
- *
- *   This file was used to generate the code in VisibiltyC.* The command
- *   used to generate code is:
- *
- *     tao_idl
- *        -o orig -SS -Ge 1 -Sc -Sci
- *          -Wb,export_macro=TAO_Export
- *          -Wb,export_include="tao/TAO_Export.h"
- *          -Wb,pre_include="ace/pre.h"
- *          -Wb,post_include="ace/post.h"
- *          Visibilty.pidl
- */
-// ================================================================
-
-#ifndef TAO_VISIBILITY_PIDL
-#define TAO_VISIBILITY_PIDL
-
-#pragma prefix "omg.org"
-
-module CORBA
-{
-  typedef short Visibility;
-  const Visibility PRIVATE_MEMBER = 0;
-  const Visibility PUBLIC_MEMBER = 1;
-};
-
-#endif /* TAO_VISIBILITY_PIDL */
diff --git a/TAO/tao/VisibilityS.h b/TAO/tao/VisibilityS.h
deleted file mode 100644
index 17b1360599e..00000000000
--- a/TAO/tao/VisibilityS.h
+++ /dev/null
@@ -1,28 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-// Skeleton file generation suppressed with command line option -SS
diff --git a/TAO/tao/WCharSeqA.cpp b/TAO/tao/WCharSeqA.cpp
deleted file mode 100644
index 5f79ab8d2bf..00000000000
--- a/TAO/tao/WCharSeqA.cpp
+++ /dev/null
@@ -1,142 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "WCharSeqC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Sequence_TypeCode_Static.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Dual_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:937
-
-
-#ifndef _TAO_TYPECODE_CORBA_WCharSeq_GUARD
-#define _TAO_TYPECODE_CORBA_WCharSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_WCharSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_wchar,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_WCharSeq_0 =
-      &CORBA_WCharSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_WCharSeq_GUARD */
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_WCharSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/WCharSeq:1.0",
-    "WCharSeq",
-    &TAO::TypeCode::tc_CORBA_WCharSeq_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_WCharSeq =
-    &_tao_tc_CORBA_WCharSeq;
-}
-
-
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::WCharSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::WCharSeq>::insert_copy (
-      _tao_any,
-      CORBA::WCharSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_WCharSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::WCharSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::WCharSeq>::insert (
-      _tao_any,
-      CORBA::WCharSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_WCharSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::WCharSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::WCharSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::WCharSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::WCharSeq>::extract (
-        _tao_any,
-        CORBA::WCharSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_WCharSeq_0,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/WCharSeqC.cpp b/TAO/tao/WCharSeqC.cpp
index 7be0ffd9c3d..2ec0b1bd9e0 100644
--- a/TAO/tao/WCharSeqC.cpp
+++ b/TAO/tao/WCharSeqC.cpp
@@ -26,16 +26,12 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:291
+// be\be_codegen.cpp:288
 
 
 #include "WCharSeqC.h"
 #include "tao/CDR.h"
 
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
diff --git a/TAO/tao/WCharSeqC.h b/TAO/tao/WCharSeqC.h
index 66e272a3891..a757c0b021c 100644
--- a/TAO/tao/WCharSeqC.h
+++ b/TAO/tao/WCharSeqC.h
@@ -26,10 +26,10 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:153
+// be\be_codegen.cpp:154
 
-#ifndef _TAO_IDL_ORIG_WCHARSEQC_H_
-#define _TAO_IDL_ORIG_WCHARSEQC_H_
+#ifndef _TAO_IDL_WCHARSEQC_H_
+#define _TAO_IDL_WCHARSEQC_H_
 
 #include /**/ "ace/pre.h"
 
@@ -57,12 +57,8 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:49
 
 namespace CORBA
 {
@@ -114,14 +110,9 @@ namespace CORBA
   };
 
 #endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_WCharSeq;
 
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:78
 
 } // module CORBA
 
@@ -134,14 +125,6 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const CORBA::WCharSeq &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, CORBA::WCharSeq*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::WCharSeq *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::WCharSeq *&);
-
-// TAO_IDL - Generated from
 // be\be_visitor_sequence/cdr_op_ch.cpp:71
 
 #if !defined _TAO_CDR_OP_CORBA_WCharSeq_H_
@@ -159,16 +142,12 @@ TAO_Export CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_CORBA_WCharSeq_H_ */
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:955
+// be\be_codegen.cpp:1062
 
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
diff --git a/TAO/tao/WStringSeqA.cpp b/TAO/tao/WStringSeqA.cpp
deleted file mode 100644
index 319557ee39c..00000000000
--- a/TAO/tao/WStringSeqA.cpp
+++ /dev/null
@@ -1,143 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "WStringSeqC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Sequence_TypeCode_Static.h"
-#include "tao/String_TypeCode_Static.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Dual_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/typecode_defn.cpp:937
-
-
-#ifndef _TAO_TYPECODE_CORBA_WStringSeq_GUARD
-#define _TAO_TYPECODE_CORBA_WStringSeq_GUARD
-namespace TAO
-{
-  namespace TypeCode
-  {
-    TAO::TypeCode::Sequence< ::CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-      CORBA_WStringSeq_0 (
-        CORBA::tk_sequence,
-        &CORBA::_tc_wstring,
-        0U);
-      
-    ::CORBA::TypeCode_ptr const tc_CORBA_WStringSeq_0 =
-      &CORBA_WStringSeq_0;
-    
-  }
-}
-
-
-#endif /* _TAO_TYPECODE_CORBA_WStringSeq_GUARD */
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_WStringSeq (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/WStringSeq:1.0",
-    "WStringSeq",
-    &TAO::TypeCode::tc_CORBA_WStringSeq_0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_WStringSeq =
-    &_tao_tc_CORBA_WStringSeq;
-}
-
-
-
-// TAO_IDL - Generated from 
-// be\be_visitor_sequence/any_op_cs.cpp:54
-
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::WStringSeq &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::WStringSeq>::insert_copy (
-      _tao_any,
-      CORBA::WStringSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_WStringSeq_0,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::WStringSeq *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::WStringSeq>::insert (
-      _tao_any,
-      CORBA::WStringSeq::_tao_any_destructor,
-      TAO::TypeCode::tc_CORBA_WStringSeq_0,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::WStringSeq *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::WStringSeq *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::WStringSeq *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::WStringSeq>::extract (
-        _tao_any,
-        CORBA::WStringSeq::_tao_any_destructor,
-        TAO::TypeCode::tc_CORBA_WStringSeq_0,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/WStringSeqC.cpp b/TAO/tao/WStringSeqC.cpp
index fd19f744d9f..98e4b6cd4bb 100644
--- a/TAO/tao/WStringSeqC.cpp
+++ b/TAO/tao/WStringSeqC.cpp
@@ -26,16 +26,12 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:291
+// be\be_codegen.cpp:277
 
 
 #include "WStringSeqC.h"
 #include "tao/CDR.h"
 
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
 
diff --git a/TAO/tao/WStringSeqC.h b/TAO/tao/WStringSeqC.h
index c73b0347014..e63489ccfa7 100644
--- a/TAO/tao/WStringSeqC.h
+++ b/TAO/tao/WStringSeqC.h
@@ -26,10 +26,10 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:153
+// be\be_codegen.cpp:154
 
-#ifndef _TAO_IDL_ORIG_WSTRINGSEQC_H_
-#define _TAO_IDL_ORIG_WSTRINGSEQC_H_
+#ifndef _TAO_IDL_WSTRINGSEQC_H_
+#define _TAO_IDL_WSTRINGSEQC_H_
 
 #include /**/ "ace/pre.h"
 
@@ -52,17 +52,8 @@
 #endif
 #define TAO_EXPORT_MACRO TAO_Export
 
-#if defined(_MSC_VER)
-#pragma warning(push)
-#pragma warning(disable:4250)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:49
 
 namespace CORBA
 {
@@ -112,14 +103,9 @@ namespace CORBA
   };
 
 #endif /* end #if !defined */
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_WStringSeq;
 
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:78
 
 } // module CORBA
 
@@ -132,14 +118,6 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_sequence/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const CORBA::WStringSeq &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, CORBA::WStringSeq*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::WStringSeq *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::WStringSeq *&);
-
-// TAO_IDL - Generated from
 // be\be_visitor_sequence/cdr_op_ch.cpp:71
 
 #if !defined _TAO_CDR_OP_CORBA_WStringSeq_H_
@@ -157,15 +135,7 @@ TAO_Export CORBA::Boolean operator>> (
 #endif /* _TAO_CDR_OP_CORBA_WStringSeq_H_ */
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:955
-
-#if defined(_MSC_VER)
-#pragma warning(pop)
-#endif /* _MSC_VER */
-
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
+// be\be_codegen.cpp:1028
 
 #include /**/ "ace/post.h"
 
diff --git a/TAO/tao/Wait_On_LF_No_Upcall.h b/TAO/tao/Wait_On_LF_No_Upcall.h
index bfc9f56640e..d2ea3b899f8 100644
--- a/TAO/tao/Wait_On_LF_No_Upcall.h
+++ b/TAO/tao/Wait_On_LF_No_Upcall.h
@@ -38,7 +38,7 @@ namespace TAO
    * reset once the reply is received.
    */
 
-  class TAO_Export Wait_On_LF_No_Upcall : public TAO_Wait_On_Leader_Follower
+  class Wait_On_LF_No_Upcall : public TAO_Wait_On_Leader_Follower
   {
   public:
 
diff --git a/TAO/tao/Wait_On_Leader_Follower.h b/TAO/tao/Wait_On_Leader_Follower.h
index fd815ef4862..5db60e5808b 100644
--- a/TAO/tao/Wait_On_Leader_Follower.h
+++ b/TAO/tao/Wait_On_Leader_Follower.h
@@ -35,7 +35,7 @@
  * is Muxed and hence there are multiple threads running in the
  * same Transport context.
  */
-class TAO_Export TAO_Wait_On_Leader_Follower : public TAO_Wait_Strategy
+class TAO_Wait_On_Leader_Follower : public TAO_Wait_Strategy
 {
 
 public:
diff --git a/TAO/tao/Wait_On_Reactor.h b/TAO/tao/Wait_On_Reactor.h
index c8af5477fba..566a419efd1 100644
--- a/TAO/tao/Wait_On_Reactor.h
+++ b/TAO/tao/Wait_On_Reactor.h
@@ -28,7 +28,7 @@
  * environment.
  *
  */
-class TAO_Export TAO_Wait_On_Reactor : public TAO_Wait_Strategy
+class TAO_Wait_On_Reactor : public TAO_Wait_Strategy
 {
 
 public:
diff --git a/TAO/tao/Wait_On_Read.h b/TAO/tao/Wait_On_Read.h
index d2de502871f..e946f07d4a3 100644
--- a/TAO/tao/Wait_On_Read.h
+++ b/TAO/tao/Wait_On_Read.h
@@ -27,7 +27,7 @@
  *
  * Simply block on read() to wait for the reply.
  */
-class TAO_Export TAO_Wait_On_Read :  public TAO_Wait_Strategy
+class TAO_Wait_On_Read :  public TAO_Wait_Strategy
 {
 
 public:
diff --git a/TAO/tao/Wait_Strategy.h b/TAO/tao/Wait_Strategy.h
index b38dc77b7a9..88e80011167 100644
--- a/TAO/tao/Wait_Strategy.h
+++ b/TAO/tao/Wait_Strategy.h
@@ -15,12 +15,14 @@
 
 #include /**/ "ace/pre.h"
 
-#include "tao/TAO_Export.h"
+#include "tao/orbconf.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "tao/TAO_Export.h"
+
 class ACE_Time_Value;
 class TAO_ORB_Core;
 class TAO_Transport;
diff --git a/TAO/tao/WrongTransactionA.cpp b/TAO/tao/WrongTransactionA.cpp
deleted file mode 100644
index 83780fd5442..00000000000
--- a/TAO/tao/WrongTransactionA.cpp
+++ /dev/null
@@ -1,147 +0,0 @@
-// -*- C++ -*-
-//
-// $Id$
-
-// ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
-// TAO and the TAO IDL Compiler have been developed by:
-//       Center for Distributed Object Computing
-//       Washington University
-//       St. Louis, MO
-//       USA
-//       http://www.cs.wustl.edu/~schmidt/doc-center.html
-// and
-//       Distributed Object Computing Laboratory
-//       University of California at Irvine
-//       Irvine, CA
-//       USA
-//       http://doc.ece.uci.edu/
-// and
-//       Institute for Software Integrated Systems
-//       Vanderbilt University
-//       Nashville, TN
-//       USA
-//       http://www.isis.vanderbilt.edu/
-//
-// Information about TAO is available at:
-//     http://www.cs.wustl.edu/~schmidt/TAO.html
-
-#include "WrongTransactionC.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/Struct_TypeCode_Static.h"
-#include "tao/TypeCode_Struct_Field.h"
-#include "tao/CDR.h"
-#include "tao/Any.h"
-#include "tao/Any_Dual_Impl_T.h"
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/struct_typecode.cpp:87
-
-static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const * const _tao_fields_CORBA_WrongTransaction = 0;
-static TAO::TypeCode::Struct<char const *,
-                      CORBA::TypeCode_ptr const *,
-                      TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *,
-                      TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_WrongTransaction (
-    CORBA::tk_except,
-    "IDL:omg.org/CORBA/WrongTransaction:1.0",
-    "WrongTransaction",
-    _tao_fields_CORBA_WrongTransaction,
-    0);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_WrongTransaction =
-    &_tao_tc_CORBA_WrongTransaction;
-}
-
-
-
-// TAO_IDL - Generated from 
-// be\be_visitor_exception/any_op_cs.cpp:50
-
-namespace TAO
-{
-  template<>
-  CORBA::Boolean
-  Any_Dual_Impl_T<CORBA::WrongTransaction>::demarshal_value (
-      TAO_InputCDR & cdr
-    )
-  {
-    CORBA::String_var id;
-    
-    if (!(cdr >> id.out ()))
-      {
-        return false;
-      }
-    
-    ACE_TRY_NEW_ENV
-      {
-        this->value_->_tao_decode (cdr ACE_ENV_ARG_PARAMETER);
-        ACE_TRY_CHECK;
-      }
-    ACE_CATCHANY
-      {
-        return false;
-      }
-    ACE_ENDTRY;
-    
-    return true;
-  }
-}
-
-// Copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    const CORBA::WrongTransaction &_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::WrongTransaction>::insert_copy (
-      _tao_any,
-      CORBA::WrongTransaction::_tao_any_destructor,
-      CORBA::_tc_WrongTransaction,
-      _tao_elem
-    );
-}
-
-// Non-copying insertion.
-void operator<<= (
-    CORBA::Any &_tao_any,
-    CORBA::WrongTransaction *_tao_elem
-  )
-{
-  TAO::Any_Dual_Impl_T<CORBA::WrongTransaction>::insert (
-      _tao_any,
-      CORBA::WrongTransaction::_tao_any_destructor,
-      CORBA::_tc_WrongTransaction,
-      _tao_elem
-    );
-}
-
-// Extraction to non-const pointer (deprecated).
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    CORBA::WrongTransaction *&_tao_elem
-  )
-{
-  return _tao_any >>= const_cast<
-      const CORBA::WrongTransaction *&> (
-      _tao_elem
-    );
-}
-
-// Extraction to const pointer.
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    const CORBA::WrongTransaction *&_tao_elem
-  )
-{
-  return
-    TAO::Any_Dual_Impl_T<CORBA::WrongTransaction>::extract (
-        _tao_any,
-        CORBA::WrongTransaction::_tao_any_destructor,
-        CORBA::_tc_WrongTransaction,
-        _tao_elem
-      );
-}
diff --git a/TAO/tao/WrongTransactionC.cpp b/TAO/tao/WrongTransactionC.cpp
index 97721c038ef..3ca279cf001 100644
--- a/TAO/tao/WrongTransactionC.cpp
+++ b/TAO/tao/WrongTransactionC.cpp
@@ -33,6 +33,8 @@
 #include "tao/CDR.h"
 #include "tao/SystemException.h"
 #include "ace/OS_NS_string.h"
+#include "tao/AnyTypeCode_Adapter.h"
+#include "ace/Dynamic_Service.h"
 
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
@@ -47,7 +49,7 @@ namespace TAO
 }
 
 
-// TAO_IDL - Generated from 
+// TAO_IDL - Generated from
 // be\be_visitor_exception/exception_cs.cpp:63
 
 CORBA::WrongTransaction::WrongTransaction (void)
@@ -129,7 +131,7 @@ void CORBA::WrongTransaction::_tao_encode (
     {
       return;
     }
-  
+
   ACE_THROW (CORBA::MARSHAL ());
 }
 
@@ -142,14 +144,27 @@ void CORBA::WrongTransaction::_tao_decode (
     {
       return;
     }
-  
+
   ACE_THROW (CORBA::MARSHAL ());
 }
 
 // TAO extension - the virtual _type method.
 CORBA::TypeCode_ptr CORBA::WrongTransaction::_tao_type (void) const
 {
-  return ::CORBA::_tc_WrongTransaction;
+  TAO_AnyTypeCode_Adapter *adapter =
+    ACE_Dynamic_Service<TAO_AnyTypeCode_Adapter>::instance (
+        "AnyTypeCode_Adapter"
+      );
+  if (adapter != 0)
+    return adapter->_tao_type_WrongTransaction ();
+  else
+    {
+      ACE_ERROR ((LM_ERROR,
+                  ACE_TEXT ("(%P|%t) %p\n"),
+                  ACE_TEXT ("Unable to find the ")
+                  ACE_TEXT ("AnyTypeCode Adapter instance")));
+      return 0;
+    }
 }
 
 // TAO_IDL - Generated from
diff --git a/TAO/tao/WrongTransactionC.h b/TAO/tao/WrongTransactionC.h
index e17d3e6099d..a872bfdfaf2 100644
--- a/TAO/tao/WrongTransactionC.h
+++ b/TAO/tao/WrongTransactionC.h
@@ -63,30 +63,30 @@
 
 namespace CORBA
 {
-  
+
   // TAO_IDL - Generated from
   // be\be_visitor_exception/exception_ch.cpp:53
 
 #if !defined (_CORBA_WRONGTRANSACTION_CH_)
 #define _CORBA_WRONGTRANSACTION_CH_
-  
+
   class TAO_Export WrongTransaction : public CORBA::UserException
   {
   public:
-    
+
     WrongTransaction (void);
     WrongTransaction (const WrongTransaction &);
     ~WrongTransaction (void);
 
     WrongTransaction &operator= (const WrongTransaction &);
-    
+
     static void _tao_any_destructor (void *);
-    
+
     static WrongTransaction *_downcast (CORBA::Exception *);
     static const WrongTransaction *_downcast (CORBA::Exception const *);
-    
+
     static CORBA::Exception *_alloc (void);
-    
+
     virtual CORBA::Exception *_tao_duplicate (void) const;
 
     virtual void _raise (void) const;
@@ -95,22 +95,17 @@ namespace CORBA
         TAO_OutputCDR &
         ACE_ENV_ARG_DECL
       ) const;
-    
+
     virtual void _tao_decode (
         TAO_InputCDR &
         ACE_ENV_ARG_DECL
       );
-    
+
     // TAO_IDL - Generated from
     // be\be_visitor_exception/exception_ch.cpp:129
-    
+
     virtual CORBA::TypeCode_ptr _tao_type (void) const;
   };
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_WrongTransaction;
 
 #endif /* end #if !defined */
 
@@ -128,14 +123,6 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be\be_visitor_exception/any_op_ch.cpp:52
-
-TAO_Export void operator<<= (CORBA::Any &, const CORBA::WrongTransaction &); // copying version
-TAO_Export void operator<<= (CORBA::Any &, CORBA::WrongTransaction*); // noncopying version
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, CORBA::WrongTransaction *&); // deprecated
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any &, const CORBA::WrongTransaction *&);
-
-// TAO_IDL - Generated from
 // be\be_visitor_exception/cdr_op_ch.cpp:52
 
 TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const CORBA::WrongTransaction &);
diff --git a/TAO/tao/append.cpp b/TAO/tao/append.cpp
deleted file mode 100644
index da48f4bb43f..00000000000
--- a/TAO/tao/append.cpp
+++ /dev/null
@@ -1,1318 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//     TAO
-//
-// = FILENAME
-//     append.cpp
-//
-// = DESCRIPTION
-//     Appends a CDR stream to another CDR stream. Due to the
-//     stringent alignment requirements, it is not possible to simply
-//     append or memcpy. Instead we go thru the same CDR encoding rules
-//
-// = AUTHOR
-//     Copyright 1994-1995 by Sun Microsystems Inc.
-//     and Aniruddha Gokhale
-//
-// ============================================================================
-
-#include "tao/Environment.h"
-#include "tao/debug.h"
-#include "tao/Valuetype_Adapter.h"
-#include "tao/ORB_Core.h"
-#include "tao/TypeCode.h"
-#include "tao/Marshal.h"
-#include "tao/Any_Unknown_IDL_Type.h"
-#include "tao/CDR.h"
-#include "tao/SystemException.h"
-#include "tao/TypeCode_Constants.h"
-
-#include "ace/Dynamic_Service.h"
-
-ACE_RCSID (tao,
-           append,
-           "$Id$")
-
-// Encode instances of arbitrary data types based only on typecode.
-// "data" points to the data type; if it's not a primitve data type,
-// the TypeCode interpreter is used to recursively encode its
-// components.  "context" is the marshaling stream on which to encode
-// the data value.
-
-TAO::traverse_status
-TAO_Marshal_Primitive::append (CORBA::TypeCode_ptr tc,
-                               TAO_InputCDR *src,
-                               TAO_OutputCDR *dest
-                               ACE_ENV_ARG_DECL)
-{
-  CORBA::Boolean continue_append = 1;
-  TAO::traverse_status retval =
-    TAO::TRAVERSE_CONTINUE; // status of encode operation
-
-  CORBA::TCKind const k = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-  switch (k)
-    {
-    case CORBA::tk_null:
-    case CORBA::tk_void:
-      break;
-    case CORBA::tk_short:
-    case CORBA::tk_ushort:
-      continue_append = dest->append_short (*src);
-      break;
-    case CORBA::tk_long:
-    case CORBA::tk_ulong:
-    case CORBA::tk_float:
-    case CORBA::tk_enum:
-      continue_append = dest->append_long (*src);
-      break;
-    case CORBA::tk_double:
-    case CORBA::tk_longlong:
-    case CORBA::tk_ulonglong:
-      continue_append = dest->append_double (*src);
-      break;
-    case CORBA::tk_boolean:
-      continue_append = dest->append_boolean (*src);
-      break;
-    case CORBA::tk_char:
-    case CORBA::tk_octet:
-      continue_append = dest->append_octet (*src);
-      break;
-    case CORBA::tk_longdouble:
-      continue_append = dest->append_longdouble (*src);
-      break;
-    case CORBA::tk_wchar:
-      continue_append = dest->append_wchar (*src);
-      break;
-    default:
-      retval = TAO::TRAVERSE_STOP;
-      // we are not a primitive type
-    }
-
-  if (retval == TAO::TRAVERSE_CONTINUE
-      && continue_append == 1)
-    return TAO::TRAVERSE_CONTINUE;
-
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((
-        LM_DEBUG,
-        ACE_TEXT ("TAO_Marshal_Primitive::append detected error\n")
-      ));
-
-  ACE_THROW_RETURN (CORBA::MARSHAL (0,
-                                    CORBA::COMPLETED_MAYBE),
-                    TAO::TRAVERSE_STOP);
-}
-
-TAO::traverse_status
-TAO_Marshal_Any::append (CORBA::TypeCode_ptr,
-                         TAO_InputCDR *src,
-                         TAO_OutputCDR *dest
-                         ACE_ENV_ARG_DECL)
-{
-  // Typecode of the element that makes the Any.
-  CORBA::TypeCode_var elem_tc;
-
-  if (!(*src >> elem_tc.inout ()))
-    ACE_THROW_RETURN (CORBA::MARSHAL (0,
-                                      CORBA::COMPLETED_MAYBE),
-                      TAO::TRAVERSE_STOP);
-
-  if (!(*dest << elem_tc.in ()))
-    ACE_THROW_RETURN (CORBA::MARSHAL (0,
-                                      CORBA::COMPLETED_MAYBE),
-                      TAO::TRAVERSE_STOP);
-
-  // append the data
-  TAO::traverse_status retval =
-    TAO_Marshal_Object::perform_append (elem_tc.in (),
-                                        src,
-                                        dest
-                                        ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-  if (retval != TAO::TRAVERSE_CONTINUE)
-    {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("TAO_Marshal_Any::append detected error\n")));
-
-      ACE_THROW_RETURN (CORBA::MARSHAL (0,
-                                        CORBA::COMPLETED_MAYBE),
-                        TAO::TRAVERSE_STOP);
-    }
-
-  return retval;
-}
-
-TAO::traverse_status
-TAO_Marshal_TypeCode::append (CORBA::TypeCode_ptr,
-                              TAO_InputCDR *src,
-                              TAO_OutputCDR *dest
-                              ACE_ENV_ARG_DECL)
-{
-  CORBA::Boolean continue_append = 1;
-  TAO::traverse_status retval =
-    TAO::TRAVERSE_CONTINUE;
-  CORBA::ULong kind;
-
-  // Decode the "kind" field of the typecode from the src for further
-  // use. However, also write it back into the destination
-  continue_append = (CORBA::Boolean) (src->read_ulong (kind)
-                                      ? dest->write_ulong (kind)
-                                      : 0);
-
-  if (continue_append == 1)
-    {
-      // Typecodes with empty parameter lists all have preallocated
-      // constants.  We use those to reduce memory consumption and
-      // heap access ... also, to speed things up!
-      if ((kind < CORBA::TAO_TC_KIND_COUNT)
-          || (kind == ~0u))
-        {
-          // Either a non-constant typecode or an indirected typecode.
-          switch (kind)
-            {
-              // Need special handling for all kinds of typecodes that
-              // have nonempty parameter lists ...
-            default:
-              // nothing to de done
-              break;
-            case CORBA::tk_string:
-            case CORBA::tk_wstring:
-              {
-                // read and write the bounds
-                retval =
-                  TAO_Marshal_Object::perform_append (CORBA::_tc_long,
-                                                      src,
-                                                      dest
-                                                      ACE_ENV_ARG_PARAMETER);
-                ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-              }
-            break;
-
-            // Indirected typecodes, illegal at "top level"
-            case ~0u:
-              {
-                // read and write the negative offset
-                retval =
-                  TAO_Marshal_Object::perform_append (CORBA::_tc_long,
-                                                      src,
-                                                      dest
-                                                      ACE_ENV_ARG_PARAMETER);
-                ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-              }
-            break;
-
-            // The rest have "complex" parameter lists that are
-            // encoded as bulk octets ...
-            case CORBA::tk_objref:
-            case CORBA::tk_struct:
-            case CORBA::tk_union:
-            case CORBA::tk_enum:
-            case CORBA::tk_sequence:
-            case CORBA::tk_array:
-            case CORBA::tk_alias:
-            case CORBA::tk_except:
-            case CORBA::tk_value:
-            case CORBA::tk_value_box:
-            case CORBA::tk_native:
-            case CORBA::tk_abstract_interface:
-            case CORBA::tk_local_interface:
-            case CORBA::tk_component:
-            case CORBA::tk_home:
-            case CORBA::tk_event:
-              {
-                // write the encapsulation i.e., octet sequence
-                retval =
-                  TAO_Marshal_Object::perform_append (CORBA::_tc_OctetSeq,
-                                                      src,
-                                                      dest
-                                                      ACE_ENV_ARG_PARAMETER);
-                ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-              }
-            } // end of switch
-        }
-      else // bad kind_ value to be decoded
-        {
-          if (TAO_debug_level > 0)
-            {
-              ACE_DEBUG ((LM_DEBUG,
-                          ACE_TEXT ("TAO_Marshal_TypeCode: ")
-                          ACE_TEXT ("Bad kind_ value in CDR stream\n")));
-            }
-
-          ACE_THROW_RETURN (CORBA::BAD_TYPECODE (),
-                            TAO::TRAVERSE_STOP);
-        }
-    }
-
-  if (continue_append == 1 && retval == TAO::TRAVERSE_CONTINUE)
-    {
-      return TAO::TRAVERSE_CONTINUE;
-    }
-
-  if (TAO_debug_level > 0)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("TAO_Marshal_TypeCode::append detected error\n")));
-    }
-
-  ACE_THROW_RETURN (CORBA::MARSHAL (0,
-                                    CORBA::COMPLETED_MAYBE),
-                    TAO::TRAVERSE_STOP);
-}
-
-TAO::traverse_status
-TAO_Marshal_Principal::append (CORBA::TypeCode_ptr,
-                               TAO_InputCDR *src,
-                               TAO_OutputCDR *dest
-                               ACE_ENV_ARG_DECL)
-{
-  // write the octet sequence representing the Principal
-  return TAO_Marshal_Object::perform_append (CORBA::_tc_OctetSeq,
-                                             src,
-                                             dest
-                                             ACE_ENV_ARG_PARAMETER);
-}
-
-TAO::traverse_status
-TAO_Marshal_ObjRef::append (CORBA::TypeCode_ptr,
-                            TAO_InputCDR *src,
-                            TAO_OutputCDR *dest
-                            ACE_ENV_ARG_DECL)
-{
-  CORBA::Boolean continue_append = 1;
-
-  // First, append the type hint. This will be the type_id encoded in an
-  // object reference.
-  dest->append_string (*src);
-
-  // Read the profiles, discarding all until an IIOP profile comes by.
-  // Once we see an IIOP profile, ignore any further ones.
-  //
-  // XXX this will need to change someday to let different protocol
-  // code be accessed, not just IIOP.  Protocol modules will be
-  // dynamically loaded from shared libraries via ORB_init (), and we
-  // just need to be able to access such preloaded libraries here as
-  // we unmarshal objrefs.
-
-  CORBA::ULong profiles = 0;
-
-  // get the count of profiles that follow. This will tell us the
-  // length of the sequence
-  continue_append = (CORBA::Boolean) (src->read_ulong (profiles)
-                                      ? dest->write_ulong (profiles)
-                                      : 0);
-
-  // No profiles means a NIL objref.
-  while (profiles-- != 0 && continue_append)
-    {
-      CORBA::ULong tag = 0;
-
-      // get the profile ID tag
-      if ((continue_append = (CORBA::Boolean) (src->read_ulong (tag)
-                                               ? dest->write_ulong (tag)
-                                               : 0))  == 0)
-        continue;
-
-      CORBA::ULong length = 0;
-      if ((continue_append = (CORBA::Boolean) (src->read_ulong (length)
-                              ? dest->write_ulong (length)
-                              : 0)) == 0)
-        continue;
-
-      // @@ This can be optimized! Pre-allocating on the destination
-      //    and then copying directly into that.
-      CORBA::Octet* body = 0;
-      ACE_NEW_RETURN (body,
-                      CORBA::Octet[length],
-                      TAO::TRAVERSE_STOP);
-      continue_append =
-        (CORBA::Boolean) (src->read_octet_array (body, length)
-                          ? dest->write_octet_array (body, length)
-                          : 0);
-      delete [] body;
-    }
-
-  if (continue_append == 1)
-    return TAO::TRAVERSE_CONTINUE;
-
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((
-        LM_DEBUG,
-        ACE_TEXT ("TAO_Marshal_ObjRef::append detected error\n")
-      ));
-
-  ACE_THROW_RETURN (CORBA::MARSHAL (0,
-                                    CORBA::COMPLETED_MAYBE),
-                    TAO::TRAVERSE_STOP);
-}
-
-TAO::traverse_status
-TAO_Marshal_Struct::append (CORBA::TypeCode_ptr  tc,
-                            TAO_InputCDR *src,
-                            TAO_OutputCDR *dest
-                            ACE_ENV_ARG_DECL)
-{
-  TAO::traverse_status retval =
-    TAO::TRAVERSE_CONTINUE;
-  CORBA::TypeCode_var param;
-
-  // Number of fields in the struct.
-  const CORBA::ULong member_count =
-    tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-  for (CORBA::ULong i = 0;
-       i < member_count && retval == TAO::TRAVERSE_CONTINUE;
-       ++i)
-    {
-      // get member type
-      param = tc->member_type (i ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-      retval =
-        TAO_Marshal_Object::perform_append (param.in (),
-                                            src,
-                                            dest
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-    }
-
-  if (retval == TAO::TRAVERSE_CONTINUE)
-    return TAO::TRAVERSE_CONTINUE;
-
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("TAO_Marshal_Struct::append detected error\n")));
-
-  ACE_THROW_RETURN (CORBA::MARSHAL (0,
-                                    CORBA::COMPLETED_MAYBE),
-                    TAO::TRAVERSE_STOP);
-}
-
-TAO::traverse_status
-TAO_Marshal_Union::append (CORBA::TypeCode_ptr tc,
-                           TAO_InputCDR *src,
-                           TAO_OutputCDR *dest
-                           ACE_ENV_ARG_DECL)
-{
-  CORBA::TypeCode_var discrim_tc =
-    tc->discriminator_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-  CORBA::ULong kind =
-    discrim_tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-  // Save the discriminator value in a temporary variable...
-  CORBA::Short short_v;
-  CORBA::UShort ushort_v;
-  CORBA::Long long_v;
-  CORBA::ULong ulong_v;
-  CORBA::ULong enum_v;
-  CORBA::Char char_v;
-  CORBA::WChar wchar_v;
-  CORBA::Boolean boolean_v = false;
-
-  switch (kind)
-    {
-    case CORBA::tk_short:
-      {
-        if (!src->read_short (short_v)
-            || !dest->write_short (short_v))
-          return TAO::TRAVERSE_STOP;
-      }
-      break;
-
-    case CORBA::tk_ushort:
-      {
-        if (!src->read_ushort (ushort_v)
-            || !dest->write_ushort (ushort_v))
-          return TAO::TRAVERSE_STOP;
-      }
-      break;
-
-    case CORBA::tk_long:
-      {
-        if (!src->read_long (long_v)
-            || !dest->write_long (long_v))
-          return TAO::TRAVERSE_STOP;
-      }
-      break;
-
-    case CORBA::tk_ulong:
-      {
-        if (!src->read_ulong (ulong_v)
-            || !dest->write_ulong (ulong_v))
-          return TAO::TRAVERSE_STOP;
-      }
-      break;
-
-    case CORBA::tk_enum:
-      {
-        if (!src->read_ulong (enum_v)
-            || !dest->write_ulong (enum_v))
-          return TAO::TRAVERSE_STOP;
-      }
-      break;
-
-    case CORBA::tk_char:
-      {
-        if (!src->read_char (char_v)
-            || !dest->write_char (char_v))
-          return TAO::TRAVERSE_STOP;
-      }
-      break;
-
-    case CORBA::tk_wchar:
-      {
-        if (!src->read_wchar (wchar_v)
-            || !dest->write_wchar (wchar_v))
-          return TAO::TRAVERSE_STOP;
-      }
-      break;
-
-    case CORBA::tk_boolean:
-      {
-        if (!src->read_boolean (boolean_v)
-            || !dest->write_boolean (boolean_v))
-          return TAO::TRAVERSE_STOP;
-      }
-      break;
-
-    default:
-      return TAO::TRAVERSE_STOP;
-    }
-
-  const CORBA::ULong member_count =
-    tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-  const CORBA::ULong null_member = ~static_cast<CORBA::ULong> (0U);
-
-  CORBA::ULong current_member = null_member;
-  CORBA::ULong default_member = null_member;
-
-  for (CORBA::ULong i = 0;
-       i < member_count && current_member == null_member;
-       ++i)
-    {
-      CORBA::Any_var any = tc->member_label (i
-                                             ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-      CORBA::Octet o;
-
-      if ((any >>= CORBA::Any::to_octet (o)) && o == 0)
-        {
-          CORBA::ULong default_index =
-            tc->default_index (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-          if (i != default_index)
-            ACE_THROW_RETURN (CORBA::BAD_TYPECODE (),
-                              TAO::TRAVERSE_STOP);
-          // Found the default branch, save its position and continue
-          // trying to find the current value...
-          default_member = i;
-          continue;
-        }
-
-      switch (kind)
-        {
-        case CORBA::tk_short:
-          {
-            CORBA::Short d;
-            if ((any >>= d) && d == short_v)
-              current_member = i;
-          }
-          break;
-
-        case CORBA::tk_ushort:
-          {
-            CORBA::UShort d;
-            if ((any >>= d) && d == ushort_v)
-              current_member = i;
-          }
-          break;
-
-        case CORBA::tk_long:
-          {
-            CORBA::Long d;
-            if ((any >>= d) && d == long_v)
-              current_member = i;
-          }
-          break;
-
-        case CORBA::tk_ulong:
-          {
-            CORBA::ULong d;
-            if ((any >>= d) && d == ulong_v)
-              current_member = i;
-          }
-          break;
-
-        case CORBA::tk_enum:
-          {
-            CORBA::ULong d;
-            TAO::Any_Impl *impl = any->impl ();
-
-            if (impl->encoded ())
-              {
-                TAO::Unknown_IDL_Type *unk =
-                  dynamic_cast<TAO::Unknown_IDL_Type *> (impl);
-
-                // We don't want unk's rd_ptr to move, in case
-                // we are shared by another Any, so we use this
-                // to copy the state, not the buffer.
-                TAO_InputCDR for_reading (unk->_tao_get_cdr ());
-
-                for_reading.read_ulong (d);
-              }
-            else
-              {
-                TAO_OutputCDR out;
-                impl->marshal_value (out);
-                TAO_InputCDR cdr (out);
-                cdr.read_ulong (d);
-              }
-
-            if (d == enum_v)
-              {
-                current_member = i;
-              }
-          }
-          break;
-
-        case CORBA::tk_char:
-          {
-            CORBA::Char d;
-            if ((any >>= CORBA::Any::to_char (d)) && d == char_v)
-              current_member = i;
-          }
-          break;
-
-        case CORBA::tk_wchar:
-          {
-            CORBA::WChar d;
-            if ((any >>= CORBA::Any::to_wchar (d)) && d == wchar_v)
-              current_member = i;
-          }
-          break;
-
-        case CORBA::tk_boolean:
-          {
-            CORBA::Boolean d;
-            if ((any >>= CORBA::Any::to_boolean (d)) && d == boolean_v)
-              current_member = i;
-          }
-          break;
-
-        default:
-          return TAO::TRAVERSE_STOP;
-        }
-    }
-
-  if (current_member == null_member)
-    {
-      // Cannot find the current member, check if there is a
-      // default...
-      if (default_member != null_member)
-        {
-          // Good, use the default to append...
-          CORBA::TypeCode_var member_tc =
-            tc->member_type (default_member ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-          return TAO_Marshal_Object::perform_append (member_tc.in (),
-                                                     src,
-                                                     dest
-                                                     ACE_ENV_ARG_PARAMETER);
-        }
-
-      // If we're here, we have an implicit default case, and we
-      // should just return without appending anything, since no
-      // union member was marshaled in the first place.
-      return TAO::TRAVERSE_CONTINUE;
-    }
-
-  // If we found the member successfully then just use that one...
-  CORBA::TypeCode_var member_tc =
-    tc->member_type (current_member ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-  return TAO_Marshal_Object::perform_append (member_tc.in (),
-                                             src,
-                                             dest
-                                             ACE_ENV_ARG_PARAMETER);
-}
-
-TAO::traverse_status
-TAO_Marshal_String::append (CORBA::TypeCode_ptr,
-                            TAO_InputCDR *src,
-                            TAO_OutputCDR *dest
-                            ACE_ENV_ARG_DECL)
-{
-  CORBA::Boolean continue_append = 1;
-
-  // On decode, omit the check against specified string bounds, and
-  // cope with illegal "zero length" strings (all lengths on the wire
-  // must include a NUL).
-  //
-  // This is on the principle of being gracious in what we accept; we
-  // don't generate messages that fail to comply with protocol specs,
-  // but we will accept them when it's clear how to do so.
-
-  continue_append = dest->append_string (*src);
-  if (continue_append == 1)
-    return TAO::TRAVERSE_CONTINUE;
-
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("TAO_Marshal_TypeCode::append detected error\n")));
-
-  ACE_THROW_RETURN (CORBA::MARSHAL (0,
-                                    CORBA::COMPLETED_MAYBE),
-                    TAO::TRAVERSE_STOP);
-}
-
-TAO::traverse_status
-TAO_Marshal_Sequence::append (CORBA::TypeCode_ptr  tc,
-                              TAO_InputCDR *src,
-                              TAO_OutputCDR *dest
-                              ACE_ENV_ARG_DECL)
-{
-  // Size of element.
-  CORBA::ULong bounds;
-
-  // First unmarshal the sequence length ... we trust it to be right
-  // here, on the "be gracious in what you accept" principle.  We
-  // don't generate illegal sequences (i.e. length > bounds).
-
-  CORBA::Boolean continue_append =
-    (CORBA::Boolean) (src->read_ulong (bounds)
-                      ? dest->write_ulong (bounds)
-                      : 0);
-
-  if (!continue_append)
-    {
-      ACE_DEBUG ((
-          LM_DEBUG,
-          ACE_TEXT ("TAO_Marshal_Sequence::append detected error\n")
-        ));
-      ACE_THROW_RETURN (CORBA::MARSHAL (),
-                        TAO::TRAVERSE_STOP);
-    }
-
-  if (bounds == 0)
-    {
-      return TAO::TRAVERSE_CONTINUE;
-    }
-
-  if (continue_append)
-    {
-      // Get element typecode.
-      CORBA::TypeCode_var tc2 =
-        tc->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-      TAO::traverse_status retval =
-        TAO::TRAVERSE_CONTINUE;
-
-      CORBA::TCKind kind = tc2->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-      ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-      switch (kind)
-        {
-        case CORBA::tk_octet:
-          {
-            char* buf;
-            if (dest->adjust (ACE_CDR::OCTET_SIZE * bounds,
-                              ACE_CDR::OCTET_ALIGN, buf) == 0)
-              {
-                if (src->read_octet_array ((ACE_CDR::Octet*)buf, bounds) == 0)
-                  retval = TAO::TRAVERSE_STOP;
-              }
-          }
-          break;
-        case CORBA::tk_boolean:
-          {
-            char* buf;
-            if (dest->adjust (ACE_CDR::OCTET_SIZE * bounds,
-                              ACE_CDR::OCTET_ALIGN, buf) == 0)
-              {
-                if (src->read_boolean_array ((ACE_CDR::Boolean*)buf, bounds) == 0)
-                  retval = TAO::TRAVERSE_STOP;
-              }
-          }
-          break;
-        case CORBA::tk_char:
-          {
-            char* buf;
-            if (dest->adjust (ACE_CDR::OCTET_SIZE * bounds,
-                              ACE_CDR::OCTET_ALIGN, buf) == 0)
-              {
-                if (src->read_char_array ((ACE_CDR::Char*)buf, bounds) == 0)
-                  retval = TAO::TRAVERSE_STOP;
-              }
-          }
-          break;
-        case CORBA::tk_short:
-          {
-            char* buf;
-            if (dest->adjust (ACE_CDR::SHORT_SIZE * bounds,
-                              ACE_CDR::SHORT_ALIGN, buf) == 0)
-              {
-                if (src->read_short_array ((ACE_CDR::Short*)buf, bounds) == 0)
-                  retval = TAO::TRAVERSE_STOP;
-              }
-          }
-          break;
-        case CORBA::tk_ushort:
-          {
-            char* buf;
-            if (dest->adjust (ACE_CDR::SHORT_SIZE * bounds,
-                              ACE_CDR::SHORT_ALIGN, buf) == 0)
-              {
-                if (src->read_ushort_array ((ACE_CDR::UShort*)buf, bounds) == 0)
-                  retval = TAO::TRAVERSE_STOP;
-              }
-          }
-          break;
-        case CORBA::tk_wchar:
-          {
-            char* buf;
-            if (dest->adjust (ACE_CDR::SHORT_SIZE * bounds,
-                              ACE_CDR::SHORT_ALIGN, buf) == 0)
-              {
-                if (src->read_wchar_array ((ACE_CDR::WChar*)buf, bounds) == 0)
-                  retval = TAO::TRAVERSE_STOP;
-              }
-          }
-          break;
-        case CORBA::tk_long:
-          {
-            char* buf;
-            if (dest->adjust (ACE_CDR::LONG_SIZE * bounds,
-                              ACE_CDR::LONG_ALIGN, buf) == 0)
-              {
-                if (src->read_long_array ((ACE_CDR::Long*)buf, bounds) == 0)
-                  retval = TAO::TRAVERSE_STOP;
-              }
-          }
-          break;
-        case CORBA::tk_ulong:
-          {
-            char* buf;
-            if (dest->adjust (ACE_CDR::LONG_SIZE * bounds,
-                              ACE_CDR::LONG_ALIGN, buf) == 0)
-              {
-                if (src->read_ulong_array ((ACE_CDR::ULong*)buf, bounds) == 0)
-                  retval = TAO::TRAVERSE_STOP;
-              }
-          }
-          break;
-        case CORBA::tk_float:
-          {
-            char* buf;
-            if (dest->adjust (ACE_CDR::LONG_SIZE * bounds,
-                              ACE_CDR::LONG_ALIGN, buf) == 0)
-              {
-                if (src->read_float_array ((ACE_CDR::Float*)buf, bounds) == 0)
-                  retval = TAO::TRAVERSE_STOP;
-              }
-          }
-          break;
-        case CORBA::tk_double:
-          {
-            char* buf;
-            if (dest->adjust (ACE_CDR::LONGLONG_SIZE * bounds,
-                              ACE_CDR::LONGLONG_ALIGN, buf) == 0)
-              {
-                if (src->read_double_array ((ACE_CDR::Double*)buf, bounds) == 0)
-                  retval = TAO::TRAVERSE_STOP;
-              }
-          }
-          break;
-        case CORBA::tk_longlong:
-          {
-            char* buf;
-            if (dest->adjust (ACE_CDR::LONGLONG_SIZE * bounds,
-                              ACE_CDR::LONGLONG_ALIGN, buf) == 0)
-              {
-                if (src->read_longlong_array ((ACE_CDR::LongLong*)buf, bounds) == 0)
-                  retval = TAO::TRAVERSE_STOP;
-              }
-          }
-          break;
-        case CORBA::tk_ulonglong:
-          {
-            char* buf;
-            if (dest->adjust (ACE_CDR::LONGLONG_SIZE * bounds,
-                              ACE_CDR::LONGLONG_ALIGN, buf) == 0)
-              {
-                if (src->read_ulonglong_array ((ACE_CDR::ULongLong*)buf, bounds) == 0)
-                  retval = TAO::TRAVERSE_STOP;
-              }
-          }
-          break;
-        case CORBA::tk_longdouble:
-          {
-            char* buf;
-            if (dest->adjust (ACE_CDR::LONGDOUBLE_SIZE * bounds,
-                              ACE_CDR::LONGDOUBLE_ALIGN, buf) == 0)
-              {
-                if (src->read_longdouble_array ((ACE_CDR::LongDouble*)buf, bounds) == 0)
-                  retval = TAO::TRAVERSE_STOP;
-              }
-          }
-          break;
-
-        default:
-          while (bounds-- && retval == TAO::TRAVERSE_CONTINUE)
-            {
-              retval = TAO_Marshal_Object::perform_append (tc2.in (),
-                                                           src,
-                                                           dest
-                                                            ACE_ENV_ARG_PARAMETER);
-              ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-            }
-          break;
-        }// end of switch
-
-      if (retval == TAO::TRAVERSE_CONTINUE)
-        return TAO::TRAVERSE_CONTINUE;
-    }
-  // error exit
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((
-        LM_DEBUG,
-        ACE_TEXT ("marshaling TAO_Marshal_Sequence::append detected error\n")
-      ));
-
-  ACE_THROW_RETURN (CORBA::MARSHAL (),
-                    TAO::TRAVERSE_STOP);
-}
-
-TAO::traverse_status
-TAO_Marshal_Array::append (CORBA::TypeCode_ptr  tc,
-                           TAO_InputCDR *src,
-                           TAO_OutputCDR *dest
-                           ACE_ENV_ARG_DECL)
-{
-  // retrieve the bounds of the array
-  CORBA::ULong bounds = tc->length (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-  // get element typecode
-  CORBA::TypeCode_var tc2 = tc->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-  // For CORBA basic types, the copy can be optimized
-  CORBA::TCKind kind = tc2->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-  // Return status.
-  TAO::traverse_status retval =
-    TAO::TRAVERSE_CONTINUE;
-
-  switch (kind)
-    {
-    case CORBA::tk_octet:
-      {
-        char* buf;
-        if (dest->adjust (ACE_CDR::OCTET_SIZE * bounds,
-                          ACE_CDR::OCTET_ALIGN, buf) == 0)
-          {
-            if (src->read_octet_array ((ACE_CDR::Octet*)buf, bounds) == 0)
-              retval = TAO::TRAVERSE_STOP;
-          }
-      }
-      break;
-    case CORBA::tk_boolean:
-      {
-        char* buf;
-        if (dest->adjust (ACE_CDR::OCTET_SIZE * bounds,
-                          ACE_CDR::OCTET_ALIGN, buf) == 0)
-          {
-            if (src->read_boolean_array ((ACE_CDR::Boolean*)buf, bounds) == 0)
-              retval = TAO::TRAVERSE_STOP;
-          }
-      }
-      break;
-    case CORBA::tk_char:
-      {
-        char* buf;
-        if (dest->adjust (ACE_CDR::OCTET_SIZE * bounds,
-                          ACE_CDR::OCTET_ALIGN, buf) == 0)
-          {
-            if (src->read_char_array ((ACE_CDR::Char*)buf, bounds) == 0)
-              retval = TAO::TRAVERSE_STOP;
-          }
-      }
-      break;
-    case CORBA::tk_short:
-      {
-        char* buf;
-        if (dest->adjust (ACE_CDR::SHORT_SIZE * bounds,
-                          ACE_CDR::SHORT_ALIGN, buf) == 0)
-          {
-            if (src->read_short_array ((ACE_CDR::Short*)buf, bounds) == 0)
-              retval = TAO::TRAVERSE_STOP;
-          }
-      }
-      break;
-    case CORBA::tk_ushort:
-      {
-        char* buf;
-        if (dest->adjust (ACE_CDR::SHORT_SIZE * bounds,
-                          ACE_CDR::SHORT_ALIGN, buf) == 0)
-          {
-            if (src->read_ushort_array ((ACE_CDR::UShort*)buf, bounds) == 0)
-              retval = TAO::TRAVERSE_STOP;
-          }
-      }
-      break;
-    case CORBA::tk_wchar:
-      {
-        char* buf;
-        if (dest->adjust (ACE_CDR::SHORT_SIZE * bounds,
-                          ACE_CDR::SHORT_ALIGN, buf) == 0)
-          {
-            if (src->read_wchar_array ((ACE_CDR::WChar*)buf, bounds) == 0)
-              retval = TAO::TRAVERSE_STOP;
-          }
-      }
-      break;
-    case CORBA::tk_long:
-      {
-        char* buf;
-        if (dest->adjust (ACE_CDR::LONG_SIZE * bounds,
-                          ACE_CDR::LONG_ALIGN, buf) == 0)
-          {
-            if (src->read_long_array ((ACE_CDR::Long*)buf, bounds) == 0)
-              retval = TAO::TRAVERSE_STOP;
-          }
-      }
-      break;
-    case CORBA::tk_ulong:
-      {
-        char* buf;
-        if (dest->adjust (ACE_CDR::LONG_SIZE * bounds,
-                          ACE_CDR::LONG_ALIGN, buf) == 0)
-          {
-            if (src->read_ulong_array ((ACE_CDR::ULong*)buf, bounds) == 0)
-              retval = TAO::TRAVERSE_STOP;
-          }
-      }
-      break;
-    case CORBA::tk_float:
-      {
-        char* buf;
-        if (dest->adjust (ACE_CDR::LONG_SIZE * bounds,
-                          ACE_CDR::LONG_ALIGN, buf) == 0)
-          {
-            if (src->read_float_array ((ACE_CDR::Float*)buf, bounds) == 0)
-              retval = TAO::TRAVERSE_STOP;
-          }
-      }
-      break;
-    case CORBA::tk_double:
-      {
-        char* buf;
-        if (dest->adjust (ACE_CDR::LONGLONG_SIZE * bounds,
-                          ACE_CDR::LONGLONG_ALIGN, buf) == 0)
-          {
-            if (src->read_double_array ((ACE_CDR::Double*)buf, bounds) == 0)
-              retval = TAO::TRAVERSE_STOP;
-          }
-      }
-      break;
-    case CORBA::tk_longlong:
-      {
-        char* buf;
-        if (dest->adjust (ACE_CDR::LONGLONG_SIZE * bounds,
-                          ACE_CDR::LONGLONG_ALIGN, buf) == 0)
-          {
-            if (src->read_longlong_array ((ACE_CDR::LongLong*)buf, bounds) == 0)
-              retval = TAO::TRAVERSE_STOP;
-          }
-      }
-      break;
-    case CORBA::tk_ulonglong:
-      {
-        char* buf;
-        if (dest->adjust (ACE_CDR::LONGLONG_SIZE * bounds,
-                          ACE_CDR::LONGLONG_ALIGN, buf) == 0)
-          {
-            if (src->read_ulonglong_array ((ACE_CDR::ULongLong*)buf, bounds) == 0)
-              retval = TAO::TRAVERSE_STOP;
-          }
-      }
-      break;
-    case CORBA::tk_longdouble:
-      {
-        char* buf;
-        if (dest->adjust (ACE_CDR::LONGDOUBLE_SIZE * bounds,
-                          ACE_CDR::LONGDOUBLE_ALIGN, buf) == 0)
-          {
-            if (src->read_longdouble_array ((ACE_CDR::LongDouble*)buf, bounds) == 0)
-              retval = TAO::TRAVERSE_STOP;
-          }
-      }
-      break;
-    default:
-      while (bounds-- && retval == TAO::TRAVERSE_CONTINUE)
-        {
-          retval = TAO_Marshal_Object::perform_append (tc2.in (),
-                                                       src,
-                                                       dest
-                                                       ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-        }
-      break;
-    }// end of switch
-
-  if (retval == TAO::TRAVERSE_CONTINUE)
-    return retval;
-
-  // error exit
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("TAO_Marshal_Sequence::append detected error\n")));
-
-  ACE_THROW_RETURN (CORBA::MARSHAL (),
-                    TAO::TRAVERSE_STOP);
-}
-
-TAO::traverse_status
-TAO_Marshal_Alias::append (CORBA::TypeCode_ptr  tc,
-                           TAO_InputCDR *src,
-                           TAO_OutputCDR *dest
-                           ACE_ENV_ARG_DECL)
-{
-  // Typecode of the aliased type.
-  CORBA::TypeCode_var tc2;
-  CORBA::Boolean continue_append = 1;
-
-  // Status of decode operation.
-  TAO::traverse_status retval =
-    TAO::TRAVERSE_CONTINUE;
-
-  tc2 = tc->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-  retval = TAO_Marshal_Object::perform_append (tc2.in (),
-                                               src,
-                                               dest
-                                               ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-  if (retval == TAO::TRAVERSE_CONTINUE
-      && continue_append == 1)
-    return TAO::TRAVERSE_CONTINUE;
-
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("TAO_Marshal_Alias::append detected error\n")));
-  ACE_THROW_RETURN (CORBA::MARSHAL (0,
-                                    CORBA::COMPLETED_MAYBE),
-                    TAO::TRAVERSE_STOP);
-}
-
-// Decode exception For exceptions, the "hidden" type ID near the
-// front of the on-wire representation was previously unmarshaled and
-// mapped to the "tc" typcode we're using to traverse the memory ...
-// at the same time its vtable, refcount, and other state was
-// established.
-//
-// NOTE: This is asymmetric with respect to encoding exceptions.
-TAO::traverse_status
-TAO_Marshal_Except::append (CORBA::TypeCode_ptr  tc,
-                            TAO_InputCDR *src,
-                            TAO_OutputCDR *dest
-                            ACE_ENV_ARG_DECL)
-{
-  TAO::traverse_status retval =
-    TAO::TRAVERSE_CONTINUE;
-  CORBA::Boolean continue_append = 1;
-  CORBA::TypeCode_var param;
-
-  // first append the RepositoryID
-  continue_append = dest->append_string (*src);
-
-  // Number of fields in the struct.
-  const CORBA::ULong member_count =
-    tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-  for (CORBA::ULong i = 0;
-       i < member_count
-         && retval == TAO::TRAVERSE_CONTINUE
-         && continue_append == 1;
-       ++i)
-    {
-      param = tc->member_type (i ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-      retval = TAO_Marshal_Object::perform_append (param.in (),
-                                                   src,
-                                                   dest
-                                                   ACE_ENV_ARG_PARAMETER);
-    }
-
-  if (retval == TAO::TRAVERSE_CONTINUE
-      && continue_append == 1)
-    return TAO::TRAVERSE_CONTINUE;
-
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("TAO_Marshal_Except::append detected error\n")));
-
-  ACE_THROW_RETURN (CORBA::MARSHAL (0,
-                                    CORBA::COMPLETED_MAYBE),
-                    TAO::TRAVERSE_STOP);
-}
-
-TAO::traverse_status
-TAO_Marshal_WString::append (CORBA::TypeCode_ptr,
-                             TAO_InputCDR *src,
-                             TAO_OutputCDR *dest
-                             ACE_ENV_ARG_DECL)
-{
-  CORBA::Boolean continue_append = 1;
-
-  // On decode, omit the check against specified wstring bounds, and
-  // cope with illegal "zero length" strings (all lengths on the wire
-  // must include a NUL).
-  //
-  // This is on the principle of being gracious in what we accept; we
-  // don't generate messages that fail to comply with protocol specs,
-  // but we will accept them when it's clear how to do so.
-
-  continue_append = dest->append_wstring (*src);
-
-  if (continue_append == 1)
-    return TAO::TRAVERSE_CONTINUE;
-
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("TAO_Marshal_WString::append detected error\n")));
-
-  ACE_THROW_RETURN (CORBA::MARSHAL (0,
-                                    CORBA::COMPLETED_MAYBE),
-                    TAO::TRAVERSE_STOP);
-}
-
-TAO::traverse_status
-TAO_Marshal_Value::append (CORBA::TypeCode_ptr  tc,
-                           TAO_InputCDR *src,
-                           TAO_OutputCDR *dest
-                           ACE_ENV_ARG_DECL)
-{
-  TAO::traverse_status retval =
-    TAO::TRAVERSE_CONTINUE;
-
-  // Use the same method to append our base valuetype.
-  // To achive this we'll need to distinguish between
-  // first-time/nested appends so that we won't attempt to
-  // append rep_id several times.
-  //
-  if (this->nested_processing_ == 0)
-    {
-      this->nested_processing_ = 1;
-
-      CORBA::ULong value_tag;
-
-      if (!src->read_ulong (value_tag) ||
-          !dest->write_ulong (value_tag))
-        {
-          return TAO::TRAVERSE_STOP;
-        }
-
-      TAO_Valuetype_Adapter *adapter =
-        ACE_Dynamic_Service<TAO_Valuetype_Adapter>::instance (
-            TAO_ORB_Core::valuetype_adapter_name ()
-          );
-
-      if (adapter == 0)
-        {
-          ACE_THROW_RETURN (CORBA::INTERNAL (),
-                            TAO::TRAVERSE_STOP);
-        }
-
-      if (value_tag == 0) // Null value type pointer.
-        {
-          //We are done.
-          return retval;
-        }
-      else if (value_tag & adapter->type_info_single ())
-        {
-          // Append repository id which is of type string.
-          dest->append_string (*src);
-        }
-      else
-        {
-          //@@ boris: VT CDR
-          return TAO::TRAVERSE_STOP;
-        }
-    }
-
-  // Handle our base valuetype if any.
-  CORBA::TypeCode_var param =
-    tc->concrete_base_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-  CORBA::TCKind const param_kind = param->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-  if (param_kind != CORBA::tk_null)
-    {
-      retval = this->append (param.in (),
-                             src,
-                             dest
-                             ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-      if (retval != TAO::TRAVERSE_CONTINUE)
-        {
-          return retval;
-        }
-    }
-
-  // Number of fields in the struct.
-  const CORBA::ULong member_count =
-    tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-  for (CORBA::ULong i = 0;
-       i < member_count && retval == TAO::TRAVERSE_CONTINUE;
-       ++i)
-    {
-      // get member type
-      param = tc->member_type (i ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-      retval =
-        TAO_Marshal_Object::perform_append (param.in (),
-                                            src,
-                                            dest
-                                            ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-    }
-
-  if (retval == TAO::TRAVERSE_CONTINUE)
-    return TAO::TRAVERSE_CONTINUE;
-
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("TAO_Marshal_Value::append detected error\n")));
-
-  ACE_THROW_RETURN (CORBA::MARSHAL (0,
-                                    CORBA::COMPLETED_MAYBE),
-                    TAO::TRAVERSE_STOP);
-}
diff --git a/TAO/tao/corba.h b/TAO/tao/corba.h
index b94dc564704..737bd8d5930 100644
--- a/TAO/tao/corba.h
+++ b/TAO/tao/corba.h
@@ -34,21 +34,18 @@
 
 // The definitions are included in the same order as they are declared
 // in corbafwd.h
-#include "tao/TypeCode.h"
+#include "tao/AnyTypeCode/TypeCode.h"
 
 #include "tao/Environment.h"
 #include "tao/SystemException.h"
 #include "tao/UserException.h"
 
-#include "tao/NVList.h"
-
 #include "tao/Object.h"
 #include "tao/LocalObject.h"
 #include "tao/Principal.h"
 #include "tao/ORB.h"
 
 #include "tao/CurrentC.h"
-#include "tao/BoundsC.h"
 #include "tao/PolicyC.h"
 #include "tao/ServicesC.h"
 #include "tao/DomainC.h"
@@ -56,7 +53,6 @@
 
 #include "tao/ObjectIdListC.h"
 
-#include "tao/AnySeqC.h"
 #include "tao/BooleanSeqC.h"
 #include "tao/CharSeqC.h"
 #include "tao/DoubleSeqC.h"
diff --git a/TAO/tao/corbafwd.h b/TAO/tao/corbafwd.h
index a15ee8c758b..80a9dc3b318 100644
--- a/TAO/tao/corbafwd.h
+++ b/TAO/tao/corbafwd.h
@@ -31,7 +31,6 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
-#include "tao/TC_Constants_Forward.h"
 #include "tao/CORBA_methods.h"
 
 #include /**/ "ace/post.h"
diff --git a/TAO/tao/extra_core.mpb b/TAO/tao/extra_core.mpb
index 3d16ae00da6..8d7542b0509 100644
--- a/TAO/tao/extra_core.mpb
+++ b/TAO/tao/extra_core.mpb
@@ -3,7 +3,6 @@
 
 feature(!minimum_corba) {
   Source_Files(TAO_COMPONENTS) {
-    NVList.cpp
     ClientRequestInterceptor_Adapter.cpp
     ServerRequestInterceptor_Adapter.cpp
     ServicesC.cpp
diff --git a/TAO/tao/operation_details.cpp b/TAO/tao/operation_details.cpp
index 807f8e480b7..c75ced2a83f 100644
--- a/TAO/tao/operation_details.cpp
+++ b/TAO/tao/operation_details.cpp
@@ -1,25 +1,22 @@
 //$Id$
+
 #include "operation_details.h"
 #include "Stub.h"
-#include "TypeCode.h"
 #include "ORB_Constants.h"
-#include "DynamicC.h"
 #include "Exception_Data.h"
 #include "SystemException.h"
+#include "Argument.h"
 
 #include "ace/OS_NS_string.h"
 
-
 #if !defined (__ACE_INLINE__)
 # include "tao/operation_details.i"
 #endif /* ! __ACE_INLINE__ */
 
-
 ACE_RCSID (tao,
            operation_details,
            "$Id$")
 
-
 CORBA::Exception *
 TAO_Operation_Details::corba_exception (const char *id
                                         ACE_ENV_ARG_DECL)
@@ -78,54 +75,3 @@ TAO_Operation_Details::demarshal_args (TAO_InputCDR &cdr)
   return true;
 }
 
-#if TAO_HAS_INTERCEPTORS == 1
-
-bool
-TAO_Operation_Details::parameter_list (Dynamic::ParameterList &param_list)
-{
-  // Account for the return type that could be in the argument list.
-  param_list.length (this->num_args_ - 1);
-
-   for (CORBA::ULong i = 1; i != this->num_args_; ++i)
-     this->args_[i]->interceptor_param (param_list[i - 1]);
-
-   return true;
-}
-
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
-
-#if TAO_HAS_INTERCEPTORS == 1
-
-bool
-TAO_Operation_Details::exception_list (Dynamic::ExceptionList &exception_list)
-{
-  if (this->ex_count_)
-    {
-      exception_list.length (this->ex_count_);
-
-      for (CORBA::ULong i = 0;
-           i != this->ex_count_;
-           ++i)
-        {
-          CORBA::TypeCode_ptr tcp = this->ex_data_[i].tc_ptr;
-          TAO_Pseudo_Object_Manager<CORBA::TypeCode> tcp_object (&tcp, 1);
-          exception_list[i] = tcp_object;
-        }
-    }
-  return true;
-}
-
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
-
-#if TAO_HAS_INTERCEPTORS == 1
-
-bool
-TAO_Operation_Details::result (CORBA::Any *any)
-{
-  for (CORBA::ULong i = 0; i != this->num_args_; ++i)
-    (*this->args_[i]).interceptor_result (any);
-
-  return true;
-}
-
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
diff --git a/TAO/tao/operation_details.h b/TAO/tao/operation_details.h
index 04d137e39e9..0b1fee4c2a3 100644
--- a/TAO/tao/operation_details.h
+++ b/TAO/tao/operation_details.h
@@ -76,7 +76,6 @@ public:
   void response_flags (CORBA::Octet flags);
 
   /// Get the response flags
-  CORBA::Octet response_flags (void);
   CORBA::Octet response_flags (void) const;
 
   /// Accessors for the service context list
@@ -103,7 +102,6 @@ public:
   CORBA::ULong request_id (void) const;
 
   /// Accessor method for the addressing mode
-  TAO_Target_Specification::TAO_Target_Address addressing_mode (void);
   TAO_Target_Specification::TAO_Target_Address addressing_mode (void) const;
 
   /// Set method for the addressing mode
@@ -133,22 +131,15 @@ public:
   /// Demarshals the list of <this->arg_> into the \a cdr.
   bool demarshal_args (TAO_InputCDR &cdr);
 
-  /**
-   * The following methods are used by client interceptors to extract
-   * the list of parameters passed by the operation, exceptions
-   * declared for the operation, and the result when available.
-   */
-#if TAO_HAS_INTERCEPTORS == 1
-  bool exception_list (Dynamic::ExceptionList &exception_list);
-  bool parameter_list (Dynamic::ParameterList &param_list);
-  bool result (CORBA::Any *any);
-#endif /* TAO_HAS_INTERCEPTORS == 1 */
-  //@}
-
   /// Accessors for the argument list
   TAO::Argument ** args (void) const;
   CORBA::ULong args_num (void) const ;
 
+  /// Exception count
+  CORBA::ULong ex_count (void) const;
+
+  TAO::Exception_Data const * ex_data (void) const;
+
 private:
 
   /// Name of the operation being invoked.
diff --git a/TAO/tao/operation_details.i b/TAO/tao/operation_details.i
index f1178f5bc87..666bb7cad51 100644
--- a/TAO/tao/operation_details.i
+++ b/TAO/tao/operation_details.i
@@ -118,22 +118,22 @@ TAO_Operation_Details::response_flags (CORBA::Octet flags)
   this->response_flags_ = flags;
 }
 
-ACE_INLINE CORBA::Octet
-TAO_Operation_Details::response_flags (void)
+ACE_INLINE CORBA::ULong
+TAO_Operation_Details::ex_count (void) const
 {
-  return this->response_flags_;
+  return this->ex_count_;
 }
 
-ACE_INLINE CORBA::Octet
-TAO_Operation_Details::response_flags (void) const
+ACE_INLINE TAO::Exception_Data const *
+TAO_Operation_Details::ex_data (void) const
 {
-  return this->response_flags_;
+  return this->ex_data_;
 }
 
-ACE_INLINE TAO_Target_Specification::TAO_Target_Address
-TAO_Operation_Details::addressing_mode (void)
+ACE_INLINE CORBA::Octet
+TAO_Operation_Details::response_flags (void) const
 {
-  return this->addressing_mode_;
+  return this->response_flags_;
 }
 
 ACE_INLINE TAO_Target_Specification::TAO_Target_Address
diff --git a/TAO/tao/orb.idl b/TAO/tao/orb.idl
index 4d0e7a8fe94..265865f4d2f 100644
--- a/TAO/tao/orb.idl
+++ b/TAO/tao/orb.idl
@@ -8,7 +8,6 @@
 #define TAO_ORB_IDL
 
 ///FUZZ: disable check_for_include/
-#include <tao/AnySeq.pidl>
 #include <tao/BooleanSeq.pidl>
 #include <tao/CharSeq.pidl>
 #include <tao/DoubleSeq.pidl>
@@ -36,8 +35,6 @@
 #include <tao/ParameterMode.pidl>
 #include <tao/orb_types.pidl>
 #include <tao/Typecode_types.pidl>
-#include <tao/Visibility.pidl>
-#include <tao/ValueModifier.pidl>
 
 #pragma prefix "omg.org"
 
diff --git a/TAO/tao/orb_typesC.cpp b/TAO/tao/orb_typesC.cpp
index f8e4bbfb1c5..168eeabc2fb 100644
--- a/TAO/tao/orb_typesC.cpp
+++ b/TAO/tao/orb_typesC.cpp
@@ -26,19 +26,11 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:291
+// be\be_codegen.cpp:288
 
 
 #include "orb_typesC.h"
 #include "tao/CDR.h"
-#include "tao/Null_RefCount_Policy.h"
-#include "tao/TypeCode_Constants.h"
-#include "tao/Alias_TypeCode_Static.h"
-#include "tao/String_TypeCode_Static.h"
-
-#if defined (__BORLANDC__)
-#pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
-#endif /* __BORLANDC__ */
 
 // TAO_IDL - Generated from
 // be\be_visitor_arg_traits.cpp:70
@@ -48,83 +40,3 @@ namespace TAO
 {
 }
 
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_ORBid (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/ORBid:1.0",
-    "ORBid",
-    &CORBA::_tc_string);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_ORBid =
-    &_tao_tc_CORBA_ORBid;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_Flags (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/Flags:1.0",
-    "Flags",
-    &CORBA::_tc_ulong);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_Flags =
-    &_tao_tc_CORBA_Flags;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_Identifier (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/Identifier:1.0",
-    "Identifier",
-    &CORBA::_tc_string);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_Identifier =
-    &_tao_tc_CORBA_Identifier;
-}
-
-
-
-// TAO_IDL - Generated from
-// be\be_visitor_typecode/alias_typecode.cpp:50
-
-static TAO::TypeCode::Alias<char const *,
-                            CORBA::TypeCode_ptr const *,
-                            TAO::Null_RefCount_Policy>
-  _tao_tc_CORBA_RepositoryId (
-    CORBA::tk_alias,
-    "IDL:omg.org/CORBA/RepositoryId:1.0",
-    "RepositoryId",
-    &CORBA::_tc_string);
-  
-namespace CORBA
-{
-  ::CORBA::TypeCode_ptr const _tc_RepositoryId =
-    &_tao_tc_CORBA_RepositoryId;
-}
-
-
diff --git a/TAO/tao/orb_typesC.h b/TAO/tao/orb_typesC.h
index d598d6e8fc4..17a295fddf6 100644
--- a/TAO/tao/orb_typesC.h
+++ b/TAO/tao/orb_typesC.h
@@ -26,10 +26,10 @@
 //     http://www.cs.wustl.edu/~schmidt/TAO.html
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:153
+// be\be_codegen.cpp:154
 
-#ifndef _TAO_IDL_ORIG_ORB_TYPESC_H_
-#define _TAO_IDL_ORIG_ORB_TYPESC_H_
+#ifndef _TAO_IDL_ORB_TYPESC_H_
+#define _TAO_IDL_ORB_TYPESC_H_
 
 #include /**/ "ace/pre.h"
 
@@ -54,12 +54,8 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-#if defined (__BORLANDC__)
-#pragma option push -w-rvl -w-rch -w-ccc -w-inl
-#endif /* __BORLANDC__ */
-
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:48
+// be\be_visitor_module/module_ch.cpp:49
 
 namespace CORBA
 {
@@ -72,22 +68,12 @@ namespace CORBA
   typedef CORBA::String_out ORBid_out;
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_ORBid;
-  
-  // TAO_IDL - Generated from
   // be\be_visitor_typedef/typedef_ch.cpp:379
   
   typedef CORBA::ULong Flags;
   typedef CORBA::ULong_out Flags_out;
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_Flags;
-  
-  // TAO_IDL - Generated from
   // be\be_visitor_typedef/typedef_ch.cpp:413
   
   typedef char * Identifier;
@@ -95,24 +81,14 @@ namespace CORBA
   typedef CORBA::String_out Identifier_out;
   
   // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_Identifier;
-  
-  // TAO_IDL - Generated from
   // be\be_visitor_typedef/typedef_ch.cpp:413
   
   typedef char * RepositoryId;
   typedef CORBA::String_var RepositoryId_var;
   typedef CORBA::String_out RepositoryId_out;
-  
-  // TAO_IDL - Generated from
-  // be\be_visitor_typecode/typecode_decl.cpp:44
-  
-  extern TAO_Export ::CORBA::TypeCode_ptr const _tc_RepositoryId;
 
 // TAO_IDL - Generated from
-// be\be_visitor_module/module_ch.cpp:66
+// be\be_visitor_module/module_ch.cpp:78
 
 } // module CORBA
 
@@ -125,16 +101,12 @@ namespace TAO
 }
 
 // TAO_IDL - Generated from
-// be\be_codegen.cpp:955
+// be\be_codegen.cpp:1062
 
 #if defined(_MSC_VER)
 #pragma warning(pop)
 #endif /* _MSC_VER */
 
-#if defined (__BORLANDC__)
-#pragma option pop
-#endif /* __BORLANDC__ */
-
 #include /**/ "ace/post.h"
 
 #endif /* ifndef */
diff --git a/TAO/tao/params.h b/TAO/tao/params.h
index e45026c8e65..a44134f38c6 100644
--- a/TAO/tao/params.h
+++ b/TAO/tao/params.h
@@ -196,16 +196,13 @@ private:
   int parse_and_add_endpoints (const ACE_CString &endpoints,
                                TAO_EndpointSet &endpoint_set);
 
-  /// List of endpoints used to pre-establish connections.
-  // TAO_EndpointSet preconnects_list_;
-
   /// Map of endpoints this server is willing to accept requests on.
   endpoints_map_type endpoints_map_;
 
   /// Port numbers of the configured services.
   CORBA::UShort service_port_[TAO_NO_OF_MCAST_SERVICES];
 
-  /// address:port for Multicast Discovery Protocol for the Naming
+  /// Address:port for Multicast Discovery Protocol for the Naming
   /// Service.
   CORBA::String_var mcast_discovery_endpoint_;
 
diff --git a/TAO/tao/skip.cpp b/TAO/tao/skip.cpp
deleted file mode 100644
index 828891c1973..00000000000
--- a/TAO/tao/skip.cpp
+++ /dev/null
@@ -1,1040 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//     TAO
-//
-// = FILENAME
-//     skip.cpp
-//
-// = DESCRIPTION
-//     Code for skipping different data types
-//
-//     Data types encoded as CDR streams need to be skipped when they
-//     are part of an Any.
-//
-// = AUTHOR
-//     Aniruddha Gokhale
-//
-// ============================================================================
-
-#include "Marshal.h"
-#include "debug.h"
-#include "Valuetype_Adapter.h"
-#include "ORB_Core.h"
-#include "TypeCode.h"
-#include "Any_Unknown_IDL_Type.h"
-#include "tao/CDR.h"
-#include "SystemException.h"
-
-#include "ace/Dynamic_Service.h"
-
-ACE_RCSID (tao,
-           skip,
-           "$Id$")
-
-TAO::traverse_status
-TAO_Marshal_Primitive::skip (CORBA::TypeCode_ptr  tc,
-                             TAO_InputCDR *stream
-                             ACE_ENV_ARG_DECL)
-{
-  CORBA::Boolean continue_skipping = 1;
-
-  // Status of skip operation.
-  TAO::traverse_status retval = TAO::TRAVERSE_CONTINUE;
-
-  CORBA::TCKind const k = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-  switch (k)
-    {
-    case CORBA::tk_null:
-    case CORBA::tk_void:
-      break;
-    case CORBA::tk_short:
-    case CORBA::tk_ushort:
-      continue_skipping = stream->skip_short ();
-      break;
-    case CORBA::tk_long:
-    case CORBA::tk_ulong:
-    case CORBA::tk_float:
-    case CORBA::tk_enum:
-      continue_skipping = stream->skip_long ();
-      break;
-    case CORBA::tk_double:
-    case CORBA::tk_longlong:
-    case CORBA::tk_ulonglong:
-      continue_skipping = stream->skip_longlong ();
-      break;
-    case CORBA::tk_boolean:
-      continue_skipping = stream->skip_boolean ();
-      break;
-    case CORBA::tk_char:
-    case CORBA::tk_octet:
-      continue_skipping = stream->skip_char ();
-      break;
-    case CORBA::tk_longdouble:
-      continue_skipping = stream->skip_longdouble ();
-      break;
-    case CORBA::tk_wchar:
-      continue_skipping = stream->skip_wchar ();
-      break;
-    default:
-      retval = TAO::TRAVERSE_STOP;
-      // we are not a primitive type
-    }
-  if (retval == TAO::TRAVERSE_CONTINUE
-      && continue_skipping == 1)
-    return TAO::TRAVERSE_CONTINUE;
-  else
-    {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((
-            LM_DEBUG,
-            ACE_TEXT ("TAO_Marshal_Primitive::skip detected error\n")
-          ));
-      ACE_THROW_RETURN (CORBA::MARSHAL (0,
-                                        CORBA::COMPLETED_MAYBE),
-                        TAO::TRAVERSE_STOP);
-    }
-}
-
-TAO::traverse_status
-TAO_Marshal_Any::skip (CORBA::TypeCode_ptr,
-                       TAO_InputCDR *stream
-                       ACE_ENV_ARG_DECL)
-{
-  // Typecode of the element that makes the Any.
-  CORBA::TypeCode_var elem_tc;
-
-  // Status of encode operation.
-  if (!(*stream >> elem_tc.inout ()))
-    return TAO::TRAVERSE_STOP;
-
-  return TAO_Marshal_Object::perform_skip (elem_tc.in (),
-                                           stream
-                                           ACE_ENV_ARG_PARAMETER);
-}
-
-TAO::traverse_status
-TAO_Marshal_TypeCode::skip (CORBA::TypeCode_ptr,
-                            TAO_InputCDR *stream
-                            ACE_ENV_ARG_DECL)
-{
-  CORBA::Boolean continue_skipping = 1;
-
-  // Typecode kind.
-  CORBA::ULong kind;
-
-  // Decode the "kind" field of the typecode from the stream.
-  continue_skipping = stream->read_ulong (kind);
-
-  if (continue_skipping == 1)
-    {
-      // Typecodes with empty parameter lists all have preallocated
-      // constants.  We use those to reduce memory consumption and
-      // heap access ... also, to speed things up!
-      if ((kind < CORBA::TAO_TC_KIND_COUNT) ||
-          (kind == ~0u))
-        {
-          // Either a non-constant typecode or an indirected typecode.
-          switch (kind)
-            {
-              // Need special handling for all kinds of typecodes that
-              // have nonempty parameter lists ...
-            default:
-              // simple typecodes, nothing to do
-              break;
-            case CORBA::tk_string:
-            case CORBA::tk_wstring:
-              {
-                // skip the bounds
-                continue_skipping = stream->skip_ulong ();
-              }
-            break;
-
-            // Indirected typecodes, illegal at "top level".
-            case ~0u:
-              {
-                // skip the long indicating the encapsulation offset,
-                continue_skipping = stream->skip_long ();
-              }
-            break;
-
-            // The rest have "complex" parameter lists that are
-            // encoded as bulk octets ...
-            case CORBA::tk_objref:
-            case CORBA::tk_struct:
-            case CORBA::tk_union:
-            case CORBA::tk_enum:
-            case CORBA::tk_sequence:
-            case CORBA::tk_array:
-            case CORBA::tk_alias:
-            case CORBA::tk_except:
-            case CORBA::tk_value:
-            case CORBA::tk_value_box:
-            case CORBA::tk_native:
-            case CORBA::tk_abstract_interface:
-            case CORBA::tk_local_interface:
-            case CORBA::tk_component:
-            case CORBA::tk_home:
-            case CORBA::tk_event:
-              {
-                CORBA::ULong length;
-
-                // get the encapsulation length
-                continue_skipping = stream->read_ulong (length);
-                if (!continue_skipping)
-                  break;
-                // skip the encapsulation
-                continue_skipping = stream->skip_bytes (length);
-              }
-            } // end of switch
-        }
-      else // bad kind_ value to be decoded
-        {
-          if (TAO_debug_level > 0)
-            ACE_DEBUG ((LM_DEBUG,
-                        ACE_TEXT ("TAO_Marshal_TypeCode::skip: ")
-                        ACE_TEXT ("Bad kind_ value in CDR stream\n")));
-          ACE_THROW_RETURN (CORBA::BAD_TYPECODE (),
-                            TAO::TRAVERSE_STOP);
-        }
-    }
-
-  if (continue_skipping == 1)
-    return TAO::TRAVERSE_CONTINUE;
-  else
-    {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((
-            LM_DEBUG,
-            ACE_TEXT ("TAO_Marshal_TypeCode::skip detected error\n")
-          ));
-      ACE_THROW_RETURN (CORBA::MARSHAL (0,
-                                        CORBA::COMPLETED_MAYBE),
-                        TAO::TRAVERSE_STOP);
-    }
-}
-
-TAO::traverse_status
-TAO_Marshal_Principal::skip (CORBA::TypeCode_ptr,
-                             TAO_InputCDR *stream
-                             ACE_ENV_ARG_DECL)
-{
-  CORBA::Boolean continue_skipping = 1;
-
-  // specifies the number of bytes in the Principal
-  CORBA::ULong len;
-
-  continue_skipping = stream->read_ulong (len);
-  if (len > 0 && continue_skipping)
-    {
-      continue_skipping = stream->skip_bytes (len);
-    }
-
-  if (continue_skipping == 1)
-    return TAO::TRAVERSE_CONTINUE;
-  else
-    {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((
-            LM_DEBUG,
-            ACE_TEXT ("TAO_Marshal_Principal::skip detected error\n")
-          ));
-      ACE_THROW_RETURN (CORBA::MARSHAL (0,
-                                        CORBA::COMPLETED_MAYBE),
-                        TAO::TRAVERSE_STOP);
-    }
-}
-
-TAO::traverse_status
-TAO_Marshal_ObjRef::skip (CORBA::TypeCode_ptr,
-                          TAO_InputCDR *stream
-                          ACE_ENV_ARG_DECL)
-{
-  CORBA::Boolean continue_skipping = 1;
-
-  // return status
-  TAO::traverse_status retval =
-    TAO::TRAVERSE_CONTINUE;
-
-  // First, skip the type hint. This will be the type_id encoded in an
-  // object reference.
-  stream->skip_string ();
-
-  // Read the profiles, discarding all until an IIOP profile comes by.
-  // Once we see an IIOP profile, ignore any further ones.
-  //
-  // XXX this will need to change someday to let different protocol
-  // code be accessed, not just IIOP.  Protocol modules will be
-  // dynamically loaded from shared libraries via ORB_init (), and we
-  // just need to be able to access such preloaded libraries here as
-  // we unmarshal objrefs.
-  CORBA::ULong profiles = 0;
-
-  // get the count of profiles that follow
-  continue_skipping = stream->read_ulong (profiles);
-
-  while (profiles-- != 0 && continue_skipping)
-      {
-        CORBA::ULong tag;
-
-        // get the profile ID tag
-        if ( (continue_skipping = stream->read_ulong (tag)) == 0)
-          continue;
-
-        CORBA::ULong encap_len;
-        // ProfileData is encoded as a sequence of octet. So first get
-        // the length of the sequence.
-        // Create the decoding stream from the encapsulation in the
-        // buffer, and skip the encapsulation.
-        if ( (continue_skipping = stream->read_ulong (encap_len)) == 0)
-          continue;
-
-        continue_skipping = stream->skip_bytes (encap_len);
-      }
-
-  if (retval == TAO::TRAVERSE_CONTINUE
-      && continue_skipping == 1)
-    return TAO::TRAVERSE_CONTINUE;
-  else
-    {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((
-            LM_DEBUG,
-            ACE_TEXT ("TAO_Marshal_ObjRef::skip detected error\n")
-          ));
-      ACE_THROW_RETURN (CORBA::MARSHAL (0,
-                                        CORBA::COMPLETED_MAYBE),
-                        TAO::TRAVERSE_STOP);
-    }
-}
-
-TAO::traverse_status
-TAO_Marshal_Struct::skip (CORBA::TypeCode_ptr  tc,
-                          TAO_InputCDR *stream
-                          ACE_ENV_ARG_DECL)
-{
-  TAO::traverse_status retval = TAO::TRAVERSE_CONTINUE;
-  CORBA::TypeCode_var param;
-
-  // Number of fields in the struct.
-  const CORBA::ULong member_count =
-    tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-  for (CORBA::ULong i = 0;
-       i < member_count && retval == TAO::TRAVERSE_CONTINUE;
-       ++i)
-    {
-      param = tc->member_type (i ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-      retval = TAO_Marshal_Object::perform_skip (param.in (),
-                                                 stream
-                                                 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-    }
-
-  if (retval == TAO::TRAVERSE_CONTINUE)
-    return TAO::TRAVERSE_CONTINUE;
-
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("TAO_Marshal_Struct::skip detected error\n")));
-
-  ACE_THROW_RETURN (CORBA::MARSHAL (0,
-                                    CORBA::COMPLETED_MAYBE),
-                    TAO::TRAVERSE_STOP);
-}
-
-TAO::traverse_status
-TAO_Marshal_Union::skip (CORBA::TypeCode_ptr  tc,
-                         TAO_InputCDR *src
-                         ACE_ENV_ARG_DECL)
-{
-  CORBA::TypeCode_var discrim_tc =
-    tc->discriminator_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-  CORBA::ULong kind =
-    discrim_tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-  // Save the discriminator value in a temporary variable...
-  CORBA::Short short_v;
-  CORBA::UShort ushort_v;
-  CORBA::Long long_v;
-  CORBA::ULong ulong_v;
-  CORBA::ULong enum_v;
-  CORBA::Char char_v;
-  CORBA::WChar wchar_v;
-  CORBA::Boolean boolean_v = false;;
-
-  switch (kind)
-    {
-    case CORBA::tk_short:
-      {
-        if (!src->read_short (short_v))
-          return TAO::TRAVERSE_STOP;
-      }
-      break;
-
-    case CORBA::tk_ushort:
-      {
-        if (!src->read_ushort (ushort_v))
-          return TAO::TRAVERSE_STOP;
-      }
-      break;
-
-    case CORBA::tk_long:
-      {
-        if (!src->read_long (long_v))
-          return TAO::TRAVERSE_STOP;
-      }
-      break;
-
-    case CORBA::tk_ulong:
-      {
-        if (!src->read_ulong (ulong_v))
-          return TAO::TRAVERSE_STOP;
-      }
-      break;
-
-    case CORBA::tk_enum:
-      {
-        if (!src->read_ulong (enum_v))
-          return TAO::TRAVERSE_STOP;
-      }
-      break;
-
-    case CORBA::tk_char:
-      {
-        if (!src->read_char (char_v))
-          return TAO::TRAVERSE_STOP;
-      }
-      break;
-
-    case CORBA::tk_wchar:
-      {
-        if (!src->read_wchar (wchar_v))
-          return TAO::TRAVERSE_STOP;
-      }
-      break;
-
-    case CORBA::tk_boolean:
-      {
-        if (!src->read_boolean (boolean_v))
-          return TAO::TRAVERSE_STOP;
-      }
-      break;
-
-    default:
-      return TAO::TRAVERSE_STOP;
-    }
-
-  const CORBA::ULong member_count =
-    tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-  const CORBA::ULong null_member = ~static_cast<CORBA::ULong> (0U);
-
-  CORBA::ULong current_member = null_member;
-  CORBA::ULong default_member = null_member;
-
-  for (CORBA::ULong i = 0;
-       i < member_count && current_member == null_member;
-       ++i)
-    {
-      CORBA::Any_var any = tc->member_label (i ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-      CORBA::Octet o;
-      if ((any >>= CORBA::Any::to_octet (o)) && o == 0)
-        {
-          CORBA::ULong default_index =
-            tc->default_index (ACE_ENV_SINGLE_ARG_PARAMETER);
-          ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-          if (i != default_index)
-            ACE_THROW_RETURN (CORBA::BAD_TYPECODE (),
-                              TAO::TRAVERSE_STOP);
-          // Found the default branch, save its position and continue
-          // trying to find the current value...
-          default_member = i;
-          continue;
-        }
-
-      switch (kind)
-        {
-        case CORBA::tk_short:
-          {
-            CORBA::Short d;
-            if ((any >>= d) && d == short_v)
-              current_member = i;
-          }
-          break;
-
-        case CORBA::tk_ushort:
-          {
-            CORBA::UShort d;
-            if ((any >>= d) && d == ushort_v)
-              current_member = i;
-          }
-          break;
-
-        case CORBA::tk_long:
-          {
-            CORBA::Long d;
-            if ((any >>= d) && d == long_v)
-              current_member = i;
-          }
-          break;
-
-        case CORBA::tk_ulong:
-          {
-            CORBA::ULong d;
-            if ((any >>= d) && d == ulong_v)
-              current_member = i;
-          }
-          break;
-
-        case CORBA::tk_enum:
-          {
-            CORBA::ULong d;
-            TAO::Any_Impl *impl = any->impl ();
-
-            if (impl->encoded ())
-              {
-                TAO::Unknown_IDL_Type *unk =
-                  dynamic_cast<TAO::Unknown_IDL_Type *> (impl);
-
-                // We don't want unk's rd_ptr to move, in case
-                // we are shared by another Any, so we use this
-                // to copy the state, not the buffer.
-                TAO_InputCDR for_reading (unk->_tao_get_cdr ());
-
-                for_reading.read_ulong (d);
-              }
-            else
-              {
-                TAO_OutputCDR out;
-                impl->marshal_value (out);
-                TAO_InputCDR cdr (out);
-                cdr.read_ulong (d);
-              }
-
-            if (d == enum_v)
-              {
-                current_member = i;
-              }
-          }
-          break;
-
-        case CORBA::tk_char:
-          {
-            CORBA::Char d;
-            if ((any >>= CORBA::Any::to_char (d)) && d == char_v)
-              current_member = i;
-          }
-          break;
-
-        case CORBA::tk_wchar:
-          {
-            CORBA::WChar d;
-            if ((any >>= CORBA::Any::to_wchar (d)) && d == wchar_v)
-              current_member = i;
-          }
-          break;
-
-        case CORBA::tk_boolean:
-          {
-            CORBA::Boolean d;
-            if ((any >>= CORBA::Any::to_boolean (d)) && d == boolean_v)
-              current_member = i;
-          }
-          break;
-
-        default:
-          return TAO::TRAVERSE_STOP;
-        }
-    }
-
-  if (current_member == null_member)
-    {
-      // Cannot find the current member, check if there is a
-      // default...
-      if (default_member != null_member)
-        {
-          // Good, use the default to append...
-          CORBA::TypeCode_var member_tc =
-            tc->member_type (default_member ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-          return TAO_Marshal_Object::perform_skip (member_tc.in (),
-                                                   src
-                                                   ACE_ENV_ARG_PARAMETER);
-        }
-
-      // If we're here, we have an implicit default case, and we
-      // should just return without skipping anything, since no
-      // union member was marshaled in the first place.
-      return TAO::TRAVERSE_CONTINUE;
-    }
-
-  // If we found the member successfully then just use that one...
-  CORBA::TypeCode_var member_tc =
-    tc->member_type (current_member ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-  return TAO_Marshal_Object::perform_skip (member_tc.in (),
-                                           src
-                                           ACE_ENV_ARG_PARAMETER);
-}
-
-TAO::traverse_status
-TAO_Marshal_String::skip (CORBA::TypeCode_ptr,
-                          TAO_InputCDR *stream
-                          ACE_ENV_ARG_DECL)
-{
-  CORBA::Boolean continue_skipping = 1;
-
-  // On decode, omit the check against specified string bounds, and
-  // cope with illegal "zero length" strings (all lengths on the wire
-  // must include a NUL).
-  //
-  // This is on the principle of being gracious in what we accept; we
-  // don't generate messages that fail to comply with protocol specs,
-  // but we will accept them when it's clear how to do so.
-
-  continue_skipping = stream->skip_string ();
-  if (continue_skipping == 1)
-    return TAO::TRAVERSE_CONTINUE;
-  else
-    {
-      if (TAO_debug_level > 0)
-        ACE_DEBUG ((LM_DEBUG,
-                    ACE_TEXT ("TAO_Marshal_String::skip detected error\n")));
-      ACE_THROW_RETURN (CORBA::MARSHAL (0,
-                                        CORBA::COMPLETED_MAYBE),
-                        TAO::TRAVERSE_STOP);
-    }
-}
-
-TAO::traverse_status
-TAO_Marshal_Sequence::skip (CORBA::TypeCode_ptr  tc,
-                            TAO_InputCDR *stream
-                            ACE_ENV_ARG_DECL)
-{
-  // Size of element.
-  CORBA::ULong bounds;
-
-  // First unmarshal the sequence length ... we trust it to be right
-  // here, on the "be gracious in what you accept" principle.  We
-  // don't generate illegal sequences (i.e. length > bounds).
-
-  CORBA::Boolean continue_skipping =
-    stream->read_ulong (bounds);
-
-  if (!continue_skipping)
-    {
-      ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("TAO_Marshal_Sequence::skip detected error\n")));
-      ACE_THROW_RETURN (CORBA::MARSHAL (),
-                        TAO::TRAVERSE_STOP);
-    }
-
-  // No point decoding an empty sequence.
-  if (bounds == 0)
-    return TAO::TRAVERSE_CONTINUE;
-
-  // Get element typecode.
-  CORBA::TypeCode_var tc2 =
-    tc->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-  // For CORBA basic types, the skip can be optimized
-  CORBA::TCKind kind = tc2->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-  char *dummy;
-  switch (kind)
-    {
-    case CORBA::tk_octet:
-    case CORBA::tk_boolean:
-    case CORBA::tk_char:
-      {
-        stream->adjust (0, ACE_CDR::OCTET_ALIGN, dummy);
-        continue_skipping =
-          stream->skip_bytes (ACE_CDR::OCTET_SIZE * bounds);
-      }
-      break;
-    case CORBA::tk_short:
-    case CORBA::tk_ushort:
-    case CORBA::tk_wchar:
-      {
-        stream->adjust (0, ACE_CDR::SHORT_ALIGN, dummy);
-        continue_skipping =
-          stream->skip_bytes (ACE_CDR::SHORT_SIZE * bounds);
-      }
-      break;
-    case CORBA::tk_long:
-    case CORBA::tk_ulong:
-    case CORBA::tk_float:
-      {
-        stream->adjust (0, ACE_CDR::LONG_ALIGN, dummy);
-        continue_skipping =
-          stream->skip_bytes (ACE_CDR::LONG_SIZE * bounds);
-      }
-      break;
-    case CORBA::tk_double:
-    case CORBA::tk_longlong:
-    case CORBA::tk_ulonglong:
-      {
-        stream->adjust (0, ACE_CDR::LONGLONG_ALIGN, dummy);
-        continue_skipping =
-          stream->skip_bytes (ACE_CDR::LONGLONG_SIZE * bounds);
-      }
-      break;
-    case CORBA::tk_longdouble:
-      {
-        stream->adjust (0, ACE_CDR::LONGDOUBLE_ALIGN, dummy);
-        continue_skipping =
-          stream->skip_bytes (ACE_CDR::LONGDOUBLE_SIZE * bounds);
-      }
-      break;
-
-    default:
-      while (bounds-- && continue_skipping == 1)
-        {
-          continue_skipping =
-            TAO_Marshal_Object::perform_skip (tc2.in (),
-                                              stream
-                                              ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-        }
-      break;
-    }// end of switch
-
-  if (continue_skipping)
-    return TAO::TRAVERSE_CONTINUE;
-
-  // error exit
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("TAO_Marshal_Sequence::skip detected error\n")));
-
-  ACE_THROW_RETURN (CORBA::MARSHAL (),
-                    TAO::TRAVERSE_STOP);
-}
-
-TAO::traverse_status
-TAO_Marshal_Array::skip (CORBA::TypeCode_ptr  tc,
-                         TAO_InputCDR *stream
-                         ACE_ENV_ARG_DECL)
-{
-  CORBA::Boolean continue_skipping = 1;
-
-
-  // retrieve the bounds of the array
-  CORBA::ULong bounds = tc->length (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-  // get element typecode
-  // Typecode of the element.
-  CORBA::TypeCode_var tc2 = tc->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-  // For CORBA basic types, the skip can be optimized
-  CORBA::TCKind kind = tc2->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-  char *dummy;
-  switch (kind)
-    {
-    case CORBA::tk_octet:
-    case CORBA::tk_boolean:
-    case CORBA::tk_char:
-      {
-        stream->adjust (0, ACE_CDR::OCTET_ALIGN, dummy);
-        continue_skipping =
-          stream->skip_bytes (ACE_CDR::OCTET_SIZE * bounds);
-      }
-      break;
-    case CORBA::tk_short:
-    case CORBA::tk_ushort:
-    case CORBA::tk_wchar:
-      {
-        stream->adjust (0, ACE_CDR::SHORT_ALIGN, dummy);
-        continue_skipping =
-          stream->skip_bytes (ACE_CDR::SHORT_SIZE * bounds);
-      }
-      break;
-    case CORBA::tk_long:
-    case CORBA::tk_ulong:
-    case CORBA::tk_float:
-      {
-        stream->adjust (0, ACE_CDR::LONG_ALIGN, dummy);
-        continue_skipping =
-          stream->skip_bytes (ACE_CDR::LONG_SIZE * bounds);
-      }
-      break;
-    case CORBA::tk_double:
-    case CORBA::tk_longlong:
-    case CORBA::tk_ulonglong:
-      {
-        stream->adjust (0, ACE_CDR::LONGLONG_ALIGN, dummy);
-        continue_skipping =
-          stream->skip_bytes (ACE_CDR::LONGLONG_SIZE * bounds);
-      }
-      break;
-    case CORBA::tk_longdouble:
-      {
-        stream->adjust (0, ACE_CDR::LONGDOUBLE_ALIGN, dummy);
-        continue_skipping =
-          stream->skip_bytes (ACE_CDR::LONGDOUBLE_SIZE * bounds);
-      }
-      break;
-
-    default:
-      while (bounds-- && continue_skipping == 1)
-        {
-          int stop =
-            TAO_Marshal_Object::perform_skip (tc2.in (),
-                                              stream
-                                              ACE_ENV_ARG_PARAMETER);
-          ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-          if (stop == TAO::TRAVERSE_STOP)
-            continue_skipping = 0;
-        }
-      break;
-    }// end of switch
-
-  if (continue_skipping)
-    return TAO::TRAVERSE_CONTINUE;
-
-  // error exit
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("TAO_Marshal_Sequence::skip detected error\n")));
-
-  ACE_THROW_RETURN (CORBA::MARSHAL (),
-                    TAO::TRAVERSE_STOP);
-}
-
-TAO::traverse_status
-TAO_Marshal_Alias::skip (CORBA::TypeCode_ptr  tc,
-                         TAO_InputCDR *stream
-                         ACE_ENV_ARG_DECL)
-{
-  // Typecode of the aliased type.
-  CORBA::TypeCode_var tc2;
-  CORBA::Boolean continue_skipping = 1;
-
-  // Status of decode operation.
-  TAO::traverse_status retval =
-    TAO::TRAVERSE_CONTINUE;
-
-  tc2 = tc->content_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-  retval = TAO_Marshal_Object::perform_skip (tc2.in (),
-                                             stream
-                                             ACE_ENV_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-  //  tc2->_decr_refcnt ();
-  if (retval == TAO::TRAVERSE_CONTINUE
-      && continue_skipping == 1)
-    return TAO::TRAVERSE_CONTINUE;
-
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("TAO_Marshal_Alias::skip detected error\n")));
-
-  ACE_THROW_RETURN (CORBA::MARSHAL (0,
-                                    CORBA::COMPLETED_MAYBE),
-                    TAO::TRAVERSE_STOP);
-}
-
-// Decode exception For exceptions, the "hidden" type ID near the
-// front of the on-wire representation was previously unmarshaled and
-// mapped to the "tc" typcode we're using to traverse the memory ...
-// at the same time its vtable, refcount, and other state was
-// established.
-//
-// NOTE: This is asymmetric with respect to encoding exceptions.
-TAO::traverse_status
-TAO_Marshal_Except::skip (CORBA::TypeCode_ptr  tc,
-                          TAO_InputCDR *stream
-                          ACE_ENV_ARG_DECL)
-{
-  TAO::traverse_status retval =
-    TAO::TRAVERSE_CONTINUE;
-  CORBA::TypeCode_var param;
-
-  // skip the Repository ID
-  if (!stream->skip_string ())
-    return TAO::TRAVERSE_STOP;
-
-  // Number of fields in the exception
-  const CORBA::ULong member_count =
-    tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-  for (CORBA::ULong i = 0;
-       i < member_count && retval == TAO::TRAVERSE_CONTINUE;
-       ++i)
-    {
-      param = tc->member_type (i ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-      retval = TAO_Marshal_Object::perform_skip (param.in (),
-                                                 stream
-                                                 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-    }
-
-  if (retval == TAO::TRAVERSE_CONTINUE)
-    return TAO::TRAVERSE_CONTINUE;
-
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("TAO_Marshal_Except::skip detected error\n")));
-
-  ACE_THROW_RETURN (CORBA::MARSHAL (0,
-                                    CORBA::COMPLETED_MAYBE),
-                    TAO::TRAVERSE_STOP);
-}
-
-// decode wstring
-TAO::traverse_status
-TAO_Marshal_WString::skip (CORBA::TypeCode_ptr,
-                           TAO_InputCDR *stream
-                           ACE_ENV_ARG_DECL)
-{
-  ACE_CDR::Boolean continue_skipping = 1;
-
-  // On decode, omit the check against specified wstring bounds, and
-  // cope with illegal "zero length" strings (all lengths on the wire
-  // must include a NUL).
-  //
-  // This is on the principle of being gracious in what we accept; we
-  // don't generate messages that fail to comply with protocol specs,
-  // but we will accept them when it's clear how to do so.
-
-  // "zero length" wstrings are legal in GIOP 1.2.
-
-  continue_skipping = stream->skip_wstring ();
-
-  if (continue_skipping == 1)
-    return TAO::TRAVERSE_CONTINUE;
-
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("TAO_Marshal_WString::skip detected error\n")));
-  ACE_THROW_RETURN (CORBA::MARSHAL (0,
-                                    CORBA::COMPLETED_MAYBE),
-                    TAO::TRAVERSE_STOP);
-}
-
-TAO::traverse_status
-TAO_Marshal_Value::skip (CORBA::TypeCode_ptr  tc,
-                         TAO_InputCDR *stream
-                         ACE_ENV_ARG_DECL)
-{
-  TAO::traverse_status retval = TAO::TRAVERSE_CONTINUE;
-  CORBA::TypeCode_var param;
-
-  // Use the same method to skip over our base valuetype.
-  // To achive this we'll need to distinguish between
-  // first-time/nested skips so that we won't attempt to
-  // skip rep_id several times.
-  //
-  if (this->nested_processing_ == 0)
-    {
-      this->nested_processing_ = 1;
-
-      CORBA::ULong value_tag;
-
-      if (!stream->read_ulong (value_tag))
-        {
-          return TAO::TRAVERSE_STOP;
-        }
-
-      TAO_Valuetype_Adapter *adapter =
-        ACE_Dynamic_Service<TAO_Valuetype_Adapter>::instance (
-            TAO_ORB_Core::valuetype_adapter_name ()
-          );
-
-      if (adapter == 0)
-        {
-          ACE_THROW_RETURN (CORBA::INTERNAL (),
-                            TAO::TRAVERSE_STOP);
-        }
-
-      if (value_tag == 0) // Null value type pointer.
-        {
-          //We are done.
-          return retval;
-        }
-      else if (value_tag & adapter->type_info_single ())
-        {
-          // Skip a single repository id which is of type string.
-          stream->skip_string ();
-        }
-      else
-        {
-          //@@ boris: VT CDR
-          return TAO::TRAVERSE_STOP;
-        }
-    }
-
-  // Handle our base valuetype if any.
-  param = tc->concrete_base_type (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-  CORBA::TCKind const k = param->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-  if (k != CORBA::tk_null)
-    {
-      retval = this->skip (param.in (), stream ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-      if (retval != TAO::TRAVERSE_CONTINUE)
-        {
-          return retval;
-        }
-    }
-
-  // Number of fields in the valuetype.
-  const CORBA::ULong member_count =
-    tc->member_count (ACE_ENV_SINGLE_ARG_PARAMETER);
-  ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-  for (CORBA::ULong i = 0;
-       i < member_count && retval == TAO::TRAVERSE_CONTINUE;
-       ++i)
-    {
-      param = tc->member_type (i ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-
-      retval = TAO_Marshal_Object::perform_skip (param.in (),
-                                                 stream
-                                                 ACE_ENV_ARG_PARAMETER);
-      ACE_CHECK_RETURN (TAO::TRAVERSE_STOP);
-    }
-
-  if (retval == TAO::TRAVERSE_CONTINUE)
-    return TAO::TRAVERSE_CONTINUE;
-
-  if (TAO_debug_level > 0)
-    ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("TAO_Marshal_Value::skip detected error\n")));
-
-  ACE_THROW_RETURN (CORBA::MARSHAL (0,
-                                    CORBA::COMPLETED_MAYBE),
-                    TAO::TRAVERSE_STOP);
-}
diff --git a/TAO/tao/tao.mpc b/TAO/tao/tao.mpc
index 0dfdc94faa8..937f4be87fe 100644
--- a/TAO/tao/tao.mpc
+++ b/TAO/tao/tao.mpc
@@ -13,15 +13,7 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core {
     Adapter.cpp
     Adapter_Factory.cpp
     Adapter_Registry.cpp
-    Alias_TypeCode_Static.cpp
-    Any.cpp
-    Any_Basic_Impl.cpp
-    Any_Impl.cpp
-    Any_SystemException.cpp
-    Any_Unknown_IDL_Type.cpp
-    AnySeqA.cpp
-    AnySeqC.cpp
-    append.cpp
+    AnyTypeCode_Adapter.cpp
     Argument.cpp
     Asynch_Queued_Message.cpp
     Asynch_Reply_Dispatcher_Base.cpp
@@ -30,13 +22,9 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core {
     Bind_Dispatcher_Guard.cpp
     Block_Flushing_Strategy.cpp
     Blocked_Connect_Strategy.cpp
-    BooleanSeqA.cpp
     BooleanSeqC.cpp
-    BoundsA.cpp
-    BoundsC.cpp
     Cache_Entries.cpp
     CDR.cpp
-    CharSeqA.cpp
     CharSeqC.cpp
     Cleanup_Func_Registry.cpp
     Client_Strategy_Factory.cpp
@@ -51,12 +39,10 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core {
     Connection_Handler.cpp
     Connection_Purging_Strategy.cpp
     Connector_Registry.cpp
-    CONV_FRAMEA.cpp
     CONV_FRAMEC.cpp
     CORBA_String.cpp
     CORBALOC_Parser.cpp
     CORBANAME_Parser.cpp
-    CurrentA.cpp
     CurrentC.cpp
     debug.cpp
     default_client.cpp
@@ -68,25 +54,16 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core {
     Default_Stub_Factory.cpp
     Default_Thread_Lane_Resources_Manager.cpp
     DLL_Parser.cpp
-    DomainA.cpp
     DomainC.cpp
-    DoubleSeqA.cpp
     DoubleSeqC.cpp
     Dynamic_Adapter.cpp
-    Dynamic_ParameterA.cpp
-    Dynamic_ParameterC.cpp
-    DynamicA.cpp
-    DynamicC.cpp
-    Empty_Param_TypeCode.cpp
     Endpoint.cpp
     Endpoint_Selector_Factory.cpp
-    Enum_TypeCode_Static.cpp
     Environment.cpp
     Exception.cpp
     Exclusive_TMS.cpp
     Fault_Tolerance_Service.cpp
     FILE_Parser.cpp
-    FloatSeqA.cpp
     FloatSeqC.cpp
     Flushing_Strategy.cpp
     GIOP_Message_Base.cpp
@@ -100,28 +77,22 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core {
     GIOP_Message_State.cpp
     GIOP_Message_Version.cpp
     GIOP_Utils.cpp
-    GIOPA.cpp
     GIOPC.cpp
     IFR_Client_Adapter.cpp
     IIOP_Acceptor.cpp
     IIOP_Connection_Handler.cpp
     IIOP_Connector.cpp
     IIOP_Endpoint.cpp
-    IIOP_EndpointsA.cpp
     IIOP_EndpointsC.cpp
     IIOP_Factory.cpp
     IIOP_Lite_Factory.cpp
     IIOP_Profile.cpp
     IIOP_Transport.cpp
-    IIOPA.cpp
     IIOPC.cpp
     Incoming_Message_Queue.cpp
-    InvalidSlotA.cpp
-    InvalidSlotC.cpp
     Invocation_Adapter.cpp
     Invocation_Base.cpp
     Invocation_Endpoint_Selectors.cpp
-    IOP_IORA.cpp
     IOP_IORC.cpp
     IOPC.cpp
     IOR_Parser.cpp
@@ -143,32 +114,25 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core {
     LocalObject.cpp
     LocateRequest_Invocation.cpp
     LocateRequest_Invocation_Adapter.cpp
-    LongDoubleSeqA.cpp
     LongDoubleSeqC.cpp
-    LongLongSeqA.cpp
     LongLongSeqC.cpp
-    LongSeqA.cpp
     LongSeqC.cpp
     LRU_Connection_Purging_Strategy.cpp
     Managed_Types.cpp
-    Marshal.cpp
     MCAST_Parser.cpp
-    Messaging_PolicyValueA.cpp
     Messaging_PolicyValueC.cpp
     Messaging_SyncScopeC.cpp
     MProfile.cpp
     Muxed_TMS.cpp
     New_Leader_Generator.cpp
+    NVList_Adapter.cpp
     Object.cpp
     Object_KeyC.cpp
     Object_Loader.cpp
     Object_Proxy_Broker.cpp
     Object_Ref_Table.cpp
-    ObjectIdListA.cpp
     ObjectIdListC.cpp
     ObjectKey_Table.cpp
-    Objref_TypeCode_Static.cpp
-    OctetSeqA.cpp
     OctetSeqC.cpp
     operation_details.cpp
     ORB.cpp
@@ -179,27 +143,18 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core {
     ORB_Core_Auto_Ptr.cpp
     ORB_Core_TSS_Resources.cpp
     ORB_Table.cpp
-    ParameterModeA.cpp
     ParameterModeC.cpp
     params.cpp
     Parser_Registry.cpp
     PI_ForwardC.cpp
-    PICurrent.cpp
-    PICurrentA.cpp
-    PICurrentC.cpp
-    PICurrent_Copy_Callback.cpp
-    PICurrent_Impl.cpp
-    PICurrent_Loader.cpp
     Pluggable_Messaging.cpp
     Pluggable_Messaging_Utils.cpp
     Policy_Current.cpp
     Policy_Current_Impl.cpp
-    Policy_ForwardA.cpp
     Policy_ForwardC.cpp
     Policy_Manager.cpp
     Policy_Set.cpp
     Policy_Validator.cpp
-    PolicyA.cpp
     PolicyC.cpp
     PolicyFactory_Registry_Adapter.cpp
     PolicyFactory_Registry_Factory.cpp
@@ -217,23 +172,16 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core {
     Remote_Object_Proxy_Broker.cpp
     Reply_Dispatcher.cpp
     Request_Dispatcher.cpp
-    RequestInfo_Util.cpp
     Resource_Factory.cpp
     Resume_Handle.cpp
     Sequence.cpp
-    Sequence_TypeCode_Static.cpp
     Server_Strategy_Factory.cpp
     ServerRequestInterceptor_Adapter_Factory.cpp
     Service_Callbacks.cpp
     Service_Context.cpp
     Services_Activate.cpp
-    ShortSeqA.cpp
     ShortSeqC.cpp
-    skip.cpp
-    String_TypeCode_Static.cpp
-    StringSeqA.cpp
     StringSeqC.cpp
-    Struct_TypeCode_Static.cpp
     Stub.cpp
     Stub_Factory.cpp
     Sync_Strategies.cpp
@@ -241,19 +189,16 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core {
     Synch_Queued_Message.cpp
     Synch_Reply_Dispatcher.cpp
     SystemException.cpp
-    SystemExceptionA.cpp
     Tagged_Components.cpp
     Tagged_Profile.cpp
     TAO_Internal.cpp
     TAO_Server_Request.cpp
     TAO_Singleton_Manager.cpp
-    TAOA.cpp
     TAOC.cpp
     target_specification.cpp
     Thread_Lane_Resources.cpp
     Thread_Lane_Resources_Manager.cpp
     Thread_Per_Connection_Handler.cpp
-    TimeBaseA.cpp
     TimeBaseC.cpp
     Transport.cpp
     Transport_Acceptor.cpp
@@ -262,36 +207,21 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core {
     Transport_Descriptor_Interface.cpp
     Transport_Mux_Strategy.cpp
     Transport_Timer.cpp
-    True_RefCount_Policy.cpp
     TSS_Resources.cpp
-    TypeCode.cpp
-    TypeCodeA.cpp
-    Typecode_typesC.cpp
-    TypeCode_CDR_Extraction.cpp
-    TypeCode_Constants.cpp
     TypeCodeFactory_Adapter.cpp
-    ULongLongSeqA.cpp
+    Typecode_typesC.cpp
     ULongLongSeqC.cpp
-    ULongSeqA.cpp
     ULongSeqC.cpp
-    Union_TypeCode_Static.cpp
     UserException.cpp
-    UShortSeqA.cpp
     UShortSeqC.cpp
-    Value_TypeCode_Static.cpp
     Valuetype_Adapter.cpp
-    ValueModifierC.cpp
-    VisibilityC.cpp
     Wait_On_Leader_Follower.cpp
     Wait_On_LF_No_Upcall.cpp
     Wait_On_Reactor.cpp
     Wait_On_Read.cpp
     Wait_Strategy.cpp
-    WCharSeqA.cpp
     WCharSeqC.cpp
-    WrongTransactionA.cpp
     WrongTransactionC.cpp
-    WStringSeqA.cpp
     WStringSeqC.cpp
     GUIResource_Factory.cpp
   }
@@ -337,7 +267,6 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core {
     Block_Flushing_Strategy.h
     BooleanSeqC.h
     BooleanSeqS.h
-    BoundsC.h
     Buffer_Allocator_T.h
     Buffering_Constraint_Policy.h
     Cache_Entries.h
@@ -434,8 +363,6 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core {
     IIOP_Profile.h
     IIOP_Transport.h
     Incoming_Message_Queue.h
-    InvalidSlotC.h
-    InvalidSlotS.h
     Invocation_Adapter.h
     Invocation_Base.h
     Invocation_Endpoint_Selectors.h
@@ -478,7 +405,6 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core {
     Muxed_TMS.h
     New_Leader_Generator.h
     Null_RefCount_Policy.h
-    NVList.h
     Object_Argument_T.h
     Object.h
     objectid.h
@@ -510,12 +436,6 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core {
     ParameterModeS.h
     params.h
     Parser_Registry.h
-    PICurrent_Copy_Callback.h
-    PICurrent.h
-    PICurrentC.h
-    PICurrentS.h
-    PICurrent_Impl.h
-    PICurrent_Loader.h
     PI_ForwardC.h
     Pluggable_Messaging.h
     Pluggable_Messaging_Utils.h
@@ -548,7 +468,6 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core {
     Remote_Object_Proxy_Broker.h
     Reply_Dispatcher.h
     Request_Dispatcher.h
-    RequestInfo_Util.h
     Resource_Factory.h
     Resume_Handle.h
     Seq_Out_T.h
@@ -637,10 +556,6 @@ project(TAO) : acelib, core, tao_output, taodefaults, pidl, extra_core {
     VarOut_T.h
     Var_Size_Argument_T.h
     Version.h
-    VisibilityC.h
-    VisibilityS.h
-    ValueModifierC.h
-    ValueModifierS.h
     Wait_On_Leader_Follower.h
     Wait_On_LF_No_Upcall.h
     Wait_On_Reactor.h
diff --git a/TAO/tests/AMI_Buffering/AMI_Buffering.mpc b/TAO/tests/AMI_Buffering/AMI_Buffering.mpc
index c9c48e5e726..8e9d0e4abb2 100644
--- a/TAO/tests/AMI_Buffering/AMI_Buffering.mpc
+++ b/TAO/tests/AMI_Buffering/AMI_Buffering.mpc
@@ -1,14 +1,15 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): taoserver, messaging, ami {
+project(*Server): taoserver, ami {
   Source_Files {
     AMI_Buffering.cpp
     server.cpp
   }
 }
 
-project(*Client): messaging, taoexe, portableserver, ami {
+project(*Client): taoserver, ami {
+  exename = client
   Source_Files {
     Client_Task.cpp
     Reply_Handler.cpp
@@ -16,7 +17,8 @@ project(*Client): messaging, taoexe, portableserver, ami {
   }
 }
 
-project(*Admin): messaging, taoexe, portableserver, ami {
+project(*Admin): taoserver, ami {
+  exename = admin
   Source_Files {
     AMI_Buffering_Admin.cpp
     admin.cpp
diff --git a/TAO/tests/AMI_Buffering/client.cpp b/TAO/tests/AMI_Buffering/client.cpp
index 9733d3be55d..6ec3f9364f6 100644
--- a/TAO/tests/AMI_Buffering/client.cpp
+++ b/TAO/tests/AMI_Buffering/client.cpp
@@ -4,6 +4,8 @@
 #include "Client_Task.h"
 #include "tao/Messaging/Messaging.h"
 #include "tao/TAOC.h"
+#include "tao/AnyTypeCode/TAOA.h"
+#include "tao/AnyTypeCode/Any.h"
 #include "ace/Get_Opt.h"
 
 ACE_RCSID(AMI_Buffering, client, "$Id$")
diff --git a/TAO/tests/AMI_Timeouts/AMI_Timeouts.mpc b/TAO/tests/AMI_Timeouts/AMI_Timeouts.mpc
index a0b617d4f78..bf72e8baca6 100644
--- a/TAO/tests/AMI_Timeouts/AMI_Timeouts.mpc
+++ b/TAO/tests/AMI_Timeouts/AMI_Timeouts.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): taoserver, messaging, ami {
+project(*Server): taoserver, ami {
   Source_Files {
     timeout_i.cpp
     timeout_client.cpp
@@ -9,7 +9,8 @@ project(*Server): taoserver, messaging, ami {
   }
 }
 
-project(*Client): messaging, taoexe, portableserver, ami {
+project(*Client): taoserver, ami {
+  exename = client
   Source_Files {
     timeout_i.cpp
     timeout_client.cpp
diff --git a/TAO/tests/AMI_Timeouts/timeout_client.cpp b/TAO/tests/AMI_Timeouts/timeout_client.cpp
index 6b19f47ee68..28f7cc360c9 100644
--- a/TAO/tests/AMI_Timeouts/timeout_client.cpp
+++ b/TAO/tests/AMI_Timeouts/timeout_client.cpp
@@ -14,6 +14,7 @@
 #include "timeout_client.h"
 #include "tao/Messaging/Messaging.h"
 #include "tao/PolicyC.h"
+#include "tao/AnyTypeCode/Any.h"
 #include "ace/OS_NS_unistd.h"
 
 TimeoutClient::TimeoutClient (CORBA::ORB_ptr orb,
diff --git a/TAO/tests/Any/Recursive/RecursiveHello.mpc b/TAO/tests/Any/Recursive/RecursiveHello.mpc
index 45b716eb3d8..cf2c0ae9656 100644
--- a/TAO/tests/Any/Recursive/RecursiveHello.mpc
+++ b/TAO/tests/Any/Recursive/RecursiveHello.mpc
@@ -3,8 +3,6 @@
 // $Id$
 
 project(*Server): taoserver, valuetype {
-  idlflags += -GA
-
   Source_Files {
     Hello.cpp
     server.cpp
@@ -12,11 +10,8 @@ project(*Server): taoserver, valuetype {
 }
 
 project(*Client): taoclient, valuetype, typecodefactory, ifr_client {
-  idlflags += -GA
-
   Source_Files {
     TestC.cpp
-    TestA.cpp
     client.cpp
   }
 }
diff --git a/TAO/tests/BiDirectional/BiDirectional.mpc b/TAO/tests/BiDirectional/BiDirectional.mpc
index 41e4576ab9a..8f1239bb195 100644
--- a/TAO/tests/BiDirectional/BiDirectional.mpc
+++ b/TAO/tests/BiDirectional/BiDirectional.mpc
@@ -1,14 +1,15 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): taoserver, minimum_corba, bidir_giop {
+project(*Server): taoserver, anytypecode, minimum_corba, bidir_giop {
   Source_Files {
     test_i.cpp
     server.cpp
   }
 }
 
-project(*Client): taoexe, portableserver, minimum_corba, bidir_giop {
+project(*Client): taoserver, anytypecode, minimum_corba, bidir_giop {
+  exename = client
   Source_Files {
     test_i.cpp
     client.cpp
diff --git a/TAO/tests/BiDirectional/client.cpp b/TAO/tests/BiDirectional/client.cpp
index a5cec1f517b..d775aabc942 100644
--- a/TAO/tests/BiDirectional/client.cpp
+++ b/TAO/tests/BiDirectional/client.cpp
@@ -3,6 +3,7 @@
 #include "ace/Get_Opt.h"
 #include "test_i.h"
 #include "tao/BiDir_GIOP/BiDirGIOP.h"
+#include "tao/AnyTypeCode/Any.h"
 
 ACE_RCSID(BiDirectional, client, "$Id$")
 
diff --git a/TAO/tests/BiDirectional/server.cpp b/TAO/tests/BiDirectional/server.cpp
index f1a6ae7508a..02f3a672f43 100644
--- a/TAO/tests/BiDirectional/server.cpp
+++ b/TAO/tests/BiDirectional/server.cpp
@@ -3,6 +3,7 @@
 #include "ace/Get_Opt.h"
 #include "test_i.h"
 #include "tao/BiDir_GIOP/BiDirGIOP.h"
+#include "tao/AnyTypeCode/Any.h"
 #include "ace/OS_NS_stdio.h"
 
 ACE_RCSID(BiDirectional, server, "$Id$")
diff --git a/TAO/tests/BiDirectional_MultipleORB/destroy.cpp b/TAO/tests/BiDirectional_MultipleORB/destroy.cpp
index 8cdf84b2401..d4b0af3a3b9 100644
--- a/TAO/tests/BiDirectional_MultipleORB/destroy.cpp
+++ b/TAO/tests/BiDirectional_MultipleORB/destroy.cpp
@@ -19,6 +19,7 @@
 
 #include "tao/corba.h"
 #include "tao/PortableServer/PortableServer.h"
+#include "tao/AnyTypeCode/Any.h"
 #include "tao/BiDir_GIOP/BiDirGIOP.h"
 
 ACE_RCSID(BiDir_Multiple_ORB, destroy, "$Id$")
@@ -109,7 +110,7 @@ int
 main (int argc, char **argv)
 {
   int result = 0;
-  
+
   for (int i=0; i<10; i++)
   {
     result = test_with_bidir_poa (argc, argv, "poa_1", 1);
diff --git a/TAO/tests/BiDirectional_MultipleORB/destroy.mpc b/TAO/tests/BiDirectional_MultipleORB/destroy.mpc
index f57b2c7b1d5..b8dd7761667 100644
--- a/TAO/tests/BiDirectional_MultipleORB/destroy.mpc
+++ b/TAO/tests/BiDirectional_MultipleORB/destroy.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project: taoserver, bidir_giop {
+project: taoserver, anytypecode, bidir_giop {
   exename = destroy
   Source_Files {
     destroy.cpp
diff --git a/TAO/tests/BiDirectional_NestedUpcall/client.cpp b/TAO/tests/BiDirectional_NestedUpcall/client.cpp
index 8fb72a19b5a..2944499783f 100644
--- a/TAO/tests/BiDirectional_NestedUpcall/client.cpp
+++ b/TAO/tests/BiDirectional_NestedUpcall/client.cpp
@@ -4,6 +4,7 @@
 #include "test_i.h"
 #include "ace/High_Res_Timer.h"
 #include "tao/BiDir_GIOP/BiDirGIOP.h"
+#include "tao/AnyTypeCode/Any.h"
 
 ACE_RCSID(BiDirectional, client, "$Id$")
 
diff --git a/TAO/tests/BiDirectional_NestedUpcall/server.cpp b/TAO/tests/BiDirectional_NestedUpcall/server.cpp
index 0f419ec54fb..ef4c284f576 100644
--- a/TAO/tests/BiDirectional_NestedUpcall/server.cpp
+++ b/TAO/tests/BiDirectional_NestedUpcall/server.cpp
@@ -3,6 +3,7 @@
 #include "ace/Get_Opt.h"
 #include "test_i.h"
 #include "tao/BiDir_GIOP/BiDirGIOP.h"
+#include "tao/AnyTypeCode/Any.h"
 #include "ace/OS_NS_stdio.h"
 
 ACE_RCSID(BiDirectional, server, "$Id$")
diff --git a/TAO/tests/Big_Reply/Big_Reply.mpc b/TAO/tests/Big_Reply/Big_Reply.mpc
index aa9caa94b83..59034cf50db 100644
--- a/TAO/tests/Big_Reply/Big_Reply.mpc
+++ b/TAO/tests/Big_Reply/Big_Reply.mpc
@@ -2,6 +2,7 @@
 // $Id$
 
 project(*Server): taoserver {
+  idlflags += -Sa -St
   Source_Files {
     Big_Reply_i.cpp
     server.cpp
diff --git a/TAO/tests/Big_Request_Muxing/Client_Task.cpp b/TAO/tests/Big_Request_Muxing/Client_Task.cpp
index dc8712a9176..b33119b4e71 100644
--- a/TAO/tests/Big_Request_Muxing/Client_Task.cpp
+++ b/TAO/tests/Big_Request_Muxing/Client_Task.cpp
@@ -3,6 +3,7 @@
 //
 
 #include "Client_Task.h"
+#include "tao/AnyTypeCode/Any.h"
 
 ACE_RCSID(Big_Request_Muxing, Client_Task, "$Id$")
 
diff --git a/TAO/tests/Blocking_Sync_None/client.cpp b/TAO/tests/Blocking_Sync_None/client.cpp
index e4a83e7c146..2bff1936b7b 100644
--- a/TAO/tests/Blocking_Sync_None/client.cpp
+++ b/TAO/tests/Blocking_Sync_None/client.cpp
@@ -2,6 +2,7 @@
 
 #include "TestC.h"
 #include "tao/Messaging/Messaging.h"
+#include "tao/AnyTypeCode/Any.h"
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_sys_time.h"
 
diff --git a/TAO/tests/Bug_1020_Basic_Regression/client.cpp b/TAO/tests/Bug_1020_Basic_Regression/client.cpp
index 5cdd7222930..7deb646b538 100644
--- a/TAO/tests/Bug_1020_Basic_Regression/client.cpp
+++ b/TAO/tests/Bug_1020_Basic_Regression/client.cpp
@@ -5,7 +5,7 @@
 #include "tao/Utils/Servant_Var.h"
 #include "ace/Get_Opt.h"
 #include "tao/Messaging/Messaging.h"
-
+#include "tao/AnyTypeCode/Any.h"
 
 ACE_RCSID (Bug_1020_Basic_Regression,
            client,
diff --git a/TAO/tests/Bug_1020_Regression/client.cpp b/TAO/tests/Bug_1020_Regression/client.cpp
index 0ea73e74cff..63209f90483 100644
--- a/TAO/tests/Bug_1020_Regression/client.cpp
+++ b/TAO/tests/Bug_1020_Regression/client.cpp
@@ -3,6 +3,7 @@
 #include "Echo.h"
 #include "ORB_Task.h"
 #include "tao/Messaging/Messaging.h"
+#include "tao/AnyTypeCode/Any.h"
 #include "tao/Utils/Servant_Var.h"
 #include "tao/ORB_Core.h"
 #include "ace/Get_Opt.h"
diff --git a/TAO/tests/Bug_1269_Regression/client.cpp b/TAO/tests/Bug_1269_Regression/client.cpp
index 8b57a413c66..50b19d24f84 100644
--- a/TAO/tests/Bug_1269_Regression/client.cpp
+++ b/TAO/tests/Bug_1269_Regression/client.cpp
@@ -3,6 +3,7 @@
 #include "Echo.h"
 #include "ORB_Task.h"
 #include "tao/Messaging/Messaging.h"
+#include "tao/AnyTypeCode/Any.h"
 #include "tao/Utils/Servant_Var.h"
 #include "tao/ORB_Core.h"
 #include "ace/Get_Opt.h"
diff --git a/TAO/tests/Bug_1270_Regression/client.cpp b/TAO/tests/Bug_1270_Regression/client.cpp
index 5bdc3a618fc..8405b2d1c0c 100644
--- a/TAO/tests/Bug_1270_Regression/client.cpp
+++ b/TAO/tests/Bug_1270_Regression/client.cpp
@@ -3,6 +3,7 @@
 #include "Echo.h"
 #include "ORB_Task.h"
 #include "tao/Messaging/Messaging.h"
+#include "tao/AnyTypeCode/Any.h"
 #include "tao/Utils/Servant_Var.h"
 #include "tao/ORB_Core.h"
 #include "ace/Get_Opt.h"
diff --git a/TAO/tests/Bug_1361_Regression/client.cpp b/TAO/tests/Bug_1361_Regression/client.cpp
index 6e2540bc11b..76b98781048 100644
--- a/TAO/tests/Bug_1361_Regression/client.cpp
+++ b/TAO/tests/Bug_1361_Regression/client.cpp
@@ -3,6 +3,7 @@
 #include "Echo.h"
 #include "ORB_Task.h"
 #include "tao/Messaging/Messaging.h"
+#include "tao/AnyTypeCode/Any.h"
 #include "tao/Utils/Servant_Var.h"
 #include "tao/ORB_Core.h"
 #include "ace/Get_Opt.h"
diff --git a/TAO/tests/Bug_1476_Regression/Client_Task.cpp b/TAO/tests/Bug_1476_Regression/Client_Task.cpp
index d0ad90cebd2..570c96f0935 100644
--- a/TAO/tests/Bug_1476_Regression/Client_Task.cpp
+++ b/TAO/tests/Bug_1476_Regression/Client_Task.cpp
@@ -4,6 +4,7 @@
 
 #include "Client_Task.h"
 #include "tao/Messaging/Messaging.h"
+#include "tao/AnyTypeCode/Any.h"
 #include "ace/OS_NS_unistd.h"
 
 ACE_RCSID(Bug_1476_Regression, Client_Task, "$Id$")
diff --git a/TAO/tests/Bug_1476_Regression/client.cpp b/TAO/tests/Bug_1476_Regression/client.cpp
index 56d6e7ae7d3..cc25593ca6f 100644
--- a/TAO/tests/Bug_1476_Regression/client.cpp
+++ b/TAO/tests/Bug_1476_Regression/client.cpp
@@ -9,6 +9,7 @@
 #include "tao/ORB_Core.h"
 #include "tao/Thread_Lane_Resources.h"
 #include "tao/PortableServer/PortableServer.h"
+#include "tao/AnyTypeCode/Any.h"
 
 ACE_RCSID(Bug_1476_Regression, client, "$Id$")
 
diff --git a/TAO/tests/Bug_1482_Regression/client.cpp b/TAO/tests/Bug_1482_Regression/client.cpp
index d12c8f99086..78a8635a4e5 100644
--- a/TAO/tests/Bug_1482_Regression/client.cpp
+++ b/TAO/tests/Bug_1482_Regression/client.cpp
@@ -3,6 +3,7 @@
 #include "TestS.h"
 #include "Client_Task.h"
 #include "ace/Get_Opt.h"
+#include "tao/AnyTypeCode/Any.h"
 
 ACE_RCSID(Hello, client, "$Id$")
 
diff --git a/TAO/tests/Bug_1551_Regression/client.cpp b/TAO/tests/Bug_1551_Regression/client.cpp
index 3b2c83b6af0..a898cdb3398 100644
--- a/TAO/tests/Bug_1551_Regression/client.cpp
+++ b/TAO/tests/Bug_1551_Regression/client.cpp
@@ -5,6 +5,7 @@
 #include "TestS.h"
 #include "Client_Task.h"
 #include "ace/Get_Opt.h"
+#include "tao/AnyTypeCode/Any.h"
 
 ACE_RCSID(Hello, client, "$Id$")
 
diff --git a/TAO/tests/Bug_1627_Regression/test.mpc b/TAO/tests/Bug_1627_Regression/test.mpc
index 76b61adbf38..66bcbf45c86 100644
--- a/TAO/tests/Bug_1627_Regression/test.mpc
+++ b/TAO/tests/Bug_1627_Regression/test.mpc
@@ -8,7 +8,7 @@ project(Bug_1627_Server): taoserver, iortable {
   }
 }
 
-project(Bug_1627_Client): taoclient {
+project(Bug_1627_Client): taoclient, anytypecode {
   Source_Files {
     TestC.cpp
     client.cpp
diff --git a/TAO/tests/Bug_2174_Regression/Bug_2174_Regression.mpc b/TAO/tests/Bug_2174_Regression/Bug_2174_Regression.mpc
index 55faca590f0..1d3d307ea3e 100644
--- a/TAO/tests/Bug_2174_Regression/Bug_2174_Regression.mpc
+++ b/TAO/tests/Bug_2174_Regression/Bug_2174_Regression.mpc
@@ -8,7 +8,7 @@ project(*Server): taoserver {
   }
 }
 
-project(*Client): taoclient, minimum_corba {
+project(*Client): taoclient, anytypecode, minimum_corba {
   Source_Files {
     testC.cpp
     client.cpp
diff --git a/TAO/tests/Bug_2183_Regression/Bug_2183_Regression.mpc b/TAO/tests/Bug_2183_Regression/Bug_2183_Regression.mpc
index cc91c43587b..62cffce1ede 100755
--- a/TAO/tests/Bug_2183_Regression/Bug_2183_Regression.mpc
+++ b/TAO/tests/Bug_2183_Regression/Bug_2183_Regression.mpc
@@ -8,7 +8,7 @@ project(*Server): taoserver, strategies {
   }
 }
 
-project(*Client): taoclient {
+project(*Client): taoclient, anytypecode {
   Source_Files {
     TestC.cpp
     client.cpp
diff --git a/TAO/tests/CDR/CDR.mpc b/TAO/tests/CDR/CDR.mpc
index 155d6616a5a..cfbc027a2b2 100644
--- a/TAO/tests/CDR/CDR.mpc
+++ b/TAO/tests/CDR/CDR.mpc
@@ -17,7 +17,7 @@ project(*Allocator) : taoexe {
   }
 }
 
-project(*Basic Types) : taoexe {
+project(*Basic Types) : taoexe, anytypecode {
   exename  = basic_types
 
   Source_Files {
@@ -41,7 +41,7 @@ project(*Octet Sequence) : taoexe {
   }
 }
 
-project(*Tc) : taoexe {
+project(*Tc) : taoexe, anytypecode {
   exename  = tc
 
   Source_Files {
diff --git a/TAO/tests/CDR/basic_types.cpp b/TAO/tests/CDR/basic_types.cpp
index 656025779a4..a1035e4c150 100644
--- a/TAO/tests/CDR/basic_types.cpp
+++ b/TAO/tests/CDR/basic_types.cpp
@@ -20,7 +20,7 @@
 #include "tao/ORB.h"
 #include "tao/debug.h"
 #include "tao/CDR.h"
-#include "tao/Any.h"
+#include "tao/AnyTypeCode/Any.h"
 
 #include "ace/Get_Opt.h"
 #include "ace/Log_Msg.h"
diff --git a/TAO/tests/CDR/tc.cpp b/TAO/tests/CDR/tc.cpp
index 6b15445e1d6..9a03f8c161d 100644
--- a/TAO/tests/CDR/tc.cpp
+++ b/TAO/tests/CDR/tc.cpp
@@ -17,7 +17,8 @@
 //
 // ============================================================================
 
-#include "tao/TypeCode.h"
+#include "tao/AnyTypeCode/TypeCode.h"
+#include "tao/AnyTypeCode/TC_Constants_Forward.h"
 #include "tao/ORB.h"
 #include "tao/SystemException.h"
 #include "tao/debug.h"
diff --git a/TAO/tests/Client_Leaks/Client_Leaks.mpc b/TAO/tests/Client_Leaks/Client_Leaks.mpc
index 9d21026afb5..41961bc999f 100644
--- a/TAO/tests/Client_Leaks/Client_Leaks.mpc
+++ b/TAO/tests/Client_Leaks/Client_Leaks.mpc
@@ -10,7 +10,7 @@ project(*Server): taoserver {
   }
 }
 
-project(*Client): taoclient {
+project(*Client): taoclient, anytypecode {
   Source_Files {
     TestC.cpp
     Client_Task.cpp
@@ -18,7 +18,8 @@ project(*Client): taoclient {
   }
 }
 
-project(*Child): taoexe, portableserver {
+project(*Child): taoserver {
+  exename = child
   Source_Files {
     Process.cpp
     child.cpp
diff --git a/TAO/tests/CodeSets/simple/CodeSets_simple.mpc b/TAO/tests/CodeSets/simple/CodeSets_simple.mpc
index 6e2484872f2..ce9259b4c2c 100644
--- a/TAO/tests/CodeSets/simple/CodeSets_simple.mpc
+++ b/TAO/tests/CodeSets/simple/CodeSets_simple.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*client) : taoclient {
+project(*client) : taoclient, anytypecode {
   IDL_Files {
     simple.idl
   }
diff --git a/TAO/tests/Collocation/Collocation.mpc b/TAO/tests/Collocation/Collocation.mpc
index e0eba5a4b63..5a0b503aac4 100644
--- a/TAO/tests/Collocation/Collocation.mpc
+++ b/TAO/tests/Collocation/Collocation.mpc
@@ -3,7 +3,7 @@
 
 project(*Test Stub): taolib_with_idl {
   sharedname   = Collocation_Test_Stub
-  idlflags    += -Wb,skel_export_macro=Diamond_Export -Wb,stub_export_macro=MY_Stub_Export -Wb,skel_export_include=diamond_export.h -Wb,stub_export_include=stub_export.h -Gd
+  idlflags    += -Wb,skel_export_macro=Diamond_Export -Wb,stub_export_macro=MY_Stub_Export -Wb,skel_export_include=diamond_export.h -Wb,stub_export_include=stub_export.h -Gd -St -Sa
   dynamicflags = MY_STUB_BUILD_DLL
 
   Source_Files {
@@ -15,7 +15,7 @@ project(*Diamond) : taolib_with_idl, portableserver {
   after       += Collocation_Test_Stub
   sharedname   = Collocation_Diamond
   libs        += Collocation_Test_Stub
-  idlflags    += -Wb,skel_export_macro=Diamond_Export -Wb,stub_export_macro=MY_Stub_Export -Wb,skel_export_include=diamond_export.h -Wb,stub_export_include=stub_export.h -Gd
+  idlflags    += -Wb,skel_export_macro=Diamond_Export -Wb,stub_export_macro=MY_Stub_Export -Wb,skel_export_include=diamond_export.h -Wb,stub_export_include=stub_export.h -Gd -St -Sa
   dynamicflags = DIAMOND_BUILD_DLL
 
   Source_Files {
diff --git a/TAO/tests/Collocation_Oneway_Tests/Client_Task.cpp b/TAO/tests/Collocation_Oneway_Tests/Client_Task.cpp
index 9ad66467fbb..216bcba8cf8 100644
--- a/TAO/tests/Collocation_Oneway_Tests/Client_Task.cpp
+++ b/TAO/tests/Collocation_Oneway_Tests/Client_Task.cpp
@@ -3,6 +3,7 @@
 //
 
 #include "tao/Messaging/Messaging.h"
+#include "tao/AnyTypeCode/Any.h"
 #include "Client_Task.h"
 #include "TestC.h"
 
diff --git a/TAO/tests/Connection_Timeout/client.cpp b/TAO/tests/Connection_Timeout/client.cpp
index 6d01f8d99c7..d1bab792c95 100644
--- a/TAO/tests/Connection_Timeout/client.cpp
+++ b/TAO/tests/Connection_Timeout/client.cpp
@@ -4,8 +4,9 @@
 #include "ace/Get_Opt.h"
 #include "ace/Profile_Timer.h"
 #include "tao/Messaging/Messaging.h"
+#include "tao/AnyTypeCode/Any.h"
 
-ACE_RCSID(Hello, client, "$Id$")
+ACE_RCSID(Connection_Timeout, client, "$Id$")
 
 const char *ior =
   "corbaloc:iiop:192.3.47/10007/RandomObject";
diff --git a/TAO/tests/Crashed_Callback/client.cpp b/TAO/tests/Crashed_Callback/client.cpp
index b8a3ccf807b..4f020c7d89c 100644
--- a/TAO/tests/Crashed_Callback/client.cpp
+++ b/TAO/tests/Crashed_Callback/client.cpp
@@ -3,6 +3,7 @@
 #include "Crashed_Callback.h"
 
 #include "tao/Messaging/Messaging.h"
+#include "tao/AnyTypeCode/Any.h"
 #include "ace/Get_Opt.h"
 
 ACE_RCSID(Crashed_Callback, client, "$Id$")
diff --git a/TAO/tests/Crashed_Callback/server.cpp b/TAO/tests/Crashed_Callback/server.cpp
index 82b65649f3a..11b8a975a14 100644
--- a/TAO/tests/Crashed_Callback/server.cpp
+++ b/TAO/tests/Crashed_Callback/server.cpp
@@ -3,6 +3,7 @@
 #include "Service.h"
 
 #include "tao/Messaging/Messaging.h"
+#include "tao/AnyTypeCode/Any.h"
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_stdio.h"
 
diff --git a/TAO/tests/DLL_ORB/DLL_ORB.mpc b/TAO/tests/DLL_ORB/DLL_ORB.mpc
index 559d35e4373..f7eb4ab9597 100644
--- a/TAO/tests/DLL_ORB/DLL_ORB.mpc
+++ b/TAO/tests/DLL_ORB/DLL_ORB.mpc
@@ -1,14 +1,14 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Test Client Module): taolib_with_idl {
+project(*Test Client Module): taolib_with_idl, anytypecode {
   sharedname    = Test_Client_Module
   dynamicflags  = TEST_CLIENT_MODULE_BUILD_DLL
 
   Source_Files {
     TestC.cpp
     Test_Client_Module.cpp
-  }  
+  }
 }
 
 project(*Test Server Module) : taolib_with_idl, portableserver {
diff --git a/TAO/tests/DynAny_Test/data.cpp b/TAO/tests/DynAny_Test/data.cpp
index 9022629b48a..90711bedfc5 100644
--- a/TAO/tests/DynAny_Test/data.cpp
+++ b/TAO/tests/DynAny_Test/data.cpp
@@ -14,7 +14,7 @@
 
 #include "data.h"
 #include "ace/Log_Msg.h"
-#include "tao/TypeCode.h"
+#include "tao/AnyTypeCode/TypeCode.h"
 #include "tao/PortableServer/PortableServer.h"
 
 Data::Data (CORBA::ORB_var orb)
diff --git a/TAO/tests/DynAny_Test/data.h b/TAO/tests/DynAny_Test/data.h
index e9561c0d63b..50c4053895d 100644
--- a/TAO/tests/DynAny_Test/data.h
+++ b/TAO/tests/DynAny_Test/data.h
@@ -14,7 +14,7 @@
 
 #include "tao/ORB.h"
 #include "tao/Object.h"
-#include "tao/TC_Constants_Forward.h"
+#include "tao/AnyTypeCode/TC_Constants_Forward.h"
 
 class Data
 {
diff --git a/TAO/tests/File_IO/File_IO.mpc b/TAO/tests/File_IO/File_IO.mpc
index 1a48ef667d1..615787310c6 100644
--- a/TAO/tests/File_IO/File_IO.mpc
+++ b/TAO/tests/File_IO/File_IO.mpc
@@ -8,7 +8,7 @@ project(*Server): taoserver, pi_server, minimum_corba {
   }
 }
 
-project(*Client): taoclient, minimum_corba {
+project(*Client): taoclient, anytypecode, minimum_corba {
   Source_Files {
     FileC.cpp
     client.cpp
diff --git a/TAO/tests/Forwarding/Forwarding.mpc b/TAO/tests/Forwarding/Forwarding.mpc
index 39a1709e261..d3e679e33b7 100644
--- a/TAO/tests/Forwarding/Forwarding.mpc
+++ b/TAO/tests/Forwarding/Forwarding.mpc
@@ -8,7 +8,7 @@ project(*Server): taoserver, iortable {
   }
 }
 
-project(*Client): taoclient {
+project(*Client): taoclient, anytypecode {
   Source_Files {
     testC.cpp
     client.cpp
diff --git a/TAO/tests/Hello/Hello.mpc b/TAO/tests/Hello/Hello.mpc
index 909e1da7029..4f7f1f0064d 100644
--- a/TAO/tests/Hello/Hello.mpc
+++ b/TAO/tests/Hello/Hello.mpc
@@ -2,8 +2,6 @@
 // $Id$
 
 project(*Server): taoserver {
-  idlflags += -St -Sa
-
   Source_Files {
     Hello.cpp
     server.cpp
@@ -11,8 +9,6 @@ project(*Server): taoserver {
 }
 
 project(*Client): taoclient {
-  idlflags += -St -Sa
-
   Source_Files {
     TestC.cpp
     client.cpp
diff --git a/TAO/tests/IDL_Test/IDL_Test.mpc b/TAO/tests/IDL_Test/IDL_Test.mpc
index e135d7f7ff0..4dff9ab5ca5 100644
--- a/TAO/tests/IDL_Test/IDL_Test.mpc
+++ b/TAO/tests/IDL_Test/IDL_Test.mpc
@@ -3,17 +3,39 @@
 
 project(*Main): taoserver, messaging {
   exename = main
-  
-  idlflags += -GC -GH -Gd -GA
 
   IDL_Files {
-    *.idl
+    idlflags += -GC -GH -Gd
+    array.idl
+    enum_in_struct.idl
+    full.idl
+    fwd.idl
+    gperf.idl
+    including.idl
+    interface.idl
+    included.idl
+    union.idl
+    nested_scope.idl
+    params.idl
+    reopened_modules.idl
+    sequence.idl
+    reopen_include1.idl
+    reopen_include2.idl
   }
-  
+
+  IDL_Files {
+    idlflags += -GC -GH -Gd -GA
+    anonymous.idl
+    constants.idl
+    generic_object.idl
+    keywords.idl
+    pragma.idl
+    repo_id_mod.idl
+    typedef.idl
+    valuetype.idl
+  }
+
   Source_Files {
     main.cpp
-    *C.cpp
-    *S.cpp
-    *A.cpp
   }
 }
diff --git a/TAO/tests/IDL_Test/main.cpp b/TAO/tests/IDL_Test/main.cpp
index e18d2b1f03b..2c39344eabf 100644
--- a/TAO/tests/IDL_Test/main.cpp
+++ b/TAO/tests/IDL_Test/main.cpp
@@ -26,6 +26,7 @@
 
 #include "ace/Log_Msg.h"
 #include "ace/OS_NS_string.h"
+#include "tao/AnyTypeCode/Any.h"
 
 class hello_i : public virtual POA_hello
 {
diff --git a/TAO/tests/InterOp-Naming/InterOp-Naming.mpc b/TAO/tests/InterOp-Naming/InterOp-Naming.mpc
index 6e52261eed8..5604fafaf7b 100644
--- a/TAO/tests/InterOp-Naming/InterOp-Naming.mpc
+++ b/TAO/tests/InterOp-Naming/InterOp-Naming.mpc
@@ -10,7 +10,7 @@ project(*Server): taoserver, utils, iortable {
   }
 }
 
-project(*Client): taoclient {
+project(*Client): taoclient, anytypecode {
   exename = INS_test_client
   Source_Files {
     INSC.cpp
diff --git a/TAO/tests/MProfile_Connection_Timeout/client.cpp b/TAO/tests/MProfile_Connection_Timeout/client.cpp
index f00618c2385..093073beeb9 100644
--- a/TAO/tests/MProfile_Connection_Timeout/client.cpp
+++ b/TAO/tests/MProfile_Connection_Timeout/client.cpp
@@ -6,6 +6,7 @@
 #include "testC.h"
 #include "tao/TimeBaseC.h"
 #include "tao/Messaging/Messaging.h"
+#include "tao/AnyTypeCode/Any.h"
 
 ACE_RCSID(MProfile_Connection_Timeout,
           client,
diff --git a/TAO/tests/MProfile_Forwarding/MProfile_Forwarding.mpc b/TAO/tests/MProfile_Forwarding/MProfile_Forwarding.mpc
index 52432fcddbb..e38b68ca361 100644
--- a/TAO/tests/MProfile_Forwarding/MProfile_Forwarding.mpc
+++ b/TAO/tests/MProfile_Forwarding/MProfile_Forwarding.mpc
@@ -1,21 +1,23 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): taoexe, portableserver, minimum_corba {
+project(*Server): taoserver, minimum_corba {
   Source_Files {
     test_i.cpp
     server.cpp
   }
 }
 
-project(*Client): taoexe, minimum_corba {
+project(*Client): taoclient, anytypecode, minimum_corba {
+  exename = client
   Source_Files {
     testC.cpp
     client.cpp
   }
 }
 
-project(*Manager): taoexe, portableserver, minimum_corba, iormanip {
+project(*Manager): taoserver, minimum_corba, iormanip {
+  exename = manager
   Source_Files {
     testC.cpp
     Servant_Locator.cpp
diff --git a/TAO/tests/MT_BiDir/client.cpp b/TAO/tests/MT_BiDir/client.cpp
index 24208035c60..23566a7d242 100644
--- a/TAO/tests/MT_BiDir/client.cpp
+++ b/TAO/tests/MT_BiDir/client.cpp
@@ -4,6 +4,7 @@
 #include "Receiver_i.h"
 #include "SenderC.h"
 #include "tao/BiDir_GIOP/BiDirGIOP.h"
+#include "tao/AnyTypeCode/Any.h"
 #include "Client_Task.h"
 
 ACE_RCSID(BiDirectional, client, "client.cpp,v 1.6 2001/03/30 20:11:05 bala Exp")
diff --git a/TAO/tests/MT_BiDir/server.cpp b/TAO/tests/MT_BiDir/server.cpp
index 88189b39fc5..7aeeeecdbc8 100644
--- a/TAO/tests/MT_BiDir/server.cpp
+++ b/TAO/tests/MT_BiDir/server.cpp
@@ -3,6 +3,7 @@
 #include "ace/Get_Opt.h"
 #include "Sender_i.h"
 #include "tao/BiDir_GIOP/BiDirGIOP.h"
+#include "tao/AnyTypeCode/Any.h"
 #include "Server_Task.h"
 #include "tao/ORB_Core.h"
 #include "tao/Thread_Lane_Resources.h"
diff --git a/TAO/tests/MT_Client/MT_Client.mpc b/TAO/tests/MT_Client/MT_Client.mpc
index 6307a6f623a..a585f7ec595 100644
--- a/TAO/tests/MT_Client/MT_Client.mpc
+++ b/TAO/tests/MT_Client/MT_Client.mpc
@@ -1,14 +1,14 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): taoexe, portableserver {
+project(*Server): taoserver {
   Source_Files {
     test_i.cpp
     server.cpp
   }
 }
 
-project(*Client): taoexe {
+project(*Client): taoclient {
   Source_Files {
     testC.cpp
     client.cpp
diff --git a/TAO/tests/MT_Server/MT_Server.mpc b/TAO/tests/MT_Server/MT_Server.mpc
index 6307a6f623a..a585f7ec595 100644
--- a/TAO/tests/MT_Server/MT_Server.mpc
+++ b/TAO/tests/MT_Server/MT_Server.mpc
@@ -1,14 +1,14 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): taoexe, portableserver {
+project(*Server): taoserver {
   Source_Files {
     test_i.cpp
     server.cpp
   }
 }
 
-project(*Client): taoexe {
+project(*Client): taoclient {
   Source_Files {
     testC.cpp
     client.cpp
diff --git a/TAO/tests/MT_Timeout/Client_Task.cpp b/TAO/tests/MT_Timeout/Client_Task.cpp
index 865e10abc65..29bb6e0502d 100644
--- a/TAO/tests/MT_Timeout/Client_Task.cpp
+++ b/TAO/tests/MT_Timeout/Client_Task.cpp
@@ -6,7 +6,7 @@
 #include "ace/OS_NS_unistd.h"
 #include "tao/TimeBaseC.h"
 #include "tao/Messaging/Messaging.h"
-
+#include "tao/AnyTypeCode/Any.h"
 
 ACE_RCSID(MT_Timeout, Client_Task, "$Id$")
 
diff --git a/TAO/tests/Muxing/Muxing.mpc b/TAO/tests/Muxing/Muxing.mpc
index cc83753659f..2824b800b03 100644
--- a/TAO/tests/Muxing/Muxing.mpc
+++ b/TAO/tests/Muxing/Muxing.mpc
@@ -9,7 +9,7 @@ project(*Server): taoserver {
   }
 }
 
-project(*Client): taoclient {
+project(*Client): taoclient, anytypecode {
   Source_Files {
     TestC.cpp
     Client_Task.cpp
diff --git a/TAO/tests/Native_Exceptions/Native_Exceptions.mpc b/TAO/tests/Native_Exceptions/Native_Exceptions.mpc
index 8a82c1975ee..397406b1347 100644
--- a/TAO/tests/Native_Exceptions/Native_Exceptions.mpc
+++ b/TAO/tests/Native_Exceptions/Native_Exceptions.mpc
@@ -1,16 +1,16 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): taoserver, exceptions {
-  idlflags  = -Ge 0 -Sc
+project(*Server): taoserver, anytypecode, exceptions {
+  idlflags  = -Ge 0 -Sc -Sa -St
   Source_Files {
     test_i.cpp
     server.cpp
   }
 }
 
-project(*Client): taoclient, exceptions {
-  idlflags  = -Ge 0 -Sc
+project(*Client): taoclient, anytypecode, exceptions {
+  idlflags  = -Ge 0 -Sc -Sa -St
   Source_Files {
     testC.cpp
     client.cpp
diff --git a/TAO/tests/Nested_Upcall_Crash/client.cpp b/TAO/tests/Nested_Upcall_Crash/client.cpp
index 55a9dc1f236..0bafc403012 100644
--- a/TAO/tests/Nested_Upcall_Crash/client.cpp
+++ b/TAO/tests/Nested_Upcall_Crash/client.cpp
@@ -3,6 +3,7 @@
 #include "Client_Peer.h"
 #include "Clock_Ticks.h"
 #include "tao/Messaging/Messaging.h"
+#include "tao/AnyTypeCode/Any.h"
 #include "tao/ORB_Core.h"
 #include "ace/Get_Opt.h"
 #include "ace/Reactor.h"
diff --git a/TAO/tests/Nested_Upcall_Crash/scavenger.cpp b/TAO/tests/Nested_Upcall_Crash/scavenger.cpp
index 3e9e053a830..d2b7c7d3981 100644
--- a/TAO/tests/Nested_Upcall_Crash/scavenger.cpp
+++ b/TAO/tests/Nested_Upcall_Crash/scavenger.cpp
@@ -2,6 +2,7 @@
 
 #include "TestC.h"
 #include "tao/Messaging/Messaging.h"
+#include "tao/AnyTypeCode/Any.h"
 #include "tao/ORB_Core.h"
 #include "ace/Get_Opt.h"
 
diff --git a/TAO/tests/Nested_Upcall_Crash/server.cpp b/TAO/tests/Nested_Upcall_Crash/server.cpp
index 7bb6378f697..0b7eb0628fe 100644
--- a/TAO/tests/Nested_Upcall_Crash/server.cpp
+++ b/TAO/tests/Nested_Upcall_Crash/server.cpp
@@ -3,6 +3,7 @@
 #include "Server_Peer.h"
 #include "Clock_Ticks.h"
 #include "tao/Messaging/Messaging.h"
+#include "tao/AnyTypeCode/Any.h"
 #include "tao/ORB_Core.h"
 #include "ace/Get_Opt.h"
 #include "ace/Reactor.h"
diff --git a/TAO/tests/No_Server_MT_Connect_Test/No_Server_Connect_Test.mpc b/TAO/tests/No_Server_MT_Connect_Test/No_Server_Connect_Test.mpc
index a585f7ec595..4c15c26f959 100644
--- a/TAO/tests/No_Server_MT_Connect_Test/No_Server_Connect_Test.mpc
+++ b/TAO/tests/No_Server_MT_Connect_Test/No_Server_Connect_Test.mpc
@@ -8,7 +8,7 @@ project(*Server): taoserver {
   }
 }
 
-project(*Client): taoclient {
+project(*Client): taoclient, anytypecode {
   Source_Files {
     testC.cpp
     client.cpp
diff --git a/TAO/tests/ORT/ORT.mpc b/TAO/tests/ORT/ORT.mpc
index 9c288c29f52..461f03a1a7b 100644
--- a/TAO/tests/ORT/ORT.mpc
+++ b/TAO/tests/ORT/ORT.mpc
@@ -21,7 +21,7 @@ project(Test_ORT_Server): taoserver, objreftemplate, iorinterceptor, pi_server,
 }
 
 
-project(Test_ORT_Client): taoclient, interceptors {
+project(Test_ORT_Client): taoclient, anytypecode, interceptors {
   after += Test_ORT_Server
 
   IDL_Files {
diff --git a/TAO/tests/Objref_Sequence_Test/Objref_Sequence_Test.mpc b/TAO/tests/Objref_Sequence_Test/Objref_Sequence_Test.mpc
index 4a4d62a720b..fcf4ac7709c 100644
--- a/TAO/tests/Objref_Sequence_Test/Objref_Sequence_Test.mpc
+++ b/TAO/tests/Objref_Sequence_Test/Objref_Sequence_Test.mpc
@@ -7,7 +7,7 @@ project(*Server): taoserver {
   }
 }
 
-project(*Client): taoclient {
+project(*Client): taoclient, anytypecode {
   Source_Files {
     TestC.cpp
     client.cpp
diff --git a/TAO/tests/OctetSeq/OctetSeq.mpc b/TAO/tests/OctetSeq/OctetSeq.mpc
index 7df36753283..f022a840487 100644
--- a/TAO/tests/OctetSeq/OctetSeq.mpc
+++ b/TAO/tests/OctetSeq/OctetSeq.mpc
@@ -8,16 +8,15 @@ project(*Server): taoserver {
   }
 }
 
-project(*Client): taoclient {
+project(*Client): taoclient, anytypecode {
   Source_Files {
     testC.cpp
     client.cpp
   }
 }
 
-project(*OctetSeq): taoexe {
+project(*OctetSeq): taoclient, anytypecode {
   exename = OctetSeq
-
   Source_Files {
     testC.cpp
     OctetSeq.cpp
diff --git a/TAO/tests/Oneway_Buffering/client.cpp b/TAO/tests/Oneway_Buffering/client.cpp
index 33061a3f815..ca1b240ca78 100644
--- a/TAO/tests/Oneway_Buffering/client.cpp
+++ b/TAO/tests/Oneway_Buffering/client.cpp
@@ -2,7 +2,9 @@
 
 #include "TestC.h"
 #include "tao/Messaging/Messaging.h"
+#include "tao/AnyTypeCode/Any.h"
 #include "tao/TAOC.h"
+#include "tao/AnyTypeCode/TAOA.h"
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_sys_time.h"
 
diff --git a/TAO/tests/POA/Current/Current.mpc b/TAO/tests/POA/Current/Current.mpc
index 49fcc0fc6a3..d08e1edbd9d 100644
--- a/TAO/tests/POA/Current/Current.mpc
+++ b/TAO/tests/POA/Current/Current.mpc
@@ -1,5 +1,6 @@
 // -*- MPC -*-
 // $Id$
 
-project(POA*): taoexe, portableserver, pi_server {
+project(POA*): taoserver, pi_server {
+  exename = Current
 }
diff --git a/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.cpp b/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.cpp
index 17ad5ce90b5..11d740642cd 100644
--- a/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.cpp
+++ b/TAO/tests/POA/MT_Servant_Locator/MT_Servant_Locator.cpp
@@ -21,6 +21,7 @@
 #include "ace/Task.h"
 #include "ace/Auto_Event.h"
 #include "tao/PortableServer/ServantLocatorC.h"
+#include "tao/CDR.h"
 
 class test_i :
   public virtual POA_test
@@ -176,7 +177,7 @@ Servant_Locator::postinvoke (const PortableServer::ObjectId &oid,
               name.in ()));
 }
 
-void
+bool
 set_nil_servant_manager (PortableServer::POA_ptr poa)
 {
   bool succeed = false;
@@ -205,9 +206,11 @@ set_nil_servant_manager (PortableServer::POA_ptr poa)
     ACE_ERROR ((LM_ERROR,
                 "(%t) ERROR, set nil servant manager failed\n"));
   }
+
+  return succeed;
 }
 
-void
+bool
 overwrite_servant_manager (PortableServer::POA_ptr poa)
 {
   bool succeed = false;
@@ -238,11 +241,15 @@ overwrite_servant_manager (PortableServer::POA_ptr poa)
     ACE_ERROR ((LM_ERROR,
                 "(%t) ERROR, overwrite servant manager failed\n"));
   }
+
+  return succeed;
 }
 
 int
 main (int argc, char **argv)
 {
+  int retval = 0;
+
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
@@ -297,14 +304,16 @@ main (int argc, char **argv)
                               ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      set_nil_servant_manager (child_poa.in());
+      if (!set_nil_servant_manager (child_poa.in()))
+        retval = -1;
 
       Servant_Locator servant_locator (child_poa.in ());
       child_poa->set_servant_manager (&servant_locator
                                       ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      overwrite_servant_manager (child_poa.in());
+      if (!overwrite_servant_manager (child_poa.in()))
+        retval = -1;
 
       PortableServer::ObjectId_var first_oid =
         PortableServer::string_to_ObjectId ("first");
@@ -355,9 +364,9 @@ main (int argc, char **argv)
   ACE_CATCHANY
     {
       ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught");
-      return -1;
+      retval = -1;
     }
   ACE_ENDTRY;
 
-  return 0;
+  return retval;
 }
diff --git a/TAO/tests/POA/Policies/Policies.cpp b/TAO/tests/POA/Policies/Policies.cpp
index 77a64c760c1..095c1dca356 100644
--- a/TAO/tests/POA/Policies/Policies.cpp
+++ b/TAO/tests/POA/Policies/Policies.cpp
@@ -19,7 +19,7 @@
 //=========================================================================
 
 #include "tao/ORB.h"
-#include "tao/Any.h"
+#include "tao/AnyTypeCode/Any.h"
 #include "tao/PortableServer/PortableServer.h"
 #include "tao/PI_Server/PI_Server.h"
 
diff --git a/TAO/tests/Param_Test/Param_Test.mpc b/TAO/tests/Param_Test/Param_Test.mpc
index 3acdda2a21b..6124582c733 100644
--- a/TAO/tests/Param_Test/Param_Test.mpc
+++ b/TAO/tests/Param_Test/Param_Test.mpc
@@ -2,8 +2,6 @@
 // $Id$
 
 project(*Server): taoserver, minimum_corba {
-  idlflags += -GA
-
   Source_Files {
     param_test_i.cpp
     server.cpp
@@ -12,7 +10,6 @@ project(*Server): taoserver, minimum_corba {
 
 project(*Client): taoserver, minimum_corba, dynamicinterface {
   exename  = client
-  idlflags += -GA
   after += Param_Test_Server
 
   Source_Files {
@@ -62,12 +59,10 @@ project(*Client): taoserver, minimum_corba, dynamicinterface {
 
 project(*Anyop): taoserver, minimum_corba {
   exename = anyop
-  idlflags += -GA
   after += Param_Test_Client
 
   Source_Files {
     param_testC.cpp
-    param_testA.cpp
     anyop.cpp
   }
 }
diff --git a/TAO/tests/Param_Test/param_test.idl b/TAO/tests/Param_Test/param_test.idl
index a2023cbbede..cf28c1273cc 100644
--- a/TAO/tests/Param_Test/param_test.idl
+++ b/TAO/tests/Param_Test/param_test.idl
@@ -20,6 +20,7 @@
 // ============================================================================
 
 #include <orb.idl>
+#include "tao/AnyTypeCode/AnySeq.pidl"
 
 interface Coffee
 {
diff --git a/TAO/tests/Policies/Manipulation.cpp b/TAO/tests/Policies/Manipulation.cpp
index c6bfc107291..8de5aa8c65f 100644
--- a/TAO/tests/Policies/Manipulation.cpp
+++ b/TAO/tests/Policies/Manipulation.cpp
@@ -3,6 +3,8 @@
 #include "testC.h"
 
 #include "tao/Messaging/Messaging.h"
+#include "tao/AnyTypeCode/Any.h"
+#include "tao/AnyTypeCode/TAOA.h"
 #include "tao/TAOC.h"
 #include "tao/Object_T.h"
 #include "ace/Get_Opt.h"
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/client_interceptors.cpp b/TAO/tests/Portable_Interceptors/Benchmark/client_interceptors.cpp
index f28091c7e3e..0086a292ed7 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/client_interceptors.cpp
+++ b/TAO/tests/Portable_Interceptors/Benchmark/client_interceptors.cpp
@@ -2,8 +2,8 @@
 
 #include "client_interceptors.h"
 
-#include "tao/DynamicC.h"
-#include "tao/TypeCode.h"
+#include "tao/AnyTypeCode/DynamicC.h"
+#include "tao/AnyTypeCode/TypeCode.h"
 #include "ace/OS_NS_string.h"
 #include "ace/Log_Msg.h"
 
diff --git a/TAO/tests/Portable_Interceptors/Benchmark/server_interceptors.cpp b/TAO/tests/Portable_Interceptors/Benchmark/server_interceptors.cpp
index a2cfbb32e3a..a11b66691d3 100644
--- a/TAO/tests/Portable_Interceptors/Benchmark/server_interceptors.cpp
+++ b/TAO/tests/Portable_Interceptors/Benchmark/server_interceptors.cpp
@@ -2,8 +2,8 @@
 
 #include "server_interceptors.h"
 
-#include "tao/DynamicC.h"
-#include "tao/TypeCode.h"
+#include "tao/AnyTypeCode/DynamicC.h"
+#include "tao/AnyTypeCode/TypeCode.h"
 #include "ace/OS_NS_string.h"
 #include "ace/Log_Msg.h"
 
diff --git a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.cpp b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.cpp
index 6d580a122d4..927b0f37cc9 100644
--- a/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.cpp
+++ b/TAO/tests/Portable_Interceptors/Collocated/Dynamic/interceptors.cpp
@@ -3,8 +3,8 @@
 #include "interceptors.h"
 #include "ace/Log_Msg.h"
 #include "ace/OS_NS_string.h"
-#include "tao/DynamicC.h"
-#include "tao/TypeCode.h"
+#include "tao/AnyTypeCode/DynamicC.h"
+#include "tao/AnyTypeCode/TypeCode.h"
 
 ACE_RCSID (Dynamic,
            interceptors,
diff --git a/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.cpp b/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.cpp
index 29eae24ccda..155f0663b5d 100644
--- a/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.cpp
@@ -3,8 +3,8 @@
 #include "client_interceptor.h"
 #include "testC.h"
 
-#include "tao/DynamicC.h"
-#include "tao/TypeCode.h"
+#include "tao/AnyTypeCode/DynamicC.h"
+#include "tao/AnyTypeCode/TypeCode.h"
 
 #include "ace/Log_Msg.h"
 #include "ace/OS_NS_string.h"
diff --git a/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.cpp b/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.cpp
index 8e072515d51..30bd61bceb8 100644
--- a/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.cpp
@@ -3,8 +3,8 @@
 #include "server_interceptor.h"
 #include "testC.h"
 
-#include "tao/DynamicC.h"
-#include "tao/TypeCode.h"
+#include "tao/AnyTypeCode/DynamicC.h"
+#include "tao/AnyTypeCode/TypeCode.h"
 
 #include "ace/Log_Msg.h"
 #include "ace/OS_NS_string.h"
diff --git a/TAO/tests/Portable_Interceptors/ForwardRequest/test.idl b/TAO/tests/Portable_Interceptors/ForwardRequest/test.idl
index 153cf4559de..0b9ab7f0190 100644
--- a/TAO/tests/Portable_Interceptors/ForwardRequest/test.idl
+++ b/TAO/tests/Portable_Interceptors/ForwardRequest/test.idl
@@ -13,7 +13,7 @@
  */
 //=============================================================================
 
-#include "tao/PI_Server/ServerRequestInterceptor.pidl"
+#include "tao/PI_Server/PI_Server_include.pidl"
 
 module ForwardRequestTest
 {
diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.cpp b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.cpp
index b499b5b317e..6cfa38f8bde 100644
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/FOO_ClientRequestInterceptor.cpp
@@ -3,7 +3,7 @@
 
 #include "ace/Log_Msg.h"
 
-#include "tao/TC_Constants_Forward.h"
+#include "tao/AnyTypeCode/TC_Constants_Forward.h"
 
 ACE_RCSID (IORInterceptor,
            FOO_ClientRequestInterceptor,
diff --git a/TAO/tests/Portable_Interceptors/IORInterceptor/PI_IORInterceptor.mpc b/TAO/tests/Portable_Interceptors/IORInterceptor/PI_IORInterceptor.mpc
index 1bdc7d0b821..26777d6f625 100644
--- a/TAO/tests/Portable_Interceptors/IORInterceptor/PI_IORInterceptor.mpc
+++ b/TAO/tests/Portable_Interceptors/IORInterceptor/PI_IORInterceptor.mpc
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project(*Server): taoserver, iorinterceptor, codecfactory, interceptors {
+project(*Server): taoserver, iorinterceptor, interceptors {
   Source_Files {
     test_i.cpp
     FOO_IORInterceptor_ORBInitializer.cpp
@@ -10,7 +10,7 @@ project(*Server): taoserver, iorinterceptor, codecfactory, interceptors {
   }
 }
 
-project(*Client): taoclient, pi, codecfactory, interceptors {
+project(*Client): taoclient, pi, interceptors {
   Source_Files {
     testC.cpp
     FOO_Client_ORBInitializer.cpp
diff --git a/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.h b/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.h
index 0e7c09d7d9c..b9cd7bf2c5d 100644
--- a/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.h
+++ b/TAO/tests/Portable_Interceptors/PICurrent/ServerRequestInterceptor.h
@@ -23,6 +23,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/PI_Server/PI_Server.h"
+#include "tao/PI/PI.h"
 #include "tao/PortableInterceptorC.h"
 #include "tao/LocalObject.h"
 
diff --git a/TAO/tests/Portable_Interceptors/PICurrent/client.cpp b/TAO/tests/Portable_Interceptors/PICurrent/client.cpp
index 3763c57bde7..4325478fd98 100644
--- a/TAO/tests/Portable_Interceptors/PICurrent/client.cpp
+++ b/TAO/tests/Portable_Interceptors/PICurrent/client.cpp
@@ -6,7 +6,7 @@
 #include "ClientORBInitializer.h"
 
 #include "tao/ORBInitializer_Registry.h"
-#include "tao/PICurrentC.h"
+#include "tao/PI/PI.h"
 
 ACE_RCSID (PICurrent,
            client,
diff --git a/TAO/tests/Portable_Interceptors/PICurrent/test_i.h b/TAO/tests/Portable_Interceptors/PICurrent/test_i.h
index eb6e6ab4709..74244723b72 100644
--- a/TAO/tests/Portable_Interceptors/PICurrent/test_i.h
+++ b/TAO/tests/Portable_Interceptors/PICurrent/test_i.h
@@ -19,6 +19,7 @@
 #include "testS.h"
 
 #include "tao/PortableInterceptorC.h"
+#include "tao/PI/PI.h"
 
 /**
  * @class test_i
diff --git a/TAO/tests/Portable_Interceptors/PolicyFactory/PolicyFactory.cpp b/TAO/tests/Portable_Interceptors/PolicyFactory/PolicyFactory.cpp
index 03748c67f6e..495bc24a325 100644
--- a/TAO/tests/Portable_Interceptors/PolicyFactory/PolicyFactory.cpp
+++ b/TAO/tests/Portable_Interceptors/PolicyFactory/PolicyFactory.cpp
@@ -26,7 +26,7 @@ PolicyFactory::create_policy (CORBA::PolicyType type,
     ACE_THROW_RETURN (CORBA::INTERNAL (),
                       CORBA::Policy::_nil ());
 
-  Policy * p;
+  Policy * p = 0;
   ACE_NEW_THROW_EX (p,
                     Policy (val),
                     CORBA::NO_MEMORY ());
diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_Request_Interceptor.cpp
index 7d6333c7dff..ee4ed4d118e 100644
--- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_Request_Interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Client_Request_Interceptor.cpp
@@ -3,8 +3,7 @@
 #include "Client_Request_Interceptor.h"
 #include "testC.h"
 
-#include "tao/DynamicC.h"
-#include "tao/TypeCode.h"
+#include "tao/AnyTypeCode/TypeCode.h"
 #include "ace/OS_NS_string.h"
 
 ACE_RCSID (Request_Interceptor_Flow,
diff --git a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.cpp b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.cpp
index a69f1e25dd9..b6d4260d09b 100644
--- a/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.cpp
+++ b/TAO/tests/Portable_Interceptors/Request_Interceptor_Flow/Server_Request_Interceptor.cpp
@@ -8,8 +8,7 @@ ACE_RCSID (Request_Interceptor_Flow,
 
 #include "testC.h"
 
-#include "tao/DynamicC.h"
-#include "tao/TypeCode.h"
+#include "tao/AnyTypeCode/TypeCode.h"
 #include "ace/OS_NS_string.h"
 
 Server_Request_Interceptor::Server_Request_Interceptor (const char *name)
diff --git a/TAO/tests/RTCORBA/Persistent_IOR/RTCORBA_Persistent_IOR.mpc b/TAO/tests/RTCORBA/Persistent_IOR/RTCORBA_Persistent_IOR.mpc
index 0662db7fb4e..0f82a323a72 100644
--- a/TAO/tests/RTCORBA/Persistent_IOR/RTCORBA_Persistent_IOR.mpc
+++ b/TAO/tests/RTCORBA/Persistent_IOR/RTCORBA_Persistent_IOR.mpc
@@ -7,8 +7,7 @@ project(*Server): rt_server, minimum_corba {
   }
 }
 
-project(*Client): taoexe, minimum_corba {
-  requires += rt_corba
+project(*Client): rt_client, minimum_corba {
   Source_Files {
     testC.cpp
     client.cpp
diff --git a/TAO/tests/RTCORBA/Policies/Policies.cpp b/TAO/tests/RTCORBA/Policies/Policies.cpp
index d33d11b6136..63d97ab4717 100644
--- a/TAO/tests/RTCORBA/Policies/Policies.cpp
+++ b/TAO/tests/RTCORBA/Policies/Policies.cpp
@@ -20,6 +20,7 @@
 
 #include "tao/ORB.h"
 #include "tao/RTCORBA/RTCORBA.h"
+#include "tao/AnyTypeCode/Any.h"
 
 #include "ace/Log_Msg.h"
 
diff --git a/TAO/tests/Reliable_Oneways/client.cpp b/TAO/tests/Reliable_Oneways/client.cpp
index a0cce868c6c..ee9b09cd5b9 100644
--- a/TAO/tests/Reliable_Oneways/client.cpp
+++ b/TAO/tests/Reliable_Oneways/client.cpp
@@ -2,6 +2,7 @@
 
 #include "TestC.h"
 #include "tao/Messaging/Messaging.h"
+#include "tao/AnyTypeCode/Any.h"
 #include "ace/Get_Opt.h"
 #include "ace/OS_NS_sys_time.h"
 
diff --git a/TAO/tests/Server_Leaks/Server_Leaks.mpc b/TAO/tests/Server_Leaks/Server_Leaks.mpc
index db616ea3e82..6e565915472 100644
--- a/TAO/tests/Server_Leaks/Server_Leaks.mpc
+++ b/TAO/tests/Server_Leaks/Server_Leaks.mpc
@@ -8,7 +8,7 @@ project(*Server): taoserver {
   }
 }
 
-project(*Client): taoclient {
+project(*Client): taoclient, anytypecode {
   Source_Files {
     TestC.cpp
     client.cpp
diff --git a/TAO/tests/Stack_Recursion/Stack_Recursion.mpc b/TAO/tests/Stack_Recursion/Stack_Recursion.mpc
index da6c70d8f42..253a61435dc 100644
--- a/TAO/tests/Stack_Recursion/Stack_Recursion.mpc
+++ b/TAO/tests/Stack_Recursion/Stack_Recursion.mpc
@@ -11,7 +11,7 @@ project(*Server): taoserver {
   }
 }
 
-project(*Client): taoclient {
+project(*Client): taoclient, anytypecode {
   Source_Files {
     TestC.cpp
     client.cpp
diff --git a/TAO/tests/Timed_Buffered_Oneways/client.cpp b/TAO/tests/Timed_Buffered_Oneways/client.cpp
index 48e37d13caa..9878f57d8b8 100644
--- a/TAO/tests/Timed_Buffered_Oneways/client.cpp
+++ b/TAO/tests/Timed_Buffered_Oneways/client.cpp
@@ -17,6 +17,8 @@
 #include "testC.h"
 
 #include "tao/Messaging/Messaging.h"
+#include "tao/AnyTypeCode/TAOA.h"
+#include "tao/AnyTypeCode/Any.h"
 #include "tao/TAOC.h"
 #include "ace/Get_Opt.h"
 #include "ace/Read_Buffer.h"
diff --git a/TAO/tests/Timeout/client.cpp b/TAO/tests/Timeout/client.cpp
index 55d3850f599..7d0ff876ea7 100644
--- a/TAO/tests/Timeout/client.cpp
+++ b/TAO/tests/Timeout/client.cpp
@@ -3,6 +3,7 @@
 #include "testC.h"
 
 #include "tao/Messaging/Messaging.h"
+#include "tao/AnyTypeCode/Any.h"
 #include "ace/Get_Opt.h"
 
 ACE_RCSID(Timeout, client, "$Id$")
diff --git a/TAO/tests/Two_Objects/Two_Objects.mpc b/TAO/tests/Two_Objects/Two_Objects.mpc
index 1570ccd0f66..de36db49c6a 100644
--- a/TAO/tests/Two_Objects/Two_Objects.mpc
+++ b/TAO/tests/Two_Objects/Two_Objects.mpc
@@ -11,7 +11,7 @@ project(*Server): taoserver {
   }
 }
 
-project(*Client): taoclient {
+project(*Client): taoclient, anytypecode {
   Source_Files {
     Two_ObjectsC.cpp
     client.cpp
diff --git a/TAO/tests/Typedef_String_Array/typedef_string_array.mpc b/TAO/tests/Typedef_String_Array/typedef_string_array.mpc
index df3587cd81b..3124c65910a 100644
--- a/TAO/tests/Typedef_String_Array/typedef_string_array.mpc
+++ b/TAO/tests/Typedef_String_Array/typedef_string_array.mpc
@@ -1,14 +1,14 @@
 // -*- MPC -*-
 // $Id$
 
-project(*server): taoexe, portableserver {
+project(*server): taoserver {
   Source_Files {
     server.cpp
     testImpl.cpp
   }
 }
 
-project(*client): taoexe {
+project(*client): taoclient, anytypecode {
   Source_Files {
     testC.cpp
     client.cpp
diff --git a/TAO/tests/UNKNOWN_Exception/UNKNOWN_Exception.mpc b/TAO/tests/UNKNOWN_Exception/UNKNOWN_Exception.mpc
index 79cf0d0b3e1..91fc9d79183 100644
--- a/TAO/tests/UNKNOWN_Exception/UNKNOWN_Exception.mpc
+++ b/TAO/tests/UNKNOWN_Exception/UNKNOWN_Exception.mpc
@@ -8,7 +8,7 @@ project(*Server): taoserver, exceptions {
   }
 }
 
-project(*Client): taoclient, exceptions {
+project(*Client): taoclient, anytypecode, exceptions {
   idlflags  = -Ge 0
   Source_Files {
     testC.cpp
diff --git a/TAO/utils/catior/catior.cpp b/TAO/utils/catior/catior.cpp
index 4ec1a165190..266db0413ee 100644
--- a/TAO/utils/catior/catior.cpp
+++ b/TAO/utils/catior/catior.cpp
@@ -31,9 +31,7 @@
 #include "tao/Messaging/Messaging_SyncScope_PolicyC.h"
 #include "tao/Messaging/Messaging_No_ImplC.h"
 #include "tao/RTCORBA/RTCORBA.h"
-//#include "tao/Typecode.h"
-#include "tao/Marshal.h"
-//#include "tao/ORB_Constants.h"
+#include "tao/AnyTypeCode/Marshal.h"
 #include "tao/Transport_Acceptor.h"
 #include "tao/IIOP_EndpointsC.h"
 
diff --git a/ace/Acceptor.cpp b/ace/Acceptor.cpp
index f187980c14f..d5ab5593d40 100644
--- a/ace/Acceptor.cpp
+++ b/ace/Acceptor.cpp
@@ -345,13 +345,13 @@ ACE_Acceptor<SVC_HANDLER, ACE_PEER_ACCEPTOR_2>::handle_input (ACE_HANDLE listene
 
   // Default is "timeout (0, 0)," which means "poll."
   ACE_Time_Value timeout;
-#  if defined (ACE_WIN64)
+#  if defined (ACE_WIN32)
   // This arg is ignored on Windows and causes pointer truncation
-  // warnings on 64-bit compiles.
+  // warnings on 64-bit compiles
   int select_width = 0;
 #  else
   int select_width = int (listener) + 1;
-#  endif /* ACE_WIN64 */
+#  endif /* ACE_WIN32 */
 
   // Accept connections from clients.  Note that a loop is used for two
   // reasons:
diff --git a/ace/CORBA_macros.h b/ace/CORBA_macros.h
index 252aac67a98..c50c7d9d0d2 100644
--- a/ace/CORBA_macros.h
+++ b/ace/CORBA_macros.h
@@ -146,17 +146,8 @@
       throw EXCEPTION
 
 // Throwing an exception when the function requires a return value.
-# if defined (WIN32) || defined (__HP_aCC)
-#   define ACE_THROW_RETURN(EXCEPTION, RETV) \
-      do \
-        { \
-          throw EXCEPTION; \
-          return RETV; \
-        } while (0)
-# else /* WIN32 */
-#   define ACE_THROW_RETURN(EXCEPTION,RETV) \
-        throw EXCEPTION
-# endif /* WIN32 */
+# define ACE_THROW_RETURN(EXCEPTION,RETV) \
+      throw EXCEPTION
 
 // For compilers with native exceptions, we can simply use try to try. ;-)
 // do {} while (0) is required to avoid compilation warnings.
diff --git a/ace/config-win32-msvc-7.h b/ace/config-win32-msvc-7.h
index e76f0f058c9..231f6ba7af5 100644
--- a/ace/config-win32-msvc-7.h
+++ b/ace/config-win32-msvc-7.h
@@ -105,11 +105,12 @@
 #pragma warning(disable:4355)
 // 'class1' : inherits 'class2::member' via dominance
 #pragma warning(disable:4250)
-// C++ Exception Specification ignored
-#pragma warning(disable:4290)
 
-# pragma warning(disable:4231)
 // Disable warning of using Microsoft Extension.
+# pragma warning(disable:4231)
+
+// 'function' : unreferenced local function has been removed
+# pragma warning(disable:4505)
 
 #define ACE_ENDTHREADEX(STATUS) ::_endthreadex ((DWORD) STATUS)
 
diff --git a/ace/config-win32-msvc-8.h b/ace/config-win32-msvc-8.h
index 0338c56f1f8..839e892a2f5 100644
--- a/ace/config-win32-msvc-8.h
+++ b/ace/config-win32-msvc-8.h
@@ -99,15 +99,15 @@
 
 // There are too many instances of this warning to fix it right now.
 // Maybe in the future.
+
 // 'this' : used in base member initializer list
 #pragma warning(disable:4355)
+
 // 'class1' : inherits 'class2::member' via dominance
 #pragma warning(disable:4250)
-// C++ Exception Specification ignored
-#pragma warning(disable:4290)
 
-# pragma warning(disable:4231)
 // Disable warning of using Microsoft Extension.
+# pragma warning(disable:4231)
 
 // Disable deprecation warnings, because setting _CRT_SECURE_NO_DEPRECATE
 // did not prevent the warnings.
diff --git a/bin/MakeProjectCreator/config/anytypecode.mpb b/bin/MakeProjectCreator/config/anytypecode.mpb
new file mode 100644
index 00000000000..4207be85db8
--- /dev/null
+++ b/bin/MakeProjectCreator/config/anytypecode.mpb
@@ -0,0 +1,9 @@
+// -*- MPC -*-
+// $Id$
+
+project : taolib, taoidldefaults {
+  after   += AnyTypeCode
+  libs    += TAO_AnyTypeCode
+
+  idlflags -= -Sa -St
+}
diff --git a/bin/MakeProjectCreator/config/codecfactory.mpb b/bin/MakeProjectCreator/config/codecfactory.mpb
index 79ada5659e1..3d2a4cbdf68 100644
--- a/bin/MakeProjectCreator/config/codecfactory.mpb
+++ b/bin/MakeProjectCreator/config/codecfactory.mpb
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project : taolib {
+project : taolib, anytypecode {
   after   += CodecFactory
   libs    += TAO_CodecFactory
 }
diff --git a/bin/MakeProjectCreator/config/dynamicany.mpb b/bin/MakeProjectCreator/config/dynamicany.mpb
index e25511d838b..06b22148a17 100644
--- a/bin/MakeProjectCreator/config/dynamicany.mpb
+++ b/bin/MakeProjectCreator/config/dynamicany.mpb
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project : taolib {
+project : taolib, anytypecode {
   after   += DynamicAny
   libs    += TAO_DynamicAny
 }
diff --git a/bin/MakeProjectCreator/config/ifr_client.mpb b/bin/MakeProjectCreator/config/ifr_client.mpb
index 9aa2af326b3..89cee167fd2 100644
--- a/bin/MakeProjectCreator/config/ifr_client.mpb
+++ b/bin/MakeProjectCreator/config/ifr_client.mpb
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project : taolib {
+project : taolib, anytypecode {
   libs    += TAO_IFR_Client
   after   += IFR_Client
 }
diff --git a/bin/MakeProjectCreator/config/iormanip.mpb b/bin/MakeProjectCreator/config/iormanip.mpb
index 58547db80c2..7fd064393ef 100644
--- a/bin/MakeProjectCreator/config/iormanip.mpb
+++ b/bin/MakeProjectCreator/config/iormanip.mpb
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project : taolib {
+project : taolib, anytypecode {
   after   += IORManipulation
   libs    += TAO_IORManip
 }
diff --git a/bin/MakeProjectCreator/config/orbsvcsexe.mpb b/bin/MakeProjectCreator/config/orbsvcsexe.mpb
index a2bbe7ed9e1..b4521e70641 100644
--- a/bin/MakeProjectCreator/config/orbsvcsexe.mpb
+++ b/bin/MakeProjectCreator/config/orbsvcsexe.mpb
@@ -1,5 +1,5 @@
 // -*- MPC -*-
 // $Id$
 
-project : taoexe, negotiate_codesets {
+project : taoexe, negotiate_codesets, anytypecode {
 }
diff --git a/bin/MakeProjectCreator/config/orbsvcslib.mpb b/bin/MakeProjectCreator/config/orbsvcslib.mpb
index 9a9842671f9..483b93b2412 100644
--- a/bin/MakeProjectCreator/config/orbsvcslib.mpb
+++ b/bin/MakeProjectCreator/config/orbsvcslib.mpb
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project : taolib_with_idl, orbsvcs_output {
+project : taolib_with_idl, orbsvcs_output, anytypecode {
   tagname     = TAO_ORBSVCS
   includes += $(TAO_ROOT)/orbsvcs
   idlflags += -I$(TAO_ROOT)/orbsvcs
diff --git a/bin/MakeProjectCreator/config/portableserver.mpb b/bin/MakeProjectCreator/config/portableserver.mpb
index 484d7aa83c2..2fc99e7a876 100644
--- a/bin/MakeProjectCreator/config/portableserver.mpb
+++ b/bin/MakeProjectCreator/config/portableserver.mpb
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project : taolib {
+project : taolib, anytypecode {
   after   += PortableServer
   libs    += TAO_PortableServer
 }
diff --git a/bin/MakeProjectCreator/config/strategies.mpb b/bin/MakeProjectCreator/config/strategies.mpb
index 262bc6200ed..d5e01739d73 100644
--- a/bin/MakeProjectCreator/config/strategies.mpb
+++ b/bin/MakeProjectCreator/config/strategies.mpb
@@ -1,6 +1,6 @@
 // -*- MPC -*-
 // $Id$
-project : taolib {
+project : taolib, anytypecode {
   after   += Strategies
   libs    += TAO_Strategies
 }
diff --git a/bin/MakeProjectCreator/config/taoidldefaults.mpb b/bin/MakeProjectCreator/config/taoidldefaults.mpb
index e70706357d4..4b5cfde6c7a 100644
--- a/bin/MakeProjectCreator/config/taoidldefaults.mpb
+++ b/bin/MakeProjectCreator/config/taoidldefaults.mpb
@@ -6,7 +6,7 @@ project {
   specific {
     tao_idl      = $(ACE_ROOT)/bin/tao_idl
     tao_idl_dep  = $(ACE_ROOT)/bin/tao_idl
-    tao_idlflags = -Ge 1 -Wb,pre_include=ace/pre.h \
+    tao_idlflags = -Ge 1 -Wb,pre_include=ace/pre.h -Sa -St \
                    -Wb,post_include=ace/post.h -I$(TAO_ROOT)
   }
 
@@ -51,6 +51,9 @@ project {
     optional(header_pre_extension) {
       commandflags(!-Sc && !-SS) += S_T
     }
+    optional(header_pre_extension) {
+      commandflags(-GA) += A
+    }
   }
 
   after    += TAO_IDL_EXE
diff --git a/bin/MakeProjectCreator/config/valuetype.mpb b/bin/MakeProjectCreator/config/valuetype.mpb
index 482663c9148..47edd4e94c4 100644
--- a/bin/MakeProjectCreator/config/valuetype.mpb
+++ b/bin/MakeProjectCreator/config/valuetype.mpb
@@ -1,7 +1,7 @@
 // -*- MPC -*-
 // $Id$
 
-project: taolib {
+project: taolib, anytypecode {
   after    += Valuetype
   libs     += TAO_Valuetype
 }