ChangeLogTag:Tue Mar 28 16:53:07 2000 Carlos O'Ryan <coryan@uci.edu>

3 files changed, 294 insertions, 7549 deletions

diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index 7a5841e136c..90336e9d7b9 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,9 @@
+Tue Mar 28 16:53:07 2000  Carlos O'Ryan  <coryan@uci.edu>
+
+        * tao/corbafwd.h:
+        * tao/POA_CORBA.h:
+           Fixed a couple of missing defined(TAO_HAS_MINIMUM_CORBA)
+
 Tue Mar 28 16:05:20 2000  Carlos O'Ryan  <coryan@uci.edu>
 
         * orbsvcs/tests/Event/Event.dsw:
diff --git a/TAO/tao/POA_CORBA.h b/TAO/tao/POA_CORBA.h
index 18f77121f07..b03c6265f7a 100644
--- a/TAO/tao/POA_CORBA.h
+++ b/TAO/tao/POA_CORBA.h
@@ -10,7 +10,7 @@
 //   POA_CORBA.h
 //
 //   This file is created by merging the CurrentS.h, PolicyS.h,
-//   PollableS.h, DomainS.h, DynAnyS.h and InterfaceS.h files which 
+//   PollableS.h, DomainS.h, DynAnyS.h and InterfaceS.h files which
 //   have been removed.
 //
 // = AUTHOR
@@ -295,7 +295,7 @@ public:
 
   class PolicyCurrent;
   typedef PolicyCurrent *PolicyCurrent_ptr;
-  class TAO_Export PolicyCurrent : public virtual PolicyManager, 
+  class TAO_Export PolicyCurrent : public virtual PolicyManager,
                                    public virtual Current
   {
   protected:
@@ -1825,7 +1825,7 @@ public:
 
     virtual CORBA::Boolean _is_a (
         const char* logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV = 
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       );
 
@@ -1837,7 +1837,7 @@ public:
         CORBA::ServerRequest &req,
         void *obj,
         void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       );
 
@@ -1845,26 +1845,26 @@ public:
         CORBA::ServerRequest &req,
         void *obj,
         void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       );
 
     virtual void _dispatch (
         CORBA::ServerRequest &_tao_req,
         void *_tao_context,
-        CORBA::Environment &ACE_TRY_ENV = 
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       );
 
     ::CORBA::IRObject *_this (
-        CORBA::Environment &ACE_TRY_ENV = 
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       );
 
     virtual const char* _interface_repository_id (void) const;
 
-    virtual CORBA::DefinitionKind def_kind (
-        CORBA::Environment &ACE_TRY_ENV = 
+    virtual IR::DefinitionKind def_kind (
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
@@ -1872,15 +1872,15 @@ public:
       )) = 0;
 
     static void _get_def_kind_skel (
-        CORBA::ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
+        CORBA::ServerRequest &_tao_req,
+        void *_tao_obj,
+        void *_tao_context,
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       );
 
     virtual void destroy (
-        CORBA::Environment &ACE_TRY_ENV = 
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
@@ -1888,10 +1888,10 @@ public:
       )) = 0;
 
     static void destroy_skel (
-        CORBA::ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
+        CORBA::ServerRequest &_tao_req,
+        void *_tao_obj,
+        void *_tao_context,
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       );
   };
@@ -1906,13 +1906,13 @@ public:
         const CORBA::Char *logical_type_id,
         CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
       );
-    
+
     virtual CORBA::Boolean _non_existent(
         CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
       );
-    
-        virtual CORBA::DefinitionKind def_kind (
-        CORBA::Environment &ACE_TRY_ENV = 
+
+        virtual IR::DefinitionKind def_kind (
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
@@ -1920,7 +1920,7 @@ public:
       ));
 
     virtual void destroy (
-        CORBA::Environment &ACE_TRY_ENV = 
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
@@ -1928,20 +1928,21 @@ public:
       ));
   };
 
-  class Contained;
-  typedef Contained *Contained_ptr;
-  class TAO_Export Contained : public virtual IRObject
+  class TypeCodeFactory;
+  typedef TypeCodeFactory *TypeCodeFactory_ptr;
+  class  TypeCodeFactory :  public virtual PortableServer::ServantBase
   {
   protected:
-    Contained (void);
+    TypeCodeFactory (void);
 
   public:
-    Contained (const Contained& rhs);
-    virtual ~Contained (void);
+    TypeCodeFactory (const TypeCodeFactory& rhs);
+    virtual ~TypeCodeFactory (void);
+
 
     virtual CORBA::Boolean _is_a (
         const char* logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV = 
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       );
 
@@ -1953,7 +1954,7 @@ public:
         CORBA::ServerRequest &req,
         void *obj,
         void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       );
 
@@ -1961,7208 +1962,560 @@ public:
         CORBA::ServerRequest &req,
         void *obj,
         void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       );
 
     virtual void _dispatch (
         CORBA::ServerRequest &_tao_req,
         void *_tao_context,
-        CORBA::Environment &ACE_TRY_ENV = 
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       );
 
