ChangeLogTag: Tue Apr 24 18:35:31 2001 Jeff Parsons <parsons@cs.wustl.edu>

23 files changed, 9086 insertions, 2155 deletions

diff --git a/TAO/tao/IFR_Client/IFR_Base.pidl b/TAO/tao/IFR_Client/IFR_Base.pidl
index 31751a84ac9..07a72d6dd9a 100644
--- a/TAO/tao/IFR_Client/IFR_Base.pidl
+++ b/TAO/tao/IFR_Client/IFR_Base.pidl
@@ -46,9 +46,9 @@
 //   If this fails for some reason, the files must be patched
 //   by hand, and the diff files regenerated with
 //
-//      diff -wbu orig/IFR_BaseC.h IRR_BaseC.h > diffs/IFR_BaseC.h.diff
-//      diff -wbu orig/IFR_BaseC.i IRR_BaseC.i > diffs/IFR_BaseC.i.diff
-//      diff -wbu orig/IFR_BaseC.cpp IRR_BaseC.cpp > diffs/IFR_BaseC.cpp.diff
+//      diff -wbu orig/IFR_BaseC.h IFR_BaseC.h > diffs/IFR_BaseC.h.diff
+//      diff -wbu orig/IFR_BaseC.i IFR_BaseC.i > diffs/IFR_BaseC.i.diff
+//      diff -wbu orig/IFR_BaseC.cpp IFR_BaseC.cpp > diffs/IFR_BaseC.cpp.diff
 //
 //   5. Restore IFR_Base.pidl.
 //
diff --git a/TAO/tao/IFR_Client/IFR_BaseC.cpp b/TAO/tao/IFR_Client/IFR_BaseC.cpp
index e6629834115..99e0f7cd880 100644
--- a/TAO/tao/IFR_Client/IFR_BaseC.cpp
+++ b/TAO/tao/IFR_Client/IFR_BaseC.cpp
@@ -35,6 +35,49 @@
 #include "IFR_BaseC.i"
 #endif /* !defined INLINE */
 
+CORBA_IRObject_ptr
+tao_CORBA_IRObject_duplicate (
+    CORBA_IRObject_ptr p
+  )
+{
+  return CORBA_IRObject::_duplicate (p);
+}
+
+void
+tao_CORBA_IRObject_release (
+    CORBA_IRObject_ptr p
+  )
+{
+  CORBA::release (p);
+}
+
+CORBA_IRObject_ptr
+tao_CORBA_IRObject_nil (
+    void
+  )
+{
+  return CORBA_IRObject::_nil ();
+}
+
+CORBA_IRObject_ptr
+tao_CORBA_IRObject_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return CORBA_IRObject::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+tao_CORBA_IRObject_upcast (
+    void *src
+  )
+{
+  CORBA_IRObject **tmp =
+    ACE_static_cast (CORBA_IRObject **, src);
+  return *tmp;
+}
+
 // *************************************************************
 // Operations for class CORBA_IRObject_var
 // *************************************************************
@@ -925,6 +968,49 @@ void CORBA_IRObject::destroy (
     );
 }
 
+CORBA_Contained_ptr
+tao_CORBA_Contained_duplicate (
+    CORBA_Contained_ptr p
+  )
+{
+  return CORBA_Contained::_duplicate (p);
+}
+
+void
+tao_CORBA_Contained_release (
+    CORBA_Contained_ptr p
+  )
+{
+  CORBA::release (p);
+}
+
+CORBA_Contained_ptr
+tao_CORBA_Contained_nil (
+    void
+  )
+{
+  return CORBA_Contained::_nil ();
+}
+
+CORBA_Contained_ptr
+tao_CORBA_Contained_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return CORBA_Contained::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+tao_CORBA_Contained_upcast (
+    void *src
+  )
+{
+  CORBA_Contained **tmp =
+    ACE_static_cast (CORBA_Contained **, src);
+  return *tmp;
+}
+
 // *************************************************************
 // Operations for class CORBA_Contained_var
 // *************************************************************
@@ -5520,6 +5606,49 @@ void CORBA_EnumMemberSeq::_tao_any_destructor (void *x)
 
 #endif /* end #if !defined */
 
+CORBA_Container_ptr
+tao_CORBA_Container_duplicate (
+    CORBA_Container_ptr p
+  )
+{
+  return CORBA_Container::_duplicate (p);
+}
+
+void
+tao_CORBA_Container_release (
+    CORBA_Container_ptr p
+  )
+{
+  CORBA::release (p);
+}
+
+CORBA_Container_ptr
+tao_CORBA_Container_nil (
+    void
+  )
+{
+  return CORBA_Container::_nil ();
+}
+
+CORBA_Container_ptr
+tao_CORBA_Container_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return CORBA_Container::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+tao_CORBA_Container_upcast (
+    void *src
+  )
+{
+  CORBA_Container **tmp =
+    ACE_static_cast (CORBA_Container **, src);
+  return *tmp;
+}
+
 // *************************************************************
 // Operations for class CORBA_Container_var
 // *************************************************************
@@ -12193,6 +12322,49 @@ CORBA_LocalInterfaceDef_ptr CORBA_Container::create_local_interface (
     );
 }
 
+CORBA_IDLType_ptr
+tao_CORBA_IDLType_duplicate (
+    CORBA_IDLType_ptr p
+  )
+{
+  return CORBA_IDLType::_duplicate (p);
+}
+
+void
+tao_CORBA_IDLType_release (
+    CORBA_IDLType_ptr p
+  )
+{
+  CORBA::release (p);
+}
+
+CORBA_IDLType_ptr
+tao_CORBA_IDLType_nil (
+    void
+  )
+{
+  return CORBA_IDLType::_nil ();
+}
+
+CORBA_IDLType_ptr
+tao_CORBA_IDLType_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return CORBA_IDLType::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+tao_CORBA_IDLType_upcast (
+    void *src
+  )
+{
+  CORBA_IDLType **tmp =
+    ACE_static_cast (CORBA_IDLType **, src);
+  return *tmp;
+}
+
 // *************************************************************
 // Operations for class CORBA_IDLType_var
 // *************************************************************
@@ -12861,6 +13033,49 @@ CORBA::TypeCode_ptr CORBA_IDLType::type (
     );
 }
 
+CORBA_TypedefDef_ptr
+tao_CORBA_TypedefDef_duplicate (
+    CORBA_TypedefDef_ptr p
+  )
+{
+  return CORBA_TypedefDef::_duplicate (p);
+}
+
+void
+tao_CORBA_TypedefDef_release (
+    CORBA_TypedefDef_ptr p
+  )
+{
+  CORBA::release (p);
+}
+
+CORBA_TypedefDef_ptr
+tao_CORBA_TypedefDef_nil (
+    void
+  )
+{
+  return CORBA_TypedefDef::_nil ();
+}
+
+CORBA_TypedefDef_ptr
+tao_CORBA_TypedefDef_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return CORBA_TypedefDef::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+tao_CORBA_TypedefDef_upcast (
+    void *src
+  )
+{
+  CORBA_TypedefDef **tmp =
+    ACE_static_cast (CORBA_TypedefDef **, src);
+  return *tmp;
+}
+
 // *************************************************************
 // Operations for class CORBA_TypedefDef_var
 // *************************************************************
diff --git a/TAO/tao/IFR_Client/IFR_BaseC.h b/TAO/tao/IFR_Client/IFR_BaseC.h
index e1a1b02bd05..6d12d988c68 100644
--- a/TAO/tao/IFR_Client/IFR_BaseC.h
+++ b/TAO/tao/IFR_Client/IFR_BaseC.h
@@ -5254,407 +5254,407 @@ _TAO_CORBA_TypedefDef_Proxy_Broker *
     CORBA::Object_ptr obj
   );
 
-// External declarations for undefined interface
+// Declarations for undefined interface
 // CORBA_Repository
-extern TAO_IFR_Client_Export
+TAO_IFR_Client_Export
 CORBA_Repository_ptr
 tao_CORBA_Repository_duplicate (
     CORBA_Repository_ptr
   );
-extern TAO_IFR_Client_Export
+TAO_IFR_Client_Export
 void
 tao_CORBA_Repository_release (
     CORBA_Repository_ptr
   );
-extern TAO_IFR_Client_Export
+TAO_IFR_Client_Export
 CORBA_Repository_ptr
 tao_CORBA_Repository_nil (
     void
   );
-extern TAO_IFR_Client_Export
+TAO_IFR_Client_Export
 CORBA_Repository_ptr
 tao_CORBA_Repository_narrow (
     CORBA::Object *,
     CORBA::Environment &
   );
-extern TAO_IFR_Client_Export
+TAO_IFR_Client_Export
 CORBA::Object *
 tao_CORBA_Repository_upcast (
     void *
   );
 
-// External declarations for undefined interface
+// Declarations for undefined interface
 // CORBA_ModuleDef
-extern TAO_IFR_Client_Export
+TAO_IFR_Client_Export
 CORBA_ModuleDef_ptr
 tao_CORBA_ModuleDef_duplicate (
     CORBA_ModuleDef_ptr
   );
-extern TAO_IFR_Client_Export
+TAO_IFR_Client_Export
 void
 tao_CORBA_ModuleDef_release (
     CORBA_ModuleDef_ptr
   );
-extern TAO_IFR_Client_Export
+TAO_IFR_Client_Export
 CORBA_ModuleDef_ptr
 tao_CORBA_ModuleDef_nil (
     void
   );
-extern TAO_IFR_Client_Export
+TAO_IFR_Client_Export
 CORBA_ModuleDef_ptr
 tao_CORBA_ModuleDef_narrow (
     CORBA::Object *,
     CORBA::Environment &
   );
-extern TAO_IFR_Client_Export
+TAO_IFR_Client_Export
 CORBA::Object *
 tao_CORBA_ModuleDef_upcast (
     void *
   );
 
-// External declarations for undefined interface
+// Declarations for undefined interface
 // CORBA_ConstantDef
-extern TAO_IFR_Client_Export
+TAO_IFR_Client_Export
 CORBA_ConstantDef_ptr
 tao_CORBA_ConstantDef_duplicate (
     CORBA_ConstantDef_ptr
   );
-extern TAO_IFR_Client_Export
+TAO_IFR_Client_Export
 void
 tao_CORBA_ConstantDef_release (
     CORBA_ConstantDef_ptr
   );
-extern TAO_IFR_Client_Export
+TAO_IFR_Client_Export
 CORBA_ConstantDef_ptr
 tao_CORBA_ConstantDef_nil (
     void
   );
-extern TAO_IFR_Client_Export
+TAO_IFR_Client_Export
 CORBA_ConstantDef_ptr
 tao_CORBA_ConstantDef_narrow (
     CORBA::Object *,
     CORBA::Environment &
   );
-extern TAO_IFR_Client_Export
+TAO_IFR_Client_Export
 CORBA::Object *
 tao_CORBA_ConstantDef_upcast (
     void *
   );
 
-// External declarations for undefined interface
+// Declarations for undefined interface
 // CORBA_StructDef
-extern TAO_IFR_Client_Export
+TAO_IFR_Client_Export
 CORBA_StructDef_ptr
 tao_CORBA_StructDef_duplicate (
     CORBA_StructDef_ptr
   );
-extern TAO_IFR_Client_Export
+TAO_IFR_Client_Export
 void
 tao_CORBA_StructDef_release (
     CORBA_StructDef_ptr
   );
-extern TAO_IFR_Client_Export
+TAO_IFR_Client_Export
 CORBA_StructDef_ptr
 tao_CORBA_StructDef_nil (
     void
   );
-extern TAO_IFR_Client_Export
+TAO_IFR_Client_Export
 CORBA_StructDef_ptr
 tao_CORBA_StructDef_narrow (
     CORBA::Object *,
     CORBA::Environment &
   );
-extern TAO_IFR_Client_Export
+TAO_IFR_Client_Export
 CORBA::Object *
 tao_CORBA_StructDef_upcast (
     void *
   );
 
-// External declarations for undefined interface
+// Declarations for undefined interface
 // CORBA_UnionDef
-extern TAO_IFR_Client_Export
+TAO_IFR_Client_Export
 CORBA_UnionDef_ptr
 tao_CORBA_UnionDef_duplicate (
     CORBA_UnionDef_ptr
   );
-extern TAO_IFR_Client_Export
+TAO_IFR_Client_Export
 void
 tao_CORBA_UnionDef_release (
     CORBA_UnionDef_ptr
   );
-extern TAO_IFR_Client_Export
+TAO_IFR_Client_Export
 CORBA_UnionDef_ptr
 tao_CORBA_UnionDef_nil (
     void
   );
-extern TAO_IFR_Client_Export
+TAO_IFR_Client_Export
 CORBA_UnionDef_ptr
 tao_CORBA_UnionDef_narrow (
     CORBA::Object *,
     CORBA::Environment &
   );
-extern TAO_IFR_Client_Export
+TAO_IFR_Client_Export
 CORBA::Object *
 tao_CORBA_UnionDef_upcast (
     void *
   );
 
-// External declarations for undefined interface
+// Declarations for undefined interface
 // CORBA_EnumDef
-extern TAO_IFR_Client_Export
+TAO_IFR_Client_Export
 CORBA_EnumDef_ptr
 tao_CORBA_EnumDef_duplicate (
     CORBA_EnumDef_ptr
   );
-extern TAO_IFR_Client_Export
+TAO_IFR_Client_Export
 void
 tao_CORBA_EnumDef_release (
     CORBA_EnumDef_ptr
   );
-extern TAO_IFR_Client_Export
+TAO_IFR_Client_Export
 CORBA_EnumDef_ptr
 tao_CORBA_EnumDef_nil (
     void
   );
-extern TAO_IFR_Client_Export
+TAO_IFR_Client_Export
 CORBA_EnumDef_ptr
 tao_CORBA_EnumDef_narrow (
     CORBA::Object *,
     CORBA::Environment &
   );
-extern TAO_IFR_Client_Export
+TAO_IFR_Client_Export
 CORBA::Object *
 tao_CORBA_EnumDef_upcast (
     void *
   );
 
-// External declarations for undefined interface
+// Declarations for undefined interface
 // CORBA_AliasDef
-extern TAO_IFR_Client_Export
+TAO_IFR_Client_Export
 CORBA_AliasDef_ptr
 tao_CORBA_AliasDef_duplicate (
     CORBA_AliasDef_ptr
   );
-extern TAO_IFR_Client_Export
+TAO_IFR_Client_Export
 void
 tao_CORBA_AliasDef_release (
     CORBA_AliasDef_ptr
   );
-extern TAO_IFR_Client_Export
+TAO_IFR_Client_Export
 CORBA_AliasDef_ptr
 tao_CORBA_AliasDef_nil (
     void
   );
-extern TAO_IFR_Client_Export
+TAO_IFR_Client_Export
 CORBA_AliasDef_ptr
 tao_CORBA_AliasDef_narrow (
     CORBA::Object *,
     CORBA::Environment &
   );
-extern TAO_IFR_Client_Export
+TAO_IFR_Client_Export
 CORBA::Object *
 tao_CORBA_AliasDef_upcast (
     void *
   );
 
-// External declarations for undefined interface
+// Declarations for undefined interface
 // CORBA_InterfaceDef
-extern TAO_IFR_Client_Export
+TAO_IFR_Client_Export
 CORBA_InterfaceDef_ptr
 tao_CORBA_InterfaceDef_duplicate (
     CORBA_InterfaceDef_ptr
   );
-extern TAO_IFR_Client_Export
+TAO_IFR_Client_Export
 void
 tao_CORBA_InterfaceDef_release (
     CORBA_InterfaceDef_ptr
   );
-extern TAO_IFR_Client_Export
+TAO_IFR_Client_Export
 CORBA_InterfaceDef_ptr
 tao_CORBA_InterfaceDef_nil (
     void
   );
-extern TAO_IFR_Client_Export
+TAO_IFR_Client_Export
 CORBA_InterfaceDef_ptr
 tao_CORBA_InterfaceDef_narrow (
     CORBA::Object *,
     CORBA::Environment &
   );
-extern TAO_IFR_Client_Export
+TAO_IFR_Client_Export
 CORBA::Object *
 tao_CORBA_InterfaceDef_upcast (
     void *
   );
 
-// External declarations for undefined interface
+// Declarations for undefined interface
 // CORBA_ExceptionDef
-extern TAO_IFR_Client_Export
+TAO_IFR_Client_Export
 CORBA_ExceptionDef_ptr
 tao_CORBA_ExceptionDef_duplicate (
     CORBA_ExceptionDef_ptr
   );
-extern TAO_IFR_Client_Export
+TAO_IFR_Client_Export
 void
 tao_CORBA_ExceptionDef_release (
     CORBA_ExceptionDef_ptr
   );
-extern TAO_IFR_Client_Export
+TAO_IFR_Client_Export
 CORBA_ExceptionDef_ptr
 tao_CORBA_ExceptionDef_nil (
     void
   );
-extern TAO_IFR_Client_Export
+TAO_IFR_Client_Export
 CORBA_ExceptionDef_ptr
 tao_CORBA_ExceptionDef_narrow (
     CORBA::Object *,
     CORBA::Environment &
   );
-extern TAO_IFR_Client_Export
+TAO_IFR_Client_Export
 CORBA::Object *
 tao_CORBA_ExceptionDef_upcast (
     void *
   );
 
-// External declarations for undefined interface
+// Declarations for undefined interface
 // CORBA_NativeDef
-extern TAO_IFR_Client_Export
+TAO_IFR_Client_Export
 CORBA_NativeDef_ptr
 tao_CORBA_NativeDef_duplicate (
     CORBA_NativeDef_ptr
   );
-extern TAO_IFR_Client_Export
+TAO_IFR_Client_Export
 void
 tao_CORBA_NativeDef_release (
     CORBA_NativeDef_ptr
   );
-extern TAO_IFR_Client_Export
+TAO_IFR_Client_Export
 CORBA_NativeDef_ptr
 tao_CORBA_NativeDef_nil (
     void
   );
-extern TAO_IFR_Client_Export
+TAO_IFR_Client_Export
 CORBA_NativeDef_ptr
 tao_CORBA_NativeDef_narrow (
     CORBA::Object *,
     CORBA::Environment &
   );
-extern TAO_IFR_Client_Export
+TAO_IFR_Client_Export
 CORBA::Object *
 tao_CORBA_NativeDef_upcast (
     void *
   );
 
-// External declarations for undefined interface
+// Declarations for undefined interface
 // CORBA_ValueDef
-extern TAO_IFR_Client_Export
+TAO_IFR_Client_Export
 CORBA_ValueDef_ptr
 tao_CORBA_ValueDef_duplicate (
     CORBA_ValueDef_ptr
   );
-extern TAO_IFR_Client_Export
+TAO_IFR_Client_Export
 void
 tao_CORBA_ValueDef_release (
     CORBA_ValueDef_ptr
   );
-extern TAO_IFR_Client_Export
+TAO_IFR_Client_Export
 CORBA_ValueDef_ptr
 tao_CORBA_ValueDef_nil (
     void
   );
-extern TAO_IFR_Client_Export
+TAO_IFR_Client_Export
 CORBA_ValueDef_ptr
 tao_CORBA_ValueDef_narrow (
     CORBA::Object *,
     CORBA::Environment &
   );
-extern TAO_IFR_Client_Export
+TAO_IFR_Client_Export
 CORBA::Object *
 tao_CORBA_ValueDef_upcast (
     void *
   );
 
-// External declarations for undefined interface
+// Declarations for undefined interface
 // CORBA_ValueBoxDef
-extern TAO_IFR_Client_Export
+TAO_IFR_Client_Export
 CORBA_ValueBoxDef_ptr
 tao_CORBA_ValueBoxDef_duplicate (
     CORBA_ValueBoxDef_ptr
   );
-extern TAO_IFR_Client_Export
+TAO_IFR_Client_Export
 void
 tao_CORBA_ValueBoxDef_release (
     CORBA_ValueBoxDef_ptr
   );
-extern TAO_IFR_Client_Export
+TAO_IFR_Client_Export
 CORBA_ValueBoxDef_ptr
 tao_CORBA_ValueBoxDef_nil (
     void
   );
-extern TAO_IFR_Client_Export
+TAO_IFR_Client_Export
 CORBA_ValueBoxDef_ptr
 tao_CORBA_ValueBoxDef_narrow (
     CORBA::Object *,
     CORBA::Environment &
   );
-extern TAO_IFR_Client_Export
+TAO_IFR_Client_Export
 CORBA::Object *
 tao_CORBA_ValueBoxDef_upcast (
     void *
   );
 
-// External declarations for undefined interface
+// Declarations for undefined interface
 // CORBA_AbstractInterfaceDef
-extern TAO_IFR_Client_Export
+TAO_IFR_Client_Export
 CORBA_AbstractInterfaceDef_ptr
 tao_CORBA_AbstractInterfaceDef_duplicate (
     CORBA_AbstractInterfaceDef_ptr
   );
-extern TAO_IFR_Client_Export
+TAO_IFR_Client_Export
 void
 tao_CORBA_AbstractInterfaceDef_release (
     CORBA_AbstractInterfaceDef_ptr
   );
-extern TAO_IFR_Client_Export
+TAO_IFR_Client_Export
 CORBA_AbstractInterfaceDef_ptr
 tao_CORBA_AbstractInterfaceDef_nil (
     void
   );
-extern TAO_IFR_Client_Export
+TAO_IFR_Client_Export
 CORBA_AbstractInterfaceDef_ptr
 tao_CORBA_AbstractInterfaceDef_narrow (
     CORBA::Object *,
     CORBA::Environment &
   );
-extern TAO_IFR_Client_Export
+TAO_IFR_Client_Export
 CORBA::Object *
 tao_CORBA_AbstractInterfaceDef_upcast (
     void *
   );
 
-// External declarations for undefined interface
+// Declarations for undefined interface
 // CORBA_LocalInterfaceDef
-extern TAO_IFR_Client_Export
+TAO_IFR_Client_Export
 CORBA_LocalInterfaceDef_ptr
 tao_CORBA_LocalInterfaceDef_duplicate (
     CORBA_LocalInterfaceDef_ptr
   );
-extern TAO_IFR_Client_Export
+TAO_IFR_Client_Export
 void
 tao_CORBA_LocalInterfaceDef_release (
     CORBA_LocalInterfaceDef_ptr
   );
-extern TAO_IFR_Client_Export
+TAO_IFR_Client_Export
 CORBA_LocalInterfaceDef_ptr
 tao_CORBA_LocalInterfaceDef_nil (
     void
   );
-extern TAO_IFR_Client_Export
+TAO_IFR_Client_Export
 CORBA_LocalInterfaceDef_ptr
 tao_CORBA_LocalInterfaceDef_narrow (
     CORBA::Object *,
     CORBA::Environment &
   );
-extern TAO_IFR_Client_Export
+TAO_IFR_Client_Export
 CORBA::Object *
 tao_CORBA_LocalInterfaceDef_upcast (
     void *
diff --git a/TAO/tao/IFR_Client/IFR_BaseC.i b/TAO/tao/IFR_Client/IFR_BaseC.i
index 85b1fed5f0c..9121efdc2c9 100644
--- a/TAO/tao/IFR_Client/IFR_BaseC.i
+++ b/TAO/tao/IFR_Client/IFR_BaseC.i
@@ -23,49 +23,6 @@
 #if !defined (_CORBA_IROBJECT___CI_)
 #define _CORBA_IROBJECT___CI_
 
-ACE_INLINE CORBA_IRObject_ptr
-tao_CORBA_IRObject_duplicate (
-    CORBA_IRObject_ptr p
-  )
-{
-  return CORBA_IRObject::_duplicate (p);
-}
-
-ACE_INLINE void
-tao_CORBA_IRObject_release (
-    CORBA_IRObject_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-ACE_INLINE CORBA_IRObject_ptr
-tao_CORBA_IRObject_nil (
-    void
-  )
-{
-  return CORBA_IRObject::_nil ();
-}
-
-ACE_INLINE CORBA_IRObject_ptr
-tao_CORBA_IRObject_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return CORBA_IRObject::_narrow (p, ACE_TRY_ENV);
-}
-
-ACE_INLINE CORBA::Object *
-tao_CORBA_IRObject_upcast (
-    void *src
-  )
-{
-  CORBA_IRObject **tmp =
-    ACE_static_cast (CORBA_IRObject **, src);
-  return *tmp;
-}
-
 ACE_INLINE
 CORBA_IRObject::CORBA_IRObject (
     TAO_Stub *objref,
@@ -277,49 +234,6 @@ CORBA_Contained::Description_out::operator-> (void)
 #if !defined (_CORBA_CONTAINED___CI_)
 #define _CORBA_CONTAINED___CI_
 
-ACE_INLINE CORBA_Contained_ptr
-tao_CORBA_Contained_duplicate (
-    CORBA_Contained_ptr p
-  )
-{
-  return CORBA_Contained::_duplicate (p);
-}
-
-ACE_INLINE void
-tao_CORBA_Contained_release (
-    CORBA_Contained_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-ACE_INLINE CORBA_Contained_ptr
-tao_CORBA_Contained_nil (
-    void
-  )
-{
-  return CORBA_Contained::_nil ();
-}
-
-ACE_INLINE CORBA_Contained_ptr
-tao_CORBA_Contained_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return CORBA_Contained::_narrow (p, ACE_TRY_ENV);
-}
-
-ACE_INLINE CORBA::Object *
-tao_CORBA_Contained_upcast (
-    void *src
-  )
-{
-  CORBA_Contained **tmp =
-    ACE_static_cast (CORBA_Contained **, src);
-  return *tmp;
-}
-
 ACE_INLINE
 CORBA_Contained::CORBA_Contained (
     TAO_Stub *objref,
@@ -4768,49 +4682,6 @@ CORBA_Container::DescriptionSeq_out::operator[] (CORBA::ULong index)
 #if !defined (_CORBA_CONTAINER___CI_)
 #define _CORBA_CONTAINER___CI_
 
-ACE_INLINE CORBA_Container_ptr
-tao_CORBA_Container_duplicate (
-    CORBA_Container_ptr p
-  )
-{
-  return CORBA_Container::_duplicate (p);
-}
-
-ACE_INLINE void
-tao_CORBA_Container_release (
-    CORBA_Container_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-ACE_INLINE CORBA_Container_ptr
-tao_CORBA_Container_nil (
-    void
-  )
-{
-  return CORBA_Container::_nil ();
-}
-
-ACE_INLINE CORBA_Container_ptr
-tao_CORBA_Container_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return CORBA_Container::_narrow (p, ACE_TRY_ENV);
-}
-
-ACE_INLINE CORBA::Object *
-tao_CORBA_Container_upcast (
-    void *src
-  )
-{
-  CORBA_Container **tmp =
-    ACE_static_cast (CORBA_Container **, src);
-  return *tmp;
-}
-
 ACE_INLINE
 CORBA_Container::CORBA_Container (
     TAO_Stub *objref,
@@ -4829,49 +4700,6 @@ CORBA_Container::CORBA_Container (
 #if !defined (_CORBA_IDLTYPE___CI_)
 #define _CORBA_IDLTYPE___CI_
 
-ACE_INLINE CORBA_IDLType_ptr
-tao_CORBA_IDLType_duplicate (
-    CORBA_IDLType_ptr p
-  )
-{
-  return CORBA_IDLType::_duplicate (p);
-}
-
-ACE_INLINE void
-tao_CORBA_IDLType_release (
-    CORBA_IDLType_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-ACE_INLINE CORBA_IDLType_ptr
-tao_CORBA_IDLType_nil (
-    void
-  )
-{
-  return CORBA_IDLType::_nil ();
-}
-
-ACE_INLINE CORBA_IDLType_ptr
-tao_CORBA_IDLType_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return CORBA_IDLType::_narrow (p, ACE_TRY_ENV);
-}
-
-ACE_INLINE CORBA::Object *
-tao_CORBA_IDLType_upcast (
-    void *src
-  )
-{
-  CORBA_IDLType **tmp =
-    ACE_static_cast (CORBA_IDLType **, src);
-  return *tmp;
-}
-
 ACE_INLINE
 CORBA_IDLType::CORBA_IDLType (
     TAO_Stub *objref,
@@ -4890,49 +4718,6 @@ CORBA_IDLType::CORBA_IDLType (
 #if !defined (_CORBA_TYPEDEFDEF___CI_)
 #define _CORBA_TYPEDEFDEF___CI_
 
-ACE_INLINE CORBA_TypedefDef_ptr
-tao_CORBA_TypedefDef_duplicate (
-    CORBA_TypedefDef_ptr p
-  )
-{
-  return CORBA_TypedefDef::_duplicate (p);
-}
-
-ACE_INLINE void
-tao_CORBA_TypedefDef_release (
-    CORBA_TypedefDef_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-ACE_INLINE CORBA_TypedefDef_ptr
-tao_CORBA_TypedefDef_nil (
-    void
-  )
-{
-  return CORBA_TypedefDef::_nil ();
-}
-
-ACE_INLINE CORBA_TypedefDef_ptr
-tao_CORBA_TypedefDef_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return CORBA_TypedefDef::_narrow (p, ACE_TRY_ENV);
-}
-
-ACE_INLINE CORBA::Object *
-tao_CORBA_TypedefDef_upcast (
-    void *src
-  )
-{
-  CORBA_TypedefDef **tmp =
-    ACE_static_cast (CORBA_TypedefDef **, src);
-  return *tmp;
-}
-
 ACE_INLINE
 CORBA_TypedefDef::CORBA_TypedefDef (
     TAO_Stub *objref,
diff --git a/TAO/tao/IFR_Client/IFR_BasicC.cpp b/TAO/tao/IFR_Client/IFR_BasicC.cpp
index 35e0b2c56d6..0fd42fdbd01 100644
--- a/TAO/tao/IFR_Client/IFR_BasicC.cpp
+++ b/TAO/tao/IFR_Client/IFR_BasicC.cpp
@@ -36,6 +36,49 @@
 #include "IFR_BasicC.i"
 #endif /* !defined INLINE */
 
+CORBA_Repository_ptr
+tao_CORBA_Repository_duplicate (
+    CORBA_Repository_ptr p
+  )
+{
+  return CORBA_Repository::_duplicate (p);
+}
+
+void
+tao_CORBA_Repository_release (
+    CORBA_Repository_ptr p
+  )
+{
+  CORBA::release (p);
+}
+
+CORBA_Repository_ptr
+tao_CORBA_Repository_nil (
+    void
+  )
+{
+  return CORBA_Repository::_nil ();
+}
+
+CORBA_Repository_ptr
+tao_CORBA_Repository_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return CORBA_Repository::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+tao_CORBA_Repository_upcast (
+    void *src
+  )
+{
+  CORBA_Repository **tmp =
+    ACE_static_cast (CORBA_Repository **, src);
+  return *tmp;
+}
+
 // *************************************************************
 // Operations for class CORBA_Repository_var
 // *************************************************************
@@ -457,14 +500,14 @@ public:
     )
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void result (CORBA::PrimitiveDef_ptr result);
+  void result (CORBA_PrimitiveDef_ptr result);
 
 private:
   TAO_ClientRequestInfo_CORBA_Repository_get_primitive (const TAO_ClientRequestInfo_CORBA_Repository_get_primitive &);
   void operator= (const TAO_ClientRequestInfo_CORBA_Repository_get_primitive &);
 
   const CORBA::PrimitiveKind & kind_;
-  CORBA::PrimitiveDef_ptr _result;
+  CORBA_PrimitiveDef_ptr _result;
 };
 
 TAO_ClientRequestInfo_CORBA_Repository_get_primitive::TAO_ClientRequestInfo_CORBA_Repository_get_primitive (
@@ -527,7 +570,7 @@ TAO_ClientRequestInfo_CORBA_Repository_get_primitive::result (CORBA::Environment
 }
 
 void 
-TAO_ClientRequestInfo_CORBA_Repository_get_primitive::result (CORBA::PrimitiveDef_ptr result)
+TAO_ClientRequestInfo_CORBA_Repository_get_primitive::result (CORBA_PrimitiveDef_ptr result)
 {
   // update the result 
   this->_result = result;
@@ -1440,7 +1483,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::get_canonical_typec
   return _tao_safe_retval._retn ();
 }
 
-CORBA::PrimitiveDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::get_primitive (
+CORBA_PrimitiveDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::get_primitive (
     CORBA_Object *_collocated_tao_target_,
     CORBA::PrimitiveKind kind,
     CORBA::Environment &ACE_TRY_ENV
@@ -1450,7 +1493,7 @@ CORBA::PrimitiveDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::get_primitive (
   ))
 {
   
-  CORBA::PrimitiveDef_ptr _tao_retval = CORBA_PrimitiveDef::_nil ();
+  CORBA_PrimitiveDef_ptr _tao_retval = CORBA_PrimitiveDef::_nil ();
   CORBA_PrimitiveDef_var _tao_safe_retval (_tao_retval);
   
   
@@ -1546,7 +1589,7 @@ CORBA::PrimitiveDef_ptr _TAO_CORBA_Repository_Remote_Proxy_Impl::get_primitive (
             }
           
           TAO_INTERCEPTOR (
-              CORBA::PrimitiveDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
+              CORBA_PrimitiveDef_ptr _tao_retval_info = _tao_safe_retval._retn ();
               ri.result (_tao_retval_info);
               _tao_safe_retval = _tao_retval_info;
             );
@@ -2732,7 +2775,7 @@ CORBA::TypeCode_ptr CORBA_Repository::get_canonical_typecode (
     );
 }
 
-CORBA::PrimitiveDef_ptr CORBA_Repository::get_primitive (
+CORBA_PrimitiveDef_ptr CORBA_Repository::get_primitive (
     CORBA::PrimitiveKind kind,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -2852,6 +2895,49 @@ CORBA_FixedDef_ptr CORBA_Repository::create_fixed (
     );
 }
 
+CORBA_ModuleDef_ptr
+tao_CORBA_ModuleDef_duplicate (
+    CORBA_ModuleDef_ptr p
+  )
+{
+  return CORBA_ModuleDef::_duplicate (p);
+}
+
+void
+tao_CORBA_ModuleDef_release (
+    CORBA_ModuleDef_ptr p
+  )
+{
+  CORBA::release (p);
+}
+
+CORBA_ModuleDef_ptr
+tao_CORBA_ModuleDef_nil (
+    void
+  )
+{
+  return CORBA_ModuleDef::_nil ();
+}
+
+CORBA_ModuleDef_ptr
+tao_CORBA_ModuleDef_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return CORBA_ModuleDef::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+tao_CORBA_ModuleDef_upcast (
+    void *src
+  )
+{
+  CORBA_ModuleDef **tmp =
+    ACE_static_cast (CORBA_ModuleDef **, src);
+  return *tmp;
+}
+
 // *************************************************************
 // Operations for class CORBA_ModuleDef_var
 // *************************************************************
@@ -3284,6 +3370,49 @@ void CORBA_ModuleDescription::_tao_any_destructor (void *x)
   delete tmp;
 }
 
+CORBA_ConstantDef_ptr
+tao_CORBA_ConstantDef_duplicate (
+    CORBA_ConstantDef_ptr p
+  )
+{
+  return CORBA_ConstantDef::_duplicate (p);
+}
+
+void
+tao_CORBA_ConstantDef_release (
+    CORBA_ConstantDef_ptr p
+  )
+{
+  CORBA::release (p);
+}
+
+CORBA_ConstantDef_ptr
+tao_CORBA_ConstantDef_nil (
+    void
+  )
+{
+  return CORBA_ConstantDef::_nil ();
+}
+
+CORBA_ConstantDef_ptr
+tao_CORBA_ConstantDef_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return CORBA_ConstantDef::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+tao_CORBA_ConstantDef_upcast (
+    void *src
+  )
+{
+  CORBA_ConstantDef **tmp =
+    ACE_static_cast (CORBA_ConstantDef **, src);
+  return *tmp;
+}
+
 // *************************************************************
 // Operations for class CORBA_ConstantDef_var
 // *************************************************************
@@ -5039,6 +5168,49 @@ void CORBA_ConstantDescription::_tao_any_destructor (void *x)
   delete tmp;
 }
 
+CORBA_StructDef_ptr
+tao_CORBA_StructDef_duplicate (
+    CORBA_StructDef_ptr p
+  )
+{
+  return CORBA_StructDef::_duplicate (p);
+}
+
+void
+tao_CORBA_StructDef_release (
+    CORBA_StructDef_ptr p
+  )
+{
+  CORBA::release (p);
+}
+
+CORBA_StructDef_ptr
+tao_CORBA_StructDef_nil (
+    void
+  )
+{
+  return CORBA_StructDef::_nil ();
+}
+
+CORBA_StructDef_ptr
+tao_CORBA_StructDef_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return CORBA_StructDef::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+tao_CORBA_StructDef_upcast (
+    void *src
+  )
+{
+  CORBA_StructDef **tmp =
+    ACE_static_cast (CORBA_StructDef **, src);
+  return *tmp;
+}
+
 // *************************************************************
 // Operations for class CORBA_StructDef_var
 // *************************************************************
@@ -6026,6 +6198,49 @@ void CORBA_StructDef::members (
     );
 }
 
+CORBA_UnionDef_ptr
+tao_CORBA_UnionDef_duplicate (
+    CORBA_UnionDef_ptr p
+  )
+{
+  return CORBA_UnionDef::_duplicate (p);
+}
+
+void
+tao_CORBA_UnionDef_release (
+    CORBA_UnionDef_ptr p
+  )
+{
+  CORBA::release (p);
+}
+
+CORBA_UnionDef_ptr
+tao_CORBA_UnionDef_nil (
+    void
+  )
+{
+  return CORBA_UnionDef::_nil ();
+}
+
+CORBA_UnionDef_ptr
+tao_CORBA_UnionDef_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return CORBA_UnionDef::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+tao_CORBA_UnionDef_upcast (
+    void *src
+  )
+{
+  CORBA_UnionDef **tmp =
+    ACE_static_cast (CORBA_UnionDef **, src);
+  return *tmp;
+}
+
 // *************************************************************
 // Operations for class CORBA_UnionDef_var
 // *************************************************************
@@ -7817,6 +8032,49 @@ void CORBA_UnionDef::members (
     );
 }
 
+CORBA_EnumDef_ptr
+tao_CORBA_EnumDef_duplicate (
+    CORBA_EnumDef_ptr p
+  )
+{
+  return CORBA_EnumDef::_duplicate (p);
+}
+
+void
+tao_CORBA_EnumDef_release (
+    CORBA_EnumDef_ptr p
+  )
+{
+  CORBA::release (p);
+}
+
+CORBA_EnumDef_ptr
+tao_CORBA_EnumDef_nil (
+    void
+  )
+{
+  return CORBA_EnumDef::_nil ();
+}
+
+CORBA_EnumDef_ptr
+tao_CORBA_EnumDef_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return CORBA_EnumDef::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+tao_CORBA_EnumDef_upcast (
+    void *src
+  )
+{
+  CORBA_EnumDef **tmp =
+    ACE_static_cast (CORBA_EnumDef **, src);
+  return *tmp;
+}
+
 // *************************************************************
 // Operations for class CORBA_EnumDef_var
 // *************************************************************
@@ -8789,6 +9047,49 @@ void CORBA_EnumDef::members (
     );
 }
 
+CORBA_AliasDef_ptr
+tao_CORBA_AliasDef_duplicate (
+    CORBA_AliasDef_ptr p
+  )
+{
+  return CORBA_AliasDef::_duplicate (p);
+}
+
+void
+tao_CORBA_AliasDef_release (
+    CORBA_AliasDef_ptr p
+  )
+{
+  CORBA::release (p);
+}
+
+CORBA_AliasDef_ptr
+tao_CORBA_AliasDef_nil (
+    void
+  )
+{
+  return CORBA_AliasDef::_nil ();
+}
+
+CORBA_AliasDef_ptr
+tao_CORBA_AliasDef_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return CORBA_AliasDef::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+tao_CORBA_AliasDef_upcast (
+    void *src
+  )
+{
+  CORBA_AliasDef **tmp =
+    ACE_static_cast (CORBA_AliasDef **, src);
+  return *tmp;
+}
+
 // *************************************************************
 // Operations for class CORBA_AliasDef_var
 // *************************************************************
@@ -9760,6 +10061,49 @@ void CORBA_AliasDef::original_type_def (
     );
 }
 
+CORBA_NativeDef_ptr
+tao_CORBA_NativeDef_duplicate (
+    CORBA_NativeDef_ptr p
+  )
+{
+  return CORBA_NativeDef::_duplicate (p);
+}
+
+void
+tao_CORBA_NativeDef_release (
+    CORBA_NativeDef_ptr p
+  )
+{
+  CORBA::release (p);
+}
+
+CORBA_NativeDef_ptr
+tao_CORBA_NativeDef_nil (
+    void
+  )
+{
+  return CORBA_NativeDef::_nil ();
+}
+
+CORBA_NativeDef_ptr
+tao_CORBA_NativeDef_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return CORBA_NativeDef::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+tao_CORBA_NativeDef_upcast (
+    void *src
+  )
+{
+  CORBA_NativeDef **tmp =
+    ACE_static_cast (CORBA_NativeDef **, src);
+  return *tmp;
+}
+
 // *************************************************************
 // Operations for class CORBA_NativeDef_var
 // *************************************************************
@@ -10197,6 +10541,49 @@ const char* CORBA_NativeDef::_interface_repository_id (void) const
   return "IDL:omg.org/CORBA/NativeDef:1.0";
 }
 
+CORBA_PrimitiveDef_ptr
+tao_CORBA_PrimitiveDef_duplicate (
+    CORBA_PrimitiveDef_ptr p
+  )
+{
+  return CORBA_PrimitiveDef::_duplicate (p);
+}
+
+void
+tao_CORBA_PrimitiveDef_release (
+    CORBA_PrimitiveDef_ptr p
+  )
+{
+  CORBA::release (p);
+}
+
+CORBA_PrimitiveDef_ptr
+tao_CORBA_PrimitiveDef_nil (
+    void
+  )
+{
+  return CORBA_PrimitiveDef::_nil ();
+}
+
+CORBA_PrimitiveDef_ptr
+tao_CORBA_PrimitiveDef_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return CORBA_PrimitiveDef::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+tao_CORBA_PrimitiveDef_upcast (
+    void *src
+  )
+{
+  CORBA_PrimitiveDef **tmp =
+    ACE_static_cast (CORBA_PrimitiveDef **, src);
+  return *tmp;
+}
+
 // *************************************************************
 // Operations for class CORBA_PrimitiveDef_var
 // *************************************************************
@@ -10205,7 +10592,7 @@ CORBA_PrimitiveDef_var::CORBA_PrimitiveDef_var (void) // default constructor
   : ptr_ (CORBA_PrimitiveDef::_nil ())
 {}
 
-::CORBA::PrimitiveDef_ptr
+::CORBA_PrimitiveDef_ptr
 CORBA_PrimitiveDef_var::ptr (void) const
 {
   return this->ptr_;
@@ -10222,7 +10609,7 @@ CORBA_PrimitiveDef_var::~CORBA_PrimitiveDef_var (void) // destructor
 }
 
 CORBA_PrimitiveDef_var &
-CORBA_PrimitiveDef_var::operator= (CORBA::PrimitiveDef_ptr p)
+CORBA_PrimitiveDef_var::operator= (CORBA_PrimitiveDef_ptr p)
 {
   CORBA::release (this->ptr_);
   this->ptr_ = p;
@@ -10240,35 +10627,35 @@ CORBA_PrimitiveDef_var::operator= (const ::CORBA_PrimitiveDef_var &p)
   return *this;
 }
 
-CORBA_PrimitiveDef_var::operator const ::CORBA::PrimitiveDef_ptr &() const // cast
+CORBA_PrimitiveDef_var::operator const ::CORBA_PrimitiveDef_ptr &() const // cast
 {
   return this->ptr_;
 }
 
-CORBA_PrimitiveDef_var::operator ::CORBA::PrimitiveDef_ptr &() // cast 
+CORBA_PrimitiveDef_var::operator ::CORBA_PrimitiveDef_ptr &() // cast 
 {
   return this->ptr_;
 }
 
-::CORBA::PrimitiveDef_ptr
+::CORBA_PrimitiveDef_ptr
 CORBA_PrimitiveDef_var::operator-> (void) const
 {
   return this->ptr_;
 }
 
-::CORBA::PrimitiveDef_ptr
+::CORBA_PrimitiveDef_ptr
 CORBA_PrimitiveDef_var::in (void) const
 {
   return this->ptr_;
 }
 
-::CORBA::PrimitiveDef_ptr &
+::CORBA_PrimitiveDef_ptr &
 CORBA_PrimitiveDef_var::inout (void)
 {
   return this->ptr_;
 }
 
-::CORBA::PrimitiveDef_ptr &
+::CORBA_PrimitiveDef_ptr &
 CORBA_PrimitiveDef_var::out (void)
 {
   CORBA::release (this->ptr_);
@@ -10276,34 +10663,34 @@ CORBA_PrimitiveDef_var::out (void)
   return this->ptr_;
 }
 
-::CORBA::PrimitiveDef_ptr
+::CORBA_PrimitiveDef_ptr
 CORBA_PrimitiveDef_var::_retn (void)
 {
   // yield ownership of managed obj reference
-  ::CORBA::PrimitiveDef_ptr val = this->ptr_;
+  ::CORBA_PrimitiveDef_ptr val = this->ptr_;
   this->ptr_ = ::CORBA_PrimitiveDef::_nil ();
   return val;
 }
 
-::CORBA::PrimitiveDef_ptr
-CORBA_PrimitiveDef_var::duplicate (CORBA::PrimitiveDef_ptr p)
+::CORBA_PrimitiveDef_ptr
+CORBA_PrimitiveDef_var::duplicate (CORBA_PrimitiveDef_ptr p)
 {
   return ::CORBA_PrimitiveDef::_duplicate (p);
 }
 
 void
-CORBA_PrimitiveDef_var::release (CORBA::PrimitiveDef_ptr p)
+CORBA_PrimitiveDef_var::release (CORBA_PrimitiveDef_ptr p)
 {
   CORBA::release (p);
 }
 
-::CORBA::PrimitiveDef_ptr
+::CORBA_PrimitiveDef_ptr
 CORBA_PrimitiveDef_var::nil (void)
 {
   return ::CORBA_PrimitiveDef::_nil ();
 }
 
-::CORBA::PrimitiveDef_ptr
+::CORBA_PrimitiveDef_ptr
 CORBA_PrimitiveDef_var::narrow (
     CORBA::Object *p,
     CORBA::Environment &ACE_TRY_ENV
@@ -10324,7 +10711,7 @@ CORBA_PrimitiveDef_var::upcast (void *src)
 // Inline operations for class CORBA_PrimitiveDef_out
 // *************************************************************
 
-CORBA_PrimitiveDef_out::CORBA_PrimitiveDef_out (CORBA::PrimitiveDef_ptr &p)
+CORBA_PrimitiveDef_out::CORBA_PrimitiveDef_out (CORBA_PrimitiveDef_ptr &p)
   : ptr_ (p)
 {
   this->ptr_ = ::CORBA_PrimitiveDef::_nil ();
@@ -10356,24 +10743,24 @@ CORBA_PrimitiveDef_out::operator= (const ::CORBA_PrimitiveDef_var &p)
 }
 
 CORBA_PrimitiveDef_out &
-CORBA_PrimitiveDef_out::operator= (CORBA::PrimitiveDef_ptr p)
+CORBA_PrimitiveDef_out::operator= (CORBA_PrimitiveDef_ptr p)
 {
   this->ptr_ = p;
   return *this;
 }
 
-CORBA_PrimitiveDef_out::operator ::CORBA::PrimitiveDef_ptr &() // cast
+CORBA_PrimitiveDef_out::operator ::CORBA_PrimitiveDef_ptr &() // cast
 {
   return this->ptr_;
 }
 
-::CORBA::PrimitiveDef_ptr &
+::CORBA_PrimitiveDef_ptr &
 CORBA_PrimitiveDef_out::ptr (void) // ptr
 {
   return this->ptr_;
 }
 
-::CORBA::PrimitiveDef_ptr
+::CORBA_PrimitiveDef_ptr
 CORBA_PrimitiveDef_out::operator-> (void)
 {
   return this->ptr_;
@@ -10728,7 +11115,7 @@ void CORBA_PrimitiveDef::_tao_any_destructor (void *x)
   CORBA::release (tmp);
 }
 
-CORBA::PrimitiveDef_ptr CORBA_PrimitiveDef::_narrow (
+CORBA_PrimitiveDef_ptr CORBA_PrimitiveDef::_narrow (
     CORBA::Object_ptr obj,
     CORBA::Environment &ACE_TRY_ENV
   )
@@ -10745,7 +11132,7 @@ CORBA::PrimitiveDef_ptr CORBA_PrimitiveDef::_narrow (
   return CORBA_PrimitiveDef::_unchecked_narrow (obj, ACE_TRY_ENV);
 }
 
-CORBA::PrimitiveDef_ptr CORBA_PrimitiveDef::_unchecked_narrow (
+CORBA_PrimitiveDef_ptr CORBA_PrimitiveDef::_unchecked_narrow (
     CORBA::Object_ptr obj,
     CORBA::Environment &
   )
@@ -10757,7 +11144,7 @@ CORBA::PrimitiveDef_ptr CORBA_PrimitiveDef::_unchecked_narrow (
       TAO_Stub* stub = obj->_stubobj ();
       if (stub)
         stub->_incr_refcnt ();
-      CORBA::PrimitiveDef_ptr default_proxy = CORBA_PrimitiveDef::_nil ();
+      CORBA_PrimitiveDef_ptr default_proxy = CORBA_PrimitiveDef::_nil ();
 
       if (
           !CORBA::is_nil (stub->servant_orb_var ().ptr ()) &&
@@ -10782,7 +11169,7 @@ CORBA::PrimitiveDef_ptr CORBA_PrimitiveDef::_unchecked_narrow (
       return
         ACE_reinterpret_cast
           (
-            CORBA::PrimitiveDef_ptr,
+            CORBA_PrimitiveDef_ptr,
               obj->_tao_QueryInterface
                 (
                   ACE_reinterpret_cast
@@ -10794,8 +11181,8 @@ CORBA::PrimitiveDef_ptr CORBA_PrimitiveDef::_unchecked_narrow (
           );
 }
 
-CORBA::PrimitiveDef_ptr
-CORBA_PrimitiveDef::_duplicate (CORBA::PrimitiveDef_ptr obj)
+CORBA_PrimitiveDef_ptr
+CORBA_PrimitiveDef::_duplicate (CORBA_PrimitiveDef_ptr obj)
 {
   if (!CORBA::is_nil (obj))
     obj->_add_ref ();
@@ -10876,6 +11263,49 @@ CORBA::PrimitiveKind CORBA_PrimitiveDef::kind (
     );
 }
 
+CORBA_StringDef_ptr
+tao_CORBA_StringDef_duplicate (
+    CORBA_StringDef_ptr p
+  )
+{
+  return CORBA_StringDef::_duplicate (p);
+}
+
+void
+tao_CORBA_StringDef_release (
+    CORBA_StringDef_ptr p
+  )
+{
+  CORBA::release (p);
+}
+
+CORBA_StringDef_ptr
+tao_CORBA_StringDef_nil (
+    void
+  )
+{
+  return CORBA_StringDef::_nil ();
+}
+
+CORBA_StringDef_ptr
+tao_CORBA_StringDef_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return CORBA_StringDef::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+tao_CORBA_StringDef_upcast (
+    void *src
+  )
+{
+  CORBA_StringDef **tmp =
+    ACE_static_cast (CORBA_StringDef **, src);
+  return *tmp;
+}
+
 // *************************************************************
 // Operations for class CORBA_StringDef_var
 // *************************************************************
@@ -11818,6 +12248,49 @@ void CORBA_StringDef::bound (
     );
 }
 
+CORBA_WstringDef_ptr
+tao_CORBA_WstringDef_duplicate (
+    CORBA_WstringDef_ptr p
+  )
+{
+  return CORBA_WstringDef::_duplicate (p);
+}
+
+void
+tao_CORBA_WstringDef_release (
+    CORBA_WstringDef_ptr p
+  )
+{
+  CORBA::release (p);
+}
+
+CORBA_WstringDef_ptr
+tao_CORBA_WstringDef_nil (
+    void
+  )
+{
+  return CORBA_WstringDef::_nil ();
+}
+
+CORBA_WstringDef_ptr
+tao_CORBA_WstringDef_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return CORBA_WstringDef::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+tao_CORBA_WstringDef_upcast (
+    void *src
+  )
+{
+  CORBA_WstringDef **tmp =
+    ACE_static_cast (CORBA_WstringDef **, src);
+  return *tmp;
+}
+
 // *************************************************************
 // Operations for class CORBA_WstringDef_var
 // *************************************************************
@@ -12760,6 +13233,49 @@ void CORBA_WstringDef::bound (
     );
 }
 
+CORBA_SequenceDef_ptr
+tao_CORBA_SequenceDef_duplicate (
+    CORBA_SequenceDef_ptr p
+  )
+{
+  return CORBA_SequenceDef::_duplicate (p);
+}
+
+void
+tao_CORBA_SequenceDef_release (
+    CORBA_SequenceDef_ptr p
+  )
+{
+  CORBA::release (p);
+}
+
+CORBA_SequenceDef_ptr
+tao_CORBA_SequenceDef_nil (
+    void
+  )
+{
+  return CORBA_SequenceDef::_nil ();
+}
+
+CORBA_SequenceDef_ptr
+tao_CORBA_SequenceDef_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return CORBA_SequenceDef::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+tao_CORBA_SequenceDef_upcast (
+    void *src
+  )
+{
+  CORBA_SequenceDef **tmp =
+    ACE_static_cast (CORBA_SequenceDef **, src);
+  return *tmp;
+}
+
 // *************************************************************
 // Operations for class CORBA_SequenceDef_var
 // *************************************************************
@@ -14506,6 +15022,49 @@ void CORBA_SequenceDef::element_type_def (
     );
 }
 
+CORBA_ArrayDef_ptr
+tao_CORBA_ArrayDef_duplicate (
+    CORBA_ArrayDef_ptr p
+  )
+{
+  return CORBA_ArrayDef::_duplicate (p);
+}
+
+void
+tao_CORBA_ArrayDef_release (
+    CORBA_ArrayDef_ptr p
+  )
+{
+  CORBA::release (p);
+}
+
+CORBA_ArrayDef_ptr
+tao_CORBA_ArrayDef_nil (
+    void
+  )
+{
+  return CORBA_ArrayDef::_nil ();
+}
+
+CORBA_ArrayDef_ptr
+tao_CORBA_ArrayDef_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return CORBA_ArrayDef::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+tao_CORBA_ArrayDef_upcast (
+    void *src
+  )
+{
+  CORBA_ArrayDef **tmp =
+    ACE_static_cast (CORBA_ArrayDef **, src);
+  return *tmp;
+}
+
 // *************************************************************
 // Operations for class CORBA_ArrayDef_var
 // *************************************************************
@@ -16252,6 +16811,49 @@ void CORBA_ArrayDef::element_type_def (
     );
 }
 
+CORBA_ExceptionDef_ptr
+tao_CORBA_ExceptionDef_duplicate (
+    CORBA_ExceptionDef_ptr p
+  )
+{
+  return CORBA_ExceptionDef::_duplicate (p);
+}
+
+void
+tao_CORBA_ExceptionDef_release (
+    CORBA_ExceptionDef_ptr p
+  )
+{
+  CORBA::release (p);
+}
+
+CORBA_ExceptionDef_ptr
+tao_CORBA_ExceptionDef_nil (
+    void
+  )
+{
+  return CORBA_ExceptionDef::_nil ();
+}
+
+CORBA_ExceptionDef_ptr
+tao_CORBA_ExceptionDef_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return CORBA_ExceptionDef::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+tao_CORBA_ExceptionDef_upcast (
+    void *src
+  )
+{
+  CORBA_ExceptionDef **tmp =
+    ACE_static_cast (CORBA_ExceptionDef **, src);
+  return *tmp;
+}
+
 // *************************************************************
 // Operations for class CORBA_ExceptionDef_var
 // *************************************************************
@@ -17725,6 +18327,49 @@ void CORBA_ExcDescriptionSeq::_tao_any_destructor (void *x)
 
 #endif /* end #if !defined */
 
+CORBA_AttributeDef_ptr
+tao_CORBA_AttributeDef_duplicate (
+    CORBA_AttributeDef_ptr p
+  )
+{
+  return CORBA_AttributeDef::_duplicate (p);
+}
+
+void
+tao_CORBA_AttributeDef_release (
+    CORBA_AttributeDef_ptr p
+  )
+{
+  CORBA::release (p);
+}
+
+CORBA_AttributeDef_ptr
+tao_CORBA_AttributeDef_nil (
+    void
+  )
+{
+  return CORBA_AttributeDef::_nil ();
+}
+
+CORBA_AttributeDef_ptr
+tao_CORBA_AttributeDef_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return CORBA_AttributeDef::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+tao_CORBA_AttributeDef_upcast (
+    void *src
+  )
+{
+  CORBA_AttributeDef **tmp =
+    ACE_static_cast (CORBA_AttributeDef **, src);
+  return *tmp;
+}
+
 // *************************************************************
 // Operations for class CORBA_AttributeDef_var
 // *************************************************************
@@ -19627,6 +20272,49 @@ void CORBA_ContextIdSeq::_tao_any_destructor (void *x)
 
 #endif /* end #if !defined */
 
+CORBA_OperationDef_ptr
+tao_CORBA_OperationDef_duplicate (
+    CORBA_OperationDef_ptr p
+  )
+{
+  return CORBA_OperationDef::_duplicate (p);
+}
+
+void
+tao_CORBA_OperationDef_release (
+    CORBA_OperationDef_ptr p
+  )
+{
+  CORBA::release (p);
+}
+
+CORBA_OperationDef_ptr
+tao_CORBA_OperationDef_nil (
+    void
+  )
+{
+  return CORBA_OperationDef::_nil ();
+}
+
+CORBA_OperationDef_ptr
+tao_CORBA_OperationDef_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return CORBA_OperationDef::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+tao_CORBA_OperationDef_upcast (
+    void *src
+  )
+{
+  CORBA_OperationDef **tmp =
+    ACE_static_cast (CORBA_OperationDef **, src);
+  return *tmp;
+}
+
 // *************************************************************
 // Operations for class CORBA_OperationDef_var
 // *************************************************************
@@ -23223,6 +23911,49 @@ void CORBA_AttrDescriptionSeq::_tao_any_destructor (void *x)
 
 #endif /* end #if !defined */
 
+CORBA_InterfaceDef_ptr
+tao_CORBA_InterfaceDef_duplicate (
+    CORBA_InterfaceDef_ptr p
+  )
+{
+  return CORBA_InterfaceDef::_duplicate (p);
+}
+
+void
+tao_CORBA_InterfaceDef_release (
+    CORBA_InterfaceDef_ptr p
+  )
+{
+  CORBA::release (p);
+}
+
+CORBA_InterfaceDef_ptr
+tao_CORBA_InterfaceDef_nil (
+    void
+  )
+{
+  return CORBA_InterfaceDef::_nil ();
+}
+
+CORBA_InterfaceDef_ptr
+tao_CORBA_InterfaceDef_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return CORBA_InterfaceDef::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+tao_CORBA_InterfaceDef_upcast (
+    void *src
+  )
+{
+  CORBA_InterfaceDef **tmp =
+    ACE_static_cast (CORBA_InterfaceDef **, src);
+  return *tmp;
+}
+
 // *************************************************************
 // Operations for class CORBA_InterfaceDef_var
 // *************************************************************
@@ -26445,6 +27176,49 @@ void CORBA_InterfaceDescription::_tao_any_destructor (void *x)
   delete tmp;
 }
 
+CORBA_AbstractInterfaceDef_ptr
+tao_CORBA_AbstractInterfaceDef_duplicate (
+    CORBA_AbstractInterfaceDef_ptr p
+  )
+{
+  return CORBA_AbstractInterfaceDef::_duplicate (p);
+}
+
+void
+tao_CORBA_AbstractInterfaceDef_release (
+    CORBA_AbstractInterfaceDef_ptr p
+  )
+{
+  CORBA::release (p);
+}
+
+CORBA_AbstractInterfaceDef_ptr
+tao_CORBA_AbstractInterfaceDef_nil (
+    void
+  )
+{
+  return CORBA_AbstractInterfaceDef::_nil ();
+}
+
+CORBA_AbstractInterfaceDef_ptr
+tao_CORBA_AbstractInterfaceDef_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return CORBA_AbstractInterfaceDef::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+tao_CORBA_AbstractInterfaceDef_upcast (
+    void *src
+  )
+{
+  CORBA_AbstractInterfaceDef **tmp =
+    ACE_static_cast (CORBA_AbstractInterfaceDef **, src);
+  return *tmp;
+}
+
 // *************************************************************
 // Operations for class CORBA_AbstractInterfaceDef_var
 // *************************************************************
@@ -26895,6 +27669,49 @@ const char* CORBA_AbstractInterfaceDef::_interface_repository_id (void) const
   return "IDL:omg.org/CORBA/AbstractInterfaceDef:1.0";
 }
 
+CORBA_LocalInterfaceDef_ptr
+tao_CORBA_LocalInterfaceDef_duplicate (
+    CORBA_LocalInterfaceDef_ptr p
+  )
+{
+  return CORBA_LocalInterfaceDef::_duplicate (p);
+}
+
+void
+tao_CORBA_LocalInterfaceDef_release (
+    CORBA_LocalInterfaceDef_ptr p
+  )
+{
+  CORBA::release (p);
+}
+
+CORBA_LocalInterfaceDef_ptr
+tao_CORBA_LocalInterfaceDef_nil (
+    void
+  )
+{
+  return CORBA_LocalInterfaceDef::_nil ();
+}
+
+CORBA_LocalInterfaceDef_ptr
+tao_CORBA_LocalInterfaceDef_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return CORBA_LocalInterfaceDef::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+tao_CORBA_LocalInterfaceDef_upcast (
+    void *src
+  )
+{
+  CORBA_LocalInterfaceDef **tmp =
+    ACE_static_cast (CORBA_LocalInterfaceDef **, src);
+  return *tmp;
+}
+
 // *************************************************************
 // Operations for class CORBA_LocalInterfaceDef_var
 // *************************************************************
@@ -28039,7 +28856,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_NativeDef_ptr &_ta
   #  pragma instantiate TAO_Object_Manager<CORBA_NativeDef,CORBA_NativeDef_var>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
-void operator<<= (CORBA::Any &_tao_any, CORBA::PrimitiveDef_ptr _tao_elem)
+void operator<<= (CORBA::Any &_tao_any, CORBA_PrimitiveDef_ptr _tao_elem)
 {
   TAO_OutputCDR stream;
   if (stream << _tao_elem)
@@ -28055,7 +28872,7 @@ void operator<<= (CORBA::Any &_tao_any, CORBA::PrimitiveDef_ptr _tao_elem)
   }
 }
 
-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::PrimitiveDef_ptr &_tao_elem)
+CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA_PrimitiveDef_ptr &_tao_elem)
 {
   ACE_TRY_NEW_ENV
   {
@@ -30255,7 +31072,7 @@ CORBA::Boolean operator>> (
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
-    const CORBA::PrimitiveDef_ptr _tao_objref
+    const CORBA_PrimitiveDef_ptr _tao_objref
   )
 {
   CORBA::Object_ptr _tao_corba_obj = _tao_objref;
@@ -30264,7 +31081,7 @@ CORBA::Boolean operator<< (
 
 CORBA::Boolean operator>> (
     TAO_InputCDR &strm,
-    CORBA::PrimitiveDef_ptr &_tao_objref
+    CORBA_PrimitiveDef_ptr &_tao_objref
   )
 {
   ACE_TRY_NEW_ENV
diff --git a/TAO/tao/IFR_Client/IFR_BasicC.h b/TAO/tao/IFR_Client/IFR_BasicC.h
index f724bf7d756..0642bd52acd 100644
--- a/TAO/tao/IFR_Client/IFR_BasicC.h
+++ b/TAO/tao/IFR_Client/IFR_BasicC.h
@@ -8370,30 +8370,30 @@ _TAO_CORBA_LocalInterfaceDef_Proxy_Broker *
     CORBA::Object_ptr obj
   );
 
-// External declarations for undefined interface
+// Declarations for undefined interface
 // CORBA_FixedDef
-extern TAO_IFR_Client_Export
+TAO_IFR_Client_Export
 CORBA_FixedDef_ptr
 tao_CORBA_FixedDef_duplicate (
     CORBA_FixedDef_ptr
   );
-extern TAO_IFR_Client_Export
+TAO_IFR_Client_Export
 void
 tao_CORBA_FixedDef_release (
     CORBA_FixedDef_ptr
   );
-extern TAO_IFR_Client_Export
+TAO_IFR_Client_Export
 CORBA_FixedDef_ptr
 tao_CORBA_FixedDef_nil (
     void
   );
-extern TAO_IFR_Client_Export
+TAO_IFR_Client_Export
 CORBA_FixedDef_ptr
 tao_CORBA_FixedDef_narrow (
     CORBA::Object *,
     CORBA::Environment &
   );
-extern TAO_IFR_Client_Export
+TAO_IFR_Client_Export
 CORBA::Object *
 tao_CORBA_FixedDef_upcast (
     void *
diff --git a/TAO/tao/IFR_Client/IFR_BasicC.i b/TAO/tao/IFR_Client/IFR_BasicC.i
index 60b041da43c..a54bc4d955a 100644
--- a/TAO/tao/IFR_Client/IFR_BasicC.i
+++ b/TAO/tao/IFR_Client/IFR_BasicC.i
@@ -23,49 +23,6 @@
 #if !defined (_CORBA_REPOSITORY___CI_)
 #define _CORBA_REPOSITORY___CI_
 
-ACE_INLINE CORBA_Repository_ptr
-tao_CORBA_Repository_duplicate (
-    CORBA_Repository_ptr p
-  )
-{
-  return CORBA_Repository::_duplicate (p);
-}
-
-ACE_INLINE void
-tao_CORBA_Repository_release (
-    CORBA_Repository_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-ACE_INLINE CORBA_Repository_ptr
-tao_CORBA_Repository_nil (
-    void
-  )
-{
-  return CORBA_Repository::_nil ();
-}
-
-ACE_INLINE CORBA_Repository_ptr
-tao_CORBA_Repository_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return CORBA_Repository::_narrow (p, ACE_TRY_ENV);
-}
-
-ACE_INLINE CORBA::Object *
-tao_CORBA_Repository_upcast (
-    void *src
-  )
-{
-  CORBA_Repository **tmp =
-    ACE_static_cast (CORBA_Repository **, src);
-  return *tmp;
-}
-
 ACE_INLINE
 CORBA_Repository::CORBA_Repository (
     TAO_Stub *objref,
@@ -84,49 +41,6 @@ CORBA_Repository::CORBA_Repository (
 #if !defined (_CORBA_MODULEDEF___CI_)
 #define _CORBA_MODULEDEF___CI_
 
-ACE_INLINE CORBA_ModuleDef_ptr
-tao_CORBA_ModuleDef_duplicate (
-    CORBA_ModuleDef_ptr p
-  )
-{
-  return CORBA_ModuleDef::_duplicate (p);
-}
-
-ACE_INLINE void
-tao_CORBA_ModuleDef_release (
-    CORBA_ModuleDef_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-ACE_INLINE CORBA_ModuleDef_ptr
-tao_CORBA_ModuleDef_nil (
-    void
-  )
-{
-  return CORBA_ModuleDef::_nil ();
-}
-
-ACE_INLINE CORBA_ModuleDef_ptr
-tao_CORBA_ModuleDef_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return CORBA_ModuleDef::_narrow (p, ACE_TRY_ENV);
-}
-
-ACE_INLINE CORBA::Object *
-tao_CORBA_ModuleDef_upcast (
-    void *src
-  )
-{
-  CORBA_ModuleDef **tmp =
-    ACE_static_cast (CORBA_ModuleDef **, src);
-  return *tmp;
-}
-
 ACE_INLINE
 CORBA_ModuleDef::CORBA_ModuleDef (
     TAO_Stub *objref,
@@ -338,49 +252,6 @@ CORBA_ModuleDescription_out::operator-> (void)
 #if !defined (_CORBA_CONSTANTDEF___CI_)
 #define _CORBA_CONSTANTDEF___CI_
 
-ACE_INLINE CORBA_ConstantDef_ptr
-tao_CORBA_ConstantDef_duplicate (
-    CORBA_ConstantDef_ptr p
-  )
-{
-  return CORBA_ConstantDef::_duplicate (p);
-}
-
-ACE_INLINE void
-tao_CORBA_ConstantDef_release (
-    CORBA_ConstantDef_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-ACE_INLINE CORBA_ConstantDef_ptr
-tao_CORBA_ConstantDef_nil (
-    void
-  )
-{
-  return CORBA_ConstantDef::_nil ();
-}
-
-ACE_INLINE CORBA_ConstantDef_ptr
-tao_CORBA_ConstantDef_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return CORBA_ConstantDef::_narrow (p, ACE_TRY_ENV);
-}
-
-ACE_INLINE CORBA::Object *
-tao_CORBA_ConstantDef_upcast (
-    void *src
-  )
-{
-  CORBA_ConstantDef **tmp =
-    ACE_static_cast (CORBA_ConstantDef **, src);
-  return *tmp;
-}
-
 ACE_INLINE
 CORBA_ConstantDef::CORBA_ConstantDef (
     TAO_Stub *objref,
@@ -592,49 +463,6 @@ CORBA_ConstantDescription_out::operator-> (void)
 #if !defined (_CORBA_STRUCTDEF___CI_)
 #define _CORBA_STRUCTDEF___CI_
 
-ACE_INLINE CORBA_StructDef_ptr
-tao_CORBA_StructDef_duplicate (
-    CORBA_StructDef_ptr p
-  )
-{
-  return CORBA_StructDef::_duplicate (p);
-}
-
-ACE_INLINE void
-tao_CORBA_StructDef_release (
-    CORBA_StructDef_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-ACE_INLINE CORBA_StructDef_ptr
-tao_CORBA_StructDef_nil (
-    void
-  )
-{
-  return CORBA_StructDef::_nil ();
-}
-
-ACE_INLINE CORBA_StructDef_ptr
-tao_CORBA_StructDef_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return CORBA_StructDef::_narrow (p, ACE_TRY_ENV);
-}
-
-ACE_INLINE CORBA::Object *
-tao_CORBA_StructDef_upcast (
-    void *src
-  )
-{
-  CORBA_StructDef **tmp =
-    ACE_static_cast (CORBA_StructDef **, src);
-  return *tmp;
-}
-
 ACE_INLINE
 CORBA_StructDef::CORBA_StructDef (
     TAO_Stub *objref,
@@ -653,49 +481,6 @@ CORBA_StructDef::CORBA_StructDef (
 #if !defined (_CORBA_UNIONDEF___CI_)
 #define _CORBA_UNIONDEF___CI_
 
-ACE_INLINE CORBA_UnionDef_ptr
-tao_CORBA_UnionDef_duplicate (
-    CORBA_UnionDef_ptr p
-  )
-{
-  return CORBA_UnionDef::_duplicate (p);
-}
-
-ACE_INLINE void
-tao_CORBA_UnionDef_release (
-    CORBA_UnionDef_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-ACE_INLINE CORBA_UnionDef_ptr
-tao_CORBA_UnionDef_nil (
-    void
-  )
-{
-  return CORBA_UnionDef::_nil ();
-}
-
-ACE_INLINE CORBA_UnionDef_ptr
-tao_CORBA_UnionDef_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return CORBA_UnionDef::_narrow (p, ACE_TRY_ENV);
-}
-
-ACE_INLINE CORBA::Object *
-tao_CORBA_UnionDef_upcast (
-    void *src
-  )
-{
-  CORBA_UnionDef **tmp =
-    ACE_static_cast (CORBA_UnionDef **, src);
-  return *tmp;
-}
-
 ACE_INLINE
 CORBA_UnionDef::CORBA_UnionDef (
     TAO_Stub *objref,
@@ -714,49 +499,6 @@ CORBA_UnionDef::CORBA_UnionDef (
 #if !defined (_CORBA_ENUMDEF___CI_)
 #define _CORBA_ENUMDEF___CI_
 
-ACE_INLINE CORBA_EnumDef_ptr
-tao_CORBA_EnumDef_duplicate (
-    CORBA_EnumDef_ptr p
-  )
-{
-  return CORBA_EnumDef::_duplicate (p);
-}
-
-ACE_INLINE void
-tao_CORBA_EnumDef_release (
-    CORBA_EnumDef_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-ACE_INLINE CORBA_EnumDef_ptr
-tao_CORBA_EnumDef_nil (
-    void
-  )
-{
-  return CORBA_EnumDef::_nil ();
-}
-
-ACE_INLINE CORBA_EnumDef_ptr
-tao_CORBA_EnumDef_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return CORBA_EnumDef::_narrow (p, ACE_TRY_ENV);
-}
-
-ACE_INLINE CORBA::Object *
-tao_CORBA_EnumDef_upcast (
-    void *src
-  )
-{
-  CORBA_EnumDef **tmp =
-    ACE_static_cast (CORBA_EnumDef **, src);
-  return *tmp;
-}
-
 ACE_INLINE
 CORBA_EnumDef::CORBA_EnumDef (
     TAO_Stub *objref,
@@ -775,49 +517,6 @@ CORBA_EnumDef::CORBA_EnumDef (
 #if !defined (_CORBA_ALIASDEF___CI_)
 #define _CORBA_ALIASDEF___CI_
 
-ACE_INLINE CORBA_AliasDef_ptr
-tao_CORBA_AliasDef_duplicate (
-    CORBA_AliasDef_ptr p
-  )
-{
-  return CORBA_AliasDef::_duplicate (p);
-}
-
-ACE_INLINE void
-tao_CORBA_AliasDef_release (
-    CORBA_AliasDef_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-ACE_INLINE CORBA_AliasDef_ptr
-tao_CORBA_AliasDef_nil (
-    void
-  )
-{
-  return CORBA_AliasDef::_nil ();
-}
-
-ACE_INLINE CORBA_AliasDef_ptr
-tao_CORBA_AliasDef_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return CORBA_AliasDef::_narrow (p, ACE_TRY_ENV);
-}
-
-ACE_INLINE CORBA::Object *
-tao_CORBA_AliasDef_upcast (
-    void *src
-  )
-{
-  CORBA_AliasDef **tmp =
-    ACE_static_cast (CORBA_AliasDef **, src);
-  return *tmp;
-}
-
 ACE_INLINE
 CORBA_AliasDef::CORBA_AliasDef (
     TAO_Stub *objref,
@@ -836,49 +535,6 @@ CORBA_AliasDef::CORBA_AliasDef (
 #if !defined (_CORBA_NATIVEDEF___CI_)
 #define _CORBA_NATIVEDEF___CI_
 
-ACE_INLINE CORBA_NativeDef_ptr
-tao_CORBA_NativeDef_duplicate (
-    CORBA_NativeDef_ptr p
-  )
-{
-  return CORBA_NativeDef::_duplicate (p);
-}
-
-ACE_INLINE void
-tao_CORBA_NativeDef_release (
-    CORBA_NativeDef_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-ACE_INLINE CORBA_NativeDef_ptr
-tao_CORBA_NativeDef_nil (
-    void
-  )
-{
-  return CORBA_NativeDef::_nil ();
-}
-
-ACE_INLINE CORBA_NativeDef_ptr
-tao_CORBA_NativeDef_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return CORBA_NativeDef::_narrow (p, ACE_TRY_ENV);
-}
-
-ACE_INLINE CORBA::Object *
-tao_CORBA_NativeDef_upcast (
-    void *src
-  )
-{
-  CORBA_NativeDef **tmp =
-    ACE_static_cast (CORBA_NativeDef **, src);
-  return *tmp;
-}
-
 ACE_INLINE
 CORBA_NativeDef::CORBA_NativeDef (
     TAO_Stub *objref,
@@ -897,49 +553,6 @@ CORBA_NativeDef::CORBA_NativeDef (
 #if !defined (_CORBA_PRIMITIVEDEF___CI_)
 #define _CORBA_PRIMITIVEDEF___CI_
 
-ACE_INLINE CORBA::PrimitiveDef_ptr
-tao_CORBA_PrimitiveDef_duplicate (
-    CORBA::PrimitiveDef_ptr p
-  )
-{
-  return CORBA_PrimitiveDef::_duplicate (p);
-}
-
-ACE_INLINE void
-tao_CORBA_PrimitiveDef_release (
-    CORBA::PrimitiveDef_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-ACE_INLINE CORBA::PrimitiveDef_ptr
-tao_CORBA_PrimitiveDef_nil (
-    void
-  )
-{
-  return CORBA_PrimitiveDef::_nil ();
-}
-
-ACE_INLINE CORBA::PrimitiveDef_ptr
-tao_CORBA_PrimitiveDef_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return CORBA_PrimitiveDef::_narrow (p, ACE_TRY_ENV);
-}
-
-ACE_INLINE CORBA::Object *
-tao_CORBA_PrimitiveDef_upcast (
-    void *src
-  )
-{
-  CORBA_PrimitiveDef **tmp =
-    ACE_static_cast (CORBA_PrimitiveDef **, src);
-  return *tmp;
-}
-
 ACE_INLINE
 CORBA_PrimitiveDef::CORBA_PrimitiveDef (
     TAO_Stub *objref,
@@ -958,49 +571,6 @@ CORBA_PrimitiveDef::CORBA_PrimitiveDef (
 #if !defined (_CORBA_STRINGDEF___CI_)
 #define _CORBA_STRINGDEF___CI_
 
-ACE_INLINE CORBA_StringDef_ptr
-tao_CORBA_StringDef_duplicate (
-    CORBA_StringDef_ptr p
-  )
-{
-  return CORBA_StringDef::_duplicate (p);
-}
-
-ACE_INLINE void
-tao_CORBA_StringDef_release (
-    CORBA_StringDef_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-ACE_INLINE CORBA_StringDef_ptr
-tao_CORBA_StringDef_nil (
-    void
-  )
-{
-  return CORBA_StringDef::_nil ();
-}
-
-ACE_INLINE CORBA_StringDef_ptr
-tao_CORBA_StringDef_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return CORBA_StringDef::_narrow (p, ACE_TRY_ENV);
-}
-
-ACE_INLINE CORBA::Object *
-tao_CORBA_StringDef_upcast (
-    void *src
-  )
-{
-  CORBA_StringDef **tmp =
-    ACE_static_cast (CORBA_StringDef **, src);
-  return *tmp;
-}
-
 ACE_INLINE
 CORBA_StringDef::CORBA_StringDef (
     TAO_Stub *objref,
@@ -1019,49 +589,6 @@ CORBA_StringDef::CORBA_StringDef (
 #if !defined (_CORBA_WSTRINGDEF___CI_)
 #define _CORBA_WSTRINGDEF___CI_
 
-ACE_INLINE CORBA_WstringDef_ptr
-tao_CORBA_WstringDef_duplicate (
-    CORBA_WstringDef_ptr p
-  )
-{
-  return CORBA_WstringDef::_duplicate (p);
-}
-
-ACE_INLINE void
-tao_CORBA_WstringDef_release (
-    CORBA_WstringDef_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-ACE_INLINE CORBA_WstringDef_ptr
-tao_CORBA_WstringDef_nil (
-    void
-  )
-{
-  return CORBA_WstringDef::_nil ();
-}
-
-ACE_INLINE CORBA_WstringDef_ptr
-tao_CORBA_WstringDef_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return CORBA_WstringDef::_narrow (p, ACE_TRY_ENV);
-}
-
-ACE_INLINE CORBA::Object *
-tao_CORBA_WstringDef_upcast (
-    void *src
-  )
-{
-  CORBA_WstringDef **tmp =
-    ACE_static_cast (CORBA_WstringDef **, src);
-  return *tmp;
-}
-
 ACE_INLINE
 CORBA_WstringDef::CORBA_WstringDef (
     TAO_Stub *objref,
@@ -1080,49 +607,6 @@ CORBA_WstringDef::CORBA_WstringDef (
 #if !defined (_CORBA_SEQUENCEDEF___CI_)
 #define _CORBA_SEQUENCEDEF___CI_
 
-ACE_INLINE CORBA_SequenceDef_ptr
-tao_CORBA_SequenceDef_duplicate (
-    CORBA_SequenceDef_ptr p
-  )
-{
-  return CORBA_SequenceDef::_duplicate (p);
-}
-
-ACE_INLINE void
-tao_CORBA_SequenceDef_release (
-    CORBA_SequenceDef_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-ACE_INLINE CORBA_SequenceDef_ptr
-tao_CORBA_SequenceDef_nil (
-    void
-  )
-{
-  return CORBA_SequenceDef::_nil ();
-}
-
-ACE_INLINE CORBA_SequenceDef_ptr
-tao_CORBA_SequenceDef_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return CORBA_SequenceDef::_narrow (p, ACE_TRY_ENV);
-}
-
-ACE_INLINE CORBA::Object *
-tao_CORBA_SequenceDef_upcast (
-    void *src
-  )
-{
-  CORBA_SequenceDef **tmp =
-    ACE_static_cast (CORBA_SequenceDef **, src);
-  return *tmp;
-}
-
 ACE_INLINE
 CORBA_SequenceDef::CORBA_SequenceDef (
     TAO_Stub *objref,
@@ -1141,49 +625,6 @@ CORBA_SequenceDef::CORBA_SequenceDef (
 #if !defined (_CORBA_ARRAYDEF___CI_)
 #define _CORBA_ARRAYDEF___CI_
 
-ACE_INLINE CORBA_ArrayDef_ptr
-tao_CORBA_ArrayDef_duplicate (
-    CORBA_ArrayDef_ptr p
-  )
-{
-  return CORBA_ArrayDef::_duplicate (p);
-}
-
-ACE_INLINE void
-tao_CORBA_ArrayDef_release (
-    CORBA_ArrayDef_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-ACE_INLINE CORBA_ArrayDef_ptr
-tao_CORBA_ArrayDef_nil (
-    void
-  )
-{
-  return CORBA_ArrayDef::_nil ();
-}
-
-ACE_INLINE CORBA_ArrayDef_ptr
-tao_CORBA_ArrayDef_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return CORBA_ArrayDef::_narrow (p, ACE_TRY_ENV);
-}
-
-ACE_INLINE CORBA::Object *
-tao_CORBA_ArrayDef_upcast (
-    void *src
-  )
-{
-  CORBA_ArrayDef **tmp =
-    ACE_static_cast (CORBA_ArrayDef **, src);
-  return *tmp;
-}
-
 ACE_INLINE
 CORBA_ArrayDef::CORBA_ArrayDef (
     TAO_Stub *objref,
@@ -1202,49 +643,6 @@ CORBA_ArrayDef::CORBA_ArrayDef (
 #if !defined (_CORBA_EXCEPTIONDEF___CI_)
 #define _CORBA_EXCEPTIONDEF___CI_
 
-ACE_INLINE CORBA_ExceptionDef_ptr
-tao_CORBA_ExceptionDef_duplicate (
-    CORBA_ExceptionDef_ptr p
-  )
-{
-  return CORBA_ExceptionDef::_duplicate (p);
-}
-
-ACE_INLINE void
-tao_CORBA_ExceptionDef_release (
-    CORBA_ExceptionDef_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-ACE_INLINE CORBA_ExceptionDef_ptr
-tao_CORBA_ExceptionDef_nil (
-    void
-  )
-{
-  return CORBA_ExceptionDef::_nil ();
-}
-
-ACE_INLINE CORBA_ExceptionDef_ptr
-tao_CORBA_ExceptionDef_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return CORBA_ExceptionDef::_narrow (p, ACE_TRY_ENV);
-}
-
-ACE_INLINE CORBA::Object *
-tao_CORBA_ExceptionDef_upcast (
-    void *src
-  )
-{
-  CORBA_ExceptionDef **tmp =
-    ACE_static_cast (CORBA_ExceptionDef **, src);
-  return *tmp;
-}
-
 ACE_INLINE
 CORBA_ExceptionDef::CORBA_ExceptionDef (
     TAO_Stub *objref,
@@ -2224,49 +1622,6 @@ CORBA_ExcDescriptionSeq_out::operator[] (CORBA::ULong index)
 #if !defined (_CORBA_ATTRIBUTEDEF___CI_)
 #define _CORBA_ATTRIBUTEDEF___CI_
 
-ACE_INLINE CORBA_AttributeDef_ptr
-tao_CORBA_AttributeDef_duplicate (
-    CORBA_AttributeDef_ptr p
-  )
-{
-  return CORBA_AttributeDef::_duplicate (p);
-}
-
-ACE_INLINE void
-tao_CORBA_AttributeDef_release (
-    CORBA_AttributeDef_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-ACE_INLINE CORBA_AttributeDef_ptr
-tao_CORBA_AttributeDef_nil (
-    void
-  )
-{
-  return CORBA_AttributeDef::_nil ();
-}
-
-ACE_INLINE CORBA_AttributeDef_ptr
-tao_CORBA_AttributeDef_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return CORBA_AttributeDef::_narrow (p, ACE_TRY_ENV);
-}
-
-ACE_INLINE CORBA::Object *
-tao_CORBA_AttributeDef_upcast (
-    void *src
-  )
-{
-  CORBA_AttributeDef **tmp =
-    ACE_static_cast (CORBA_AttributeDef **, src);
-  return *tmp;
-}
-
 ACE_INLINE
 CORBA_AttributeDef::CORBA_AttributeDef (
     TAO_Stub *objref,
@@ -3277,49 +2632,6 @@ CORBA_ContextIdSeq_out::operator[] (CORBA::ULong index)
 #if !defined (_CORBA_OPERATIONDEF___CI_)
 #define _CORBA_OPERATIONDEF___CI_
 
-ACE_INLINE CORBA_OperationDef_ptr
-tao_CORBA_OperationDef_duplicate (
-    CORBA_OperationDef_ptr p
-  )
-{
-  return CORBA_OperationDef::_duplicate (p);
-}
-
-ACE_INLINE void
-tao_CORBA_OperationDef_release (
-    CORBA_OperationDef_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-ACE_INLINE CORBA_OperationDef_ptr
-tao_CORBA_OperationDef_nil (
-    void
-  )
-{
-  return CORBA_OperationDef::_nil ();
-}
-
-ACE_INLINE CORBA_OperationDef_ptr
-tao_CORBA_OperationDef_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return CORBA_OperationDef::_narrow (p, ACE_TRY_ENV);
-}
-
-ACE_INLINE CORBA::Object *
-tao_CORBA_OperationDef_upcast (
-    void *src
-  )
-{
-  CORBA_OperationDef **tmp =
-    ACE_static_cast (CORBA_OperationDef **, src);
-  return *tmp;
-}
-
 ACE_INLINE
 CORBA_OperationDef::CORBA_OperationDef (
     TAO_Stub *objref,
@@ -4724,49 +4036,6 @@ CORBA_InterfaceDef::FullInterfaceDescription_out::operator-> (void)
 #if !defined (_CORBA_INTERFACEDEF___CI_)
 #define _CORBA_INTERFACEDEF___CI_
 
-ACE_INLINE CORBA_InterfaceDef_ptr
-tao_CORBA_InterfaceDef_duplicate (
-    CORBA_InterfaceDef_ptr p
-  )
-{
-  return CORBA_InterfaceDef::_duplicate (p);
-}
-
-ACE_INLINE void
-tao_CORBA_InterfaceDef_release (
-    CORBA_InterfaceDef_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-ACE_INLINE CORBA_InterfaceDef_ptr
-tao_CORBA_InterfaceDef_nil (
-    void
-  )
-{
-  return CORBA_InterfaceDef::_nil ();
-}
-
-ACE_INLINE CORBA_InterfaceDef_ptr
-tao_CORBA_InterfaceDef_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return CORBA_InterfaceDef::_narrow (p, ACE_TRY_ENV);
-}
-
-ACE_INLINE CORBA::Object *
-tao_CORBA_InterfaceDef_upcast (
-    void *src
-  )
-{
-  CORBA_InterfaceDef **tmp =
-    ACE_static_cast (CORBA_InterfaceDef **, src);
-  return *tmp;
-}
-
 ACE_INLINE
 CORBA_InterfaceDef::CORBA_InterfaceDef (
     TAO_Stub *objref,
@@ -4978,49 +4247,6 @@ CORBA_InterfaceDescription_out::operator-> (void)
 #if !defined (_CORBA_ABSTRACTINTERFACEDEF___CI_)
 #define _CORBA_ABSTRACTINTERFACEDEF___CI_
 
-ACE_INLINE CORBA_AbstractInterfaceDef_ptr
-tao_CORBA_AbstractInterfaceDef_duplicate (
-    CORBA_AbstractInterfaceDef_ptr p
-  )
-{
-  return CORBA_AbstractInterfaceDef::_duplicate (p);
-}
-
-ACE_INLINE void
-tao_CORBA_AbstractInterfaceDef_release (
-    CORBA_AbstractInterfaceDef_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-ACE_INLINE CORBA_AbstractInterfaceDef_ptr
-tao_CORBA_AbstractInterfaceDef_nil (
-    void
-  )
-{
-  return CORBA_AbstractInterfaceDef::_nil ();
-}
-
-ACE_INLINE CORBA_AbstractInterfaceDef_ptr
-tao_CORBA_AbstractInterfaceDef_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return CORBA_AbstractInterfaceDef::_narrow (p, ACE_TRY_ENV);
-}
-
-ACE_INLINE CORBA::Object *
-tao_CORBA_AbstractInterfaceDef_upcast (
-    void *src
-  )
-{
-  CORBA_AbstractInterfaceDef **tmp =
-    ACE_static_cast (CORBA_AbstractInterfaceDef **, src);
-  return *tmp;
-}
-
 ACE_INLINE
 CORBA_AbstractInterfaceDef::CORBA_AbstractInterfaceDef (
     TAO_Stub *objref,
@@ -5039,49 +4265,6 @@ CORBA_AbstractInterfaceDef::CORBA_AbstractInterfaceDef (
 #if !defined (_CORBA_LOCALINTERFACEDEF___CI_)
 #define _CORBA_LOCALINTERFACEDEF___CI_
 
-ACE_INLINE CORBA_LocalInterfaceDef_ptr
-tao_CORBA_LocalInterfaceDef_duplicate (
-    CORBA_LocalInterfaceDef_ptr p
-  )
-{
-  return CORBA_LocalInterfaceDef::_duplicate (p);
-}
-
-ACE_INLINE void
-tao_CORBA_LocalInterfaceDef_release (
-    CORBA_LocalInterfaceDef_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-ACE_INLINE CORBA_LocalInterfaceDef_ptr
-tao_CORBA_LocalInterfaceDef_nil (
-    void
-  )
-{
-  return CORBA_LocalInterfaceDef::_nil ();
-}
-
-ACE_INLINE CORBA_LocalInterfaceDef_ptr
-tao_CORBA_LocalInterfaceDef_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return CORBA_LocalInterfaceDef::_narrow (p, ACE_TRY_ENV);
-}
-
-ACE_INLINE CORBA::Object *
-tao_CORBA_LocalInterfaceDef_upcast (
-    void *src
-  )
-{
-  CORBA_LocalInterfaceDef **tmp =
-    ACE_static_cast (CORBA_LocalInterfaceDef **, src);
-  return *tmp;
-}
-
 ACE_INLINE
 CORBA_LocalInterfaceDef::CORBA_LocalInterfaceDef (
     TAO_Stub *objref,
@@ -5098,12 +4281,12 @@ CORBA_LocalInterfaceDef::CORBA_LocalInterfaceDef (
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
-    const CORBA::PrimitiveDef_ptr
+    const CORBA_PrimitiveDef_ptr
   );
 
 TAO_IFR_Client_Export CORBA::Boolean operator>> (
     TAO_InputCDR &,
-    CORBA::PrimitiveDef_ptr &
+    CORBA_PrimitiveDef_ptr &
   );
 
 TAO_IFR_Client_Export CORBA::Boolean operator<< (
diff --git a/TAO/tao/IFR_Client/IFR_ComponentsC.cpp b/TAO/tao/IFR_Client/IFR_ComponentsC.cpp
index e504beb5fae..31af843f354 100644
--- a/TAO/tao/IFR_Client/IFR_ComponentsC.cpp
+++ b/TAO/tao/IFR_Client/IFR_ComponentsC.cpp
@@ -2027,6 +2027,49 @@ TAO_NAMESPACE_BEGIN (IR)
 TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_FinderDefSeq, &_tc_TAO_tc_IR_FinderDefSeq)
 TAO_NAMESPACE_END
 
+IR::ComponentRepository_ptr
+tao_IR_ComponentRepository_duplicate (
+    IR::ComponentRepository_ptr p
+  )
+{
+  return IR::ComponentRepository::_duplicate (p);
+}
+
+void
+tao_IR_ComponentRepository_release (
+    IR::ComponentRepository_ptr p
+  )
+{
+  CORBA::release (p);
+}
+
+IR::ComponentRepository_ptr
+tao_IR_ComponentRepository_nil (
+    void
+  )
+{
+  return IR::ComponentRepository::_nil ();
+}
+
+IR::ComponentRepository_ptr
+tao_IR_ComponentRepository_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return IR::ComponentRepository::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+tao_IR_ComponentRepository_upcast (
+    void *src
+  )
+{
+  IR::ComponentRepository **tmp =
+    ACE_static_cast (IR::ComponentRepository **, src);
+  return *tmp;
+}
+
 // *************************************************************
 // Operations for class IR::ComponentRepository_var
 // *************************************************************
@@ -3207,6 +3250,49 @@ TAO_NAMESPACE_BEGIN (IR)
 TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ComponentRepository, &_tc_TAO_tc_IR_ComponentRepository)
 TAO_NAMESPACE_END
 
+IR::ProvidesDef_ptr
+tao_IR_ProvidesDef_duplicate (
+    IR::ProvidesDef_ptr p
+  )
+{
+  return IR::ProvidesDef::_duplicate (p);
+}
+
+void
+tao_IR_ProvidesDef_release (
+    IR::ProvidesDef_ptr p
+  )
+{
+  CORBA::release (p);
+}
+
+IR::ProvidesDef_ptr
+tao_IR_ProvidesDef_nil (
+    void
+  )
+{
+  return IR::ProvidesDef::_nil ();
+}
+
+IR::ProvidesDef_ptr
+tao_IR_ProvidesDef_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return IR::ProvidesDef::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+tao_IR_ProvidesDef_upcast (
+    void *src
+  )
+{
+  IR::ProvidesDef **tmp =
+    ACE_static_cast (IR::ProvidesDef **, src);
+  return *tmp;
+}
+
 // *************************************************************
 // Operations for class IR::ProvidesDef_var
 // *************************************************************
@@ -4076,6 +4162,49 @@ void IR::ProvidesDescription::_tao_any_destructor (void *x)
   delete tmp;
 }
 
+IR::UsesDef_ptr
+tao_IR_UsesDef_duplicate (
+    IR::UsesDef_ptr p
+  )
+{
+  return IR::UsesDef::_duplicate (p);
+}
+
+void
+tao_IR_UsesDef_release (
+    IR::UsesDef_ptr p
+  )
+{
+  CORBA::release (p);
+}
+
+IR::UsesDef_ptr
+tao_IR_UsesDef_nil (
+    void
+  )
+{
+  return IR::UsesDef::_nil ();
+}
+
+IR::UsesDef_ptr
+tao_IR_UsesDef_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return IR::UsesDef::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+tao_IR_UsesDef_upcast (
+    void *src
+  )
+{
+  IR::UsesDef **tmp =
+    ACE_static_cast (IR::UsesDef **, src);
+  return *tmp;
+}
+
 // *************************************************************
 // Operations for class IR::UsesDef_var
 // *************************************************************
@@ -5759,6 +5888,49 @@ TAO_NAMESPACE_BEGIN (IR)
 TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_UsesDescSeq, &_tc_TAO_tc_IR_UsesDescSeq)
 TAO_NAMESPACE_END
 
+IR::EventDef_ptr
+tao_IR_EventDef_duplicate (
+    IR::EventDef_ptr p
+  )
+{
+  return IR::EventDef::_duplicate (p);
+}
+
+void
+tao_IR_EventDef_release (
+    IR::EventDef_ptr p
+  )
+{
+  CORBA::release (p);
+}
+
+IR::EventDef_ptr
+tao_IR_EventDef_nil (
+    void
+  )
+{
+  return IR::EventDef::_nil ();
+}
+
+IR::EventDef_ptr
+tao_IR_EventDef_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return IR::EventDef::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+tao_IR_EventDef_upcast (
+    void *src
+  )
+{
+  IR::EventDef **tmp =
+    ACE_static_cast (IR::EventDef **, src);
+  return *tmp;
+}
+
 // *************************************************************
 // Operations for class IR::EventDef_var
 // *************************************************************
@@ -6915,6 +7087,49 @@ void IR::EventDescription::_tao_any_destructor (void *x)
   delete tmp;
 }
 
+IR::EmitsDef_ptr
+tao_IR_EmitsDef_duplicate (
+    IR::EmitsDef_ptr p
+  )
+{
+  return IR::EmitsDef::_duplicate (p);
+}
+
+void
+tao_IR_EmitsDef_release (
+    IR::EmitsDef_ptr p
+  )
+{
+  CORBA::release (p);
+}
+
+IR::EmitsDef_ptr
+tao_IR_EmitsDef_nil (
+    void
+  )
+{
+  return IR::EmitsDef::_nil ();
+}
+
+IR::EmitsDef_ptr
+tao_IR_EmitsDef_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return IR::EmitsDef::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+tao_IR_EmitsDef_upcast (
+    void *src
+  )
+{
+  IR::EmitsDef **tmp =
+    ACE_static_cast (IR::EmitsDef **, src);
+  return *tmp;
+}
+
 // *************************************************************
 // Operations for class IR::EmitsDef_var
 // *************************************************************
@@ -7369,6 +7584,49 @@ TAO_NAMESPACE_BEGIN (IR)
 TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_EmitsDef, &_tc_TAO_tc_IR_EmitsDef)
 TAO_NAMESPACE_END
 
+IR::PublishesDef_ptr
+tao_IR_PublishesDef_duplicate (
+    IR::PublishesDef_ptr p
+  )
+{
+  return IR::PublishesDef::_duplicate (p);
+}
+
+void
+tao_IR_PublishesDef_release (
+    IR::PublishesDef_ptr p
+  )
+{
+  CORBA::release (p);
+}
+
+IR::PublishesDef_ptr
+tao_IR_PublishesDef_nil (
+    void
+  )
+{
+  return IR::PublishesDef::_nil ();
+}
+
+IR::PublishesDef_ptr
+tao_IR_PublishesDef_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return IR::PublishesDef::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+tao_IR_PublishesDef_upcast (
+    void *src
+  )
+{
+  IR::PublishesDef **tmp =
+    ACE_static_cast (IR::PublishesDef **, src);
+  return *tmp;
+}
+
 // *************************************************************
 // Operations for class IR::PublishesDef_var
 // *************************************************************
@@ -7825,6 +8083,49 @@ TAO_NAMESPACE_BEGIN (IR)
 TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_PublishesDef, &_tc_TAO_tc_IR_PublishesDef)
 TAO_NAMESPACE_END
 
+IR::ConsumesDef_ptr
+tao_IR_ConsumesDef_duplicate (
+    IR::ConsumesDef_ptr p
+  )
+{
+  return IR::ConsumesDef::_duplicate (p);
+}
+
+void
+tao_IR_ConsumesDef_release (
+    IR::ConsumesDef_ptr p
+  )
+{
+  CORBA::release (p);
+}
+
+IR::ConsumesDef_ptr
+tao_IR_ConsumesDef_nil (
+    void
+  )
+{
+  return IR::ConsumesDef::_nil ();
+}
+
+IR::ConsumesDef_ptr
+tao_IR_ConsumesDef_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return IR::ConsumesDef::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+tao_IR_ConsumesDef_upcast (
+    void *src
+  )
+{
+  IR::ConsumesDef **tmp =
+    ACE_static_cast (IR::ConsumesDef **, src);
+  return *tmp;
+}
+
 // *************************************************************
 // Operations for class IR::ConsumesDef_var
 // *************************************************************
@@ -8280,6 +8581,49 @@ TAO_NAMESPACE_BEGIN (IR)
 TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ConsumesDef, &_tc_TAO_tc_IR_ConsumesDef)
 TAO_NAMESPACE_END
 
+IR::ComponentDef_ptr
+tao_IR_ComponentDef_duplicate (
+    IR::ComponentDef_ptr p
+  )
+{
+  return IR::ComponentDef::_duplicate (p);
+}
+
+void
+tao_IR_ComponentDef_release (
+    IR::ComponentDef_ptr p
+  )
+{
+  CORBA::release (p);
+}
+
+IR::ComponentDef_ptr
+tao_IR_ComponentDef_nil (
+    void
+  )
+{
+  return IR::ComponentDef::_nil ();
+}
+
+IR::ComponentDef_ptr
+tao_IR_ComponentDef_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return IR::ComponentDef::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+tao_IR_ComponentDef_upcast (
+    void *src
+  )
+{
+  IR::ComponentDef **tmp =
+    ACE_static_cast (IR::ComponentDef **, src);
+  return *tmp;
+}
+
 // *************************************************************
 // Operations for class IR::ComponentDef_var
 // *************************************************************
@@ -13450,6 +13794,49 @@ void IR::ComponentDescription::_tao_any_destructor (void *x)
   delete tmp;
 }
 
+IR::PrimaryKeyDef_ptr
+tao_IR_PrimaryKeyDef_duplicate (
+    IR::PrimaryKeyDef_ptr p
+  )
+{
+  return IR::PrimaryKeyDef::_duplicate (p);
+}
+
+void
+tao_IR_PrimaryKeyDef_release (
+    IR::PrimaryKeyDef_ptr p
+  )
+{
+  CORBA::release (p);
+}
+
+IR::PrimaryKeyDef_ptr
+tao_IR_PrimaryKeyDef_nil (
+    void
+  )
+{
+  return IR::PrimaryKeyDef::_nil ();
+}
+
+IR::PrimaryKeyDef_ptr
+tao_IR_PrimaryKeyDef_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return IR::PrimaryKeyDef::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+tao_IR_PrimaryKeyDef_upcast (
+    void *src
+  )
+{
+  IR::PrimaryKeyDef **tmp =
+    ACE_static_cast (IR::PrimaryKeyDef **, src);
+  return *tmp;
+}
+
 // *************************************************************
 // Operations for class IR::PrimaryKeyDef_var
 // *************************************************************
@@ -14613,6 +15000,49 @@ void IR::PrimaryKeyDescription::_tao_any_destructor (void *x)
   delete tmp;
 }
 
+IR::FactoryDef_ptr
+tao_IR_FactoryDef_duplicate (
+    IR::FactoryDef_ptr p
+  )
+{
+  return IR::FactoryDef::_duplicate (p);
+}
+
+void
+tao_IR_FactoryDef_release (
+    IR::FactoryDef_ptr p
+  )
+{
+  CORBA::release (p);
+}
+
+IR::FactoryDef_ptr
+tao_IR_FactoryDef_nil (
+    void
+  )
+{
+  return IR::FactoryDef::_nil ();
+}
+
+IR::FactoryDef_ptr
+tao_IR_FactoryDef_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return IR::FactoryDef::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+tao_IR_FactoryDef_upcast (
+    void *src
+  )
+{
+  IR::FactoryDef **tmp =
+    ACE_static_cast (IR::FactoryDef **, src);
+  return *tmp;
+}
+
 // *************************************************************
 // Operations for class IR::FactoryDef_var
 // *************************************************************
@@ -15068,6 +15498,49 @@ TAO_NAMESPACE_BEGIN (IR)
 TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_FactoryDef, &_tc_TAO_tc_IR_FactoryDef)
 TAO_NAMESPACE_END
 
+IR::FinderDef_ptr
+tao_IR_FinderDef_duplicate (
+    IR::FinderDef_ptr p
+  )
+{
+  return IR::FinderDef::_duplicate (p);
+}
+
+void
+tao_IR_FinderDef_release (
+    IR::FinderDef_ptr p
+  )
+{
+  CORBA::release (p);
+}
+
+IR::FinderDef_ptr
+tao_IR_FinderDef_nil (
+    void
+  )
+{
+  return IR::FinderDef::_nil ();
+}
+
+IR::FinderDef_ptr
+tao_IR_FinderDef_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return IR::FinderDef::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+tao_IR_FinderDef_upcast (
+    void *src
+  )
+{
+  IR::FinderDef **tmp =
+    ACE_static_cast (IR::FinderDef **, src);
+  return *tmp;
+}
+
 // *************************************************************
 // Operations for class IR::FinderDef_var
 // *************************************************************
@@ -15523,6 +15996,49 @@ TAO_NAMESPACE_BEGIN (IR)
 TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_FinderDef, &_tc_TAO_tc_IR_FinderDef)
 TAO_NAMESPACE_END
 
+IR::HomeDef_ptr
+tao_IR_HomeDef_duplicate (
+    IR::HomeDef_ptr p
+  )
+{
+  return IR::HomeDef::_duplicate (p);
+}
+
+void
+tao_IR_HomeDef_release (
+    IR::HomeDef_ptr p
+  )
+{
+  CORBA::release (p);
+}
+
+IR::HomeDef_ptr
+tao_IR_HomeDef_nil (
+    void
+  )
+{
+  return IR::HomeDef::_nil ();
+}
+
+IR::HomeDef_ptr
+tao_IR_HomeDef_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return IR::HomeDef::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+tao_IR_HomeDef_upcast (
+    void *src
+  )
+{
+  IR::HomeDef **tmp =
+    ACE_static_cast (IR::HomeDef **, src);
+  return *tmp;
+}
+
 // *************************************************************
 // Operations for class IR::HomeDef_var
 // *************************************************************
diff --git a/TAO/tao/IFR_Client/IFR_ComponentsC.i b/TAO/tao/IFR_Client/IFR_ComponentsC.i
index fd62303f138..bec30d9b1e2 100644
--- a/TAO/tao/IFR_Client/IFR_ComponentsC.i
+++ b/TAO/tao/IFR_Client/IFR_ComponentsC.i
@@ -3601,49 +3601,6 @@ IR::FinderDefSeq_out::operator[] (CORBA::ULong index)
 #if !defined (_IR_COMPONENTREPOSITORY___CI_)
 #define _IR_COMPONENTREPOSITORY___CI_
 
-ACE_INLINE IR::ComponentRepository_ptr
-tao_IR_ComponentRepository_duplicate (
-    IR::ComponentRepository_ptr p
-  )
-{
-  return IR::ComponentRepository::_duplicate (p);
-}
-
-ACE_INLINE void
-tao_IR_ComponentRepository_release (
-    IR::ComponentRepository_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-ACE_INLINE IR::ComponentRepository_ptr
-tao_IR_ComponentRepository_nil (
-    void
-  )
-{
-  return IR::ComponentRepository::_nil ();
-}
-
-ACE_INLINE IR::ComponentRepository_ptr
-tao_IR_ComponentRepository_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return IR::ComponentRepository::_narrow (p, ACE_TRY_ENV);
-}
-
-ACE_INLINE CORBA::Object *
-tao_IR_ComponentRepository_upcast (
-    void *src
-  )
-{
-  IR::ComponentRepository **tmp =
-    ACE_static_cast (IR::ComponentRepository **, src);
-  return *tmp;
-}
-
 ACE_INLINE
 IR::ComponentRepository::ComponentRepository (
     TAO_Stub *objref,
@@ -3662,49 +3619,6 @@ IR::ComponentRepository::ComponentRepository (
 #if !defined (_IR_PROVIDESDEF___CI_)
 #define _IR_PROVIDESDEF___CI_
 
-ACE_INLINE IR::ProvidesDef_ptr
-tao_IR_ProvidesDef_duplicate (
-    IR::ProvidesDef_ptr p
-  )
-{
-  return IR::ProvidesDef::_duplicate (p);
-}
-
-ACE_INLINE void
-tao_IR_ProvidesDef_release (
-    IR::ProvidesDef_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-ACE_INLINE IR::ProvidesDef_ptr
-tao_IR_ProvidesDef_nil (
-    void
-  )
-{
-  return IR::ProvidesDef::_nil ();
-}
-
-ACE_INLINE IR::ProvidesDef_ptr
-tao_IR_ProvidesDef_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return IR::ProvidesDef::_narrow (p, ACE_TRY_ENV);
-}
-
-ACE_INLINE CORBA::Object *
-tao_IR_ProvidesDef_upcast (
-    void *src
-  )
-{
-  IR::ProvidesDef **tmp =
-    ACE_static_cast (IR::ProvidesDef **, src);
-  return *tmp;
-}
-
 ACE_INLINE
 IR::ProvidesDef::ProvidesDef (
     TAO_Stub *objref,
@@ -3916,49 +3830,6 @@ IR::ProvidesDescription_out::operator-> (void)
 #if !defined (_IR_USESDEF___CI_)
 #define _IR_USESDEF___CI_
 
-ACE_INLINE IR::UsesDef_ptr
-tao_IR_UsesDef_duplicate (
-    IR::UsesDef_ptr p
-  )
-{
-  return IR::UsesDef::_duplicate (p);
-}
-
-ACE_INLINE void
-tao_IR_UsesDef_release (
-    IR::UsesDef_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-ACE_INLINE IR::UsesDef_ptr
-tao_IR_UsesDef_nil (
-    void
-  )
-{
-  return IR::UsesDef::_nil ();
-}
-
-ACE_INLINE IR::UsesDef_ptr
-tao_IR_UsesDef_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return IR::UsesDef::_narrow (p, ACE_TRY_ENV);
-}
-
-ACE_INLINE CORBA::Object *
-tao_IR_UsesDef_upcast (
-    void *src
-  )
-{
-  IR::UsesDef **tmp =
-    ACE_static_cast (IR::UsesDef **, src);
-  return *tmp;
-}
-
 ACE_INLINE
 IR::UsesDef::UsesDef (
     TAO_Stub *objref,
@@ -4958,49 +4829,6 @@ IR::UsesDescSeq_out::operator[] (CORBA::ULong index)
 #if !defined (_IR_EVENTDEF___CI_)
 #define _IR_EVENTDEF___CI_
 
-ACE_INLINE IR::EventDef_ptr
-tao_IR_EventDef_duplicate (
-    IR::EventDef_ptr p
-  )
-{
-  return IR::EventDef::_duplicate (p);
-}
-
-ACE_INLINE void
-tao_IR_EventDef_release (
-    IR::EventDef_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-ACE_INLINE IR::EventDef_ptr
-tao_IR_EventDef_nil (
-    void
-  )
-{
-  return IR::EventDef::_nil ();
-}
-
-ACE_INLINE IR::EventDef_ptr
-tao_IR_EventDef_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return IR::EventDef::_narrow (p, ACE_TRY_ENV);
-}
-
-ACE_INLINE CORBA::Object *
-tao_IR_EventDef_upcast (
-    void *src
-  )
-{
-  IR::EventDef **tmp =
-    ACE_static_cast (IR::EventDef **, src);
-  return *tmp;
-}
-
 ACE_INLINE
 IR::EventDef::EventDef (
     TAO_Stub *objref,
@@ -5212,49 +5040,6 @@ IR::EventDescription_out::operator-> (void)
 #if !defined (_IR_EMITSDEF___CI_)
 #define _IR_EMITSDEF___CI_
 
-ACE_INLINE IR::EmitsDef_ptr
-tao_IR_EmitsDef_duplicate (
-    IR::EmitsDef_ptr p
-  )
-{
-  return IR::EmitsDef::_duplicate (p);
-}
-
-ACE_INLINE void
-tao_IR_EmitsDef_release (
-    IR::EmitsDef_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-ACE_INLINE IR::EmitsDef_ptr
-tao_IR_EmitsDef_nil (
-    void
-  )
-{
-  return IR::EmitsDef::_nil ();
-}
-
-ACE_INLINE IR::EmitsDef_ptr
-tao_IR_EmitsDef_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return IR::EmitsDef::_narrow (p, ACE_TRY_ENV);
-}
-
-ACE_INLINE CORBA::Object *
-tao_IR_EmitsDef_upcast (
-    void *src
-  )
-{
-  IR::EmitsDef **tmp =
-    ACE_static_cast (IR::EmitsDef **, src);
-  return *tmp;
-}
-
 ACE_INLINE
 IR::EmitsDef::EmitsDef (
     TAO_Stub *objref,
@@ -5273,49 +5058,6 @@ IR::EmitsDef::EmitsDef (
 #if !defined (_IR_PUBLISHESDEF___CI_)
 #define _IR_PUBLISHESDEF___CI_
 
-ACE_INLINE IR::PublishesDef_ptr
-tao_IR_PublishesDef_duplicate (
-    IR::PublishesDef_ptr p
-  )
-{
-  return IR::PublishesDef::_duplicate (p);
-}
-
-ACE_INLINE void
-tao_IR_PublishesDef_release (
-    IR::PublishesDef_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-ACE_INLINE IR::PublishesDef_ptr
-tao_IR_PublishesDef_nil (
-    void
-  )
-{
-  return IR::PublishesDef::_nil ();
-}
-
-ACE_INLINE IR::PublishesDef_ptr
-tao_IR_PublishesDef_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return IR::PublishesDef::_narrow (p, ACE_TRY_ENV);
-}
-
-ACE_INLINE CORBA::Object *
-tao_IR_PublishesDef_upcast (
-    void *src
-  )
-{
-  IR::PublishesDef **tmp =
-    ACE_static_cast (IR::PublishesDef **, src);
-  return *tmp;
-}
-
 ACE_INLINE
 IR::PublishesDef::PublishesDef (
     TAO_Stub *objref,
@@ -5334,49 +5076,6 @@ IR::PublishesDef::PublishesDef (
 #if !defined (_IR_CONSUMESDEF___CI_)
 #define _IR_CONSUMESDEF___CI_
 
-ACE_INLINE IR::ConsumesDef_ptr
-tao_IR_ConsumesDef_duplicate (
-    IR::ConsumesDef_ptr p
-  )
-{
-  return IR::ConsumesDef::_duplicate (p);
-}
-
-ACE_INLINE void
-tao_IR_ConsumesDef_release (
-    IR::ConsumesDef_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-ACE_INLINE IR::ConsumesDef_ptr
-tao_IR_ConsumesDef_nil (
-    void
-  )
-{
-  return IR::ConsumesDef::_nil ();
-}
-
-ACE_INLINE IR::ConsumesDef_ptr
-tao_IR_ConsumesDef_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return IR::ConsumesDef::_narrow (p, ACE_TRY_ENV);
-}
-
-ACE_INLINE CORBA::Object *
-tao_IR_ConsumesDef_upcast (
-    void *src
-  )
-{
-  IR::ConsumesDef **tmp =
-    ACE_static_cast (IR::ConsumesDef **, src);
-  return *tmp;
-}
-
 ACE_INLINE
 IR::ConsumesDef::ConsumesDef (
     TAO_Stub *objref,
@@ -5395,49 +5094,6 @@ IR::ConsumesDef::ConsumesDef (
 #if !defined (_IR_COMPONENTDEF___CI_)
 #define _IR_COMPONENTDEF___CI_
 
-ACE_INLINE IR::ComponentDef_ptr
-tao_IR_ComponentDef_duplicate (
-    IR::ComponentDef_ptr p
-  )
-{
-  return IR::ComponentDef::_duplicate (p);
-}
-
-ACE_INLINE void
-tao_IR_ComponentDef_release (
-    IR::ComponentDef_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-ACE_INLINE IR::ComponentDef_ptr
-tao_IR_ComponentDef_nil (
-    void
-  )
-{
-  return IR::ComponentDef::_nil ();
-}
-
-ACE_INLINE IR::ComponentDef_ptr
-tao_IR_ComponentDef_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return IR::ComponentDef::_narrow (p, ACE_TRY_ENV);
-}
-
-ACE_INLINE CORBA::Object *
-tao_IR_ComponentDef_upcast (
-    void *src
-  )
-{
-  IR::ComponentDef **tmp =
-    ACE_static_cast (IR::ComponentDef **, src);
-  return *tmp;
-}
-
 ACE_INLINE
 IR::ComponentDef::ComponentDef (
     TAO_Stub *objref,
@@ -5649,49 +5305,6 @@ IR::ComponentDescription_out::operator-> (void)
 #if !defined (_IR_PRIMARYKEYDEF___CI_)
 #define _IR_PRIMARYKEYDEF___CI_
 
-ACE_INLINE IR::PrimaryKeyDef_ptr
-tao_IR_PrimaryKeyDef_duplicate (
-    IR::PrimaryKeyDef_ptr p
-  )
-{
-  return IR::PrimaryKeyDef::_duplicate (p);
-}
-
-ACE_INLINE void
-tao_IR_PrimaryKeyDef_release (
-    IR::PrimaryKeyDef_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-ACE_INLINE IR::PrimaryKeyDef_ptr
-tao_IR_PrimaryKeyDef_nil (
-    void
-  )
-{
-  return IR::PrimaryKeyDef::_nil ();
-}
-
-ACE_INLINE IR::PrimaryKeyDef_ptr
-tao_IR_PrimaryKeyDef_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return IR::PrimaryKeyDef::_narrow (p, ACE_TRY_ENV);
-}
-
-ACE_INLINE CORBA::Object *
-tao_IR_PrimaryKeyDef_upcast (
-    void *src
-  )
-{
-  IR::PrimaryKeyDef **tmp =
-    ACE_static_cast (IR::PrimaryKeyDef **, src);
-  return *tmp;
-}
-
 ACE_INLINE
 IR::PrimaryKeyDef::PrimaryKeyDef (
     TAO_Stub *objref,
@@ -5903,49 +5516,6 @@ IR::PrimaryKeyDescription_out::operator-> (void)
 #if !defined (_IR_FACTORYDEF___CI_)
 #define _IR_FACTORYDEF___CI_
 
-ACE_INLINE IR::FactoryDef_ptr
-tao_IR_FactoryDef_duplicate (
-    IR::FactoryDef_ptr p
-  )
-{
-  return IR::FactoryDef::_duplicate (p);
-}
-
-ACE_INLINE void
-tao_IR_FactoryDef_release (
-    IR::FactoryDef_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-ACE_INLINE IR::FactoryDef_ptr
-tao_IR_FactoryDef_nil (
-    void
-  )
-{
-  return IR::FactoryDef::_nil ();
-}
-
-ACE_INLINE IR::FactoryDef_ptr
-tao_IR_FactoryDef_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return IR::FactoryDef::_narrow (p, ACE_TRY_ENV);
-}
-
-ACE_INLINE CORBA::Object *
-tao_IR_FactoryDef_upcast (
-    void *src
-  )
-{
-  IR::FactoryDef **tmp =
-    ACE_static_cast (IR::FactoryDef **, src);
-  return *tmp;
-}
-
 ACE_INLINE
 IR::FactoryDef::FactoryDef (
     TAO_Stub *objref,
@@ -5964,49 +5534,6 @@ IR::FactoryDef::FactoryDef (
 #if !defined (_IR_FINDERDEF___CI_)
 #define _IR_FINDERDEF___CI_
 
-ACE_INLINE IR::FinderDef_ptr
-tao_IR_FinderDef_duplicate (
-    IR::FinderDef_ptr p
-  )
-{
-  return IR::FinderDef::_duplicate (p);
-}
-
-ACE_INLINE void
-tao_IR_FinderDef_release (
-    IR::FinderDef_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-ACE_INLINE IR::FinderDef_ptr
-tao_IR_FinderDef_nil (
-    void
-  )
-{
-  return IR::FinderDef::_nil ();
-}
-
-ACE_INLINE IR::FinderDef_ptr
-tao_IR_FinderDef_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return IR::FinderDef::_narrow (p, ACE_TRY_ENV);
-}
-
-ACE_INLINE CORBA::Object *
-tao_IR_FinderDef_upcast (
-    void *src
-  )
-{
-  IR::FinderDef **tmp =
-    ACE_static_cast (IR::FinderDef **, src);
-  return *tmp;
-}
-
 ACE_INLINE
 IR::FinderDef::FinderDef (
     TAO_Stub *objref,
@@ -6025,49 +5552,6 @@ IR::FinderDef::FinderDef (
 #if !defined (_IR_HOMEDEF___CI_)
 #define _IR_HOMEDEF___CI_
 
-ACE_INLINE IR::HomeDef_ptr
-tao_IR_HomeDef_duplicate (
-    IR::HomeDef_ptr p
-  )
-{
-  return IR::HomeDef::_duplicate (p);
-}
-
-ACE_INLINE void
-tao_IR_HomeDef_release (
-    IR::HomeDef_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-ACE_INLINE IR::HomeDef_ptr
-tao_IR_HomeDef_nil (
-    void
-  )
-{
-  return IR::HomeDef::_nil ();
-}
-
-ACE_INLINE IR::HomeDef_ptr
-tao_IR_HomeDef_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return IR::HomeDef::_narrow (p, ACE_TRY_ENV);
-}
-
-ACE_INLINE CORBA::Object *
-tao_IR_HomeDef_upcast (
-    void *src
-  )
-{
-  IR::HomeDef **tmp =
-    ACE_static_cast (IR::HomeDef **, src);
-  return *tmp;
-}
-
 ACE_INLINE
 IR::HomeDef::HomeDef (
     TAO_Stub *objref,
diff --git a/TAO/tao/IFR_Client/IFR_ExtendedC.cpp b/TAO/tao/IFR_Client/IFR_ExtendedC.cpp
index 6f4317018eb..898797beb30 100644
--- a/TAO/tao/IFR_Client/IFR_ExtendedC.cpp
+++ b/TAO/tao/IFR_Client/IFR_ExtendedC.cpp
@@ -34,6 +34,49 @@
 #include "IFR_ExtendedC.i"
 #endif /* !defined INLINE */
 
+CORBA_FixedDef_ptr
+tao_CORBA_FixedDef_duplicate (
+    CORBA_FixedDef_ptr p
+  )
+{
+  return CORBA_FixedDef::_duplicate (p);
+}
+
+void
+tao_CORBA_FixedDef_release (
+    CORBA_FixedDef_ptr p
+  )
+{
+  CORBA::release (p);
+}
+
+CORBA_FixedDef_ptr
+tao_CORBA_FixedDef_nil (
+    void
+  )
+{
+  return CORBA_FixedDef::_nil ();
+}
+
+CORBA_FixedDef_ptr
+tao_CORBA_FixedDef_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return CORBA_FixedDef::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+tao_CORBA_FixedDef_upcast (
+    void *src
+  )
+{
+  CORBA_FixedDef **tmp =
+    ACE_static_cast (CORBA_FixedDef **, src);
+  return *tmp;
+}
+
 // *************************************************************
 // Operations for class CORBA_FixedDef_var
 // *************************************************************
@@ -1609,6 +1652,49 @@ void CORBA_ValueMemberSeq::_tao_any_destructor (void *x)
 
 #endif /* end #if !defined */
 
+CORBA_ValueMemberDef_ptr
+tao_CORBA_ValueMemberDef_duplicate (
+    CORBA_ValueMemberDef_ptr p
+  )
+{
+  return CORBA_ValueMemberDef::_duplicate (p);
+}
+
+void
+tao_CORBA_ValueMemberDef_release (
+    CORBA_ValueMemberDef_ptr p
+  )
+{
+  CORBA::release (p);
+}
+
+CORBA_ValueMemberDef_ptr
+tao_CORBA_ValueMemberDef_nil (
+    void
+  )
+{
+  return CORBA_ValueMemberDef::_nil ();
+}
+
+CORBA_ValueMemberDef_ptr
+tao_CORBA_ValueMemberDef_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return CORBA_ValueMemberDef::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+tao_CORBA_ValueMemberDef_upcast (
+    void *src
+  )
+{
+  CORBA_ValueMemberDef **tmp =
+    ACE_static_cast (CORBA_ValueMemberDef **, src);
+  return *tmp;
+}
+
 // *************************************************************
 // Operations for class CORBA_ValueMemberDef_var
 // *************************************************************
@@ -3355,6 +3441,49 @@ void CORBA_ValueMemberDef::access (
     );
 }
 
+CORBA_ValueDef_ptr
+tao_CORBA_ValueDef_duplicate (
+    CORBA_ValueDef_ptr p
+  )
+{
+  return CORBA_ValueDef::_duplicate (p);
+}
+
+void
+tao_CORBA_ValueDef_release (
+    CORBA_ValueDef_ptr p
+  )
+{
+  CORBA::release (p);
+}
+
+CORBA_ValueDef_ptr
+tao_CORBA_ValueDef_nil (
+    void
+  )
+{
+  return CORBA_ValueDef::_nil ();
+}
+
+CORBA_ValueDef_ptr
+tao_CORBA_ValueDef_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return CORBA_ValueDef::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+tao_CORBA_ValueDef_upcast (
+    void *src
+  )
+{
+  CORBA_ValueDef **tmp =
+    ACE_static_cast (CORBA_ValueDef **, src);
+  return *tmp;
+}
+
 // *************************************************************
 // Operations for class CORBA_ValueDef_var
 // *************************************************************
@@ -10579,6 +10708,49 @@ void CORBA_ValueDescription::_tao_any_destructor (void *x)
   delete tmp;
 }
 
+CORBA_ValueBoxDef_ptr
+tao_CORBA_ValueBoxDef_duplicate (
+    CORBA_ValueBoxDef_ptr p
+  )
+{
+  return CORBA_ValueBoxDef::_duplicate (p);
+}
+
+void
+tao_CORBA_ValueBoxDef_release (
+    CORBA_ValueBoxDef_ptr p
+  )
+{
+  CORBA::release (p);
+}
+
+CORBA_ValueBoxDef_ptr
+tao_CORBA_ValueBoxDef_nil (
+    void
+  )
+{
+  return CORBA_ValueBoxDef::_nil ();
+}
+
+CORBA_ValueBoxDef_ptr
+tao_CORBA_ValueBoxDef_narrow (
+    CORBA::Object *p,
+    CORBA::Environment &ACE_TRY_ENV
+  )
+{
+  return CORBA_ValueBoxDef::_narrow (p, ACE_TRY_ENV);
+}
+
+CORBA::Object *
+tao_CORBA_ValueBoxDef_upcast (
+    void *src
+  )
+{
+  CORBA_ValueBoxDef **tmp =
+    ACE_static_cast (CORBA_ValueBoxDef **, src);
+  return *tmp;
+}
+
 // *************************************************************
 // Operations for class CORBA_ValueBoxDef_var
 // *************************************************************
diff --git a/TAO/tao/IFR_Client/IFR_ExtendedC.i b/TAO/tao/IFR_Client/IFR_ExtendedC.i
index 416c1ae435a..3cd99189195 100644
--- a/TAO/tao/IFR_Client/IFR_ExtendedC.i
+++ b/TAO/tao/IFR_Client/IFR_ExtendedC.i
@@ -23,49 +23,6 @@
 #if !defined (_CORBA_FIXEDDEF___CI_)
 #define _CORBA_FIXEDDEF___CI_
 
-ACE_INLINE CORBA_FixedDef_ptr
-tao_CORBA_FixedDef_duplicate (
-    CORBA_FixedDef_ptr p
-  )
-{
-  return CORBA_FixedDef::_duplicate (p);
-}
-
-ACE_INLINE void
-tao_CORBA_FixedDef_release (
-    CORBA_FixedDef_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-ACE_INLINE CORBA_FixedDef_ptr
-tao_CORBA_FixedDef_nil (
-    void
-  )
-{
-  return CORBA_FixedDef::_nil ();
-}
-
-ACE_INLINE CORBA_FixedDef_ptr
-tao_CORBA_FixedDef_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return CORBA_FixedDef::_narrow (p, ACE_TRY_ENV);
-}
-
-ACE_INLINE CORBA::Object *
-tao_CORBA_FixedDef_upcast (
-    void *src
-  )
-{
-  CORBA_FixedDef **tmp =
-    ACE_static_cast (CORBA_FixedDef **, src);
-  return *tmp;
-}
-
 ACE_INLINE
 CORBA_FixedDef::CORBA_FixedDef (
     TAO_Stub *objref,
@@ -671,49 +628,6 @@ CORBA_ValueMemberSeq_out::operator[] (CORBA::ULong index)
 #if !defined (_CORBA_VALUEMEMBERDEF___CI_)
 #define _CORBA_VALUEMEMBERDEF___CI_
 
-ACE_INLINE CORBA_ValueMemberDef_ptr
-tao_CORBA_ValueMemberDef_duplicate (
-    CORBA_ValueMemberDef_ptr p
-  )
-{
-  return CORBA_ValueMemberDef::_duplicate (p);
-}
-
-ACE_INLINE void
-tao_CORBA_ValueMemberDef_release (
-    CORBA_ValueMemberDef_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-ACE_INLINE CORBA_ValueMemberDef_ptr
-tao_CORBA_ValueMemberDef_nil (
-    void
-  )
-{
-  return CORBA_ValueMemberDef::_nil ();
-}
-
-ACE_INLINE CORBA_ValueMemberDef_ptr
-tao_CORBA_ValueMemberDef_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return CORBA_ValueMemberDef::_narrow (p, ACE_TRY_ENV);
-}
-
-ACE_INLINE CORBA::Object *
-tao_CORBA_ValueMemberDef_upcast (
-    void *src
-  )
-{
-  CORBA_ValueMemberDef **tmp =
-    ACE_static_cast (CORBA_ValueMemberDef **, src);
-  return *tmp;
-}
-
 ACE_INLINE
 CORBA_ValueMemberDef::CORBA_ValueMemberDef (
     TAO_Stub *objref,
@@ -925,49 +839,6 @@ CORBA_ValueDef::FullValueDescription_out::operator-> (void)
 #if !defined (_CORBA_VALUEDEF___CI_)
 #define _CORBA_VALUEDEF___CI_
 
-ACE_INLINE CORBA_ValueDef_ptr
-tao_CORBA_ValueDef_duplicate (
-    CORBA_ValueDef_ptr p
-  )
-{
-  return CORBA_ValueDef::_duplicate (p);
-}
-
-ACE_INLINE void
-tao_CORBA_ValueDef_release (
-    CORBA_ValueDef_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-ACE_INLINE CORBA_ValueDef_ptr
-tao_CORBA_ValueDef_nil (
-    void
-  )
-{
-  return CORBA_ValueDef::_nil ();
-}
-
-ACE_INLINE CORBA_ValueDef_ptr
-tao_CORBA_ValueDef_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return CORBA_ValueDef::_narrow (p, ACE_TRY_ENV);
-}
-
-ACE_INLINE CORBA::Object *
-tao_CORBA_ValueDef_upcast (
-    void *src
-  )
-{
-  CORBA_ValueDef **tmp =
-    ACE_static_cast (CORBA_ValueDef **, src);
-  return *tmp;
-}
-
 ACE_INLINE
 CORBA_ValueDef::CORBA_ValueDef (
     TAO_Stub *objref,
@@ -1179,49 +1050,6 @@ CORBA_ValueDescription_out::operator-> (void)
 #if !defined (_CORBA_VALUEBOXDEF___CI_)
 #define _CORBA_VALUEBOXDEF___CI_
 
-ACE_INLINE CORBA_ValueBoxDef_ptr
-tao_CORBA_ValueBoxDef_duplicate (
-    CORBA_ValueBoxDef_ptr p
-  )
-{
-  return CORBA_ValueBoxDef::_duplicate (p);
-}
-
-ACE_INLINE void
-tao_CORBA_ValueBoxDef_release (
-    CORBA_ValueBoxDef_ptr p
-  )
-{
-  CORBA::release (p);
-}
-
-ACE_INLINE CORBA_ValueBoxDef_ptr
-tao_CORBA_ValueBoxDef_nil (
-    void
-  )
-{
-  return CORBA_ValueBoxDef::_nil ();
-}
-
-ACE_INLINE CORBA_ValueBoxDef_ptr
-tao_CORBA_ValueBoxDef_narrow (
-    CORBA::Object *p,
-    CORBA::Environment &ACE_TRY_ENV
-  )
-{
-  return CORBA_ValueBoxDef::_narrow (p, ACE_TRY_ENV);
-}
-
-ACE_INLINE CORBA::Object *
-tao_CORBA_ValueBoxDef_upcast (
-    void *src
-  )
-{
-  CORBA_ValueBoxDef **tmp =
-    ACE_static_cast (CORBA_ValueBoxDef **, src);
-  return *tmp;
-}
-
 ACE_INLINE
 CORBA_ValueBoxDef::CORBA_ValueBoxDef (
     TAO_Stub *objref,
diff --git a/TAO/tao/IFR_Client/diffs/IFR_BaseC.cpp.diff b/TAO/tao/IFR_Client/diffs/IFR_BaseC.cpp.diff
index 3ccd7f7e4e2..86515b859f1 100644
--- a/TAO/tao/IFR_Client/diffs/IFR_BaseC.cpp.diff
+++ b/TAO/tao/IFR_Client/diffs/IFR_BaseC.cpp.diff
@@ -1,5 +1,5 @@
---- orig/IFR_BaseC.cpp	Mon Apr 23 20:19:29 2001
-+++ IFR_BaseC.cpp	Mon Apr 23 19:56:56 2001
+--- orig/IFR_BaseC.cpp	Tue Apr 24 23:25:42 2001
++++ IFR_BaseC.cpp	Tue Apr 24 22:49:23 2001
 @@ -1,6 +1,6 @@
  // -*- C++ -*-
  //
@@ -173,10 +173,10 @@
 -TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_DefinitionKind, &_tc_TAO_tc_CORBA_DefinitionKind)
 -TAO_NAMESPACE_END
 -
- // *************************************************************
- // Operations for class CORBA_IRObject_var
- // *************************************************************
-@@ -944,7 +795,7 @@
+ CORBA_IRObject_ptr
+ tao_CORBA_IRObject_duplicate (
+     CORBA_IRObject_ptr p
+@@ -987,7 +838,7 @@
      return CORBA_IRObject::_nil ();
    if (! obj->_is_local ())
      {
@@ -185,7 +185,7 @@
        ACE_CHECK_RETURN (CORBA_IRObject::_nil ());
        if (is_a == 0)
          return CORBA_IRObject::_nil ();
-@@ -1012,7 +863,7 @@
+@@ -1055,7 +906,7 @@
  CORBA::Boolean CORBA_IRObject::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
  {
    if (
@@ -194,7 +194,7 @@
      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
    return 1; // success using local knowledge
    else
-@@ -1037,7 +888,7 @@
+@@ -1080,7 +931,7 @@
  
  const char* CORBA_IRObject::_interface_repository_id (void) const
  {
@@ -203,7 +203,7 @@
  }
  
  CORBA::DefinitionKind CORBA_IRObject::def_kind (
-@@ -1074,36 +925,6 @@
+@@ -1117,36 +968,6 @@
      );
  }
  
@@ -237,10 +237,10 @@
 -CORBA::TypeCode_ptr _tc_CORBA_IRObject =
 -  &_tc_TAO_tc_CORBA_IRObject;
 -
- // *************************************************************
- // Operations for class CORBA_Contained_var
- // *************************************************************
-@@ -4161,7 +3982,7 @@
+ CORBA_Contained_ptr
+ tao_CORBA_Contained_duplicate (
+     CORBA_Contained_ptr p
+@@ -4247,7 +4068,7 @@
      return CORBA_Contained::_nil ();
    if (! obj->_is_local ())
      {
@@ -249,7 +249,7 @@
        ACE_CHECK_RETURN (CORBA_Contained::_nil ());
        if (is_a == 0)
          return CORBA_Contained::_nil ();
-@@ -4229,8 +4050,8 @@
+@@ -4315,8 +4136,8 @@
  CORBA::Boolean CORBA_Contained::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
  {
    if (
@@ -260,7 +260,7 @@
      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
    return 1; // success using local knowledge
    else
-@@ -4267,7 +4088,7 @@
+@@ -4353,7 +4174,7 @@
  
  const char* CORBA_Contained::_interface_repository_id (void) const
  {
@@ -269,7 +269,7 @@
  }
  
  char * CORBA_Contained::id (
-@@ -4437,13 +4258,13 @@
+@@ -4523,13 +4344,13 @@
    ACE_NTOHL (0x6f6d672e), 
    ACE_NTOHL (0x6f72672f), 
    ACE_NTOHL (0x434f5242), 
@@ -285,7 +285,7 @@
    12,
    ACE_NTOHL (0x44657363), 
    ACE_NTOHL (0x72697074), 
-@@ -4650,37 +4471,6 @@
+@@ -4736,37 +4557,6 @@
      );
  }
  
@@ -323,7 +323,7 @@
  #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
    
  #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_CONTAINEDSEQ_CS_)
-@@ -4821,62 +4611,6 @@
+@@ -4907,62 +4697,6 @@
  
  #endif /* end #if !defined */
  
@@ -386,7 +386,7 @@
  #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
    
  #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_INTERFACEDEFSEQ_CS_)
-@@ -5016,66 +4750,6 @@
+@@ -5102,66 +4836,6 @@
  
  #endif /* end #if !defined */
  
@@ -453,7 +453,7 @@
  #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
    
  #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_VALUEDEFSEQ_CS_)
-@@ -5215,62 +4889,6 @@
+@@ -5301,62 +4975,6 @@
  
  #endif /* end #if !defined */
  
@@ -516,7 +516,7 @@
  #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
    
  #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_ABSTRACTINTERFACEDEFSEQ_CS_)
-@@ -5410,74 +5028,6 @@
+@@ -5496,74 +5114,6 @@
  
  #endif /* end #if !defined */
  
@@ -591,7 +591,7 @@
  #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
    
  #if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_LOCALINTERFACEDEFSEQ_CS_)
-@@ -5617,134 +5167,6 @@
+@@ -5703,134 +5253,6 @@
  
  #endif /* end #if !defined */
  
@@ -726,18 +726,10 @@
  void CORBA_StructMember::_tao_any_destructor (void *x)
  {
    CORBA_StructMember *tmp = ACE_static_cast (CORBA_StructMember*,x);
-@@ -5834,231 +5256,18 @@
- #else /* TAO_USE_SEQUENCE_TEMPLATES */
-   TAO_Unbounded_Sequence<CORBA_StructMember>
- #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
-- (seq)
--{}
--CORBA_StructMemberSeq::~CORBA_StructMemberSeq (void) // dtor
--{}
--void CORBA_StructMemberSeq::_tao_any_destructor (void *x)
--{
--  CORBA_StructMemberSeq *tmp = ACE_static_cast (CORBA_StructMemberSeq*,x);
--  delete tmp;
+@@ -5928,223 +5350,10 @@
+ {
+   CORBA_StructMemberSeq *tmp = ACE_static_cast (CORBA_StructMemberSeq*,x);
+   delete tmp;
 -}
 -
 -
@@ -944,16 +936,7 @@
 -  CORBA::tk_string, 
 -  0U, // string length
 -};
-+ (seq)
-+{}
-+CORBA_StructMemberSeq::~CORBA_StructMemberSeq (void) // dtor
-+{}
-+void CORBA_StructMemberSeq::_tao_any_destructor (void *x)
-+{
-+  CORBA_StructMemberSeq *tmp = ACE_static_cast (CORBA_StructMemberSeq*,x);
-+  delete tmp;
-+}
- 
+-
 -static CORBA::TypeCode _tc_TAO_tc_CORBA_Initializer (
 -    CORBA::tk_struct,
 -    sizeof (_oc_CORBA_Initializer),
@@ -961,6 +944,8 @@
 -    0,
 -    sizeof (CORBA_Initializer)
 -  );
++}
++
  
 -CORBA::TypeCode_ptr _tc_CORBA_Initializer =
 -  &_tc_TAO_tc_CORBA_Initializer;
@@ -968,7 +953,7 @@
  
  void CORBA_Initializer::_tao_any_destructor (void *x)
  {
-@@ -6162,224 +5371,6 @@
+@@ -6248,224 +5457,6 @@
  
  #endif /* end #if !defined */
  
@@ -1193,7 +1178,7 @@
  void CORBA_UnionMember::_tao_any_destructor (void *x)
  {
    CORBA_UnionMember *tmp = ACE_static_cast (CORBA_UnionMember*,x);
-@@ -6482,104 +5473,6 @@
+@@ -6568,104 +5559,6 @@
  
  #endif /* end #if !defined */
  
@@ -1298,7 +1283,7 @@
  #if !defined (_CORBA_ENUMMEMBERSEQ_CS_)
  #define _CORBA_ENUMMEMBERSEQ_CS_
  
-@@ -6627,45 +5520,6 @@
+@@ -6713,45 +5606,6 @@
  
  #endif /* end #if !defined */
  
@@ -1341,10 +1326,10 @@
 -CORBA::TypeCode_ptr _tc_CORBA_EnumMemberSeq =
 -  &_tc_TAO_tc_CORBA_EnumMemberSeq;
 -
- // *************************************************************
- // Operations for class CORBA_Container_var
- // *************************************************************
-@@ -12280,7 +11134,7 @@
+ CORBA_Container_ptr
+ tao_CORBA_Container_duplicate (
+     CORBA_Container_ptr p
+@@ -12409,7 +11263,7 @@
      return CORBA_Container::_nil ();
    if (! obj->_is_local ())
      {
@@ -1353,7 +1338,7 @@
        ACE_CHECK_RETURN (CORBA_Container::_nil ());
        if (is_a == 0)
          return CORBA_Container::_nil ();
-@@ -12348,8 +11202,8 @@
+@@ -12477,8 +11331,8 @@
  CORBA::Boolean CORBA_Container::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
  {
    if (
@@ -1364,7 +1349,7 @@
      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
    return 1; // success using local knowledge
    else
-@@ -12386,7 +11240,7 @@
+@@ -12515,7 +11369,7 @@
  
  const char* CORBA_Container::_interface_repository_id (void) const
  {
@@ -1373,7 +1358,7 @@
  }
  
  CORBA_Contained_ptr CORBA_Container::lookup (
-@@ -12462,13 +11316,13 @@
+@@ -12591,13 +11445,13 @@
    ACE_NTOHL (0x6f6d672e), 
    ACE_NTOHL (0x6f72672f), 
    ACE_NTOHL (0x434f5242), 
@@ -1389,7 +1374,7 @@
    12,
    ACE_NTOHL (0x44657363), 
    ACE_NTOHL (0x72697074), 
-@@ -12481,22 +11335,21 @@
+@@ -12610,22 +11464,21 @@
    ACE_NTOHL (0x6a656374), 
    ACE_NTOHL (0x0),  // name = contained_object
    CORBA::tk_objref, // typecode kind
@@ -1419,7 +1404,7 @@
  
    5,
    ACE_NTOHL (0x6b696e64), 
-@@ -12763,37 +11616,37 @@
+@@ -12892,37 +11745,37 @@
    ACE_NTOHL (0x6f6d672e), 
    ACE_NTOHL (0x6f72672f), 
    ACE_NTOHL (0x434f5242), 
@@ -1463,7 +1448,7 @@
        12,
        ACE_NTOHL (0x44657363), 
        ACE_NTOHL (0x72697074), 
-@@ -12806,22 +11659,21 @@
+@@ -12935,22 +11788,21 @@
        ACE_NTOHL (0x6a656374), 
        ACE_NTOHL (0x0),  // name = contained_object
        CORBA::tk_objref, // typecode kind
@@ -1493,7 +1478,7 @@
  
        5,
        ACE_NTOHL (0x6b696e64), 
-@@ -13341,36 +12193,6 @@
+@@ -13470,36 +12322,6 @@
      );
  }
  
@@ -1527,10 +1512,10 @@
 -CORBA::TypeCode_ptr _tc_CORBA_Container =
 -  &_tc_TAO_tc_CORBA_Container;
 -
- // *************************************************************
- // Operations for class CORBA_IDLType_var
- // *************************************************************
-@@ -13913,7 +12735,7 @@
+ CORBA_IDLType_ptr
+ tao_CORBA_IDLType_duplicate (
+     CORBA_IDLType_ptr p
+@@ -14085,7 +12907,7 @@
      return CORBA_IDLType::_nil ();
    if (! obj->_is_local ())
      {
@@ -1539,7 +1524,7 @@
        ACE_CHECK_RETURN (CORBA_IDLType::_nil ());
        if (is_a == 0)
          return CORBA_IDLType::_nil ();
-@@ -13981,8 +12803,8 @@
+@@ -14153,8 +12975,8 @@
  CORBA::Boolean CORBA_IDLType::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
  {
    if (
@@ -1550,7 +1535,7 @@
      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
    return 1; // success using local knowledge
    else
-@@ -14019,7 +12841,7 @@
+@@ -14191,7 +13013,7 @@
  
  const char* CORBA_IDLType::_interface_repository_id (void) const
  {
@@ -1559,7 +1544,7 @@
  }
  
  CORBA::TypeCode_ptr CORBA_IDLType::type (
-@@ -14039,36 +12861,6 @@
+@@ -14211,36 +13033,6 @@
      );
  }
  
@@ -1593,10 +1578,10 @@
 -CORBA::TypeCode_ptr _tc_CORBA_IDLType =
 -  &_tc_TAO_tc_CORBA_IDLType;
 -
- // *************************************************************
- // Operations for class CORBA_TypedefDef_var
- // *************************************************************
-@@ -14360,7 +13152,7 @@
+ CORBA_TypedefDef_ptr
+ tao_CORBA_TypedefDef_duplicate (
+     CORBA_TypedefDef_ptr p
+@@ -14575,7 +13367,7 @@
      return CORBA_TypedefDef::_nil ();
    if (! obj->_is_local ())
      {
@@ -1605,7 +1590,7 @@
        ACE_CHECK_RETURN (CORBA_TypedefDef::_nil ());
        if (is_a == 0)
          return CORBA_TypedefDef::_nil ();
-@@ -14428,10 +13220,10 @@
+@@ -14643,10 +13435,10 @@
  CORBA::Boolean CORBA_TypedefDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
  {
    if (
@@ -1620,7 +1605,7 @@
      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
    return 1; // success using local knowledge
    else
-@@ -14492,101 +13284,9 @@
+@@ -14707,101 +13499,9 @@
  
  const char* CORBA_TypedefDef::_interface_repository_id (void) const
  {
@@ -1723,7 +1708,7 @@
  void CORBA_TypeDescription::_tao_any_destructor (void *x)
  {
    CORBA_TypeDescription *tmp = ACE_static_cast (CORBA_TypeDescription*,x);
-@@ -14639,7 +13339,7 @@
+@@ -14854,7 +13554,7 @@
    if (stream << _tao_elem)
    {
      _tao_any._tao_replace (
@@ -1732,7 +1717,7 @@
          TAO_ENCAP_BYTE_ORDER,
          stream.begin (),
          1,
-@@ -14656,7 +13356,7 @@
+@@ -14871,7 +13571,7 @@
      _tao_elem = CORBA_IRObject::_nil ();
      CORBA::TypeCode_var type = _tao_any.type ();
      
@@ -1741,7 +1726,7 @@
      ACE_TRY_CHECK;
      
      if (!result)
-@@ -14669,7 +13369,7 @@
+@@ -14884,7 +13584,7 @@
      if (stream >> _tao_elem)
      {
        ((CORBA::Any *)&_tao_any)->_tao_replace (
@@ -1750,7 +1735,7 @@
            1,
            _tao_elem,
            CORBA_IRObject::_tao_any_destructor
-@@ -14700,7 +13400,7 @@
+@@ -14915,7 +13615,7 @@
    if (stream << _tao_elem)
    {
      _tao_any._tao_replace (
@@ -1759,7 +1744,7 @@
          TAO_ENCAP_BYTE_ORDER,
          stream.begin (),
          1,
-@@ -14717,7 +13417,7 @@
+@@ -14932,7 +13632,7 @@
      _tao_elem = CORBA_Contained::_nil ();
      CORBA::TypeCode_var type = _tao_any.type ();
      
@@ -1768,7 +1753,7 @@
      ACE_TRY_CHECK;
      
      if (!result)
-@@ -14730,7 +13430,7 @@
+@@ -14945,7 +13645,7 @@
      if (stream >> _tao_elem)
      {
        ((CORBA::Any *)&_tao_any)->_tao_replace (
@@ -1777,7 +1762,7 @@
            1,
            _tao_elem,
            CORBA_Contained::_tao_any_destructor
-@@ -14847,7 +13547,7 @@
+@@ -15062,7 +13762,7 @@
    if (stream << _tao_elem)
    {
      _tao_any._tao_replace (
@@ -1786,7 +1771,7 @@
          TAO_ENCAP_BYTE_ORDER,
          stream.begin ()
        );
-@@ -14859,7 +13559,7 @@
+@@ -15074,7 +13774,7 @@
    TAO_OutputCDR stream;
    stream << *_tao_elem;
    _tao_any._tao_replace (
@@ -1795,7 +1780,7 @@
        TAO_ENCAP_BYTE_ORDER,
        stream.begin (),
        1,
-@@ -14883,7 +13583,7 @@
+@@ -15098,7 +13798,7 @@
    {
      CORBA::TypeCode_var type = _tao_any.type ();
      
@@ -1804,7 +1789,7 @@
      ACE_TRY_CHECK;
      
      if (!result)
-@@ -14908,7 +13608,7 @@
+@@ -15123,7 +13823,7 @@
        if (stream >> *tmp)
        {
          ((CORBA::Any *)&_tao_any)->_tao_replace (
@@ -1813,7 +1798,7 @@
              1,
              ACE_static_cast (void *, tmp),
              CORBA_ContainedSeq::_tao_any_destructor
-@@ -14938,7 +13638,7 @@
+@@ -15153,7 +13853,7 @@
    if (stream << _tao_elem)
    {
      _tao_any._tao_replace (
@@ -1822,7 +1807,7 @@
          TAO_ENCAP_BYTE_ORDER,
          stream.begin ()
        );
-@@ -14950,7 +13650,7 @@
+@@ -15165,7 +13865,7 @@
    TAO_OutputCDR stream;
    stream << *_tao_elem;
    _tao_any._tao_replace (
@@ -1831,7 +1816,7 @@
        TAO_ENCAP_BYTE_ORDER,
        stream.begin (),
        1,
-@@ -14974,7 +13674,7 @@
+@@ -15189,7 +13889,7 @@
    {
      CORBA::TypeCode_var type = _tao_any.type ();
      
@@ -1840,7 +1825,7 @@
      ACE_TRY_CHECK;
      
      if (!result)
-@@ -14999,7 +13699,7 @@
+@@ -15214,7 +13914,7 @@
        if (stream >> *tmp)
        {
          ((CORBA::Any *)&_tao_any)->_tao_replace (
@@ -1849,7 +1834,7 @@
              1,
              ACE_static_cast (void *, tmp),
              CORBA_InterfaceDefSeq::_tao_any_destructor
-@@ -15029,7 +13729,7 @@
+@@ -15244,7 +13944,7 @@
    if (stream << _tao_elem)
    {
      _tao_any._tao_replace (
@@ -1858,7 +1843,7 @@
          TAO_ENCAP_BYTE_ORDER,
          stream.begin ()
        );
-@@ -15041,7 +13741,7 @@
+@@ -15256,7 +13956,7 @@
    TAO_OutputCDR stream;
    stream << *_tao_elem;
    _tao_any._tao_replace (
@@ -1867,7 +1852,7 @@
        TAO_ENCAP_BYTE_ORDER,
        stream.begin (),
        1,
-@@ -15065,7 +13765,7 @@
+@@ -15280,7 +13980,7 @@
    {
      CORBA::TypeCode_var type = _tao_any.type ();
      
@@ -1876,7 +1861,7 @@
      ACE_TRY_CHECK;
      
      if (!result)
-@@ -15090,7 +13790,7 @@
+@@ -15305,7 +14005,7 @@
        if (stream >> *tmp)
        {
          ((CORBA::Any *)&_tao_any)->_tao_replace (
@@ -1885,7 +1870,7 @@
              1,
              ACE_static_cast (void *, tmp),
              CORBA_ValueDefSeq::_tao_any_destructor
-@@ -15120,7 +13820,7 @@
+@@ -15335,7 +14035,7 @@
    if (stream << _tao_elem)
    {
      _tao_any._tao_replace (
@@ -1894,7 +1879,7 @@
          TAO_ENCAP_BYTE_ORDER,
          stream.begin ()
        );
-@@ -15132,7 +13832,7 @@
+@@ -15347,7 +14047,7 @@
    TAO_OutputCDR stream;
    stream << *_tao_elem;
    _tao_any._tao_replace (
@@ -1903,7 +1888,7 @@
        TAO_ENCAP_BYTE_ORDER,
        stream.begin (),
        1,
-@@ -15156,7 +13856,7 @@
+@@ -15371,7 +14071,7 @@
    {
      CORBA::TypeCode_var type = _tao_any.type ();
      
@@ -1912,7 +1897,7 @@
      ACE_TRY_CHECK;
      
      if (!result)
-@@ -15181,7 +13881,7 @@
+@@ -15396,7 +14096,7 @@
        if (stream >> *tmp)
        {
          ((CORBA::Any *)&_tao_any)->_tao_replace (
@@ -1921,7 +1906,7 @@
              1,
              ACE_static_cast (void *, tmp),
              CORBA_AbstractInterfaceDefSeq::_tao_any_destructor
-@@ -15211,7 +13911,7 @@
+@@ -15426,7 +14126,7 @@
    if (stream << _tao_elem)
    {
      _tao_any._tao_replace (
@@ -1930,7 +1915,7 @@
          TAO_ENCAP_BYTE_ORDER,
          stream.begin ()
        );
-@@ -15223,7 +13923,7 @@
+@@ -15438,7 +14138,7 @@
    TAO_OutputCDR stream;
    stream << *_tao_elem;
    _tao_any._tao_replace (
@@ -1939,7 +1924,7 @@
        TAO_ENCAP_BYTE_ORDER,
        stream.begin (),
        1,
-@@ -15247,7 +13947,7 @@
+@@ -15462,7 +14162,7 @@
    {
      CORBA::TypeCode_var type = _tao_any.type ();
      
@@ -1948,7 +1933,7 @@
      ACE_TRY_CHECK;
      
      if (!result)
-@@ -15272,7 +13972,7 @@
+@@ -15487,7 +14187,7 @@
        if (stream >> *tmp)
        {
          ((CORBA::Any *)&_tao_any)->_tao_replace (
@@ -1957,7 +1942,7 @@
              1,
              ACE_static_cast (void *, tmp),
              CORBA_LocalInterfaceDefSeq::_tao_any_destructor
-@@ -15298,7 +13998,7 @@
+@@ -15513,7 +14213,7 @@
    TAO_OutputCDR stream;
    stream << _tao_elem;
    _tao_any._tao_replace (
@@ -1966,7 +1951,7 @@
        TAO_ENCAP_BYTE_ORDER,
        stream.begin ()
      );
-@@ -15309,7 +14009,7 @@
+@@ -15524,7 +14224,7 @@
    TAO_OutputCDR stream;
    stream << *_tao_elem;
    _tao_any._tao_replace (
@@ -1975,7 +1960,7 @@
        TAO_ENCAP_BYTE_ORDER,
        stream.begin (),
        1,
-@@ -15330,7 +14030,7 @@
+@@ -15545,7 +14245,7 @@
    {
      CORBA::TypeCode_var type = _tao_any.type ();
      
@@ -1984,7 +1969,7 @@
      ACE_TRY_CHECK;
      
      if (!result)
-@@ -15355,7 +14055,7 @@
+@@ -15570,7 +14270,7 @@
        if (stream >> *tmp)
        {
          ((CORBA::Any *)&_tao_any)->_tao_replace (
@@ -1993,7 +1978,7 @@
              1,
              ACE_static_cast (void *, tmp),
              CORBA_StructMember::_tao_any_destructor
-@@ -15385,7 +14085,7 @@
+@@ -15600,7 +14300,7 @@
    if (stream << _tao_elem)
    {
      _tao_any._tao_replace (
@@ -2002,7 +1987,7 @@
          TAO_ENCAP_BYTE_ORDER,
          stream.begin ()
        );
-@@ -15397,7 +14097,7 @@
+@@ -15612,7 +14312,7 @@
    TAO_OutputCDR stream;
    stream << *_tao_elem;
    _tao_any._tao_replace (
@@ -2011,7 +1996,7 @@
        TAO_ENCAP_BYTE_ORDER,
        stream.begin (),
        1,
-@@ -15421,7 +14121,7 @@
+@@ -15636,7 +14336,7 @@
    {
      CORBA::TypeCode_var type = _tao_any.type ();
      
@@ -2020,7 +2005,7 @@
      ACE_TRY_CHECK;
      
      if (!result)
-@@ -15446,7 +14146,7 @@
+@@ -15661,7 +14361,7 @@
        if (stream >> *tmp)
        {
          ((CORBA::Any *)&_tao_any)->_tao_replace (
@@ -2029,7 +2014,7 @@
              1,
              ACE_static_cast (void *, tmp),
              CORBA_StructMemberSeq::_tao_any_destructor
-@@ -15472,7 +14172,7 @@
+@@ -15687,7 +14387,7 @@
    TAO_OutputCDR stream;
    stream << _tao_elem;
    _tao_any._tao_replace (
@@ -2038,7 +2023,7 @@
        TAO_ENCAP_BYTE_ORDER,
        stream.begin ()
      );
-@@ -15483,7 +14183,7 @@
+@@ -15698,7 +14398,7 @@
    TAO_OutputCDR stream;
    stream << *_tao_elem;
    _tao_any._tao_replace (
@@ -2047,7 +2032,7 @@
        TAO_ENCAP_BYTE_ORDER,
        stream.begin (),
        1,
-@@ -15504,7 +14204,7 @@
+@@ -15719,7 +14419,7 @@
    {
      CORBA::TypeCode_var type = _tao_any.type ();
      
@@ -2056,7 +2041,7 @@
      ACE_TRY_CHECK;
      
      if (!result)
-@@ -15529,7 +14229,7 @@
+@@ -15744,7 +14444,7 @@
        if (stream >> *tmp)
        {
          ((CORBA::Any *)&_tao_any)->_tao_replace (
@@ -2065,7 +2050,7 @@
              1,
              ACE_static_cast (void *, tmp),
              CORBA_Initializer::_tao_any_destructor
-@@ -15559,7 +14259,7 @@
+@@ -15774,7 +14474,7 @@
    if (stream << _tao_elem)
    {
      _tao_any._tao_replace (
@@ -2074,7 +2059,7 @@
          TAO_ENCAP_BYTE_ORDER,
          stream.begin ()
        );
-@@ -15571,7 +14271,7 @@
+@@ -15786,7 +14486,7 @@
    TAO_OutputCDR stream;
    stream << *_tao_elem;
    _tao_any._tao_replace (
@@ -2083,7 +2068,7 @@
        TAO_ENCAP_BYTE_ORDER,
        stream.begin (),
        1,
-@@ -15595,7 +14295,7 @@
+@@ -15810,7 +14510,7 @@
    {
      CORBA::TypeCode_var type = _tao_any.type ();
      
@@ -2092,7 +2077,7 @@
      ACE_TRY_CHECK;
      
      if (!result)
-@@ -15620,7 +14320,7 @@
+@@ -15835,7 +14535,7 @@
        if (stream >> *tmp)
        {
          ((CORBA::Any *)&_tao_any)->_tao_replace (
@@ -2101,7 +2086,7 @@
              1,
              ACE_static_cast (void *, tmp),
              CORBA_InitializerSeq::_tao_any_destructor
-@@ -15646,7 +14346,7 @@
+@@ -15861,7 +14561,7 @@
    TAO_OutputCDR stream;
    stream << _tao_elem;
    _tao_any._tao_replace (
@@ -2110,7 +2095,7 @@
        TAO_ENCAP_BYTE_ORDER,
        stream.begin ()
      );
-@@ -15657,7 +14357,7 @@
+@@ -15872,7 +14572,7 @@
    TAO_OutputCDR stream;
    stream << *_tao_elem;
    _tao_any._tao_replace (
@@ -2119,7 +2104,7 @@
        TAO_ENCAP_BYTE_ORDER,
        stream.begin (),
        1,
-@@ -15678,7 +14378,7 @@
+@@ -15893,7 +14593,7 @@
    {
      CORBA::TypeCode_var type = _tao_any.type ();
      
@@ -2128,7 +2113,7 @@
      ACE_TRY_CHECK;
      
      if (!result)
-@@ -15703,7 +14403,7 @@
+@@ -15918,7 +14618,7 @@
        if (stream >> *tmp)
        {
          ((CORBA::Any *)&_tao_any)->_tao_replace (
@@ -2137,7 +2122,7 @@
              1,
              ACE_static_cast (void *, tmp),
              CORBA_UnionMember::_tao_any_destructor
-@@ -15733,7 +14433,7 @@
+@@ -15948,7 +14648,7 @@
    if (stream << _tao_elem)
    {
      _tao_any._tao_replace (
@@ -2146,7 +2131,7 @@
          TAO_ENCAP_BYTE_ORDER,
          stream.begin ()
        );
-@@ -15745,7 +14445,7 @@
+@@ -15960,7 +14660,7 @@
    TAO_OutputCDR stream;
    stream << *_tao_elem;
    _tao_any._tao_replace (
@@ -2155,7 +2140,7 @@
        TAO_ENCAP_BYTE_ORDER,
        stream.begin (),
        1,
-@@ -15769,7 +14469,7 @@
+@@ -15984,7 +14684,7 @@
    {
      CORBA::TypeCode_var type = _tao_any.type ();
      
@@ -2164,7 +2149,7 @@
      ACE_TRY_CHECK;
      
      if (!result)
-@@ -15794,7 +14494,7 @@
+@@ -16009,7 +14709,7 @@
        if (stream >> *tmp)
        {
          ((CORBA::Any *)&_tao_any)->_tao_replace (
@@ -2173,7 +2158,7 @@
              1,
              ACE_static_cast (void *, tmp),
              CORBA_UnionMemberSeq::_tao_any_destructor
-@@ -15824,7 +14524,7 @@
+@@ -16039,7 +14739,7 @@
    if (stream << _tao_elem)
    {
      _tao_any._tao_replace (
@@ -2182,7 +2167,7 @@
          TAO_ENCAP_BYTE_ORDER,
          stream.begin ()
        );
-@@ -15836,7 +14536,7 @@
+@@ -16051,7 +14751,7 @@
    TAO_OutputCDR stream;
    stream << *_tao_elem;
    _tao_any._tao_replace (
@@ -2191,7 +2176,7 @@
        TAO_ENCAP_BYTE_ORDER,
        stream.begin (),
        1,
-@@ -15860,7 +14560,7 @@
+@@ -16075,7 +14775,7 @@
    {
      CORBA::TypeCode_var type = _tao_any.type ();
      
@@ -2200,7 +2185,7 @@
      ACE_TRY_CHECK;
      
      if (!result)
-@@ -15885,7 +14585,7 @@
+@@ -16100,7 +14800,7 @@
        if (stream >> *tmp)
        {
          ((CORBA::Any *)&_tao_any)->_tao_replace (
@@ -2209,7 +2194,7 @@
              1,
              ACE_static_cast (void *, tmp),
              CORBA_EnumMemberSeq::_tao_any_destructor
-@@ -15912,7 +14612,7 @@
+@@ -16127,7 +14827,7 @@
    if (stream << _tao_elem)
    {
      _tao_any._tao_replace (
@@ -2218,7 +2203,7 @@
          TAO_ENCAP_BYTE_ORDER,
          stream.begin (),
          1,
-@@ -15929,7 +14629,7 @@
+@@ -16144,7 +14844,7 @@
      _tao_elem = CORBA_Container::_nil ();
      CORBA::TypeCode_var type = _tao_any.type ();
      
@@ -2227,7 +2212,7 @@
      ACE_TRY_CHECK;
      
      if (!result)
-@@ -15942,7 +14642,7 @@
+@@ -16157,7 +14857,7 @@
      if (stream >> _tao_elem)
      {
        ((CORBA::Any *)&_tao_any)->_tao_replace (
@@ -2236,7 +2221,7 @@
            1,
            _tao_elem,
            CORBA_Container::_tao_any_destructor
-@@ -16147,7 +14847,7 @@
+@@ -16362,7 +15062,7 @@
    if (stream << _tao_elem)
    {
      _tao_any._tao_replace (
@@ -2245,7 +2230,7 @@
          TAO_ENCAP_BYTE_ORDER,
          stream.begin (),
          1,
-@@ -16164,7 +14864,7 @@
+@@ -16379,7 +15079,7 @@
      _tao_elem = CORBA_IDLType::_nil ();
      CORBA::TypeCode_var type = _tao_any.type ();
      
@@ -2254,7 +2239,7 @@
      ACE_TRY_CHECK;
      
      if (!result)
-@@ -16177,7 +14877,7 @@
+@@ -16392,7 +15092,7 @@
      if (stream >> _tao_elem)
      {
        ((CORBA::Any *)&_tao_any)->_tao_replace (
@@ -2263,7 +2248,7 @@
            1,
            _tao_elem,
            CORBA_IDLType::_tao_any_destructor
-@@ -16208,7 +14908,7 @@
+@@ -16423,7 +15123,7 @@
    if (stream << _tao_elem)
    {
      _tao_any._tao_replace (
@@ -2272,7 +2257,7 @@
          TAO_ENCAP_BYTE_ORDER,
          stream.begin (),
          1,
-@@ -16225,7 +14925,7 @@
+@@ -16440,7 +15140,7 @@
      _tao_elem = CORBA_TypedefDef::_nil ();
      CORBA::TypeCode_var type = _tao_any.type ();
      
@@ -2281,7 +2266,7 @@
      ACE_TRY_CHECK;
      
      if (!result)
-@@ -16238,7 +14938,7 @@
+@@ -16453,7 +15153,7 @@
      if (stream >> _tao_elem)
      {
        ((CORBA::Any *)&_tao_any)->_tao_replace (
@@ -2290,7 +2275,7 @@
            1,
            _tao_elem,
            CORBA_TypedefDef::_tao_any_destructor
-@@ -16268,7 +14968,7 @@
+@@ -16483,7 +15183,7 @@
    TAO_OutputCDR stream;
    stream << _tao_elem;
    _tao_any._tao_replace (
@@ -2299,7 +2284,7 @@
        TAO_ENCAP_BYTE_ORDER,
        stream.begin ()
      );
-@@ -16279,7 +14979,7 @@
+@@ -16494,7 +15194,7 @@
    TAO_OutputCDR stream;
    stream << *_tao_elem;
    _tao_any._tao_replace (
@@ -2308,7 +2293,7 @@
        TAO_ENCAP_BYTE_ORDER,
        stream.begin (),
        1,
-@@ -16300,7 +15000,7 @@
+@@ -16515,7 +15215,7 @@
    {
      CORBA::TypeCode_var type = _tao_any.type ();
      
@@ -2317,7 +2302,7 @@
      ACE_TRY_CHECK;
      
      if (!result)
-@@ -16325,7 +15025,7 @@
+@@ -16540,7 +15240,7 @@
        if (stream >> *tmp)
        {
          ((CORBA::Any *)&_tao_any)->_tao_replace (
@@ -2326,3 +2311,123 @@
              1,
              ACE_static_cast (void *, tmp),
              CORBA_TypeDescription::_tao_any_destructor
+@@ -16664,11 +15364,6 @@
+     // If length is 0 we return true.
+     if (0 >= _tao_seq_len) 
+       return 1;
+-    // Add a check to the length of the sequence
+-    // to make sure it does not exceed the length
+-    // of the stream. (See bug 58.)
+-    if (_tao_seq_len > strm.length())
+-      return 0;
+     // retrieve all the elements
+     CORBA::Boolean _tao_marshal_flag = 1;
+     for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
+@@ -16711,11 +15406,6 @@
+     // If length is 0 we return true.
+     if (0 >= _tao_seq_len) 
+       return 1;
+-    // Add a check to the length of the sequence
+-    // to make sure it does not exceed the length
+-    // of the stream. (See bug 58.)
+-    if (_tao_seq_len > strm.length())
+-      return 0;
+     // retrieve all the elements
+     CORBA::Boolean _tao_marshal_flag = 1;
+     for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
+@@ -16758,11 +15448,6 @@
+     // If length is 0 we return true.
+     if (0 >= _tao_seq_len) 
+       return 1;
+-    // Add a check to the length of the sequence
+-    // to make sure it does not exceed the length
+-    // of the stream. (See bug 58.)
+-    if (_tao_seq_len > strm.length())
+-      return 0;
+     // retrieve all the elements
+     CORBA::Boolean _tao_marshal_flag = 1;
+     for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
+@@ -16805,11 +15490,6 @@
+     // If length is 0 we return true.
+     if (0 >= _tao_seq_len) 
+       return 1;
+-    // Add a check to the length of the sequence
+-    // to make sure it does not exceed the length
+-    // of the stream. (See bug 58.)
+-    if (_tao_seq_len > strm.length())
+-      return 0;
+     // retrieve all the elements
+     CORBA::Boolean _tao_marshal_flag = 1;
+     for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
+@@ -16852,11 +15532,6 @@
+     // If length is 0 we return true.
+     if (0 >= _tao_seq_len) 
+       return 1;
+-    // Add a check to the length of the sequence
+-    // to make sure it does not exceed the length
+-    // of the stream. (See bug 58.)
+-    if (_tao_seq_len > strm.length())
+-      return 0;
+     // retrieve all the elements
+     CORBA::Boolean _tao_marshal_flag = 1;
+     for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
+@@ -16899,11 +15574,6 @@
+     // If length is 0 we return true.
+     if (0 >= _tao_seq_len) 
+       return 1;
+-    // Add a check to the length of the sequence
+-    // to make sure it does not exceed the length
+-    // of the stream. (See bug 58.)
+-    if (_tao_seq_len > strm.length())
+-      return 0;
+     // retrieve all the elements
+     CORBA::Boolean _tao_marshal_flag = 1;
+     for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
+@@ -16946,11 +15616,6 @@
+     // If length is 0 we return true.
+     if (0 >= _tao_seq_len) 
+       return 1;
+-    // Add a check to the length of the sequence
+-    // to make sure it does not exceed the length
+-    // of the stream. (See bug 58.)
+-    if (_tao_seq_len > strm.length())
+-      return 0;
+     // retrieve all the elements
+     CORBA::Boolean _tao_marshal_flag = 1;
+     for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
+@@ -16993,11 +15658,6 @@
+     // If length is 0 we return true.
+     if (0 >= _tao_seq_len) 
+       return 1;
+-    // Add a check to the length of the sequence
+-    // to make sure it does not exceed the length
+-    // of the stream. (See bug 58.)
+-    if (_tao_seq_len > strm.length())
+-      return 0;
+     // retrieve all the elements
+     CORBA::Boolean _tao_marshal_flag = 1;
+     for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
+@@ -17040,11 +15700,6 @@
+     // If length is 0 we return true.
+     if (0 >= _tao_seq_len) 
+       return 1;
+-    // Add a check to the length of the sequence
+-    // to make sure it does not exceed the length
+-    // of the stream. (See bug 58.)
+-    if (_tao_seq_len > strm.length())
+-      return 0;
+     // retrieve all the elements
+     CORBA::Boolean _tao_marshal_flag = 1;
+     for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
+@@ -17087,11 +15742,6 @@
+     // If length is 0 we return true.
+     if (0 >= _tao_seq_len) 
+       return 1;
+-    // Add a check to the length of the sequence
+-    // to make sure it does not exceed the length
+-    // of the stream. (See bug 58.)
+-    if (_tao_seq_len > strm.length())
+-      return 0;
+     // retrieve all the elements
+     CORBA::Boolean _tao_marshal_flag = 1;
+     for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
diff --git a/TAO/tao/IFR_Client/diffs/IFR_BaseC.h.diff b/TAO/tao/IFR_Client/diffs/IFR_BaseC.h.diff
index ad1e108becd..f3c35a09c08 100644
--- a/TAO/tao/IFR_Client/diffs/IFR_BaseC.h.diff
+++ b/TAO/tao/IFR_Client/diffs/IFR_BaseC.h.diff
@@ -1,5 +1,5 @@
---- orig/IFR_BaseC.h	Mon Apr 23 20:19:29 2001
-+++ IFR_BaseC.h	Mon Apr 23 19:56:31 2001
+--- orig/IFR_BaseC.h	Tue Apr 24 23:25:42 2001
++++ IFR_BaseC.h	Tue Apr 24 22:39:24 2001
 @@ -1,6 +1,6 @@
  // -*- C++ -*-
  //
@@ -113,7 +113,43 @@
  class CORBA_ModuleDef;
  
  #if !defined (_CORBA_MODULEDEF___PTR_CH_)
-@@ -3048,8 +2995,6 @@
+@@ -2070,8 +2017,6 @@
+ 
+ #endif /* end #if !defined */
+ 
+-extern TAO_IFR_Client_Export CORBA::TypeCode_ptr  _tc_CORBA_InterfaceDefSeq;
+-
+ class CORBA_ExceptionDef;
+ 
+ #if !defined (_CORBA_EXCEPTIONDEF___PTR_CH_)
+@@ -2450,8 +2395,6 @@
+ 
+ #endif /* end #if !defined */
+ 
+-extern TAO_IFR_Client_Export CORBA::TypeCode_ptr  _tc_CORBA_ValueDefSeq;
+-
+ class CORBA_ValueBoxDef;
+ 
+ #if !defined (_CORBA_VALUEBOXDEF___PTR_CH_)
+@@ -2754,8 +2697,6 @@
+ 
+ #endif /* end #if !defined */
+ 
+-extern TAO_IFR_Client_Export CORBA::TypeCode_ptr  _tc_CORBA_AbstractInterfaceDefSeq;
+-
+ class CORBA_LocalInterfaceDef;
+ 
+ #if !defined (_CORBA_LOCALINTERFACEDEF___PTR_CH_)
+@@ -2982,8 +2923,6 @@
+ 
+ #endif /* end #if !defined */
+ 
+-extern TAO_IFR_Client_Export CORBA::TypeCode_ptr  _tc_CORBA_LocalInterfaceDefSeq;
+-
+ struct CORBA_StructMember;
+ class CORBA_StructMember_var;
+ 
+@@ -3048,8 +2987,6 @@
    void operator= (const CORBA_StructMember_var &);
  };
  
@@ -122,7 +158,7 @@
  
  #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
    
-@@ -3200,8 +3145,6 @@
+@@ -3200,8 +3137,6 @@
  
  #endif /* end #if !defined */
  
@@ -131,7 +167,7 @@
  struct CORBA_Initializer;
  class CORBA_Initializer_var;
  
-@@ -3265,8 +3208,6 @@
+@@ -3265,8 +3200,6 @@
    void operator= (const CORBA_Initializer_var &);
  };
  
@@ -140,7 +176,7 @@
  
  #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
    
-@@ -3417,8 +3358,6 @@
+@@ -3417,8 +3350,6 @@
  
  #endif /* end #if !defined */
  
@@ -149,7 +185,7 @@
  struct CORBA_UnionMember;
  class CORBA_UnionMember_var;
  
-@@ -3484,8 +3423,6 @@
+@@ -3484,8 +3415,6 @@
    void operator= (const CORBA_UnionMember_var &);
  };
  
@@ -158,7 +194,7 @@
  
  #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
    
-@@ -3636,8 +3573,6 @@
+@@ -3636,8 +3565,6 @@
  
  #endif /* end #if !defined */
  
@@ -167,7 +203,7 @@
  
  #if !defined (_CORBA_ENUMMEMBERSEQ_CH_)
  #define _CORBA_ENUMMEMBERSEQ_CH_
-@@ -3745,8 +3680,6 @@
+@@ -3745,8 +3672,6 @@
  
  #endif /* end #if !defined */
  
@@ -176,7 +212,7 @@
  
  #if !defined (_CORBA_CONTAINER_CH_)
  #define _CORBA_CONTAINER_CH_
-@@ -4761,8 +4694,6 @@
+@@ -4761,8 +4686,6 @@
  
  #endif /* end #if !defined */
  
@@ -185,7 +221,7 @@
  
  #if !defined (_CORBA_IDLTYPE_CH_)
  #define _CORBA_IDLTYPE_CH_
-@@ -4971,8 +4902,6 @@
+@@ -4971,8 +4894,6 @@
  
  #endif /* end #if !defined */
  
@@ -194,7 +230,7 @@
  
  #if !defined (_CORBA_TYPEDEFDEF___PTR_CH_)
  #define _CORBA_TYPEDEFDEF___PTR_CH_
-@@ -5235,8 +5164,6 @@
+@@ -5235,8 +5156,6 @@
  
  #endif /* end #if !defined */
  
@@ -203,12 +239,490 @@
  struct CORBA_TypeDescription;
  class CORBA_TypeDescription_var;
  
-@@ -5302,8 +5229,6 @@
-   // assignment from T_var not allowed
+@@ -5303,8 +5222,6 @@
    void operator= (const CORBA_TypeDescription_var &);
  };
--
--extern TAO_IFR_Client_Export CORBA::TypeCode_ptr  _tc_CORBA_TypeDescription;
  
+-extern TAO_IFR_Client_Export CORBA::TypeCode_ptr  _tc_CORBA_TypeDescription;
+-
  // Proxy Broker Factory function pointer declarations.
  
+ extern TAO_IFR_Client_Export
+@@ -5337,407 +5254,407 @@
+     CORBA::Object_ptr obj
+   );
+ 
+-// External declarations for undefined interface
++// Declarations for undefined interface
+ // CORBA_Repository
+ TAO_IFR_Client_Export
+ CORBA_Repository_ptr
+ tao_CORBA_Repository_duplicate (
+     CORBA_Repository_ptr
+   );
+-extern TAO_IFR_Client_Export
++TAO_IFR_Client_Export
+ void
+ tao_CORBA_Repository_release (
+     CORBA_Repository_ptr
+   );
+-extern TAO_IFR_Client_Export
++TAO_IFR_Client_Export
+ CORBA_Repository_ptr
+ tao_CORBA_Repository_nil (
+     void
+   );
+-extern TAO_IFR_Client_Export
++TAO_IFR_Client_Export
+ CORBA_Repository_ptr
+ tao_CORBA_Repository_narrow (
+     CORBA::Object *,
+     CORBA::Environment &
+   );
+-extern TAO_IFR_Client_Export
++TAO_IFR_Client_Export
+ CORBA::Object *
+ tao_CORBA_Repository_upcast (
+     void *
+   );
+ 
+-// External declarations for undefined interface
++// Declarations for undefined interface
+ // CORBA_ModuleDef
+ TAO_IFR_Client_Export
+ CORBA_ModuleDef_ptr
+ tao_CORBA_ModuleDef_duplicate (
+     CORBA_ModuleDef_ptr
+   );
+-extern TAO_IFR_Client_Export
++TAO_IFR_Client_Export
+ void
+ tao_CORBA_ModuleDef_release (
+     CORBA_ModuleDef_ptr
+   );
+-extern TAO_IFR_Client_Export
++TAO_IFR_Client_Export
+ CORBA_ModuleDef_ptr
+ tao_CORBA_ModuleDef_nil (
+     void
+   );
+-extern TAO_IFR_Client_Export
++TAO_IFR_Client_Export
+ CORBA_ModuleDef_ptr
+ tao_CORBA_ModuleDef_narrow (
+     CORBA::Object *,
+     CORBA::Environment &
+   );
+-extern TAO_IFR_Client_Export
++TAO_IFR_Client_Export
+ CORBA::Object *
+ tao_CORBA_ModuleDef_upcast (
+     void *
+   );
+ 
+-// External declarations for undefined interface
++// Declarations for undefined interface
+ // CORBA_ConstantDef
+ TAO_IFR_Client_Export
+ CORBA_ConstantDef_ptr
+ tao_CORBA_ConstantDef_duplicate (
+     CORBA_ConstantDef_ptr
+   );
+-extern TAO_IFR_Client_Export
++TAO_IFR_Client_Export
+ void
+ tao_CORBA_ConstantDef_release (
+     CORBA_ConstantDef_ptr
+   );
+-extern TAO_IFR_Client_Export
++TAO_IFR_Client_Export
+ CORBA_ConstantDef_ptr
+ tao_CORBA_ConstantDef_nil (
+     void
+   );
+-extern TAO_IFR_Client_Export
++TAO_IFR_Client_Export
+ CORBA_ConstantDef_ptr
+ tao_CORBA_ConstantDef_narrow (
+     CORBA::Object *,
+     CORBA::Environment &
+   );
+-extern TAO_IFR_Client_Export
++TAO_IFR_Client_Export
+ CORBA::Object *
+ tao_CORBA_ConstantDef_upcast (
+     void *
+   );
+ 
+-// External declarations for undefined interface
++// Declarations for undefined interface
+ // CORBA_StructDef
+ TAO_IFR_Client_Export
+ CORBA_StructDef_ptr
+ tao_CORBA_StructDef_duplicate (
+     CORBA_StructDef_ptr
+   );
+-extern TAO_IFR_Client_Export
++TAO_IFR_Client_Export
+ void
+ tao_CORBA_StructDef_release (
+     CORBA_StructDef_ptr
+   );
+-extern TAO_IFR_Client_Export
++TAO_IFR_Client_Export
+ CORBA_StructDef_ptr
+ tao_CORBA_StructDef_nil (
+     void
+   );
+-extern TAO_IFR_Client_Export
++TAO_IFR_Client_Export
+ CORBA_StructDef_ptr
+ tao_CORBA_StructDef_narrow (
+     CORBA::Object *,
+     CORBA::Environment &
+   );
+-extern TAO_IFR_Client_Export
++TAO_IFR_Client_Export
+ CORBA::Object *
+ tao_CORBA_StructDef_upcast (
+     void *
+   );
+ 
+-// External declarations for undefined interface
++// Declarations for undefined interface
+ // CORBA_UnionDef
+ TAO_IFR_Client_Export
+ CORBA_UnionDef_ptr
+ tao_CORBA_UnionDef_duplicate (
+     CORBA_UnionDef_ptr
+   );
+-extern TAO_IFR_Client_Export
++TAO_IFR_Client_Export
+ void
+ tao_CORBA_UnionDef_release (
+     CORBA_UnionDef_ptr
+   );
+-extern TAO_IFR_Client_Export
++TAO_IFR_Client_Export
+ CORBA_UnionDef_ptr
+ tao_CORBA_UnionDef_nil (
+     void
+   );
+-extern TAO_IFR_Client_Export
++TAO_IFR_Client_Export
+ CORBA_UnionDef_ptr
+ tao_CORBA_UnionDef_narrow (
+     CORBA::Object *,
+     CORBA::Environment &
+   );
+-extern TAO_IFR_Client_Export
++TAO_IFR_Client_Export
+ CORBA::Object *
+ tao_CORBA_UnionDef_upcast (
+     void *
+   );
+ 
+-// External declarations for undefined interface
++// Declarations for undefined interface
+ // CORBA_EnumDef
+ TAO_IFR_Client_Export
+ CORBA_EnumDef_ptr
+ tao_CORBA_EnumDef_duplicate (
+     CORBA_EnumDef_ptr
+   );
+-extern TAO_IFR_Client_Export
++TAO_IFR_Client_Export
+ void
+ tao_CORBA_EnumDef_release (
+     CORBA_EnumDef_ptr
+   );
+-extern TAO_IFR_Client_Export
++TAO_IFR_Client_Export
+ CORBA_EnumDef_ptr
+ tao_CORBA_EnumDef_nil (
+     void
+   );
+-extern TAO_IFR_Client_Export
++TAO_IFR_Client_Export
+ CORBA_EnumDef_ptr
+ tao_CORBA_EnumDef_narrow (
+     CORBA::Object *,
+     CORBA::Environment &
+   );
+-extern TAO_IFR_Client_Export
++TAO_IFR_Client_Export
+ CORBA::Object *
+ tao_CORBA_EnumDef_upcast (
+     void *
+   );
+ 
+-// External declarations for undefined interface
++// Declarations for undefined interface
+ // CORBA_AliasDef
+ TAO_IFR_Client_Export
+ CORBA_AliasDef_ptr
+ tao_CORBA_AliasDef_duplicate (
+     CORBA_AliasDef_ptr
+   );
+-extern TAO_IFR_Client_Export
++TAO_IFR_Client_Export
+ void
+ tao_CORBA_AliasDef_release (
+     CORBA_AliasDef_ptr
+   );
+-extern TAO_IFR_Client_Export
++TAO_IFR_Client_Export
+ CORBA_AliasDef_ptr
+ tao_CORBA_AliasDef_nil (
+     void
+   );
+-extern TAO_IFR_Client_Export
++TAO_IFR_Client_Export
+ CORBA_AliasDef_ptr
+ tao_CORBA_AliasDef_narrow (
+     CORBA::Object *,
+     CORBA::Environment &
+   );
+-extern TAO_IFR_Client_Export
++TAO_IFR_Client_Export
+ CORBA::Object *
+ tao_CORBA_AliasDef_upcast (
+     void *
+   );
+ 
+-// External declarations for undefined interface
++// Declarations for undefined interface
+ // CORBA_InterfaceDef
+ TAO_IFR_Client_Export
+ CORBA_InterfaceDef_ptr
+ tao_CORBA_InterfaceDef_duplicate (
+     CORBA_InterfaceDef_ptr
+   );
+-extern TAO_IFR_Client_Export
++TAO_IFR_Client_Export
+ void
+ tao_CORBA_InterfaceDef_release (
+     CORBA_InterfaceDef_ptr
+   );
+-extern TAO_IFR_Client_Export
++TAO_IFR_Client_Export
+ CORBA_InterfaceDef_ptr
+ tao_CORBA_InterfaceDef_nil (
+     void
+   );
+-extern TAO_IFR_Client_Export
++TAO_IFR_Client_Export
+ CORBA_InterfaceDef_ptr
+ tao_CORBA_InterfaceDef_narrow (
+     CORBA::Object *,
+     CORBA::Environment &
+   );
+-extern TAO_IFR_Client_Export
++TAO_IFR_Client_Export
+ CORBA::Object *
+ tao_CORBA_InterfaceDef_upcast (
+     void *
+   );
+ 
+-// External declarations for undefined interface
++// Declarations for undefined interface
+ // CORBA_ExceptionDef
+ TAO_IFR_Client_Export
+ CORBA_ExceptionDef_ptr
+ tao_CORBA_ExceptionDef_duplicate (
+     CORBA_ExceptionDef_ptr
+   );
+-extern TAO_IFR_Client_Export
++TAO_IFR_Client_Export
+ void
+ tao_CORBA_ExceptionDef_release (
+     CORBA_ExceptionDef_ptr
+   );
+-extern TAO_IFR_Client_Export
++TAO_IFR_Client_Export
+ CORBA_ExceptionDef_ptr
+ tao_CORBA_ExceptionDef_nil (
+     void
+   );
+-extern TAO_IFR_Client_Export
++TAO_IFR_Client_Export
+ CORBA_ExceptionDef_ptr
+ tao_CORBA_ExceptionDef_narrow (
+     CORBA::Object *,
+     CORBA::Environment &
+   );
+-extern TAO_IFR_Client_Export
++TAO_IFR_Client_Export
+ CORBA::Object *
+ tao_CORBA_ExceptionDef_upcast (
+     void *
+   );
+ 
+-// External declarations for undefined interface
++// Declarations for undefined interface
+ // CORBA_NativeDef
+ TAO_IFR_Client_Export
+ CORBA_NativeDef_ptr
+ tao_CORBA_NativeDef_duplicate (
+     CORBA_NativeDef_ptr
+   );
+-extern TAO_IFR_Client_Export
++TAO_IFR_Client_Export
+ void
+ tao_CORBA_NativeDef_release (
+     CORBA_NativeDef_ptr
+   );
+-extern TAO_IFR_Client_Export
++TAO_IFR_Client_Export
+ CORBA_NativeDef_ptr
+ tao_CORBA_NativeDef_nil (
+     void
+   );
+-extern TAO_IFR_Client_Export
++TAO_IFR_Client_Export
+ CORBA_NativeDef_ptr
+ tao_CORBA_NativeDef_narrow (
+     CORBA::Object *,
+     CORBA::Environment &
+   );
+-extern TAO_IFR_Client_Export
++TAO_IFR_Client_Export
+ CORBA::Object *
+ tao_CORBA_NativeDef_upcast (
+     void *
+   );
+ 
+-// External declarations for undefined interface
++// Declarations for undefined interface
+ // CORBA_ValueDef
+ TAO_IFR_Client_Export
+ CORBA_ValueDef_ptr
+ tao_CORBA_ValueDef_duplicate (
+     CORBA_ValueDef_ptr
+   );
+-extern TAO_IFR_Client_Export
++TAO_IFR_Client_Export
+ void
+ tao_CORBA_ValueDef_release (
+     CORBA_ValueDef_ptr
+   );
+-extern TAO_IFR_Client_Export
++TAO_IFR_Client_Export
+ CORBA_ValueDef_ptr
+ tao_CORBA_ValueDef_nil (
+     void
+   );
+-extern TAO_IFR_Client_Export
++TAO_IFR_Client_Export
+ CORBA_ValueDef_ptr
+ tao_CORBA_ValueDef_narrow (
+     CORBA::Object *,
+     CORBA::Environment &
+   );
+-extern TAO_IFR_Client_Export
++TAO_IFR_Client_Export
+ CORBA::Object *
+ tao_CORBA_ValueDef_upcast (
+     void *
+   );
+ 
+-// External declarations for undefined interface
++// Declarations for undefined interface
+ // CORBA_ValueBoxDef
+ TAO_IFR_Client_Export
+ CORBA_ValueBoxDef_ptr
+ tao_CORBA_ValueBoxDef_duplicate (
+     CORBA_ValueBoxDef_ptr
+   );
+-extern TAO_IFR_Client_Export
++TAO_IFR_Client_Export
+ void
+ tao_CORBA_ValueBoxDef_release (
+     CORBA_ValueBoxDef_ptr
+   );
+-extern TAO_IFR_Client_Export
++TAO_IFR_Client_Export
+ CORBA_ValueBoxDef_ptr
+ tao_CORBA_ValueBoxDef_nil (
+     void
+   );
+-extern TAO_IFR_Client_Export
++TAO_IFR_Client_Export
+ CORBA_ValueBoxDef_ptr
+ tao_CORBA_ValueBoxDef_narrow (
+     CORBA::Object *,
+     CORBA::Environment &
+   );
+-extern TAO_IFR_Client_Export
++TAO_IFR_Client_Export
+ CORBA::Object *
+ tao_CORBA_ValueBoxDef_upcast (
+     void *
+   );
+ 
+-// External declarations for undefined interface
++// Declarations for undefined interface
+ // CORBA_AbstractInterfaceDef
+ TAO_IFR_Client_Export
+ CORBA_AbstractInterfaceDef_ptr
+ tao_CORBA_AbstractInterfaceDef_duplicate (
+     CORBA_AbstractInterfaceDef_ptr
+   );
+-extern TAO_IFR_Client_Export
++TAO_IFR_Client_Export
+ void
+ tao_CORBA_AbstractInterfaceDef_release (
+     CORBA_AbstractInterfaceDef_ptr
+   );
+-extern TAO_IFR_Client_Export
++TAO_IFR_Client_Export
+ CORBA_AbstractInterfaceDef_ptr
+ tao_CORBA_AbstractInterfaceDef_nil (
+     void
+   );
+-extern TAO_IFR_Client_Export
++TAO_IFR_Client_Export
+ CORBA_AbstractInterfaceDef_ptr
+ tao_CORBA_AbstractInterfaceDef_narrow (
+     CORBA::Object *,
+     CORBA::Environment &
+   );
+-extern TAO_IFR_Client_Export
++TAO_IFR_Client_Export
+ CORBA::Object *
+ tao_CORBA_AbstractInterfaceDef_upcast (
+     void *
+   );
+ 
+-// External declarations for undefined interface
++// Declarations for undefined interface
+ // CORBA_LocalInterfaceDef
+ TAO_IFR_Client_Export
+ CORBA_LocalInterfaceDef_ptr
+ tao_CORBA_LocalInterfaceDef_duplicate (
+     CORBA_LocalInterfaceDef_ptr
+   );
+-extern TAO_IFR_Client_Export
++TAO_IFR_Client_Export
+ void
+ tao_CORBA_LocalInterfaceDef_release (
+     CORBA_LocalInterfaceDef_ptr
+   );
+-extern TAO_IFR_Client_Export
++TAO_IFR_Client_Export
+ CORBA_LocalInterfaceDef_ptr
+ tao_CORBA_LocalInterfaceDef_nil (
+     void
+   );
+-extern TAO_IFR_Client_Export
++TAO_IFR_Client_Export
+ CORBA_LocalInterfaceDef_ptr
+ tao_CORBA_LocalInterfaceDef_narrow (
+     CORBA::Object *,
+     CORBA::Environment &
+   );
+-extern TAO_IFR_Client_Export
++TAO_IFR_Client_Export
+ CORBA::Object *
+ tao_CORBA_LocalInterfaceDef_upcast (
+     void *
diff --git a/TAO/tao/IFR_Client/diffs/IFR_BaseC.i.diff b/TAO/tao/IFR_Client/diffs/IFR_BaseC.i.diff
index ad52809c647..2316355124b 100644
--- a/TAO/tao/IFR_Client/diffs/IFR_BaseC.i.diff
+++ b/TAO/tao/IFR_Client/diffs/IFR_BaseC.i.diff
@@ -1,5 +1,5 @@
---- orig/IFR_BaseC.i	Mon Apr 23 20:19:29 2001
-+++ IFR_BaseC.i	Mon Apr 23 19:58:19 2001
+--- orig/IFR_BaseC.i	Tue Apr 24 23:25:42 2001
++++ IFR_BaseC.i	Tue Apr 24 22:48:27 2001
 @@ -1,6 +1,6 @@
  // -*- C++ -*-
  //
diff --git a/TAO/tao/IFR_Client/diffs/IFR_BasicC.cpp.diff b/TAO/tao/IFR_Client/diffs/IFR_BasicC.cpp.diff
index e69de29bb2d..6e302b771db 100644
--- a/TAO/tao/IFR_Client/diffs/IFR_BasicC.cpp.diff
+++ b/TAO/tao/IFR_Client/diffs/IFR_BasicC.cpp.diff
@@ -0,0 +1,6169 @@
+--- orig/IFR_BasicC.cpp	Tue Apr 24 23:25:50 2001
++++ IFR_BasicC.cpp	Tue Apr 24 23:02:55 2001
+@@ -1,6 +1,6 @@
+ // -*- C++ -*-
+ //
+-// $Id$
++// $Id$
+ 
+ // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+ // TAO and the TAO IDL Compiler have been developed by:
+@@ -36,258 +36,6 @@
+ #include "IFR_BasicC.i"
+ #endif /* !defined INLINE */
+ 
+-static const CORBA::Long _oc_CORBA_PrimitiveKind[] =
+-{
+-  TAO_ENCAP_BYTE_ORDER, // byte order
+-  36,
+-  ACE_NTOHL (0x49444c3a), 
+-  ACE_NTOHL (0x6f6d672e), 
+-  ACE_NTOHL (0x6f72672f), 
+-  ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x412f5072), 
+-  ACE_NTOHL (0x696d6974), 
+-  ACE_NTOHL (0x6976654b), 
+-  ACE_NTOHL (0x696e643a), 
+-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/PrimitiveKind:1.0
+-  14,
+-  ACE_NTOHL (0x5072696d), 
+-  ACE_NTOHL (0x69746976), 
+-  ACE_NTOHL (0x654b696e), 
+-  ACE_NTOHL (0x64000000),  // name = PrimitiveKind
+-  22, // member count
+-  8,
+-  ACE_NTOHL (0x706b5f6e), 
+-  ACE_NTOHL (0x756c6c00),  // name = pk_null
+-  8,
+-  ACE_NTOHL (0x706b5f76), 
+-  ACE_NTOHL (0x6f696400),  // name = pk_void
+-  9,
+-  ACE_NTOHL (0x706b5f73), 
+-  ACE_NTOHL (0x686f7274), 
+-  ACE_NTOHL (0x0),  // name = pk_short
+-  8,
+-  ACE_NTOHL (0x706b5f6c), 
+-  ACE_NTOHL (0x6f6e6700),  // name = pk_long
+-  10,
+-  ACE_NTOHL (0x706b5f75), 
+-  ACE_NTOHL (0x73686f72), 
+-  ACE_NTOHL (0x74000000),  // name = pk_ushort
+-  9,
+-  ACE_NTOHL (0x706b5f75), 
+-  ACE_NTOHL (0x6c6f6e67), 
+-  ACE_NTOHL (0x0),  // name = pk_ulong
+-  9,
+-  ACE_NTOHL (0x706b5f66), 
+-  ACE_NTOHL (0x6c6f6174), 
+-  ACE_NTOHL (0x0),  // name = pk_float
+-  10,
+-  ACE_NTOHL (0x706b5f64), 
+-  ACE_NTOHL (0x6f75626c), 
+-  ACE_NTOHL (0x65000000),  // name = pk_double
+-  11,
+-  ACE_NTOHL (0x706b5f62), 
+-  ACE_NTOHL (0x6f6f6c65), 
+-  ACE_NTOHL (0x616e0000),  // name = pk_boolean
+-  8,
+-  ACE_NTOHL (0x706b5f63), 
+-  ACE_NTOHL (0x68617200),  // name = pk_char
+-  9,
+-  ACE_NTOHL (0x706b5f6f), 
+-  ACE_NTOHL (0x63746574), 
+-  ACE_NTOHL (0x0),  // name = pk_octet
+-  7,
+-  ACE_NTOHL (0x706b5f61), 
+-  ACE_NTOHL (0x6e790000),  // name = pk_any
+-  12,
+-  ACE_NTOHL (0x706b5f54), 
+-  ACE_NTOHL (0x79706543), 
+-  ACE_NTOHL (0x6f646500),  // name = pk_TypeCode
+-  13,
+-  ACE_NTOHL (0x706b5f50), 
+-  ACE_NTOHL (0x72696e63), 
+-  ACE_NTOHL (0x6970616c), 
+-  ACE_NTOHL (0x0),  // name = pk_Principal
+-  10,
+-  ACE_NTOHL (0x706b5f73), 
+-  ACE_NTOHL (0x7472696e), 
+-  ACE_NTOHL (0x67000000),  // name = pk_string
+-  10,
+-  ACE_NTOHL (0x706b5f6f), 
+-  ACE_NTOHL (0x626a7265), 
+-  ACE_NTOHL (0x66000000),  // name = pk_objref
+-  12,
+-  ACE_NTOHL (0x706b5f6c), 
+-  ACE_NTOHL (0x6f6e676c), 
+-  ACE_NTOHL (0x6f6e6700),  // name = pk_longlong
+-  13,
+-  ACE_NTOHL (0x706b5f75), 
+-  ACE_NTOHL (0x6c6f6e67), 
+-  ACE_NTOHL (0x6c6f6e67), 
+-  ACE_NTOHL (0x0),  // name = pk_ulonglong
+-  14,
+-  ACE_NTOHL (0x706b5f6c), 
+-  ACE_NTOHL (0x6f6e6764), 
+-  ACE_NTOHL (0x6f75626c), 
+-  ACE_NTOHL (0x65000000),  // name = pk_longdouble
+-  9,
+-  ACE_NTOHL (0x706b5f77), 
+-  ACE_NTOHL (0x63686172), 
+-  ACE_NTOHL (0x0),  // name = pk_wchar
+-  11,
+-  ACE_NTOHL (0x706b5f77), 
+-  ACE_NTOHL (0x73747269), 
+-  ACE_NTOHL (0x6e670000),  // name = pk_wstring
+-  14,
+-  ACE_NTOHL (0x706b5f76), 
+-  ACE_NTOHL (0x616c7565), 
+-  ACE_NTOHL (0x5f626173), 
+-  ACE_NTOHL (0x65000000),  // name = pk_value_base
+-};
+-
+-static CORBA::TypeCode _tc_TAO_tc_CORBA_PrimitiveKind (
+-    CORBA::tk_enum,
+-    sizeof (_oc_CORBA_PrimitiveKind),
+-    (char *) &_oc_CORBA_PrimitiveKind,
+-    0,
+-    sizeof (CORBA::PrimitiveKind)
+-  );
+-
+-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+-TAO_NAMESPACE_BEGIN (CORBA)
+-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_PrimitiveKind, &_tc_TAO_tc_CORBA_PrimitiveKind)
+-TAO_NAMESPACE_END
+-
+-static const CORBA::Long _oc_CORBA_AttributeMode[] =
+-{
+-  TAO_ENCAP_BYTE_ORDER, // byte order
+-  36,
+-  ACE_NTOHL (0x49444c3a), 
+-  ACE_NTOHL (0x6f6d672e), 
+-  ACE_NTOHL (0x6f72672f), 
+-  ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x412f4174), 
+-  ACE_NTOHL (0x74726962), 
+-  ACE_NTOHL (0x7574654d), 
+-  ACE_NTOHL (0x6f64653a), 
+-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/AttributeMode:1.0
+-  14,
+-  ACE_NTOHL (0x41747472), 
+-  ACE_NTOHL (0x69627574), 
+-  ACE_NTOHL (0x654d6f64), 
+-  ACE_NTOHL (0x65000000),  // name = AttributeMode
+-  2, // member count
+-  12,
+-  ACE_NTOHL (0x41545452), 
+-  ACE_NTOHL (0x5f4e4f52), 
+-  ACE_NTOHL (0x4d414c00),  // name = ATTR_NORMAL
+-  14,
+-  ACE_NTOHL (0x41545452), 
+-  ACE_NTOHL (0x5f524541), 
+-  ACE_NTOHL (0x444f4e4c), 
+-  ACE_NTOHL (0x59000000),  // name = ATTR_READONLY
+-};
+-
+-static CORBA::TypeCode _tc_TAO_tc_CORBA_AttributeMode (
+-    CORBA::tk_enum,
+-    sizeof (_oc_CORBA_AttributeMode),
+-    (char *) &_oc_CORBA_AttributeMode,
+-    0,
+-    sizeof (CORBA::AttributeMode)
+-  );
+-
+-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+-TAO_NAMESPACE_BEGIN (CORBA)
+-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_AttributeMode, &_tc_TAO_tc_CORBA_AttributeMode)
+-TAO_NAMESPACE_END
+-
+-static const CORBA::Long _oc_CORBA_OperationMode[] =
+-{
+-  TAO_ENCAP_BYTE_ORDER, // byte order
+-  36,
+-  ACE_NTOHL (0x49444c3a), 
+-  ACE_NTOHL (0x6f6d672e), 
+-  ACE_NTOHL (0x6f72672f), 
+-  ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x412f4f70), 
+-  ACE_NTOHL (0x65726174), 
+-  ACE_NTOHL (0x696f6e4d), 
+-  ACE_NTOHL (0x6f64653a), 
+-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/OperationMode:1.0
+-  14,
+-  ACE_NTOHL (0x4f706572), 
+-  ACE_NTOHL (0x6174696f), 
+-  ACE_NTOHL (0x6e4d6f64), 
+-  ACE_NTOHL (0x65000000),  // name = OperationMode
+-  2, // member count
+-  10,
+-  ACE_NTOHL (0x4f505f4e), 
+-  ACE_NTOHL (0x4f524d41), 
+-  ACE_NTOHL (0x4c000000),  // name = OP_NORMAL
+-  10,
+-  ACE_NTOHL (0x4f505f4f), 
+-  ACE_NTOHL (0x4e455741), 
+-  ACE_NTOHL (0x59000000),  // name = OP_ONEWAY
+-};
+-
+-static CORBA::TypeCode _tc_TAO_tc_CORBA_OperationMode (
+-    CORBA::tk_enum,
+-    sizeof (_oc_CORBA_OperationMode),
+-    (char *) &_oc_CORBA_OperationMode,
+-    0,
+-    sizeof (CORBA::OperationMode)
+-  );
+-
+-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+-TAO_NAMESPACE_BEGIN (CORBA)
+-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_OperationMode, &_tc_TAO_tc_CORBA_OperationMode)
+-TAO_NAMESPACE_END
+-
+-static const CORBA::Long _oc_CORBA_ParameterMode[] =
+-{
+-  TAO_ENCAP_BYTE_ORDER, // byte order
+-  36,
+-  ACE_NTOHL (0x49444c3a), 
+-  ACE_NTOHL (0x6f6d672e), 
+-  ACE_NTOHL (0x6f72672f), 
+-  ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x412f5061), 
+-  ACE_NTOHL (0x72616d65), 
+-  ACE_NTOHL (0x7465724d), 
+-  ACE_NTOHL (0x6f64653a), 
+-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ParameterMode:1.0
+-  14,
+-  ACE_NTOHL (0x50617261), 
+-  ACE_NTOHL (0x6d657465), 
+-  ACE_NTOHL (0x724d6f64), 
+-  ACE_NTOHL (0x65000000),  // name = ParameterMode
+-  3, // member count
+-  9,
+-  ACE_NTOHL (0x50415241), 
+-  ACE_NTOHL (0x4d5f494e), 
+-  ACE_NTOHL (0x0),  // name = PARAM_IN
+-  10,
+-  ACE_NTOHL (0x50415241), 
+-  ACE_NTOHL (0x4d5f4f55), 
+-  ACE_NTOHL (0x54000000),  // name = PARAM_OUT
+-  12,
+-  ACE_NTOHL (0x50415241), 
+-  ACE_NTOHL (0x4d5f494e), 
+-  ACE_NTOHL (0x4f555400),  // name = PARAM_INOUT
+-};
+-
+-static CORBA::TypeCode _tc_TAO_tc_CORBA_ParameterMode (
+-    CORBA::tk_enum,
+-    sizeof (_oc_CORBA_ParameterMode),
+-    (char *) &_oc_CORBA_ParameterMode,
+-    0,
+-    sizeof (CORBA::ParameterMode)
+-  );
+-
+-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
+-TAO_NAMESPACE_BEGIN (CORBA)
+-TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ParameterMode, &_tc_TAO_tc_CORBA_ParameterMode)
+-TAO_NAMESPACE_END
+-
+ CORBA_Repository_ptr
+ tao_CORBA_Repository_duplicate (
+     CORBA_Repository_ptr p
+@@ -2867,7 +2615,7 @@
+     return CORBA_Repository::_nil ();
+   if (! obj->_is_local ())
+     {
+-      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA_Repository:1.0", ACE_TRY_ENV);
++      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/Repository:1.0", ACE_TRY_ENV);
+       ACE_CHECK_RETURN (CORBA_Repository::_nil ());
+       if (is_a == 0)
+         return CORBA_Repository::_nil ();
+@@ -2935,9 +2683,9 @@
+ CORBA::Boolean CORBA_Repository::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+ {
+   if (
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Repository:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Container:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Repository:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Container:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
+   return 1; // success using local knowledge
+   else
+@@ -2986,7 +2734,7 @@
+ 
+ const char* CORBA_Repository::_interface_repository_id (void) const
+ {
+-  return "IDL:omg.org/CORBA_Repository:1.0";
++  return "IDL:omg.org/CORBA/Repository:1.0";
+ }
+ 
+ CORBA_Contained_ptr CORBA_Repository::lookup_id (
+@@ -3147,38 +2895,6 @@
+     );
+ }
+ 
+-static const CORBA::Long _oc_CORBA_Repository[] =
+-{
+-  TAO_ENCAP_BYTE_ORDER, // byte order
+-  33,
+-  ACE_NTOHL (0x49444c3a), 
+-  ACE_NTOHL (0x6f6d672e), 
+-  ACE_NTOHL (0x6f72672f), 
+-  ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x415f5265), 
+-  ACE_NTOHL (0x706f7369), 
+-  ACE_NTOHL (0x746f7279), 
+-  ACE_NTOHL (0x3a312e30), 
+-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA_Repository:1.0
+-  17,
+-  ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x415f5265), 
+-  ACE_NTOHL (0x706f7369), 
+-  ACE_NTOHL (0x746f7279), 
+-  ACE_NTOHL (0x0),  // name = CORBA_Repository
+-};
+-
+-static CORBA::TypeCode _tc_TAO_tc_CORBA_Repository (
+-    CORBA::tk_objref,
+-    sizeof (_oc_CORBA_Repository),
+-    (char *) &_oc_CORBA_Repository,
+-    0,
+-    sizeof (CORBA_Repository)
+-  );
+-
+-CORBA::TypeCode_ptr _tc_CORBA_Repository =
+-  &_tc_TAO_tc_CORBA_Repository;
+-
+ CORBA_ModuleDef_ptr
+ tao_CORBA_ModuleDef_duplicate (
+     CORBA_ModuleDef_ptr p
+@@ -3513,7 +3229,7 @@
+     return CORBA_ModuleDef::_nil ();
+   if (! obj->_is_local ())
+     {
+-      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA_ModuleDef:1.0", ACE_TRY_ENV);
++      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/ModuleDef:1.0", ACE_TRY_ENV);
+       ACE_CHECK_RETURN (CORBA_ModuleDef::_nil ());
+       if (is_a == 0)
+         return CORBA_ModuleDef::_nil ();
+@@ -3581,10 +3297,10 @@
+ CORBA::Boolean CORBA_ModuleDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+ {
+   if (
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_ModuleDef:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Container:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/ModuleDef:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Container:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
+   return 1; // success using local knowledge
+   else
+@@ -3645,94 +3361,9 @@
+ 
+ const char* CORBA_ModuleDef::_interface_repository_id (void) const
+ {
+-  return "IDL:omg.org/CORBA_ModuleDef:1.0";
++  return "IDL:omg.org/CORBA/ModuleDef:1.0";
+ }
+ 
+-static const CORBA::Long _oc_CORBA_ModuleDef[] =
+-{
+-  TAO_ENCAP_BYTE_ORDER, // byte order
+-  32,
+-  ACE_NTOHL (0x49444c3a), 
+-  ACE_NTOHL (0x6f6d672e), 
+-  ACE_NTOHL (0x6f72672f), 
+-  ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x415f4d6f), 
+-  ACE_NTOHL (0x64756c65), 
+-  ACE_NTOHL (0x4465663a), 
+-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA_ModuleDef:1.0
+-  16,
+-  ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x415f4d6f), 
+-  ACE_NTOHL (0x64756c65), 
+-  ACE_NTOHL (0x44656600),  // name = CORBA_ModuleDef
+-};
+-
+-static CORBA::TypeCode _tc_TAO_tc_CORBA_ModuleDef (
+-    CORBA::tk_objref,
+-    sizeof (_oc_CORBA_ModuleDef),
+-    (char *) &_oc_CORBA_ModuleDef,
+-    0,
+-    sizeof (CORBA_ModuleDef)
+-  );
+-
+-CORBA::TypeCode_ptr _tc_CORBA_ModuleDef =
+-  &_tc_TAO_tc_CORBA_ModuleDef;
+-
+-static const CORBA::Long _oc_CORBA_ModuleDescription[] =
+-{
+-  TAO_ENCAP_BYTE_ORDER, // byte order
+-  40,
+-  ACE_NTOHL (0x49444c3a), 
+-  ACE_NTOHL (0x6f6d672e), 
+-  ACE_NTOHL (0x6f72672f), 
+-  ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x415f4d6f), 
+-  ACE_NTOHL (0x64756c65), 
+-  ACE_NTOHL (0x44657363), 
+-  ACE_NTOHL (0x72697074), 
+-  ACE_NTOHL (0x696f6e3a), 
+-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA_ModuleDescription:1.0
+-  24,
+-  ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x415f4d6f), 
+-  ACE_NTOHL (0x64756c65), 
+-  ACE_NTOHL (0x44657363), 
+-  ACE_NTOHL (0x72697074), 
+-  ACE_NTOHL (0x696f6e00),  // name = CORBA_ModuleDescription
+-  4, // member count
+-  5,
+-  ACE_NTOHL (0x6e616d65), 
+-  ACE_NTOHL (0x0),  // name = name
+-  CORBA::tk_string, 
+-  0U, // string length
+-  3,
+-  ACE_NTOHL (0x69640000),  // name = id
+-  CORBA::tk_string, 
+-  0U, // string length
+-  11,
+-  ACE_NTOHL (0x64656669), 
+-  ACE_NTOHL (0x6e65645f), 
+-  ACE_NTOHL (0x696e0000),  // name = defined_in
+-  CORBA::tk_string, 
+-  0U, // string length
+-  8,
+-  ACE_NTOHL (0x76657273), 
+-  ACE_NTOHL (0x696f6e00),  // name = version
+-  CORBA::tk_string, 
+-  0U, // string length
+-};
+-
+-static CORBA::TypeCode _tc_TAO_tc_CORBA_ModuleDescription (
+-    CORBA::tk_struct,
+-    sizeof (_oc_CORBA_ModuleDescription),
+-    (char *) &_oc_CORBA_ModuleDescription,
+-    0,
+-    sizeof (CORBA_ModuleDescription)
+-  );
+-
+-CORBA::TypeCode_ptr _tc_CORBA_ModuleDescription =
+-  &_tc_TAO_tc_CORBA_ModuleDescription;
+-
+ void CORBA_ModuleDescription::_tao_any_destructor (void *x)
+ {
+   CORBA_ModuleDescription *tmp = ACE_static_cast (CORBA_ModuleDescription*,x);
+@@ -5320,7 +4951,7 @@
+     return CORBA_ConstantDef::_nil ();
+   if (! obj->_is_local ())
+     {
+-      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA_ConstantDef:1.0", ACE_TRY_ENV);
++      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/ConstantDef:1.0", ACE_TRY_ENV);
+       ACE_CHECK_RETURN (CORBA_ConstantDef::_nil ());
+       if (is_a == 0)
+         return CORBA_ConstantDef::_nil ();
+@@ -5388,9 +5019,9 @@
+ CORBA::Boolean CORBA_ConstantDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+ {
+   if (
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_ConstantDef:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/ConstantDef:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
+   return 1; // success using local knowledge
+   else
+@@ -5439,7 +5070,7 @@
+ 
+ const char* CORBA_ConstantDef::_interface_repository_id (void) const
+ {
+-  return "IDL:omg.org/CORBA_ConstantDef:1.0";
++  return "IDL:omg.org/CORBA/ConstantDef:1.0";
+ }
+ 
+ CORBA::TypeCode_ptr CORBA_ConstantDef::type (
+@@ -5531,131 +5162,32 @@
+     );
+ }
+ 
+-static const CORBA::Long _oc_CORBA_ConstantDef[] =
++void CORBA_ConstantDescription::_tao_any_destructor (void *x)
+ {
+-  TAO_ENCAP_BYTE_ORDER, // byte order
+-  34,
+-  ACE_NTOHL (0x49444c3a), 
+-  ACE_NTOHL (0x6f6d672e), 
+-  ACE_NTOHL (0x6f72672f), 
+-  ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x415f436f), 
+-  ACE_NTOHL (0x6e737461), 
+-  ACE_NTOHL (0x6e744465), 
+-  ACE_NTOHL (0x663a312e), 
+-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA_ConstantDef:1.0
+-  18,
+-  ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x415f436f), 
+-  ACE_NTOHL (0x6e737461), 
+-  ACE_NTOHL (0x6e744465), 
+-  ACE_NTOHL (0x66000000),  // name = CORBA_ConstantDef
+-};
++  CORBA_ConstantDescription *tmp = ACE_static_cast (CORBA_ConstantDescription*,x);
++  delete tmp;
++}
+ 
+-static CORBA::TypeCode _tc_TAO_tc_CORBA_ConstantDef (
+-    CORBA::tk_objref,
+-    sizeof (_oc_CORBA_ConstantDef),
+-    (char *) &_oc_CORBA_ConstantDef,
+-    0,
+-    sizeof (CORBA_ConstantDef)
+-  );
++CORBA_StructDef_ptr
++tao_CORBA_StructDef_duplicate (
++    CORBA_StructDef_ptr p
++  )
++{
++  return CORBA_StructDef::_duplicate (p);
++}
+ 
+-CORBA::TypeCode_ptr _tc_CORBA_ConstantDef =
+-  &_tc_TAO_tc_CORBA_ConstantDef;
++void
++tao_CORBA_StructDef_release (
++    CORBA_StructDef_ptr p
++  )
++{
++  CORBA::release (p);
++}
+ 
+-static const CORBA::Long _oc_CORBA_ConstantDescription[] =
+-{
+-  TAO_ENCAP_BYTE_ORDER, // byte order
+-  42,
+-  ACE_NTOHL (0x49444c3a), 
+-  ACE_NTOHL (0x6f6d672e), 
+-  ACE_NTOHL (0x6f72672f), 
+-  ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x415f436f), 
+-  ACE_NTOHL (0x6e737461), 
+-  ACE_NTOHL (0x6e744465), 
+-  ACE_NTOHL (0x73637269), 
+-  ACE_NTOHL (0x7074696f), 
+-  ACE_NTOHL (0x6e3a312e), 
+-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA_ConstantDescription:1.0
+-  26,
+-  ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x415f436f), 
+-  ACE_NTOHL (0x6e737461), 
+-  ACE_NTOHL (0x6e744465), 
+-  ACE_NTOHL (0x73637269), 
+-  ACE_NTOHL (0x7074696f), 
+-  ACE_NTOHL (0x6e000000),  // name = CORBA_ConstantDescription
+-  6, // member count
+-  5,
+-  ACE_NTOHL (0x6e616d65), 
+-  ACE_NTOHL (0x0),  // name = name
+-  CORBA::tk_string, 
+-  0U, // string length
+-  3,
+-  ACE_NTOHL (0x69640000),  // name = id
+-  CORBA::tk_string, 
+-  0U, // string length
+-  11,
+-  ACE_NTOHL (0x64656669), 
+-  ACE_NTOHL (0x6e65645f), 
+-  ACE_NTOHL (0x696e0000),  // name = defined_in
+-  CORBA::tk_string, 
+-  0U, // string length
+-  8,
+-  ACE_NTOHL (0x76657273), 
+-  ACE_NTOHL (0x696f6e00),  // name = version
+-  CORBA::tk_string, 
+-  0U, // string length
+-  5,
+-  ACE_NTOHL (0x74797065), 
+-  ACE_NTOHL (0x0),  // name = type
+-  CORBA::tk_TypeCode,
+-
+-  6,
+-  ACE_NTOHL (0x76616c75), 
+-  ACE_NTOHL (0x65000000),  // name = value
+-  CORBA::tk_any,
+-
+-};
+-
+-static CORBA::TypeCode _tc_TAO_tc_CORBA_ConstantDescription (
+-    CORBA::tk_struct,
+-    sizeof (_oc_CORBA_ConstantDescription),
+-    (char *) &_oc_CORBA_ConstantDescription,
+-    0,
+-    sizeof (CORBA_ConstantDescription)
+-  );
+-
+-CORBA::TypeCode_ptr _tc_CORBA_ConstantDescription =
+-  &_tc_TAO_tc_CORBA_ConstantDescription;
+-
+-void CORBA_ConstantDescription::_tao_any_destructor (void *x)
+-{
+-  CORBA_ConstantDescription *tmp = ACE_static_cast (CORBA_ConstantDescription*,x);
+-  delete tmp;
+-}
+-
+-CORBA_StructDef_ptr
+-tao_CORBA_StructDef_duplicate (
+-    CORBA_StructDef_ptr p
+-  )
+-{
+-  return CORBA_StructDef::_duplicate (p);
+-}
+-
+-void
+-tao_CORBA_StructDef_release (
+-    CORBA_StructDef_ptr p
+-  )
+-{
+-  CORBA::release (p);
+-}
+-
+-CORBA_StructDef_ptr
+-tao_CORBA_StructDef_nil (
+-    void
+-  )
++CORBA_StructDef_ptr
++tao_CORBA_StructDef_nil (
++    void
++  )
+ {
+   return CORBA_StructDef::_nil ();
+ }
+@@ -6469,7 +6001,7 @@
+     return CORBA_StructDef::_nil ();
+   if (! obj->_is_local ())
+     {
+-      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA_StructDef:1.0", ACE_TRY_ENV);
++      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/StructDef:1.0", ACE_TRY_ENV);
+       ACE_CHECK_RETURN (CORBA_StructDef::_nil ());
+       if (is_a == 0)
+         return CORBA_StructDef::_nil ();
+@@ -6537,12 +6069,12 @@
+ CORBA::Boolean CORBA_StructDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+ {
+   if (
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_StructDef:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_TypedefDef:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Container:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/StructDef:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/TypedefDef:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Container:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
+   return 1; // success using local knowledge
+   else
+@@ -6627,7 +6159,7 @@
+ 
+ const char* CORBA_StructDef::_interface_repository_id (void) const
+ {
+-  return "IDL:omg.org/CORBA_StructDef:1.0";
++  return "IDL:omg.org/CORBA/StructDef:1.0";
+ }
+ 
+ CORBA_StructMemberSeq * CORBA_StructDef::members (
+@@ -6666,36 +6198,6 @@
+     );
+ }
+ 
+-static const CORBA::Long _oc_CORBA_StructDef[] =
+-{
+-  TAO_ENCAP_BYTE_ORDER, // byte order
+-  32,
+-  ACE_NTOHL (0x49444c3a), 
+-  ACE_NTOHL (0x6f6d672e), 
+-  ACE_NTOHL (0x6f72672f), 
+-  ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x415f5374), 
+-  ACE_NTOHL (0x72756374), 
+-  ACE_NTOHL (0x4465663a), 
+-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA_StructDef:1.0
+-  16,
+-  ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x415f5374), 
+-  ACE_NTOHL (0x72756374), 
+-  ACE_NTOHL (0x44656600),  // name = CORBA_StructDef
+-};
+-
+-static CORBA::TypeCode _tc_TAO_tc_CORBA_StructDef (
+-    CORBA::tk_objref,
+-    sizeof (_oc_CORBA_StructDef),
+-    (char *) &_oc_CORBA_StructDef,
+-    0,
+-    sizeof (CORBA_StructDef)
+-  );
+-
+-CORBA::TypeCode_ptr _tc_CORBA_StructDef =
+-  &_tc_TAO_tc_CORBA_StructDef;
+-
+ CORBA_UnionDef_ptr
+ tao_CORBA_UnionDef_duplicate (
+     CORBA_UnionDef_ptr p
+@@ -8280,7 +7782,7 @@
+     return CORBA_UnionDef::_nil ();
+   if (! obj->_is_local ())
+     {
+-      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA_UnionDef:1.0", ACE_TRY_ENV);
++      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/UnionDef:1.0", ACE_TRY_ENV);
+       ACE_CHECK_RETURN (CORBA_UnionDef::_nil ());
+       if (is_a == 0)
+         return CORBA_UnionDef::_nil ();
+@@ -8348,12 +7850,12 @@
+ CORBA::Boolean CORBA_UnionDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+ {
+   if (
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_UnionDef:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_TypedefDef:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Container:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/UnionDef:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/TypedefDef:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Container:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
+   return 1; // success using local knowledge
+   else
+@@ -8438,7 +7940,7 @@
+ 
+ const char* CORBA_UnionDef::_interface_repository_id (void) const
+ {
+-  return "IDL:omg.org/CORBA_UnionDef:1.0";
++  return "IDL:omg.org/CORBA/UnionDef:1.0";
+ }
+ 
+ CORBA::TypeCode_ptr CORBA_UnionDef::discriminator_type (
+@@ -8530,36 +8032,6 @@
+     );
+ }
+ 
+-static const CORBA::Long _oc_CORBA_UnionDef[] =
+-{
+-  TAO_ENCAP_BYTE_ORDER, // byte order
+-  31,
+-  ACE_NTOHL (0x49444c3a), 
+-  ACE_NTOHL (0x6f6d672e), 
+-  ACE_NTOHL (0x6f72672f), 
+-  ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x415f556e), 
+-  ACE_NTOHL (0x696f6e44), 
+-  ACE_NTOHL (0x65663a31), 
+-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA_UnionDef:1.0
+-  15,
+-  ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x415f556e), 
+-  ACE_NTOHL (0x696f6e44), 
+-  ACE_NTOHL (0x65660000),  // name = CORBA_UnionDef
+-};
+-
+-static CORBA::TypeCode _tc_TAO_tc_CORBA_UnionDef (
+-    CORBA::tk_objref,
+-    sizeof (_oc_CORBA_UnionDef),
+-    (char *) &_oc_CORBA_UnionDef,
+-    0,
+-    sizeof (CORBA_UnionDef)
+-  );
+-
+-CORBA::TypeCode_ptr _tc_CORBA_UnionDef =
+-  &_tc_TAO_tc_CORBA_UnionDef;
+-
+ CORBA_EnumDef_ptr
+ tao_CORBA_EnumDef_duplicate (
+     CORBA_EnumDef_ptr p
+@@ -9391,7 +8863,7 @@
+     return CORBA_EnumDef::_nil ();
+   if (! obj->_is_local ())
+     {
+-      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA_EnumDef:1.0", ACE_TRY_ENV);
++      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/EnumDef:1.0", ACE_TRY_ENV);
+       ACE_CHECK_RETURN (CORBA_EnumDef::_nil ());
+       if (is_a == 0)
+         return CORBA_EnumDef::_nil ();
+@@ -9459,11 +8931,11 @@
+ CORBA::Boolean CORBA_EnumDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+ {
+   if (
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_EnumDef:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_TypedefDef:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/EnumDef:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/TypedefDef:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
+   return 1; // success using local knowledge
+   else
+@@ -9536,7 +9008,7 @@
+ 
+ const char* CORBA_EnumDef::_interface_repository_id (void) const
+ {
+-  return "IDL:omg.org/CORBA_EnumDef:1.0";
++  return "IDL:omg.org/CORBA/EnumDef:1.0";
+ }
+ 
+ CORBA_EnumMemberSeq * CORBA_EnumDef::members (
+@@ -9575,36 +9047,6 @@
+     );
+ }
+ 
+-static const CORBA::Long _oc_CORBA_EnumDef[] =
+-{
+-  TAO_ENCAP_BYTE_ORDER, // byte order
+-  30,
+-  ACE_NTOHL (0x49444c3a), 
+-  ACE_NTOHL (0x6f6d672e), 
+-  ACE_NTOHL (0x6f72672f), 
+-  ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x415f456e), 
+-  ACE_NTOHL (0x756d4465), 
+-  ACE_NTOHL (0x663a312e), 
+-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA_EnumDef:1.0
+-  14,
+-  ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x415f456e), 
+-  ACE_NTOHL (0x756d4465), 
+-  ACE_NTOHL (0x66000000),  // name = CORBA_EnumDef
+-};
+-
+-static CORBA::TypeCode _tc_TAO_tc_CORBA_EnumDef (
+-    CORBA::tk_objref,
+-    sizeof (_oc_CORBA_EnumDef),
+-    (char *) &_oc_CORBA_EnumDef,
+-    0,
+-    sizeof (CORBA_EnumDef)
+-  );
+-
+-CORBA::TypeCode_ptr _tc_CORBA_EnumDef =
+-  &_tc_TAO_tc_CORBA_EnumDef;
+-
+ CORBA_AliasDef_ptr
+ tao_CORBA_AliasDef_duplicate (
+     CORBA_AliasDef_ptr p
+@@ -10435,7 +9877,7 @@
+     return CORBA_AliasDef::_nil ();
+   if (! obj->_is_local ())
+     {
+-      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA_AliasDef:1.0", ACE_TRY_ENV);
++      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/AliasDef:1.0", ACE_TRY_ENV);
+       ACE_CHECK_RETURN (CORBA_AliasDef::_nil ());
+       if (is_a == 0)
+         return CORBA_AliasDef::_nil ();
+@@ -10503,11 +9945,11 @@
+ CORBA::Boolean CORBA_AliasDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+ {
+   if (
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_AliasDef:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_TypedefDef:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/AliasDef:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/TypedefDef:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
+   return 1; // success using local knowledge
+   else
+@@ -10580,7 +10022,7 @@
+ 
+ const char* CORBA_AliasDef::_interface_repository_id (void) const
+ {
+-  return "IDL:omg.org/CORBA_AliasDef:1.0";
++  return "IDL:omg.org/CORBA/AliasDef:1.0";
+ }
+ 
+ CORBA_IDLType_ptr CORBA_AliasDef::original_type_def (
+@@ -10619,36 +10061,6 @@
+     );
+ }
+ 
+-static const CORBA::Long _oc_CORBA_AliasDef[] =
+-{
+-  TAO_ENCAP_BYTE_ORDER, // byte order
+-  31,
+-  ACE_NTOHL (0x49444c3a), 
+-  ACE_NTOHL (0x6f6d672e), 
+-  ACE_NTOHL (0x6f72672f), 
+-  ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x415f416c), 
+-  ACE_NTOHL (0x69617344), 
+-  ACE_NTOHL (0x65663a31), 
+-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA_AliasDef:1.0
+-  15,
+-  ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x415f416c), 
+-  ACE_NTOHL (0x69617344), 
+-  ACE_NTOHL (0x65660000),  // name = CORBA_AliasDef
+-};
+-
+-static CORBA::TypeCode _tc_TAO_tc_CORBA_AliasDef (
+-    CORBA::tk_objref,
+-    sizeof (_oc_CORBA_AliasDef),
+-    (char *) &_oc_CORBA_AliasDef,
+-    0,
+-    sizeof (CORBA_AliasDef)
+-  );
+-
+-CORBA::TypeCode_ptr _tc_CORBA_AliasDef =
+-  &_tc_TAO_tc_CORBA_AliasDef;
+-
+ CORBA_NativeDef_ptr
+ tao_CORBA_NativeDef_duplicate (
+     CORBA_NativeDef_ptr p
+@@ -10981,7 +10393,7 @@
+     return CORBA_NativeDef::_nil ();
+   if (! obj->_is_local ())
+     {
+-      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA_NativeDef:1.0", ACE_TRY_ENV);
++      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/NativeDef:1.0", ACE_TRY_ENV);
+       ACE_CHECK_RETURN (CORBA_NativeDef::_nil ());
+       if (is_a == 0)
+         return CORBA_NativeDef::_nil ();
+@@ -11049,11 +10461,11 @@
+ CORBA::Boolean CORBA_NativeDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+ {
+   if (
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_NativeDef:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_TypedefDef:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/NativeDef:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/TypedefDef:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
+   return 1; // success using local knowledge
+   else
+@@ -11126,39 +10538,9 @@
+ 
+ const char* CORBA_NativeDef::_interface_repository_id (void) const
+ {
+-  return "IDL:omg.org/CORBA_NativeDef:1.0";
++  return "IDL:omg.org/CORBA/NativeDef:1.0";
+ }
+ 
+-static const CORBA::Long _oc_CORBA_NativeDef[] =
+-{
+-  TAO_ENCAP_BYTE_ORDER, // byte order
+-  32,
+-  ACE_NTOHL (0x49444c3a), 
+-  ACE_NTOHL (0x6f6d672e), 
+-  ACE_NTOHL (0x6f72672f), 
+-  ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x415f4e61), 
+-  ACE_NTOHL (0x74697665), 
+-  ACE_NTOHL (0x4465663a), 
+-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA_NativeDef:1.0
+-  16,
+-  ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x415f4e61), 
+-  ACE_NTOHL (0x74697665), 
+-  ACE_NTOHL (0x44656600),  // name = CORBA_NativeDef
+-};
+-
+-static CORBA::TypeCode _tc_TAO_tc_CORBA_NativeDef (
+-    CORBA::tk_objref,
+-    sizeof (_oc_CORBA_NativeDef),
+-    (char *) &_oc_CORBA_NativeDef,
+-    0,
+-    sizeof (CORBA_NativeDef)
+-  );
+-
+-CORBA::TypeCode_ptr _tc_CORBA_NativeDef =
+-  &_tc_TAO_tc_CORBA_NativeDef;
+-
+ CORBA_PrimitiveDef_ptr
+ tao_CORBA_PrimitiveDef_duplicate (
+     CORBA_PrimitiveDef_ptr p
+@@ -11742,7 +11124,7 @@
+     return CORBA_PrimitiveDef::_nil ();
+   if (! obj->_is_local ())
+     {
+-      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA_PrimitiveDef:1.0", ACE_TRY_ENV);
++      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/PrimitiveDef:1.0", ACE_TRY_ENV);
+       ACE_CHECK_RETURN (CORBA_PrimitiveDef::_nil ());
+       if (is_a == 0)
+         return CORBA_PrimitiveDef::_nil ();
+@@ -11810,9 +11192,9 @@
+ CORBA::Boolean CORBA_PrimitiveDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+ {
+   if (
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_PrimitiveDef:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/PrimitiveDef:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
+   return 1; // success using local knowledge
+   else
+@@ -11861,7 +11243,7 @@
+ 
+ const char* CORBA_PrimitiveDef::_interface_repository_id (void) const
+ {
+-  return "IDL:omg.org/CORBA_PrimitiveDef:1.0";
++  return "IDL:omg.org/CORBA/PrimitiveDef:1.0";
+ }
+ 
+ CORBA::PrimitiveKind CORBA_PrimitiveDef::kind (
+@@ -11881,38 +11263,6 @@
+     );
+ }
+ 
+-static const CORBA::Long _oc_CORBA_PrimitiveDef[] =
+-{
+-  TAO_ENCAP_BYTE_ORDER, // byte order
+-  35,
+-  ACE_NTOHL (0x49444c3a), 
+-  ACE_NTOHL (0x6f6d672e), 
+-  ACE_NTOHL (0x6f72672f), 
+-  ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x415f5072), 
+-  ACE_NTOHL (0x696d6974), 
+-  ACE_NTOHL (0x69766544), 
+-  ACE_NTOHL (0x65663a31), 
+-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA_PrimitiveDef:1.0
+-  19,
+-  ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x415f5072), 
+-  ACE_NTOHL (0x696d6974), 
+-  ACE_NTOHL (0x69766544), 
+-  ACE_NTOHL (0x65660000),  // name = CORBA_PrimitiveDef
+-};
+-
+-static CORBA::TypeCode _tc_TAO_tc_CORBA_PrimitiveDef (
+-    CORBA::tk_objref,
+-    sizeof (_oc_CORBA_PrimitiveDef),
+-    (char *) &_oc_CORBA_PrimitiveDef,
+-    0,
+-    sizeof (CORBA_PrimitiveDef)
+-  );
+-
+-CORBA::TypeCode_ptr _tc_CORBA_PrimitiveDef =
+-  &_tc_TAO_tc_CORBA_PrimitiveDef;
+-
+ CORBA_StringDef_ptr
+ tao_CORBA_StringDef_duplicate (
+     CORBA_StringDef_ptr p
+@@ -12740,7 +12090,7 @@
+     return CORBA_StringDef::_nil ();
+   if (! obj->_is_local ())
+     {
+-      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA_StringDef:1.0", ACE_TRY_ENV);
++      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/StringDef:1.0", ACE_TRY_ENV);
+       ACE_CHECK_RETURN (CORBA_StringDef::_nil ());
+       if (is_a == 0)
+         return CORBA_StringDef::_nil ();
+@@ -12808,9 +12158,9 @@
+ CORBA::Boolean CORBA_StringDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+ {
+   if (
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_StringDef:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/StringDef:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
+   return 1; // success using local knowledge
+   else
+@@ -12859,7 +12209,7 @@
+ 
+ const char* CORBA_StringDef::_interface_repository_id (void) const
+ {
+-  return "IDL:omg.org/CORBA_StringDef:1.0";
++  return "IDL:omg.org/CORBA/StringDef:1.0";
+ }
+ 
+ CORBA::ULong CORBA_StringDef::bound (
+@@ -12898,36 +12248,6 @@
+     );
+ }
+ 
+-static const CORBA::Long _oc_CORBA_StringDef[] =
+-{
+-  TAO_ENCAP_BYTE_ORDER, // byte order
+-  32,
+-  ACE_NTOHL (0x49444c3a), 
+-  ACE_NTOHL (0x6f6d672e), 
+-  ACE_NTOHL (0x6f72672f), 
+-  ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x415f5374), 
+-  ACE_NTOHL (0x72696e67), 
+-  ACE_NTOHL (0x4465663a), 
+-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA_StringDef:1.0
+-  16,
+-  ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x415f5374), 
+-  ACE_NTOHL (0x72696e67), 
+-  ACE_NTOHL (0x44656600),  // name = CORBA_StringDef
+-};
+-
+-static CORBA::TypeCode _tc_TAO_tc_CORBA_StringDef (
+-    CORBA::tk_objref,
+-    sizeof (_oc_CORBA_StringDef),
+-    (char *) &_oc_CORBA_StringDef,
+-    0,
+-    sizeof (CORBA_StringDef)
+-  );
+-
+-CORBA::TypeCode_ptr _tc_CORBA_StringDef =
+-  &_tc_TAO_tc_CORBA_StringDef;
+-
+ CORBA_WstringDef_ptr
+ tao_CORBA_WstringDef_duplicate (
+     CORBA_WstringDef_ptr p
+@@ -13755,7 +13075,7 @@
+     return CORBA_WstringDef::_nil ();
+   if (! obj->_is_local ())
+     {
+-      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA_WstringDef:1.0", ACE_TRY_ENV);
++      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/WstringDef:1.0", ACE_TRY_ENV);
+       ACE_CHECK_RETURN (CORBA_WstringDef::_nil ());
+       if (is_a == 0)
+         return CORBA_WstringDef::_nil ();
+@@ -13823,9 +13143,9 @@
+ CORBA::Boolean CORBA_WstringDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+ {
+   if (
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_WstringDef:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/WstringDef:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
+   return 1; // success using local knowledge
+   else
+@@ -13874,7 +13194,7 @@
+ 
+ const char* CORBA_WstringDef::_interface_repository_id (void) const
+ {
+-  return "IDL:omg.org/CORBA_WstringDef:1.0";
++  return "IDL:omg.org/CORBA/WstringDef:1.0";
+ }
+ 
+ CORBA::ULong CORBA_WstringDef::bound (
+@@ -13913,38 +13233,6 @@
+     );
+ }
+ 
+-static const CORBA::Long _oc_CORBA_WstringDef[] =
+-{
+-  TAO_ENCAP_BYTE_ORDER, // byte order
+-  33,
+-  ACE_NTOHL (0x49444c3a), 
+-  ACE_NTOHL (0x6f6d672e), 
+-  ACE_NTOHL (0x6f72672f), 
+-  ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x415f5773), 
+-  ACE_NTOHL (0x7472696e), 
+-  ACE_NTOHL (0x67446566), 
+-  ACE_NTOHL (0x3a312e30), 
+-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA_WstringDef:1.0
+-  17,
+-  ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x415f5773), 
+-  ACE_NTOHL (0x7472696e), 
+-  ACE_NTOHL (0x67446566), 
+-  ACE_NTOHL (0x0),  // name = CORBA_WstringDef
+-};
+-
+-static CORBA::TypeCode _tc_TAO_tc_CORBA_WstringDef (
+-    CORBA::tk_objref,
+-    sizeof (_oc_CORBA_WstringDef),
+-    (char *) &_oc_CORBA_WstringDef,
+-    0,
+-    sizeof (CORBA_WstringDef)
+-  );
+-
+-CORBA::TypeCode_ptr _tc_CORBA_WstringDef =
+-  &_tc_TAO_tc_CORBA_WstringDef;
+-
+ CORBA_SequenceDef_ptr
+ tao_CORBA_SequenceDef_duplicate (
+     CORBA_SequenceDef_ptr p
+@@ -15523,7 +14811,7 @@
+     return CORBA_SequenceDef::_nil ();
+   if (! obj->_is_local ())
+     {
+-      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA_SequenceDef:1.0", ACE_TRY_ENV);
++      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/SequenceDef:1.0", ACE_TRY_ENV);
+       ACE_CHECK_RETURN (CORBA_SequenceDef::_nil ());
+       if (is_a == 0)
+         return CORBA_SequenceDef::_nil ();
+@@ -15642,7 +14930,7 @@
+ 
+ const char* CORBA_SequenceDef::_interface_repository_id (void) const
+ {
+-  return "IDL:omg.org/CORBA_SequenceDef:1.0";
++  return "IDL:omg.org/CORBA/SequenceDef:1.0";
+ }
+ 
+ CORBA::ULong CORBA_SequenceDef::bound (
+@@ -15734,38 +15022,6 @@
+     );
+ }
+ 
+-static const CORBA::Long _oc_CORBA_SequenceDef[] =
+-{
+-  TAO_ENCAP_BYTE_ORDER, // byte order
+-  34,
+-  ACE_NTOHL (0x49444c3a), 
+-  ACE_NTOHL (0x6f6d672e), 
+-  ACE_NTOHL (0x6f72672f), 
+-  ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x415f5365), 
+-  ACE_NTOHL (0x7175656e), 
+-  ACE_NTOHL (0x63654465), 
+-  ACE_NTOHL (0x663a312e), 
+-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA_SequenceDef:1.0
+-  18,
+-  ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x415f5365), 
+-  ACE_NTOHL (0x7175656e), 
+-  ACE_NTOHL (0x63654465), 
+-  ACE_NTOHL (0x66000000),  // name = CORBA_SequenceDef
+-};
+-
+-static CORBA::TypeCode _tc_TAO_tc_CORBA_SequenceDef (
+-    CORBA::tk_objref,
+-    sizeof (_oc_CORBA_SequenceDef),
+-    (char *) &_oc_CORBA_SequenceDef,
+-    0,
+-    sizeof (CORBA_SequenceDef)
+-  );
+-
+-CORBA::TypeCode_ptr _tc_CORBA_SequenceDef =
+-  &_tc_TAO_tc_CORBA_SequenceDef;
+-
+ CORBA_ArrayDef_ptr
+ tao_CORBA_ArrayDef_duplicate (
+     CORBA_ArrayDef_ptr p
+@@ -17344,7 +16600,7 @@
+     return CORBA_ArrayDef::_nil ();
+   if (! obj->_is_local ())
+     {
+-      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA_ArrayDef:1.0", ACE_TRY_ENV);
++      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/ArrayDef:1.0", ACE_TRY_ENV);
+       ACE_CHECK_RETURN (CORBA_ArrayDef::_nil ());
+       if (is_a == 0)
+         return CORBA_ArrayDef::_nil ();
+@@ -17412,9 +16668,9 @@
+ CORBA::Boolean CORBA_ArrayDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+ {
+   if (
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_ArrayDef:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/ArrayDef:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
+   return 1; // success using local knowledge
+   else
+@@ -17463,7 +16719,7 @@
+ 
+ const char* CORBA_ArrayDef::_interface_repository_id (void) const
+ {
+-  return "IDL:omg.org/CORBA_ArrayDef:1.0";
++  return "IDL:omg.org/CORBA/ArrayDef:1.0";
+ }
+ 
+ CORBA::ULong CORBA_ArrayDef::length (
+@@ -17555,36 +16811,6 @@
+     );
+ }
+ 
+-static const CORBA::Long _oc_CORBA_ArrayDef[] =
+-{
+-  TAO_ENCAP_BYTE_ORDER, // byte order
+-  31,
+-  ACE_NTOHL (0x49444c3a), 
+-  ACE_NTOHL (0x6f6d672e), 
+-  ACE_NTOHL (0x6f72672f), 
+-  ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x415f4172), 
+-  ACE_NTOHL (0x72617944), 
+-  ACE_NTOHL (0x65663a31), 
+-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA_ArrayDef:1.0
+-  15,
+-  ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x415f4172), 
+-  ACE_NTOHL (0x72617944), 
+-  ACE_NTOHL (0x65660000),  // name = CORBA_ArrayDef
+-};
+-
+-static CORBA::TypeCode _tc_TAO_tc_CORBA_ArrayDef (
+-    CORBA::tk_objref,
+-    sizeof (_oc_CORBA_ArrayDef),
+-    (char *) &_oc_CORBA_ArrayDef,
+-    0,
+-    sizeof (CORBA_ArrayDef)
+-  );
+-
+-CORBA::TypeCode_ptr _tc_CORBA_ArrayDef =
+-  &_tc_TAO_tc_CORBA_ArrayDef;
+-
+ CORBA_ExceptionDef_ptr
+ tao_CORBA_ExceptionDef_duplicate (
+     CORBA_ExceptionDef_ptr p
+@@ -18671,7 +17897,7 @@
+     return CORBA_ExceptionDef::_nil ();
+   if (! obj->_is_local ())
+     {
+-      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA_ExceptionDef:1.0", ACE_TRY_ENV);
++      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/ExceptionDef:1.0", ACE_TRY_ENV);
+       ACE_CHECK_RETURN (CORBA_ExceptionDef::_nil ());
+       if (is_a == 0)
+         return CORBA_ExceptionDef::_nil ();
+@@ -18739,10 +17965,10 @@
+ CORBA::Boolean CORBA_ExceptionDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+ {
+   if (
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_ExceptionDef:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Container:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/ExceptionDef:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Container:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
+   return 1; // success using local knowledge
+   else
+@@ -18803,7 +18029,7 @@
+ 
+ const char* CORBA_ExceptionDef::_interface_repository_id (void) const
+ {
+-  return "IDL:omg.org/CORBA_ExceptionDef:1.0";
++  return "IDL:omg.org/CORBA/ExceptionDef:1.0";
+ }
+ 
+ CORBA::TypeCode_ptr CORBA_ExceptionDef::type (
+@@ -18859,115 +18085,21 @@
+     );
+ }
+ 
+-static const CORBA::Long _oc_CORBA_ExceptionDef[] =
++void CORBA_ExceptionDescription::_tao_any_destructor (void *x)
+ {
+-  TAO_ENCAP_BYTE_ORDER, // byte order
+-  35,
+-  ACE_NTOHL (0x49444c3a), 
+-  ACE_NTOHL (0x6f6d672e), 
+-  ACE_NTOHL (0x6f72672f), 
+-  ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x415f4578), 
+-  ACE_NTOHL (0x63657074), 
+-  ACE_NTOHL (0x696f6e44), 
+-  ACE_NTOHL (0x65663a31), 
+-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA_ExceptionDef:1.0
+-  19,
+-  ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x415f4578), 
+-  ACE_NTOHL (0x63657074), 
+-  ACE_NTOHL (0x696f6e44), 
+-  ACE_NTOHL (0x65660000),  // name = CORBA_ExceptionDef
+-};
++  CORBA_ExceptionDescription *tmp = ACE_static_cast (CORBA_ExceptionDescription*,x);
++  delete tmp;
++}
+ 
+-static CORBA::TypeCode _tc_TAO_tc_CORBA_ExceptionDef (
+-    CORBA::tk_objref,
+-    sizeof (_oc_CORBA_ExceptionDef),
+-    (char *) &_oc_CORBA_ExceptionDef,
+-    0,
+-    sizeof (CORBA_ExceptionDef)
+-  );
+ 
+-CORBA::TypeCode_ptr _tc_CORBA_ExceptionDef =
+-  &_tc_TAO_tc_CORBA_ExceptionDef;
++#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
++  
++#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_EXCEPTIONDEFSEQ_CS_)
++#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_EXCEPTIONDEFSEQ_CS_
+ 
+-static const CORBA::Long _oc_CORBA_ExceptionDescription[] =
+-{
+-  TAO_ENCAP_BYTE_ORDER, // byte order
+-  43,
+-  ACE_NTOHL (0x49444c3a), 
+-  ACE_NTOHL (0x6f6d672e), 
+-  ACE_NTOHL (0x6f72672f), 
+-  ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x415f4578), 
+-  ACE_NTOHL (0x63657074), 
+-  ACE_NTOHL (0x696f6e44), 
+-  ACE_NTOHL (0x65736372), 
+-  ACE_NTOHL (0x69707469), 
+-  ACE_NTOHL (0x6f6e3a31), 
+-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA_ExceptionDescription:1.0
+-  27,
+-  ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x415f4578), 
+-  ACE_NTOHL (0x63657074), 
+-  ACE_NTOHL (0x696f6e44), 
+-  ACE_NTOHL (0x65736372), 
+-  ACE_NTOHL (0x69707469), 
+-  ACE_NTOHL (0x6f6e0000),  // name = CORBA_ExceptionDescription
+-  5, // member count
+-  5,
+-  ACE_NTOHL (0x6e616d65), 
+-  ACE_NTOHL (0x0),  // name = name
+-  CORBA::tk_string, 
+-  0U, // string length
+-  3,
+-  ACE_NTOHL (0x69640000),  // name = id
+-  CORBA::tk_string, 
+-  0U, // string length
+-  11,
+-  ACE_NTOHL (0x64656669), 
+-  ACE_NTOHL (0x6e65645f), 
+-  ACE_NTOHL (0x696e0000),  // name = defined_in
+-  CORBA::tk_string, 
+-  0U, // string length
+-  8,
+-  ACE_NTOHL (0x76657273), 
+-  ACE_NTOHL (0x696f6e00),  // name = version
+-  CORBA::tk_string, 
+-  0U, // string length
+-  5,
+-  ACE_NTOHL (0x74797065), 
+-  ACE_NTOHL (0x0),  // name = type
+-  CORBA::tk_TypeCode,
+-
+-};
+-
+-static CORBA::TypeCode _tc_TAO_tc_CORBA_ExceptionDescription (
+-    CORBA::tk_struct,
+-    sizeof (_oc_CORBA_ExceptionDescription),
+-    (char *) &_oc_CORBA_ExceptionDescription,
+-    0,
+-    sizeof (CORBA_ExceptionDescription)
+-  );
+-
+-CORBA::TypeCode_ptr _tc_CORBA_ExceptionDescription =
+-  &_tc_TAO_tc_CORBA_ExceptionDescription;
+-
+-void CORBA_ExceptionDescription::_tao_any_destructor (void *x)
+-{
+-  CORBA_ExceptionDescription *tmp = ACE_static_cast (CORBA_ExceptionDescription*,x);
+-  delete tmp;
+-}
+-
+-
+-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+-  
+-#if !defined (__TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_EXCEPTIONDEFSEQ_CS_)
+-#define __TAO_UNBOUNDED_OBJECT_SEQUENCE_CORBA_EXCEPTIONDEFSEQ_CS_
+-
+-  // The Base_Sequence functions, please see tao/Sequence.h
+-  void
+-  _TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq::_allocate_buffer (CORBA::ULong length)
++  // The Base_Sequence functions, please see tao/Sequence.h
++  void
++  _TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq::_allocate_buffer (CORBA::ULong length)
+   {
+     CORBA_ExceptionDef **tmp = 0;
+     tmp = _TAO_Unbounded_Object_Sequence_CORBA_ExceptionDefSeq::allocbuf (length);
+@@ -19100,66 +18232,6 @@
+ 
+ #endif /* end #if !defined */
+ 
+-static const CORBA::Long _oc_CORBA_ExceptionDefSeq[] =
+-{
+-  TAO_ENCAP_BYTE_ORDER, // byte order
+-  38,
+-  ACE_NTOHL (0x49444c3a), 
+-  ACE_NTOHL (0x6f6d672e), 
+-  ACE_NTOHL (0x6f72672f), 
+-  ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x415f4578), 
+-  ACE_NTOHL (0x63657074), 
+-  ACE_NTOHL (0x696f6e44), 
+-  ACE_NTOHL (0x65665365), 
+-  ACE_NTOHL (0x713a312e), 
+-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA_ExceptionDefSeq:1.0
+-  22,
+-  ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x415f4578), 
+-  ACE_NTOHL (0x63657074), 
+-  ACE_NTOHL (0x696f6e44), 
+-  ACE_NTOHL (0x65665365), 
+-  ACE_NTOHL (0x71000000),  // name = CORBA_ExceptionDefSeq
+-  CORBA::tk_sequence, // typecode kind
+-  84, // encapsulation length
+-    TAO_ENCAP_BYTE_ORDER, // byte order
+-    CORBA::tk_objref, // typecode kind
+-    68, // encapsulation length
+-      TAO_ENCAP_BYTE_ORDER, // byte order
+-      35,
+-      ACE_NTOHL (0x49444c3a), 
+-      ACE_NTOHL (0x6f6d672e), 
+-      ACE_NTOHL (0x6f72672f), 
+-      ACE_NTOHL (0x434f5242), 
+-      ACE_NTOHL (0x415f4578), 
+-      ACE_NTOHL (0x63657074), 
+-      ACE_NTOHL (0x696f6e44), 
+-      ACE_NTOHL (0x65663a31), 
+-      ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA_ExceptionDef:1.0
+-      19,
+-      ACE_NTOHL (0x434f5242), 
+-      ACE_NTOHL (0x415f4578), 
+-      ACE_NTOHL (0x63657074), 
+-      ACE_NTOHL (0x696f6e44), 
+-      ACE_NTOHL (0x65660000),  // name = CORBA_ExceptionDef
+-
+-    0U,
+-
+-};
+-
+-static CORBA::TypeCode _tc_TAO_tc_CORBA_ExceptionDefSeq (
+-    CORBA::tk_alias,
+-    sizeof (_oc_CORBA_ExceptionDefSeq),
+-    (char *) &_oc_CORBA_ExceptionDefSeq,
+-    0,
+-    sizeof (CORBA_ExceptionDefSeq)
+-  );
+-
+-CORBA::TypeCode_ptr _tc_CORBA_ExceptionDefSeq =
+-  &_tc_TAO_tc_CORBA_ExceptionDefSeq;
+-
+-
+ #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+   
+ #if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_EXCDESCRIPTIONSEQ_CS_)
+@@ -19255,95 +18327,6 @@
+ 
+ #endif /* end #if !defined */
+ 
+-static const CORBA::Long _oc_CORBA_ExcDescriptionSeq[] =
+-{
+-  TAO_ENCAP_BYTE_ORDER, // byte order
+-  40,
+-  ACE_NTOHL (0x49444c3a), 
+-  ACE_NTOHL (0x6f6d672e), 
+-  ACE_NTOHL (0x6f72672f), 
+-  ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x415f4578), 
+-  ACE_NTOHL (0x63446573), 
+-  ACE_NTOHL (0x63726970), 
+-  ACE_NTOHL (0x74696f6e), 
+-  ACE_NTOHL (0x5365713a), 
+-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA_ExcDescriptionSeq:1.0
+-  24,
+-  ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x415f4578), 
+-  ACE_NTOHL (0x63446573), 
+-  ACE_NTOHL (0x63726970), 
+-  ACE_NTOHL (0x74696f6e), 
+-  ACE_NTOHL (0x53657100),  // name = CORBA_ExcDescriptionSeq
+-  CORBA::tk_sequence, // typecode kind
+-  200, // encapsulation length
+-    TAO_ENCAP_BYTE_ORDER, // byte order
+-    CORBA::tk_struct, // typecode kind
+-    184, // encapsulation length
+-      TAO_ENCAP_BYTE_ORDER, // byte order
+-      43,
+-      ACE_NTOHL (0x49444c3a), 
+-      ACE_NTOHL (0x6f6d672e), 
+-      ACE_NTOHL (0x6f72672f), 
+-      ACE_NTOHL (0x434f5242), 
+-      ACE_NTOHL (0x415f4578), 
+-      ACE_NTOHL (0x63657074), 
+-      ACE_NTOHL (0x696f6e44), 
+-      ACE_NTOHL (0x65736372), 
+-      ACE_NTOHL (0x69707469), 
+-      ACE_NTOHL (0x6f6e3a31), 
+-      ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA_ExceptionDescription:1.0
+-      27,
+-      ACE_NTOHL (0x434f5242), 
+-      ACE_NTOHL (0x415f4578), 
+-      ACE_NTOHL (0x63657074), 
+-      ACE_NTOHL (0x696f6e44), 
+-      ACE_NTOHL (0x65736372), 
+-      ACE_NTOHL (0x69707469), 
+-      ACE_NTOHL (0x6f6e0000),  // name = CORBA_ExceptionDescription
+-      5, // member count
+-      5,
+-      ACE_NTOHL (0x6e616d65), 
+-      ACE_NTOHL (0x0),  // name = name
+-      CORBA::tk_string, 
+-      0U, // string length
+-      3,
+-      ACE_NTOHL (0x69640000),  // name = id
+-      CORBA::tk_string, 
+-      0U, // string length
+-      11,
+-      ACE_NTOHL (0x64656669), 
+-      ACE_NTOHL (0x6e65645f), 
+-      ACE_NTOHL (0x696e0000),  // name = defined_in
+-      CORBA::tk_string, 
+-      0U, // string length
+-      8,
+-      ACE_NTOHL (0x76657273), 
+-      ACE_NTOHL (0x696f6e00),  // name = version
+-      CORBA::tk_string, 
+-      0U, // string length
+-      5,
+-      ACE_NTOHL (0x74797065), 
+-      ACE_NTOHL (0x0),  // name = type
+-      CORBA::tk_TypeCode,
+-
+-
+-    0U,
+-
+-};
+-
+-static CORBA::TypeCode _tc_TAO_tc_CORBA_ExcDescriptionSeq (
+-    CORBA::tk_alias,
+-    sizeof (_oc_CORBA_ExcDescriptionSeq),
+-    (char *) &_oc_CORBA_ExcDescriptionSeq,
+-    0,
+-    sizeof (CORBA_ExcDescriptionSeq)
+-  );
+-
+-CORBA::TypeCode_ptr _tc_CORBA_ExcDescriptionSeq =
+-  &_tc_TAO_tc_CORBA_ExcDescriptionSeq;
+-
+ CORBA_AttributeDef_ptr
+ tao_CORBA_AttributeDef_duplicate (
+     CORBA_AttributeDef_ptr p
+@@ -20923,7 +19906,7 @@
+     return CORBA_AttributeDef::_nil ();
+   if (! obj->_is_local ())
+     {
+-      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA_AttributeDef:1.0", ACE_TRY_ENV);
++      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/AttributeDef:1.0", ACE_TRY_ENV);
+       ACE_CHECK_RETURN (CORBA_AttributeDef::_nil ());
+       if (is_a == 0)
+         return CORBA_AttributeDef::_nil ();
+@@ -20991,9 +19974,9 @@
+ CORBA::Boolean CORBA_AttributeDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+ {
+   if (
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_AttributeDef:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/AttributeDef:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
+   return 1; // success using local knowledge
+   else
+@@ -21042,7 +20025,7 @@
+ 
+ const char* CORBA_AttributeDef::_interface_repository_id (void) const
+ {
+-  return "IDL:omg.org/CORBA_AttributeDef:1.0";
++  return "IDL:omg.org/CORBA/AttributeDef:1.0";
+ }
+ 
+ CORBA::TypeCode_ptr CORBA_AttributeDef::type (
+@@ -21134,259 +20117,29 @@
+     );
+ }
+ 
+-static const CORBA::Long _oc_CORBA_AttributeDef[] =
++void CORBA_AttributeDescription::_tao_any_destructor (void *x)
+ {
+-  TAO_ENCAP_BYTE_ORDER, // byte order
+-  35,
+-  ACE_NTOHL (0x49444c3a), 
+-  ACE_NTOHL (0x6f6d672e), 
+-  ACE_NTOHL (0x6f72672f), 
+-  ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x415f4174), 
+-  ACE_NTOHL (0x74726962), 
+-  ACE_NTOHL (0x75746544), 
+-  ACE_NTOHL (0x65663a31), 
+-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA_AttributeDef:1.0
+-  19,
+-  ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x415f4174), 
+-  ACE_NTOHL (0x74726962), 
+-  ACE_NTOHL (0x75746544), 
+-  ACE_NTOHL (0x65660000),  // name = CORBA_AttributeDef
+-};
++  CORBA_AttributeDescription *tmp = ACE_static_cast (CORBA_AttributeDescription*,x);
++  delete tmp;
++}
+ 
+-static CORBA::TypeCode _tc_TAO_tc_CORBA_AttributeDef (
+-    CORBA::tk_objref,
+-    sizeof (_oc_CORBA_AttributeDef),
+-    (char *) &_oc_CORBA_AttributeDef,
+-    0,
+-    sizeof (CORBA_AttributeDef)
+-  );
++void CORBA_ParameterDescription::_tao_any_destructor (void *x)
++{
++  CORBA_ParameterDescription *tmp = ACE_static_cast (CORBA_ParameterDescription*,x);
++  delete tmp;
++}
+ 
+-CORBA::TypeCode_ptr _tc_CORBA_AttributeDef =
+-  &_tc_TAO_tc_CORBA_AttributeDef;
+ 
+-static const CORBA::Long _oc_CORBA_AttributeDescription[] =
++#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
++  
++#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_PARDESCRIPTIONSEQ_CS_)
++#define __TAO_UNBOUNDED_SEQUENCE_CORBA_PARDESCRIPTIONSEQ_CS_
++
++  void
++  _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq::_allocate_buffer (CORBA::ULong length)
+ {
+-  TAO_ENCAP_BYTE_ORDER, // byte order
+-  43,
+-  ACE_NTOHL (0x49444c3a), 
+-  ACE_NTOHL (0x6f6d672e), 
+-  ACE_NTOHL (0x6f72672f), 
+-  ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x415f4174), 
+-  ACE_NTOHL (0x74726962), 
+-  ACE_NTOHL (0x75746544), 
+-  ACE_NTOHL (0x65736372), 
+-  ACE_NTOHL (0x69707469), 
+-  ACE_NTOHL (0x6f6e3a31), 
+-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA_AttributeDescription:1.0
+-  27,
+-  ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x415f4174), 
+-  ACE_NTOHL (0x74726962), 
+-  ACE_NTOHL (0x75746544), 
+-  ACE_NTOHL (0x65736372), 
+-  ACE_NTOHL (0x69707469), 
+-  ACE_NTOHL (0x6f6e0000),  // name = CORBA_AttributeDescription
+-  6, // member count
+-  5,
+-  ACE_NTOHL (0x6e616d65), 
+-  ACE_NTOHL (0x0),  // name = name
+-  CORBA::tk_string, 
+-  0U, // string length
+-  3,
+-  ACE_NTOHL (0x69640000),  // name = id
+-  CORBA::tk_string, 
+-  0U, // string length
+-  11,
+-  ACE_NTOHL (0x64656669), 
+-  ACE_NTOHL (0x6e65645f), 
+-  ACE_NTOHL (0x696e0000),  // name = defined_in
+-  CORBA::tk_string, 
+-  0U, // string length
+-  8,
+-  ACE_NTOHL (0x76657273), 
+-  ACE_NTOHL (0x696f6e00),  // name = version
+-  CORBA::tk_string, 
+-  0U, // string length
+-  5,
+-  ACE_NTOHL (0x74797065), 
+-  ACE_NTOHL (0x0),  // name = type
+-  CORBA::tk_TypeCode,
+-
+-  5,
+-  ACE_NTOHL (0x6d6f6465), 
+-  ACE_NTOHL (0x0),  // name = mode
+-  CORBA::tk_enum, // typecode kind
+-  104, // encapsulation length
+-    TAO_ENCAP_BYTE_ORDER, // byte order
+-    36,
+-    ACE_NTOHL (0x49444c3a), 
+-    ACE_NTOHL (0x6f6d672e), 
+-    ACE_NTOHL (0x6f72672f), 
+-    ACE_NTOHL (0x434f5242), 
+-    ACE_NTOHL (0x412f4174), 
+-    ACE_NTOHL (0x74726962), 
+-    ACE_NTOHL (0x7574654d), 
+-    ACE_NTOHL (0x6f64653a), 
+-    ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/AttributeMode:1.0
+-    14,
+-    ACE_NTOHL (0x41747472), 
+-    ACE_NTOHL (0x69627574), 
+-    ACE_NTOHL (0x654d6f64), 
+-    ACE_NTOHL (0x65000000),  // name = AttributeMode
+-    2, // member count
+-    12,
+-    ACE_NTOHL (0x41545452), 
+-    ACE_NTOHL (0x5f4e4f52), 
+-    ACE_NTOHL (0x4d414c00),  // name = ATTR_NORMAL
+-    14,
+-    ACE_NTOHL (0x41545452), 
+-    ACE_NTOHL (0x5f524541), 
+-    ACE_NTOHL (0x444f4e4c), 
+-    ACE_NTOHL (0x59000000),  // name = ATTR_READONLY
+-
+-};
+-
+-static CORBA::TypeCode _tc_TAO_tc_CORBA_AttributeDescription (
+-    CORBA::tk_struct,
+-    sizeof (_oc_CORBA_AttributeDescription),
+-    (char *) &_oc_CORBA_AttributeDescription,
+-    0,
+-    sizeof (CORBA_AttributeDescription)
+-  );
+-
+-CORBA::TypeCode_ptr _tc_CORBA_AttributeDescription =
+-  &_tc_TAO_tc_CORBA_AttributeDescription;
+-
+-void CORBA_AttributeDescription::_tao_any_destructor (void *x)
+-{
+-  CORBA_AttributeDescription *tmp = ACE_static_cast (CORBA_AttributeDescription*,x);
+-  delete tmp;
+-}
+-
+-static const CORBA::Long _oc_CORBA_ParameterDescription[] =
+-{
+-  TAO_ENCAP_BYTE_ORDER, // byte order
+-  43,
+-  ACE_NTOHL (0x49444c3a), 
+-  ACE_NTOHL (0x6f6d672e), 
+-  ACE_NTOHL (0x6f72672f), 
+-  ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x415f5061), 
+-  ACE_NTOHL (0x72616d65), 
+-  ACE_NTOHL (0x74657244), 
+-  ACE_NTOHL (0x65736372), 
+-  ACE_NTOHL (0x69707469), 
+-  ACE_NTOHL (0x6f6e3a31), 
+-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA_ParameterDescription:1.0
+-  27,
+-  ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x415f5061), 
+-  ACE_NTOHL (0x72616d65), 
+-  ACE_NTOHL (0x74657244), 
+-  ACE_NTOHL (0x65736372), 
+-  ACE_NTOHL (0x69707469), 
+-  ACE_NTOHL (0x6f6e0000),  // name = CORBA_ParameterDescription
+-  4, // member count
+-  5,
+-  ACE_NTOHL (0x6e616d65), 
+-  ACE_NTOHL (0x0),  // name = name
+-  CORBA::tk_string, 
+-  0U, // string length
+-  5,
+-  ACE_NTOHL (0x74797065), 
+-  ACE_NTOHL (0x0),  // name = type
+-  CORBA::tk_TypeCode,
+-
+-  9,
+-  ACE_NTOHL (0x74797065), 
+-  ACE_NTOHL (0x5f646566), 
+-  ACE_NTOHL (0x0),  // name = type_def
+-  CORBA::tk_objref, // typecode kind
+-  60, // encapsulation length
+-    TAO_ENCAP_BYTE_ORDER, // byte order
+-    30,
+-    ACE_NTOHL (0x49444c3a), 
+-    ACE_NTOHL (0x6f6d672e), 
+-    ACE_NTOHL (0x6f72672f), 
+-    ACE_NTOHL (0x434f5242), 
+-    ACE_NTOHL (0x415f4944), 
+-    ACE_NTOHL (0x4c547970), 
+-    ACE_NTOHL (0x653a312e), 
+-    ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA_IDLType:1.0
+-    14,
+-    ACE_NTOHL (0x434f5242), 
+-    ACE_NTOHL (0x415f4944), 
+-    ACE_NTOHL (0x4c547970), 
+-    ACE_NTOHL (0x65000000),  // name = CORBA_IDLType
+-
+-  5,
+-  ACE_NTOHL (0x6d6f6465), 
+-  ACE_NTOHL (0x0),  // name = mode
+-  CORBA::tk_enum, // typecode kind
+-  116, // encapsulation length
+-    TAO_ENCAP_BYTE_ORDER, // byte order
+-    36,
+-    ACE_NTOHL (0x49444c3a), 
+-    ACE_NTOHL (0x6f6d672e), 
+-    ACE_NTOHL (0x6f72672f), 
+-    ACE_NTOHL (0x434f5242), 
+-    ACE_NTOHL (0x412f5061), 
+-    ACE_NTOHL (0x72616d65), 
+-    ACE_NTOHL (0x7465724d), 
+-    ACE_NTOHL (0x6f64653a), 
+-    ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ParameterMode:1.0
+-    14,
+-    ACE_NTOHL (0x50617261), 
+-    ACE_NTOHL (0x6d657465), 
+-    ACE_NTOHL (0x724d6f64), 
+-    ACE_NTOHL (0x65000000),  // name = ParameterMode
+-    3, // member count
+-    9,
+-    ACE_NTOHL (0x50415241), 
+-    ACE_NTOHL (0x4d5f494e), 
+-    ACE_NTOHL (0x0),  // name = PARAM_IN
+-    10,
+-    ACE_NTOHL (0x50415241), 
+-    ACE_NTOHL (0x4d5f4f55), 
+-    ACE_NTOHL (0x54000000),  // name = PARAM_OUT
+-    12,
+-    ACE_NTOHL (0x50415241), 
+-    ACE_NTOHL (0x4d5f494e), 
+-    ACE_NTOHL (0x4f555400),  // name = PARAM_INOUT
+-
+-};
+-
+-static CORBA::TypeCode _tc_TAO_tc_CORBA_ParameterDescription (
+-    CORBA::tk_struct,
+-    sizeof (_oc_CORBA_ParameterDescription),
+-    (char *) &_oc_CORBA_ParameterDescription,
+-    0,
+-    sizeof (CORBA_ParameterDescription)
+-  );
+-
+-CORBA::TypeCode_ptr _tc_CORBA_ParameterDescription =
+-  &_tc_TAO_tc_CORBA_ParameterDescription;
+-
+-void CORBA_ParameterDescription::_tao_any_destructor (void *x)
+-{
+-  CORBA_ParameterDescription *tmp = ACE_static_cast (CORBA_ParameterDescription*,x);
+-  delete tmp;
+-}
+-
+-
+-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+-  
+-#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_PARDESCRIPTIONSEQ_CS_)
+-#define __TAO_UNBOUNDED_SEQUENCE_CORBA_PARDESCRIPTIONSEQ_CS_
+-
+-  void
+-  _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq::_allocate_buffer (CORBA::ULong length)
+-  {
+-    CORBA_ParameterDescription* tmp = 0;
+-    tmp = _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq::allocbuf (length);
++    CORBA_ParameterDescription* tmp = 0;
++    tmp = _TAO_Unbounded_Sequence_CORBA_ParDescriptionSeq::allocbuf (length);
+     
+     if (this->buffer_ != 0)
+     {
+@@ -21472,138 +20225,6 @@
+ 
+ #endif /* end #if !defined */
+ 
+-static const CORBA::Long _oc_CORBA_ParDescriptionSeq[] =
+-{
+-  TAO_ENCAP_BYTE_ORDER, // byte order
+-  40,
+-  ACE_NTOHL (0x49444c3a), 
+-  ACE_NTOHL (0x6f6d672e), 
+-  ACE_NTOHL (0x6f72672f), 
+-  ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x415f5061), 
+-  ACE_NTOHL (0x72446573), 
+-  ACE_NTOHL (0x63726970), 
+-  ACE_NTOHL (0x74696f6e), 
+-  ACE_NTOHL (0x5365713a), 
+-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA_ParDescriptionSeq:1.0
+-  24,
+-  ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x415f5061), 
+-  ACE_NTOHL (0x72446573), 
+-  ACE_NTOHL (0x63726970), 
+-  ACE_NTOHL (0x74696f6e), 
+-  ACE_NTOHL (0x53657100),  // name = CORBA_ParDescriptionSeq
+-  CORBA::tk_sequence, // typecode kind
+-  360, // encapsulation length
+-    TAO_ENCAP_BYTE_ORDER, // byte order
+-    CORBA::tk_struct, // typecode kind
+-    344, // encapsulation length
+-      TAO_ENCAP_BYTE_ORDER, // byte order
+-      43,
+-      ACE_NTOHL (0x49444c3a), 
+-      ACE_NTOHL (0x6f6d672e), 
+-      ACE_NTOHL (0x6f72672f), 
+-      ACE_NTOHL (0x434f5242), 
+-      ACE_NTOHL (0x415f5061), 
+-      ACE_NTOHL (0x72616d65), 
+-      ACE_NTOHL (0x74657244), 
+-      ACE_NTOHL (0x65736372), 
+-      ACE_NTOHL (0x69707469), 
+-      ACE_NTOHL (0x6f6e3a31), 
+-      ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA_ParameterDescription:1.0
+-      27,
+-      ACE_NTOHL (0x434f5242), 
+-      ACE_NTOHL (0x415f5061), 
+-      ACE_NTOHL (0x72616d65), 
+-      ACE_NTOHL (0x74657244), 
+-      ACE_NTOHL (0x65736372), 
+-      ACE_NTOHL (0x69707469), 
+-      ACE_NTOHL (0x6f6e0000),  // name = CORBA_ParameterDescription
+-      4, // member count
+-      5,
+-      ACE_NTOHL (0x6e616d65), 
+-      ACE_NTOHL (0x0),  // name = name
+-      CORBA::tk_string, 
+-      0U, // string length
+-      5,
+-      ACE_NTOHL (0x74797065), 
+-      ACE_NTOHL (0x0),  // name = type
+-      CORBA::tk_TypeCode,
+-
+-      9,
+-      ACE_NTOHL (0x74797065), 
+-      ACE_NTOHL (0x5f646566), 
+-      ACE_NTOHL (0x0),  // name = type_def
+-      CORBA::tk_objref, // typecode kind
+-      60, // encapsulation length
+-        TAO_ENCAP_BYTE_ORDER, // byte order
+-        30,
+-        ACE_NTOHL (0x49444c3a), 
+-        ACE_NTOHL (0x6f6d672e), 
+-        ACE_NTOHL (0x6f72672f), 
+-        ACE_NTOHL (0x434f5242), 
+-        ACE_NTOHL (0x415f4944), 
+-        ACE_NTOHL (0x4c547970), 
+-        ACE_NTOHL (0x653a312e), 
+-        ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA_IDLType:1.0
+-        14,
+-        ACE_NTOHL (0x434f5242), 
+-        ACE_NTOHL (0x415f4944), 
+-        ACE_NTOHL (0x4c547970), 
+-        ACE_NTOHL (0x65000000),  // name = CORBA_IDLType
+-
+-      5,
+-      ACE_NTOHL (0x6d6f6465), 
+-      ACE_NTOHL (0x0),  // name = mode
+-      CORBA::tk_enum, // typecode kind
+-      116, // encapsulation length
+-        TAO_ENCAP_BYTE_ORDER, // byte order
+-        36,
+-        ACE_NTOHL (0x49444c3a), 
+-        ACE_NTOHL (0x6f6d672e), 
+-        ACE_NTOHL (0x6f72672f), 
+-        ACE_NTOHL (0x434f5242), 
+-        ACE_NTOHL (0x412f5061), 
+-        ACE_NTOHL (0x72616d65), 
+-        ACE_NTOHL (0x7465724d), 
+-        ACE_NTOHL (0x6f64653a), 
+-        ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ParameterMode:1.0
+-        14,
+-        ACE_NTOHL (0x50617261), 
+-        ACE_NTOHL (0x6d657465), 
+-        ACE_NTOHL (0x724d6f64), 
+-        ACE_NTOHL (0x65000000),  // name = ParameterMode
+-        3, // member count
+-        9,
+-        ACE_NTOHL (0x50415241), 
+-        ACE_NTOHL (0x4d5f494e), 
+-        ACE_NTOHL (0x0),  // name = PARAM_IN
+-        10,
+-        ACE_NTOHL (0x50415241), 
+-        ACE_NTOHL (0x4d5f4f55), 
+-        ACE_NTOHL (0x54000000),  // name = PARAM_OUT
+-        12,
+-        ACE_NTOHL (0x50415241), 
+-        ACE_NTOHL (0x4d5f494e), 
+-        ACE_NTOHL (0x4f555400),  // name = PARAM_INOUT
+-
+-
+-    0U,
+-
+-};
+-
+-static CORBA::TypeCode _tc_TAO_tc_CORBA_ParDescriptionSeq (
+-    CORBA::tk_alias,
+-    sizeof (_oc_CORBA_ParDescriptionSeq),
+-    (char *) &_oc_CORBA_ParDescriptionSeq,
+-    0,
+-    sizeof (CORBA_ParDescriptionSeq)
+-  );
+-
+-CORBA::TypeCode_ptr _tc_CORBA_ParDescriptionSeq =
+-  &_tc_TAO_tc_CORBA_ParDescriptionSeq;
+-
+-
+ #if !defined (_CORBA_CONTEXTIDSEQ_CS_)
+ #define _CORBA_CONTEXTIDSEQ_CS_
+ 
+@@ -21651,45 +20272,6 @@
+ 
+ #endif /* end #if !defined */
+ 
+-static const CORBA::Long _oc_CORBA_ContextIdSeq[] =
+-{
+-  TAO_ENCAP_BYTE_ORDER, // byte order
+-  35,
+-  ACE_NTOHL (0x49444c3a), 
+-  ACE_NTOHL (0x6f6d672e), 
+-  ACE_NTOHL (0x6f72672f), 
+-  ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x415f436f), 
+-  ACE_NTOHL (0x6e746578), 
+-  ACE_NTOHL (0x74496453), 
+-  ACE_NTOHL (0x65713a31), 
+-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA_ContextIdSeq:1.0
+-  19,
+-  ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x415f436f), 
+-  ACE_NTOHL (0x6e746578), 
+-  ACE_NTOHL (0x74496453), 
+-  ACE_NTOHL (0x65710000),  // name = CORBA_ContextIdSeq
+-  CORBA::tk_sequence, // typecode kind
+-  16, // encapsulation length
+-    TAO_ENCAP_BYTE_ORDER, // byte order
+-    CORBA::tk_string, 
+-    0U, // string length
+-    0U,
+-
+-};
+-
+-static CORBA::TypeCode _tc_TAO_tc_CORBA_ContextIdSeq (
+-    CORBA::tk_alias,
+-    sizeof (_oc_CORBA_ContextIdSeq),
+-    (char *) &_oc_CORBA_ContextIdSeq,
+-    0,
+-    sizeof (CORBA_ContextIdSeq)
+-  );
+-
+-CORBA::TypeCode_ptr _tc_CORBA_ContextIdSeq =
+-  &_tc_TAO_tc_CORBA_ContextIdSeq;
+-
+ CORBA_OperationDef_ptr
+ tao_CORBA_OperationDef_duplicate (
+     CORBA_OperationDef_ptr p
+@@ -24766,7 +23348,7 @@
+     return CORBA_OperationDef::_nil ();
+   if (! obj->_is_local ())
+     {
+-      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA_OperationDef:1.0", ACE_TRY_ENV);
++      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/OperationDef:1.0", ACE_TRY_ENV);
+       ACE_CHECK_RETURN (CORBA_OperationDef::_nil ());
+       if (is_a == 0)
+         return CORBA_OperationDef::_nil ();
+@@ -24834,9 +23416,9 @@
+ CORBA::Boolean CORBA_OperationDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+ {
+   if (
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_OperationDef:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/OperationDef:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
+   return 1; // success using local knowledge
+   else
+@@ -24885,7 +23467,7 @@
+ 
+ const char* CORBA_OperationDef::_interface_repository_id (void) const
+ {
+-  return "IDL:omg.org/CORBA_OperationDef:1.0";
++  return "IDL:omg.org/CORBA/OperationDef:1.0";
+ }
+ 
+ CORBA::TypeCode_ptr CORBA_OperationDef::result (
+@@ -25085,472 +23667,70 @@
+     );
+ }
+ 
+-static const CORBA::Long _oc_CORBA_OperationDef[] =
++void CORBA_OperationDescription::_tao_any_destructor (void *x)
+ {
+-  TAO_ENCAP_BYTE_ORDER, // byte order
+-  35,
+-  ACE_NTOHL (0x49444c3a), 
+-  ACE_NTOHL (0x6f6d672e), 
+-  ACE_NTOHL (0x6f72672f), 
+-  ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x415f4f70), 
+-  ACE_NTOHL (0x65726174), 
+-  ACE_NTOHL (0x696f6e44), 
+-  ACE_NTOHL (0x65663a31), 
+-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA_OperationDef:1.0
+-  19,
+-  ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x415f4f70), 
+-  ACE_NTOHL (0x65726174), 
+-  ACE_NTOHL (0x696f6e44), 
+-  ACE_NTOHL (0x65660000),  // name = CORBA_OperationDef
+-};
++  CORBA_OperationDescription *tmp = ACE_static_cast (CORBA_OperationDescription*,x);
++  delete tmp;
++}
+ 
+-static CORBA::TypeCode _tc_TAO_tc_CORBA_OperationDef (
+-    CORBA::tk_objref,
+-    sizeof (_oc_CORBA_OperationDef),
+-    (char *) &_oc_CORBA_OperationDef,
+-    0,
+-    sizeof (CORBA_OperationDef)
+-  );
+ 
+-CORBA::TypeCode_ptr _tc_CORBA_OperationDef =
+-  &_tc_TAO_tc_CORBA_OperationDef;
++#if !defined (_CORBA_REPOSITORYIDSEQ_CS_)
++#define _CORBA_REPOSITORYIDSEQ_CS_
++
++// *************************************************************
++// CORBA_RepositoryIdSeq
++// *************************************************************
+ 
+-static const CORBA::Long _oc_CORBA_OperationDescription[] =
++CORBA_RepositoryIdSeq::CORBA_RepositoryIdSeq (void)
++{}
++CORBA_RepositoryIdSeq::CORBA_RepositoryIdSeq (CORBA::ULong max) // uses max size
++  : 
++#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
++  TAO_Unbounded_String_Sequence
++#else /* TAO_USE_SEQUENCE_TEMPLATES */
++  TAO_Unbounded_String_Sequence
++#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
++ (max)
++{}
++CORBA_RepositoryIdSeq::CORBA_RepositoryIdSeq (CORBA::ULong max, CORBA::ULong length, char * *buffer, CORBA::Boolean release)
++  : 
++#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
++  TAO_Unbounded_String_Sequence
++#else /* TAO_USE_SEQUENCE_TEMPLATES */
++  TAO_Unbounded_String_Sequence
++#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
++ (max, length, buffer, release)
++{}
++CORBA_RepositoryIdSeq::CORBA_RepositoryIdSeq (const CORBA_RepositoryIdSeq &seq) // copy ctor
++  : 
++#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
++  TAO_Unbounded_String_Sequence
++#else /* TAO_USE_SEQUENCE_TEMPLATES */
++  TAO_Unbounded_String_Sequence
++#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
++ (seq)
++{}
++CORBA_RepositoryIdSeq::~CORBA_RepositoryIdSeq (void) // dtor
++{}
++void CORBA_RepositoryIdSeq::_tao_any_destructor (void *x)
+ {
+-  TAO_ENCAP_BYTE_ORDER, // byte order
+-  43,
+-  ACE_NTOHL (0x49444c3a), 
+-  ACE_NTOHL (0x6f6d672e), 
+-  ACE_NTOHL (0x6f72672f), 
+-  ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x415f4f70), 
+-  ACE_NTOHL (0x65726174), 
+-  ACE_NTOHL (0x696f6e44), 
+-  ACE_NTOHL (0x65736372), 
+-  ACE_NTOHL (0x69707469), 
+-  ACE_NTOHL (0x6f6e3a31), 
+-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA_OperationDescription:1.0
+-  27,
+-  ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x415f4f70), 
+-  ACE_NTOHL (0x65726174), 
+-  ACE_NTOHL (0x696f6e44), 
+-  ACE_NTOHL (0x65736372), 
+-  ACE_NTOHL (0x69707469), 
+-  ACE_NTOHL (0x6f6e0000),  // name = CORBA_OperationDescription
+-  9, // member count
+-  5,
+-  ACE_NTOHL (0x6e616d65), 
+-  ACE_NTOHL (0x0),  // name = name
+-  CORBA::tk_string, 
+-  0U, // string length
+-  3,
+-  ACE_NTOHL (0x69640000),  // name = id
+-  CORBA::tk_string, 
+-  0U, // string length
+-  11,
+-  ACE_NTOHL (0x64656669), 
+-  ACE_NTOHL (0x6e65645f), 
+-  ACE_NTOHL (0x696e0000),  // name = defined_in
+-  CORBA::tk_string, 
+-  0U, // string length
+-  8,
+-  ACE_NTOHL (0x76657273), 
+-  ACE_NTOHL (0x696f6e00),  // name = version
+-  CORBA::tk_string, 
+-  0U, // string length
+-  7,
+-  ACE_NTOHL (0x72657375), 
+-  ACE_NTOHL (0x6c740000),  // name = result
+-  CORBA::tk_TypeCode,
++  CORBA_RepositoryIdSeq *tmp = ACE_static_cast (CORBA_RepositoryIdSeq*,x);
++  delete tmp;
++}
+ 
+-  5,
+-  ACE_NTOHL (0x6d6f6465), 
+-  ACE_NTOHL (0x0),  // name = mode
+-  CORBA::tk_enum, // typecode kind
+-  100, // encapsulation length
+-    TAO_ENCAP_BYTE_ORDER, // byte order
+-    36,
+-    ACE_NTOHL (0x49444c3a), 
+-    ACE_NTOHL (0x6f6d672e), 
+-    ACE_NTOHL (0x6f72672f), 
+-    ACE_NTOHL (0x434f5242), 
+-    ACE_NTOHL (0x412f4f70), 
+-    ACE_NTOHL (0x65726174), 
+-    ACE_NTOHL (0x696f6e4d), 
+-    ACE_NTOHL (0x6f64653a), 
+-    ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/OperationMode:1.0
+-    14,
+-    ACE_NTOHL (0x4f706572), 
+-    ACE_NTOHL (0x6174696f), 
+-    ACE_NTOHL (0x6e4d6f64), 
+-    ACE_NTOHL (0x65000000),  // name = OperationMode
+-    2, // member count
+-    10,
+-    ACE_NTOHL (0x4f505f4e), 
+-    ACE_NTOHL (0x4f524d41), 
+-    ACE_NTOHL (0x4c000000),  // name = OP_NORMAL
+-    10,
+-    ACE_NTOHL (0x4f505f4f), 
+-    ACE_NTOHL (0x4e455741), 
+-    ACE_NTOHL (0x59000000),  // name = OP_ONEWAY
+ 
+-  9,
+-  ACE_NTOHL (0x636f6e74), 
+-  ACE_NTOHL (0x65787473), 
+-  ACE_NTOHL (0x0),  // name = contexts
+-  CORBA::tk_alias, // typecode kind for typedefs
+-  92, // encapsulation length
+-    TAO_ENCAP_BYTE_ORDER, // byte order
+-    35,
+-    ACE_NTOHL (0x49444c3a), 
+-    ACE_NTOHL (0x6f6d672e), 
+-    ACE_NTOHL (0x6f72672f), 
+-    ACE_NTOHL (0x434f5242), 
+-    ACE_NTOHL (0x415f436f), 
+-    ACE_NTOHL (0x6e746578), 
+-    ACE_NTOHL (0x74496453), 
+-    ACE_NTOHL (0x65713a31), 
+-    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA_ContextIdSeq:1.0
+-    19,
+-    ACE_NTOHL (0x434f5242), 
+-    ACE_NTOHL (0x415f436f), 
+-    ACE_NTOHL (0x6e746578), 
+-    ACE_NTOHL (0x74496453), 
+-    ACE_NTOHL (0x65710000),  // name = CORBA_ContextIdSeq
+-    CORBA::tk_sequence, // typecode kind
+-    16, // encapsulation length
+-      TAO_ENCAP_BYTE_ORDER, // byte order
+-      CORBA::tk_string, 
+-      0U, // string length
+-      0U,
++#endif /* end #if !defined */
+ 
++#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+ 
+-  11,
+-  ACE_NTOHL (0x70617261), 
+-  ACE_NTOHL (0x6d657465), 
+-  ACE_NTOHL (0x72730000),  // name = parameters
+-  CORBA::tk_alias, // typecode kind for typedefs
+-  444, // encapsulation length
+-    TAO_ENCAP_BYTE_ORDER, // byte order
+-    40,
+-    ACE_NTOHL (0x49444c3a), 
+-    ACE_NTOHL (0x6f6d672e), 
+-    ACE_NTOHL (0x6f72672f), 
+-    ACE_NTOHL (0x434f5242), 
+-    ACE_NTOHL (0x415f5061), 
+-    ACE_NTOHL (0x72446573), 
+-    ACE_NTOHL (0x63726970), 
+-    ACE_NTOHL (0x74696f6e), 
+-    ACE_NTOHL (0x5365713a), 
+-    ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA_ParDescriptionSeq:1.0
+-    24,
+-    ACE_NTOHL (0x434f5242), 
+-    ACE_NTOHL (0x415f5061), 
+-    ACE_NTOHL (0x72446573), 
+-    ACE_NTOHL (0x63726970), 
+-    ACE_NTOHL (0x74696f6e), 
+-    ACE_NTOHL (0x53657100),  // name = CORBA_ParDescriptionSeq
+-    CORBA::tk_sequence, // typecode kind
+-    360, // encapsulation length
+-      TAO_ENCAP_BYTE_ORDER, // byte order
+-      CORBA::tk_struct, // typecode kind
+-      344, // encapsulation length
+-        TAO_ENCAP_BYTE_ORDER, // byte order
+-        43,
+-        ACE_NTOHL (0x49444c3a), 
+-        ACE_NTOHL (0x6f6d672e), 
+-        ACE_NTOHL (0x6f72672f), 
+-        ACE_NTOHL (0x434f5242), 
+-        ACE_NTOHL (0x415f5061), 
+-        ACE_NTOHL (0x72616d65), 
+-        ACE_NTOHL (0x74657244), 
+-        ACE_NTOHL (0x65736372), 
+-        ACE_NTOHL (0x69707469), 
+-        ACE_NTOHL (0x6f6e3a31), 
+-        ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA_ParameterDescription:1.0
+-        27,
+-        ACE_NTOHL (0x434f5242), 
+-        ACE_NTOHL (0x415f5061), 
+-        ACE_NTOHL (0x72616d65), 
+-        ACE_NTOHL (0x74657244), 
+-        ACE_NTOHL (0x65736372), 
+-        ACE_NTOHL (0x69707469), 
+-        ACE_NTOHL (0x6f6e0000),  // name = CORBA_ParameterDescription
+-        4, // member count
+-        5,
+-        ACE_NTOHL (0x6e616d65), 
+-        ACE_NTOHL (0x0),  // name = name
+-        CORBA::tk_string, 
+-        0U, // string length
+-        5,
+-        ACE_NTOHL (0x74797065), 
+-        ACE_NTOHL (0x0),  // name = type
+-        CORBA::tk_TypeCode,
++#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_OPDESCRIPTIONSEQ_CS_)
++#define __TAO_UNBOUNDED_SEQUENCE_CORBA_OPDESCRIPTIONSEQ_CS_
+ 
+-        9,
+-        ACE_NTOHL (0x74797065), 
+-        ACE_NTOHL (0x5f646566), 
+-        ACE_NTOHL (0x0),  // name = type_def
+-        CORBA::tk_objref, // typecode kind
+-        60, // encapsulation length
+-          TAO_ENCAP_BYTE_ORDER, // byte order
+-          30,
+-          ACE_NTOHL (0x49444c3a), 
+-          ACE_NTOHL (0x6f6d672e), 
+-          ACE_NTOHL (0x6f72672f), 
+-          ACE_NTOHL (0x434f5242), 
+-          ACE_NTOHL (0x415f4944), 
+-          ACE_NTOHL (0x4c547970), 
+-          ACE_NTOHL (0x653a312e), 
+-          ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA_IDLType:1.0
+-          14,
+-          ACE_NTOHL (0x434f5242), 
+-          ACE_NTOHL (0x415f4944), 
+-          ACE_NTOHL (0x4c547970), 
+-          ACE_NTOHL (0x65000000),  // name = CORBA_IDLType
+-
+-        5,
+-        ACE_NTOHL (0x6d6f6465), 
+-        ACE_NTOHL (0x0),  // name = mode
+-        CORBA::tk_enum, // typecode kind
+-        116, // encapsulation length
+-          TAO_ENCAP_BYTE_ORDER, // byte order
+-          36,
+-          ACE_NTOHL (0x49444c3a), 
+-          ACE_NTOHL (0x6f6d672e), 
+-          ACE_NTOHL (0x6f72672f), 
+-          ACE_NTOHL (0x434f5242), 
+-          ACE_NTOHL (0x412f5061), 
+-          ACE_NTOHL (0x72616d65), 
+-          ACE_NTOHL (0x7465724d), 
+-          ACE_NTOHL (0x6f64653a), 
+-          ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ParameterMode:1.0
+-          14,
+-          ACE_NTOHL (0x50617261), 
+-          ACE_NTOHL (0x6d657465), 
+-          ACE_NTOHL (0x724d6f64), 
+-          ACE_NTOHL (0x65000000),  // name = ParameterMode
+-          3, // member count
+-          9,
+-          ACE_NTOHL (0x50415241), 
+-          ACE_NTOHL (0x4d5f494e), 
+-          ACE_NTOHL (0x0),  // name = PARAM_IN
+-          10,
+-          ACE_NTOHL (0x50415241), 
+-          ACE_NTOHL (0x4d5f4f55), 
+-          ACE_NTOHL (0x54000000),  // name = PARAM_OUT
+-          12,
+-          ACE_NTOHL (0x50415241), 
+-          ACE_NTOHL (0x4d5f494e), 
+-          ACE_NTOHL (0x4f555400),  // name = PARAM_INOUT
+-
+-
+-      0U,
+-
+-
+-  11,
+-  ACE_NTOHL (0x65786365), 
+-  ACE_NTOHL (0x7074696f), 
+-  ACE_NTOHL (0x6e730000),  // name = exceptions
+-  CORBA::tk_alias, // typecode kind for typedefs
+-  284, // encapsulation length
+-    TAO_ENCAP_BYTE_ORDER, // byte order
+-    40,
+-    ACE_NTOHL (0x49444c3a), 
+-    ACE_NTOHL (0x6f6d672e), 
+-    ACE_NTOHL (0x6f72672f), 
+-    ACE_NTOHL (0x434f5242), 
+-    ACE_NTOHL (0x415f4578), 
+-    ACE_NTOHL (0x63446573), 
+-    ACE_NTOHL (0x63726970), 
+-    ACE_NTOHL (0x74696f6e), 
+-    ACE_NTOHL (0x5365713a), 
+-    ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA_ExcDescriptionSeq:1.0
+-    24,
+-    ACE_NTOHL (0x434f5242), 
+-    ACE_NTOHL (0x415f4578), 
+-    ACE_NTOHL (0x63446573), 
+-    ACE_NTOHL (0x63726970), 
+-    ACE_NTOHL (0x74696f6e), 
+-    ACE_NTOHL (0x53657100),  // name = CORBA_ExcDescriptionSeq
+-    CORBA::tk_sequence, // typecode kind
+-    200, // encapsulation length
+-      TAO_ENCAP_BYTE_ORDER, // byte order
+-      CORBA::tk_struct, // typecode kind
+-      184, // encapsulation length
+-        TAO_ENCAP_BYTE_ORDER, // byte order
+-        43,
+-        ACE_NTOHL (0x49444c3a), 
+-        ACE_NTOHL (0x6f6d672e), 
+-        ACE_NTOHL (0x6f72672f), 
+-        ACE_NTOHL (0x434f5242), 
+-        ACE_NTOHL (0x415f4578), 
+-        ACE_NTOHL (0x63657074), 
+-        ACE_NTOHL (0x696f6e44), 
+-        ACE_NTOHL (0x65736372), 
+-        ACE_NTOHL (0x69707469), 
+-        ACE_NTOHL (0x6f6e3a31), 
+-        ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA_ExceptionDescription:1.0
+-        27,
+-        ACE_NTOHL (0x434f5242), 
+-        ACE_NTOHL (0x415f4578), 
+-        ACE_NTOHL (0x63657074), 
+-        ACE_NTOHL (0x696f6e44), 
+-        ACE_NTOHL (0x65736372), 
+-        ACE_NTOHL (0x69707469), 
+-        ACE_NTOHL (0x6f6e0000),  // name = CORBA_ExceptionDescription
+-        5, // member count
+-        5,
+-        ACE_NTOHL (0x6e616d65), 
+-        ACE_NTOHL (0x0),  // name = name
+-        CORBA::tk_string, 
+-        0U, // string length
+-        3,
+-        ACE_NTOHL (0x69640000),  // name = id
+-        CORBA::tk_string, 
+-        0U, // string length
+-        11,
+-        ACE_NTOHL (0x64656669), 
+-        ACE_NTOHL (0x6e65645f), 
+-        ACE_NTOHL (0x696e0000),  // name = defined_in
+-        CORBA::tk_string, 
+-        0U, // string length
+-        8,
+-        ACE_NTOHL (0x76657273), 
+-        ACE_NTOHL (0x696f6e00),  // name = version
+-        CORBA::tk_string, 
+-        0U, // string length
+-        5,
+-        ACE_NTOHL (0x74797065), 
+-        ACE_NTOHL (0x0),  // name = type
+-        CORBA::tk_TypeCode,
+-
+-
+-      0U,
+-
+-
+-};
+-
+-static CORBA::TypeCode _tc_TAO_tc_CORBA_OperationDescription (
+-    CORBA::tk_struct,
+-    sizeof (_oc_CORBA_OperationDescription),
+-    (char *) &_oc_CORBA_OperationDescription,
+-    0,
+-    sizeof (CORBA_OperationDescription)
+-  );
+-
+-CORBA::TypeCode_ptr _tc_CORBA_OperationDescription =
+-  &_tc_TAO_tc_CORBA_OperationDescription;
+-
+-void CORBA_OperationDescription::_tao_any_destructor (void *x)
+-{
+-  CORBA_OperationDescription *tmp = ACE_static_cast (CORBA_OperationDescription*,x);
+-  delete tmp;
+-}
+-
+-
+-#if !defined (_CORBA_REPOSITORYIDSEQ_CS_)
+-#define _CORBA_REPOSITORYIDSEQ_CS_
+-
+-// *************************************************************
+-// CORBA_RepositoryIdSeq
+-// *************************************************************
+-
+-CORBA_RepositoryIdSeq::CORBA_RepositoryIdSeq (void)
+-{}
+-CORBA_RepositoryIdSeq::CORBA_RepositoryIdSeq (CORBA::ULong max) // uses max size
+-  : 
+-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+-  TAO_Unbounded_String_Sequence
+-#else /* TAO_USE_SEQUENCE_TEMPLATES */
+-  TAO_Unbounded_String_Sequence
+-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+- (max)
+-{}
+-CORBA_RepositoryIdSeq::CORBA_RepositoryIdSeq (CORBA::ULong max, CORBA::ULong length, char * *buffer, CORBA::Boolean release)
+-  : 
+-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+-  TAO_Unbounded_String_Sequence
+-#else /* TAO_USE_SEQUENCE_TEMPLATES */
+-  TAO_Unbounded_String_Sequence
+-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+- (max, length, buffer, release)
+-{}
+-CORBA_RepositoryIdSeq::CORBA_RepositoryIdSeq (const CORBA_RepositoryIdSeq &seq) // copy ctor
+-  : 
+-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+-  TAO_Unbounded_String_Sequence
+-#else /* TAO_USE_SEQUENCE_TEMPLATES */
+-  TAO_Unbounded_String_Sequence
+-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+- (seq)
+-{}
+-CORBA_RepositoryIdSeq::~CORBA_RepositoryIdSeq (void) // dtor
+-{}
+-void CORBA_RepositoryIdSeq::_tao_any_destructor (void *x)
+-{
+-  CORBA_RepositoryIdSeq *tmp = ACE_static_cast (CORBA_RepositoryIdSeq*,x);
+-  delete tmp;
+-}
+-
+-
+-#endif /* end #if !defined */
+-
+-static const CORBA::Long _oc_CORBA_RepositoryIdSeq[] =
+-{
+-  TAO_ENCAP_BYTE_ORDER, // byte order
+-  38,
+-  ACE_NTOHL (0x49444c3a), 
+-  ACE_NTOHL (0x6f6d672e), 
+-  ACE_NTOHL (0x6f72672f), 
+-  ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x415f5265), 
+-  ACE_NTOHL (0x706f7369), 
+-  ACE_NTOHL (0x746f7279), 
+-  ACE_NTOHL (0x49645365), 
+-  ACE_NTOHL (0x713a312e), 
+-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA_RepositoryIdSeq:1.0
+-  22,
+-  ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x415f5265), 
+-  ACE_NTOHL (0x706f7369), 
+-  ACE_NTOHL (0x746f7279), 
+-  ACE_NTOHL (0x49645365), 
+-  ACE_NTOHL (0x71000000),  // name = CORBA_RepositoryIdSeq
+-  CORBA::tk_sequence, // typecode kind
+-  16, // encapsulation length
+-    TAO_ENCAP_BYTE_ORDER, // byte order
+-    CORBA::tk_string, 
+-    0U, // string length
+-    0U,
+-
+-};
+-
+-static CORBA::TypeCode _tc_TAO_tc_CORBA_RepositoryIdSeq (
+-    CORBA::tk_alias,
+-    sizeof (_oc_CORBA_RepositoryIdSeq),
+-    (char *) &_oc_CORBA_RepositoryIdSeq,
+-    0,
+-    sizeof (CORBA_RepositoryIdSeq)
+-  );
+-
+-CORBA::TypeCode_ptr _tc_CORBA_RepositoryIdSeq =
+-  &_tc_TAO_tc_CORBA_RepositoryIdSeq;
+-
+-
+-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+-  
+-#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_OPDESCRIPTIONSEQ_CS_)
+-#define __TAO_UNBOUNDED_SEQUENCE_CORBA_OPDESCRIPTIONSEQ_CS_
+-
+-  void
+-  _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq::_allocate_buffer (CORBA::ULong length)
+-  {
+-    CORBA_OperationDescription* tmp = 0;
+-    tmp = _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq::allocbuf (length);
++  void
++  _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq::_allocate_buffer (CORBA::ULong length)
++  {
++    CORBA_OperationDescription* tmp = 0;
++    tmp = _TAO_Unbounded_Sequence_CORBA_OpDescriptionSeq::allocbuf (length);
+     
+     if (this->buffer_ != 0)
+     {
+@@ -25636,369 +23816,13 @@
+ 
+ #endif /* end #if !defined */
+ 
+-static const CORBA::Long _oc_CORBA_OpDescriptionSeq[] =
+-{
+-  TAO_ENCAP_BYTE_ORDER, // byte order
+-  39,
+-  ACE_NTOHL (0x49444c3a), 
+-  ACE_NTOHL (0x6f6d672e), 
+-  ACE_NTOHL (0x6f72672f), 
+-  ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x415f4f70), 
+-  ACE_NTOHL (0x44657363), 
+-  ACE_NTOHL (0x72697074), 
+-  ACE_NTOHL (0x696f6e53), 
+-  ACE_NTOHL (0x65713a31), 
+-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA_OpDescriptionSeq:1.0
+-  23,
+-  ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x415f4f70), 
+-  ACE_NTOHL (0x44657363), 
+-  ACE_NTOHL (0x72697074), 
+-  ACE_NTOHL (0x696f6e53), 
+-  ACE_NTOHL (0x65710000),  // name = CORBA_OpDescriptionSeq
+-  CORBA::tk_sequence, // typecode kind
+-  1212, // encapsulation length
+-    TAO_ENCAP_BYTE_ORDER, // byte order
+-    CORBA::tk_struct, // typecode kind
+-    1196, // encapsulation length
+-      TAO_ENCAP_BYTE_ORDER, // byte order
+-      43,
+-      ACE_NTOHL (0x49444c3a), 
+-      ACE_NTOHL (0x6f6d672e), 
+-      ACE_NTOHL (0x6f72672f), 
+-      ACE_NTOHL (0x434f5242), 
+-      ACE_NTOHL (0x415f4f70), 
+-      ACE_NTOHL (0x65726174), 
+-      ACE_NTOHL (0x696f6e44), 
+-      ACE_NTOHL (0x65736372), 
+-      ACE_NTOHL (0x69707469), 
+-      ACE_NTOHL (0x6f6e3a31), 
+-      ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA_OperationDescription:1.0
+-      27,
+-      ACE_NTOHL (0x434f5242), 
+-      ACE_NTOHL (0x415f4f70), 
+-      ACE_NTOHL (0x65726174), 
+-      ACE_NTOHL (0x696f6e44), 
+-      ACE_NTOHL (0x65736372), 
+-      ACE_NTOHL (0x69707469), 
+-      ACE_NTOHL (0x6f6e0000),  // name = CORBA_OperationDescription
+-      9, // member count
+-      5,
+-      ACE_NTOHL (0x6e616d65), 
+-      ACE_NTOHL (0x0),  // name = name
+-      CORBA::tk_string, 
+-      0U, // string length
+-      3,
+-      ACE_NTOHL (0x69640000),  // name = id
+-      CORBA::tk_string, 
+-      0U, // string length
+-      11,
+-      ACE_NTOHL (0x64656669), 
+-      ACE_NTOHL (0x6e65645f), 
+-      ACE_NTOHL (0x696e0000),  // name = defined_in
+-      CORBA::tk_string, 
+-      0U, // string length
+-      8,
+-      ACE_NTOHL (0x76657273), 
+-      ACE_NTOHL (0x696f6e00),  // name = version
+-      CORBA::tk_string, 
+-      0U, // string length
+-      7,
+-      ACE_NTOHL (0x72657375), 
+-      ACE_NTOHL (0x6c740000),  // name = result
+-      CORBA::tk_TypeCode,
+-
+-      5,
+-      ACE_NTOHL (0x6d6f6465), 
+-      ACE_NTOHL (0x0),  // name = mode
+-      CORBA::tk_enum, // typecode kind
+-      100, // encapsulation length
+-        TAO_ENCAP_BYTE_ORDER, // byte order
+-        36,
+-        ACE_NTOHL (0x49444c3a), 
+-        ACE_NTOHL (0x6f6d672e), 
+-        ACE_NTOHL (0x6f72672f), 
+-        ACE_NTOHL (0x434f5242), 
+-        ACE_NTOHL (0x412f4f70), 
+-        ACE_NTOHL (0x65726174), 
+-        ACE_NTOHL (0x696f6e4d), 
+-        ACE_NTOHL (0x6f64653a), 
+-        ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/OperationMode:1.0
+-        14,
+-        ACE_NTOHL (0x4f706572), 
+-        ACE_NTOHL (0x6174696f), 
+-        ACE_NTOHL (0x6e4d6f64), 
+-        ACE_NTOHL (0x65000000),  // name = OperationMode
+-        2, // member count
+-        10,
+-        ACE_NTOHL (0x4f505f4e), 
+-        ACE_NTOHL (0x4f524d41), 
+-        ACE_NTOHL (0x4c000000),  // name = OP_NORMAL
+-        10,
+-        ACE_NTOHL (0x4f505f4f), 
+-        ACE_NTOHL (0x4e455741), 
+-        ACE_NTOHL (0x59000000),  // name = OP_ONEWAY
+-
+-      9,
+-      ACE_NTOHL (0x636f6e74), 
+-      ACE_NTOHL (0x65787473), 
+-      ACE_NTOHL (0x0),  // name = contexts
+-      CORBA::tk_alias, // typecode kind for typedefs
+-      92, // encapsulation length
+-        TAO_ENCAP_BYTE_ORDER, // byte order
+-        35,
+-        ACE_NTOHL (0x49444c3a), 
+-        ACE_NTOHL (0x6f6d672e), 
+-        ACE_NTOHL (0x6f72672f), 
+-        ACE_NTOHL (0x434f5242), 
+-        ACE_NTOHL (0x415f436f), 
+-        ACE_NTOHL (0x6e746578), 
+-        ACE_NTOHL (0x74496453), 
+-        ACE_NTOHL (0x65713a31), 
+-        ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA_ContextIdSeq:1.0
+-        19,
+-        ACE_NTOHL (0x434f5242), 
+-        ACE_NTOHL (0x415f436f), 
+-        ACE_NTOHL (0x6e746578), 
+-        ACE_NTOHL (0x74496453), 
+-        ACE_NTOHL (0x65710000),  // name = CORBA_ContextIdSeq
+-        CORBA::tk_sequence, // typecode kind
+-        16, // encapsulation length
+-          TAO_ENCAP_BYTE_ORDER, // byte order
+-          CORBA::tk_string, 
+-          0U, // string length
+-          0U,
+-
+-
+-      11,
+-      ACE_NTOHL (0x70617261), 
+-      ACE_NTOHL (0x6d657465), 
+-      ACE_NTOHL (0x72730000),  // name = parameters
+-      CORBA::tk_alias, // typecode kind for typedefs
+-      444, // encapsulation length
+-        TAO_ENCAP_BYTE_ORDER, // byte order
+-        40,
+-        ACE_NTOHL (0x49444c3a), 
+-        ACE_NTOHL (0x6f6d672e), 
+-        ACE_NTOHL (0x6f72672f), 
+-        ACE_NTOHL (0x434f5242), 
+-        ACE_NTOHL (0x415f5061), 
+-        ACE_NTOHL (0x72446573), 
+-        ACE_NTOHL (0x63726970), 
+-        ACE_NTOHL (0x74696f6e), 
+-        ACE_NTOHL (0x5365713a), 
+-        ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA_ParDescriptionSeq:1.0
+-        24,
+-        ACE_NTOHL (0x434f5242), 
+-        ACE_NTOHL (0x415f5061), 
+-        ACE_NTOHL (0x72446573), 
+-        ACE_NTOHL (0x63726970), 
+-        ACE_NTOHL (0x74696f6e), 
+-        ACE_NTOHL (0x53657100),  // name = CORBA_ParDescriptionSeq
+-        CORBA::tk_sequence, // typecode kind
+-        360, // encapsulation length
+-          TAO_ENCAP_BYTE_ORDER, // byte order
+-          CORBA::tk_struct, // typecode kind
+-          344, // encapsulation length
+-            TAO_ENCAP_BYTE_ORDER, // byte order
+-            43,
+-            ACE_NTOHL (0x49444c3a), 
+-            ACE_NTOHL (0x6f6d672e), 
+-            ACE_NTOHL (0x6f72672f), 
+-            ACE_NTOHL (0x434f5242), 
+-            ACE_NTOHL (0x415f5061), 
+-            ACE_NTOHL (0x72616d65), 
+-            ACE_NTOHL (0x74657244), 
+-            ACE_NTOHL (0x65736372), 
+-            ACE_NTOHL (0x69707469), 
+-            ACE_NTOHL (0x6f6e3a31), 
+-            ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA_ParameterDescription:1.0
+-            27,
+-            ACE_NTOHL (0x434f5242), 
+-            ACE_NTOHL (0x415f5061), 
+-            ACE_NTOHL (0x72616d65), 
+-            ACE_NTOHL (0x74657244), 
+-            ACE_NTOHL (0x65736372), 
+-            ACE_NTOHL (0x69707469), 
+-            ACE_NTOHL (0x6f6e0000),  // name = CORBA_ParameterDescription
+-            4, // member count
+-            5,
+-            ACE_NTOHL (0x6e616d65), 
+-            ACE_NTOHL (0x0),  // name = name
+-            CORBA::tk_string, 
+-            0U, // string length
+-            5,
+-            ACE_NTOHL (0x74797065), 
+-            ACE_NTOHL (0x0),  // name = type
+-            CORBA::tk_TypeCode,
+-
+-            9,
+-            ACE_NTOHL (0x74797065), 
+-            ACE_NTOHL (0x5f646566), 
+-            ACE_NTOHL (0x0),  // name = type_def
+-            CORBA::tk_objref, // typecode kind
+-            60, // encapsulation length
+-              TAO_ENCAP_BYTE_ORDER, // byte order
+-              30,
+-              ACE_NTOHL (0x49444c3a), 
+-              ACE_NTOHL (0x6f6d672e), 
+-              ACE_NTOHL (0x6f72672f), 
+-              ACE_NTOHL (0x434f5242), 
+-              ACE_NTOHL (0x415f4944), 
+-              ACE_NTOHL (0x4c547970), 
+-              ACE_NTOHL (0x653a312e), 
+-              ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA_IDLType:1.0
+-              14,
+-              ACE_NTOHL (0x434f5242), 
+-              ACE_NTOHL (0x415f4944), 
+-              ACE_NTOHL (0x4c547970), 
+-              ACE_NTOHL (0x65000000),  // name = CORBA_IDLType
+-
+-            5,
+-            ACE_NTOHL (0x6d6f6465), 
+-            ACE_NTOHL (0x0),  // name = mode
+-            CORBA::tk_enum, // typecode kind
+-            116, // encapsulation length
+-              TAO_ENCAP_BYTE_ORDER, // byte order
+-              36,
+-              ACE_NTOHL (0x49444c3a), 
+-              ACE_NTOHL (0x6f6d672e), 
+-              ACE_NTOHL (0x6f72672f), 
+-              ACE_NTOHL (0x434f5242), 
+-              ACE_NTOHL (0x412f5061), 
+-              ACE_NTOHL (0x72616d65), 
+-              ACE_NTOHL (0x7465724d), 
+-              ACE_NTOHL (0x6f64653a), 
+-              ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ParameterMode:1.0
+-              14,
+-              ACE_NTOHL (0x50617261), 
+-              ACE_NTOHL (0x6d657465), 
+-              ACE_NTOHL (0x724d6f64), 
+-              ACE_NTOHL (0x65000000),  // name = ParameterMode
+-              3, // member count
+-              9,
+-              ACE_NTOHL (0x50415241), 
+-              ACE_NTOHL (0x4d5f494e), 
+-              ACE_NTOHL (0x0),  // name = PARAM_IN
+-              10,
+-              ACE_NTOHL (0x50415241), 
+-              ACE_NTOHL (0x4d5f4f55), 
+-              ACE_NTOHL (0x54000000),  // name = PARAM_OUT
+-              12,
+-              ACE_NTOHL (0x50415241), 
+-              ACE_NTOHL (0x4d5f494e), 
+-              ACE_NTOHL (0x4f555400),  // name = PARAM_INOUT
+-
+-
+-          0U,
+-
+-
+-      11,
+-      ACE_NTOHL (0x65786365), 
+-      ACE_NTOHL (0x7074696f), 
+-      ACE_NTOHL (0x6e730000),  // name = exceptions
+-      CORBA::tk_alias, // typecode kind for typedefs
+-      284, // encapsulation length
+-        TAO_ENCAP_BYTE_ORDER, // byte order
+-        40,
+-        ACE_NTOHL (0x49444c3a), 
+-        ACE_NTOHL (0x6f6d672e), 
+-        ACE_NTOHL (0x6f72672f), 
+-        ACE_NTOHL (0x434f5242), 
+-        ACE_NTOHL (0x415f4578), 
+-        ACE_NTOHL (0x63446573), 
+-        ACE_NTOHL (0x63726970), 
+-        ACE_NTOHL (0x74696f6e), 
+-        ACE_NTOHL (0x5365713a), 
+-        ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA_ExcDescriptionSeq:1.0
+-        24,
+-        ACE_NTOHL (0x434f5242), 
+-        ACE_NTOHL (0x415f4578), 
+-        ACE_NTOHL (0x63446573), 
+-        ACE_NTOHL (0x63726970), 
+-        ACE_NTOHL (0x74696f6e), 
+-        ACE_NTOHL (0x53657100),  // name = CORBA_ExcDescriptionSeq
+-        CORBA::tk_sequence, // typecode kind
+-        200, // encapsulation length
+-          TAO_ENCAP_BYTE_ORDER, // byte order
+-          CORBA::tk_struct, // typecode kind
+-          184, // encapsulation length
+-            TAO_ENCAP_BYTE_ORDER, // byte order
+-            43,
+-            ACE_NTOHL (0x49444c3a), 
+-            ACE_NTOHL (0x6f6d672e), 
+-            ACE_NTOHL (0x6f72672f), 
+-            ACE_NTOHL (0x434f5242), 
+-            ACE_NTOHL (0x415f4578), 
+-            ACE_NTOHL (0x63657074), 
+-            ACE_NTOHL (0x696f6e44), 
+-            ACE_NTOHL (0x65736372), 
+-            ACE_NTOHL (0x69707469), 
+-            ACE_NTOHL (0x6f6e3a31), 
+-            ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA_ExceptionDescription:1.0
+-            27,
+-            ACE_NTOHL (0x434f5242), 
+-            ACE_NTOHL (0x415f4578), 
+-            ACE_NTOHL (0x63657074), 
+-            ACE_NTOHL (0x696f6e44), 
+-            ACE_NTOHL (0x65736372), 
+-            ACE_NTOHL (0x69707469), 
+-            ACE_NTOHL (0x6f6e0000),  // name = CORBA_ExceptionDescription
+-            5, // member count
+-            5,
+-            ACE_NTOHL (0x6e616d65), 
+-            ACE_NTOHL (0x0),  // name = name
+-            CORBA::tk_string, 
+-            0U, // string length
+-            3,
+-            ACE_NTOHL (0x69640000),  // name = id
+-            CORBA::tk_string, 
+-            0U, // string length
+-            11,
+-            ACE_NTOHL (0x64656669), 
+-            ACE_NTOHL (0x6e65645f), 
+-            ACE_NTOHL (0x696e0000),  // name = defined_in
+-            CORBA::tk_string, 
+-            0U, // string length
+-            8,
+-            ACE_NTOHL (0x76657273), 
+-            ACE_NTOHL (0x696f6e00),  // name = version
+-            CORBA::tk_string, 
+-            0U, // string length
+-            5,
+-            ACE_NTOHL (0x74797065), 
+-            ACE_NTOHL (0x0),  // name = type
+-            CORBA::tk_TypeCode,
+-
+-
+-          0U,
+-
+-
+-
+-    0U,
+-
+-};
+-
+-static CORBA::TypeCode _tc_TAO_tc_CORBA_OpDescriptionSeq (
+-    CORBA::tk_alias,
+-    sizeof (_oc_CORBA_OpDescriptionSeq),
+-    (char *) &_oc_CORBA_OpDescriptionSeq,
+-    0,
+-    sizeof (CORBA_OpDescriptionSeq)
+-  );
+-
+-CORBA::TypeCode_ptr _tc_CORBA_OpDescriptionSeq =
+-  &_tc_TAO_tc_CORBA_OpDescriptionSeq;
+-
+-
+-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+-  
+-#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_ATTRDESCRIPTIONSEQ_CS_)
+-#define __TAO_UNBOUNDED_SEQUENCE_CORBA_ATTRDESCRIPTIONSEQ_CS_
+-
+-  void
+-  _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq::_allocate_buffer (CORBA::ULong length)
++#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
++  
++#if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_ATTRDESCRIPTIONSEQ_CS_)
++#define __TAO_UNBOUNDED_SEQUENCE_CORBA_ATTRDESCRIPTIONSEQ_CS_
++
++  void
++  _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq::_allocate_buffer (CORBA::ULong length)
+   {
+     CORBA_AttributeDescription* tmp = 0;
+     tmp = _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq::allocbuf (length);
+@@ -26017,198 +23841,75 @@
+     this->buffer_ = tmp;
+   }
+   
+-  void
+-  _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq::_deallocate_buffer (void)
+-  {
+-    if (this->buffer_ == 0 || this->release_ == 0)
+-      return;
+-    
+-    CORBA_AttributeDescription *tmp = ACE_reinterpret_cast (CORBA_AttributeDescription *,this->buffer_);
+-    
+-    _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq::freebuf (tmp);
+-    this->buffer_ = 0;
+-  } 
+-  
+-  _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq::~_TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq (void) // Dtor.
+-  {
+-    this->_deallocate_buffer ();
+-  }
+-  
+-  
+-#endif /* end #if !defined */
+-
+-
+-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+-
+-#if !defined (_CORBA_ATTRDESCRIPTIONSEQ_CS_)
+-#define _CORBA_ATTRDESCRIPTIONSEQ_CS_
+-
+-// *************************************************************
+-// CORBA_AttrDescriptionSeq
+-// *************************************************************
+-
+-CORBA_AttrDescriptionSeq::CORBA_AttrDescriptionSeq (void)
+-{}
+-CORBA_AttrDescriptionSeq::CORBA_AttrDescriptionSeq (CORBA::ULong max) // uses max size
+-  : 
+-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+-  _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq
+-#else /* TAO_USE_SEQUENCE_TEMPLATES */
+-  TAO_Unbounded_Sequence<CORBA_AttributeDescription>
+-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+- (max)
+-{}
+-CORBA_AttrDescriptionSeq::CORBA_AttrDescriptionSeq (CORBA::ULong max, CORBA::ULong length, CORBA_AttributeDescription *buffer, CORBA::Boolean release)
+-  : 
+-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+-  _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq
+-#else /* TAO_USE_SEQUENCE_TEMPLATES */
+-  TAO_Unbounded_Sequence<CORBA_AttributeDescription>
+-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+- (max, length, buffer, release)
+-{}
+-CORBA_AttrDescriptionSeq::CORBA_AttrDescriptionSeq (const CORBA_AttrDescriptionSeq &seq) // copy ctor
+-  : 
+-#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
+-  _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq
+-#else /* TAO_USE_SEQUENCE_TEMPLATES */
+-  TAO_Unbounded_Sequence<CORBA_AttributeDescription>
+-#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
+- (seq)
+-{}
+-CORBA_AttrDescriptionSeq::~CORBA_AttrDescriptionSeq (void) // dtor
+-{}
+-void CORBA_AttrDescriptionSeq::_tao_any_destructor (void *x)
+-{
+-  CORBA_AttrDescriptionSeq *tmp = ACE_static_cast (CORBA_AttrDescriptionSeq*,x);
+-  delete tmp;
+-}
+-
+-
+-#endif /* end #if !defined */
+-
+-static const CORBA::Long _oc_CORBA_AttrDescriptionSeq[] =
+-{
+-  TAO_ENCAP_BYTE_ORDER, // byte order
+-  41,
+-  ACE_NTOHL (0x49444c3a), 
+-  ACE_NTOHL (0x6f6d672e), 
+-  ACE_NTOHL (0x6f72672f), 
+-  ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x415f4174), 
+-  ACE_NTOHL (0x74724465), 
+-  ACE_NTOHL (0x73637269), 
+-  ACE_NTOHL (0x7074696f), 
+-  ACE_NTOHL (0x6e536571), 
+-  ACE_NTOHL (0x3a312e30), 
+-  ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA_AttrDescriptionSeq:1.0
+-  25,
+-  ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x415f4174), 
+-  ACE_NTOHL (0x74724465), 
+-  ACE_NTOHL (0x73637269), 
+-  ACE_NTOHL (0x7074696f), 
+-  ACE_NTOHL (0x6e536571), 
+-  ACE_NTOHL (0x0),  // name = CORBA_AttrDescriptionSeq
+-  CORBA::tk_sequence, // typecode kind
+-  324, // encapsulation length
+-    TAO_ENCAP_BYTE_ORDER, // byte order
+-    CORBA::tk_struct, // typecode kind
+-    308, // encapsulation length
+-      TAO_ENCAP_BYTE_ORDER, // byte order
+-      43,
+-      ACE_NTOHL (0x49444c3a), 
+-      ACE_NTOHL (0x6f6d672e), 
+-      ACE_NTOHL (0x6f72672f), 
+-      ACE_NTOHL (0x434f5242), 
+-      ACE_NTOHL (0x415f4174), 
+-      ACE_NTOHL (0x74726962), 
+-      ACE_NTOHL (0x75746544), 
+-      ACE_NTOHL (0x65736372), 
+-      ACE_NTOHL (0x69707469), 
+-      ACE_NTOHL (0x6f6e3a31), 
+-      ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA_AttributeDescription:1.0
+-      27,
+-      ACE_NTOHL (0x434f5242), 
+-      ACE_NTOHL (0x415f4174), 
+-      ACE_NTOHL (0x74726962), 
+-      ACE_NTOHL (0x75746544), 
+-      ACE_NTOHL (0x65736372), 
+-      ACE_NTOHL (0x69707469), 
+-      ACE_NTOHL (0x6f6e0000),  // name = CORBA_AttributeDescription
+-      6, // member count
+-      5,
+-      ACE_NTOHL (0x6e616d65), 
+-      ACE_NTOHL (0x0),  // name = name
+-      CORBA::tk_string, 
+-      0U, // string length
+-      3,
+-      ACE_NTOHL (0x69640000),  // name = id
+-      CORBA::tk_string, 
+-      0U, // string length
+-      11,
+-      ACE_NTOHL (0x64656669), 
+-      ACE_NTOHL (0x6e65645f), 
+-      ACE_NTOHL (0x696e0000),  // name = defined_in
+-      CORBA::tk_string, 
+-      0U, // string length
+-      8,
+-      ACE_NTOHL (0x76657273), 
+-      ACE_NTOHL (0x696f6e00),  // name = version
+-      CORBA::tk_string, 
+-      0U, // string length
+-      5,
+-      ACE_NTOHL (0x74797065), 
+-      ACE_NTOHL (0x0),  // name = type
+-      CORBA::tk_TypeCode,
+-
+-      5,
+-      ACE_NTOHL (0x6d6f6465), 
+-      ACE_NTOHL (0x0),  // name = mode
+-      CORBA::tk_enum, // typecode kind
+-      104, // encapsulation length
+-        TAO_ENCAP_BYTE_ORDER, // byte order
+-        36,
+-        ACE_NTOHL (0x49444c3a), 
+-        ACE_NTOHL (0x6f6d672e), 
+-        ACE_NTOHL (0x6f72672f), 
+-        ACE_NTOHL (0x434f5242), 
+-        ACE_NTOHL (0x412f4174), 
+-        ACE_NTOHL (0x74726962), 
+-        ACE_NTOHL (0x7574654d), 
+-        ACE_NTOHL (0x6f64653a), 
+-        ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/AttributeMode:1.0
+-        14,
+-        ACE_NTOHL (0x41747472), 
+-        ACE_NTOHL (0x69627574), 
+-        ACE_NTOHL (0x654d6f64), 
+-        ACE_NTOHL (0x65000000),  // name = AttributeMode
+-        2, // member count
+-        12,
+-        ACE_NTOHL (0x41545452), 
+-        ACE_NTOHL (0x5f4e4f52), 
+-        ACE_NTOHL (0x4d414c00),  // name = ATTR_NORMAL
+-        14,
+-        ACE_NTOHL (0x41545452), 
+-        ACE_NTOHL (0x5f524541), 
+-        ACE_NTOHL (0x444f4e4c), 
+-        ACE_NTOHL (0x59000000),  // name = ATTR_READONLY
++  void
++  _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq::_deallocate_buffer (void)
++  {
++    if (this->buffer_ == 0 || this->release_ == 0)
++      return;
+ 
++    CORBA_AttributeDescription *tmp = ACE_reinterpret_cast (CORBA_AttributeDescription *,this->buffer_);
+ 
+-    0U,
++    _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq::freebuf (tmp);
++    this->buffer_ = 0;
++  } 
+ 
+-};
++  _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq::~_TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq (void) // Dtor.
++  {
++    this->_deallocate_buffer ();
++  }
+ 
+-static CORBA::TypeCode _tc_TAO_tc_CORBA_AttrDescriptionSeq (
+-    CORBA::tk_alias,
+-    sizeof (_oc_CORBA_AttrDescriptionSeq),
+-    (char *) &_oc_CORBA_AttrDescriptionSeq,
+-    0,
+-    sizeof (CORBA_AttrDescriptionSeq)
+-  );
+ 
+-CORBA::TypeCode_ptr _tc_CORBA_AttrDescriptionSeq =
+-  &_tc_TAO_tc_CORBA_AttrDescriptionSeq;
++#endif /* end #if !defined */
++
++
++#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
++
++#if !defined (_CORBA_ATTRDESCRIPTIONSEQ_CS_)
++#define _CORBA_ATTRDESCRIPTIONSEQ_CS_
++
++// *************************************************************
++// CORBA_AttrDescriptionSeq
++// *************************************************************
++
++CORBA_AttrDescriptionSeq::CORBA_AttrDescriptionSeq (void)
++{}
++CORBA_AttrDescriptionSeq::CORBA_AttrDescriptionSeq (CORBA::ULong max) // uses max size
++  : 
++#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
++  _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq
++#else /* TAO_USE_SEQUENCE_TEMPLATES */
++  TAO_Unbounded_Sequence<CORBA_AttributeDescription>
++#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
++ (max)
++{}
++CORBA_AttrDescriptionSeq::CORBA_AttrDescriptionSeq (CORBA::ULong max, CORBA::ULong length, CORBA_AttributeDescription *buffer, CORBA::Boolean release)
++  : 
++#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
++  _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq
++#else /* TAO_USE_SEQUENCE_TEMPLATES */
++  TAO_Unbounded_Sequence<CORBA_AttributeDescription>
++#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
++ (max, length, buffer, release)
++{}
++CORBA_AttrDescriptionSeq::CORBA_AttrDescriptionSeq (const CORBA_AttrDescriptionSeq &seq) // copy ctor
++  : 
++#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
++  _TAO_Unbounded_Sequence_CORBA_AttrDescriptionSeq
++#else /* TAO_USE_SEQUENCE_TEMPLATES */
++  TAO_Unbounded_Sequence<CORBA_AttributeDescription>
++#endif /* !TAO_USE_SEQUENCE_TEMPLATES */ 
++ (seq)
++{}
++CORBA_AttrDescriptionSeq::~CORBA_AttrDescriptionSeq (void) // dtor
++{}
++void CORBA_AttrDescriptionSeq::_tao_any_destructor (void *x)
++{
++  CORBA_AttrDescriptionSeq *tmp = ACE_static_cast (CORBA_AttrDescriptionSeq*,x);
++  delete tmp;
++}
++
++
++#endif /* end #if !defined */
+ 
+ CORBA_InterfaceDef_ptr
+ tao_CORBA_InterfaceDef_duplicate (
+@@ -28263,7 +25964,7 @@
+     return CORBA_InterfaceDef::_nil ();
+   if (! obj->_is_local ())
+     {
+-      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA_InterfaceDef:1.0", ACE_TRY_ENV);
++      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/InterfaceDef:1.0", ACE_TRY_ENV);
+       ACE_CHECK_RETURN (CORBA_InterfaceDef::_nil ());
+       if (is_a == 0)
+         return CORBA_InterfaceDef::_nil ();
+@@ -28331,11 +26032,11 @@
+ CORBA::Boolean CORBA_InterfaceDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+ {
+   if (
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_InterfaceDef:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Container:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/InterfaceDef:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Container:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
+   return 1; // success using local knowledge
+   else
+@@ -28408,7 +26109,7 @@
+ 
+ const char* CORBA_InterfaceDef::_interface_repository_id (void) const
+ {
+-  return "IDL:omg.org/CORBA_InterfaceDef:1.0";
++  return "IDL:omg.org/CORBA/InterfaceDef:1.0";
+ }
+ 
+ CORBA_InterfaceDefSeq * CORBA_InterfaceDef::base_interfaces (
+@@ -28474,7 +26175,7 @@
+   ACE_NTOHL (0x6f6d672e), 
+   ACE_NTOHL (0x6f72672f), 
+   ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x415f496e), 
++  ACE_NTOHL (0x412f496e), 
+   ACE_NTOHL (0x74657266), 
+   ACE_NTOHL (0x61636544), 
+   ACE_NTOHL (0x65662f46), 
+@@ -28484,7 +26185,7 @@
+   ACE_NTOHL (0x44657363), 
+   ACE_NTOHL (0x72697074), 
+   ACE_NTOHL (0x696f6e3a), 
+-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA_InterfaceDef/FullInterfaceDescription:1.0
++  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/InterfaceDef/FullInterfaceDescription:1.0
+   25,
+   ACE_NTOHL (0x46756c6c), 
+   ACE_NTOHL (0x496e7465), 
+@@ -28497,95 +26198,241 @@
+   5,
+   ACE_NTOHL (0x6e616d65), 
+   ACE_NTOHL (0x0),  // name = name
++  CORBA::tk_alias, // typecode kind for typedefs
++  68, // encapsulation length
++    TAO_ENCAP_BYTE_ORDER, // byte order
++    33,
++    ACE_NTOHL (0x49444c3a), 
++    ACE_NTOHL (0x6f6d672e), 
++    ACE_NTOHL (0x6f72672f), 
++    ACE_NTOHL (0x434f5242), 
++    ACE_NTOHL (0x412f4964), 
++    ACE_NTOHL (0x656e7469), 
++    ACE_NTOHL (0x66696572), 
++    ACE_NTOHL (0x3a312e30), 
++    ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
++    11,
++    ACE_NTOHL (0x4964656e), 
++    ACE_NTOHL (0x74696669), 
++    ACE_NTOHL (0x65720000),  // name = Identifier
+   CORBA::tk_string, 
+   0U, // string length
++
+   3,
+   ACE_NTOHL (0x69640000),  // name = id
++  CORBA::tk_alias, // typecode kind for typedefs
++  72, // encapsulation length
++    TAO_ENCAP_BYTE_ORDER, // byte order
++    35,
++    ACE_NTOHL (0x49444c3a), 
++    ACE_NTOHL (0x6f6d672e), 
++    ACE_NTOHL (0x6f72672f), 
++    ACE_NTOHL (0x434f5242), 
++    ACE_NTOHL (0x412f5265), 
++    ACE_NTOHL (0x706f7369), 
++    ACE_NTOHL (0x746f7279), 
++    ACE_NTOHL (0x49643a31), 
++    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
++    13,
++    ACE_NTOHL (0x5265706f), 
++    ACE_NTOHL (0x7369746f), 
++    ACE_NTOHL (0x72794964), 
++    ACE_NTOHL (0x0),  // name = RepositoryId
+   CORBA::tk_string, 
+   0U, // string length
++
+   11,
+   ACE_NTOHL (0x64656669), 
+   ACE_NTOHL (0x6e65645f), 
+   ACE_NTOHL (0x696e0000),  // name = defined_in
++  CORBA::tk_alias, // typecode kind for typedefs
++  72, // encapsulation length
++    TAO_ENCAP_BYTE_ORDER, // byte order
++    35,
++    ACE_NTOHL (0x49444c3a), 
++    ACE_NTOHL (0x6f6d672e), 
++    ACE_NTOHL (0x6f72672f), 
++    ACE_NTOHL (0x434f5242), 
++    ACE_NTOHL (0x412f5265), 
++    ACE_NTOHL (0x706f7369), 
++    ACE_NTOHL (0x746f7279), 
++    ACE_NTOHL (0x49643a31), 
++    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
++    13,
++    ACE_NTOHL (0x5265706f), 
++    ACE_NTOHL (0x7369746f), 
++    ACE_NTOHL (0x72794964), 
++    ACE_NTOHL (0x0),  // name = RepositoryId
+   CORBA::tk_string, 
+   0U, // string length
++
+   8,
+   ACE_NTOHL (0x76657273), 
+   ACE_NTOHL (0x696f6e00),  // name = version
++  CORBA::tk_alias, // typecode kind for typedefs
++  68, // encapsulation length
++    TAO_ENCAP_BYTE_ORDER, // byte order
++    34,
++    ACE_NTOHL (0x49444c3a), 
++    ACE_NTOHL (0x6f6d672e), 
++    ACE_NTOHL (0x6f72672f), 
++    ACE_NTOHL (0x434f5242), 
++    ACE_NTOHL (0x412f5665), 
++    ACE_NTOHL (0x7273696f), 
++    ACE_NTOHL (0x6e537065), 
++    ACE_NTOHL (0x633a312e), 
++    ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
++    12,
++    ACE_NTOHL (0x56657273), 
++    ACE_NTOHL (0x696f6e53), 
++    ACE_NTOHL (0x70656300),  // name = VersionSpec
+   CORBA::tk_string, 
+   0U, // string length
++
+   11,
+   ACE_NTOHL (0x6f706572), 
+   ACE_NTOHL (0x6174696f), 
+   ACE_NTOHL (0x6e730000),  // name = operations
+   CORBA::tk_alias, // typecode kind for typedefs
+-  1296, // encapsulation length
++  2036, // encapsulation length
+     TAO_ENCAP_BYTE_ORDER, // byte order
+     39,
+     ACE_NTOHL (0x49444c3a), 
+     ACE_NTOHL (0x6f6d672e), 
+     ACE_NTOHL (0x6f72672f), 
+     ACE_NTOHL (0x434f5242), 
+-    ACE_NTOHL (0x415f4f70), 
++    ACE_NTOHL (0x412f4f70), 
+     ACE_NTOHL (0x44657363), 
+     ACE_NTOHL (0x72697074), 
+     ACE_NTOHL (0x696f6e53), 
+     ACE_NTOHL (0x65713a31), 
+-    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA_OpDescriptionSeq:1.0
+-    23,
+-    ACE_NTOHL (0x434f5242), 
+-    ACE_NTOHL (0x415f4f70), 
+-    ACE_NTOHL (0x44657363), 
+-    ACE_NTOHL (0x72697074), 
+-    ACE_NTOHL (0x696f6e53), 
+-    ACE_NTOHL (0x65710000),  // name = CORBA_OpDescriptionSeq
++    ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OpDescriptionSeq:1.0
++    17,
++    ACE_NTOHL (0x4f704465), 
++    ACE_NTOHL (0x73637269), 
++    ACE_NTOHL (0x7074696f), 
++    ACE_NTOHL (0x6e536571), 
++    ACE_NTOHL (0x0),  // name = OpDescriptionSeq
+     CORBA::tk_sequence, // typecode kind
+-    1212, // encapsulation length
++    1956, // encapsulation length
+       TAO_ENCAP_BYTE_ORDER, // byte order
+       CORBA::tk_struct, // typecode kind
+-      1196, // encapsulation length
++      1940, // encapsulation length
+         TAO_ENCAP_BYTE_ORDER, // byte order
+         43,
+         ACE_NTOHL (0x49444c3a), 
+         ACE_NTOHL (0x6f6d672e), 
+         ACE_NTOHL (0x6f72672f), 
+         ACE_NTOHL (0x434f5242), 
+-        ACE_NTOHL (0x415f4f70), 
++        ACE_NTOHL (0x412f4f70), 
+         ACE_NTOHL (0x65726174), 
+         ACE_NTOHL (0x696f6e44), 
+         ACE_NTOHL (0x65736372), 
+         ACE_NTOHL (0x69707469), 
+         ACE_NTOHL (0x6f6e3a31), 
+-        ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA_OperationDescription:1.0
+-        27,
+-        ACE_NTOHL (0x434f5242), 
+-        ACE_NTOHL (0x415f4f70), 
+-        ACE_NTOHL (0x65726174), 
+-        ACE_NTOHL (0x696f6e44), 
+-        ACE_NTOHL (0x65736372), 
+-        ACE_NTOHL (0x69707469), 
+-        ACE_NTOHL (0x6f6e0000),  // name = CORBA_OperationDescription
++        ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/OperationDescription:1.0
++        21,
++        ACE_NTOHL (0x4f706572), 
++        ACE_NTOHL (0x6174696f), 
++        ACE_NTOHL (0x6e446573), 
++        ACE_NTOHL (0x63726970), 
++        ACE_NTOHL (0x74696f6e), 
++        ACE_NTOHL (0x0),  // name = OperationDescription
+         9, // member count
+         5,
+         ACE_NTOHL (0x6e616d65), 
+         ACE_NTOHL (0x0),  // name = name
++        CORBA::tk_alias, // typecode kind for typedefs
++        68, // encapsulation length
++          TAO_ENCAP_BYTE_ORDER, // byte order
++          33,
++          ACE_NTOHL (0x49444c3a), 
++          ACE_NTOHL (0x6f6d672e), 
++          ACE_NTOHL (0x6f72672f), 
++          ACE_NTOHL (0x434f5242), 
++          ACE_NTOHL (0x412f4964), 
++          ACE_NTOHL (0x656e7469), 
++          ACE_NTOHL (0x66696572), 
++          ACE_NTOHL (0x3a312e30), 
++          ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
++          11,
++          ACE_NTOHL (0x4964656e), 
++          ACE_NTOHL (0x74696669), 
++          ACE_NTOHL (0x65720000),  // name = Identifier
+         CORBA::tk_string, 
+         0U, // string length
++
+         3,
+         ACE_NTOHL (0x69640000),  // name = id
++        CORBA::tk_alias, // typecode kind for typedefs
++        72, // encapsulation length
++          TAO_ENCAP_BYTE_ORDER, // byte order
++          35,
++          ACE_NTOHL (0x49444c3a), 
++          ACE_NTOHL (0x6f6d672e), 
++          ACE_NTOHL (0x6f72672f), 
++          ACE_NTOHL (0x434f5242), 
++          ACE_NTOHL (0x412f5265), 
++          ACE_NTOHL (0x706f7369), 
++          ACE_NTOHL (0x746f7279), 
++          ACE_NTOHL (0x49643a31), 
++          ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
++          13,
++          ACE_NTOHL (0x5265706f), 
++          ACE_NTOHL (0x7369746f), 
++          ACE_NTOHL (0x72794964), 
++          ACE_NTOHL (0x0),  // name = RepositoryId
+         CORBA::tk_string, 
+         0U, // string length
++
+         11,
+         ACE_NTOHL (0x64656669), 
+         ACE_NTOHL (0x6e65645f), 
+         ACE_NTOHL (0x696e0000),  // name = defined_in
++        CORBA::tk_alias, // typecode kind for typedefs
++        72, // encapsulation length
++          TAO_ENCAP_BYTE_ORDER, // byte order
++          35,
++          ACE_NTOHL (0x49444c3a), 
++          ACE_NTOHL (0x6f6d672e), 
++          ACE_NTOHL (0x6f72672f), 
++          ACE_NTOHL (0x434f5242), 
++          ACE_NTOHL (0x412f5265), 
++          ACE_NTOHL (0x706f7369), 
++          ACE_NTOHL (0x746f7279), 
++          ACE_NTOHL (0x49643a31), 
++          ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
++          13,
++          ACE_NTOHL (0x5265706f), 
++          ACE_NTOHL (0x7369746f), 
++          ACE_NTOHL (0x72794964), 
++          ACE_NTOHL (0x0),  // name = RepositoryId
+         CORBA::tk_string, 
+         0U, // string length
++
+         8,
+         ACE_NTOHL (0x76657273), 
+         ACE_NTOHL (0x696f6e00),  // name = version
++        CORBA::tk_alias, // typecode kind for typedefs
++        68, // encapsulation length
++          TAO_ENCAP_BYTE_ORDER, // byte order
++          34,
++          ACE_NTOHL (0x49444c3a), 
++          ACE_NTOHL (0x6f6d672e), 
++          ACE_NTOHL (0x6f72672f), 
++          ACE_NTOHL (0x434f5242), 
++          ACE_NTOHL (0x412f5665), 
++          ACE_NTOHL (0x7273696f), 
++          ACE_NTOHL (0x6e537065), 
++          ACE_NTOHL (0x633a312e), 
++          ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
++          12,
++          ACE_NTOHL (0x56657273), 
++          ACE_NTOHL (0x696f6e53), 
++          ACE_NTOHL (0x70656300),  // name = VersionSpec
+         CORBA::tk_string, 
+         0U, // string length
++
+         7,
+         ACE_NTOHL (0x72657375), 
+         ACE_NTOHL (0x6c740000),  // name = result
+@@ -28627,29 +26474,67 @@
+         ACE_NTOHL (0x65787473), 
+         ACE_NTOHL (0x0),  // name = contexts
+         CORBA::tk_alias, // typecode kind for typedefs
+-        92, // encapsulation length
++        236, // encapsulation length
+           TAO_ENCAP_BYTE_ORDER, // byte order
+           35,
+           ACE_NTOHL (0x49444c3a), 
+           ACE_NTOHL (0x6f6d672e), 
+           ACE_NTOHL (0x6f72672f), 
+           ACE_NTOHL (0x434f5242), 
+-          ACE_NTOHL (0x415f436f), 
++          ACE_NTOHL (0x412f436f), 
+           ACE_NTOHL (0x6e746578), 
+           ACE_NTOHL (0x74496453), 
+           ACE_NTOHL (0x65713a31), 
+-          ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA_ContextIdSeq:1.0
+-          19,
++          ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ContextIdSeq:1.0
++          13,
++          ACE_NTOHL (0x436f6e74), 
++          ACE_NTOHL (0x65787449), 
++          ACE_NTOHL (0x64536571), 
++          ACE_NTOHL (0x0),  // name = ContextIdSeq
++          CORBA::tk_sequence, // typecode kind
++          164, // encapsulation length
++            TAO_ENCAP_BYTE_ORDER, // byte order
++            CORBA::tk_alias, // typecode kind for typedefs
++            148, // encapsulation length
++              TAO_ENCAP_BYTE_ORDER, // byte order
++              40,
++              ACE_NTOHL (0x49444c3a), 
++              ACE_NTOHL (0x6f6d672e), 
++              ACE_NTOHL (0x6f72672f), 
+           ACE_NTOHL (0x434f5242), 
+-          ACE_NTOHL (0x415f436f), 
++              ACE_NTOHL (0x412f436f), 
+           ACE_NTOHL (0x6e746578), 
+-          ACE_NTOHL (0x74496453), 
+-          ACE_NTOHL (0x65710000),  // name = CORBA_ContextIdSeq
+-          CORBA::tk_sequence, // typecode kind
+-          16, // encapsulation length
++              ACE_NTOHL (0x74496465), 
++              ACE_NTOHL (0x6e746966), 
++              ACE_NTOHL (0x6965723a), 
++              ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ContextIdentifier:1.0
++              18,
++              ACE_NTOHL (0x436f6e74), 
++              ACE_NTOHL (0x65787449), 
++              ACE_NTOHL (0x64656e74), 
++              ACE_NTOHL (0x69666965), 
++              ACE_NTOHL (0x72000000),  // name = ContextIdentifier
++              CORBA::tk_alias, // typecode kind for typedefs
++              68, // encapsulation length
+             TAO_ENCAP_BYTE_ORDER, // byte order
++                33,
++                ACE_NTOHL (0x49444c3a), 
++                ACE_NTOHL (0x6f6d672e), 
++                ACE_NTOHL (0x6f72672f), 
++                ACE_NTOHL (0x434f5242), 
++                ACE_NTOHL (0x412f4964), 
++                ACE_NTOHL (0x656e7469), 
++                ACE_NTOHL (0x66696572), 
++                ACE_NTOHL (0x3a312e30), 
++                ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
++                11,
++                ACE_NTOHL (0x4964656e), 
++                ACE_NTOHL (0x74696669), 
++                ACE_NTOHL (0x65720000),  // name = Identifier
+             CORBA::tk_string, 
+             0U, // string length
++
++
+             0U,
+ 
+ 
+@@ -28658,58 +26543,74 @@
+         ACE_NTOHL (0x6d657465), 
+         ACE_NTOHL (0x72730000),  // name = parameters
+         CORBA::tk_alias, // typecode kind for typedefs
+-        444, // encapsulation length
++        496, // encapsulation length
+           TAO_ENCAP_BYTE_ORDER, // byte order
+           40,
+           ACE_NTOHL (0x49444c3a), 
+           ACE_NTOHL (0x6f6d672e), 
+           ACE_NTOHL (0x6f72672f), 
+           ACE_NTOHL (0x434f5242), 
+-          ACE_NTOHL (0x415f5061), 
++          ACE_NTOHL (0x412f5061), 
+           ACE_NTOHL (0x72446573), 
+           ACE_NTOHL (0x63726970), 
+           ACE_NTOHL (0x74696f6e), 
+           ACE_NTOHL (0x5365713a), 
+-          ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA_ParDescriptionSeq:1.0
+-          24,
+-          ACE_NTOHL (0x434f5242), 
+-          ACE_NTOHL (0x415f5061), 
+-          ACE_NTOHL (0x72446573), 
+-          ACE_NTOHL (0x63726970), 
+-          ACE_NTOHL (0x74696f6e), 
+-          ACE_NTOHL (0x53657100),  // name = CORBA_ParDescriptionSeq
++          ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ParDescriptionSeq:1.0
++          18,
++          ACE_NTOHL (0x50617244), 
++          ACE_NTOHL (0x65736372), 
++          ACE_NTOHL (0x69707469), 
++          ACE_NTOHL (0x6f6e5365), 
++          ACE_NTOHL (0x71000000),  // name = ParDescriptionSeq
+           CORBA::tk_sequence, // typecode kind
+-          360, // encapsulation length
++          416, // encapsulation length
+             TAO_ENCAP_BYTE_ORDER, // byte order
+             CORBA::tk_struct, // typecode kind
+-            344, // encapsulation length
++            400, // encapsulation length
+               TAO_ENCAP_BYTE_ORDER, // byte order
+               43,
+               ACE_NTOHL (0x49444c3a), 
+               ACE_NTOHL (0x6f6d672e), 
+               ACE_NTOHL (0x6f72672f), 
+               ACE_NTOHL (0x434f5242), 
+-              ACE_NTOHL (0x415f5061), 
++              ACE_NTOHL (0x412f5061), 
+               ACE_NTOHL (0x72616d65), 
+               ACE_NTOHL (0x74657244), 
+               ACE_NTOHL (0x65736372), 
+               ACE_NTOHL (0x69707469), 
+               ACE_NTOHL (0x6f6e3a31), 
+-              ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA_ParameterDescription:1.0
+-              27,
+-              ACE_NTOHL (0x434f5242), 
+-              ACE_NTOHL (0x415f5061), 
+-              ACE_NTOHL (0x72616d65), 
+-              ACE_NTOHL (0x74657244), 
+-              ACE_NTOHL (0x65736372), 
+-              ACE_NTOHL (0x69707469), 
+-              ACE_NTOHL (0x6f6e0000),  // name = CORBA_ParameterDescription
++              ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ParameterDescription:1.0
++              21,
++              ACE_NTOHL (0x50617261), 
++              ACE_NTOHL (0x6d657465), 
++              ACE_NTOHL (0x72446573), 
++              ACE_NTOHL (0x63726970), 
++              ACE_NTOHL (0x74696f6e), 
++              ACE_NTOHL (0x0),  // name = ParameterDescription
+               4, // member count
+               5,
+               ACE_NTOHL (0x6e616d65), 
+               ACE_NTOHL (0x0),  // name = name
++              CORBA::tk_alias, // typecode kind for typedefs
++              68, // encapsulation length
++                TAO_ENCAP_BYTE_ORDER, // byte order
++                33,
++                ACE_NTOHL (0x49444c3a), 
++                ACE_NTOHL (0x6f6d672e), 
++                ACE_NTOHL (0x6f72672f), 
++                ACE_NTOHL (0x434f5242), 
++                ACE_NTOHL (0x412f4964), 
++                ACE_NTOHL (0x656e7469), 
++                ACE_NTOHL (0x66696572), 
++                ACE_NTOHL (0x3a312e30), 
++                ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
++                11,
++                ACE_NTOHL (0x4964656e), 
++                ACE_NTOHL (0x74696669), 
++                ACE_NTOHL (0x65720000),  // name = Identifier
+               CORBA::tk_string, 
+               0U, // string length
++
+               5,
+               ACE_NTOHL (0x74797065), 
+               ACE_NTOHL (0x0),  // name = type
+@@ -28720,22 +26621,20 @@
+               ACE_NTOHL (0x5f646566), 
+               ACE_NTOHL (0x0),  // name = type_def
+               CORBA::tk_objref, // typecode kind
+-              60, // encapsulation length
++              52, // encapsulation length
+                 TAO_ENCAP_BYTE_ORDER, // byte order
+                 30,
+                 ACE_NTOHL (0x49444c3a), 
+                 ACE_NTOHL (0x6f6d672e), 
+                 ACE_NTOHL (0x6f72672f), 
+                 ACE_NTOHL (0x434f5242), 
+-                ACE_NTOHL (0x415f4944), 
++                ACE_NTOHL (0x412f4944), 
+                 ACE_NTOHL (0x4c547970), 
+                 ACE_NTOHL (0x653a312e), 
+-                ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA_IDLType:1.0
+-                14,
+-                ACE_NTOHL (0x434f5242), 
+-                ACE_NTOHL (0x415f4944), 
+-                ACE_NTOHL (0x4c547970), 
+-                ACE_NTOHL (0x65000000),  // name = CORBA_IDLType
++                ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/IDLType:1.0
++                8,
++                ACE_NTOHL (0x49444c54), 
++                ACE_NTOHL (0x79706500),  // name = IDLType
+ 
+               5,
+               ACE_NTOHL (0x6d6f6465), 
+@@ -28781,73 +26680,145 @@
+         ACE_NTOHL (0x7074696f), 
+         ACE_NTOHL (0x6e730000),  // name = exceptions
+         CORBA::tk_alias, // typecode kind for typedefs
+-        284, // encapsulation length
++        556, // encapsulation length
+           TAO_ENCAP_BYTE_ORDER, // byte order
+           40,
+           ACE_NTOHL (0x49444c3a), 
+           ACE_NTOHL (0x6f6d672e), 
+           ACE_NTOHL (0x6f72672f), 
+           ACE_NTOHL (0x434f5242), 
+-          ACE_NTOHL (0x415f4578), 
++          ACE_NTOHL (0x412f4578), 
+           ACE_NTOHL (0x63446573), 
+           ACE_NTOHL (0x63726970), 
+           ACE_NTOHL (0x74696f6e), 
+           ACE_NTOHL (0x5365713a), 
+-          ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA_ExcDescriptionSeq:1.0
+-          24,
+-          ACE_NTOHL (0x434f5242), 
+-          ACE_NTOHL (0x415f4578), 
+-          ACE_NTOHL (0x63446573), 
+-          ACE_NTOHL (0x63726970), 
+-          ACE_NTOHL (0x74696f6e), 
+-          ACE_NTOHL (0x53657100),  // name = CORBA_ExcDescriptionSeq
++          ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA/ExcDescriptionSeq:1.0
++          18,
++          ACE_NTOHL (0x45786344), 
++          ACE_NTOHL (0x65736372), 
++          ACE_NTOHL (0x69707469), 
++          ACE_NTOHL (0x6f6e5365), 
++          ACE_NTOHL (0x71000000),  // name = ExcDescriptionSeq
+           CORBA::tk_sequence, // typecode kind
+-          200, // encapsulation length
++          476, // encapsulation length
+             TAO_ENCAP_BYTE_ORDER, // byte order
+             CORBA::tk_struct, // typecode kind
+-            184, // encapsulation length
++            460, // encapsulation length
+               TAO_ENCAP_BYTE_ORDER, // byte order
+               43,
+               ACE_NTOHL (0x49444c3a), 
+               ACE_NTOHL (0x6f6d672e), 
+-              ACE_NTOHL (0x6f72672f), 
+-              ACE_NTOHL (0x434f5242), 
+-              ACE_NTOHL (0x415f4578), 
+-              ACE_NTOHL (0x63657074), 
+-              ACE_NTOHL (0x696f6e44), 
+-              ACE_NTOHL (0x65736372), 
+-              ACE_NTOHL (0x69707469), 
+-              ACE_NTOHL (0x6f6e3a31), 
+-              ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA_ExceptionDescription:1.0
+-              27,
++              ACE_NTOHL (0x6f72672f), 
+               ACE_NTOHL (0x434f5242), 
+-              ACE_NTOHL (0x415f4578), 
++              ACE_NTOHL (0x412f4578), 
+               ACE_NTOHL (0x63657074), 
+               ACE_NTOHL (0x696f6e44), 
+               ACE_NTOHL (0x65736372), 
+               ACE_NTOHL (0x69707469), 
+-              ACE_NTOHL (0x6f6e0000),  // name = CORBA_ExceptionDescription
++              ACE_NTOHL (0x6f6e3a31), 
++              ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/ExceptionDescription:1.0
++              21,
++              ACE_NTOHL (0x45786365), 
++              ACE_NTOHL (0x7074696f), 
++              ACE_NTOHL (0x6e446573), 
++              ACE_NTOHL (0x63726970), 
++              ACE_NTOHL (0x74696f6e), 
++              ACE_NTOHL (0x0),  // name = ExceptionDescription
+               5, // member count
+               5,
+               ACE_NTOHL (0x6e616d65), 
+               ACE_NTOHL (0x0),  // name = name
++              CORBA::tk_alias, // typecode kind for typedefs
++              68, // encapsulation length
++                TAO_ENCAP_BYTE_ORDER, // byte order
++                33,
++                ACE_NTOHL (0x49444c3a), 
++                ACE_NTOHL (0x6f6d672e), 
++                ACE_NTOHL (0x6f72672f), 
++                ACE_NTOHL (0x434f5242), 
++                ACE_NTOHL (0x412f4964), 
++                ACE_NTOHL (0x656e7469), 
++                ACE_NTOHL (0x66696572), 
++                ACE_NTOHL (0x3a312e30), 
++                ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
++                11,
++                ACE_NTOHL (0x4964656e), 
++                ACE_NTOHL (0x74696669), 
++                ACE_NTOHL (0x65720000),  // name = Identifier
+               CORBA::tk_string, 
+               0U, // string length
++
+               3,
+               ACE_NTOHL (0x69640000),  // name = id
++              CORBA::tk_alias, // typecode kind for typedefs
++              72, // encapsulation length
++                TAO_ENCAP_BYTE_ORDER, // byte order
++                35,
++                ACE_NTOHL (0x49444c3a), 
++                ACE_NTOHL (0x6f6d672e), 
++                ACE_NTOHL (0x6f72672f), 
++                ACE_NTOHL (0x434f5242), 
++                ACE_NTOHL (0x412f5265), 
++                ACE_NTOHL (0x706f7369), 
++                ACE_NTOHL (0x746f7279), 
++                ACE_NTOHL (0x49643a31), 
++                ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
++                13,
++                ACE_NTOHL (0x5265706f), 
++                ACE_NTOHL (0x7369746f), 
++                ACE_NTOHL (0x72794964), 
++                ACE_NTOHL (0x0),  // name = RepositoryId
+               CORBA::tk_string, 
+               0U, // string length
++
+               11,
+               ACE_NTOHL (0x64656669), 
+               ACE_NTOHL (0x6e65645f), 
+               ACE_NTOHL (0x696e0000),  // name = defined_in
++              CORBA::tk_alias, // typecode kind for typedefs
++              72, // encapsulation length
++                TAO_ENCAP_BYTE_ORDER, // byte order
++                35,
++                ACE_NTOHL (0x49444c3a), 
++                ACE_NTOHL (0x6f6d672e), 
++                ACE_NTOHL (0x6f72672f), 
++                ACE_NTOHL (0x434f5242), 
++                ACE_NTOHL (0x412f5265), 
++                ACE_NTOHL (0x706f7369), 
++                ACE_NTOHL (0x746f7279), 
++                ACE_NTOHL (0x49643a31), 
++                ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
++                13,
++                ACE_NTOHL (0x5265706f), 
++                ACE_NTOHL (0x7369746f), 
++                ACE_NTOHL (0x72794964), 
++                ACE_NTOHL (0x0),  // name = RepositoryId
+               CORBA::tk_string, 
+               0U, // string length
++
+               8,
+               ACE_NTOHL (0x76657273), 
+               ACE_NTOHL (0x696f6e00),  // name = version
++              CORBA::tk_alias, // typecode kind for typedefs
++              68, // encapsulation length
++                TAO_ENCAP_BYTE_ORDER, // byte order
++                34,
++                ACE_NTOHL (0x49444c3a), 
++                ACE_NTOHL (0x6f6d672e), 
++                ACE_NTOHL (0x6f72672f), 
++                ACE_NTOHL (0x434f5242), 
++                ACE_NTOHL (0x412f5665), 
++                ACE_NTOHL (0x7273696f), 
++                ACE_NTOHL (0x6e537065), 
++                ACE_NTOHL (0x633a312e), 
++                ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
++                12,
++                ACE_NTOHL (0x56657273), 
++                ACE_NTOHL (0x696f6e53), 
++                ACE_NTOHL (0x70656300),  // name = VersionSpec
+               CORBA::tk_string, 
+               0U, // string length
++
+               5,
+               ACE_NTOHL (0x74797065), 
+               ACE_NTOHL (0x0),  // name = type
+@@ -28866,75 +26837,146 @@
+   ACE_NTOHL (0x69627574), 
+   ACE_NTOHL (0x65730000),  // name = attributes
+   CORBA::tk_alias, // typecode kind for typedefs
+-  416, // encapsulation length
++  684, // encapsulation length
+     TAO_ENCAP_BYTE_ORDER, // byte order
+     41,
+     ACE_NTOHL (0x49444c3a), 
+     ACE_NTOHL (0x6f6d672e), 
+     ACE_NTOHL (0x6f72672f), 
+     ACE_NTOHL (0x434f5242), 
+-    ACE_NTOHL (0x415f4174), 
++    ACE_NTOHL (0x412f4174), 
+     ACE_NTOHL (0x74724465), 
+     ACE_NTOHL (0x73637269), 
+     ACE_NTOHL (0x7074696f), 
+     ACE_NTOHL (0x6e536571), 
+     ACE_NTOHL (0x3a312e30), 
+-    ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA_AttrDescriptionSeq:1.0
+-    25,
+-    ACE_NTOHL (0x434f5242), 
+-    ACE_NTOHL (0x415f4174), 
+-    ACE_NTOHL (0x74724465), 
+-    ACE_NTOHL (0x73637269), 
+-    ACE_NTOHL (0x7074696f), 
+-    ACE_NTOHL (0x6e536571), 
+-    ACE_NTOHL (0x0),  // name = CORBA_AttrDescriptionSeq
++    ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/AttrDescriptionSeq:1.0
++    19,
++    ACE_NTOHL (0x41747472), 
++    ACE_NTOHL (0x44657363), 
++    ACE_NTOHL (0x72697074), 
++    ACE_NTOHL (0x696f6e53), 
++    ACE_NTOHL (0x65710000),  // name = AttrDescriptionSeq
+     CORBA::tk_sequence, // typecode kind
+-    324, // encapsulation length
++    600, // encapsulation length
+       TAO_ENCAP_BYTE_ORDER, // byte order
+       CORBA::tk_struct, // typecode kind
+-      308, // encapsulation length
++      584, // encapsulation length
+         TAO_ENCAP_BYTE_ORDER, // byte order
+         43,
+         ACE_NTOHL (0x49444c3a), 
+         ACE_NTOHL (0x6f6d672e), 
+         ACE_NTOHL (0x6f72672f), 
+         ACE_NTOHL (0x434f5242), 
+-        ACE_NTOHL (0x415f4174), 
++        ACE_NTOHL (0x412f4174), 
+         ACE_NTOHL (0x74726962), 
+         ACE_NTOHL (0x75746544), 
+         ACE_NTOHL (0x65736372), 
+         ACE_NTOHL (0x69707469), 
+         ACE_NTOHL (0x6f6e3a31), 
+-        ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA_AttributeDescription:1.0
+-        27,
+-        ACE_NTOHL (0x434f5242), 
+-        ACE_NTOHL (0x415f4174), 
+-        ACE_NTOHL (0x74726962), 
+-        ACE_NTOHL (0x75746544), 
+-        ACE_NTOHL (0x65736372), 
+-        ACE_NTOHL (0x69707469), 
+-        ACE_NTOHL (0x6f6e0000),  // name = CORBA_AttributeDescription
++        ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/AttributeDescription:1.0
++        21,
++        ACE_NTOHL (0x41747472), 
++        ACE_NTOHL (0x69627574), 
++        ACE_NTOHL (0x65446573), 
++        ACE_NTOHL (0x63726970), 
++        ACE_NTOHL (0x74696f6e), 
++        ACE_NTOHL (0x0),  // name = AttributeDescription
+         6, // member count
+         5,
+         ACE_NTOHL (0x6e616d65), 
+         ACE_NTOHL (0x0),  // name = name
++        CORBA::tk_alias, // typecode kind for typedefs
++        68, // encapsulation length
++          TAO_ENCAP_BYTE_ORDER, // byte order
++          33,
++          ACE_NTOHL (0x49444c3a), 
++          ACE_NTOHL (0x6f6d672e), 
++          ACE_NTOHL (0x6f72672f), 
++          ACE_NTOHL (0x434f5242), 
++          ACE_NTOHL (0x412f4964), 
++          ACE_NTOHL (0x656e7469), 
++          ACE_NTOHL (0x66696572), 
++          ACE_NTOHL (0x3a312e30), 
++          ACE_NTOHL (0x0),  // repository ID = IDL:omg.org/CORBA/Identifier:1.0
++          11,
++          ACE_NTOHL (0x4964656e), 
++          ACE_NTOHL (0x74696669), 
++          ACE_NTOHL (0x65720000),  // name = Identifier
+         CORBA::tk_string, 
+         0U, // string length
++
+         3,
+         ACE_NTOHL (0x69640000),  // name = id
++        CORBA::tk_alias, // typecode kind for typedefs
++        72, // encapsulation length
++          TAO_ENCAP_BYTE_ORDER, // byte order
++          35,
++          ACE_NTOHL (0x49444c3a), 
++          ACE_NTOHL (0x6f6d672e), 
++          ACE_NTOHL (0x6f72672f), 
++          ACE_NTOHL (0x434f5242), 
++          ACE_NTOHL (0x412f5265), 
++          ACE_NTOHL (0x706f7369), 
++          ACE_NTOHL (0x746f7279), 
++          ACE_NTOHL (0x49643a31), 
++          ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
++          13,
++          ACE_NTOHL (0x5265706f), 
++          ACE_NTOHL (0x7369746f), 
++          ACE_NTOHL (0x72794964), 
++          ACE_NTOHL (0x0),  // name = RepositoryId
+         CORBA::tk_string, 
+         0U, // string length
++
+         11,
+         ACE_NTOHL (0x64656669), 
+         ACE_NTOHL (0x6e65645f), 
+         ACE_NTOHL (0x696e0000),  // name = defined_in
++        CORBA::tk_alias, // typecode kind for typedefs
++        72, // encapsulation length
++          TAO_ENCAP_BYTE_ORDER, // byte order
++          35,
++          ACE_NTOHL (0x49444c3a), 
++          ACE_NTOHL (0x6f6d672e), 
++          ACE_NTOHL (0x6f72672f), 
++          ACE_NTOHL (0x434f5242), 
++          ACE_NTOHL (0x412f5265), 
++          ACE_NTOHL (0x706f7369), 
++          ACE_NTOHL (0x746f7279), 
++          ACE_NTOHL (0x49643a31), 
++          ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
++          13,
++          ACE_NTOHL (0x5265706f), 
++          ACE_NTOHL (0x7369746f), 
++          ACE_NTOHL (0x72794964), 
++          ACE_NTOHL (0x0),  // name = RepositoryId
+         CORBA::tk_string, 
+         0U, // string length
++
+         8,
+         ACE_NTOHL (0x76657273), 
+         ACE_NTOHL (0x696f6e00),  // name = version
++        CORBA::tk_alias, // typecode kind for typedefs
++        68, // encapsulation length
++          TAO_ENCAP_BYTE_ORDER, // byte order
++          34,
++          ACE_NTOHL (0x49444c3a), 
++          ACE_NTOHL (0x6f6d672e), 
++          ACE_NTOHL (0x6f72672f), 
++          ACE_NTOHL (0x434f5242), 
++          ACE_NTOHL (0x412f5665), 
++          ACE_NTOHL (0x7273696f), 
++          ACE_NTOHL (0x6e537065), 
++          ACE_NTOHL (0x633a312e), 
++          ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/VersionSpec:1.0
++          12,
++          ACE_NTOHL (0x56657273), 
++          ACE_NTOHL (0x696f6e53), 
++          ACE_NTOHL (0x70656300),  // name = VersionSpec
+         CORBA::tk_string, 
+         0U, // string length
++
+         5,
+         ACE_NTOHL (0x74797065), 
+         ACE_NTOHL (0x0),  // name = type
+@@ -28982,31 +27024,48 @@
+   ACE_NTOHL (0x65726661), 
+   ACE_NTOHL (0x63657300),  // name = base_interfaces
+   CORBA::tk_alias, // typecode kind for typedefs
+-  100, // encapsulation length
++  164, // encapsulation length
+     TAO_ENCAP_BYTE_ORDER, // byte order
+     38,
+     ACE_NTOHL (0x49444c3a), 
+     ACE_NTOHL (0x6f6d672e), 
+     ACE_NTOHL (0x6f72672f), 
+     ACE_NTOHL (0x434f5242), 
+-    ACE_NTOHL (0x415f5265), 
++    ACE_NTOHL (0x412f5265), 
+     ACE_NTOHL (0x706f7369), 
+     ACE_NTOHL (0x746f7279), 
+     ACE_NTOHL (0x49645365), 
+     ACE_NTOHL (0x713a312e), 
+-    ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA_RepositoryIdSeq:1.0
+-    22,
++    ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA/RepositoryIdSeq:1.0
++    16,
++    ACE_NTOHL (0x5265706f), 
++    ACE_NTOHL (0x7369746f), 
++    ACE_NTOHL (0x72794964), 
++    ACE_NTOHL (0x53657100),  // name = RepositoryIdSeq
++    CORBA::tk_sequence, // typecode kind
++    88, // encapsulation length
++      TAO_ENCAP_BYTE_ORDER, // byte order
++      CORBA::tk_alias, // typecode kind for typedefs
++      72, // encapsulation length
++        TAO_ENCAP_BYTE_ORDER, // byte order
++        35,
++        ACE_NTOHL (0x49444c3a), 
++        ACE_NTOHL (0x6f6d672e), 
++        ACE_NTOHL (0x6f72672f), 
+     ACE_NTOHL (0x434f5242), 
+-    ACE_NTOHL (0x415f5265), 
++        ACE_NTOHL (0x412f5265), 
+     ACE_NTOHL (0x706f7369), 
+     ACE_NTOHL (0x746f7279), 
+-    ACE_NTOHL (0x49645365), 
+-    ACE_NTOHL (0x71000000),  // name = CORBA_RepositoryIdSeq
+-    CORBA::tk_sequence, // typecode kind
+-    16, // encapsulation length
+-      TAO_ENCAP_BYTE_ORDER, // byte order
++        ACE_NTOHL (0x49643a31), 
++        ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA/RepositoryId:1.0
++        13,
++        ACE_NTOHL (0x5265706f), 
++        ACE_NTOHL (0x7369746f), 
++        ACE_NTOHL (0x72794964), 
++        ACE_NTOHL (0x0),  // name = RepositoryId
+       CORBA::tk_string, 
+       0U, // string length
++
+       0U,
+ 
+ 
+@@ -29078,161 +27137,38 @@
+     );
+ }
+ 
+-CORBA_OperationDef_ptr CORBA_InterfaceDef::create_operation (
+-    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
+-  )
+-  ACE_THROW_SPEC ((
+-    CORBA::SystemException
+-  ))
+-{
+-  _TAO_CORBA_InterfaceDef_Proxy_Impl &proxy = 
+-    this->the_TAO_CORBA_InterfaceDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
+-  ACE_CHECK_RETURN (0);
+-  
+-  return proxy.create_operation (
+-      this,
+-      id,
+-      name,
+-      version,
+-      result,
+-      mode,
+-      params,
+-      exceptions,
+-      contexts,
+-      ACE_TRY_ENV
+-    );
+-}
+-
+-static const CORBA::Long _oc_CORBA_InterfaceDef[] =
+-{
+-  TAO_ENCAP_BYTE_ORDER, // byte order
+-  35,
+-  ACE_NTOHL (0x49444c3a), 
+-  ACE_NTOHL (0x6f6d672e), 
+-  ACE_NTOHL (0x6f72672f), 
+-  ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x415f496e), 
+-  ACE_NTOHL (0x74657266), 
+-  ACE_NTOHL (0x61636544), 
+-  ACE_NTOHL (0x65663a31), 
+-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA_InterfaceDef:1.0
+-  19,
+-  ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x415f496e), 
+-  ACE_NTOHL (0x74657266), 
+-  ACE_NTOHL (0x61636544), 
+-  ACE_NTOHL (0x65660000),  // name = CORBA_InterfaceDef
+-};
+-
+-static CORBA::TypeCode _tc_TAO_tc_CORBA_InterfaceDef (
+-    CORBA::tk_objref,
+-    sizeof (_oc_CORBA_InterfaceDef),
+-    (char *) &_oc_CORBA_InterfaceDef,
+-    0,
+-    sizeof (CORBA_InterfaceDef)
+-  );
+-
+-CORBA::TypeCode_ptr _tc_CORBA_InterfaceDef =
+-  &_tc_TAO_tc_CORBA_InterfaceDef;
+-
+-static const CORBA::Long _oc_CORBA_InterfaceDescription[] =
+-{
+-  TAO_ENCAP_BYTE_ORDER, // byte order
+-  43,
+-  ACE_NTOHL (0x49444c3a), 
+-  ACE_NTOHL (0x6f6d672e), 
+-  ACE_NTOHL (0x6f72672f), 
+-  ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x415f496e), 
+-  ACE_NTOHL (0x74657266), 
+-  ACE_NTOHL (0x61636544), 
+-  ACE_NTOHL (0x65736372), 
+-  ACE_NTOHL (0x69707469), 
+-  ACE_NTOHL (0x6f6e3a31), 
+-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA_InterfaceDescription:1.0
+-  27,
+-  ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x415f496e), 
+-  ACE_NTOHL (0x74657266), 
+-  ACE_NTOHL (0x61636544), 
+-  ACE_NTOHL (0x65736372), 
+-  ACE_NTOHL (0x69707469), 
+-  ACE_NTOHL (0x6f6e0000),  // name = CORBA_InterfaceDescription
+-  5, // member count
+-  5,
+-  ACE_NTOHL (0x6e616d65), 
+-  ACE_NTOHL (0x0),  // name = name
+-  CORBA::tk_string, 
+-  0U, // string length
+-  3,
+-  ACE_NTOHL (0x69640000),  // name = id
+-  CORBA::tk_string, 
+-  0U, // string length
+-  11,
+-  ACE_NTOHL (0x64656669), 
+-  ACE_NTOHL (0x6e65645f), 
+-  ACE_NTOHL (0x696e0000),  // name = defined_in
+-  CORBA::tk_string, 
+-  0U, // string length
+-  8,
+-  ACE_NTOHL (0x76657273), 
+-  ACE_NTOHL (0x696f6e00),  // name = version
+-  CORBA::tk_string, 
+-  0U, // string length
+-  16,
+-  ACE_NTOHL (0x62617365), 
+-  ACE_NTOHL (0x5f696e74), 
+-  ACE_NTOHL (0x65726661), 
+-  ACE_NTOHL (0x63657300),  // name = base_interfaces
+-  CORBA::tk_alias, // typecode kind for typedefs
+-  100, // encapsulation length
+-    TAO_ENCAP_BYTE_ORDER, // byte order
+-    38,
+-    ACE_NTOHL (0x49444c3a), 
+-    ACE_NTOHL (0x6f6d672e), 
+-    ACE_NTOHL (0x6f72672f), 
+-    ACE_NTOHL (0x434f5242), 
+-    ACE_NTOHL (0x415f5265), 
+-    ACE_NTOHL (0x706f7369), 
+-    ACE_NTOHL (0x746f7279), 
+-    ACE_NTOHL (0x49645365), 
+-    ACE_NTOHL (0x713a312e), 
+-    ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/CORBA_RepositoryIdSeq:1.0
+-    22,
+-    ACE_NTOHL (0x434f5242), 
+-    ACE_NTOHL (0x415f5265), 
+-    ACE_NTOHL (0x706f7369), 
+-    ACE_NTOHL (0x746f7279), 
+-    ACE_NTOHL (0x49645365), 
+-    ACE_NTOHL (0x71000000),  // name = CORBA_RepositoryIdSeq
+-    CORBA::tk_sequence, // typecode kind
+-    16, // encapsulation length
+-      TAO_ENCAP_BYTE_ORDER, // byte order
+-      CORBA::tk_string, 
+-      0U, // string length
+-      0U,
+-
+-
+-};
++CORBA_OperationDef_ptr CORBA_InterfaceDef::create_operation (
++    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
++  )
++  ACE_THROW_SPEC ((
++    CORBA::SystemException
++  ))
++{
++  _TAO_CORBA_InterfaceDef_Proxy_Impl &proxy = 
++    this->the_TAO_CORBA_InterfaceDef_Proxy_Broker_->select_proxy (this, ACE_TRY_ENV);
++  ACE_CHECK_RETURN (0);
+ 
+-static CORBA::TypeCode _tc_TAO_tc_CORBA_InterfaceDescription (
+-    CORBA::tk_struct,
+-    sizeof (_oc_CORBA_InterfaceDescription),
+-    (char *) &_oc_CORBA_InterfaceDescription,
+-    0,
+-    sizeof (CORBA_InterfaceDescription)
++  return proxy.create_operation (
++      this,
++      id,
++      name,
++      version,
++      result,
++      mode,
++      params,
++      exceptions,
++      contexts,
++      ACE_TRY_ENV
+   );
+-
+-CORBA::TypeCode_ptr _tc_CORBA_InterfaceDescription =
+-  &_tc_TAO_tc_CORBA_InterfaceDescription;
++}
+ 
+ void CORBA_InterfaceDescription::_tao_any_destructor (void *x)
+ {
+@@ -29572,7 +27508,7 @@
+     return CORBA_AbstractInterfaceDef::_nil ();
+   if (! obj->_is_local ())
+     {
+-      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA_AbstractInterfaceDef:1.0", ACE_TRY_ENV);
++      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/AbstractInterfaceDef:1.0", ACE_TRY_ENV);
+       ACE_CHECK_RETURN (CORBA_AbstractInterfaceDef::_nil ());
+       if (is_a == 0)
+         return CORBA_AbstractInterfaceDef::_nil ();
+@@ -29640,12 +27576,12 @@
+ CORBA::Boolean CORBA_AbstractInterfaceDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+ {
+   if (
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_AbstractInterfaceDef:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_InterfaceDef:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Container:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/AbstractInterfaceDef:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/InterfaceDef:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Container:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
+     (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
+   return 1; // success using local knowledge
+   else
+@@ -29730,45 +27666,9 @@
+ 
+ const char* CORBA_AbstractInterfaceDef::_interface_repository_id (void) const
+ {
+-  return "IDL:omg.org/CORBA_AbstractInterfaceDef:1.0";
++  return "IDL:omg.org/CORBA/AbstractInterfaceDef:1.0";
+ }
+ 
+-static const CORBA::Long _oc_CORBA_AbstractInterfaceDef[] =
+-{
+-  TAO_ENCAP_BYTE_ORDER, // byte order
+-  43,
+-  ACE_NTOHL (0x49444c3a), 
+-  ACE_NTOHL (0x6f6d672e), 
+-  ACE_NTOHL (0x6f72672f), 
+-  ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x415f4162), 
+-  ACE_NTOHL (0x73747261), 
+-  ACE_NTOHL (0x6374496e), 
+-  ACE_NTOHL (0x74657266), 
+-  ACE_NTOHL (0x61636544), 
+-  ACE_NTOHL (0x65663a31), 
+-  ACE_NTOHL (0x2e300000),  // repository ID = IDL:omg.org/CORBA_AbstractInterfaceDef:1.0
+-  27,
+-  ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x415f4162), 
+-  ACE_NTOHL (0x73747261), 
+-  ACE_NTOHL (0x6374496e), 
+-  ACE_NTOHL (0x74657266), 
+-  ACE_NTOHL (0x61636544), 
+-  ACE_NTOHL (0x65660000),  // name = CORBA_AbstractInterfaceDef
+-};
+-
+-static CORBA::TypeCode _tc_TAO_tc_CORBA_AbstractInterfaceDef (
+-    CORBA::tk_objref,
+-    sizeof (_oc_CORBA_AbstractInterfaceDef),
+-    (char *) &_oc_CORBA_AbstractInterfaceDef,
+-    0,
+-    sizeof (CORBA_AbstractInterfaceDef)
+-  );
+-
+-CORBA::TypeCode_ptr _tc_CORBA_AbstractInterfaceDef =
+-  &_tc_TAO_tc_CORBA_AbstractInterfaceDef;
+-
+ CORBA_LocalInterfaceDef_ptr
+ tao_CORBA_LocalInterfaceDef_duplicate (
+     CORBA_LocalInterfaceDef_ptr p
+@@ -30101,7 +28001,7 @@
+     return CORBA_LocalInterfaceDef::_nil ();
+   if (! obj->_is_local ())
+     {
+-      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA_LocalInterfaceDef:1.0", ACE_TRY_ENV);
++      CORBA::Boolean is_a = obj->_is_a ("IDL:omg.org/CORBA/LocalInterfaceDef:1.0", ACE_TRY_ENV);
+       ACE_CHECK_RETURN (CORBA_LocalInterfaceDef::_nil ());
+       if (is_a == 0)
+         return CORBA_LocalInterfaceDef::_nil ();
+@@ -30152,288 +28052,134 @@
+                   ACE_reinterpret_cast
+                     (
+                       ptr_arith_t,
+-                      &CORBA_LocalInterfaceDef::_narrow
+-                    )
+-                )
+-          );
+-}
+-
+-CORBA_LocalInterfaceDef_ptr
+-CORBA_LocalInterfaceDef::_duplicate (CORBA_LocalInterfaceDef_ptr obj)
+-{
+-  if (!CORBA::is_nil (obj))
+-    obj->_add_ref ();
+-  return obj;
+-}
+-
+-CORBA::Boolean CORBA_LocalInterfaceDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+-{
+-  if (
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_LocalInterfaceDef:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_InterfaceDef:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Container:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_Contained:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IDLType:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA_IRObject:1.0")) ||
+-    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
+-  return 1; // success using local knowledge
+-  else
+-    return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
+-}
+-
+-void *CORBA_LocalInterfaceDef::_tao_QueryInterface (ptr_arith_t type)
+-{
+-  void *retv = 0;
+-  if (type == ACE_reinterpret_cast
+-    (ptr_arith_t,
+-      &CORBA_LocalInterfaceDef::_narrow))
+-    retv = ACE_reinterpret_cast (void*, this);
+-  else if (type == ACE_reinterpret_cast
+-    (ptr_arith_t,
+-      &CORBA_InterfaceDef::_narrow))
+-    retv = ACE_reinterpret_cast
+-      (
+-        void *,
+-        ACE_static_cast
+-          (
+-            CORBA_InterfaceDef_ptr,
+-            this
+-          )
+-      );
+-  else if (type == ACE_reinterpret_cast
+-    (ptr_arith_t,
+-      &CORBA_Container::_narrow))
+-    retv = ACE_reinterpret_cast
+-      (
+-        void *,
+-        ACE_static_cast
+-          (
+-            CORBA_Container_ptr,
+-            this
+-          )
+-      );
+-  else if (type == ACE_reinterpret_cast
+-    (ptr_arith_t,
+-      &CORBA_Contained::_narrow))
+-    retv = ACE_reinterpret_cast
+-      (
+-        void *,
+-        ACE_static_cast
+-          (
+-            CORBA_Contained_ptr,
+-            this
+-          )
+-      );
+-  else if (type == ACE_reinterpret_cast
+-    (ptr_arith_t,
+-      &CORBA_IDLType::_narrow))
+-    retv = ACE_reinterpret_cast
+-      (
+-        void *,
+-        ACE_static_cast
+-          (
+-            CORBA_IDLType_ptr,
+-            this
+-          )
+-      );
+-  else if (type == ACE_reinterpret_cast
+-    (ptr_arith_t,
+-      &CORBA_IRObject::_narrow))
+-    retv = ACE_reinterpret_cast
+-      (
+-        void *,
+-        ACE_static_cast
+-          (
+-            CORBA_IRObject_ptr,
+-            this
+-          )
+-      );
+-  else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
+-    retv = ACE_reinterpret_cast (void *,
+-      ACE_static_cast (CORBA::Object_ptr, this));
+-    
+-  if (retv)
+-    this->_add_ref ();
+-  return retv;
+-}
+-
+-const char* CORBA_LocalInterfaceDef::_interface_repository_id (void) const
+-{
+-  return "IDL:omg.org/CORBA_LocalInterfaceDef:1.0";
+-}
+-
+-static const CORBA::Long _oc_CORBA_LocalInterfaceDef[] =
+-{
+-  TAO_ENCAP_BYTE_ORDER, // byte order
+-  40,
+-  ACE_NTOHL (0x49444c3a), 
+-  ACE_NTOHL (0x6f6d672e), 
+-  ACE_NTOHL (0x6f72672f), 
+-  ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x415f4c6f), 
+-  ACE_NTOHL (0x63616c49), 
+-  ACE_NTOHL (0x6e746572), 
+-  ACE_NTOHL (0x66616365), 
+-  ACE_NTOHL (0x4465663a), 
+-  ACE_NTOHL (0x312e3000),  // repository ID = IDL:omg.org/CORBA_LocalInterfaceDef:1.0
+-  24,
+-  ACE_NTOHL (0x434f5242), 
+-  ACE_NTOHL (0x415f4c6f), 
+-  ACE_NTOHL (0x63616c49), 
+-  ACE_NTOHL (0x6e746572), 
+-  ACE_NTOHL (0x66616365), 
+-  ACE_NTOHL (0x44656600),  // name = CORBA_LocalInterfaceDef
+-};
+-
+-static CORBA::TypeCode _tc_TAO_tc_CORBA_LocalInterfaceDef (
+-    CORBA::tk_objref,
+-    sizeof (_oc_CORBA_LocalInterfaceDef),
+-    (char *) &_oc_CORBA_LocalInterfaceDef,
+-    0,
+-    sizeof (CORBA_LocalInterfaceDef)
+-  );
+-
+-CORBA::TypeCode_ptr _tc_CORBA_LocalInterfaceDef =
+-  &_tc_TAO_tc_CORBA_LocalInterfaceDef;
+-
+-void operator<<= (CORBA::Any &_tao_any, CORBA::PrimitiveKind _tao_elem)
+-{
+-  TAO_OutputCDR stream;
+-  stream << _tao_elem;
+-  _tao_any._tao_replace (
+-      CORBA::_tc_PrimitiveKind,
+-      TAO_ENCAP_BYTE_ORDER,
+-      stream.begin ()
+-    );
+-}
+-
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::PrimitiveKind &_tao_elem)
+-{
+-  ACE_TRY_NEW_ENV
+-  {
+-    CORBA::TypeCode_var type = _tao_any.type ();
+-    
+-    CORBA::Boolean result = type->equivalent (CORBA::_tc_PrimitiveKind, ACE_TRY_ENV);
+-    ACE_TRY_CHECK;
+-    
+-    if (!result)
+-      return 0; // not equivalent
+-    
+-    TAO_InputCDR stream (
+-        _tao_any._tao_get_cdr (),
+-        _tao_any._tao_byte_order ()
+-      );
+-    if (stream >> _tao_elem)
+-    {
+-      return 1;
+-    }
+-  }
+-  ACE_CATCHANY
+-  {
+-    return 0;
+-  }
+-  ACE_ENDTRY;
+-  return 0;
+-}
+-
+-void operator<<= (CORBA::Any &_tao_any, CORBA::AttributeMode _tao_elem)
+-{
+-  TAO_OutputCDR stream;
+-  stream << _tao_elem;
+-  _tao_any._tao_replace (
+-      CORBA::_tc_AttributeMode,
+-      TAO_ENCAP_BYTE_ORDER,
+-      stream.begin ()
+-    );
+-}
+-
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::AttributeMode &_tao_elem)
+-{
+-  ACE_TRY_NEW_ENV
+-  {
+-    CORBA::TypeCode_var type = _tao_any.type ();
+-    
+-    CORBA::Boolean result = type->equivalent (CORBA::_tc_AttributeMode, ACE_TRY_ENV);
+-    ACE_TRY_CHECK;
+-    
+-    if (!result)
+-      return 0; // not equivalent
+-    
+-    TAO_InputCDR stream (
+-        _tao_any._tao_get_cdr (),
+-        _tao_any._tao_byte_order ()
+-      );
+-    if (stream >> _tao_elem)
+-    {
+-      return 1;
+-    }
+-  }
+-  ACE_CATCHANY
+-  {
+-    return 0;
+-  }
+-  ACE_ENDTRY;
+-  return 0;
++                      &CORBA_LocalInterfaceDef::_narrow
++                    )
++                )
++          );
+ }
+ 
+-void operator<<= (CORBA::Any &_tao_any, CORBA::OperationMode _tao_elem)
++CORBA_LocalInterfaceDef_ptr
++CORBA_LocalInterfaceDef::_duplicate (CORBA_LocalInterfaceDef_ptr obj)
+ {
+-  TAO_OutputCDR stream;
+-  stream << _tao_elem;
+-  _tao_any._tao_replace (
+-      CORBA::_tc_OperationMode,
+-      TAO_ENCAP_BYTE_ORDER,
+-      stream.begin ()
+-    );
++  if (!CORBA::is_nil (obj))
++    obj->_add_ref ();
++  return obj;
+ }
+ 
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::OperationMode &_tao_elem)
+-{
+-  ACE_TRY_NEW_ENV
++CORBA::Boolean CORBA_LocalInterfaceDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
+   {
+-    CORBA::TypeCode_var type = _tao_any.type ();
+-    
+-    CORBA::Boolean result = type->equivalent (CORBA::_tc_OperationMode, ACE_TRY_ENV);
+-    ACE_TRY_CHECK;
+-    
+-    if (!result)
+-      return 0; // not equivalent
++  if (
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/LocalInterfaceDef:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/InterfaceDef:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Container:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Contained:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IDLType:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/IRObject:1.0")) ||
++    (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
++  return 1; // success using local knowledge
++  else
++    return this->CORBA_Object::_is_a (value, ACE_TRY_ENV);
++}
+     
+-    TAO_InputCDR stream (
+-        _tao_any._tao_get_cdr (),
+-        _tao_any._tao_byte_order ()
+-      );
+-    if (stream >> _tao_elem)
++void *CORBA_LocalInterfaceDef::_tao_QueryInterface (ptr_arith_t type)
+     {
+-      return 1;
+-    }
++  void *retv = 0;
++  if (type == ACE_reinterpret_cast
++    (ptr_arith_t,
++      &CORBA_LocalInterfaceDef::_narrow))
++    retv = ACE_reinterpret_cast (void*, this);
++  else if (type == ACE_reinterpret_cast
++    (ptr_arith_t,
++      &CORBA_InterfaceDef::_narrow))
++    retv = ACE_reinterpret_cast
++      (
++        void *,
++        ACE_static_cast
++          (
++            CORBA_InterfaceDef_ptr,
++            this
++          )
++      );
++  else if (type == ACE_reinterpret_cast
++    (ptr_arith_t,
++      &CORBA_Container::_narrow))
++    retv = ACE_reinterpret_cast
++      (
++        void *,
++        ACE_static_cast
++          (
++            CORBA_Container_ptr,
++            this
++          )
++      );
++  else if (type == ACE_reinterpret_cast
++    (ptr_arith_t,
++      &CORBA_Contained::_narrow))
++    retv = ACE_reinterpret_cast
++      (
++        void *,
++        ACE_static_cast
++          (
++            CORBA_Contained_ptr,
++            this
++          )
++      );
++  else if (type == ACE_reinterpret_cast
++    (ptr_arith_t,
++      &CORBA_IDLType::_narrow))
++    retv = ACE_reinterpret_cast
++      (
++        void *,
++        ACE_static_cast
++          (
++            CORBA_IDLType_ptr,
++            this
++          )
++      );
++  else if (type == ACE_reinterpret_cast
++    (ptr_arith_t,
++      &CORBA_IRObject::_narrow))
++    retv = ACE_reinterpret_cast
++      (
++        void *,
++        ACE_static_cast
++          (
++            CORBA_IRObject_ptr,
++            this
++          )
++      );
++  else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow))
++    retv = ACE_reinterpret_cast (void *,
++      ACE_static_cast (CORBA::Object_ptr, this));
++    
++  if (retv)
++    this->_add_ref ();
++  return retv;
+   }
+-  ACE_CATCHANY
++
++const char* CORBA_LocalInterfaceDef::_interface_repository_id (void) const
+   {
+-    return 0;
+-  }
+-  ACE_ENDTRY;
+-  return 0;
++  return "IDL:omg.org/CORBA/LocalInterfaceDef:1.0";
+ }
+ 
+-void operator<<= (CORBA::Any &_tao_any, CORBA::ParameterMode _tao_elem)
++void operator<<= (CORBA::Any &_tao_any, CORBA::PrimitiveKind _tao_elem)
+ {
+   TAO_OutputCDR stream;
+   stream << _tao_elem;
+   _tao_any._tao_replace (
+-      CORBA::_tc_ParameterMode,
++      CORBA::_tc_PrimitiveKind,
+       TAO_ENCAP_BYTE_ORDER,
+       stream.begin ()
+     );
+ }
+ 
+-CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::ParameterMode &_tao_elem)
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::PrimitiveKind &_tao_elem)
+ {
+   ACE_TRY_NEW_ENV
+   {
+     CORBA::TypeCode_var type = _tao_any.type ();
+     
+-    CORBA::Boolean result = type->equivalent (CORBA::_tc_ParameterMode, ACE_TRY_ENV);
++    CORBA::Boolean result = type->equivalent (CORBA::_tc_PrimitiveKind, ACE_TRY_ENV);
+     ACE_TRY_CHECK;
+     
+     if (!result)
+@@ -30462,7 +28208,7 @@
+   if (stream << _tao_elem)
+   {
+     _tao_any._tao_replace (
+-        _tc_CORBA_Repository, 
++        CORBA::_tc_Repository, 
+         TAO_ENCAP_BYTE_ORDER,
+         stream.begin (),
+         1,
+@@ -30479,7 +28225,7 @@
+     _tao_elem = CORBA_Repository::_nil ();
+     CORBA::TypeCode_var type = _tao_any.type ();
+     
+-    CORBA::Boolean result = type->equivalent (_tc_CORBA_Repository, ACE_TRY_ENV);
++    CORBA::Boolean result = type->equivalent (CORBA::_tc_Repository, ACE_TRY_ENV);
+     ACE_TRY_CHECK;
+     
+     if (!result)
+@@ -30492,7 +28238,7 @@
+     if (stream >> _tao_elem)
+     {
+       ((CORBA::Any *)&_tao_any)->_tao_replace (
+-          _tc_CORBA_Repository,
++          CORBA::_tc_Repository,
+           1,
+           _tao_elem,
+           CORBA_Repository::_tao_any_destructor
+@@ -30523,7 +28269,7 @@
+   if (stream << _tao_elem)
+   {
+     _tao_any._tao_replace (
+-        _tc_CORBA_ModuleDef, 
++        CORBA::_tc_ModuleDef, 
+         TAO_ENCAP_BYTE_ORDER,
+         stream.begin (),
+         1,
+@@ -30540,7 +28286,7 @@
+     _tao_elem = CORBA_ModuleDef::_nil ();
+     CORBA::TypeCode_var type = _tao_any.type ();
+     
+-    CORBA::Boolean result = type->equivalent (_tc_CORBA_ModuleDef, ACE_TRY_ENV);
++    CORBA::Boolean result = type->equivalent (CORBA::_tc_ModuleDef, ACE_TRY_ENV);
+     ACE_TRY_CHECK;
+     
+     if (!result)
+@@ -30553,7 +28299,7 @@
+     if (stream >> _tao_elem)
+     {
+       ((CORBA::Any *)&_tao_any)->_tao_replace (
+-          _tc_CORBA_ModuleDef,
++          CORBA::_tc_ModuleDef,
+           1,
+           _tao_elem,
+           CORBA_ModuleDef::_tao_any_destructor
+@@ -30583,7 +28329,7 @@
+   TAO_OutputCDR stream;
+   stream << _tao_elem;
+   _tao_any._tao_replace (
+-      _tc_CORBA_ModuleDescription,
++      CORBA::_tc_ModuleDescription,
+       TAO_ENCAP_BYTE_ORDER,
+       stream.begin ()
+     );
+@@ -30594,7 +28340,7 @@
+   TAO_OutputCDR stream;
+   stream << *_tao_elem;
+   _tao_any._tao_replace (
+-      _tc_CORBA_ModuleDescription,
++      CORBA::_tc_ModuleDescription,
+       TAO_ENCAP_BYTE_ORDER,
+       stream.begin (),
+       1,
+@@ -30615,7 +28361,7 @@
+   {
+     CORBA::TypeCode_var type = _tao_any.type ();
+     
+-    CORBA::Boolean result = type->equivalent (_tc_CORBA_ModuleDescription, ACE_TRY_ENV);
++    CORBA::Boolean result = type->equivalent (CORBA::_tc_ModuleDescription, ACE_TRY_ENV);
+     ACE_TRY_CHECK;
+     
+     if (!result)
+@@ -30640,7 +28386,7 @@
+       if (stream >> *tmp)
+       {
+         ((CORBA::Any *)&_tao_any)->_tao_replace (
+-            _tc_CORBA_ModuleDescription,
++            CORBA::_tc_ModuleDescription,
+             1,
+             ACE_static_cast (void *, tmp),
+             CORBA_ModuleDescription::_tao_any_destructor
+@@ -30667,7 +28413,7 @@
+   if (stream << _tao_elem)
+   {
+     _tao_any._tao_replace (
+-        _tc_CORBA_ConstantDef, 
++        CORBA::_tc_ConstantDef, 
+         TAO_ENCAP_BYTE_ORDER,
+         stream.begin (),
+         1,
+@@ -30684,7 +28430,7 @@
+     _tao_elem = CORBA_ConstantDef::_nil ();
+     CORBA::TypeCode_var type = _tao_any.type ();
+     
+-    CORBA::Boolean result = type->equivalent (_tc_CORBA_ConstantDef, ACE_TRY_ENV);
++    CORBA::Boolean result = type->equivalent (CORBA::_tc_ConstantDef, ACE_TRY_ENV);
+     ACE_TRY_CHECK;
+     
+     if (!result)
+@@ -30697,7 +28443,7 @@
+     if (stream >> _tao_elem)
+     {
+       ((CORBA::Any *)&_tao_any)->_tao_replace (
+-          _tc_CORBA_ConstantDef,
++          CORBA::_tc_ConstantDef,
+           1,
+           _tao_elem,
+           CORBA_ConstantDef::_tao_any_destructor
+@@ -30727,7 +28473,7 @@
+   TAO_OutputCDR stream;
+   stream << _tao_elem;
+   _tao_any._tao_replace (
+-      _tc_CORBA_ConstantDescription,
++      CORBA::_tc_ConstantDescription,
+       TAO_ENCAP_BYTE_ORDER,
+       stream.begin ()
+     );
+@@ -30738,7 +28484,7 @@
+   TAO_OutputCDR stream;
+   stream << *_tao_elem;
+   _tao_any._tao_replace (
+-      _tc_CORBA_ConstantDescription,
++      CORBA::_tc_ConstantDescription,
+       TAO_ENCAP_BYTE_ORDER,
+       stream.begin (),
+       1,
+@@ -30759,7 +28505,7 @@
+   {
+     CORBA::TypeCode_var type = _tao_any.type ();
+     
+-    CORBA::Boolean result = type->equivalent (_tc_CORBA_ConstantDescription, ACE_TRY_ENV);
++    CORBA::Boolean result = type->equivalent (CORBA::_tc_ConstantDescription, ACE_TRY_ENV);
+     ACE_TRY_CHECK;
+     
+     if (!result)
+@@ -30784,7 +28530,7 @@
+       if (stream >> *tmp)
+       {
+         ((CORBA::Any *)&_tao_any)->_tao_replace (
+-            _tc_CORBA_ConstantDescription,
++            CORBA::_tc_ConstantDescription,
+             1,
+             ACE_static_cast (void *, tmp),
+             CORBA_ConstantDescription::_tao_any_destructor
+@@ -30811,7 +28557,7 @@
+   if (stream << _tao_elem)
+   {
+     _tao_any._tao_replace (
+-        _tc_CORBA_StructDef, 
++        CORBA::_tc_StructDef, 
+         TAO_ENCAP_BYTE_ORDER,
+         stream.begin (),
+         1,
+@@ -30828,7 +28574,7 @@
+     _tao_elem = CORBA_StructDef::_nil ();
+     CORBA::TypeCode_var type = _tao_any.type ();
+     
+-    CORBA::Boolean result = type->equivalent (_tc_CORBA_StructDef, ACE_TRY_ENV);
++    CORBA::Boolean result = type->equivalent (CORBA::_tc_StructDef, ACE_TRY_ENV);
+     ACE_TRY_CHECK;
+     
+     if (!result)
+@@ -30841,7 +28587,7 @@
+     if (stream >> _tao_elem)
+     {
+       ((CORBA::Any *)&_tao_any)->_tao_replace (
+-          _tc_CORBA_StructDef,
++          CORBA::_tc_StructDef,
+           1,
+           _tao_elem,
+           CORBA_StructDef::_tao_any_destructor
+@@ -30872,7 +28618,7 @@
+   if (stream << _tao_elem)
+   {
+     _tao_any._tao_replace (
+-        _tc_CORBA_UnionDef, 
++        CORBA::_tc_UnionDef, 
+         TAO_ENCAP_BYTE_ORDER,
+         stream.begin (),
+         1,
+@@ -30889,7 +28635,7 @@
+     _tao_elem = CORBA_UnionDef::_nil ();
+     CORBA::TypeCode_var type = _tao_any.type ();
+     
+-    CORBA::Boolean result = type->equivalent (_tc_CORBA_UnionDef, ACE_TRY_ENV);
++    CORBA::Boolean result = type->equivalent (CORBA::_tc_UnionDef, ACE_TRY_ENV);
+     ACE_TRY_CHECK;
+     
+     if (!result)
+@@ -30902,7 +28648,7 @@
+     if (stream >> _tao_elem)
+     {
+       ((CORBA::Any *)&_tao_any)->_tao_replace (
+-          _tc_CORBA_UnionDef,
++          CORBA::_tc_UnionDef,
+           1,
+           _tao_elem,
+           CORBA_UnionDef::_tao_any_destructor
+@@ -30933,7 +28679,7 @@
+   if (stream << _tao_elem)
+   {
+     _tao_any._tao_replace (
+-        _tc_CORBA_EnumDef, 
++        CORBA::_tc_EnumDef, 
+         TAO_ENCAP_BYTE_ORDER,
+         stream.begin (),
+         1,
+@@ -30950,7 +28696,7 @@
+     _tao_elem = CORBA_EnumDef::_nil ();
+     CORBA::TypeCode_var type = _tao_any.type ();
+     
+-    CORBA::Boolean result = type->equivalent (_tc_CORBA_EnumDef, ACE_TRY_ENV);
++    CORBA::Boolean result = type->equivalent (CORBA::_tc_EnumDef, ACE_TRY_ENV);
+     ACE_TRY_CHECK;
+     
+     if (!result)
+@@ -30963,7 +28709,7 @@
+     if (stream >> _tao_elem)
+     {
+       ((CORBA::Any *)&_tao_any)->_tao_replace (
+-          _tc_CORBA_EnumDef,
++          CORBA::_tc_EnumDef,
+           1,
+           _tao_elem,
+           CORBA_EnumDef::_tao_any_destructor
+@@ -30994,7 +28740,7 @@
+   if (stream << _tao_elem)
+   {
+     _tao_any._tao_replace (
+-        _tc_CORBA_AliasDef, 
++        CORBA::_tc_AliasDef, 
+         TAO_ENCAP_BYTE_ORDER,
+         stream.begin (),
+         1,
+@@ -31011,7 +28757,7 @@
+     _tao_elem = CORBA_AliasDef::_nil ();
+     CORBA::TypeCode_var type = _tao_any.type ();
+     
+-    CORBA::Boolean result = type->equivalent (_tc_CORBA_AliasDef, ACE_TRY_ENV);
++    CORBA::Boolean result = type->equivalent (CORBA::_tc_AliasDef, ACE_TRY_ENV);
+     ACE_TRY_CHECK;
+     
+     if (!result)
+@@ -31024,7 +28770,7 @@
+     if (stream >> _tao_elem)
+     {
+       ((CORBA::Any *)&_tao_any)->_tao_replace (
+-          _tc_CORBA_AliasDef,
++          CORBA::_tc_AliasDef,
+           1,
+           _tao_elem,
+           CORBA_AliasDef::_tao_any_destructor
+@@ -31055,7 +28801,7 @@
+   if (stream << _tao_elem)
+   {
+     _tao_any._tao_replace (
+-        _tc_CORBA_NativeDef, 
++        CORBA::_tc_NativeDef, 
+         TAO_ENCAP_BYTE_ORDER,
+         stream.begin (),
+         1,
+@@ -31072,7 +28818,7 @@
+     _tao_elem = CORBA_NativeDef::_nil ();
+     CORBA::TypeCode_var type = _tao_any.type ();
+     
+-    CORBA::Boolean result = type->equivalent (_tc_CORBA_NativeDef, ACE_TRY_ENV);
++    CORBA::Boolean result = type->equivalent (CORBA::_tc_NativeDef, ACE_TRY_ENV);
+     ACE_TRY_CHECK;
+     
+     if (!result)
+@@ -31085,7 +28831,7 @@
+     if (stream >> _tao_elem)
+     {
+       ((CORBA::Any *)&_tao_any)->_tao_replace (
+-          _tc_CORBA_NativeDef,
++          CORBA::_tc_NativeDef,
+           1,
+           _tao_elem,
+           CORBA_NativeDef::_tao_any_destructor
+@@ -31116,7 +28862,7 @@
+   if (stream << _tao_elem)
+   {
+     _tao_any._tao_replace (
+-        _tc_CORBA_PrimitiveDef, 
++        CORBA::_tc_PrimitiveDef, 
+         TAO_ENCAP_BYTE_ORDER,
+         stream.begin (),
+         1,
+@@ -31133,7 +28879,7 @@
+     _tao_elem = CORBA_PrimitiveDef::_nil ();
+     CORBA::TypeCode_var type = _tao_any.type ();
+     
+-    CORBA::Boolean result = type->equivalent (_tc_CORBA_PrimitiveDef, ACE_TRY_ENV);
++    CORBA::Boolean result = type->equivalent (CORBA::_tc_PrimitiveDef, ACE_TRY_ENV);
+     ACE_TRY_CHECK;
+     
+     if (!result)
+@@ -31146,7 +28892,7 @@
+     if (stream >> _tao_elem)
+     {
+       ((CORBA::Any *)&_tao_any)->_tao_replace (
+-          _tc_CORBA_PrimitiveDef,
++          CORBA::_tc_PrimitiveDef,
+           1,
+           _tao_elem,
+           CORBA_PrimitiveDef::_tao_any_destructor
+@@ -31177,7 +28923,7 @@
+   if (stream << _tao_elem)
+   {
+     _tao_any._tao_replace (
+-        _tc_CORBA_StringDef, 
++        CORBA::_tc_StringDef, 
+         TAO_ENCAP_BYTE_ORDER,
+         stream.begin (),
+         1,
+@@ -31194,7 +28940,7 @@
+     _tao_elem = CORBA_StringDef::_nil ();
+     CORBA::TypeCode_var type = _tao_any.type ();
+     
+-    CORBA::Boolean result = type->equivalent (_tc_CORBA_StringDef, ACE_TRY_ENV);
++    CORBA::Boolean result = type->equivalent (CORBA::_tc_StringDef, ACE_TRY_ENV);
+     ACE_TRY_CHECK;
+     
+     if (!result)
+@@ -31207,7 +28953,7 @@
+     if (stream >> _tao_elem)
+     {
+       ((CORBA::Any *)&_tao_any)->_tao_replace (
+-          _tc_CORBA_StringDef,
++          CORBA::_tc_StringDef,
+           1,
+           _tao_elem,
+           CORBA_StringDef::_tao_any_destructor
+@@ -31238,7 +28984,7 @@
+   if (stream << _tao_elem)
+   {
+     _tao_any._tao_replace (
+-        _tc_CORBA_WstringDef, 
++        CORBA::_tc_WstringDef, 
+         TAO_ENCAP_BYTE_ORDER,
+         stream.begin (),
+         1,
+@@ -31255,7 +29001,7 @@
+     _tao_elem = CORBA_WstringDef::_nil ();
+     CORBA::TypeCode_var type = _tao_any.type ();
+     
+-    CORBA::Boolean result = type->equivalent (_tc_CORBA_WstringDef, ACE_TRY_ENV);
++    CORBA::Boolean result = type->equivalent (CORBA::_tc_WstringDef, ACE_TRY_ENV);
+     ACE_TRY_CHECK;
+     
+     if (!result)
+@@ -31268,7 +29014,7 @@
+     if (stream >> _tao_elem)
+     {
+       ((CORBA::Any *)&_tao_any)->_tao_replace (
+-          _tc_CORBA_WstringDef,
++          CORBA::_tc_WstringDef,
+           1,
+           _tao_elem,
+           CORBA_WstringDef::_tao_any_destructor
+@@ -31299,7 +29045,7 @@
+   if (stream << _tao_elem)
+   {
+     _tao_any._tao_replace (
+-        _tc_CORBA_SequenceDef, 
++        CORBA::_tc_SequenceDef, 
+         TAO_ENCAP_BYTE_ORDER,
+         stream.begin (),
+         1,
+@@ -31316,7 +29062,7 @@
+     _tao_elem = CORBA_SequenceDef::_nil ();
+     CORBA::TypeCode_var type = _tao_any.type ();
+     
+-    CORBA::Boolean result = type->equivalent (_tc_CORBA_SequenceDef, ACE_TRY_ENV);
++    CORBA::Boolean result = type->equivalent (CORBA::_tc_SequenceDef, ACE_TRY_ENV);
+     ACE_TRY_CHECK;
+     
+     if (!result)
+@@ -31329,7 +29075,7 @@
+     if (stream >> _tao_elem)
+     {
+       ((CORBA::Any *)&_tao_any)->_tao_replace (
+-          _tc_CORBA_SequenceDef,
++          CORBA::_tc_SequenceDef,
+           1,
+           _tao_elem,
+           CORBA_SequenceDef::_tao_any_destructor
+@@ -31360,7 +29106,7 @@
+   if (stream << _tao_elem)
+   {
+     _tao_any._tao_replace (
+-        _tc_CORBA_ArrayDef, 
++        CORBA::_tc_ArrayDef, 
+         TAO_ENCAP_BYTE_ORDER,
+         stream.begin (),
+         1,
+@@ -31377,7 +29123,7 @@
+     _tao_elem = CORBA_ArrayDef::_nil ();
+     CORBA::TypeCode_var type = _tao_any.type ();
+     
+-    CORBA::Boolean result = type->equivalent (_tc_CORBA_ArrayDef, ACE_TRY_ENV);
++    CORBA::Boolean result = type->equivalent (CORBA::_tc_ArrayDef, ACE_TRY_ENV);
+     ACE_TRY_CHECK;
+     
+     if (!result)
+@@ -31390,7 +29136,7 @@
+     if (stream >> _tao_elem)
+     {
+       ((CORBA::Any *)&_tao_any)->_tao_replace (
+-          _tc_CORBA_ArrayDef,
++          CORBA::_tc_ArrayDef,
+           1,
+           _tao_elem,
+           CORBA_ArrayDef::_tao_any_destructor
+@@ -31421,7 +29167,7 @@
+   if (stream << _tao_elem)
+   {
+     _tao_any._tao_replace (
+-        _tc_CORBA_ExceptionDef, 
++        CORBA::_tc_ExceptionDef, 
+         TAO_ENCAP_BYTE_ORDER,
+         stream.begin (),
+         1,
+@@ -31438,7 +29184,7 @@
+     _tao_elem = CORBA_ExceptionDef::_nil ();
+     CORBA::TypeCode_var type = _tao_any.type ();
+     
+-    CORBA::Boolean result = type->equivalent (_tc_CORBA_ExceptionDef, ACE_TRY_ENV);
++    CORBA::Boolean result = type->equivalent (CORBA::_tc_ExceptionDef, ACE_TRY_ENV);
+     ACE_TRY_CHECK;
+     
+     if (!result)
+@@ -31451,7 +29197,7 @@
+     if (stream >> _tao_elem)
+     {
+       ((CORBA::Any *)&_tao_any)->_tao_replace (
+-          _tc_CORBA_ExceptionDef,
++          CORBA::_tc_ExceptionDef,
+           1,
+           _tao_elem,
+           CORBA_ExceptionDef::_tao_any_destructor
+@@ -31481,7 +29227,7 @@
+   TAO_OutputCDR stream;
+   stream << _tao_elem;
+   _tao_any._tao_replace (
+-      _tc_CORBA_ExceptionDescription,
++      CORBA::_tc_ExceptionDescription,
+       TAO_ENCAP_BYTE_ORDER,
+       stream.begin ()
+     );
+@@ -31492,7 +29238,7 @@
+   TAO_OutputCDR stream;
+   stream << *_tao_elem;
+   _tao_any._tao_replace (
+-      _tc_CORBA_ExceptionDescription,
++      CORBA::_tc_ExceptionDescription,
+       TAO_ENCAP_BYTE_ORDER,
+       stream.begin (),
+       1,
+@@ -31513,7 +29259,7 @@
+   {
+     CORBA::TypeCode_var type = _tao_any.type ();
+     
+-    CORBA::Boolean result = type->equivalent (_tc_CORBA_ExceptionDescription, ACE_TRY_ENV);
++    CORBA::Boolean result = type->equivalent (CORBA::_tc_ExceptionDescription, ACE_TRY_ENV);
+     ACE_TRY_CHECK;
+     
+     if (!result)
+@@ -31538,7 +29284,7 @@
+       if (stream >> *tmp)
+       {
+         ((CORBA::Any *)&_tao_any)->_tao_replace (
+-            _tc_CORBA_ExceptionDescription,
++            CORBA::_tc_ExceptionDescription,
+             1,
+             ACE_static_cast (void *, tmp),
+             CORBA_ExceptionDescription::_tao_any_destructor
+@@ -31568,7 +29314,7 @@
+   if (stream << _tao_elem)
+   {
+     _tao_any._tao_replace (
+-        _tc_CORBA_ExceptionDefSeq,
++        CORBA::_tc_ExceptionDefSeq,
+         TAO_ENCAP_BYTE_ORDER,
+         stream.begin ()
+       );
+@@ -31580,7 +29326,7 @@
+   TAO_OutputCDR stream;
+   stream << *_tao_elem;
+   _tao_any._tao_replace (
+-      _tc_CORBA_ExceptionDefSeq,
++      CORBA::_tc_ExceptionDefSeq,
+       TAO_ENCAP_BYTE_ORDER,
+       stream.begin (),
+       1,
+@@ -31604,7 +29350,7 @@
+   {
+     CORBA::TypeCode_var type = _tao_any.type ();
+     
+-    CORBA::Boolean result = type->equivalent (_tc_CORBA_ExceptionDefSeq, ACE_TRY_ENV);
++    CORBA::Boolean result = type->equivalent (CORBA::_tc_ExceptionDefSeq, ACE_TRY_ENV);
+     ACE_TRY_CHECK;
+     
+     if (!result)
+@@ -31629,7 +29375,7 @@
+       if (stream >> *tmp)
+       {
+         ((CORBA::Any *)&_tao_any)->_tao_replace (
+-            _tc_CORBA_ExceptionDefSeq,
++            CORBA::_tc_ExceptionDefSeq,
+             1,
+             ACE_static_cast (void *, tmp),
+             CORBA_ExceptionDefSeq::_tao_any_destructor
+@@ -31659,7 +29405,7 @@
+   if (stream << _tao_elem)
+   {
+     _tao_any._tao_replace (
+-        _tc_CORBA_ExcDescriptionSeq,
++        CORBA::_tc_ExcDescriptionSeq,
+         TAO_ENCAP_BYTE_ORDER,
+         stream.begin ()
+       );
+@@ -31671,7 +29417,7 @@
+   TAO_OutputCDR stream;
+   stream << *_tao_elem;
+   _tao_any._tao_replace (
+-      _tc_CORBA_ExcDescriptionSeq,
++      CORBA::_tc_ExcDescriptionSeq,
+       TAO_ENCAP_BYTE_ORDER,
+       stream.begin (),
+       1,
+@@ -31695,7 +29441,7 @@
+   {
+     CORBA::TypeCode_var type = _tao_any.type ();
+     
+-    CORBA::Boolean result = type->equivalent (_tc_CORBA_ExcDescriptionSeq, ACE_TRY_ENV);
++    CORBA::Boolean result = type->equivalent (CORBA::_tc_ExcDescriptionSeq, ACE_TRY_ENV);
+     ACE_TRY_CHECK;
+     
+     if (!result)
+@@ -31720,7 +29466,7 @@
+       if (stream >> *tmp)
+       {
+         ((CORBA::Any *)&_tao_any)->_tao_replace (
+-            _tc_CORBA_ExcDescriptionSeq,
++            CORBA::_tc_ExcDescriptionSeq,
+             1,
+             ACE_static_cast (void *, tmp),
+             CORBA_ExcDescriptionSeq::_tao_any_destructor
+@@ -31741,13 +29487,53 @@
+   return 0;
+ }
+ 
++void operator<<= (CORBA::Any &_tao_any, CORBA::AttributeMode _tao_elem)
++{
++  TAO_OutputCDR stream;
++  stream << _tao_elem;
++  _tao_any._tao_replace (
++      CORBA::_tc_AttributeMode,
++      TAO_ENCAP_BYTE_ORDER,
++      stream.begin ()
++    );
++}
++
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::AttributeMode &_tao_elem)
++{
++  ACE_TRY_NEW_ENV
++  {
++    CORBA::TypeCode_var type = _tao_any.type ();
++    
++    CORBA::Boolean result = type->equivalent (CORBA::_tc_AttributeMode, ACE_TRY_ENV);
++    ACE_TRY_CHECK;
++    
++    if (!result)
++      return 0; // not equivalent
++    
++    TAO_InputCDR stream (
++        _tao_any._tao_get_cdr (),
++        _tao_any._tao_byte_order ()
++      );
++    if (stream >> _tao_elem)
++    {
++      return 1;
++    }
++  }
++  ACE_CATCHANY
++  {
++    return 0;
++  }
++  ACE_ENDTRY;
++  return 0;
++}
++
+ void operator<<= (CORBA::Any &_tao_any, CORBA_AttributeDef_ptr _tao_elem)
+ {
+   TAO_OutputCDR stream;
+   if (stream << _tao_elem)
+   {
+     _tao_any._tao_replace (
+-        _tc_CORBA_AttributeDef, 
++        CORBA::_tc_AttributeDef, 
+         TAO_ENCAP_BYTE_ORDER,
+         stream.begin (),
+         1,
+@@ -31764,7 +29550,7 @@
+     _tao_elem = CORBA_AttributeDef::_nil ();
+     CORBA::TypeCode_var type = _tao_any.type ();
+     
+-    CORBA::Boolean result = type->equivalent (_tc_CORBA_AttributeDef, ACE_TRY_ENV);
++    CORBA::Boolean result = type->equivalent (CORBA::_tc_AttributeDef, ACE_TRY_ENV);
+     ACE_TRY_CHECK;
+     
+     if (!result)
+@@ -31777,7 +29563,7 @@
+     if (stream >> _tao_elem)
+     {
+       ((CORBA::Any *)&_tao_any)->_tao_replace (
+-          _tc_CORBA_AttributeDef,
++          CORBA::_tc_AttributeDef,
+           1,
+           _tao_elem,
+           CORBA_AttributeDef::_tao_any_destructor
+@@ -31807,7 +29593,7 @@
+   TAO_OutputCDR stream;
+   stream << _tao_elem;
+   _tao_any._tao_replace (
+-      _tc_CORBA_AttributeDescription,
++      CORBA::_tc_AttributeDescription,
+       TAO_ENCAP_BYTE_ORDER,
+       stream.begin ()
+     );
+@@ -31818,7 +29604,7 @@
+   TAO_OutputCDR stream;
+   stream << *_tao_elem;
+   _tao_any._tao_replace (
+-      _tc_CORBA_AttributeDescription,
++      CORBA::_tc_AttributeDescription,
+       TAO_ENCAP_BYTE_ORDER,
+       stream.begin (),
+       1,
+@@ -31839,7 +29625,7 @@
+   {
+     CORBA::TypeCode_var type = _tao_any.type ();
+     
+-    CORBA::Boolean result = type->equivalent (_tc_CORBA_AttributeDescription, ACE_TRY_ENV);
++    CORBA::Boolean result = type->equivalent (CORBA::_tc_AttributeDescription, ACE_TRY_ENV);
+     ACE_TRY_CHECK;
+     
+     if (!result)
+@@ -31864,7 +29650,7 @@
+       if (stream >> *tmp)
+       {
+         ((CORBA::Any *)&_tao_any)->_tao_replace (
+-            _tc_CORBA_AttributeDescription,
++            CORBA::_tc_AttributeDescription,
+             1,
+             ACE_static_cast (void *, tmp),
+             CORBA_AttributeDescription::_tao_any_destructor
+@@ -31885,12 +29671,92 @@
+   return 0;
+ }
+ 
++void operator<<= (CORBA::Any &_tao_any, CORBA::OperationMode _tao_elem)
++{
++  TAO_OutputCDR stream;
++  stream << _tao_elem;
++  _tao_any._tao_replace (
++      CORBA::_tc_OperationMode,
++      TAO_ENCAP_BYTE_ORDER,
++      stream.begin ()
++    );
++}
++
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::OperationMode &_tao_elem)
++{
++  ACE_TRY_NEW_ENV
++  {
++    CORBA::TypeCode_var type = _tao_any.type ();
++    
++    CORBA::Boolean result = type->equivalent (CORBA::_tc_OperationMode, ACE_TRY_ENV);
++    ACE_TRY_CHECK;
++    
++    if (!result)
++      return 0; // not equivalent
++    
++    TAO_InputCDR stream (
++        _tao_any._tao_get_cdr (),
++        _tao_any._tao_byte_order ()
++      );
++    if (stream >> _tao_elem)
++    {
++      return 1;
++    }
++  }
++  ACE_CATCHANY
++  {
++    return 0;
++  }
++  ACE_ENDTRY;
++  return 0;
++}
++
++void operator<<= (CORBA::Any &_tao_any, CORBA::ParameterMode _tao_elem)
++{
++  TAO_OutputCDR stream;
++  stream << _tao_elem;
++  _tao_any._tao_replace (
++      CORBA::_tc_ParameterMode,
++      TAO_ENCAP_BYTE_ORDER,
++      stream.begin ()
++    );
++}
++
++CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, CORBA::ParameterMode &_tao_elem)
++{
++  ACE_TRY_NEW_ENV
++  {
++    CORBA::TypeCode_var type = _tao_any.type ();
++    
++    CORBA::Boolean result = type->equivalent (CORBA::_tc_ParameterMode, ACE_TRY_ENV);
++    ACE_TRY_CHECK;
++    
++    if (!result)
++      return 0; // not equivalent
++    
++    TAO_InputCDR stream (
++        _tao_any._tao_get_cdr (),
++        _tao_any._tao_byte_order ()
++      );
++    if (stream >> _tao_elem)
++    {
++      return 1;
++    }
++  }
++  ACE_CATCHANY
++  {
++    return 0;
++  }
++  ACE_ENDTRY;
++  return 0;
++}
++
+ void operator<<= (CORBA::Any &_tao_any, const CORBA_ParameterDescription &_tao_elem) // copying
+ {
+   TAO_OutputCDR stream;
+   stream << _tao_elem;
+   _tao_any._tao_replace (
+-      _tc_CORBA_ParameterDescription,
++      CORBA::_tc_ParameterDescription,
+       TAO_ENCAP_BYTE_ORDER,
+       stream.begin ()
+     );
+@@ -31901,7 +29767,7 @@
+   TAO_OutputCDR stream;
+   stream << *_tao_elem;
+   _tao_any._tao_replace (
+-      _tc_CORBA_ParameterDescription,
++      CORBA::_tc_ParameterDescription,
+       TAO_ENCAP_BYTE_ORDER,
+       stream.begin (),
+       1,
+@@ -31922,7 +29788,7 @@
+   {
+     CORBA::TypeCode_var type = _tao_any.type ();
+     
+-    CORBA::Boolean result = type->equivalent (_tc_CORBA_ParameterDescription, ACE_TRY_ENV);
++    CORBA::Boolean result = type->equivalent (CORBA::_tc_ParameterDescription, ACE_TRY_ENV);
+     ACE_TRY_CHECK;
+     
+     if (!result)
+@@ -31947,7 +29813,7 @@
+       if (stream >> *tmp)
+       {
+         ((CORBA::Any *)&_tao_any)->_tao_replace (
+-            _tc_CORBA_ParameterDescription,
++            CORBA::_tc_ParameterDescription,
+             1,
+             ACE_static_cast (void *, tmp),
+             CORBA_ParameterDescription::_tao_any_destructor
+@@ -31977,7 +29843,7 @@
+   if (stream << _tao_elem)
+   {
+     _tao_any._tao_replace (
+-        _tc_CORBA_ParDescriptionSeq,
++        CORBA::_tc_ParDescriptionSeq,
+         TAO_ENCAP_BYTE_ORDER,
+         stream.begin ()
+       );
+@@ -31989,7 +29855,7 @@
+   TAO_OutputCDR stream;
+   stream << *_tao_elem;
+   _tao_any._tao_replace (
+-      _tc_CORBA_ParDescriptionSeq,
++      CORBA::_tc_ParDescriptionSeq,
+       TAO_ENCAP_BYTE_ORDER,
+       stream.begin (),
+       1,
+@@ -32013,7 +29879,7 @@
+   {
+     CORBA::TypeCode_var type = _tao_any.type ();
+     
+-    CORBA::Boolean result = type->equivalent (_tc_CORBA_ParDescriptionSeq, ACE_TRY_ENV);
++    CORBA::Boolean result = type->equivalent (CORBA::_tc_ParDescriptionSeq, ACE_TRY_ENV);
+     ACE_TRY_CHECK;
+     
+     if (!result)
+@@ -32038,7 +29904,7 @@
+       if (stream >> *tmp)
+       {
+         ((CORBA::Any *)&_tao_any)->_tao_replace (
+-            _tc_CORBA_ParDescriptionSeq,
++            CORBA::_tc_ParDescriptionSeq,
+             1,
+             ACE_static_cast (void *, tmp),
+             CORBA_ParDescriptionSeq::_tao_any_destructor
+@@ -32068,7 +29934,7 @@
+   if (stream << _tao_elem)
+   {
+     _tao_any._tao_replace (
+-        _tc_CORBA_ContextIdSeq,
++        CORBA::_tc_ContextIdSeq,
+         TAO_ENCAP_BYTE_ORDER,
+         stream.begin ()
+       );
+@@ -32080,7 +29946,7 @@
+   TAO_OutputCDR stream;
+   stream << *_tao_elem;
+   _tao_any._tao_replace (
+-      _tc_CORBA_ContextIdSeq,
++      CORBA::_tc_ContextIdSeq,
+       TAO_ENCAP_BYTE_ORDER,
+       stream.begin (),
+       1,
+@@ -32104,7 +29970,7 @@
+   {
+     CORBA::TypeCode_var type = _tao_any.type ();
+     
+-    CORBA::Boolean result = type->equivalent (_tc_CORBA_ContextIdSeq, ACE_TRY_ENV);
++    CORBA::Boolean result = type->equivalent (CORBA::_tc_ContextIdSeq, ACE_TRY_ENV);
+     ACE_TRY_CHECK;
+     
+     if (!result)
+@@ -32129,7 +29995,7 @@
+       if (stream >> *tmp)
+       {
+         ((CORBA::Any *)&_tao_any)->_tao_replace (
+-            _tc_CORBA_ContextIdSeq,
++            CORBA::_tc_ContextIdSeq,
+             1,
+             ACE_static_cast (void *, tmp),
+             CORBA_ContextIdSeq::_tao_any_destructor
+@@ -32156,7 +30022,7 @@
+   if (stream << _tao_elem)
+   {
+     _tao_any._tao_replace (
+-        _tc_CORBA_OperationDef, 
++        CORBA::_tc_OperationDef, 
+         TAO_ENCAP_BYTE_ORDER,
+         stream.begin (),
+         1,
+@@ -32173,7 +30039,7 @@
+     _tao_elem = CORBA_OperationDef::_nil ();
+     CORBA::TypeCode_var type = _tao_any.type ();
+     
+-    CORBA::Boolean result = type->equivalent (_tc_CORBA_OperationDef, ACE_TRY_ENV);
++    CORBA::Boolean result = type->equivalent (CORBA::_tc_OperationDef, ACE_TRY_ENV);
+     ACE_TRY_CHECK;
+     
+     if (!result)
+@@ -32186,7 +30052,7 @@
+     if (stream >> _tao_elem)
+     {
+       ((CORBA::Any *)&_tao_any)->_tao_replace (
+-          _tc_CORBA_OperationDef,
++          CORBA::_tc_OperationDef,
+           1,
+           _tao_elem,
+           CORBA_OperationDef::_tao_any_destructor
+@@ -32216,7 +30082,7 @@
+   TAO_OutputCDR stream;
+   stream << _tao_elem;
+   _tao_any._tao_replace (
+-      _tc_CORBA_OperationDescription,
++      CORBA::_tc_OperationDescription,
+       TAO_ENCAP_BYTE_ORDER,
+       stream.begin ()
+     );
+@@ -32227,7 +30093,7 @@
+   TAO_OutputCDR stream;
+   stream << *_tao_elem;
+   _tao_any._tao_replace (
+-      _tc_CORBA_OperationDescription,
++      CORBA::_tc_OperationDescription,
+       TAO_ENCAP_BYTE_ORDER,
+       stream.begin (),
+       1,
+@@ -32248,7 +30114,7 @@
+   {
+     CORBA::TypeCode_var type = _tao_any.type ();
+     
+-    CORBA::Boolean result = type->equivalent (_tc_CORBA_OperationDescription, ACE_TRY_ENV);
++    CORBA::Boolean result = type->equivalent (CORBA::_tc_OperationDescription, ACE_TRY_ENV);
+     ACE_TRY_CHECK;
+     
+     if (!result)
+@@ -32273,7 +30139,7 @@
+       if (stream >> *tmp)
+       {
+         ((CORBA::Any *)&_tao_any)->_tao_replace (
+-            _tc_CORBA_OperationDescription,
++            CORBA::_tc_OperationDescription,
+             1,
+             ACE_static_cast (void *, tmp),
+             CORBA_OperationDescription::_tao_any_destructor
+@@ -32303,7 +30169,7 @@
+   if (stream << _tao_elem)
+   {
+     _tao_any._tao_replace (
+-        _tc_CORBA_RepositoryIdSeq,
++        CORBA::_tc_RepositoryIdSeq,
+         TAO_ENCAP_BYTE_ORDER,
+         stream.begin ()
+       );
+@@ -32315,7 +30181,7 @@
+   TAO_OutputCDR stream;
+   stream << *_tao_elem;
+   _tao_any._tao_replace (
+-      _tc_CORBA_RepositoryIdSeq,
++      CORBA::_tc_RepositoryIdSeq,
+       TAO_ENCAP_BYTE_ORDER,
+       stream.begin (),
+       1,
+@@ -32339,7 +30205,7 @@
+   {
+     CORBA::TypeCode_var type = _tao_any.type ();
+     
+-    CORBA::Boolean result = type->equivalent (_tc_CORBA_RepositoryIdSeq, ACE_TRY_ENV);
++    CORBA::Boolean result = type->equivalent (CORBA::_tc_RepositoryIdSeq, ACE_TRY_ENV);
+     ACE_TRY_CHECK;
+     
+     if (!result)
+@@ -32364,7 +30230,7 @@
+       if (stream >> *tmp)
+       {
+         ((CORBA::Any *)&_tao_any)->_tao_replace (
+-            _tc_CORBA_RepositoryIdSeq,
++            CORBA::_tc_RepositoryIdSeq,
+             1,
+             ACE_static_cast (void *, tmp),
+             CORBA_RepositoryIdSeq::_tao_any_destructor
+@@ -32394,7 +30260,7 @@
+   if (stream << _tao_elem)
+   {
+     _tao_any._tao_replace (
+-        _tc_CORBA_OpDescriptionSeq,
++        CORBA::_tc_OpDescriptionSeq,
+         TAO_ENCAP_BYTE_ORDER,
+         stream.begin ()
+       );
+@@ -32406,7 +30272,7 @@
+   TAO_OutputCDR stream;
+   stream << *_tao_elem;
+   _tao_any._tao_replace (
+-      _tc_CORBA_OpDescriptionSeq,
++      CORBA::_tc_OpDescriptionSeq,
+       TAO_ENCAP_BYTE_ORDER,
+       stream.begin (),
+       1,
+@@ -32430,7 +30296,7 @@
+   {
+     CORBA::TypeCode_var type = _tao_any.type ();
+     
+-    CORBA::Boolean result = type->equivalent (_tc_CORBA_OpDescriptionSeq, ACE_TRY_ENV);
++    CORBA::Boolean result = type->equivalent (CORBA::_tc_OpDescriptionSeq, ACE_TRY_ENV);
+     ACE_TRY_CHECK;
+     
+     if (!result)
+@@ -32455,7 +30321,7 @@
+       if (stream >> *tmp)
+       {
+         ((CORBA::Any *)&_tao_any)->_tao_replace (
+-            _tc_CORBA_OpDescriptionSeq,
++            CORBA::_tc_OpDescriptionSeq,
+             1,
+             ACE_static_cast (void *, tmp),
+             CORBA_OpDescriptionSeq::_tao_any_destructor
+@@ -32485,7 +30351,7 @@
+   if (stream << _tao_elem)
+   {
+     _tao_any._tao_replace (
+-        _tc_CORBA_AttrDescriptionSeq,
++        CORBA::_tc_AttrDescriptionSeq,
+         TAO_ENCAP_BYTE_ORDER,
+         stream.begin ()
+       );
+@@ -32497,7 +30363,7 @@
+   TAO_OutputCDR stream;
+   stream << *_tao_elem;
+   _tao_any._tao_replace (
+-      _tc_CORBA_AttrDescriptionSeq,
++      CORBA::_tc_AttrDescriptionSeq,
+       TAO_ENCAP_BYTE_ORDER,
+       stream.begin (),
+       1,
+@@ -32521,7 +30387,7 @@
+   {
+     CORBA::TypeCode_var type = _tao_any.type ();
+     
+-    CORBA::Boolean result = type->equivalent (_tc_CORBA_AttrDescriptionSeq, ACE_TRY_ENV);
++    CORBA::Boolean result = type->equivalent (CORBA::_tc_AttrDescriptionSeq, ACE_TRY_ENV);
+     ACE_TRY_CHECK;
+     
+     if (!result)
+@@ -32546,7 +30412,7 @@
+       if (stream >> *tmp)
+       {
+         ((CORBA::Any *)&_tao_any)->_tao_replace (
+-            _tc_CORBA_AttrDescriptionSeq,
++            CORBA::_tc_AttrDescriptionSeq,
+             1,
+             ACE_static_cast (void *, tmp),
+             CORBA_AttrDescriptionSeq::_tao_any_destructor
+@@ -32573,7 +30439,7 @@
+   if (stream << _tao_elem)
+   {
+     _tao_any._tao_replace (
+-        _tc_CORBA_InterfaceDef, 
++        CORBA::_tc_InterfaceDef, 
+         TAO_ENCAP_BYTE_ORDER,
+         stream.begin (),
+         1,
+@@ -32590,7 +30456,7 @@
+     _tao_elem = CORBA_InterfaceDef::_nil ();
+     CORBA::TypeCode_var type = _tao_any.type ();
+     
+-    CORBA::Boolean result = type->equivalent (_tc_CORBA_InterfaceDef, ACE_TRY_ENV);
++    CORBA::Boolean result = type->equivalent (CORBA::_tc_InterfaceDef, ACE_TRY_ENV);
+     ACE_TRY_CHECK;
+     
+     if (!result)
+@@ -32603,7 +30469,7 @@
+     if (stream >> _tao_elem)
+     {
+       ((CORBA::Any *)&_tao_any)->_tao_replace (
+-          _tc_CORBA_InterfaceDef,
++          CORBA::_tc_InterfaceDef,
+           1,
+           _tao_elem,
+           CORBA_InterfaceDef::_tao_any_destructor
+@@ -32716,7 +30582,7 @@
+   TAO_OutputCDR stream;
+   stream << _tao_elem;
+   _tao_any._tao_replace (
+-      _tc_CORBA_InterfaceDescription,
++      CORBA::_tc_InterfaceDescription,
+       TAO_ENCAP_BYTE_ORDER,
+       stream.begin ()
+     );
+@@ -32727,7 +30593,7 @@
+   TAO_OutputCDR stream;
+   stream << *_tao_elem;
+   _tao_any._tao_replace (
+-      _tc_CORBA_InterfaceDescription,
++      CORBA::_tc_InterfaceDescription,
+       TAO_ENCAP_BYTE_ORDER,
+       stream.begin (),
+       1,
+@@ -32748,7 +30614,7 @@
+   {
+     CORBA::TypeCode_var type = _tao_any.type ();
+     
+-    CORBA::Boolean result = type->equivalent (_tc_CORBA_InterfaceDescription, ACE_TRY_ENV);
++    CORBA::Boolean result = type->equivalent (CORBA::_tc_InterfaceDescription, ACE_TRY_ENV);
+     ACE_TRY_CHECK;
+     
+     if (!result)
+@@ -32773,7 +30639,7 @@
+       if (stream >> *tmp)
+       {
+         ((CORBA::Any *)&_tao_any)->_tao_replace (
+-            _tc_CORBA_InterfaceDescription,
++            CORBA::_tc_InterfaceDescription,
+             1,
+             ACE_static_cast (void *, tmp),
+             CORBA_InterfaceDescription::_tao_any_destructor
+@@ -32800,7 +30666,7 @@
+   if (stream << _tao_elem)
+   {
+     _tao_any._tao_replace (
+-        _tc_CORBA_AbstractInterfaceDef, 
++        CORBA::_tc_AbstractInterfaceDef, 
+         TAO_ENCAP_BYTE_ORDER,
+         stream.begin (),
+         1,
+@@ -32817,7 +30683,7 @@
+     _tao_elem = CORBA_AbstractInterfaceDef::_nil ();
+     CORBA::TypeCode_var type = _tao_any.type ();
+     
+-    CORBA::Boolean result = type->equivalent (_tc_CORBA_AbstractInterfaceDef, ACE_TRY_ENV);
++    CORBA::Boolean result = type->equivalent (CORBA::_tc_AbstractInterfaceDef, ACE_TRY_ENV);
+     ACE_TRY_CHECK;
+     
+     if (!result)
+@@ -32830,7 +30696,7 @@
+     if (stream >> _tao_elem)
+     {
+       ((CORBA::Any *)&_tao_any)->_tao_replace (
+-          _tc_CORBA_AbstractInterfaceDef,
++          CORBA::_tc_AbstractInterfaceDef,
+           1,
+           _tao_elem,
+           CORBA_AbstractInterfaceDef::_tao_any_destructor
+@@ -32861,7 +30727,7 @@
+   if (stream << _tao_elem)
+   {
+     _tao_any._tao_replace (
+-        _tc_CORBA_LocalInterfaceDef, 
++        CORBA::_tc_LocalInterfaceDef, 
+         TAO_ENCAP_BYTE_ORDER,
+         stream.begin (),
+         1,
+@@ -32878,7 +30744,7 @@
+     _tao_elem = CORBA_LocalInterfaceDef::_nil ();
+     CORBA::TypeCode_var type = _tao_any.type ();
+     
+-    CORBA::Boolean result = type->equivalent (_tc_CORBA_LocalInterfaceDef, ACE_TRY_ENV);
++    CORBA::Boolean result = type->equivalent (CORBA::_tc_LocalInterfaceDef, ACE_TRY_ENV);
+     ACE_TRY_CHECK;
+     
+     if (!result)
+@@ -32891,7 +30757,7 @@
+     if (stream >> _tao_elem)
+     {
+       ((CORBA::Any *)&_tao_any)->_tao_replace (
+-          _tc_CORBA_LocalInterfaceDef,
++          CORBA::_tc_LocalInterfaceDef,
+           1,
+           _tao_elem,
+           CORBA_LocalInterfaceDef::_tao_any_destructor
+@@ -33451,11 +31317,6 @@
+     // If length is 0 we return true.
+     if (0 >= _tao_seq_len) 
+       return 1;
+-    // Add a check to the length of the sequence
+-    // to make sure it does not exceed the length
+-    // of the stream. (See bug 58.)
+-    if (_tao_seq_len > strm.length())
+-      return 0;
+     // retrieve all the elements
+     CORBA::Boolean _tao_marshal_flag = 1;
+     for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
+@@ -33498,11 +31359,6 @@
+     // If length is 0 we return true.
+     if (0 >= _tao_seq_len) 
+       return 1;
+-    // Add a check to the length of the sequence
+-    // to make sure it does not exceed the length
+-    // of the stream. (See bug 58.)
+-    if (_tao_seq_len > strm.length())
+-      return 0;
+     // retrieve all the elements
+     CORBA::Boolean _tao_marshal_flag = 1;
+     for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
+@@ -33581,11 +31437,6 @@
+     // If length is 0 we return true.
+     if (0 >= _tao_seq_len) 
+       return 1;
+-    // Add a check to the length of the sequence
+-    // to make sure it does not exceed the length
+-    // of the stream. (See bug 58.)
+-    if (_tao_seq_len > strm.length())
+-      return 0;
+     // retrieve all the elements
+     CORBA::Boolean _tao_marshal_flag = 1;
+     for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
+@@ -33628,11 +31479,6 @@
+     // If length is 0 we return true.
+     if (0 >= _tao_seq_len) 
+       return 1;
+-    // Add a check to the length of the sequence
+-    // to make sure it does not exceed the length
+-    // of the stream. (See bug 58.)
+-    if (_tao_seq_len > strm.length())
+-      return 0;
+     // retrieve all the elements
+     CORBA::Boolean _tao_marshal_flag = 1;
+     for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
+@@ -33711,11 +31557,6 @@
+     // If length is 0 we return true.
+     if (0 >= _tao_seq_len) 
+       return 1;
+-    // Add a check to the length of the sequence
+-    // to make sure it does not exceed the length
+-    // of the stream. (See bug 58.)
+-    if (_tao_seq_len > strm.length())
+-      return 0;
+     // retrieve all the elements
+     CORBA::Boolean _tao_marshal_flag = 1;
+     for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
+@@ -33758,11 +31599,6 @@
+     // If length is 0 we return true.
+     if (0 >= _tao_seq_len) 
+       return 1;
+-    // Add a check to the length of the sequence
+-    // to make sure it does not exceed the length
+-    // of the stream. (See bug 58.)
+-    if (_tao_seq_len > strm.length())
+-      return 0;
+     // retrieve all the elements
+     CORBA::Boolean _tao_marshal_flag = 1;
+     for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
+@@ -33805,11 +31641,6 @@
+     // If length is 0 we return true.
+     if (0 >= _tao_seq_len) 
+       return 1;
+-    // Add a check to the length of the sequence
+-    // to make sure it does not exceed the length
+-    // of the stream. (See bug 58.)
+-    if (_tao_seq_len > strm.length())
+-      return 0;
+     // retrieve all the elements
+     CORBA::Boolean _tao_marshal_flag = 1;
+     for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
diff --git a/TAO/tao/IFR_Client/diffs/IFR_BasicC.h.diff b/TAO/tao/IFR_Client/diffs/IFR_BasicC.h.diff
index cac4e337f1b..29376d37e6f 100644
--- a/TAO/tao/IFR_Client/diffs/IFR_BasicC.h.diff
+++ b/TAO/tao/IFR_Client/diffs/IFR_BasicC.h.diff
@@ -1,5 +1,5 @@
---- orig/IFR_BasicC.h	Mon Apr 23 20:55:30 2001
-+++ IFR_BasicC.h	Mon Apr 23 20:54:05 2001
+--- orig/IFR_BasicC.h	Tue Apr 24 23:25:50 2001
++++ IFR_BasicC.h	Tue Apr 24 22:38:54 2001
 @@ -1,6 +1,6 @@
  // -*- C++ -*-
  //
@@ -550,7 +550,41 @@
  // Proxy Broker Factory function pointer declarations.
  
  extern TAO_IFR_Client_Export
-@@ -8531,17 +8399,11 @@
+@@ -8502,46 +8370,40 @@
+     CORBA::Object_ptr obj
+   );
+ 
+-// External declarations for undefined interface
++// Declarations for undefined interface
+ // CORBA_FixedDef
+ TAO_IFR_Client_Export
+ CORBA_FixedDef_ptr
+ tao_CORBA_FixedDef_duplicate (
+     CORBA_FixedDef_ptr
+   );
+-extern TAO_IFR_Client_Export
++TAO_IFR_Client_Export
+ void
+ tao_CORBA_FixedDef_release (
+     CORBA_FixedDef_ptr
+   );
+-extern TAO_IFR_Client_Export
++TAO_IFR_Client_Export
+ CORBA_FixedDef_ptr
+ tao_CORBA_FixedDef_nil (
+     void
+   );
+-extern TAO_IFR_Client_Export
++TAO_IFR_Client_Export
+ CORBA_FixedDef_ptr
+ tao_CORBA_FixedDef_narrow (
+     CORBA::Object *,
+     CORBA::Environment &
+   );
+-extern TAO_IFR_Client_Export
++TAO_IFR_Client_Export
+ CORBA::Object *
+ tao_CORBA_FixedDef_upcast (
      void *
    );
  
diff --git a/TAO/tao/IFR_Client/diffs/IFR_BasicC.i.diff b/TAO/tao/IFR_Client/diffs/IFR_BasicC.i.diff
index 54da720b153..cb975c4dcfc 100644
--- a/TAO/tao/IFR_Client/diffs/IFR_BasicC.i.diff
+++ b/TAO/tao/IFR_Client/diffs/IFR_BasicC.i.diff
@@ -1,5 +1,5 @@
---- orig/IFR_BasicC.i	Mon Apr 23 20:55:30 2001
-+++ IFR_BasicC.i	Mon Apr 23 20:05:29 2001
+--- orig/IFR_BasicC.i	Tue Apr 24 23:25:50 2001
++++ IFR_BasicC.i	Tue Apr 24 23:01:36 2001
 @@ -1,6 +1,6 @@
  // -*- C++ -*-
  //
@@ -8,44 +8,7 @@
  
  // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
  // TAO and the TAO IDL Compiler have been developed by:
-@@ -897,9 +897,9 @@
- #if !defined (_CORBA_PRIMITIVEDEF___CI_)
- #define _CORBA_PRIMITIVEDEF___CI_
- 
--ACE_INLINE CORBA_PrimitiveDef_ptr
-+ACE_INLINE CORBA::PrimitiveDef_ptr
- tao_CORBA_PrimitiveDef_duplicate (
--    CORBA_PrimitiveDef_ptr p
-+    CORBA::PrimitiveDef_ptr p
-   )
- {
-   return CORBA_PrimitiveDef::_duplicate (p);
-@@ -907,13 +907,13 @@
- 
- ACE_INLINE void
- tao_CORBA_PrimitiveDef_release (
--    CORBA_PrimitiveDef_ptr p
-+    CORBA::PrimitiveDef_ptr p
-   )
- {
-   CORBA::release (p);
- }
- 
--ACE_INLINE CORBA_PrimitiveDef_ptr
-+ACE_INLINE CORBA::PrimitiveDef_ptr
- tao_CORBA_PrimitiveDef_nil (
-     void
-   )
-@@ -921,7 +921,7 @@
-   return CORBA_PrimitiveDef::_nil ();
- }
- 
--ACE_INLINE CORBA_PrimitiveDef_ptr
-+ACE_INLINE CORBA::PrimitiveDef_ptr
- tao_CORBA_PrimitiveDef_narrow (
-     CORBA::Object *p,
-     CORBA::Environment &ACE_TRY_ENV
-@@ -5096,90 +5096,14 @@
+@@ -4279,82 +4279,6 @@
  
  #endif /* end #if !defined */
  
@@ -127,18 +90,8 @@
 -
  TAO_IFR_Client_Export CORBA::Boolean operator<< (
      TAO_OutputCDR &,
--    const CORBA_PrimitiveDef_ptr
-+    const CORBA::PrimitiveDef_ptr
-   );
- 
- TAO_IFR_Client_Export CORBA::Boolean operator>> (
-     TAO_InputCDR &,
--    CORBA_PrimitiveDef_ptr &
-+    CORBA::PrimitiveDef_ptr &
-   );
- 
- TAO_IFR_Client_Export CORBA::Boolean operator<< (
-@@ -5232,6 +5156,25 @@
+     const CORBA_PrimitiveDef_ptr
+@@ -4415,6 +4339,25 @@
      CORBA_FixedDef_ptr &
    );
  
@@ -164,7 +117,7 @@
  TAO_IFR_Client_Export CORBA::Boolean operator<< (
      TAO_OutputCDR &,
      const CORBA_Repository_ptr
-@@ -5442,6 +5385,25 @@
+@@ -4625,6 +4568,25 @@
  
  #endif /* _TAO_CDR_OP_CORBA_ExcDescriptionSeq_I_ */
  
@@ -190,7 +143,7 @@
  TAO_IFR_Client_Export CORBA::Boolean operator<< (
      TAO_OutputCDR &,
      const CORBA_AttributeDef_ptr
-@@ -5482,6 +5444,44 @@
+@@ -4665,6 +4627,44 @@
    else
      return 0;
    
diff --git a/TAO/tao/IFR_Client/diffs/IFR_ComponentsC.cpp.diff b/TAO/tao/IFR_Client/diffs/IFR_ComponentsC.cpp.diff
index c2474dd590e..924ef6cd258 100644
--- a/TAO/tao/IFR_Client/diffs/IFR_ComponentsC.cpp.diff
+++ b/TAO/tao/IFR_Client/diffs/IFR_ComponentsC.cpp.diff
@@ -1,5 +1,5 @@
---- orig/IFR_ComponentsC.cpp	Mon Apr 23 20:20:22 2001
-+++ IFR_ComponentsC.cpp	Fri Apr 20 03:52:30 2001
+--- orig/IFR_ComponentsC.cpp	Tue Apr 24 23:26:05 2001
++++ IFR_ComponentsC.cpp	Tue Apr 24 23:15:18 2001
 @@ -1,6 +1,6 @@
  // -*- C++ -*-
  //
@@ -17,7 +17,7 @@
  #include "tao/ClientRequestInfo.h"
  #if TAO_HAS_INTERCEPTORS == 1
  #include "tao/RequestInfo_Util.h"
-@@ -13177,7 +13175,7 @@
+@@ -13521,7 +13519,7 @@
    ACE_NTOHL (0x69627574), 
    ACE_NTOHL (0x65730000),  // name = attributes
    CORBA::tk_alias, // typecode kind for typedefs
@@ -26,7 +26,7 @@
      TAO_ENCAP_BYTE_ORDER, // byte order
      41,
      ACE_NTOHL (0x49444c3a), 
-@@ -13200,10 +13198,10 @@
+@@ -13544,10 +13542,10 @@
      ACE_NTOHL (0x6e536571), 
      ACE_NTOHL (0x0),  // name = CORBA_AttrDescriptionSeq
      CORBA::tk_sequence, // typecode kind
@@ -39,7 +39,7 @@
          TAO_ENCAP_BYTE_ORDER, // byte order
          43,
          ACE_NTOHL (0x49444c3a), 
-@@ -13255,23 +13253,24 @@
+@@ -13599,23 +13597,24 @@
          ACE_NTOHL (0x6d6f6465), 
          ACE_NTOHL (0x0),  // name = mode
          CORBA::tk_enum, // typecode kind
@@ -72,7 +72,7 @@
            2, // member count
            12,
            ACE_NTOHL (0x41545452), 
-@@ -18943,7 +18942,7 @@
+@@ -19459,7 +19458,7 @@
    ACE_NTOHL (0x6174696f), 
    ACE_NTOHL (0x6e730000),  // name = operations
    CORBA::tk_alias, // typecode kind for typedefs
@@ -81,7 +81,7 @@
      TAO_ENCAP_BYTE_ORDER, // byte order
      39,
      ACE_NTOHL (0x49444c3a), 
-@@ -18964,10 +18963,10 @@
+@@ -19480,10 +19479,10 @@
      ACE_NTOHL (0x696f6e53), 
      ACE_NTOHL (0x65710000),  // name = CORBA_OpDescriptionSeq
      CORBA::tk_sequence, // typecode kind
@@ -94,7 +94,7 @@
          TAO_ENCAP_BYTE_ORDER, // byte order
          43,
          ACE_NTOHL (0x49444c3a), 
-@@ -19019,23 +19018,24 @@
+@@ -19535,23 +19534,24 @@
          ACE_NTOHL (0x6d6f6465), 
          ACE_NTOHL (0x0),  // name = mode
          CORBA::tk_enum, // typecode kind
@@ -127,7 +127,7 @@
            2, // member count
            10,
            ACE_NTOHL (0x4f505f4e), 
-@@ -19082,7 +19082,7 @@
+@@ -19598,7 +19598,7 @@
          ACE_NTOHL (0x6d657465), 
          ACE_NTOHL (0x72730000),  // name = parameters
          CORBA::tk_alias, // typecode kind for typedefs
@@ -136,7 +136,7 @@
            TAO_ENCAP_BYTE_ORDER, // byte order
            40,
            ACE_NTOHL (0x49444c3a), 
-@@ -19103,10 +19103,10 @@
+@@ -19619,10 +19619,10 @@
            ACE_NTOHL (0x74696f6e), 
            ACE_NTOHL (0x53657100),  // name = CORBA_ParDescriptionSeq
            CORBA::tk_sequence, // typecode kind
@@ -149,7 +149,7 @@
                TAO_ENCAP_BYTE_ORDER, // byte order
                43,
                ACE_NTOHL (0x49444c3a), 
-@@ -19165,23 +19165,24 @@
+@@ -19681,23 +19681,24 @@
                ACE_NTOHL (0x6d6f6465), 
                ACE_NTOHL (0x0),  // name = mode
                CORBA::tk_enum, // typecode kind
@@ -182,7 +182,7 @@
                  3, // member count
                  9,
                  ACE_NTOHL (0x50415241), 
-@@ -19290,7 +19291,7 @@
+@@ -19806,7 +19807,7 @@
    ACE_NTOHL (0x69627574), 
    ACE_NTOHL (0x65730000),  // name = attributes
    CORBA::tk_alias, // typecode kind for typedefs
@@ -191,7 +191,7 @@
      TAO_ENCAP_BYTE_ORDER, // byte order
      41,
      ACE_NTOHL (0x49444c3a), 
-@@ -19313,10 +19314,10 @@
+@@ -19829,10 +19830,10 @@
      ACE_NTOHL (0x6e536571), 
      ACE_NTOHL (0x0),  // name = CORBA_AttrDescriptionSeq
      CORBA::tk_sequence, // typecode kind
@@ -204,7 +204,7 @@
          TAO_ENCAP_BYTE_ORDER, // byte order
          43,
          ACE_NTOHL (0x49444c3a), 
-@@ -19368,23 +19369,24 @@
+@@ -19884,23 +19885,24 @@
          ACE_NTOHL (0x6d6f6465), 
          ACE_NTOHL (0x0),  // name = mode
          CORBA::tk_enum, // typecode kind
@@ -237,3 +237,147 @@
            2, // member count
            12,
            ACE_NTOHL (0x41545452), 
+@@ -22296,11 +22298,6 @@
+     // If length is 0 we return true.
+     if (0 >= _tao_seq_len) 
+       return 1;
+-    // Add a check to the length of the sequence
+-    // to make sure it does not exceed the length
+-    // of the stream. (See bug 58.)
+-    if (_tao_seq_len > strm.length())
+-      return 0;
+     // retrieve all the elements
+     CORBA::Boolean _tao_marshal_flag = 1;
+     for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
+@@ -22343,11 +22340,6 @@
+     // If length is 0 we return true.
+     if (0 >= _tao_seq_len) 
+       return 1;
+-    // Add a check to the length of the sequence
+-    // to make sure it does not exceed the length
+-    // of the stream. (See bug 58.)
+-    if (_tao_seq_len > strm.length())
+-      return 0;
+     // retrieve all the elements
+     CORBA::Boolean _tao_marshal_flag = 1;
+     for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
+@@ -22390,11 +22382,6 @@
+     // If length is 0 we return true.
+     if (0 >= _tao_seq_len) 
+       return 1;
+-    // Add a check to the length of the sequence
+-    // to make sure it does not exceed the length
+-    // of the stream. (See bug 58.)
+-    if (_tao_seq_len > strm.length())
+-      return 0;
+     // retrieve all the elements
+     CORBA::Boolean _tao_marshal_flag = 1;
+     for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
+@@ -22437,11 +22424,6 @@
+     // If length is 0 we return true.
+     if (0 >= _tao_seq_len) 
+       return 1;
+-    // Add a check to the length of the sequence
+-    // to make sure it does not exceed the length
+-    // of the stream. (See bug 58.)
+-    if (_tao_seq_len > strm.length())
+-      return 0;
+     // retrieve all the elements
+     CORBA::Boolean _tao_marshal_flag = 1;
+     for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
+@@ -22484,11 +22466,6 @@
+     // If length is 0 we return true.
+     if (0 >= _tao_seq_len) 
+       return 1;
+-    // Add a check to the length of the sequence
+-    // to make sure it does not exceed the length
+-    // of the stream. (See bug 58.)
+-    if (_tao_seq_len > strm.length())
+-      return 0;
+     // retrieve all the elements
+     CORBA::Boolean _tao_marshal_flag = 1;
+     for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
+@@ -22531,11 +22508,6 @@
+     // If length is 0 we return true.
+     if (0 >= _tao_seq_len) 
+       return 1;
+-    // Add a check to the length of the sequence
+-    // to make sure it does not exceed the length
+-    // of the stream. (See bug 58.)
+-    if (_tao_seq_len > strm.length())
+-      return 0;
+     // retrieve all the elements
+     CORBA::Boolean _tao_marshal_flag = 1;
+     for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
+@@ -22578,11 +22550,6 @@
+     // If length is 0 we return true.
+     if (0 >= _tao_seq_len) 
+       return 1;
+-    // Add a check to the length of the sequence
+-    // to make sure it does not exceed the length
+-    // of the stream. (See bug 58.)
+-    if (_tao_seq_len > strm.length())
+-      return 0;
+     // retrieve all the elements
+     CORBA::Boolean _tao_marshal_flag = 1;
+     for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
+@@ -22625,11 +22592,6 @@
+     // If length is 0 we return true.
+     if (0 >= _tao_seq_len) 
+       return 1;
+-    // Add a check to the length of the sequence
+-    // to make sure it does not exceed the length
+-    // of the stream. (See bug 58.)
+-    if (_tao_seq_len > strm.length())
+-      return 0;
+     // retrieve all the elements
+     CORBA::Boolean _tao_marshal_flag = 1;
+     for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
+@@ -22672,11 +22634,6 @@
+     // If length is 0 we return true.
+     if (0 >= _tao_seq_len) 
+       return 1;
+-    // Add a check to the length of the sequence
+-    // to make sure it does not exceed the length
+-    // of the stream. (See bug 58.)
+-    if (_tao_seq_len > strm.length())
+-      return 0;
+     // retrieve all the elements
+     CORBA::Boolean _tao_marshal_flag = 1;
+     for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
+@@ -22719,11 +22676,6 @@
+     // If length is 0 we return true.
+     if (0 >= _tao_seq_len) 
+       return 1;
+-    // Add a check to the length of the sequence
+-    // to make sure it does not exceed the length
+-    // of the stream. (See bug 58.)
+-    if (_tao_seq_len > strm.length())
+-      return 0;
+     // retrieve all the elements
+     CORBA::Boolean _tao_marshal_flag = 1;
+     for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
+@@ -22874,11 +22826,6 @@
+     // If length is 0 we return true.
+     if (0 >= _tao_seq_len) 
+       return 1;
+-    // Add a check to the length of the sequence
+-    // to make sure it does not exceed the length
+-    // of the stream. (See bug 58.)
+-    if (_tao_seq_len > strm.length())
+-      return 0;
+     // retrieve all the elements
+     CORBA::Boolean _tao_marshal_flag = 1;
+     for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
+@@ -22921,11 +22868,6 @@
+     // If length is 0 we return true.
+     if (0 >= _tao_seq_len) 
+       return 1;
+-    // Add a check to the length of the sequence
+-    // to make sure it does not exceed the length
+-    // of the stream. (See bug 58.)
+-    if (_tao_seq_len > strm.length())
+-      return 0;
+     // retrieve all the elements
+     CORBA::Boolean _tao_marshal_flag = 1;
+     for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
diff --git a/TAO/tao/IFR_Client/diffs/IFR_ComponentsC.h.diff b/TAO/tao/IFR_Client/diffs/IFR_ComponentsC.h.diff
index 4b66aa74e01..343c3c45859 100644
--- a/TAO/tao/IFR_Client/diffs/IFR_ComponentsC.h.diff
+++ b/TAO/tao/IFR_Client/diffs/IFR_ComponentsC.h.diff
@@ -1,5 +1,5 @@
---- orig/IFR_ComponentsC.h	Mon Apr 23 20:20:21 2001
-+++ IFR_ComponentsC.h	Fri Apr 20 03:51:02 2001
+--- orig/IFR_ComponentsC.h	Tue Apr 24 23:26:05 2001
++++ IFR_ComponentsC.h	Tue Apr 24 13:44:47 2001
 @@ -1,6 +1,6 @@
  // -*- C++ -*-
  //
diff --git a/TAO/tao/IFR_Client/diffs/IFR_ComponentsC.i.diff b/TAO/tao/IFR_Client/diffs/IFR_ComponentsC.i.diff
index d917da2a475..6c7f93c7a8c 100644
--- a/TAO/tao/IFR_Client/diffs/IFR_ComponentsC.i.diff
+++ b/TAO/tao/IFR_Client/diffs/IFR_ComponentsC.i.diff
@@ -1,5 +1,5 @@
---- orig/IFR_ComponentsC.i	Mon Apr 23 20:20:22 2001
-+++ IFR_ComponentsC.i	Fri Apr 20 03:51:28 2001
+--- orig/IFR_ComponentsC.i	Tue Apr 24 23:26:05 2001
++++ IFR_ComponentsC.i	Tue Apr 24 23:14:52 2001
 @@ -1,6 +1,6 @@
  // -*- C++ -*-
  //
diff --git a/TAO/tao/IFR_Client/diffs/IFR_ExtendedC.cpp.diff b/TAO/tao/IFR_Client/diffs/IFR_ExtendedC.cpp.diff
index 2de6399d7a3..a740045e43c 100644
--- a/TAO/tao/IFR_Client/diffs/IFR_ExtendedC.cpp.diff
+++ b/TAO/tao/IFR_Client/diffs/IFR_ExtendedC.cpp.diff
@@ -1,5 +1,5 @@
---- orig/IFR_ExtendedC.cpp	Mon Apr 23 20:20:13 2001
-+++ IFR_ExtendedC.cpp	Mon Apr 23 20:07:22 2001
+--- orig/IFR_ExtendedC.cpp	Tue Apr 24 23:25:56 2001
++++ IFR_ExtendedC.cpp	Tue Apr 24 23:09:09 2001
 @@ -1,6 +1,6 @@
  // -*- C++ -*-
  //
@@ -58,10 +58,10 @@
 -TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_Visibility, &_tc_TAO_tc_CORBA_Visibility)
 -TAO_NAMESPACE_END
 -
- // *************************************************************
- // Operations for class CORBA_FixedDef_var
- // *************************************************************
-@@ -1349,7 +1313,7 @@
+ CORBA_FixedDef_ptr
+ tao_CORBA_FixedDef_duplicate (
+     CORBA_FixedDef_ptr p
+@@ -1392,7 +1356,7 @@
      return CORBA_FixedDef::_nil ();
    if (! obj->_is_local ())
      {
@@ -70,7 +70,7 @@
        ACE_CHECK_RETURN (CORBA_FixedDef::_nil ());
        if (is_a == 0)
          return CORBA_FixedDef::_nil ();
-@@ -1417,9 +1381,9 @@
+@@ -1460,9 +1424,9 @@
  CORBA::Boolean CORBA_FixedDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
  {
    if (
@@ -83,7 +83,7 @@
      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
    return 1; // success using local knowledge
    else
-@@ -1468,7 +1432,7 @@
+@@ -1511,7 +1475,7 @@
  
  const char* CORBA_FixedDef::_interface_repository_id (void) const
  {
@@ -92,7 +92,7 @@
  }
  
  CORBA::UShort CORBA_FixedDef::digits (
-@@ -1543,139 +1507,6 @@
+@@ -1586,139 +1550,6 @@
      );
  }
  
@@ -232,7 +232,7 @@
  void CORBA_ValueMember::_tao_any_destructor (void *x)
  {
    CORBA_ValueMember *tmp = ACE_static_cast (CORBA_ValueMember*,x);
-@@ -1778,136 +1609,6 @@
+@@ -1821,136 +1652,6 @@
  
  #endif /* end #if !defined */
  
@@ -366,10 +366,10 @@
 -CORBA::TypeCode_ptr _tc_CORBA_ValueMemberSeq =
 -  &_tc_TAO_tc_CORBA_ValueMemberSeq;
 -
- // *************************************************************
- // Operations for class CORBA_ValueMemberDef_var
- // *************************************************************
-@@ -3443,7 +3144,7 @@
+ CORBA_ValueMemberDef_ptr
+ tao_CORBA_ValueMemberDef_duplicate (
+     CORBA_ValueMemberDef_ptr p
+@@ -3529,7 +3230,7 @@
      return CORBA_ValueMemberDef::_nil ();
    if (! obj->_is_local ())
      {
@@ -378,7 +378,7 @@
        ACE_CHECK_RETURN (CORBA_ValueMemberDef::_nil ());
        if (is_a == 0)
          return CORBA_ValueMemberDef::_nil ();
-@@ -3511,9 +3212,9 @@
+@@ -3597,9 +3298,9 @@
  CORBA::Boolean CORBA_ValueMemberDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
  {
    if (
@@ -391,7 +391,7 @@
      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
    return 1; // success using local knowledge
    else
-@@ -3562,7 +3263,7 @@
+@@ -3648,7 +3349,7 @@
  
  const char* CORBA_ValueMemberDef::_interface_repository_id (void) const
  {
@@ -400,7 +400,7 @@
  }
  
  CORBA::TypeCode_ptr CORBA_ValueMemberDef::type (
-@@ -3654,40 +3355,6 @@
+@@ -3740,40 +3441,6 @@
      );
  }
  
@@ -438,10 +438,10 @@
 -CORBA::TypeCode_ptr _tc_CORBA_ValueMemberDef =
 -  &_tc_TAO_tc_CORBA_ValueMemberDef;
 -
- // *************************************************************
- // Operations for class CORBA_ValueDef_var
- // *************************************************************
-@@ -9004,7 +8671,7 @@
+ CORBA_ValueDef_ptr
+ tao_CORBA_ValueDef_duplicate (
+     CORBA_ValueDef_ptr p
+@@ -9133,7 +8800,7 @@
      return CORBA_ValueDef::_nil ();
    if (! obj->_is_local ())
      {
@@ -450,7 +450,7 @@
        ACE_CHECK_RETURN (CORBA_ValueDef::_nil ());
        if (is_a == 0)
          return CORBA_ValueDef::_nil ();
-@@ -9072,11 +8739,11 @@
+@@ -9201,11 +8868,11 @@
  CORBA::Boolean CORBA_ValueDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
  {
    if (
@@ -467,7 +467,7 @@
      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
    return 1; // success using local knowledge
    else
-@@ -9149,7 +8816,7 @@
+@@ -9278,7 +8945,7 @@
  
  const char* CORBA_ValueDef::_interface_repository_id (void) const
  {
@@ -476,7 +476,7 @@
  }
  
  CORBA_InterfaceDefSeq * CORBA_ValueDef::supported_interfaces (
-@@ -9431,7 +9098,7 @@
+@@ -9560,7 +9227,7 @@
    ACE_NTOHL (0x6f6d672e), 
    ACE_NTOHL (0x6f72672f), 
    ACE_NTOHL (0x434f5242), 
@@ -485,7 +485,7 @@
    ACE_NTOHL (0x6c756544), 
    ACE_NTOHL (0x65662f46), 
    ACE_NTOHL (0x756c6c56), 
-@@ -9439,7 +9106,7 @@
+@@ -9568,7 +9235,7 @@
    ACE_NTOHL (0x44657363), 
    ACE_NTOHL (0x72697074), 
    ACE_NTOHL (0x696f6e3a), 
@@ -494,7 +494,7 @@
    21,
    ACE_NTOHL (0x46756c6c), 
    ACE_NTOHL (0x56616c75), 
-@@ -9451,12 +9118,49 @@
+@@ -9580,12 +9247,49 @@
    5,
    ACE_NTOHL (0x6e616d65), 
    ACE_NTOHL (0x0),  // name = name
@@ -546,7 +546,7 @@
    12,
    ACE_NTOHL (0x69735f61), 
    ACE_NTOHL (0x62737472), 
-@@ -9473,85 +9177,194 @@
+@@ -9602,85 +9306,194 @@
    ACE_NTOHL (0x64656669), 
    ACE_NTOHL (0x6e65645f), 
    ACE_NTOHL (0x696e0000),  // name = defined_in
@@ -763,7 +763,7 @@
          7,
          ACE_NTOHL (0x72657375), 
          ACE_NTOHL (0x6c740000),  // name = result
-@@ -9593,29 +9406,67 @@
+@@ -9722,29 +9535,67 @@
          ACE_NTOHL (0x65787473), 
          ACE_NTOHL (0x0),  // name = contexts
          CORBA::tk_alias, // typecode kind for typedefs
@@ -840,7 +840,7 @@
              0U,
  
  
-@@ -9624,58 +9475,74 @@
+@@ -9753,58 +9604,74 @@
          ACE_NTOHL (0x6d657465), 
          ACE_NTOHL (0x72730000),  // name = parameters
          CORBA::tk_alias, // typecode kind for typedefs
@@ -937,7 +937,7 @@
                5,
                ACE_NTOHL (0x74797065), 
                ACE_NTOHL (0x0),  // name = type
-@@ -9686,22 +9553,20 @@
+@@ -9815,22 +9682,20 @@
                ACE_NTOHL (0x5f646566), 
                ACE_NTOHL (0x0),  // name = type_def
                CORBA::tk_objref, // typecode kind
@@ -966,7 +966,7 @@
  
                5,
                ACE_NTOHL (0x6d6f6465), 
-@@ -9747,73 +9612,145 @@
+@@ -9876,73 +9741,145 @@
          ACE_NTOHL (0x7074696f), 
          ACE_NTOHL (0x6e730000),  // name = exceptions
          CORBA::tk_alias, // typecode kind for typedefs
@@ -1134,7 +1134,7 @@
                5,
                ACE_NTOHL (0x74797065), 
                ACE_NTOHL (0x0),  // name = type
-@@ -9832,75 +9769,146 @@
+@@ -9961,75 +9898,146 @@
    ACE_NTOHL (0x69627574), 
    ACE_NTOHL (0x65730000),  // name = attributes
    CORBA::tk_alias, // typecode kind for typedefs
@@ -1304,7 +1304,7 @@
          5,
          ACE_NTOHL (0x74797065), 
          ACE_NTOHL (0x0),  // name = type
-@@ -9946,69 +9954,139 @@
+@@ -10075,69 +10083,139 @@
    ACE_NTOHL (0x6d656d62), 
    ACE_NTOHL (0x65727300),  // name = members
    CORBA::tk_alias, // typecode kind for typedefs
@@ -1464,7 +1464,7 @@
          5,
          ACE_NTOHL (0x74797065), 
          ACE_NTOHL (0x0),  // name = type
-@@ -10019,22 +10097,20 @@
+@@ -10148,22 +10226,20 @@
          ACE_NTOHL (0x5f646566), 
          ACE_NTOHL (0x0),  // name = type_def
          CORBA::tk_objref, // typecode kind
@@ -1493,7 +1493,7 @@
  
          7,
          ACE_NTOHL (0x61636365), 
-@@ -10069,101 +10145,112 @@
+@@ -10198,101 +10274,112 @@
    ACE_NTOHL (0x7a657273), 
    ACE_NTOHL (0x0),  // name = initializers
    CORBA::tk_alias, // typecode kind for typedefs
@@ -1646,7 +1646,7 @@
                5,
                ACE_NTOHL (0x74797065), 
                ACE_NTOHL (0x0),  // name = type
-@@ -10174,22 +10261,20 @@
+@@ -10303,22 +10390,20 @@
                ACE_NTOHL (0x5f646566), 
                ACE_NTOHL (0x0),  // name = type_def
                CORBA::tk_objref, // typecode kind
@@ -1675,7 +1675,7 @@
  
  
              0U,
-@@ -10198,9 +10283,27 @@
+@@ -10327,9 +10412,27 @@
          5,
          ACE_NTOHL (0x6e616d65), 
          ACE_NTOHL (0x0),  // name = name
@@ -1703,7 +1703,7 @@
        0U,
  
  
-@@ -10212,31 +10315,48 @@
+@@ -10341,31 +10444,48 @@
    ACE_NTOHL (0x61636573), 
    ACE_NTOHL (0x0),  // name = supported_interfaces
    CORBA::tk_alias, // typecode kind for typedefs
@@ -1762,7 +1762,7 @@
        0U,
  
  
-@@ -10248,31 +10368,48 @@
+@@ -10377,31 +10497,48 @@
    ACE_NTOHL (0x6c756573), 
    ACE_NTOHL (0x0),  // name = abstract_base_values
    CORBA::tk_alias, // typecode kind for typedefs
@@ -1821,7 +1821,7 @@
        0U,
  
  
-@@ -10287,8 +10424,27 @@
+@@ -10416,8 +10553,27 @@
    ACE_NTOHL (0x62617365), 
    ACE_NTOHL (0x5f76616c), 
    ACE_NTOHL (0x75650000),  // name = base_value
@@ -1849,7 +1849,7 @@
    5,
    ACE_NTOHL (0x74797065), 
    ACE_NTOHL (0x0),  // name = type
-@@ -10417,188 +10573,6 @@
+@@ -10546,188 +10702,6 @@
      );
  }
  
@@ -2038,7 +2038,7 @@
  void CORBA_ValueDescription::_tao_any_destructor (void *x)
  {
    CORBA_ValueDescription *tmp = ACE_static_cast (CORBA_ValueDescription*,x);
-@@ -11392,7 +11366,7 @@
+@@ -11564,7 +11538,7 @@
      return CORBA_ValueBoxDef::_nil ();
    if (! obj->_is_local ())
      {
@@ -2047,7 +2047,7 @@
        ACE_CHECK_RETURN (CORBA_ValueBoxDef::_nil ());
        if (is_a == 0)
          return CORBA_ValueBoxDef::_nil ();
-@@ -11460,11 +11434,11 @@
+@@ -11632,11 +11606,11 @@
  CORBA::Boolean CORBA_ValueBoxDef::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV)
  {
    if (
@@ -2064,7 +2064,7 @@
      (!ACE_OS::strcmp ((char *)value, "IDL:omg.org/CORBA/Object:1.0")))
    return 1; // success using local knowledge
    else
-@@ -11537,7 +11511,7 @@
+@@ -11709,7 +11683,7 @@
  
  const char* CORBA_ValueBoxDef::_interface_repository_id (void) const
  {
@@ -2073,7 +2073,7 @@
  }
  
  CORBA_IDLType_ptr CORBA_ValueBoxDef::original_type_def (
-@@ -11576,45 +11550,13 @@
+@@ -11748,45 +11722,13 @@
      );
  }
  
@@ -2120,7 +2120,7 @@
          TAO_ENCAP_BYTE_ORDER,
          stream.begin (),
          1,
-@@ -11631,7 +11573,7 @@
+@@ -11803,7 +11745,7 @@
      _tao_elem = CORBA_FixedDef::_nil ();
      CORBA::TypeCode_var type = _tao_any.type ();
      
@@ -2129,7 +2129,7 @@
      ACE_TRY_CHECK;
      
      if (!result)
-@@ -11644,7 +11586,7 @@
+@@ -11816,7 +11758,7 @@
      if (stream >> _tao_elem)
      {
        ((CORBA::Any *)&_tao_any)->_tao_replace (
@@ -2138,7 +2138,7 @@
            1,
            _tao_elem,
            CORBA_FixedDef::_tao_any_destructor
-@@ -11674,7 +11616,7 @@
+@@ -11846,7 +11788,7 @@
    TAO_OutputCDR stream;
    stream << _tao_elem;
    _tao_any._tao_replace (
@@ -2147,7 +2147,7 @@
        TAO_ENCAP_BYTE_ORDER,
        stream.begin ()
      );
-@@ -11685,7 +11627,7 @@
+@@ -11857,7 +11799,7 @@
    TAO_OutputCDR stream;
    stream << *_tao_elem;
    _tao_any._tao_replace (
@@ -2156,7 +2156,7 @@
        TAO_ENCAP_BYTE_ORDER,
        stream.begin (),
        1,
-@@ -11706,7 +11648,7 @@
+@@ -11878,7 +11820,7 @@
    {
      CORBA::TypeCode_var type = _tao_any.type ();
      
@@ -2165,7 +2165,7 @@
      ACE_TRY_CHECK;
      
      if (!result)
-@@ -11731,7 +11673,7 @@
+@@ -11903,7 +11845,7 @@
        if (stream >> *tmp)
        {
          ((CORBA::Any *)&_tao_any)->_tao_replace (
@@ -2174,7 +2174,7 @@
              1,
              ACE_static_cast (void *, tmp),
              CORBA_ValueMember::_tao_any_destructor
-@@ -11761,7 +11703,7 @@
+@@ -11933,7 +11875,7 @@
    if (stream << _tao_elem)
    {
      _tao_any._tao_replace (
@@ -2183,7 +2183,7 @@
          TAO_ENCAP_BYTE_ORDER,
          stream.begin ()
        );
-@@ -11773,7 +11715,7 @@
+@@ -11945,7 +11887,7 @@
    TAO_OutputCDR stream;
    stream << *_tao_elem;
    _tao_any._tao_replace (
@@ -2192,7 +2192,7 @@
        TAO_ENCAP_BYTE_ORDER,
        stream.begin (),
        1,
-@@ -11797,7 +11739,7 @@
+@@ -11969,7 +11911,7 @@
    {
      CORBA::TypeCode_var type = _tao_any.type ();
      
@@ -2201,7 +2201,7 @@
      ACE_TRY_CHECK;
      
      if (!result)
-@@ -11822,7 +11764,7 @@
+@@ -11994,7 +11936,7 @@
        if (stream >> *tmp)
        {
          ((CORBA::Any *)&_tao_any)->_tao_replace (
@@ -2210,7 +2210,7 @@
              1,
              ACE_static_cast (void *, tmp),
              CORBA_ValueMemberSeq::_tao_any_destructor
-@@ -11849,7 +11791,7 @@
+@@ -12021,7 +11963,7 @@
    if (stream << _tao_elem)
    {
      _tao_any._tao_replace (
@@ -2219,7 +2219,7 @@
          TAO_ENCAP_BYTE_ORDER,
          stream.begin (),
          1,
-@@ -11866,7 +11808,7 @@
+@@ -12038,7 +11980,7 @@
      _tao_elem = CORBA_ValueMemberDef::_nil ();
      CORBA::TypeCode_var type = _tao_any.type ();
      
@@ -2228,7 +2228,7 @@
      ACE_TRY_CHECK;
      
      if (!result)
-@@ -11879,7 +11821,7 @@
+@@ -12051,7 +11993,7 @@
      if (stream >> _tao_elem)
      {
        ((CORBA::Any *)&_tao_any)->_tao_replace (
@@ -2237,7 +2237,7 @@
            1,
            _tao_elem,
            CORBA_ValueMemberDef::_tao_any_destructor
-@@ -11910,7 +11852,7 @@
+@@ -12082,7 +12024,7 @@
    if (stream << _tao_elem)
    {
      _tao_any._tao_replace (
@@ -2246,7 +2246,7 @@
          TAO_ENCAP_BYTE_ORDER,
          stream.begin (),
          1,
-@@ -11927,7 +11869,7 @@
+@@ -12099,7 +12041,7 @@
      _tao_elem = CORBA_ValueDef::_nil ();
      CORBA::TypeCode_var type = _tao_any.type ();
      
@@ -2255,7 +2255,7 @@
      ACE_TRY_CHECK;
      
      if (!result)
-@@ -11940,7 +11882,7 @@
+@@ -12112,7 +12054,7 @@
      if (stream >> _tao_elem)
      {
        ((CORBA::Any *)&_tao_any)->_tao_replace (
@@ -2264,7 +2264,7 @@
            1,
            _tao_elem,
            CORBA_ValueDef::_tao_any_destructor
-@@ -12053,7 +11995,7 @@
+@@ -12225,7 +12167,7 @@
    TAO_OutputCDR stream;
    stream << _tao_elem;
    _tao_any._tao_replace (
@@ -2273,7 +2273,7 @@
        TAO_ENCAP_BYTE_ORDER,
        stream.begin ()
      );
-@@ -12064,7 +12006,7 @@
+@@ -12236,7 +12178,7 @@
    TAO_OutputCDR stream;
    stream << *_tao_elem;
    _tao_any._tao_replace (
@@ -2282,7 +2282,7 @@
        TAO_ENCAP_BYTE_ORDER,
        stream.begin (),
        1,
-@@ -12085,7 +12027,7 @@
+@@ -12257,7 +12199,7 @@
    {
      CORBA::TypeCode_var type = _tao_any.type ();
      
@@ -2291,7 +2291,7 @@
      ACE_TRY_CHECK;
      
      if (!result)
-@@ -12110,7 +12052,7 @@
+@@ -12282,7 +12224,7 @@
        if (stream >> *tmp)
        {
          ((CORBA::Any *)&_tao_any)->_tao_replace (
@@ -2300,7 +2300,7 @@
              1,
              ACE_static_cast (void *, tmp),
              CORBA_ValueDescription::_tao_any_destructor
-@@ -12137,7 +12079,7 @@
+@@ -12309,7 +12251,7 @@
    if (stream << _tao_elem)
    {
      _tao_any._tao_replace (
@@ -2309,7 +2309,7 @@
          TAO_ENCAP_BYTE_ORDER,
          stream.begin (),
          1,
-@@ -12154,7 +12096,7 @@
+@@ -12326,7 +12268,7 @@
      _tao_elem = CORBA_ValueBoxDef::_nil ();
      CORBA::TypeCode_var type = _tao_any.type ();
      
@@ -2318,7 +2318,7 @@
      ACE_TRY_CHECK;
      
      if (!result)
-@@ -12167,7 +12109,7 @@
+@@ -12339,7 +12281,7 @@
      if (stream >> _tao_elem)
      {
        ((CORBA::Any *)&_tao_any)->_tao_replace (
@@ -2327,3 +2327,15 @@
            1,
            _tao_elem,
            CORBA_ValueBoxDef::_tao_any_destructor
+@@ -12431,11 +12373,6 @@
+     // If length is 0 we return true.
+     if (0 >= _tao_seq_len) 
+       return 1;
+-    // Add a check to the length of the sequence
+-    // to make sure it does not exceed the length
+-    // of the stream. (See bug 58.)
+-    if (_tao_seq_len > strm.length())
+-      return 0;
+     // retrieve all the elements
+     CORBA::Boolean _tao_marshal_flag = 1;
+     for (CORBA::ULong i = 0; i < _tao_sequence.length () && _tao_marshal_flag; i++)
diff --git a/TAO/tao/IFR_Client/diffs/IFR_ExtendedC.h.diff b/TAO/tao/IFR_Client/diffs/IFR_ExtendedC.h.diff
index bdeb2537ea0..2cb48378045 100644
--- a/TAO/tao/IFR_Client/diffs/IFR_ExtendedC.h.diff
+++ b/TAO/tao/IFR_Client/diffs/IFR_ExtendedC.h.diff
@@ -1,5 +1,5 @@
---- orig/IFR_ExtendedC.h	Mon Apr 23 20:20:13 2001
-+++ IFR_ExtendedC.h	Mon Apr 23 20:07:13 2001
+--- orig/IFR_ExtendedC.h	Tue Apr 24 23:25:56 2001
++++ IFR_ExtendedC.h	Tue Apr 24 13:44:48 2001
 @@ -1,6 +1,6 @@
  // -*- C++ -*-
  //
diff --git a/TAO/tao/IFR_Client/diffs/IFR_ExtendedC.i.diff b/TAO/tao/IFR_Client/diffs/IFR_ExtendedC.i.diff
index b43185312f2..b5acef0bafa 100644
--- a/TAO/tao/IFR_Client/diffs/IFR_ExtendedC.i.diff
+++ b/TAO/tao/IFR_Client/diffs/IFR_ExtendedC.i.diff
@@ -1,5 +1,5 @@
---- orig/IFR_ExtendedC.i	Mon Apr 23 20:20:13 2001
-+++ IFR_ExtendedC.i	Fri Apr 20 03:16:47 2001
+--- orig/IFR_ExtendedC.i	Tue Apr 24 23:25:56 2001
++++ IFR_ExtendedC.i	Tue Apr 24 23:05:02 2001
 @@ -1,6 +1,6 @@
  // -*- C++ -*-
  //