-    ::CORBA::Contained *_this (
-        CORBA::Environment &ACE_TRY_ENV = 
+    ::CORBA::TypeCodeFactory *_this (
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       );
 
     virtual const char* _interface_repository_id (void) const;
 
-    virtual char * id (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void _get_id_skel (
-        CORBA::ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual void id (
+    virtual CORBA::TypeCode_ptr create_struct_tc (
         const char * id,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void _set_id_skel (
-        CORBA::ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual char * name (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void _get_name_skel (
-        CORBA::ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual void name (
         const char * name,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void _set_name_skel (
-        CORBA::ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual char * version (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void _get_version_skel (
-        CORBA::ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual void version (
-        const char * version,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void _set_version_skel (
-        CORBA::ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual CORBA::Container_ptr defined_in (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void _get_defined_in_skel (
-        CORBA::ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual char * absolute_name (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void _get_absolute_name_skel (
-        CORBA::ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual CORBA::Repository_ptr containing_repository (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void _get_containing_repository_skel (
-        CORBA::ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual CORBA::Contained::Description * describe (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void describe_skel (
-        CORBA::ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual void move (
-        CORBA::Container_ptr new_container,
-        const char * new_name,
-        const char * new_version,
-        CORBA::Environment &ACE_TRY_ENV = 
+        const IR::StructMemberSeq & members,
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
-    static void move_skel (
-        CORBA::ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    static void _get_def_kind_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void destroy_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-  };
-
-  class  _tao_thru_poa_collocated_Contained : public virtual ::CORBA::Contained,
-      public virtual _tao_thru_poa_collocated_IRObject
-  {
-  public:
-    _tao_thru_poa_collocated_Contained (
-        TAO_Stub *stub
-      );
-    virtual CORBA::Boolean _is_a(
-        const CORBA::Char *logical_type_id,
-        CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-      );
-    
-    virtual CORBA::Boolean _non_existent(
-        CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-      );
-    
-        virtual char * id (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual void id (
-        const char * id,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual char * name (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual void name (
-        const char * name,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual char * version (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual void version (
-        const char * version,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA::Container_ptr defined_in (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual char * absolute_name (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA::Repository_ptr containing_repository (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA::Contained::Description * describe (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual void move (
-        CORBA::Container_ptr new_container,
-        const char * new_name,
-        const char * new_version,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-  };
-
-  class Container;
-  typedef Container *Container_ptr;
-  class TAO_Export Container : public virtual IRObject
-  {
-  protected:
-    Container (void);
-
-  public:
-    Container (const Container& rhs);
-    virtual ~Container (void);
-
-    virtual CORBA::Boolean _is_a (
-        const char* logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual void* _downcast (
-        const char* logical_type_id
-      );
-
-    static void _is_a_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    static void _non_existent_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual void _dispatch (
+    static void create_struct_tc_skel (
         CORBA::ServerRequest &_tao_req,
+        void *_tao_obj,
         void *_tao_context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    ::CORBA::Container *_this (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual const char* _interface_repository_id (void) const;
-
-    virtual CORBA::Contained_ptr lookup (
-        const char * search_name,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void lookup_skel (
-        CORBA::ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual CORBA::ContainedSeq * contents (
-        CORBA::DefinitionKind limit_type,
-        CORBA::Boolean exclude_inherited,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void contents_skel (
-        CORBA::ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual CORBA::ContainedSeq * lookup_name (
-        const char * search_name,
-        CORBA::Long levels_to_search,
-        CORBA::DefinitionKind limit_type,
-        CORBA::Boolean exclude_inherited,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void lookup_name_skel (
-        CORBA::ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual CORBA::Container::DescriptionSeq * describe_contents (
-        CORBA::DefinitionKind limit_type,
-        CORBA::Boolean exclude_inherited,
-        CORBA::Long max_returned_objs,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void describe_contents_skel (
-        CORBA::ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual CORBA::ModuleDef_ptr create_module (
-        const char * id,
-        const char * name,
-        const char * version,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void create_module_skel (
-        CORBA::ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual CORBA::ConstantDef_ptr create_constant (
-        const char * id,
-        const char * name,
-        const char * version,
-        CORBA::IDLType_ptr type,
-        const CORBA::Any & value,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void create_constant_skel (
-        CORBA::ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual CORBA::StructDef_ptr create_struct (
-        const char * id,
-        const char * name,
-        const char * version,
-        const CORBA::StructMemberSeq & members,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void create_struct_skel (
-        CORBA::ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual CORBA::UnionDef_ptr create_union (
-        const char * id,
-        const char * name,
-        const char * version,
-        CORBA::IDLType_ptr discriminator_type,
-        const CORBA::UnionMemberSeq & members,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void create_union_skel (
-        CORBA::ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual CORBA::EnumDef_ptr create_enum (
-        const char * id,
-        const char * name,
-        const char * version,
-        const CORBA::EnumMemberSeq & members,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void create_enum_skel (
-        CORBA::ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual CORBA::AliasDef_ptr create_alias (
-        const char * id,
-        const char * name,
-        const char * version,
-        CORBA::IDLType_ptr original_type,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void create_alias_skel (
-        CORBA::ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       );
 
-    virtual CORBA::InterfaceDef_ptr create_interface (
+    virtual CORBA::TypeCode_ptr create_union_tc (
         const char * id,
         const char * name,
-        const char * version,
-        const CORBA::InterfaceDefSeq & base_interfaces,
-        CORBA::Environment &ACE_TRY_ENV = 
+        CORBA::TypeCode_ptr discriminator_type,
+        const IR::UnionMemberSeq & members,
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
-    static void create_interface_skel (
-        CORBA::ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
+    static void create_union_tc_skel (
+        CORBA::ServerRequest &_tao_req,
+        void *_tao_obj,
+        void *_tao_context,
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       );
 
-    virtual CORBA::ValueDef_ptr create_value (
+    virtual CORBA::TypeCode_ptr create_enum_tc (
         const char * id,
         const char * name,
-        const char * version,
-        CORBA::Boolean is_custom,
-        CORBA::Boolean is_abstract,
-        CORBA::ValueDef_ptr base_value,
-        CORBA::Boolean is_truncatable,
-        const CORBA::ValueDefSeq & abstract_base_values,
-        CORBA::InterfaceDef_ptr supported_interface,
-        const CORBA::InitializerSeq & initializers,
-        CORBA::Environment &ACE_TRY_ENV = 
+        const IR::EnumMemberSeq & members,
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
-    static void create_value_skel (
-        CORBA::ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
+    static void create_enum_tc_skel (
+        CORBA::ServerRequest &_tao_req,
+        void *_tao_obj,
+        void *_tao_context,
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       );
 
-    virtual CORBA::ValueBoxDef_ptr create_value_box (
+    virtual CORBA::TypeCode_ptr create_alias_tc (
         const char * id,
         const char * name,
-        const char * version,
-        CORBA::IDLType_ptr original_type_def,
-        CORBA::Environment &ACE_TRY_ENV = 
+        CORBA::TypeCode_ptr original_type,
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
-    static void create_value_box_skel (
-        CORBA::ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
+    static void create_alias_tc_skel (
+        CORBA::ServerRequest &_tao_req,
+        void *_tao_obj,
+        void *_tao_context,
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       );
 
-    virtual CORBA::ExceptionDef_ptr create_exception (
+    virtual CORBA::TypeCode_ptr create_exception_tc (
         const char * id,
         const char * name,
-        const char * version,
-        const CORBA::StructMemberSeq & members,
-        CORBA::Environment &ACE_TRY_ENV = 
+        const IR::StructMemberSeq & members,
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
-    static void create_exception_skel (
-        CORBA::ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    static void _get_def_kind_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void destroy_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-  };
-
-  class  _tao_thru_poa_collocated_Container : public virtual ::CORBA::Container,
-      public virtual _tao_thru_poa_collocated_IRObject
-  {
-  public:
-    _tao_thru_poa_collocated_Container (
-        TAO_Stub *stub
-      );
-    virtual CORBA::Boolean _is_a(
-        const CORBA::Char *logical_type_id,
-        CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-      );
-    
-    virtual CORBA::Boolean _non_existent(
-        CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-      );
-    
-        virtual CORBA::Contained_ptr lookup (
-        const char * search_name,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA::ContainedSeq * contents (
-        CORBA::DefinitionKind limit_type,
-        CORBA::Boolean exclude_inherited,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA::ContainedSeq * lookup_name (
-        const char * search_name,
-        CORBA::Long levels_to_search,
-        CORBA::DefinitionKind limit_type,
-        CORBA::Boolean exclude_inherited,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA::Container::DescriptionSeq * describe_contents (
-        CORBA::DefinitionKind limit_type,
-        CORBA::Boolean exclude_inherited,
-        CORBA::Long max_returned_objs,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA::ModuleDef_ptr create_module (
-        const char * id,
-        const char * name,
-        const char * version,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA::ConstantDef_ptr create_constant (
-        const char * id,
-        const char * name,
-        const char * version,
-        CORBA::IDLType_ptr type,
-        const CORBA::Any & value,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA::StructDef_ptr create_struct (
-        const char * id,
-        const char * name,
-        const char * version,
-        const CORBA::StructMemberSeq & members,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA::UnionDef_ptr create_union (
-        const char * id,
-        const char * name,
-        const char * version,
-        CORBA::IDLType_ptr discriminator_type,
-        const CORBA::UnionMemberSeq & members,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA::EnumDef_ptr create_enum (
-        const char * id,
-        const char * name,
-        const char * version,
-        const CORBA::EnumMemberSeq & members,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA::AliasDef_ptr create_alias (
-        const char * id,
-        const char * name,
-        const char * version,
-        CORBA::IDLType_ptr original_type,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA::InterfaceDef_ptr create_interface (
-        const char * id,
-        const char * name,
-        const char * version,
-        const CORBA::InterfaceDefSeq & base_interfaces,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA::ValueDef_ptr create_value (
-        const char * id,
-        const char * name,
-        const char * version,
-        CORBA::Boolean is_custom,
-        CORBA::Boolean is_abstract,
-        CORBA::ValueDef_ptr base_value,
-        CORBA::Boolean is_truncatable,
-        const CORBA::ValueDefSeq & abstract_base_values,
-        CORBA::InterfaceDef_ptr supported_interface,
-        const CORBA::InitializerSeq & initializers,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA::ValueBoxDef_ptr create_value_box (
-        const char * id,
-        const char * name,
-        const char * version,
-        CORBA::IDLType_ptr original_type_def,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA::ExceptionDef_ptr create_exception (
-        const char * id,
-        const char * name,
-        const char * version,
-        const CORBA::StructMemberSeq & members,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-  };
-
-  class IDLType;
-  typedef IDLType *IDLType_ptr;
-  class TAO_Export IDLType : public virtual IRObject
-  {
-  protected:
-    IDLType (void);
-
-  public:
-    IDLType (const IDLType& rhs);
-    virtual ~IDLType (void);
-
-    virtual CORBA::Boolean _is_a (
-        const char* logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual void* _downcast (
-        const char* logical_type_id
-      );
-
-    static void _is_a_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    static void _non_existent_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual void _dispatch (
+    static void create_exception_tc_skel (
         CORBA::ServerRequest &_tao_req,
+        void *_tao_obj,
         void *_tao_context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    ::CORBA::IDLType *_this (
-        CORBA::Environment &ACE_TRY_ENV = 
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       );
 
-    virtual const char* _interface_repository_id (void) const;
-
-    virtual CORBA::TypeCode_ptr type (
-        CORBA::Environment &ACE_TRY_ENV = 
+    virtual CORBA::TypeCode_ptr create_interface_tc (
+        const char * id,
+        const char * name,
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
-    static void _get_type_skel (
-        CORBA::ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    static void _get_def_kind_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void destroy_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-  };
-
-  class  _tao_thru_poa_collocated_IDLType : public virtual ::CORBA::IDLType,
-      public virtual _tao_thru_poa_collocated_IRObject
-  {
-  public:
-    _tao_thru_poa_collocated_IDLType (
-        TAO_Stub *stub
-      );
-    virtual CORBA::Boolean _is_a(
-        const CORBA::Char *logical_type_id,
-        CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-      );
-    
-    virtual CORBA::Boolean _non_existent(
-        CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-      );
-    
-        virtual CORBA::TypeCode_ptr type (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-  };
-
-  class Repository;
-  typedef Repository *Repository_ptr;
-  class TAO_Export Repository : public virtual Container
-  {
-  protected:
-    Repository (void);
-
-  public:
-    Repository (const Repository& rhs);
-    virtual ~Repository (void);
-
-    virtual CORBA::Boolean _is_a (
-        const char* logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual void* _downcast (
-        const char* logical_type_id
-      );
-
-    static void _is_a_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    static void _non_existent_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual void _dispatch (
+    static void create_interface_tc_skel (
         CORBA::ServerRequest &_tao_req,
+        void *_tao_obj,
         void *_tao_context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    ::CORBA::Repository *_this (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual const char* _interface_repository_id (void) const;
-
-    virtual CORBA::Contained_ptr lookup_id (
-        const char * search_id,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void lookup_id_skel (
-        CORBA::ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual CORBA::PrimitiveDef_ptr get_primitive (
-        CORBA::PrimitiveKind kind,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void get_primitive_skel (
-        CORBA::ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual CORBA::StringDef_ptr create_string (
-        CORBA::ULong bound,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void create_string_skel (
-        CORBA::ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual CORBA::WstringDef_ptr create_wstring (
-        CORBA::ULong bound,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void create_wstring_skel (
-        CORBA::ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual CORBA::SequenceDef_ptr create_sequence (
-        CORBA::ULong bound,
-        CORBA::IDLType_ptr element_type,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void create_sequence_skel (
-        CORBA::ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual CORBA::ArrayDef_ptr create_array (
-        CORBA::ULong length,
-        CORBA::IDLType_ptr element_type,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void create_array_skel (
-        CORBA::ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual CORBA::FixedDef_ptr create_fixed (
-        CORBA::UShort digits,
-        CORBA::Short scale,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void create_fixed_skel (
-        CORBA::ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    static void lookup_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void contents_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void lookup_name_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void describe_contents_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void create_module_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void create_constant_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void create_struct_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void create_union_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void create_enum_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void create_alias_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void create_interface_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void create_value_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void create_value_box_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void create_exception_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void _get_def_kind_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void destroy_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       );
-  };
-
-  class  _tao_thru_poa_collocated_Repository : public virtual ::CORBA::Repository,
-      public virtual _tao_thru_poa_collocated_Container
-  {
-  public:
-    _tao_thru_poa_collocated_Repository (
-        TAO_Stub *stub
-      );
-    virtual CORBA::Boolean _is_a(
-        const CORBA::Char *logical_type_id,
-        CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-      );
-    
-    virtual CORBA::Boolean _non_existent(
-        CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-      );
-    
-        virtual CORBA::Contained_ptr lookup_id (
-        const char * search_id,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA::PrimitiveDef_ptr get_primitive (
-        CORBA::PrimitiveKind kind,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA::StringDef_ptr create_string (
-        CORBA::ULong bound,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA::WstringDef_ptr create_wstring (
-        CORBA::ULong bound,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
 
-    virtual CORBA::SequenceDef_ptr create_sequence (
+    virtual CORBA::TypeCode_ptr create_string_tc (
         CORBA::ULong bound,
-        CORBA::IDLType_ptr element_type,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA::ArrayDef_ptr create_array (
-        CORBA::ULong length,
-        CORBA::IDLType_ptr element_type,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA::FixedDef_ptr create_fixed (
-        CORBA::UShort digits,
-        CORBA::Short scale,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-  };
-
-  class ModuleDef;
-  typedef ModuleDef *ModuleDef_ptr;
-  class TAO_Export ModuleDef : public virtual Container, 
-                               public virtual Contained
-  {
-  protected:
-    ModuleDef (void);
-
-  public:
-    ModuleDef (const ModuleDef& rhs);
-    virtual ~ModuleDef (void);
-
-    virtual CORBA::Boolean _is_a (
-        const char* logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual void* _downcast (
-        const char* logical_type_id
-      );
-
-    static void _is_a_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    static void _non_existent_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual void _dispatch (
-        CORBA::ServerRequest &_tao_req,
-        void *_tao_context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    ::CORBA::ModuleDef *_this (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual const char* _interface_repository_id (void) const;
-
-    static void lookup_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void contents_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void lookup_name_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void describe_contents_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void create_module_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void create_constant_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void create_struct_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void create_union_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void create_enum_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void create_alias_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void create_interface_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void create_value_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void create_value_box_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void create_exception_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void _get_id_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void _set_id_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env = 
-          TAO_default_environment ()
-      );
-
-    static void _get_name_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void _set_name_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env = 
-          TAO_default_environment ()
-      );
-
-    static void _get_version_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void _set_version_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env = 
-          TAO_default_environment ()
-      );
-
-    static void _get_defined_in_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void _get_absolute_name_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void _get_containing_repository_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void describe_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void move_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void _get_def_kind_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void destroy_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-  };
-
-  class  _tao_thru_poa_collocated_ModuleDef : public virtual ::CORBA::ModuleDef,
-      public virtual _tao_thru_poa_collocated_Container,
-      public virtual _tao_thru_poa_collocated_Contained
-  {
-  public:
-    _tao_thru_poa_collocated_ModuleDef (
-        TAO_Stub *stub
-      );
-    virtual CORBA::Boolean _is_a(
-        const CORBA::Char *logical_type_id,
-        CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-      );
-    
-    virtual CORBA::Boolean _non_existent(
-        CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-      );    
-  };
-
-  class ConstantDef;
-  typedef ConstantDef *ConstantDef_ptr;
-  class TAO_Export ConstantDef : public virtual Contained
-  {
-  protected:
-    ConstantDef (void);
-
-  public:
-    ConstantDef (const ConstantDef& rhs);
-    virtual ~ConstantDef (void);
-
-    virtual CORBA::Boolean _is_a (
-        const char* logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual void* _downcast (
-        const char* logical_type_id
-      );
-
-    static void _is_a_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    static void _non_existent_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual void _dispatch (
-        CORBA::ServerRequest &_tao_req,
-        void *_tao_context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    ::CORBA::ConstantDef *_this (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual const char* _interface_repository_id (void) const;
-
-    virtual CORBA::TypeCode_ptr type (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void _get_type_skel (
-        CORBA::ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual CORBA::IDLType_ptr type_def (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void _get_type_def_skel (
-        CORBA::ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual void type_def (
-        CORBA::IDLType_ptr type_def,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void _set_type_def_skel (
-        CORBA::ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual CORBA::Any * value (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void _get_value_skel (
-        CORBA::ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual void value (
-        const CORBA::Any & value,
-        CORBA::Environment &ACE_TRY_ENV = 
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
-    static void _set_value_skel (
-        CORBA::ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    static void _get_id_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void _set_id_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env = 
-          TAO_default_environment ()
-      );
-
-    static void _get_name_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void _set_name_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env = 
-          TAO_default_environment ()
-      );
-
-    static void _get_version_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void _set_version_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env = 
-          TAO_default_environment ()
-      );
-
-    static void _get_defined_in_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void _get_absolute_name_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void _get_containing_repository_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void describe_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void move_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void _get_def_kind_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void destroy_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-  };
-
-  class  _tao_thru_poa_collocated_ConstantDef : public virtual ::CORBA::ConstantDef,
-      public virtual _tao_thru_poa_collocated_Contained
-  {
-  public:
-    _tao_thru_poa_collocated_ConstantDef (
-        TAO_Stub *stub
-      );
-    virtual CORBA::Boolean _is_a(
-        const CORBA::Char *logical_type_id,
-        CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-      );
-    
-    virtual CORBA::Boolean _non_existent(
-        CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-      );
-    
-        virtual CORBA::TypeCode_ptr type (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA::IDLType_ptr type_def (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual void type_def (
-        CORBA::IDLType_ptr type_def,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA::Any * value (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual void value (
-        const CORBA::Any & value,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-  };
-
-  class TypedefDef;
-  typedef TypedefDef *TypedefDef_ptr;
-  class TAO_Export TypedefDef : public virtual Contained, 
-                                public virtual IDLType
-  {
-  protected:
-    TypedefDef (void);
-
-  public:
-    TypedefDef (const TypedefDef& rhs);
-    virtual ~TypedefDef (void);
-
-    virtual CORBA::Boolean _is_a (
-        const char* logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual void* _downcast (
-        const char* logical_type_id
-      );
-
-    static void _is_a_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    static void _non_existent_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual void _dispatch (
-        CORBA::ServerRequest &_tao_req,
-        void *_tao_context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    ::CORBA::TypedefDef *_this (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual const char* _interface_repository_id (void) const;
-
-    static void _get_id_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void _set_id_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env = 
-          TAO_default_environment ()
-      );
-
-    static void _get_name_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void _set_name_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env = 
-          TAO_default_environment ()
-      );
-
-    static void _get_version_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void _set_version_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env = 
-          TAO_default_environment ()
-      );
-
-    static void _get_defined_in_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void _get_absolute_name_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void _get_containing_repository_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void describe_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void move_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void _get_type_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void _get_def_kind_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void destroy_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-  };
-
-  class  _tao_thru_poa_collocated_TypedefDef : public virtual ::CORBA::TypedefDef,
-      public virtual _tao_thru_poa_collocated_Contained,
-      public virtual _tao_thru_poa_collocated_IDLType
-  {
-  public:
-    _tao_thru_poa_collocated_TypedefDef (
-        TAO_Stub *stub
-      );
-    virtual CORBA::Boolean _is_a(
-        const CORBA::Char *logical_type_id,
-        CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-      );
-    
-    virtual CORBA::Boolean _non_existent(
-        CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-      );    
-  };
-
-  class StructDef;
-  typedef StructDef *StructDef_ptr;
-  class TAO_Export StructDef : public virtual TypedefDef, 
-                               public virtual Container
-  {
-  protected:
-    StructDef (void);
-
-  public:
-    StructDef (const StructDef& rhs);
-    virtual ~StructDef (void);
-
-    virtual CORBA::Boolean _is_a (
-        const char* logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual void* _downcast (
-        const char* logical_type_id
-      );
-
-    static void _is_a_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    static void _non_existent_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual void _dispatch (
+    static void create_string_tc_skel (
         CORBA::ServerRequest &_tao_req,
+        void *_tao_obj,
         void *_tao_context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    ::CORBA::StructDef *_this (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual const char* _interface_repository_id (void) const;
-
-    virtual CORBA::StructMemberSeq * members (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void _get_members_skel (
-        CORBA::ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       );
 
-    virtual void members (
-        const CORBA::StructMemberSeq & members,
-        CORBA::Environment &ACE_TRY_ENV = 
+    virtual CORBA::TypeCode_ptr create_wstring_tc (
+        CORBA::ULong bound,
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
-    static void _set_members_skel (
-        CORBA::ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    static void lookup_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void contents_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void lookup_name_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void describe_contents_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void create_module_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void create_constant_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void create_struct_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void create_union_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void create_enum_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void create_alias_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void create_interface_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void create_value_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void create_value_box_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void create_exception_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void _get_id_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void _set_id_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env = 
-          TAO_default_environment ()
-      );
-
-    static void _get_name_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void _set_name_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env = 
-          TAO_default_environment ()
-      );
-
-    static void _get_version_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void _set_version_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env = 
-          TAO_default_environment ()
-      );
-
-    static void _get_defined_in_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void _get_absolute_name_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void _get_containing_repository_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void describe_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void move_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void _get_type_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void _get_def_kind_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void destroy_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-  };
-
-  class  _tao_thru_poa_collocated_StructDef : public virtual ::CORBA::StructDef,
-      public virtual _tao_thru_poa_collocated_TypedefDef,
-      public virtual _tao_thru_poa_collocated_Container
-  {
-  public:
-    _tao_thru_poa_collocated_StructDef (
-        TAO_Stub *stub
-      );
-    virtual CORBA::Boolean _is_a(
-        const CORBA::Char *logical_type_id,
-        CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-      );
-    
-    virtual CORBA::Boolean _non_existent(
-        CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-      );
-    
-        virtual CORBA::StructMemberSeq * members (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual void members (
-        const CORBA::StructMemberSeq & members,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-  };
-
-  class UnionDef;
-  typedef UnionDef *UnionDef_ptr;
-  class TAO_Export UnionDef : public virtual TypedefDef, 
-                              public virtual Container
-  {
-  protected:
-    UnionDef (void);
-
-  public:
-    UnionDef (const UnionDef& rhs);
-    virtual ~UnionDef (void);
-
-    virtual CORBA::Boolean _is_a (
-        const char* logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual void* _downcast (
-        const char* logical_type_id
-      );
-
-    static void _is_a_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    static void _non_existent_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual void _dispatch (
+    static void create_wstring_tc_skel (
         CORBA::ServerRequest &_tao_req,
+        void *_tao_obj,
         void *_tao_context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    ::CORBA::UnionDef *_this (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual const char* _interface_repository_id (void) const;
-
-    virtual CORBA::TypeCode_ptr discriminator_type (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void _get_discriminator_type_skel (
-        CORBA::ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual CORBA::IDLType_ptr discriminator_type_def (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void _get_discriminator_type_def_skel (
-        CORBA::ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual void discriminator_type_def (
-        CORBA::IDLType_ptr discriminator_type_def,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void _set_discriminator_type_def_skel (
-        CORBA::ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual CORBA::UnionMemberSeq * members (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void _get_members_skel (
-        CORBA::ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       );
 
-    virtual void members (
-        const CORBA::UnionMemberSeq & members,
-        CORBA::Environment &ACE_TRY_ENV = 
+    virtual CORBA::TypeCode_ptr create_fixed_tc (
+        CORBA::UShort digits,
+        CORBA::UShort scale,
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
-    static void _set_members_skel (
-        CORBA::ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    static void lookup_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void contents_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void lookup_name_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void describe_contents_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void create_module_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void create_constant_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void create_struct_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void create_union_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void create_enum_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void create_alias_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void create_interface_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void create_value_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void create_value_box_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void create_exception_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void _get_id_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void _set_id_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env = 
-          TAO_default_environment ()
-      );
-
-    static void _get_name_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void _set_name_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env = 
-          TAO_default_environment ()
-      );
-
-    static void _get_version_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void _set_version_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env = 
-          TAO_default_environment ()
-      );
-
-    static void _get_defined_in_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void _get_absolute_name_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void _get_containing_repository_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void describe_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void move_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void _get_type_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void _get_def_kind_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void destroy_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-  };
-
-  class  _tao_thru_poa_collocated_UnionDef : public virtual ::CORBA::UnionDef,
-      public virtual _tao_thru_poa_collocated_TypedefDef,
-      public virtual _tao_thru_poa_collocated_Container
-  {
-  public:
-    _tao_thru_poa_collocated_UnionDef (
-        TAO_Stub *stub
-      );
-    virtual CORBA::Boolean _is_a(
-        const CORBA::Char *logical_type_id,
-        CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-      );
-    
-    virtual CORBA::Boolean _non_existent(
-        CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-      );
-    
-        virtual CORBA::TypeCode_ptr discriminator_type (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA::IDLType_ptr discriminator_type_def (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual void discriminator_type_def (
-        CORBA::IDLType_ptr discriminator_type_def,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA::UnionMemberSeq * members (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual void members (
-        const CORBA::UnionMemberSeq & members,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-  };
-
-  class EnumDef;
-  typedef EnumDef *EnumDef_ptr;
-  class TAO_Export EnumDef : public virtual TypedefDef
-  {
-  protected:
-    EnumDef (void);
-
-  public:
-    EnumDef (const EnumDef& rhs);
-    virtual ~EnumDef (void);
-
-    virtual CORBA::Boolean _is_a (
-        const char* logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual void* _downcast (
-        const char* logical_type_id
-      );
-
-    static void _is_a_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    static void _non_existent_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual void _dispatch (
+    static void create_fixed_tc_skel (
         CORBA::ServerRequest &_tao_req,
+        void *_tao_obj,
         void *_tao_context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    ::CORBA::EnumDef *_this (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual const char* _interface_repository_id (void) const;
-
-    virtual CORBA::EnumMemberSeq * members (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void _get_members_skel (
-        CORBA::ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       );
 
-    virtual void members (
-        const CORBA::EnumMemberSeq & members,
-        CORBA::Environment &ACE_TRY_ENV = 
+    virtual CORBA::TypeCode_ptr create_sequence_tc (
+        CORBA::ULong bound,
+        CORBA::TypeCode_ptr element_type,
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
-    static void _set_members_skel (
-        CORBA::ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    static void _get_id_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void _set_id_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env = 
-          TAO_default_environment ()
-      );
-
-    static void _get_name_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void _set_name_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env = 
-          TAO_default_environment ()
-      );
-
-    static void _get_version_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void _set_version_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env = 
-          TAO_default_environment ()
-      );
-
-    static void _get_defined_in_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void _get_absolute_name_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void _get_containing_repository_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void describe_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void move_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void _get_type_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void _get_def_kind_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void destroy_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-  };
-
-  class  _tao_thru_poa_collocated_EnumDef : public virtual ::CORBA::EnumDef,
-      public virtual _tao_thru_poa_collocated_TypedefDef
-  {
-  public:
-    _tao_thru_poa_collocated_EnumDef (
-        TAO_Stub *stub
-      );
-    virtual CORBA::Boolean _is_a(
-        const CORBA::Char *logical_type_id,
-        CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-      );
-    
-    virtual CORBA::Boolean _non_existent(
-        CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-      );
-    
-        virtual CORBA::EnumMemberSeq * members (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual void members (
-        const CORBA::EnumMemberSeq & members,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-  };
-
-  class AliasDef;
-  typedef AliasDef *AliasDef_ptr;
-  class TAO_Export AliasDef : public virtual TypedefDef
-  {
-  protected:
-    AliasDef (void);
-
-  public:
-    AliasDef (const AliasDef& rhs);
-    virtual ~AliasDef (void);
-
-    virtual CORBA::Boolean _is_a (
-        const char* logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual void* _downcast (
-        const char* logical_type_id
-      );
-
-    static void _is_a_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    static void _non_existent_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual void _dispatch (
+    static void create_sequence_tc_skel (
         CORBA::ServerRequest &_tao_req,
+        void *_tao_obj,
         void *_tao_context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    ::CORBA::AliasDef *_this (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual const char* _interface_repository_id (void) const;
-
-    virtual CORBA::IDLType_ptr original_type_def (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void _get_original_type_def_skel (
-        CORBA::ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       );
 
-    virtual void original_type_def (
-        CORBA::IDLType_ptr original_type_def,
-        CORBA::Environment &ACE_TRY_ENV = 
+    virtual CORBA::TypeCode_ptr create_array_tc (
+        CORBA::ULong length,
+        CORBA::TypeCode_ptr element_type,
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
-    static void _set_original_type_def_skel (
-        CORBA::ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    static void _get_id_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void _set_id_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env = 
-          TAO_default_environment ()
-      );
-
-    static void _get_name_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void _set_name_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env = 
-          TAO_default_environment ()
-      );
-
-    static void _get_version_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void _set_version_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env = 
-          TAO_default_environment ()
-      );
-
-    static void _get_defined_in_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void _get_absolute_name_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void _get_containing_repository_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void describe_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void move_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void _get_type_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void _get_def_kind_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void destroy_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-  };
-
-  class  _tao_thru_poa_collocated_AliasDef : public virtual ::CORBA::AliasDef,
-      public virtual _tao_thru_poa_collocated_TypedefDef
-  {
-  public:
-    _tao_thru_poa_collocated_AliasDef (
-        TAO_Stub *stub
-      );
-    virtual CORBA::Boolean _is_a(
-        const CORBA::Char *logical_type_id,
-        CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-      );
-    
-    virtual CORBA::Boolean _non_existent(
-        CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-      );
-    
-        virtual CORBA::IDLType_ptr original_type_def (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual void original_type_def (
-        CORBA::IDLType_ptr original_type_def,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-  };
-
-  class PrimitiveDef;
-  typedef PrimitiveDef *PrimitiveDef_ptr;
-  class TAO_Export PrimitiveDef : public virtual IDLType
-  {
-  protected:
-    PrimitiveDef (void);
-
-  public:
-    PrimitiveDef (const PrimitiveDef& rhs);
-    virtual ~PrimitiveDef (void);
-
-    virtual CORBA::Boolean _is_a (
-        const char* logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual void* _downcast (
-        const char* logical_type_id
-      );
-
-    static void _is_a_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    static void _non_existent_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual void _dispatch (
+    static void create_array_tc_skel (
         CORBA::ServerRequest &_tao_req,
+        void *_tao_obj,
         void *_tao_context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    ::CORBA::PrimitiveDef *_this (
-        CORBA::Environment &ACE_TRY_ENV = 
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       );
 
-    virtual const char* _interface_repository_id (void) const;
-
-    virtual CORBA::PrimitiveKind kind (
-        CORBA::Environment &ACE_TRY_ENV = 
+    virtual CORBA::TypeCode_ptr create_value_tc (
+        const char * id,
+        const char * name,
+        CORBA::ValueModifier type_modifier,
+        CORBA::TypeCode_ptr concrete_base,
+        const IR::ValueMemberSeq & members,
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
-    static void _get_kind_skel (
-        CORBA::ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    static void _get_type_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void _get_def_kind_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void destroy_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-  };
-
-  class  _tao_thru_poa_collocated_PrimitiveDef : public virtual ::CORBA::PrimitiveDef,
-      public virtual _tao_thru_poa_collocated_IDLType
-  {
-  public:
-    _tao_thru_poa_collocated_PrimitiveDef (
-        TAO_Stub *stub
-      );
-    virtual CORBA::Boolean _is_a(
-        const CORBA::Char *logical_type_id,
-        CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-      );
-    
-    virtual CORBA::Boolean _non_existent(
-        CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-      );
-    
-        virtual CORBA::PrimitiveKind kind (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-  };
-
-  class StringDef;
-  typedef StringDef *StringDef_ptr;
-  class TAO_Export StringDef : public virtual IDLType
-  {
-  protected:
-    StringDef (void);
-
-  public:
-    StringDef (const StringDef& rhs);
-    virtual ~StringDef (void);
-
-    virtual CORBA::Boolean _is_a (
-        const char* logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual void* _downcast (
-        const char* logical_type_id
-      );
-
-    static void _is_a_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    static void _non_existent_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual void _dispatch (
+    static void create_value_tc_skel (
         CORBA::ServerRequest &_tao_req,
+        void *_tao_obj,
         void *_tao_context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    ::CORBA::StringDef *_this (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual const char* _interface_repository_id (void) const;
-
-    virtual CORBA::ULong bound (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void _get_bound_skel (
-        CORBA::ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       );
 
-    virtual void bound (
-        CORBA::ULong bound,
-        CORBA::Environment &ACE_TRY_ENV = 
+    virtual CORBA::TypeCode_ptr create_value_box_tc (
+        const char * id,
+        const char * name,
+        CORBA::TypeCode_ptr boxed_type,
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
-    static void _set_bound_skel (
-        CORBA::ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    static void _get_type_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void _get_def_kind_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void destroy_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-  };
-
-  class  _tao_thru_poa_collocated_StringDef : public virtual ::CORBA::StringDef,
-      public virtual _tao_thru_poa_collocated_IDLType
-  {
-  public:
-    _tao_thru_poa_collocated_StringDef (
-        TAO_Stub *stub
-      );
-    virtual CORBA::Boolean _is_a(
-        const CORBA::Char *logical_type_id,
-        CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-      );
-    
-    virtual CORBA::Boolean _non_existent(
-        CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-      );
-    
-        virtual CORBA::ULong bound (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual void bound (
-        CORBA::ULong bound,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-  };
-
-  class WstringDef;
-  typedef WstringDef *WstringDef_ptr;
-  class TAO_Export WstringDef : public virtual IDLType
-  {
-  protected:
-    WstringDef (void);
-
-  public:
-    WstringDef (const WstringDef& rhs);
-    virtual ~WstringDef (void);
-
-
-    virtual CORBA::Boolean _is_a (
-        const char* logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual void* _downcast (
-        const char* logical_type_id
-      );
-
-    static void _is_a_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    static void _non_existent_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual void _dispatch (
+    static void create_value_box_tc_skel (
         CORBA::ServerRequest &_tao_req,
+        void *_tao_obj,
         void *_tao_context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    ::CORBA::WstringDef *_this (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual const char* _interface_repository_id (void) const;
-
-    virtual CORBA::ULong bound (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void _get_bound_skel (
-        CORBA::ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       );
 
-    virtual void bound (
-        CORBA::ULong bound,
-        CORBA::Environment &ACE_TRY_ENV = 
+    virtual CORBA::TypeCode_ptr create_native_tc (
+        const char * id,
+        const char * name,
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
-    static void _set_bound_skel (
-        CORBA::ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    static void _get_type_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void _get_def_kind_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void destroy_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-  };
-
-  class  _tao_thru_poa_collocated_WstringDef : public virtual ::CORBA::WstringDef,
-      public virtual _tao_thru_poa_collocated_IDLType
-  {
-  public:
-    _tao_thru_poa_collocated_WstringDef (
-        TAO_Stub *stub
-      );
-    virtual CORBA::Boolean _is_a(
-        const CORBA::Char *logical_type_id,
-        CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-      );
-    
-    virtual CORBA::Boolean _non_existent(
-        CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-      );
-    
-        virtual CORBA::ULong bound (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual void bound (
-        CORBA::ULong bound,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-  };
-
-  class FixedDef;
-  typedef FixedDef *FixedDef_ptr;
-  class TAO_Export FixedDef : public virtual IDLType
-  {
-  protected:
-    FixedDef (void);
-
-  public:
-    FixedDef (const FixedDef& rhs);
-    virtual ~FixedDef (void);
-
-    virtual CORBA::Boolean _is_a (
-        const char* logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual void* _downcast (
-        const char* logical_type_id
-      );
-
-    static void _is_a_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    static void _non_existent_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual void _dispatch (
+    static void create_native_tc_skel (
         CORBA::ServerRequest &_tao_req,
+        void *_tao_obj,
         void *_tao_context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    ::CORBA::FixedDef *_this (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual const char* _interface_repository_id (void) const;
-
-    virtual CORBA::UShort digits (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void _get_digits_skel (
-        CORBA::ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual void digits (
-        CORBA::UShort digits,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void _set_digits_skel (
-        CORBA::ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual CORBA::Short scale (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void _get_scale_skel (
-        CORBA::ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       );
 
-    virtual void scale (
-        CORBA::Short scale,
-        CORBA::Environment &ACE_TRY_ENV = 
+    virtual CORBA::TypeCode_ptr create_recursive_tc (
+        const char * id,
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
-    static void _set_scale_skel (
-        CORBA::ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    static void _get_type_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void _get_def_kind_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void destroy_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-  };
-
-  class  _tao_thru_poa_collocated_FixedDef : public virtual ::CORBA::FixedDef,
-      public virtual _tao_thru_poa_collocated_IDLType
-  {
-  public:
-    _tao_thru_poa_collocated_FixedDef (
-        TAO_Stub *stub
-      );
-    virtual CORBA::Boolean _is_a(
-        const CORBA::Char *logical_type_id,
-        CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-      );
-    
-    virtual CORBA::Boolean _non_existent(
-        CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-      );
-    
-        virtual CORBA::UShort digits (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual void digits (
-        CORBA::UShort digits,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA::Short scale (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual void scale (
-        CORBA::Short scale,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-  };
-
-  class SequenceDef;
-  typedef SequenceDef *SequenceDef_ptr;
-  class TAO_Export SequenceDef : public virtual IDLType
-  {
-  protected:
-    SequenceDef (void);
-
-  public:
-    SequenceDef (const SequenceDef& rhs);
-    virtual ~SequenceDef (void);
-
-    virtual CORBA::Boolean _is_a (
-        const char* logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual void* _downcast (
-        const char* logical_type_id
-      );
-
-    static void _is_a_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    static void _non_existent_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual void _dispatch (
+    static void create_recursive_tc_skel (
         CORBA::ServerRequest &_tao_req,
+        void *_tao_obj,
         void *_tao_context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    ::CORBA::SequenceDef *_this (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual const char* _interface_repository_id (void) const;
-
-    virtual CORBA::ULong bound (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void _get_bound_skel (
-        CORBA::ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual void bound (
-        CORBA::ULong bound,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void _set_bound_skel (
-        CORBA::ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual CORBA::TypeCode_ptr element_type (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void _get_element_type_skel (
-        CORBA::ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual CORBA::IDLType_ptr element_type_def (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void _get_element_type_def_skel (
-        CORBA::ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       );
 
-    virtual void element_type_def (
-        CORBA::IDLType_ptr element_type_def,
-        CORBA::Environment &ACE_TRY_ENV = 
+    virtual CORBA::TypeCode_ptr create_abstract_interface_tc (
+        const char * id,
+        const char * name,
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
-    static void _set_element_type_def_skel (
-        CORBA::ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    static void _get_type_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void _get_def_kind_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void destroy_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-  };
-
-  class  _tao_thru_poa_collocated_SequenceDef : public virtual ::CORBA::SequenceDef,
-      public virtual _tao_thru_poa_collocated_IDLType
-  {
-  public:
-    _tao_thru_poa_collocated_SequenceDef (
-        TAO_Stub *stub
-      );
-    virtual CORBA::Boolean _is_a(
-        const CORBA::Char *logical_type_id,
-        CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-      );
-    
-    virtual CORBA::Boolean _non_existent(
-        CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-      );
-    
-        virtual CORBA::ULong bound (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual void bound (
-        CORBA::ULong bound,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA::TypeCode_ptr element_type (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA::IDLType_ptr element_type_def (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual void element_type_def (
-        CORBA::IDLType_ptr element_type_def,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-  };
-
-  class ArrayDef;
-  typedef ArrayDef *ArrayDef_ptr;
-  class TAO_Export ArrayDef : public virtual IDLType
-  {
-  protected:
-    ArrayDef (void);
-
-  public:
-    ArrayDef (const ArrayDef& rhs);
-    virtual ~ArrayDef (void);
-
-    virtual CORBA::Boolean _is_a (
-        const char* logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual void* _downcast (
-        const char* logical_type_id
-      );
-
-    static void _is_a_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    static void _non_existent_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual void _dispatch (
+    static void create_abstract_interface_tc_skel (
         CORBA::ServerRequest &_tao_req,
+        void *_tao_obj,
         void *_tao_context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    ::CORBA::ArrayDef *_this (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual const char* _interface_repository_id (void) const;
-
-    virtual CORBA::ULong length (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void _get_length_skel (
-        CORBA::ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual void length (
-        CORBA::ULong length,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void _set_length_skel (
-        CORBA::ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual CORBA::TypeCode_ptr element_type (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void _get_element_type_skel (
-        CORBA::ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual CORBA::IDLType_ptr element_type_def (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void _get_element_type_def_skel (
-        CORBA::ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       );
 
-    virtual void element_type_def (
-        CORBA::IDLType_ptr element_type_def,
-        CORBA::Environment &ACE_TRY_ENV = 
+    virtual CORBA::TypeCode_ptr create_component_tc (
+        const char * id,
+        const char * name,
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
-    static void _set_element_type_def_skel (
-        CORBA::ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    static void _get_type_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void _get_def_kind_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void destroy_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-  };
-
-  class  _tao_thru_poa_collocated_ArrayDef : public virtual ::CORBA::ArrayDef,
-      public virtual _tao_thru_poa_collocated_IDLType
-  {
-  public:
-    _tao_thru_poa_collocated_ArrayDef (
-        TAO_Stub *stub
-      );
-    virtual CORBA::Boolean _is_a(
-        const CORBA::Char *logical_type_id,
-        CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-      );
-    
-    virtual CORBA::Boolean _non_existent(
-        CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-      );
-    
-        virtual CORBA::ULong length (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual void length (
-        CORBA::ULong length,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA::TypeCode_ptr element_type (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA::IDLType_ptr element_type_def (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual void element_type_def (
-        CORBA::IDLType_ptr element_type_def,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-  };
-
-  class ExceptionDef;
-  typedef ExceptionDef *ExceptionDef_ptr;
-  class TAO_Export ExceptionDef : public virtual Contained, 
-                                  public virtual Container
-  {
-  protected:
-    ExceptionDef (void);
-
-  public:
-    ExceptionDef (const ExceptionDef& rhs);
-    virtual ~ExceptionDef (void);
-
-    virtual CORBA::Boolean _is_a (
-        const char* logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual void* _downcast (
-        const char* logical_type_id
-      );
-
-    static void _is_a_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    static void _non_existent_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual void _dispatch (
+    static void create_component_tc_skel (
         CORBA::ServerRequest &_tao_req,
+        void *_tao_obj,
         void *_tao_context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    ::CORBA::ExceptionDef *_this (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual const char* _interface_repository_id (void) const;
-
-    virtual CORBA::TypeCode_ptr type (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void _get_type_skel (
-        CORBA::ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual CORBA::StructMemberSeq * members (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void _get_members_skel (
-        CORBA::ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       );
 
-    virtual void members (
-        const CORBA::StructMemberSeq & members,
-        CORBA::Environment &ACE_TRY_ENV = 
+    virtual CORBA::TypeCode_ptr create_home_tc (
+        const char * id,
+        const char * name,
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
 
-    static void _set_members_skel (
-        CORBA::ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    static void _get_id_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void _set_id_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env = 
-          TAO_default_environment ()
-      );
-
-    static void _get_name_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void _set_name_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env = 
-          TAO_default_environment ()
-      );
-
-    static void _get_version_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void _set_version_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env = 
-          TAO_default_environment ()
-      );
-
-    static void _get_defined_in_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void _get_absolute_name_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void _get_containing_repository_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void describe_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void move_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void lookup_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void contents_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void lookup_name_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void describe_contents_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void create_module_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void create_constant_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void create_struct_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void create_union_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void create_enum_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void create_alias_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void create_interface_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void create_value_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void create_value_box_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void create_exception_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void _get_def_kind_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void destroy_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-  };
-
-  class  _tao_thru_poa_collocated_ExceptionDef : public virtual ::CORBA::ExceptionDef,
-      public virtual _tao_thru_poa_collocated_Contained,
-      public virtual _tao_thru_poa_collocated_Container
-  {
-  public:
-    _tao_thru_poa_collocated_ExceptionDef (
-        TAO_Stub *stub
-      );
-    virtual CORBA::Boolean _is_a(
-        const CORBA::Char *logical_type_id,
-        CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-      );
-    
-    virtual CORBA::Boolean _non_existent(
-        CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-      );
-    
-        virtual CORBA::TypeCode_ptr type (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA::StructMemberSeq * members (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual void members (
-        const CORBA::StructMemberSeq & members,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-  };
-
-  class AttributeDef;
-  typedef AttributeDef *AttributeDef_ptr;
-  class TAO_Export AttributeDef : public virtual Contained
-  {
-  protected:
-    AttributeDef (void);
-
-  public:
-    AttributeDef (const AttributeDef& rhs);
-    virtual ~AttributeDef (void);
-
-    virtual CORBA::Boolean _is_a (
-        const char* logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual void* _downcast (
-        const char* logical_type_id
-      );
-
-    static void _is_a_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    static void _non_existent_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual void _dispatch (
+    static void create_home_tc_skel (
         CORBA::ServerRequest &_tao_req,
+        void *_tao_obj,
         void *_tao_context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    ::CORBA::AttributeDef *_this (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual const char* _interface_repository_id (void) const;
-
-    virtual CORBA::TypeCode_ptr type (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void _get_type_skel (
-        CORBA::ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual CORBA::IDLType_ptr type_def (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void _get_type_def_skel (
-        CORBA::ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual void type_def (
-        CORBA::IDLType_ptr type_def,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void _set_type_def_skel (
-        CORBA::ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual CORBA::AttributeMode mode (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void _get_mode_skel (
-        CORBA::ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual void mode (
-        CORBA::AttributeMode mode,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void _set_mode_skel (
-        CORBA::ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    static void _get_id_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void _set_id_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env = 
-          TAO_default_environment ()
-      );
-
-    static void _get_name_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void _set_name_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env = 
-          TAO_default_environment ()
-      );
-
-    static void _get_version_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void _set_version_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env = 
-          TAO_default_environment ()
-      );
-
-    static void _get_defined_in_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void _get_absolute_name_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void _get_containing_repository_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void describe_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void move_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       );
 
-    static void _get_def_kind_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
 
-    static void destroy_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
   };
 
-  class  _tao_thru_poa_collocated_AttributeDef : public virtual ::CORBA::AttributeDef,
-      public virtual _tao_thru_poa_collocated_Contained
+  class  _tao_thru_poa_collocated_TypeCodeFactory     : public virtual ::CORBA::TypeCodeFactory
   {
   public:
-    _tao_thru_poa_collocated_AttributeDef (
+    _tao_thru_poa_collocated_TypeCodeFactory (
         TAO_Stub *stub
       );
     virtual CORBA::Boolean _is_a(
         const CORBA::Char *logical_type_id,
         CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
       );
-    
-    virtual CORBA::Boolean _non_existent(
-        CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-      );
-    
-        virtual CORBA::TypeCode_ptr type (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA::IDLType_ptr type_def (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual void type_def (
-        CORBA::IDLType_ptr type_def,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA::AttributeMode mode (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual void mode (
-        CORBA::AttributeMode mode,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-  };
-
-  class OperationDef;
-  typedef OperationDef *OperationDef_ptr;
-  class TAO_Export OperationDef : public virtual Contained
-  {
-  protected:
-    OperationDef (void);
-
-  public:
-    OperationDef (const OperationDef& rhs);
-    virtual ~OperationDef (void);
-
-
-    virtual CORBA::Boolean _is_a (
-        const char* logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual void* _downcast (
-        const char* logical_type_id
-      );
-
-    static void _is_a_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    static void _non_existent_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual void _dispatch (
-        CORBA::ServerRequest &_tao_req,
-        void *_tao_context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    ::CORBA::OperationDef *_this (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual const char* _interface_repository_id (void) const;
-
-    virtual CORBA::TypeCode_ptr result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void _get_result_skel (
-        CORBA::ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual CORBA::IDLType_ptr result_def (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void _get_result_def_skel (
-        CORBA::ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual void result_def (
-        CORBA::IDLType_ptr result_def,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void _set_result_def_skel (
-        CORBA::ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual CORBA::ParDescriptionSeq * params (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void _get_params_skel (
-        CORBA::ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual void params (
-        const CORBA::ParDescriptionSeq & params,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void _set_params_skel (
-        CORBA::ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual CORBA::OperationMode mode (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void _get_mode_skel (
-        CORBA::ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual void mode (
-        CORBA::OperationMode mode,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void _set_mode_skel (
-        CORBA::ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual CORBA::ContextIdSeq * contexts (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void _get_contexts_skel (
-        CORBA::ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual void contexts (
-        const CORBA::ContextIdSeq & contexts,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void _set_contexts_skel (
-        CORBA::ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual CORBA::ExceptionDefSeq * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void _get_exceptions_skel (
-        CORBA::ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual void exceptions (
-        const CORBA::ExceptionDefSeq & exceptions,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void _set_exceptions_skel (
-        CORBA::ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    static void _get_id_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void _set_id_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env = 
-          TAO_default_environment ()
-      );
-
-    static void _get_name_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void _set_name_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env = 
-          TAO_default_environment ()
-      );
-
-    static void _get_version_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void _set_version_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env = 
-          TAO_default_environment ()
-      );
-
-    static void _get_defined_in_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void _get_absolute_name_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void _get_containing_repository_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void describe_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void move_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void _get_def_kind_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
 
-    static void destroy_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-  };
-
-  class  _tao_thru_poa_collocated_OperationDef : public virtual ::CORBA::OperationDef,
-      public virtual _tao_thru_poa_collocated_Contained
-  {
-  public:
-    _tao_thru_poa_collocated_OperationDef (
-        TAO_Stub *stub
-      );
-    virtual CORBA::Boolean _is_a(
-        const CORBA::Char *logical_type_id,
-        CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-      );
-    
     virtual CORBA::Boolean _non_existent(
         CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
       );
-    
-        virtual CORBA::TypeCode_ptr result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA::IDLType_ptr result_def (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual void result_def (
-        CORBA::IDLType_ptr result_def,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA::ParDescriptionSeq * params (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual void params (
-        const CORBA::ParDescriptionSeq & params,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA::OperationMode mode (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual void mode (
-        CORBA::OperationMode mode,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA::ContextIdSeq * contexts (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual void contexts (
-        const CORBA::ContextIdSeq & contexts,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA::ExceptionDefSeq * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual void exceptions (
-        const CORBA::ExceptionDefSeq & exceptions,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-  };
-
-  class InterfaceDef;
-  typedef InterfaceDef *InterfaceDef_ptr;
-  class TAO_Export InterfaceDef : public virtual Container, 
-                                  public virtual Contained, 
-                                  public virtual IDLType
-  {
-  protected:
-    InterfaceDef (void);
-
-  public:
-    InterfaceDef (const InterfaceDef& rhs);
-    virtual ~InterfaceDef (void);
-
-    virtual CORBA::Boolean _is_a (
-        const char* logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual void* _downcast (
-        const char* logical_type_id
-      );
-
-    static void _is_a_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    static void _non_existent_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual void _dispatch (
-        CORBA::ServerRequest &_tao_req,
-        void *_tao_context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    ::CORBA::InterfaceDef *_this (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual const char* _interface_repository_id (void) const;
-
-    virtual CORBA::InterfaceDefSeq * base_interfaces (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void _get_base_interfaces_skel (
-        CORBA::ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual void base_interfaces (
-        const CORBA::InterfaceDefSeq & base_interfaces,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void _set_base_interfaces_skel (
-        CORBA::ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual CORBA::Boolean is_a (
-        const char * interface_id,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void is_a_skel (
-        CORBA::ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual CORBA::InterfaceDef::FullInterfaceDescription * describe_interface (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void describe_interface_skel (
-        CORBA::ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
 
-    virtual CORBA::AttributeDef_ptr create_attribute (
+        virtual CORBA::TypeCode_ptr create_struct_tc (
         const char * id,
         const char * name,
-        const char * version,
-        CORBA::IDLType_ptr type,
-        CORBA::AttributeMode mode,
-        CORBA::Environment &ACE_TRY_ENV = 
+        const IR::StructMemberSeq & members,
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
-      )) = 0;
-
-    static void create_attribute_skel (
-        CORBA::ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+      ));
 
-    virtual CORBA::OperationDef_ptr create_operation (
+    virtual CORBA::TypeCode_ptr create_union_tc (
         const char * id,
         const char * name,
-        const char * version,
-        CORBA::IDLType_ptr result,
-        CORBA::OperationMode mode,
-        const CORBA::ParDescriptionSeq & params,
-        const CORBA::ExceptionDefSeq & exceptions,
-        const CORBA::ContextIdSeq & contexts,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void create_operation_skel (
-        CORBA::ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    static void lookup_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void contents_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void lookup_name_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void describe_contents_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void create_module_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void create_constant_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void create_struct_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void create_union_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void create_enum_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void create_alias_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void create_interface_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void create_value_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void create_value_box_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void create_exception_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void _get_id_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void _set_id_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env = 
-          TAO_default_environment ()
-      );
-
-    static void _get_name_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void _set_name_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env = 
-          TAO_default_environment ()
-      );
-
-    static void _get_version_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void _set_version_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env = 
-          TAO_default_environment ()
-      );
-
-    static void _get_defined_in_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void _get_absolute_name_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void _get_containing_repository_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void describe_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void move_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void _get_type_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void _get_def_kind_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void destroy_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-  };
-
-  class  _tao_thru_poa_collocated_InterfaceDef : public virtual ::CORBA::InterfaceDef,
-      public virtual _tao_thru_poa_collocated_Container,
-      public virtual _tao_thru_poa_collocated_Contained,
-      public virtual _tao_thru_poa_collocated_IDLType
-  {
-  public:
-    _tao_thru_poa_collocated_InterfaceDef (
-        TAO_Stub *stub
-      );
-    virtual CORBA::Boolean _is_a(
-        const CORBA::Char *logical_type_id,
-        CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-      );
-    
-    virtual CORBA::Boolean _non_existent(
-        CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-      );
-    
-        virtual CORBA::InterfaceDefSeq * base_interfaces (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual void base_interfaces (
-        const CORBA::InterfaceDefSeq & base_interfaces,
-        CORBA::Environment &ACE_TRY_ENV = 
+        CORBA::TypeCode_ptr discriminator_type,
+        const IR::UnionMemberSeq & members,
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
-    virtual CORBA::Boolean is_a (
-        const char * interface_id,
-        CORBA::Environment &ACE_TRY_ENV = 
+    virtual CORBA::TypeCode_ptr create_enum_tc (
+        const char * id,
+        const char * name,
+        const IR::EnumMemberSeq & members,
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
-    virtual CORBA::InterfaceDef::FullInterfaceDescription * describe_interface (
-        CORBA::Environment &ACE_TRY_ENV = 
+    virtual CORBA::TypeCode_ptr create_alias_tc (
+        const char * id,
+        const char * name,
+        CORBA::TypeCode_ptr original_type,
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
-    virtual CORBA::AttributeDef_ptr create_attribute (
+    virtual CORBA::TypeCode_ptr create_exception_tc (
         const char * id,
         const char * name,
-        const char * version,
-        CORBA::IDLType_ptr type,
-        CORBA::AttributeMode mode,
-        CORBA::Environment &ACE_TRY_ENV = 
+        const IR::StructMemberSeq & members,
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
-    virtual CORBA::OperationDef_ptr create_operation (
+    virtual CORBA::TypeCode_ptr create_interface_tc (
         const char * id,
         const char * name,
-        const char * version,
-        CORBA::IDLType_ptr result,
-        CORBA::OperationMode mode,
-        const CORBA::ParDescriptionSeq & params,
-        const CORBA::ExceptionDefSeq & exceptions,
-        const CORBA::ContextIdSeq & contexts,
-        CORBA::Environment &ACE_TRY_ENV = 
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-  };
-
-  class ValueMemberDef;
-  typedef ValueMemberDef *ValueMemberDef_ptr;
-  class TAO_Export ValueMemberDef : public virtual Contained
-  {
-  protected:
-    ValueMemberDef (void);
-
-  public:
-    ValueMemberDef (const ValueMemberDef& rhs);
-    virtual ~ValueMemberDef (void);
-
-    virtual CORBA::Boolean _is_a (
-        const char* logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual void* _downcast (
-        const char* logical_type_id
-      );
-
-    static void _is_a_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
 
-    static void _non_existent_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual void _dispatch (
-        CORBA::ServerRequest &_tao_req,
-        void *_tao_context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    ::CORBA::ValueMemberDef *_this (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual const char* _interface_repository_id (void) const;
-
-    virtual CORBA::TypeCode_ptr type (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void _get_type_skel (
-        CORBA::ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual CORBA::IDLType_ptr type_def (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void _get_type_def_skel (
-        CORBA::ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual void type_def (
-        CORBA::IDLType_ptr type_def,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void _set_type_def_skel (
-        CORBA::ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual CORBA::Visibility access (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void _get_access_skel (
-        CORBA::ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual void access (
-        CORBA::Visibility access,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void _set_access_skel (
-        CORBA::ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    static void _get_id_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void _set_id_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env = 
-          TAO_default_environment ()
-      );
-
-    static void _get_name_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void _set_name_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env = 
-          TAO_default_environment ()
-      );
-
-    static void _get_version_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void _set_version_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env = 
-          TAO_default_environment ()
-      );
-
-    static void _get_defined_in_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void _get_absolute_name_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void _get_containing_repository_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void describe_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void move_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void _get_def_kind_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void destroy_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-  };
-
-  class  _tao_thru_poa_collocated_ValueMemberDef : public virtual ::CORBA::ValueMemberDef,
-      public virtual _tao_thru_poa_collocated_Contained
-  {
-  public:
-    _tao_thru_poa_collocated_ValueMemberDef (
-        TAO_Stub *stub
-      );
-    virtual CORBA::Boolean _is_a(
-        const CORBA::Char *logical_type_id,
-        CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-      );
-    
-    virtual CORBA::Boolean _non_existent(
-        CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-      );
-    
-        virtual CORBA::TypeCode_ptr type (
-        CORBA::Environment &ACE_TRY_ENV = 
+    virtual CORBA::TypeCode_ptr create_string_tc (
+        CORBA::ULong bound,
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
-    virtual CORBA::IDLType_ptr type_def (
-        CORBA::Environment &ACE_TRY_ENV = 
+    virtual CORBA::TypeCode_ptr create_wstring_tc (
+        CORBA::ULong bound,
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
-    virtual void type_def (
-        CORBA::IDLType_ptr type_def,
-        CORBA::Environment &ACE_TRY_ENV = 
+    virtual CORBA::TypeCode_ptr create_fixed_tc (
+        CORBA::UShort digits,
+        CORBA::UShort scale,
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
-    virtual CORBA::Visibility access (
-        CORBA::Environment &ACE_TRY_ENV = 
+    virtual CORBA::TypeCode_ptr create_sequence_tc (
+        CORBA::ULong bound,
+        CORBA::TypeCode_ptr element_type,
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
-    virtual void access (
-        CORBA::Visibility access,
-        CORBA::Environment &ACE_TRY_ENV = 
+    virtual CORBA::TypeCode_ptr create_array_tc (
+        CORBA::ULong length,
+        CORBA::TypeCode_ptr element_type,
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-  };
-
-  class ValueDef;
-  typedef ValueDef *ValueDef_ptr;
-  class TAO_Export ValueDef : public virtual Container, 
-                              public virtual Contained, 
-                              public virtual IDLType
-  {
-  protected:
-    ValueDef (void);
-
-  public:
-    ValueDef (const ValueDef& rhs);
-    virtual ~ValueDef (void);
-
-    virtual CORBA::Boolean _is_a (
-        const char* logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual void* _downcast (
-        const char* logical_type_id
-      );
-
-    static void _is_a_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    static void _non_existent_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual void _dispatch (
-        CORBA::ServerRequest &_tao_req,
-        void *_tao_context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    ::CORBA::ValueDef *_this (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual const char* _interface_repository_id (void) const;
-
-    virtual CORBA::InterfaceDef_ptr supported_interface (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void _get_supported_interface_skel (
-        CORBA::ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual void supported_interface (
-        CORBA::InterfaceDef_ptr supported_interface,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void _set_supported_interface_skel (
-        CORBA::ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual CORBA::InitializerSeq * initializers (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void _get_initializers_skel (
-        CORBA::ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual void initializers (
-        const CORBA::InitializerSeq & initializers,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void _set_initializers_skel (
-        CORBA::ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual CORBA::ValueDef_ptr base_value (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void _get_base_value_skel (
-        CORBA::ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual void base_value (
-        CORBA::ValueDef_ptr base_value,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void _set_base_value_skel (
-        CORBA::ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual CORBA::ValueDefSeq * abstract_base_values (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void _get_abstract_base_values_skel (
-        CORBA::ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual void abstract_base_values (
-        const CORBA::ValueDefSeq & abstract_base_values,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void _set_abstract_base_values_skel (
-        CORBA::ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual CORBA::Boolean is_abstract (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void _get_is_abstract_skel (
-        CORBA::ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual void is_abstract (
-        CORBA::Boolean is_abstract,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void _set_is_abstract_skel (
-        CORBA::ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual CORBA::Boolean is_custom (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void _get_is_custom_skel (
-        CORBA::ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual void is_custom (
-        CORBA::Boolean is_custom,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void _set_is_custom_skel (
-        CORBA::ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual CORBA::Boolean is_truncatable (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void _get_is_truncatable_skel (
-        CORBA::ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual void is_truncatable (
-        CORBA::Boolean is_truncatable,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void _set_is_truncatable_skel (
-        CORBA::ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual CORBA::Boolean is_a (
-        const char * value_id,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void is_a_skel (
-        CORBA::ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual CORBA::ValueDef::FullValueDescription * describe_value (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void describe_value_skel (
-        CORBA::ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
 
-    virtual CORBA::ValueMemberDef_ptr create_value_member (
+    virtual CORBA::TypeCode_ptr create_value_tc (
         const char * id,
         const char * name,
-        const char * version,
-        CORBA::IDLType_ptr type,
-        CORBA::Visibility access,
-        CORBA::Environment &ACE_TRY_ENV = 
+        CORBA::ValueModifier type_modifier,
+        CORBA::TypeCode_ptr concrete_base,
+        const IR::ValueMemberSeq & members,
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
-      )) = 0;
-
-    static void create_value_member_skel (
-        CORBA::ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+      ));
 
-    virtual CORBA::AttributeDef_ptr create_attribute (
+    virtual CORBA::TypeCode_ptr create_value_box_tc (
         const char * id,
         const char * name,
-        const char * version,
-        CORBA::IDLType_ptr type,
-        CORBA::AttributeMode mode,
-        CORBA::Environment &ACE_TRY_ENV = 
+        CORBA::TypeCode_ptr boxed_type,
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
-      )) = 0;
-
-    static void create_attribute_skel (
-        CORBA::ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+      ));
 
-    virtual CORBA::OperationDef_ptr create_operation (
+    virtual CORBA::TypeCode_ptr create_native_tc (
         const char * id,
         const char * name,
-        const char * version,
-        CORBA::IDLType_ptr result,
-        CORBA::OperationMode mode,
-        const CORBA::ParDescriptionSeq & params,
-        const CORBA::ExceptionDefSeq & exceptions,
-        const CORBA::ContextIdSeq & contexts,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void create_operation_skel (
-        CORBA::ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    static void lookup_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void contents_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void lookup_name_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void describe_contents_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void create_module_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void create_constant_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void create_struct_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void create_union_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void create_enum_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void create_alias_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void create_interface_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void create_value_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void create_value_box_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void create_exception_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void _get_id_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void _set_id_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env = 
-          TAO_default_environment ()
-      );
-
-    static void _get_name_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void _set_name_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env = 
-          TAO_default_environment ()
-      );
-
-    static void _get_version_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void _set_version_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env = 
-          TAO_default_environment ()
-      );
-
-    static void _get_defined_in_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void _get_absolute_name_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void _get_containing_repository_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void describe_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void move_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void _get_type_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void _get_def_kind_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void destroy_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-  };
-
-  class  _tao_thru_poa_collocated_ValueDef : public virtual ::CORBA::ValueDef,
-      public virtual _tao_thru_poa_collocated_Container,
-      public virtual _tao_thru_poa_collocated_Contained,
-      public virtual _tao_thru_poa_collocated_IDLType
-  {
-  public:
-    _tao_thru_poa_collocated_ValueDef (
-        TAO_Stub *stub
-      );
-    virtual CORBA::Boolean _is_a(
-        const CORBA::Char *logical_type_id,
-        CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-      );
-    
-    virtual CORBA::Boolean _non_existent(
-        CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-      );
-    
-        virtual CORBA::InterfaceDef_ptr supported_interface (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual void supported_interface (
-        CORBA::InterfaceDef_ptr supported_interface,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA::InitializerSeq * initializers (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual void initializers (
-        const CORBA::InitializerSeq & initializers,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA::ValueDef_ptr base_value (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual void base_value (
-        CORBA::ValueDef_ptr base_value,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA::ValueDefSeq * abstract_base_values (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual void abstract_base_values (
-        const CORBA::ValueDefSeq & abstract_base_values,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA::Boolean is_abstract (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual void is_abstract (
-        CORBA::Boolean is_abstract,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA::Boolean is_custom (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual void is_custom (
-        CORBA::Boolean is_custom,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA::Boolean is_truncatable (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual void is_truncatable (
-        CORBA::Boolean is_truncatable,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-
-    virtual CORBA::Boolean is_a (
-        const char * value_id,
-        CORBA::Environment &ACE_TRY_ENV = 
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
-    virtual CORBA::ValueDef::FullValueDescription * describe_value (
-        CORBA::Environment &ACE_TRY_ENV = 
+    virtual CORBA::TypeCode_ptr create_recursive_tc (
+        const char * id,
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
-    virtual CORBA::ValueMemberDef_ptr create_value_member (
+    virtual CORBA::TypeCode_ptr create_abstract_interface_tc (
         const char * id,
         const char * name,
-        const char * version,
-        CORBA::IDLType_ptr type,
-        CORBA::Visibility access,
-        CORBA::Environment &ACE_TRY_ENV = 
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
-    virtual CORBA::AttributeDef_ptr create_attribute (
+    virtual CORBA::TypeCode_ptr create_component_tc (
         const char * id,
         const char * name,
-        const char * version,
-        CORBA::IDLType_ptr type,
-        CORBA::AttributeMode mode,
-        CORBA::Environment &ACE_TRY_ENV = 
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
-    virtual CORBA::OperationDef_ptr create_operation (
+    virtual CORBA::TypeCode_ptr create_home_tc (
         const char * id,
         const char * name,
-        const char * version,
-        CORBA::IDLType_ptr result,
-        CORBA::OperationMode mode,
-        const CORBA::ParDescriptionSeq & params,
-        const CORBA::ExceptionDefSeq & exceptions,
-        const CORBA::ContextIdSeq & contexts,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
-  };
-
-  class ValueBoxDef;
-  typedef ValueBoxDef *ValueBoxDef_ptr;
-  class TAO_Export ValueBoxDef : public virtual IDLType
-  {
-  protected:
-    ValueBoxDef (void);
-
-  public:
-    ValueBoxDef (const ValueBoxDef& rhs);
-    virtual ~ValueBoxDef (void);
-
-    virtual CORBA::Boolean _is_a (
-        const char* logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual void* _downcast (
-        const char* logical_type_id
-      );
-
-    static void _is_a_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    static void _non_existent_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual void _dispatch (
-        CORBA::ServerRequest &_tao_req,
-        void *_tao_context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    ::CORBA::ValueBoxDef *_this (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual const char* _interface_repository_id (void) const;
-
-    virtual CORBA::IDLType_ptr original_type_def (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void _get_original_type_def_skel (
-        CORBA::ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    virtual void original_type_def (
-        CORBA::IDLType_ptr original_type_def,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      )) = 0;
-
-    static void _set_original_type_def_skel (
-        CORBA::ServerRequest &_tao_req, 
-        void *_tao_obj, 
-        void *_tao_context, 
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
-
-    static void _get_type_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void _get_def_kind_skel (
-        CORBA::ServerRequest &req,
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-
-    static void destroy_skel (
-        CORBA::ServerRequest &req, 
-        void *obj,
-        void *context,
-        CORBA::Environment &env =
-          TAO_default_environment ()
-      );
-  };
-
-  class  _tao_thru_poa_collocated_ValueBoxDef : public virtual ::CORBA::ValueBoxDef,
-      public virtual _tao_thru_poa_collocated_IDLType
-  {
-  public:
-    _tao_thru_poa_collocated_ValueBoxDef (
-        TAO_Stub *stub
-      );
-    virtual CORBA::Boolean _is_a(
-        const CORBA::Char *logical_type_id,
-        CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-      );
-    
-    virtual CORBA::Boolean _non_existent(
-        CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ()
-      );
-    
-        virtual CORBA::IDLType_ptr original_type_def (
-        CORBA::Environment &ACE_TRY_ENV = 
+        CORBA::Environment &ACE_TRY_ENV =
           TAO_default_environment ()
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
 
-    virtual void original_type_def (
-        CORBA::IDLType_ptr original_type_def,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
-      ACE_THROW_SPEC ((
-        CORBA::SystemException
-      ));
   };
 
 #endif /* TAO_HAS_INTERFACE_REPOSITORY == 1 */
diff --git a/TAO/tao/corbafwd.h b/TAO/tao/corbafwd.h
index 837c6dde138..5da06d1a9f1 100644
--- a/TAO/tao/corbafwd.h
+++ b/TAO/tao/corbafwd.h
@@ -351,273 +351,60 @@ class CORBA_ORB_ObjectIdList_out;
 typedef CORBA_ORB_ObjectIdList *CORBA_ORB_ObjectIdList_ptr;
 
 // Forward declarations for INTERFACE REPO..Bala
-#ifdef TAO_HAS_INTERFACE_REPOSITORY
+#if (TAO_HAS_INTERFACE_REPOSITORY == 1)
+
+// To avoid cyclic dependencies, this is defined here and 
+// typedef'd to DefinitionKind inside the IR namespace.
+enum TAO_Export IR_DefinitionKind
+  {
+        dk_none,
+        dk_all,
+        dk_Attribute,
+        dk_Constant,
+        dk_Exception,
+        dk_Interface,
+        dk_Module,
+        dk_Operation,
+        dk_Typedef,
+        dk_Alias,
+        dk_Struct,
+        dk_Union,
+        dk_Enum,
+        dk_Primitive,
+        dk_String,
+        dk_Sequence,
+        dk_Array,
+        dk_Repository,
+        dk_Wstring,
+        dk_Fixed,
+        dk_Value,
+        dk_ValueBox,
+        dk_ValueMember,
+        dk_Native,
+        dk_Component,
+        dk_Home,
+        dk_Factory,
+        dk_Finder,
+        dk_PrimaryKey,
+        dk_Emits,
+        dk_Publishes,
+        dk_Consumes,
+        dk_Provides,
+        dk_Uses,
+        IR_DefinitionKind_TAO_ENUM_32BIT_ENFORCER = 0x7FFFFFFF
+  };
 
 class CORBA_IRObject;
 class CORBA_IRObject_var;
 class CORBA_IRObject_out;
 typedef CORBA_IRObject *CORBA_IRObject_ptr;
 
-class CORBA_Contained;
-class CORBA_Contained_out;
-class CORBA_Contained_var;
-typedef CORBA_Contained *CORBA_Contained_ptr;
-
-class CORBA_Repository;
-class CORBA_Repository_var;
-class CORBA_Repository_out;
-typedef CORBA_Repository *CORBA_Repository_ptr;
-
-class CORBA_Container;
-class CORBA_Container_var;
-class CORBA_Container_out;
-typedef CORBA_Container *CORBA_Container_ptr;
-
-class CORBA_ModuleDef;
-class CORBA_ModuleDef_out;
-class CORBA_ModuleDef_var;
-typedef CORBA_ModuleDef *CORBA_ModuleDef_ptr;
-
-class CORBA_ConstantDef;
-class CORBA_ConstantDef_out;
-class CORBA_ConstantDef_var;
-typedef CORBA_ConstantDef *CORBA_ConstantDef_ptr;
-
-class CORBA_IDLType;
-class CORBA_IDLType_out;
-class CORBA_IDLType_var;
-typedef CORBA_IDLType *CORBA_IDLType_ptr;
-
-class CORBA_StructDef;
-class CORBA_StructDef_var;
-class CORBA_StructDef_out;
-typedef  CORBA_StructDef *CORBA_StructDef_ptr;
-
-class CORBA_UnionDef;
-class CORBA_UnionDef_var;
-class CORBA_UnionDef_out;
-typedef CORBA_UnionDef *CORBA_UnionDef_ptr;
-
-class CORBA_EnumDef;
-class CORBA_EnumDef_var;
-class CORBA_EnumDef_out;
-typedef CORBA_EnumDef *CORBA_EnumDef_ptr;
-
-class CORBA_AliasDef;
-class CORBA_AliasDef_var;
-class CORBA_AliasDef_out;
-typedef CORBA_AliasDef *CORBA_AliasDef_ptr;
-
-class CORBA_ExceptionDef;
-class CORBA_ExceptionDef_out;
-class CORBA_ExceptionDef_var;
-typedef CORBA_ExceptionDef *CORBA_ExceptionDef_ptr;
-
-class CORBA_NativeDef;
-class CORBA_NativeDef_out;
-class CORBA_NativeDef_var;
-typedef CORBA_NativeDef *CORBA_NativeDef_ptr;
-
-class CORBA_InterfaceDefSeq;
-class CORBA_InterfaceDefSeq_out;
-class CORBA_InterfaceDefSeq_var;
-typedef CORBA_InterfaceDefSeq *CORBA_InterfaceDefSeq_ptr;
-
-class CORBA_ValueDef;
-class CORBA_ValueDef_out;
-class CORBA_ValueDef_var;
-typedef CORBA_ValueDef *CORBA_ValueDef_ptr;
-
-class CORBA_ValueDefSeq;
-class CORBA_ValueDefSeq_out;
-class CORBA_ValueDefSeq_var;
-typedef CORBA_ValueDefSeq *CORBA_ValueDefSeq_ptr;
-
-class CORBA_ValueBoxDef;
-class CORBA_ValueBoxDef_out;
-class CORBA_ValueBoxDef_var;
-typedef CORBA_ValueBoxDef *CORBA_ValueBoxDef_ptr;
-
-class CORBA_ContainedSeq;
-class CORBA_ContainedSeq_out;
-class CORBA_ContainedSeq_var;
-typedef CORBA_ContainedSeq *CORBA_ContainedSeq_ptr;
-
-struct CORBA_StructMember;
-class CORBA_StructMember_out;
-class CORBA_StructMember_var;
-typedef CORBA_StructMember *CORBA_StructMember_ptr;
-
-class CORBA_StructMemberSeq;
-class CORBA_StructMemberSeq_out;
-class CORBA_StructMemberSeq_var;
-typedef CORBA_StructMemberSeq *CORBA_StructMemberSeq_ptr;
-
-struct CORBA_Initializer;
-class CORBA_Initializer_out;
-class CORBA_Initializer_var;
-typedef CORBA_Initializer *CORBA_Initializer_ptr;
-
-class CORBA_InitializerSeq;
-class CORBA_InitializerSeq_out;
-class CORBA_InitializerSeq_var;
-typedef CORBA_InitializerSeq *CORBA_InitializerSeq_ptr;
-
-struct CORBA_UnionMember;
-class CORBA_UnionMember_out;
-class CORBA_UnionMember_var;
-typedef CORBA_UnionMember *CORBA_UnionMember_ptr;
-
-class CORBA_UnionMemberSeq;
-class CORBA_UnionMemberSeq_out;
-class CORBA_UnionMemberSeq_var;
-typedef CORBA_UnionMemberSeq *CORBA_UnionMemberSeq_ptr;
-
-class CORBA_PrimitiveDef;
-class CORBA_PrimitiveDef_out;
-class CORBA_PrimitiveDef_var;
-typedef CORBA_PrimitiveDef *CORBA_PrimitiveDef_ptr;
-
-class CORBA_StringDef;
-class CORBA_StringDef_out;
-class CORBA_StringDef_var;
-typedef CORBA_StringDef *CORBA_StringDef_ptr;
-
-class CORBA_SequenceDef;
-class CORBA_SequenceDef_out;
-class CORBA_SequenceDef_var;
-typedef CORBA_SequenceDef *CORBA_SequenceDef_ptr;
-
-class CORBA_ArrayDef;
-class CORBA_ArrayDef_out;
-class CORBA_ArrayDef_var;
-typedef CORBA_ArrayDef *CORBA_ArrayDef_ptr;
-
-class CORBA_WstringDef;
-class CORBA_WstringDef_out;
-class CORBA_WstringDef_var;
-typedef CORBA_WstringDef *CORBA_WstringDef_ptr;
-
-class CORBA_FixedDef;
-class CORBA_FixedDef_out;
-class CORBA_FixedDef_var;
-typedef CORBA_FixedDef *CORBA_FixedDef_ptr;
-
-struct CORBA_ModuleDescription;
-class CORBA_ModuleDescription_out;
-class CORBA_ModuleDescription_var;
-typedef CORBA_ModuleDescription *CORBA_ModuleDescription_ptr;
-
-struct CORBA_ConstantDescription;
-class CORBA_ConstantDescription_out;
-class CORBA_ConstantDescription_var;
-typedef CORBA_ConstantDescription *CORBA_ConstantDescription_ptr;
-
-class CORBA_TypedefDef;
-class CORBA_TypedefDef_out;
-class CORBA_TypedefDef_var;
-typedef CORBA_TypedefDef *CORBA_TypedefDef_ptr;
-
-struct CORBA_TypeDescription;
-class CORBA_TypeDescription_out;
-class CORBA_TypeDescription_var;
-typedef CORBA_TypeDescription *CORBA_TypeDescription_ptr;
-
-struct CORBA_ExceptionDescription;
-class CORBA_ExceptionDescription_out;
-class CORBA_ExceptionDescription_var;
-typedef CORBA_ExceptionDescription *CORBA_ExceptionDescription_ptr;
-
-class CORBA_AttributeDef;
-class CORBA_AttributeDef_out;
-class CORBA_AttributeDef_var;
-typedef CORBA_AttributeDef *CORBA_AttributeDef_ptr;
-
-struct CORBA_AttributeDescription;
-class CORBA_AttributeDescription_out;
-class CORBA_AttributeDescription_var;
-typedef CORBA_AttributeDescription *CORBA_AttributeDescription_ptr;
-
-struct CORBA_ParameterDescription;
-class CORBA_ParameterDescription_out;
-class CORBA_ParameterDescription_var;
-typedef CORBA_ParameterDescription *CORBA_ParameterDescription_ptr;
-
-class CORBA_ParDescriptionSeq;
-class CORBA_ParDescriptionSeq_out;
-class CORBA_ParDescriptionSeq_var;
-typedef CORBA_ParDescriptionSeq *CORBA_ParDescriptionSeq_ptr;
-
-class CORBA_ContextIdSeq;
-class CORBA_ContextIdSeq_out;
-class CORBA_ContextIdSeq_var;
-typedef CORBA_ContextIdSeq *CORBA_ContextIdSeq_ptr;
-
-class CORBA_ExceptionDefSeq;
-class CORBA_ExceptionDefSeq_out;
-class CORBA_ExceptionDefSeq_var;
-typedef CORBA_ExceptionDefSeq *CORBA_ExceptionDefSeq_ptr;
-
-class CORBA_ExcDescriptionSeq;
-class CORBA_ExcDescriptionSeq_out;
-class CORBA_ExcDescriptionSeq_var;
-typedef CORBA_ExcDescriptionSeq *CORBA_ExcDescriptionSeq_ptr;
-
-class CORBA_OperationDef;
-class CORBA_OperationDef_out;
-class CORBA_OperationDef_var;
-typedef CORBA_OperationDef *CORBA_OperationDef_ptr;
-
-struct CORBA_OperationDescription;
-class CORBA_OperationDescription_out;
-class CORBA_OperationDescription_var;
-typedef CORBA_OperationDescription *CORBA_OperationDescription_ptr;
-
-class CORBA_RepositoryIdSeq;
-class CORBA_RepositoryIdSeq_out;
-class CORBA_RepositoryIdSeq_var;
-typedef CORBA_RepositoryIdSeq *CORBA_RepositoryIdSeq_ptr;
-
-class CORBA_OpDescriptionSeq;
-class CORBA_OpDescriptionSeq_out;
-class CORBA_OpDescriptionSeq_var;
-typedef CORBA_OpDescriptionSeq *CORBA_OpDescriptionSeq_ptr;
-
-class CORBA_AttrDescriptionSeq;
-class CORBA_AttrDescriptionSeq_out;
-class CORBA_AttrDescriptionSeq_var;
-typedef CORBA_AttrDescriptionSeq *CORBA_AttrDescriptionSeq_ptr;
-
-struct CORBA_InterfaceDescription;
-class CORBA_InterfaceDescription_out;
-class CORBA_InterfaceDescription_var;
-typedef CORBA_InterfaceDescription *CORBA_InterfaceDescription_ptr;
-
-struct CORBA_ValueMember;
-class CORBA_ValueMember_out;
-class CORBA_ValueMember_var;
-typedef CORBA_ValueMember *CORBA_ValueMember_ptr;
-
-class CORBA_ValueMemberSeq;
-class CORBA_ValueMemberSeq_out;
-class CORBA_ValueMemberSeq_var;
-typedef CORBA_ValueMemberSeq *CORBA_ValueMemberSeq_ptr;
-
-class CORBA_ValueMemberDef;
-class CORBA_ValueMemberDef_out;
-class CORBA_ValueMemberDef_var;
-typedef CORBA_ValueMemberDef *CORBA_ValueMemberDef_ptr;
-
-struct CORBA_ValueDescription;
-class CORBA_ValueDescription_out;
-class CORBA_ValueDescription_var;
-typedef CORBA_ValueDescription *CORBA_ValueDescription_ptr;
-
-class CORBA_EnumMemberSeq;
-class CORBA_EnumMemberSeq_out;
-class CORBA_EnumMemberSeq_var;
-typedef CORBA_EnumMemberSeq *CORBA_EnumMemberSeq_ptr;
-#endif /* TAO_HAS_INTERFACE_REPOSITORY*/
+class CORBA_TypeCodeFactory;
+class CORBA_TypeCodeFactory_var;
+class CORBA_TypeCodeFactory_out;
+typedef CORBA_TypeCodeFactory *CORBA_TypeCodeFactory_ptr;
+
+#endif /* TAO_HAS_INTERFACE_REPOSITORY == 1 */
 
 class CORBA_Bounds;
 typedef CORBA_Bounds *CORBA_Bounds_ptr;
@@ -834,272 +621,18 @@ TAO_NAMESPACE CORBA
   typedef CORBA_Current_var Current_var;
   typedef CORBA_Current_out Current_out;
 
-#ifdef TAO_HAS_INTERFACE_REPOSITORY
+#if (TAO_HAS_INTERFACE_REPOSITORY == 1)
   // Interface Repository Bala===========
   typedef CORBA_IRObject IRObject;
   typedef CORBA_IRObject *IRObject_ptr;
   typedef CORBA_IRObject_out IRObject_out;
   typedef CORBA_IRObject_var IRObject_var;
 
-  typedef CORBA_Contained Contained;
-  typedef CORBA_Contained *Contained_ptr;
-  typedef CORBA_Contained_out Contained_out;
-  typedef CORBA_Contained_var Contained_var;
-
-  typedef CORBA_Repository Repository;
-  typedef CORBA_Repository *Repository_ptr;
-  typedef CORBA_Repository_out Repository_out;
-  typedef CORBA_Repository_var Repository_var;
-
-  typedef CORBA_Container Container;
-  typedef CORBA_Container *Container_ptr;
-  typedef CORBA_Container_out Container_out;
-  typedef CORBA_Container_var Container_var;
-
-  typedef CORBA_ModuleDef ModuleDef;
-  typedef CORBA_ModuleDef *ModuleDef_ptr;
-  typedef CORBA_ModuleDef_out ModuleDef_out;
-  typedef CORBA_ModuleDef_var  ModuleDef_var;
-
-  typedef CORBA_ConstantDef ConstantDef;
-  typedef CORBA_ConstantDef *ConstantDef_ptr;
-  typedef CORBA_ConstantDef_out ConstantDef_out;
-  typedef CORBA_ConstantDef_var ConstantDef_var;
-
-  typedef CORBA_IDLType IDLType;
-  typedef CORBA_IDLType *IDLType_ptr;
-  typedef CORBA_IDLType_out IDLType_out;
-  typedef CORBA_IDLType_var IDLType_var;
-
-  typedef CORBA_StructDef StructDef;
-  typedef CORBA_StructDef *StructDef_ptr;
-  typedef CORBA_StructDef_out StructDef_out;
-  typedef CORBA_StructDef_var StructDef_var;
-
-  typedef CORBA_UnionDef  UnionDef;
-  typedef CORBA_UnionDef *UnionDef_ptr;
-  typedef CORBA_UnionDef_out UnionDef_out;
-  typedef CORBA_UnionDef_var UnionDef_var;
-
-  typedef CORBA_EnumDef  EnumDef;
-  typedef CORBA_EnumDef *EnumDef_ptr;
-  typedef CORBA_EnumDef_out EnumDef_out;
-  typedef CORBA_EnumDef_var EnumDef_var;
-
-  typedef CORBA_AliasDef AliasDef;
-  typedef CORBA_AliasDef *AliasDef_ptr;
-  typedef CORBA_AliasDef_out AliasDef_out;
-  typedef CORBA_AliasDef_var AliasDef_var;
-
-  typedef CORBA_ExceptionDef ExceptionDef;
-  typedef CORBA_ExceptionDef *ExceptionDef_ptr;
-  typedef CORBA_ExceptionDef_out ExceptionDef_out;
-  typedef CORBA_ExceptionDef_var ExceptionDef_var;
-
-  typedef CORBA_NativeDef NativeDef;
-  typedef CORBA_NativeDef *NativeDef_ptr;
-  typedef CORBA_NativeDef_out NativeDef_out;
-  typedef CORBA_NativeDef_var NativeDef_var;
-
-  typedef CORBA_InterfaceDefSeq InterfaceDefSeq;
-  typedef CORBA_InterfaceDefSeq *InterfaceDefSeq_ptr;
-  typedef CORBA_InterfaceDefSeq_out InterfaceDefSeq_out;
-  typedef CORBA_InterfaceDefSeq_var InterfaceDefSeq_var;
-
-  typedef CORBA_ValueDef ValueDef;
-  typedef CORBA_ValueDef *ValueDef_ptr;
-  typedef CORBA_ValueDef_out ValueDef_out;
-  typedef CORBA_ValueDef_var ValueDef_var;
-
-  typedef CORBA_ValueDefSeq ValueDefSeq;
-  typedef CORBA_ValueDefSeq *ValueDefSeq_ptr;
-  typedef CORBA_ValueDefSeq_out ValueDefSeq_out;
-  typedef CORBA_ValueDefSeq_var ValueDefSeq_var;
-
-  typedef CORBA_ValueBoxDef ValueBoxDef;
-  typedef CORBA_ValueBoxDef *ValueBoxDef_ptr;
-  typedef CORBA_ValueBoxDef_out ValueBoxDef_out;
-  typedef CORBA_ValueBoxDef_var ValueBoxDef_var;
-
-  typedef CORBA_ContainedSeq ContainedSeq;
-  typedef CORBA_ContainedSeq *ContainedSeq_ptr;
-  typedef CORBA_ContainedSeq_out ContainedSeq_out;
-  typedef CORBA_ContainedSeq_var ContainedSeq_var;
-
-  typedef CORBA_StructMember StructMember;
-  typedef CORBA_StructMember *StructMember_ptr;
-  typedef CORBA_StructMember_out StructMember_out;
-  typedef CORBA_StructMember_var StructMember_var;
-
-  typedef CORBA_StructMemberSeq StructMemberSeq;
-  typedef CORBA_StructMemberSeq *StructMemberSeq_ptr;
-  typedef CORBA_StructMemberSeq_out StructMemberSeq_out;
-  typedef CORBA_StructMemberSeq_var StructMemberSeq_var;
-
-  typedef CORBA_Initializer Initializer;
-  typedef CORBA_Initializer *Initializer_ptr;
-  typedef CORBA_Initializer_out Initializer_out;
-  typedef CORBA_Initializer_var Initializer_var;
-
-  typedef CORBA_InitializerSeq InitializerSeq;
-  typedef CORBA_InitializerSeq *InitializerSeq_ptr;
-  typedef CORBA_InitializerSeq_out InitializerSeq_out;
-  typedef CORBA_InitializerSeq_var InitializerSeq_var;
-
-  typedef CORBA_UnionMember UnionMember;
-  typedef CORBA_UnionMember *UnionMember_ptr;
-  typedef CORBA_UnionMember_out UnionMember_out;
-  typedef CORBA_UnionMember_var UnionMember_var;
-
-  typedef CORBA_UnionMemberSeq UnionMemberSeq;
-  typedef CORBA_UnionMemberSeq *UnionMemberSeq_ptr;
-  typedef CORBA_UnionMemberSeq_out UnionMemberSeq_out;
-  typedef CORBA_UnionMemberSeq_var UnionMemberSeq_var;
-
-  typedef CORBA_PrimitiveDef PrimitiveDef;
-  typedef CORBA_PrimitiveDef *PrimitiveDef_ptr;
-  typedef CORBA_PrimitiveDef_out PrimitiveDef_out;
-  typedef CORBA_PrimitiveDef_var PrimitiveDef_var;
-
-  typedef CORBA_StringDef StringDef;
-  typedef CORBA_StringDef *StringDef_ptr;
-  typedef CORBA_StringDef_out StringDef_out;
-  typedef CORBA_StringDef_var StringDef_var;
-
-  typedef CORBA_SequenceDef SequenceDef;
-  typedef CORBA_SequenceDef *SequenceDef_ptr;
-  typedef CORBA_SequenceDef_out SequenceDef_out;
-  typedef CORBA_SequenceDef_var SequenceDef_var;
-
-  typedef CORBA_ArrayDef ArrayDef;
-  typedef CORBA_ArrayDef *ArrayDef_ptr;
-  typedef CORBA_ArrayDef_out ArrayDef_out;
-  typedef CORBA_ArrayDef_var ArrayDef_var;
-
-  typedef CORBA_WstringDef WstringDef;
-  typedef CORBA_WstringDef *WstringDef_ptr;
-  typedef CORBA_WstringDef_out WstringDef_out;
-  typedef CORBA_WstringDef_var WstringDef_var;
-
-  typedef CORBA_FixedDef FixedDef;
-  typedef CORBA_FixedDef *FixedDef_ptr;
-  typedef CORBA_FixedDef_out FixedDef_out;
-  typedef CORBA_FixedDef_var FixedDef_var;
-
-  typedef CORBA_ModuleDescription ModuleDescription;
-  typedef CORBA_ModuleDescription *ModuleDescription_ptr;
-  typedef CORBA_ModuleDescription_out ModuleDescription_out;
-  typedef CORBA_ModuleDescription_var ModuleDescription_var;
-
-  typedef CORBA_ConstantDescription ConstantDescription;
-  typedef CORBA_ConstantDescription *ConstantDescription_ptr;
-  typedef CORBA_ConstantDescription_out ConstantDescription_out;
-  typedef CORBA_ConstantDescription_var ConstantDescription_var;
-
-  typedef CORBA_TypedefDef TypedefDef;
-  typedef CORBA_TypedefDef *TypedefDef_ptr;
-  typedef CORBA_TypedefDef_out TypedefDef_out;
-  typedef CORBA_TypedefDef_var TypedefDef_var;
-
-  typedef CORBA_TypeDescription TypeDescription;
-  typedef CORBA_TypeDescription *TypeDescription_ptr;
-  typedef CORBA_TypeDescription_out TypeDescription_out;
-  typedef CORBA_TypeDescription_var TypeDescription_var;
-
-  typedef CORBA_ExceptionDescription ExceptionDescription;
-  typedef CORBA_ExceptionDescription *ExceptionDescription_ptr;
-  typedef CORBA_ExceptionDescription_out ExceptionDescription_out;
-  typedef CORBA_ExceptionDescription_var ExceptionDescription_var;
-
-  typedef CORBA_AttributeDef AttributeDef;
-  typedef CORBA_AttributeDef *AttributeDef_ptr;
-  typedef CORBA_AttributeDef_out AttributeDef_out;
-  typedef CORBA_AttributeDef_var AttributeDef_var;
-
-  typedef CORBA_AttributeDescription AttributeDescription;
-  typedef CORBA_AttributeDescription *AttributeDescription_ptr;
-  typedef CORBA_AttributeDescription_out AttributeDescription_out;
-  typedef CORBA_AttributeDescription_var AttributeDescription_var;
-
-  typedef CORBA_ParameterDescription ParameterDescription;
-  typedef CORBA_ParameterDescription *ParameterDescription_ptr;
-  typedef CORBA_ParameterDescription_out ParameterDescription_out;
-  typedef CORBA_ParameterDescription_var ParameterDescription_var;
-
-  typedef CORBA_ParDescriptionSeq ParDescriptionSeq;
-  typedef CORBA_ParDescriptionSeq *ParDescriptionSeq_ptr;
-  typedef CORBA_ParDescriptionSeq_out ParDescriptionSeq_out;
-  typedef CORBA_ParDescriptionSeq_var ParDescriptionSeq_var;
-
-  typedef CORBA_ContextIdSeq ContextIdSeq;
-  typedef CORBA_ContextIdSeq *ContextIdSeq_ptr;
-  typedef CORBA_ContextIdSeq_out ContextIdSeq_out;
-  typedef CORBA_ContextIdSeq_var ContextIdSeq_var;
-
-  typedef CORBA_ExceptionDefSeq ExceptionDefSeq;
-  typedef CORBA_ExceptionDefSeq *ExceptionDefSeq_ptr;
-  typedef CORBA_ExceptionDefSeq_out ExceptionDefSeq_out;
-  typedef CORBA_ExceptionDefSeq_var ExceptionDefSeq_var;
-
-  typedef CORBA_ExcDescriptionSeq ExcDescriptionSeq;
-  typedef CORBA_ExcDescriptionSeq *ExcDescriptionSeq_ptr;
-  typedef CORBA_ExcDescriptionSeq_out ExcDescriptionSeq_out;
-  typedef CORBA_ExcDescriptionSeq_var ExcDescriptionSeq_var;
-
-  typedef CORBA_OperationDef OperationDef;
-  typedef CORBA_OperationDef *OperationDef_ptr;
-  typedef CORBA_OperationDef_out OperationDef_out;
-  typedef CORBA_OperationDef_var OperationDef_var;
-
-  typedef CORBA_OperationDescription OperationDescription;
-  typedef CORBA_OperationDescription *OperationDescription_ptr;
-  typedef CORBA_OperationDescription_out OperationDescription_out;
-  typedef CORBA_OperationDescription_var OperationDescription_var;
-
-  typedef CORBA_RepositoryIdSeq RepositoryIdSeq;
-  typedef CORBA_RepositoryIdSeq *RepositoryIdSeq_ptr;
-  typedef CORBA_RepositoryIdSeq_out RepositoryIdSeq_out;
-  typedef CORBA_RepositoryIdSeq_var RepositoryIdSeq_var;
-
-  typedef CORBA_OpDescriptionSeq OpDescriptionSeq;
-  typedef CORBA_OpDescriptionSeq *OpDescriptionSeq_ptr;
-  typedef CORBA_OpDescriptionSeq_out OpDescriptionSeq_out;
-  typedef CORBA_OpDescriptionSeq_var OpDescriptionSeq_var;
-
-  typedef CORBA_AttrDescriptionSeq AttrDescriptionSeq;
-  typedef CORBA_AttrDescriptionSeq *AttrDescriptionSeq_ptr;
-  typedef CORBA_AttrDescriptionSeq_out AttrDescriptionSeq_out;
-  typedef CORBA_AttrDescriptionSeq_var AttrDescriptionSeq_var;
-
-  typedef CORBA_InterfaceDescription InterfaceDescription;
-  typedef CORBA_InterfaceDescription *InterfaceDescription_ptr;
-  typedef CORBA_InterfaceDescription_out InterfaceDescription_out;
-  typedef CORBA_InterfaceDescription_var InterfaceDescription_var;
-
-  typedef CORBA_ValueMember ValueMember;
-  typedef CORBA_ValueMember *ValueMember_ptr;
-  typedef CORBA_ValueMember_out ValueMember_out;
-  typedef CORBA_ValueMember_var ValueMember_var;
-
-  typedef CORBA_ValueMemberSeq ValueMemberSeq;
-  typedef CORBA_ValueMemberSeq *ValueMemberSeq_ptr;
-  typedef CORBA_ValueMemberSeq_out ValueMemberSeq_out;
-  typedef CORBA_ValueMemberSeq_var ValueMemberSeq_var;
-
-  typedef CORBA_ValueMemberDef ValueMemberDef;
-  typedef CORBA_ValueMemberDef *ValueMemberDef_ptr;
-  typedef CORBA_ValueMemberDef_out ValueMemberDef_out;
-  typedef CORBA_ValueMemberDef_var ValueMemberDef_var;
-
-  typedef CORBA_ValueDescription ValueDescription;
-  typedef CORBA_ValueDescription *ValueDescription_ptr;
-  typedef CORBA_ValueDescription_out ValueDescription_out;
-  typedef CORBA_ValueDescription_var ValueDescription_var;
-
-  typedef CORBA_EnumMemberSeq EnumMemberSeq;
-  typedef CORBA_EnumMemberSeq *EnumMemberSeq_ptr;
-  typedef CORBA_EnumMemberSeq_out EnumMemberSeq_out;
-  typedef CORBA_EnumMemberSeq_var EnumMemberSeq_var;
+  typedef CORBA_TypeCodeFactory TypeCodeFactory;
+  typedef CORBA_TypeCodeFactory *TypeCodeFactory_ptr;
+  typedef CORBA_TypeCodeFactory_out TypeCodeFactory_out;
+  typedef CORBA_TypeCodeFactory_var TypeCodeFactory_var;
+
 #endif /* TAO_HAS_INTERFACE_REPOSITORY == 1 */
 
   typedef CORBA_Bounds Bounds;
@@ -1226,6 +759,8 @@ TAO_NAMESPACE CORBA
     tk_value_box          = 30,
     tk_native             = 31,
     tk_abstract_interface = 32,
+    tk_component          = 33, 
+    tk_home               = 34,
 
     // This symbol is not defined by CORBA 2.0.  It's used to speed up
     // dispatch based on TCKind values, and lets many important ones
@@ -1435,7 +970,7 @@ TAO_NAMESPACE CORBA
   typedef CORBA_NameValuePairSeq_out NameValuePairSeq_out;
   TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_NameValuePairSeq;
 
-#endif /* ! defined (TAO_HAS_MINIMUM_CORBA) */
+#endif /* ! TAO_HAS_MINIMUM_CORBA */
 
   // ****************************************************************
 
@@ -1468,7 +1003,7 @@ TAO_NAMESPACE CORBA
   typedef CORBA::String_out Identifier_out;
   TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_Identifier;
 
-#ifdef TAO_HAS_INTERFACE_REPOSITORY
+#if (TAO_HAS_INTERFACE_REPOSITORY == 1)
   // ------------------------------Interface REPOS Bala
 
   // =================== Interface Repository =====================
@@ -1477,157 +1012,8 @@ TAO_NAMESPACE CORBA
   typedef CORBA_String_out ScopedName_out;
   TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ScopedName;
 
-
-
-
-
-  enum DefinitionKind
-  {
-    dk_none,
-    dk_all,
-    dk_Attribute,
-    dk_Constant,
-    dk_Exception,
-    dk_Interface,
-    dk_Module,
-    dk_Operation,
-    dk_Typedef,
-    dk_Alias,
-    dk_Struct,
-    dk_Union,
-    dk_Enum,
-    dk_Primitive,
-    dk_String,
-    dk_Sequence,
-    dk_Array,
-    dk_Repository,
-    dk_Wstring,
-    dk_Fixed,
-    dk_Value,
-    dk_ValueBox,
-    dk_ValueMember,
-    dk_Native
-  };
-
-  typedef DefinitionKind &DefinitionKind_out;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_DefinitionKind;
-
   TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_IRObject;
-
-  typedef char * VersionSpec;
-  typedef CORBA_String_var VersionSpec_var;
-  typedef CORBA_String_out VersionSpec_out;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_VersionSpec;
-
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_Container;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_Contained;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_InterfaceDefSeq;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ValueDefSeq;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ContainedSeq;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_StructMember;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_StructMemberSeq;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_Initializer;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_InitializerSeq;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_UnionMember;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_UnionMemberSeq;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_EnumMemberSeq;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_IDLType;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_Repository;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ModuleDef;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ModuleDescription;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ConstantDef;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ConstantDescription;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_TypedefDef;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_TypeDescription;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_StructDef;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_UnionDef;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_EnumDef;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_AliasDef;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_PrimitiveDef;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_StringDef;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_WstringDef;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_FixedDef;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_SequenceDef;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ArrayDef;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ExceptionDef;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ExceptionDescription;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_AttributeDef;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_AttributeDescription;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ParameterDescription;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ParDescriptionSeq;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ContextIdSeq;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ExceptionDefSeq;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ExcDescriptionSeq;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_OperationDef;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_OperationDescription;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_RepositoryIdSeq;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_OpDescriptionSeq;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_AttrDescriptionSeq;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_InterfaceDef;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_InterfaceDescription;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ValueMember;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ValueMemberSeq;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ValueMemberDef;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ValueDef;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ValueDescription;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ValueBoxDef;
-
-  enum PrimitiveKind
-  {
-    pk_null,
-    pk_void,
-    pk_short,
-    pk_long,
-    pk_ushort,
-    pk_ulong,
-    pk_float,
-    pk_double,
-    pk_boolean,
-    pk_char,
-    pk_octet,
-    pk_any,
-    pk_TypeCode,
-    pk_Principal,
-    pk_string,
-    pk_objref,
-    pk_longlong,
-    pk_ulonglong,
-    pk_longdouble,
-    pk_wchar,
-    pk_wstring
-  };
-   typedef PrimitiveKind &PrimitiveKind_out;
-   TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_PrimitiveKind;
-
-   enum AttributeMode
-  {
-    ATTR_NORMAL,
-    ATTR_READONLY
-  };
-  typedef AttributeMode &AttributeMode_out;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_AttributeMode;
-
-  enum OperationMode
-  {
-    OP_NORMAL,
-    OP_ONEWAY
-  };
-  typedef OperationMode &OperationMode_out;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_OperationMode;
-
-  enum ParameterMode
-  {
-    PARAM_IN,
-    PARAM_OUT,
-    PARAM_INOUT
-  };
-  typedef ParameterMode &ParameterMode_out;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ParameterMode;
-
-  typedef char * ContextIdentifier;
-  typedef CORBA::String_var ContextIdentifier_var;
-  typedef CORBA::String_out ContextIdentifier_out;
-  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ContextIdentifier;
+  TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_TypeCodeFactory;
 
   typedef CORBA::Short Visibility;
   typedef CORBA::Short_out Visibility_out;
@@ -1646,7 +1032,7 @@ TAO_NAMESPACE CORBA
   TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short VM_ABSTRACT;
   TAO_NAMESPACE_STORAGE_CLASS const CORBA::Short VM_TRUNCATABLE;
   // ================== Interface Repository =====================
-#endif /*TAO_HAS_INTERFACE_REPOSITORY */
+#endif /* TAO_HAS_INTERFACE_REPOSITORY */
   // There could be a single version of these methods, but g++ 2.7.2
   // gets horribly confused if we used CORBA::default_environment() at
   // this point.