ChangeLogTag:Wed Apr 6 14:03:57 2005 Ossama Othman <ossama@dre.vanderbilt.edu>

4 files changed, 389 insertions, 252 deletions

diff --git a/TAO/tao/IFR_Client/IFR_BaseA.cpp b/TAO/tao/IFR_Client/IFR_BaseA.cpp
index 33300c21898..eed489ff409 100644
--- a/TAO/tao/IFR_Client/IFR_BaseA.cpp
+++ b/TAO/tao/IFR_Client/IFR_BaseA.cpp
@@ -29,7 +29,6 @@
 #include "tao/Null_RefCount_Policy.h"
 #include "tao/TypeCode_Constants.h"
 #include "tao/Alias_TypeCode.h"
-#include "tao/TypeCode_Enumerator.h"
 #include "tao/Enum_TypeCode.h"
 #include "tao/Objref_TypeCode.h"
 #include "tao/Sequence_TypeCode.h"
@@ -45,6 +44,8 @@
 // be/be_visitor_typecode/alias_typecode.cpp:31
 
 static TAO::TypeCode::Alias<char const *,
+                            CORBA::TypeCode_ptr const *,
+                            CORBA::tk_alias,
                             TAO::Null_RefCount_Policy>
   _tao_tc_CORBA_ScopedName (
     "IDL:omg.org/CORBA/ScopedName:1.0",
@@ -62,49 +63,49 @@ namespace CORBA
 // TAO_IDL - Generated from
 // be/be_visitor_typecode/enum_typecode.cpp:34
 
-static TAO::TypeCode::Enumerator<char const *> const _tao_enumerators_CORBA_DefinitionKind[] =
+static char const * const _tao_enumerators_CORBA_DefinitionKind[] =
   {
-    { "dk_none" },
-    { "dk_all" },
-    { "dk_Attribute" },
-    { "dk_Constant" },
-    { "dk_Exception" },
-    { "dk_Interface" },
-    { "dk_Module" },
-    { "dk_Operation" },
-    { "dk_Typedef" },
-    { "dk_Alias" },
-    { "dk_Struct" },
-    { "dk_Union" },
-    { "dk_Enum" },
-    { "dk_Primitive" },
-    { "dk_String" },
-    { "dk_Sequence" },
-    { "dk_Array" },
-    { "dk_Repository" },
-    { "dk_Wstring" },
-    { "dk_Fixed" },
-    { "dk_Value" },
-    { "dk_ValueBox" },
-    { "dk_ValueMember" },
-    { "dk_Native" },
-    { "dk_AbstractInterface" },
-    { "dk_LocalInterface" },
-    { "dk_Component" },
-    { "dk_Home" },
-    { "dk_Factory" },
-    { "dk_Finder" },
-    { "dk_Emits" },
-    { "dk_Publishes" },
-    { "dk_Consumes" },
-    { "dk_Provides" },
-    { "dk_Uses" },
-    { "dk_Event" }
+    "dk_none",
+    "dk_all",
+    "dk_Attribute",
+    "dk_Constant",
+    "dk_Exception",
+    "dk_Interface",
+    "dk_Module",
+    "dk_Operation",
+    "dk_Typedef",
+    "dk_Alias",
+    "dk_Struct",
+    "dk_Union",
+    "dk_Enum",
+    "dk_Primitive",
+    "dk_String",
+    "dk_Sequence",
+    "dk_Array",
+    "dk_Repository",
+    "dk_Wstring",
+    "dk_Fixed",
+    "dk_Value",
+    "dk_ValueBox",
+    "dk_ValueMember",
+    "dk_Native",
+    "dk_AbstractInterface",
+    "dk_LocalInterface",
+    "dk_Component",
+    "dk_Home",
+    "dk_Factory",
+    "dk_Finder",
+    "dk_Emits",
+    "dk_Publishes",
+    "dk_Consumes",
+    "dk_Provides",
+    "dk_Uses",
+    "dk_Event"
     
   };
 
 static TAO::TypeCode::Enum<char const *,
-                           TAO::TypeCode::Enumerator<char const *> const *,
+                           char const * const *,
                            TAO::Null_RefCount_Policy>
   _tao_tc_CORBA_DefinitionKind (
     "IDL:omg.org/CORBA/DefinitionKind:1.0",
@@ -142,6 +143,8 @@ namespace CORBA
 // be/be_visitor_typecode/alias_typecode.cpp:31
 
 static TAO::TypeCode::Alias<char const *,
+                            CORBA::TypeCode_ptr const *,
+                            CORBA::tk_alias,
                             TAO::Null_RefCount_Policy>
   _tao_tc_CORBA_VersionSpec (
     "IDL:omg.org/CORBA/VersionSpec:1.0",
@@ -159,17 +162,19 @@ namespace CORBA
 // TAO_IDL - Generated from
 // be/be_visitor_typecode/struct_typecode.cpp:34
 
-static TAO::TypeCode::Struct_Field<char const *> const _tao_fields_CORBA_Contained_Description[] =
+static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_Contained_Description[] =
   {
     { "kind", &CORBA::_tc_DefinitionKind },
     { "value", &CORBA::_tc_any }
     
   };
 static TAO::TypeCode::Struct<char const *,
-                             TAO::TypeCode::Struct_Field<char const *> const *,
-                             CORBA::tk_struct,
+                             CORBA::TypeCode_ptr const *,
+                             TAO::TypeCode::Struct_Field<char const *,
+                                                         CORBA::TypeCode_ptr const *> const *,
                              TAO::Null_RefCount_Policy>
   _tao_tc_CORBA_Contained_Description (
+    CORBA::tk_struct,
     "IDL:omg.org/CORBA/Contained/Description:1.0",
     "Description",
     _tao_fields_CORBA_Contained_Description,
@@ -202,7 +207,7 @@ namespace CORBA
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:808
+// be/be_visitor_typecode/typecode_defn.cpp:914
 
 namespace CORBA
 {
@@ -213,7 +218,8 @@ namespace TAO
 {
   namespace TypeCode
   {
-    TAO::TypeCode::Sequence<TAO::Null_RefCount_Policy>
+    TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
       CORBA_InterfaceDefSeq_0 (
         CORBA::tk_sequence,
         &CORBA::_tc_InterfaceDef,
@@ -226,6 +232,8 @@ namespace TAO
 }
 
 static TAO::TypeCode::Alias<char const *,
+                            CORBA::TypeCode_ptr const *,
+                            CORBA::tk_alias,
                             TAO::Null_RefCount_Policy>
   _tao_tc_CORBA_InterfaceDefSeq (
     "IDL:omg.org/CORBA/InterfaceDefSeq:1.0",
@@ -246,7 +254,7 @@ namespace CORBA
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:808
+// be/be_visitor_typecode/typecode_defn.cpp:914
 
 namespace CORBA
 {
@@ -257,7 +265,8 @@ namespace TAO
 {
   namespace TypeCode
   {
-    TAO::TypeCode::Sequence<TAO::Null_RefCount_Policy>
+    TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
       CORBA_ValueDefSeq_0 (
         CORBA::tk_sequence,
         &CORBA::_tc_ValueDef,
@@ -270,6 +279,8 @@ namespace TAO
 }
 
 static TAO::TypeCode::Alias<char const *,
+                            CORBA::TypeCode_ptr const *,
+                            CORBA::tk_alias,
                             TAO::Null_RefCount_Policy>
   _tao_tc_CORBA_ValueDefSeq (
     "IDL:omg.org/CORBA/ValueDefSeq:1.0",
@@ -290,7 +301,7 @@ namespace CORBA
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:808
+// be/be_visitor_typecode/typecode_defn.cpp:914
 
 namespace CORBA
 {
@@ -301,7 +312,8 @@ namespace TAO
 {
   namespace TypeCode
   {
-    TAO::TypeCode::Sequence<TAO::Null_RefCount_Policy>
+    TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
       CORBA_AbstractInterfaceDefSeq_0 (
         CORBA::tk_sequence,
         &CORBA::_tc_AbstractInterfaceDef,
@@ -314,6 +326,8 @@ namespace TAO
 }
 
 static TAO::TypeCode::Alias<char const *,
+                            CORBA::TypeCode_ptr const *,
+                            CORBA::tk_alias,
                             TAO::Null_RefCount_Policy>
   _tao_tc_CORBA_AbstractInterfaceDefSeq (
     "IDL:omg.org/CORBA/AbstractInterfaceDefSeq:1.0",
@@ -334,7 +348,7 @@ namespace CORBA
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:808
+// be/be_visitor_typecode/typecode_defn.cpp:914
 
 namespace CORBA
 {
@@ -345,7 +359,8 @@ namespace TAO
 {
   namespace TypeCode
   {
-    TAO::TypeCode::Sequence<TAO::Null_RefCount_Policy>
+    TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
       CORBA_LocalInterfaceDefSeq_0 (
         CORBA::tk_sequence,
         &CORBA::_tc_LocalInterfaceDef,
@@ -358,6 +373,8 @@ namespace TAO
 }
 
 static TAO::TypeCode::Alias<char const *,
+                            CORBA::TypeCode_ptr const *,
+                            CORBA::tk_alias,
                             TAO::Null_RefCount_Policy>
   _tao_tc_CORBA_LocalInterfaceDefSeq (
     "IDL:omg.org/CORBA/LocalInterfaceDefSeq:1.0",
@@ -378,7 +395,7 @@ namespace CORBA
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:808
+// be/be_visitor_typecode/typecode_defn.cpp:914
 
 namespace CORBA
 {
@@ -389,7 +406,8 @@ namespace TAO
 {
   namespace TypeCode
   {
-    TAO::TypeCode::Sequence<TAO::Null_RefCount_Policy>
+    TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
       CORBA_ExtInterfaceDefSeq_0 (
         CORBA::tk_sequence,
         &CORBA::_tc_ExtInterfaceDef,
@@ -402,6 +420,8 @@ namespace TAO
 }
 
 static TAO::TypeCode::Alias<char const *,
+                            CORBA::TypeCode_ptr const *,
+                            CORBA::tk_alias,
                             TAO::Null_RefCount_Policy>
   _tao_tc_CORBA_ExtInterfaceDefSeq (
     "IDL:omg.org/CORBA/ExtInterfaceDefSeq:1.0",
@@ -422,7 +442,7 @@ namespace CORBA
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:808
+// be/be_visitor_typecode/typecode_defn.cpp:914
 
 namespace CORBA
 {
@@ -433,7 +453,8 @@ namespace TAO
 {
   namespace TypeCode
   {
-    TAO::TypeCode::Sequence<TAO::Null_RefCount_Policy>
+    TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
       CORBA_ExtValueDefSeq_0 (
         CORBA::tk_sequence,
         &CORBA::_tc_ExtValueDef,
@@ -446,6 +467,8 @@ namespace TAO
 }
 
 static TAO::TypeCode::Alias<char const *,
+                            CORBA::TypeCode_ptr const *,
+                            CORBA::tk_alias,
                             TAO::Null_RefCount_Policy>
   _tao_tc_CORBA_ExtValueDefSeq (
     "IDL:omg.org/CORBA/ExtValueDefSeq:1.0",
@@ -466,7 +489,7 @@ namespace CORBA
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:808
+// be/be_visitor_typecode/typecode_defn.cpp:914
 
 namespace CORBA
 {
@@ -477,7 +500,8 @@ namespace TAO
 {
   namespace TypeCode
   {
-    TAO::TypeCode::Sequence<TAO::Null_RefCount_Policy>
+    TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
       CORBA_ExtAbstractInterfaceDefSeq_0 (
         CORBA::tk_sequence,
         &CORBA::_tc_ExtAbstractInterfaceDef,
@@ -490,6 +514,8 @@ namespace TAO
 }
 
 static TAO::TypeCode::Alias<char const *,
+                            CORBA::TypeCode_ptr const *,
+                            CORBA::tk_alias,
                             TAO::Null_RefCount_Policy>
   _tao_tc_CORBA_ExtAbstractInterfaceDefSeq (
     "IDL:omg.org/CORBA/ExtAbstractInterfaceDefSeq:1.0",
@@ -510,7 +536,7 @@ namespace CORBA
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:808
+// be/be_visitor_typecode/typecode_defn.cpp:914
 
 namespace CORBA
 {
@@ -521,7 +547,8 @@ namespace TAO
 {
   namespace TypeCode
   {
-    TAO::TypeCode::Sequence<TAO::Null_RefCount_Policy>
+    TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
       CORBA_ExtLocalInterfaceDefSeq_0 (
         CORBA::tk_sequence,
         &CORBA::_tc_ExtLocalInterfaceDef,
@@ -534,6 +561,8 @@ namespace TAO
 }
 
 static TAO::TypeCode::Alias<char const *,
+                            CORBA::TypeCode_ptr const *,
+                            CORBA::tk_alias,
                             TAO::Null_RefCount_Policy>
   _tao_tc_CORBA_ExtLocalInterfaceDefSeq (
     "IDL:omg.org/CORBA/ExtLocalInterfaceDefSeq:1.0",
@@ -554,13 +583,14 @@ namespace CORBA
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:808
+// be/be_visitor_typecode/typecode_defn.cpp:914
 
 namespace TAO
 {
   namespace TypeCode
   {
-    TAO::TypeCode::Sequence<TAO::Null_RefCount_Policy>
+    TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
       CORBA_ContainedSeq_0 (
         CORBA::tk_sequence,
         &CORBA::_tc_Contained,
@@ -573,6 +603,8 @@ namespace TAO
 }
 
 static TAO::TypeCode::Alias<char const *,
+                            CORBA::TypeCode_ptr const *,
+                            CORBA::tk_alias,
                             TAO::Null_RefCount_Policy>
   _tao_tc_CORBA_ContainedSeq (
     "IDL:omg.org/CORBA/ContainedSeq:1.0",
@@ -590,7 +622,7 @@ namespace CORBA
 // TAO_IDL - Generated from
 // be/be_visitor_typecode/struct_typecode.cpp:34
 
-static TAO::TypeCode::Struct_Field<char const *> const _tao_fields_CORBA_StructMember[] =
+static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_StructMember[] =
   {
     { "name", &CORBA::_tc_Identifier },
     { "type", &CORBA::_tc_TypeCode },
@@ -598,10 +630,12 @@ static TAO::TypeCode::Struct_Field<char const *> const _tao_fields_CORBA_StructM
     
   };
 static TAO::TypeCode::Struct<char const *,
-                             TAO::TypeCode::Struct_Field<char const *> const *,
-                             CORBA::tk_struct,
+                             CORBA::TypeCode_ptr const *,
+                             TAO::TypeCode::Struct_Field<char const *,
+                                                         CORBA::TypeCode_ptr const *> const *,
                              TAO::Null_RefCount_Policy>
   _tao_tc_CORBA_StructMember (
+    CORBA::tk_struct,
     "IDL:omg.org/CORBA/StructMember:1.0",
     "StructMember",
     _tao_fields_CORBA_StructMember,
@@ -621,13 +655,14 @@ namespace CORBA
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:808
+// be/be_visitor_typecode/typecode_defn.cpp:914
 
 namespace TAO
 {
   namespace TypeCode
   {
-    TAO::TypeCode::Sequence<TAO::Null_RefCount_Policy>
+    TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
       CORBA_StructMemberSeq_0 (
         CORBA::tk_sequence,
         &CORBA::_tc_StructMember,
@@ -640,6 +675,8 @@ namespace TAO
 }
 
 static TAO::TypeCode::Alias<char const *,
+                            CORBA::TypeCode_ptr const *,
+                            CORBA::tk_alias,
                             TAO::Null_RefCount_Policy>
   _tao_tc_CORBA_StructMemberSeq (
     "IDL:omg.org/CORBA/StructMemberSeq:1.0",
@@ -657,17 +694,19 @@ namespace CORBA
 // TAO_IDL - Generated from
 // be/be_visitor_typecode/struct_typecode.cpp:34
 
-static TAO::TypeCode::Struct_Field<char const *> const _tao_fields_CORBA_Initializer[] =
+static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_Initializer[] =
   {
     { "members", &CORBA::_tc_StructMemberSeq },
     { "name", &CORBA::_tc_Identifier }
     
   };
 static TAO::TypeCode::Struct<char const *,
-                             TAO::TypeCode::Struct_Field<char const *> const *,
-                             CORBA::tk_struct,
+                             CORBA::TypeCode_ptr const *,
+                             TAO::TypeCode::Struct_Field<char const *,
+                                                         CORBA::TypeCode_ptr const *> const *,
                              TAO::Null_RefCount_Policy>
   _tao_tc_CORBA_Initializer (
+    CORBA::tk_struct,
     "IDL:omg.org/CORBA/Initializer:1.0",
     "Initializer",
     _tao_fields_CORBA_Initializer,
@@ -687,13 +726,14 @@ namespace CORBA
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:808
+// be/be_visitor_typecode/typecode_defn.cpp:914
 
 namespace TAO
 {
   namespace TypeCode
   {
-    TAO::TypeCode::Sequence<TAO::Null_RefCount_Policy>
+    TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
       CORBA_InitializerSeq_0 (
         CORBA::tk_sequence,
         &CORBA::_tc_Initializer,
@@ -706,6 +746,8 @@ namespace TAO
 }
 
 static TAO::TypeCode::Alias<char const *,
+                            CORBA::TypeCode_ptr const *,
+                            CORBA::tk_alias,
                             TAO::Null_RefCount_Policy>
   _tao_tc_CORBA_InitializerSeq (
     "IDL:omg.org/CORBA/InitializerSeq:1.0",
@@ -723,7 +765,7 @@ namespace CORBA
 // TAO_IDL - Generated from
 // be/be_visitor_typecode/struct_typecode.cpp:34
 
-static TAO::TypeCode::Struct_Field<char const *> const _tao_fields_CORBA_ExceptionDescription[] =
+static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_ExceptionDescription[] =
   {
     { "name", &CORBA::_tc_Identifier },
     { "id", &CORBA::_tc_RepositoryId },
@@ -733,10 +775,12 @@ static TAO::TypeCode::Struct_Field<char const *> const _tao_fields_CORBA_Excepti
     
   };
 static TAO::TypeCode::Struct<char const *,
-                             TAO::TypeCode::Struct_Field<char const *> const *,
-                             CORBA::tk_struct,
+                             CORBA::TypeCode_ptr const *,
+                             TAO::TypeCode::Struct_Field<char const *,
+                                                         CORBA::TypeCode_ptr const *> const *,
                              TAO::Null_RefCount_Policy>
   _tao_tc_CORBA_ExceptionDescription (
+    CORBA::tk_struct,
     "IDL:omg.org/CORBA/ExceptionDescription:1.0",
     "ExceptionDescription",
     _tao_fields_CORBA_ExceptionDescription,
@@ -756,13 +800,14 @@ namespace CORBA
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:808
+// be/be_visitor_typecode/typecode_defn.cpp:914
 
 namespace TAO
 {
   namespace TypeCode
   {
-    TAO::TypeCode::Sequence<TAO::Null_RefCount_Policy>
+    TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
       CORBA_ExcDescriptionSeq_0 (
         CORBA::tk_sequence,
         &CORBA::_tc_ExceptionDescription,
@@ -775,6 +820,8 @@ namespace TAO
 }
 
 static TAO::TypeCode::Alias<char const *,
+                            CORBA::TypeCode_ptr const *,
+                            CORBA::tk_alias,
                             TAO::Null_RefCount_Policy>
   _tao_tc_CORBA_ExcDescriptionSeq (
     "IDL:omg.org/CORBA/ExcDescriptionSeq:1.0",
@@ -792,7 +839,7 @@ namespace CORBA
 // TAO_IDL - Generated from
 // be/be_visitor_typecode/struct_typecode.cpp:34
 
-static TAO::TypeCode::Struct_Field<char const *> const _tao_fields_CORBA_ExtInitializer[] =
+static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_ExtInitializer[] =
   {
     { "members", &CORBA::_tc_StructMemberSeq },
     { "exceptions", &CORBA::_tc_ExcDescriptionSeq },
@@ -800,10 +847,12 @@ static TAO::TypeCode::Struct_Field<char const *> const _tao_fields_CORBA_ExtInit
     
   };
 static TAO::TypeCode::Struct<char const *,
-                             TAO::TypeCode::Struct_Field<char const *> const *,
-                             CORBA::tk_struct,
+                             CORBA::TypeCode_ptr const *,
+                             TAO::TypeCode::Struct_Field<char const *,
+                                                         CORBA::TypeCode_ptr const *> const *,
                              TAO::Null_RefCount_Policy>
   _tao_tc_CORBA_ExtInitializer (
+    CORBA::tk_struct,
     "IDL:omg.org/CORBA/ExtInitializer:1.0",
     "ExtInitializer",
     _tao_fields_CORBA_ExtInitializer,
@@ -823,13 +872,14 @@ namespace CORBA
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:808
+// be/be_visitor_typecode/typecode_defn.cpp:914
 
 namespace TAO
 {
   namespace TypeCode
   {
-    TAO::TypeCode::Sequence<TAO::Null_RefCount_Policy>
+    TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
       CORBA_ExtInitializerSeq_0 (
         CORBA::tk_sequence,
         &CORBA::_tc_ExtInitializer,
@@ -842,6 +892,8 @@ namespace TAO
 }
 
 static TAO::TypeCode::Alias<char const *,
+                            CORBA::TypeCode_ptr const *,
+                            CORBA::tk_alias,
                             TAO::Null_RefCount_Policy>
   _tao_tc_CORBA_ExtInitializerSeq (
     "IDL:omg.org/CORBA/ExtInitializerSeq:1.0",
@@ -859,7 +911,7 @@ namespace CORBA
 // TAO_IDL - Generated from
 // be/be_visitor_typecode/struct_typecode.cpp:34
 
-static TAO::TypeCode::Struct_Field<char const *> const _tao_fields_CORBA_UnionMember[] =
+static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_UnionMember[] =
   {
     { "name", &CORBA::_tc_Identifier },
     { "label", &CORBA::_tc_any },
@@ -868,10 +920,12 @@ static TAO::TypeCode::Struct_Field<char const *> const _tao_fields_CORBA_UnionMe
     
   };
 static TAO::TypeCode::Struct<char const *,
-                             TAO::TypeCode::Struct_Field<char const *> const *,
-                             CORBA::tk_struct,
+                             CORBA::TypeCode_ptr const *,
+                             TAO::TypeCode::Struct_Field<char const *,
+                                                         CORBA::TypeCode_ptr const *> const *,
                              TAO::Null_RefCount_Policy>
   _tao_tc_CORBA_UnionMember (
+    CORBA::tk_struct,
     "IDL:omg.org/CORBA/UnionMember:1.0",
     "UnionMember",
     _tao_fields_CORBA_UnionMember,
@@ -891,13 +945,14 @@ namespace CORBA
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:808
+// be/be_visitor_typecode/typecode_defn.cpp:914
 
 namespace TAO
 {
   namespace TypeCode
   {
-    TAO::TypeCode::Sequence<TAO::Null_RefCount_Policy>
+    TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
       CORBA_UnionMemberSeq_0 (
         CORBA::tk_sequence,
         &CORBA::_tc_UnionMember,
@@ -910,6 +965,8 @@ namespace TAO
 }
 
 static TAO::TypeCode::Alias<char const *,
+                            CORBA::TypeCode_ptr const *,
+                            CORBA::tk_alias,
                             TAO::Null_RefCount_Policy>
   _tao_tc_CORBA_UnionMemberSeq (
     "IDL:omg.org/CORBA/UnionMemberSeq:1.0",
@@ -930,13 +987,14 @@ namespace CORBA
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:808
+// be/be_visitor_typecode/typecode_defn.cpp:914
 
 namespace TAO
 {
   namespace TypeCode
   {
-    TAO::TypeCode::Sequence<TAO::Null_RefCount_Policy>
+    TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
       CORBA_EnumMemberSeq_0 (
         CORBA::tk_sequence,
         &CORBA::_tc_Identifier,
@@ -949,6 +1007,8 @@ namespace TAO
 }
 
 static TAO::TypeCode::Alias<char const *,
+                            CORBA::TypeCode_ptr const *,
+                            CORBA::tk_alias,
                             TAO::Null_RefCount_Policy>
   _tao_tc_CORBA_EnumMemberSeq (
     "IDL:omg.org/CORBA/EnumMemberSeq:1.0",
@@ -966,7 +1026,7 @@ namespace CORBA
 // TAO_IDL - Generated from
 // be/be_visitor_typecode/struct_typecode.cpp:34
 
-static TAO::TypeCode::Struct_Field<char const *> const _tao_fields_CORBA_Container_Description[] =
+static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_Container_Description[] =
   {
     { "contained_object", &CORBA::_tc_Contained },
     { "kind", &CORBA::_tc_DefinitionKind },
@@ -974,10 +1034,12 @@ static TAO::TypeCode::Struct_Field<char const *> const _tao_fields_CORBA_Contain
     
   };
 static TAO::TypeCode::Struct<char const *,
-                             TAO::TypeCode::Struct_Field<char const *> const *,
-                             CORBA::tk_struct,
+                             CORBA::TypeCode_ptr const *,
+                             TAO::TypeCode::Struct_Field<char const *,
+                                                         CORBA::TypeCode_ptr const *> const *,
                              TAO::Null_RefCount_Policy>
   _tao_tc_CORBA_Container_Description (
+    CORBA::tk_struct,
     "IDL:omg.org/CORBA/Container/Description:1.0",
     "Description",
     _tao_fields_CORBA_Container_Description,
@@ -992,13 +1054,14 @@ static TAO::TypeCode::Struct<char const *,
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:808
+// be/be_visitor_typecode/typecode_defn.cpp:914
 
 namespace TAO
 {
   namespace TypeCode
   {
-    TAO::TypeCode::Sequence<TAO::Null_RefCount_Policy>
+    TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
       CORBA_Container_DescriptionSeq_0 (
         CORBA::tk_sequence,
         &CORBA::Container::_tc_Description,
@@ -1011,6 +1074,8 @@ namespace TAO
 }
 
 static TAO::TypeCode::Alias<char const *,
+                            CORBA::TypeCode_ptr const *,
+                            CORBA::tk_alias,
                             TAO::Null_RefCount_Policy>
   _tao_tc_CORBA_Container_DescriptionSeq (
     "IDL:omg.org/CORBA/Container/DescriptionSeq:1.0",
@@ -1077,7 +1142,7 @@ namespace CORBA
 // TAO_IDL - Generated from
 // be/be_visitor_typecode/struct_typecode.cpp:34
 
-static TAO::TypeCode::Struct_Field<char const *> const _tao_fields_CORBA_TypeDescription[] =
+static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_TypeDescription[] =
   {
     { "name", &CORBA::_tc_Identifier },
     { "id", &CORBA::_tc_RepositoryId },
@@ -1087,10 +1152,12 @@ static TAO::TypeCode::Struct_Field<char const *> const _tao_fields_CORBA_TypeDes
     
   };
 static TAO::TypeCode::Struct<char const *,
-                             TAO::TypeCode::Struct_Field<char const *> const *,
-                             CORBA::tk_struct,
+                             CORBA::TypeCode_ptr const *,
+                             TAO::TypeCode::Struct_Field<char const *,
+                                                         CORBA::TypeCode_ptr const *> const *,
                              TAO::Null_RefCount_Policy>
   _tao_tc_CORBA_TypeDescription (
+    CORBA::tk_struct,
     "IDL:omg.org/CORBA/TypeDescription:1.0",
     "TypeDescription",
     _tao_fields_CORBA_TypeDescription,
@@ -1142,7 +1209,7 @@ TAO::Any_Impl_T<CORBA::IRObject>::to_object (
   ) const
 {
   _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
+  return true;
 }
 
 // Copying insertion.
@@ -1197,7 +1264,7 @@ TAO::Any_Impl_T<CORBA::Contained>::to_object (
   ) const
 {
   _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
+  return true;
 }
 
 // Copying insertion.
@@ -2470,7 +2537,7 @@ TAO::Any_Impl_T<CORBA::Container>::to_object (
   ) const
 {
   _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
+  return true;
 }
 
 // Copying insertion.
@@ -2641,7 +2708,7 @@ TAO::Any_Impl_T<CORBA::IDLType>::to_object (
   ) const
 {
   _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
+  return true;
 }
 
 // Copying insertion.
@@ -2696,7 +2763,7 @@ TAO::Any_Impl_T<CORBA::TypedefDef>::to_object (
   ) const
 {
   _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
+  return true;
 }
 
 // Copying insertion.
diff --git a/TAO/tao/IFR_Client/IFR_BasicA.cpp b/TAO/tao/IFR_Client/IFR_BasicA.cpp
index dd064a30186..271b41d1cb8 100644
--- a/TAO/tao/IFR_Client/IFR_BasicA.cpp
+++ b/TAO/tao/IFR_Client/IFR_BasicA.cpp
@@ -29,7 +29,6 @@
 #include "tao/Null_RefCount_Policy.h"
 #include "tao/TypeCode_Constants.h"
 #include "tao/Alias_TypeCode.h"
-#include "tao/TypeCode_Enumerator.h"
 #include "tao/Enum_TypeCode.h"
 #include "tao/Objref_TypeCode.h"
 #include "tao/Sequence_TypeCode.h"
@@ -44,35 +43,35 @@
 // TAO_IDL - Generated from
 // be/be_visitor_typecode/enum_typecode.cpp:34
 
-static TAO::TypeCode::Enumerator<char const *> const _tao_enumerators_CORBA_PrimitiveKind[] =
+static char const * const _tao_enumerators_CORBA_PrimitiveKind[] =
   {
-    { "pk_null" },
-    { "pk_void" },
-    { "pk_short" },
-    { "pk_long" },
-    { "pk_ushort" },
-    { "pk_ulong" },
-    { "pk_float" },
-    { "pk_double" },
-    { "pk_boolean" },
-    { "pk_char" },
-    { "pk_octet" },
-    { "pk_any" },
-    { "pk_TypeCode" },
-    { "pk_Principal" },
-    { "pk_string" },
-    { "pk_objref" },
-    { "pk_longlong" },
-    { "pk_ulonglong" },
-    { "pk_longdouble" },
-    { "pk_wchar" },
-    { "pk_wstring" },
-    { "pk_value_base" }
+    "pk_null",
+    "pk_void",
+    "pk_short",
+    "pk_long",
+    "pk_ushort",
+    "pk_ulong",
+    "pk_float",
+    "pk_double",
+    "pk_boolean",
+    "pk_char",
+    "pk_octet",
+    "pk_any",
+    "pk_TypeCode",
+    "pk_Principal",
+    "pk_string",
+    "pk_objref",
+    "pk_longlong",
+    "pk_ulonglong",
+    "pk_longdouble",
+    "pk_wchar",
+    "pk_wstring",
+    "pk_value_base"
     
   };
 
 static TAO::TypeCode::Enum<char const *,
-                           TAO::TypeCode::Enumerator<char const *> const *,
+                           char const * const *,
                            TAO::Null_RefCount_Policy>
   _tao_tc_CORBA_PrimitiveKind (
     "IDL:omg.org/CORBA/PrimitiveKind:1.0",
@@ -127,7 +126,7 @@ namespace CORBA
 // TAO_IDL - Generated from
 // be/be_visitor_typecode/struct_typecode.cpp:34
 
-static TAO::TypeCode::Struct_Field<char const *> _tao_fields_CORBA_ModuleDescription[] =
+static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_ModuleDescription[] =
   {
     { "name", &CORBA::_tc_Identifier },
     { "id", &CORBA::_tc_RepositoryId },
@@ -136,10 +135,12 @@ static TAO::TypeCode::Struct_Field<char const *> _tao_fields_CORBA_ModuleDescrip
     
   };
 static TAO::TypeCode::Struct<char const *,
-                             TAO::TypeCode::Struct_Field<char const *> const *,
-                             CORBA::tk_struct,
+                             CORBA::TypeCode_ptr const *,
+                             TAO::TypeCode::Struct_Field<char const *,
+                                                         CORBA::TypeCode_ptr const *> const *,
                              TAO::Null_RefCount_Policy>
   _tao_tc_CORBA_ModuleDescription (
+    CORBA::tk_struct,
     "IDL:omg.org/CORBA/ModuleDescription:1.0",
     "ModuleDescription",
     _tao_fields_CORBA_ModuleDescription,
@@ -174,7 +175,7 @@ namespace CORBA
 // TAO_IDL - Generated from
 // be/be_visitor_typecode/struct_typecode.cpp:34
 
-static TAO::TypeCode::Struct_Field<char const *> _tao_fields_CORBA_ConstantDescription[] =
+static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_ConstantDescription[] =
   {
     { "name", &CORBA::_tc_Identifier },
     { "id", &CORBA::_tc_RepositoryId },
@@ -185,10 +186,12 @@ static TAO::TypeCode::Struct_Field<char const *> _tao_fields_CORBA_ConstantDescr
     
   };
 static TAO::TypeCode::Struct<char const *,
-                             TAO::TypeCode::Struct_Field<char const *> const *,
-                             CORBA::tk_struct,
+                             CORBA::TypeCode_ptr const *,
+                             TAO::TypeCode::Struct_Field<char const *,
+                                                         CORBA::TypeCode_ptr const *> const *,
                              TAO::Null_RefCount_Policy>
   _tao_tc_CORBA_ConstantDescription (
+    CORBA::tk_struct,
     "IDL:omg.org/CORBA/ConstantDescription:1.0",
     "ConstantDescription",
     _tao_fields_CORBA_ConstantDescription,
@@ -406,13 +409,14 @@ namespace CORBA
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:743
+// be/be_visitor_typecode/typecode_defn.cpp:914
 
 namespace TAO
 {
   namespace TypeCode
   {
-    TAO::TypeCode::Sequence<TAO::Null_RefCount_Policy>
+    TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
       CORBA_ExceptionDefSeq_0 (
         CORBA::tk_sequence,
         &CORBA::_tc_ExceptionDef,
@@ -425,6 +429,8 @@ namespace TAO
 }
 
 static TAO::TypeCode::Alias<char const *,
+                            CORBA::TypeCode_ptr const *,
+                            CORBA::tk_alias,
                             TAO::Null_RefCount_Policy>
   _tao_tc_CORBA_ExceptionDefSeq (
     "IDL:omg.org/CORBA/ExceptionDefSeq:1.0",
@@ -442,15 +448,15 @@ namespace CORBA
 // TAO_IDL - Generated from
 // be/be_visitor_typecode/enum_typecode.cpp:34
 
-static TAO::TypeCode::Enumerator<char const *> const _tao_enumerators_CORBA_AttributeMode[] =
+static char const * const _tao_enumerators_CORBA_AttributeMode[] =
   {
-    { "ATTR_NORMAL" },
-    { "ATTR_READONLY" }
+    "ATTR_NORMAL",
+    "ATTR_READONLY"
     
   };
 
 static TAO::TypeCode::Enum<char const *,
-                           TAO::TypeCode::Enumerator<char const *> const *,
+                           char const * const *,
                            TAO::Null_RefCount_Policy>
   _tao_tc_CORBA_AttributeMode (
     "IDL:omg.org/CORBA/AttributeMode:1.0",
@@ -487,7 +493,7 @@ namespace CORBA
 // TAO_IDL - Generated from
 // be/be_visitor_typecode/struct_typecode.cpp:34
 
-static TAO::TypeCode::Struct_Field<char const *> _tao_fields_CORBA_AttributeDescription[] =
+static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_AttributeDescription[] =
   {
     { "name", &CORBA::_tc_Identifier },
     { "id", &CORBA::_tc_RepositoryId },
@@ -498,10 +504,12 @@ static TAO::TypeCode::Struct_Field<char const *> _tao_fields_CORBA_AttributeDesc
     
   };
 static TAO::TypeCode::Struct<char const *,
-                             TAO::TypeCode::Struct_Field<char const *> const *,
-                             CORBA::tk_struct,
+                             CORBA::TypeCode_ptr const *,
+                             TAO::TypeCode::Struct_Field<char const *,
+                                                         CORBA::TypeCode_ptr const *> const *,
                              TAO::Null_RefCount_Policy>
   _tao_tc_CORBA_AttributeDescription (
+    CORBA::tk_struct,
     "IDL:omg.org/CORBA/AttributeDescription:1.0",
     "AttributeDescription",
     _tao_fields_CORBA_AttributeDescription,
@@ -518,7 +526,7 @@ namespace CORBA
 // TAO_IDL - Generated from
 // be/be_visitor_typecode/struct_typecode.cpp:34
 
-static TAO::TypeCode::Struct_Field<char const *> _tao_fields_CORBA_ExtAttributeDescription[] =
+static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_ExtAttributeDescription[] =
   {
     { "name", &CORBA::_tc_Identifier },
     { "id", &CORBA::_tc_RepositoryId },
@@ -531,10 +539,12 @@ static TAO::TypeCode::Struct_Field<char const *> _tao_fields_CORBA_ExtAttributeD
     
   };
 static TAO::TypeCode::Struct<char const *,
-                             TAO::TypeCode::Struct_Field<char const *> const *,
-                             CORBA::tk_struct,
+                             CORBA::TypeCode_ptr const *,
+                             TAO::TypeCode::Struct_Field<char const *,
+                                                         CORBA::TypeCode_ptr const *> const *,
                              TAO::Null_RefCount_Policy>
   _tao_tc_CORBA_ExtAttributeDescription (
+    CORBA::tk_struct,
     "IDL:omg.org/CORBA/ExtAttributeDescription:1.0",
     "ExtAttributeDescription",
     _tao_fields_CORBA_ExtAttributeDescription,
@@ -569,15 +579,15 @@ namespace CORBA
 // TAO_IDL - Generated from
 // be/be_visitor_typecode/enum_typecode.cpp:34
 
-static TAO::TypeCode::Enumerator<char const *> const _tao_enumerators_CORBA_OperationMode[] =
+static char const * const _tao_enumerators_CORBA_OperationMode[] =
   {
-    { "OP_NORMAL" },
-    { "OP_ONEWAY" }
+    "OP_NORMAL",
+    "OP_ONEWAY"
     
   };
 
 static TAO::TypeCode::Enum<char const *,
-                           TAO::TypeCode::Enumerator<char const *> const *,
+                           char const * const *,
                            TAO::Null_RefCount_Policy>
   _tao_tc_CORBA_OperationMode (
     "IDL:omg.org/CORBA/OperationMode:1.0",
@@ -596,7 +606,7 @@ namespace CORBA
 // TAO_IDL - Generated from
 // be/be_visitor_typecode/struct_typecode.cpp:34
 
-static TAO::TypeCode::Struct_Field<char const *> _tao_fields_CORBA_ParameterDescription[] =
+static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_ParameterDescription[] =
   {
     { "name", &CORBA::_tc_Identifier },
     { "type", &CORBA::_tc_TypeCode },
@@ -605,10 +615,12 @@ static TAO::TypeCode::Struct_Field<char const *> _tao_fields_CORBA_ParameterDesc
     
   };
 static TAO::TypeCode::Struct<char const *,
-                             TAO::TypeCode::Struct_Field<char const *> const *,
-                             CORBA::tk_struct,
+                             CORBA::TypeCode_ptr const *,
+                             TAO::TypeCode::Struct_Field<char const *,
+                                                         CORBA::TypeCode_ptr const *> const *,
                              TAO::Null_RefCount_Policy>
   _tao_tc_CORBA_ParameterDescription (
+    CORBA::tk_struct,
     "IDL:omg.org/CORBA/ParameterDescription:1.0",
     "ParameterDescription",
     _tao_fields_CORBA_ParameterDescription,
@@ -628,13 +640,14 @@ namespace CORBA
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:743
+// be/be_visitor_typecode/typecode_defn.cpp:914
 
 namespace TAO
 {
   namespace TypeCode
   {
-    TAO::TypeCode::Sequence<TAO::Null_RefCount_Policy>
+    TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
       CORBA_ParDescriptionSeq_0 (
         CORBA::tk_sequence,
         &CORBA::_tc_ParameterDescription,
@@ -647,6 +660,8 @@ namespace TAO
 }
 
 static TAO::TypeCode::Alias<char const *,
+                            CORBA::TypeCode_ptr const *,
+                            CORBA::tk_alias,
                             TAO::Null_RefCount_Policy>
   _tao_tc_CORBA_ParDescriptionSeq (
     "IDL:omg.org/CORBA/ParDescriptionSeq:1.0",
@@ -665,6 +680,8 @@ namespace CORBA
 // be/be_visitor_typecode/alias_typecode.cpp:31
 
 static TAO::TypeCode::Alias<char const *,
+                            CORBA::TypeCode_ptr const *,
+                            CORBA::tk_alias,
                             TAO::Null_RefCount_Policy>
   _tao_tc_CORBA_ContextIdentifier (
     "IDL:omg.org/CORBA/ContextIdentifier:1.0",
@@ -685,13 +702,14 @@ namespace CORBA
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:743
+// be/be_visitor_typecode/typecode_defn.cpp:914
 
 namespace TAO
 {
   namespace TypeCode
   {
-    TAO::TypeCode::Sequence<TAO::Null_RefCount_Policy>
+    TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
       CORBA_ContextIdSeq_0 (
         CORBA::tk_sequence,
         &CORBA::_tc_ContextIdentifier,
@@ -704,6 +722,8 @@ namespace TAO
 }
 
 static TAO::TypeCode::Alias<char const *,
+                            CORBA::TypeCode_ptr const *,
+                            CORBA::tk_alias,
                             TAO::Null_RefCount_Policy>
   _tao_tc_CORBA_ContextIdSeq (
     "IDL:omg.org/CORBA/ContextIdSeq:1.0",
@@ -739,7 +759,7 @@ namespace CORBA
 // TAO_IDL - Generated from
 // be/be_visitor_typecode/struct_typecode.cpp:34
 
-static TAO::TypeCode::Struct_Field<char const *> _tao_fields_CORBA_OperationDescription[] =
+static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_OperationDescription[] =
   {
     { "name", &CORBA::_tc_Identifier },
     { "id", &CORBA::_tc_RepositoryId },
@@ -753,10 +773,12 @@ static TAO::TypeCode::Struct_Field<char const *> _tao_fields_CORBA_OperationDesc
     
   };
 static TAO::TypeCode::Struct<char const *,
-                             TAO::TypeCode::Struct_Field<char const *> const *,
-                             CORBA::tk_struct,
+                             CORBA::TypeCode_ptr const *,
+                             TAO::TypeCode::Struct_Field<char const *,
+                                                         CORBA::TypeCode_ptr const *> const *,
                              TAO::Null_RefCount_Policy>
   _tao_tc_CORBA_OperationDescription (
+    CORBA::tk_struct,
     "IDL:omg.org/CORBA/OperationDescription:1.0",
     "OperationDescription",
     _tao_fields_CORBA_OperationDescription,
@@ -776,13 +798,14 @@ namespace CORBA
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:743
+// be/be_visitor_typecode/typecode_defn.cpp:914
 
 namespace TAO
 {
   namespace TypeCode
   {
-    TAO::TypeCode::Sequence<TAO::Null_RefCount_Policy>
+    TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
       CORBA_RepositoryIdSeq_0 (
         CORBA::tk_sequence,
         &CORBA::_tc_RepositoryId,
@@ -795,6 +818,8 @@ namespace TAO
 }
 
 static TAO::TypeCode::Alias<char const *,
+                            CORBA::TypeCode_ptr const *,
+                            CORBA::tk_alias,
                             TAO::Null_RefCount_Policy>
   _tao_tc_CORBA_RepositoryIdSeq (
     "IDL:omg.org/CORBA/RepositoryIdSeq:1.0",
@@ -815,13 +840,14 @@ namespace CORBA
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:743
+// be/be_visitor_typecode/typecode_defn.cpp:914
 
 namespace TAO
 {
   namespace TypeCode
   {
-    TAO::TypeCode::Sequence<TAO::Null_RefCount_Policy>
+    TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
       CORBA_OpDescriptionSeq_0 (
         CORBA::tk_sequence,
         &CORBA::_tc_OperationDescription,
@@ -834,6 +860,8 @@ namespace TAO
 }
 
 static TAO::TypeCode::Alias<char const *,
+                            CORBA::TypeCode_ptr const *,
+                            CORBA::tk_alias,
                             TAO::Null_RefCount_Policy>
   _tao_tc_CORBA_OpDescriptionSeq (
     "IDL:omg.org/CORBA/OpDescriptionSeq:1.0",
@@ -854,13 +882,14 @@ namespace CORBA
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:743
+// be/be_visitor_typecode/typecode_defn.cpp:914
 
 namespace TAO
 {
   namespace TypeCode
   {
-    TAO::TypeCode::Sequence<TAO::Null_RefCount_Policy>
+    TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
       CORBA_AttrDescriptionSeq_0 (
         CORBA::tk_sequence,
         &CORBA::_tc_AttributeDescription,
@@ -873,6 +902,8 @@ namespace TAO
 }
 
 static TAO::TypeCode::Alias<char const *,
+                            CORBA::TypeCode_ptr const *,
+                            CORBA::tk_alias,
                             TAO::Null_RefCount_Policy>
   _tao_tc_CORBA_AttrDescriptionSeq (
     "IDL:omg.org/CORBA/AttrDescriptionSeq:1.0",
@@ -893,13 +924,14 @@ namespace CORBA
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:743
+// be/be_visitor_typecode/typecode_defn.cpp:914
 
 namespace TAO
 {
   namespace TypeCode
   {
-    TAO::TypeCode::Sequence<TAO::Null_RefCount_Policy>
+    TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
       CORBA_ExtAttrDescriptionSeq_0 (
         CORBA::tk_sequence,
         &CORBA::_tc_ExtAttributeDescription,
@@ -912,6 +944,8 @@ namespace TAO
 }
 
 static TAO::TypeCode::Alias<char const *,
+                            CORBA::TypeCode_ptr const *,
+                            CORBA::tk_alias,
                             TAO::Null_RefCount_Policy>
   _tao_tc_CORBA_ExtAttrDescriptionSeq (
     "IDL:omg.org/CORBA/ExtAttrDescriptionSeq:1.0",
@@ -929,7 +963,7 @@ namespace CORBA
 // TAO_IDL - Generated from
 // be/be_visitor_typecode/struct_typecode.cpp:34
 
-static TAO::TypeCode::Struct_Field<char const *> _tao_fields_CORBA_InterfaceDef_FullInterfaceDescription[] =
+static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_InterfaceDef_FullInterfaceDescription[] =
   {
     { "name", &CORBA::_tc_Identifier },
     { "id", &CORBA::_tc_RepositoryId },
@@ -942,10 +976,12 @@ static TAO::TypeCode::Struct_Field<char const *> _tao_fields_CORBA_InterfaceDef_
     
   };
 static TAO::TypeCode::Struct<char const *,
-                             TAO::TypeCode::Struct_Field<char const *> const *,
-                             CORBA::tk_struct,
+                             CORBA::TypeCode_ptr const *,
+                             TAO::TypeCode::Struct_Field<char const *,
+                                                         CORBA::TypeCode_ptr const *> const *,
                              TAO::Null_RefCount_Policy>
   _tao_tc_CORBA_InterfaceDef_FullInterfaceDescription (
+    CORBA::tk_struct,
     "IDL:omg.org/CORBA/InterfaceDef/FullInterfaceDescription:1.0",
     "FullInterfaceDescription",
     _tao_fields_CORBA_InterfaceDef_FullInterfaceDescription,
@@ -975,7 +1011,7 @@ namespace CORBA
 // TAO_IDL - Generated from
 // be/be_visitor_typecode/struct_typecode.cpp:34
 
-static TAO::TypeCode::Struct_Field<char const *> _tao_fields_CORBA_InterfaceDescription[] =
+static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_InterfaceDescription[] =
   {
     { "name", &CORBA::_tc_Identifier },
     { "id", &CORBA::_tc_RepositoryId },
@@ -985,10 +1021,12 @@ static TAO::TypeCode::Struct_Field<char const *> _tao_fields_CORBA_InterfaceDesc
     
   };
 static TAO::TypeCode::Struct<char const *,
-                             TAO::TypeCode::Struct_Field<char const *> const *,
-                             CORBA::tk_struct,
+                             CORBA::TypeCode_ptr const *,
+                             TAO::TypeCode::Struct_Field<char const *,
+                                                         CORBA::TypeCode_ptr const *> const *,
                              TAO::Null_RefCount_Policy>
   _tao_tc_CORBA_InterfaceDescription (
+    CORBA::tk_struct,
     "IDL:omg.org/CORBA/InterfaceDescription:1.0",
     "InterfaceDescription",
     _tao_fields_CORBA_InterfaceDescription,
@@ -1005,7 +1043,7 @@ namespace CORBA
 // TAO_IDL - Generated from
 // be/be_visitor_typecode/struct_typecode.cpp:34
 
-static TAO::TypeCode::Struct_Field<char const *> _tao_fields_CORBA_InterfaceAttrExtension_ExtFullInterfaceDescription[] =
+static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_InterfaceAttrExtension_ExtFullInterfaceDescription[] =
   {
     { "name", &CORBA::_tc_Identifier },
     { "id", &CORBA::_tc_RepositoryId },
@@ -1018,10 +1056,12 @@ static TAO::TypeCode::Struct_Field<char const *> _tao_fields_CORBA_InterfaceAttr
     
   };
 static TAO::TypeCode::Struct<char const *,
-                             TAO::TypeCode::Struct_Field<char const *> const *,
-                             CORBA::tk_struct,
+                             CORBA::TypeCode_ptr const *,
+                             TAO::TypeCode::Struct_Field<char const *,
+                                                         CORBA::TypeCode_ptr const *> const *,
                              TAO::Null_RefCount_Policy>
   _tao_tc_CORBA_InterfaceAttrExtension_ExtFullInterfaceDescription (
+    CORBA::tk_struct,
     "IDL:omg.org/CORBA/InterfaceAttrExtension/ExtFullInterfaceDescription:1.0",
     "ExtFullInterfaceDescription",
     _tao_fields_CORBA_InterfaceAttrExtension_ExtFullInterfaceDescription,
@@ -1176,7 +1216,7 @@ TAO::Any_Impl_T<CORBA::Repository>::to_object (
   ) const
 {
   _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
+  return true;
 }
 
 // Copying insertion.
@@ -1231,7 +1271,7 @@ TAO::Any_Impl_T<CORBA::ModuleDef>::to_object (
   ) const
 {
   _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
+  return true;
 }
 
 // Copying insertion.
@@ -1344,7 +1384,7 @@ TAO::Any_Impl_T<CORBA::ConstantDef>::to_object (
   ) const
 {
   _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
+  return true;
 }
 
 // Copying insertion.
@@ -1457,7 +1497,7 @@ TAO::Any_Impl_T<CORBA::StructDef>::to_object (
   ) const
 {
   _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
+  return true;
 }
 
 // Copying insertion.
@@ -1512,7 +1552,7 @@ TAO::Any_Impl_T<CORBA::UnionDef>::to_object (
   ) const
 {
   _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
+  return true;
 }
 
 // Copying insertion.
@@ -1567,7 +1607,7 @@ TAO::Any_Impl_T<CORBA::EnumDef>::to_object (
   ) const
 {
   _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
+  return true;
 }
 
 // Copying insertion.
@@ -1622,7 +1662,7 @@ TAO::Any_Impl_T<CORBA::AliasDef>::to_object (
   ) const
 {
   _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
+  return true;
 }
 
 // Copying insertion.
@@ -1677,7 +1717,7 @@ TAO::Any_Impl_T<CORBA::NativeDef>::to_object (
   ) const
 {
   _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
+  return true;
 }
 
 // Copying insertion.
@@ -1732,7 +1772,7 @@ TAO::Any_Impl_T<CORBA::PrimitiveDef>::to_object (
   ) const
 {
   _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
+  return true;
 }
 
 // Copying insertion.
@@ -1787,7 +1827,7 @@ TAO::Any_Impl_T<CORBA::StringDef>::to_object (
   ) const
 {
   _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
+  return true;
 }
 
 // Copying insertion.
@@ -1842,7 +1882,7 @@ TAO::Any_Impl_T<CORBA::WstringDef>::to_object (
   ) const
 {
   _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
+  return true;
 }
 
 // Copying insertion.
@@ -1897,7 +1937,7 @@ TAO::Any_Impl_T<CORBA::SequenceDef>::to_object (
   ) const
 {
   _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
+  return true;
 }
 
 // Copying insertion.
@@ -1952,7 +1992,7 @@ TAO::Any_Impl_T<CORBA::ArrayDef>::to_object (
   ) const
 {
   _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
+  return true;
 }
 
 // Copying insertion.
@@ -2007,7 +2047,7 @@ TAO::Any_Impl_T<CORBA::ExceptionDef>::to_object (
   ) const
 {
   _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
+  return true;
 }
 
 // Copying insertion.
@@ -2148,7 +2188,7 @@ TAO::Any_Impl_T<CORBA::AttributeDef>::to_object (
   ) const
 {
   _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
+  return true;
 }
 
 // Copying insertion.
@@ -2319,7 +2359,7 @@ TAO::Any_Impl_T<CORBA::ExtAttributeDef>::to_object (
   ) const
 {
   _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
+  return true;
 }
 
 // Copying insertion.
@@ -2576,7 +2616,7 @@ TAO::Any_Impl_T<CORBA::OperationDef>::to_object (
   ) const
 {
   _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
+  return true;
 }
 
 // Copying insertion.
@@ -2921,7 +2961,7 @@ TAO::Any_Impl_T<CORBA::InterfaceDef>::to_object (
   ) const
 {
   _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
+  return true;
 }
 
 // Copying insertion.
@@ -3092,7 +3132,7 @@ TAO::Any_Impl_T<CORBA::InterfaceAttrExtension>::to_object (
   ) const
 {
   _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
+  return true;
 }
 
 // Copying insertion.
@@ -3205,7 +3245,7 @@ TAO::Any_Impl_T<CORBA::ExtInterfaceDef>::to_object (
   ) const
 {
   _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
+  return true;
 }
 
 // Copying insertion.
@@ -3260,7 +3300,7 @@ TAO::Any_Impl_T<CORBA::AbstractInterfaceDef>::to_object (
   ) const
 {
   _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
+  return true;
 }
 
 // Copying insertion.
@@ -3315,7 +3355,7 @@ TAO::Any_Impl_T<CORBA::ExtAbstractInterfaceDef>::to_object (
   ) const
 {
   _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
+  return true;
 }
 
 // Copying insertion.
@@ -3370,7 +3410,7 @@ TAO::Any_Impl_T<CORBA::LocalInterfaceDef>::to_object (
   ) const
 {
   _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
+  return true;
 }
 
 // Copying insertion.
@@ -3425,7 +3465,7 @@ TAO::Any_Impl_T<CORBA::ExtLocalInterfaceDef>::to_object (
   ) const
 {
   _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
+  return true;
 }
 
 // Copying insertion.
diff --git a/TAO/tao/IFR_Client/IFR_ComponentsA.cpp b/TAO/tao/IFR_Client/IFR_ComponentsA.cpp
index b4e236554c8..f2e702a0a96 100644
--- a/TAO/tao/IFR_Client/IFR_ComponentsA.cpp
+++ b/TAO/tao/IFR_Client/IFR_ComponentsA.cpp
@@ -146,7 +146,7 @@ namespace CORBA
 // TAO_IDL - Generated from
 // be/be_visitor_typecode/struct_typecode.cpp:34
 
-static TAO::TypeCode::Struct_Field<char const *> _tao_fields_CORBA_ComponentIR_ProvidesDescription[] =
+static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_ComponentIR_ProvidesDescription[] =
   {
     { "name", &CORBA::_tc_Identifier },
     { "id", &CORBA::_tc_RepositoryId },
@@ -156,10 +156,12 @@ static TAO::TypeCode::Struct_Field<char const *> _tao_fields_CORBA_ComponentIR_P
     
   };
 static TAO::TypeCode::Struct<char const *,
-                             TAO::TypeCode::Struct_Field<char const *> const *,
-                             CORBA::tk_struct,
+                             CORBA::TypeCode_ptr const *,
+                             TAO::TypeCode::Struct_Field<char const *,
+                                                         CORBA::TypeCode_ptr const *> const *,
                              TAO::Null_RefCount_Policy>
   _tao_tc_CORBA_ComponentIR_ProvidesDescription (
+    CORBA::tk_struct,
     "IDL:omg.org/CORBA/ComponentIR/ProvidesDescription:1.0",
     "ProvidesDescription",
     _tao_fields_CORBA_ComponentIR_ProvidesDescription,
@@ -200,7 +202,7 @@ namespace CORBA
 // TAO_IDL - Generated from
 // be/be_visitor_typecode/struct_typecode.cpp:34
 
-static TAO::TypeCode::Struct_Field<char const *> _tao_fields_CORBA_ComponentIR_UsesDescription[] =
+static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_ComponentIR_UsesDescription[] =
   {
     { "name", &CORBA::_tc_Identifier },
     { "id", &CORBA::_tc_RepositoryId },
@@ -211,10 +213,12 @@ static TAO::TypeCode::Struct_Field<char const *> _tao_fields_CORBA_ComponentIR_U
     
   };
 static TAO::TypeCode::Struct<char const *,
-                             TAO::TypeCode::Struct_Field<char const *> const *,
-                             CORBA::tk_struct,
+                             CORBA::TypeCode_ptr const *,
+                             TAO::TypeCode::Struct_Field<char const *,
+                                                         CORBA::TypeCode_ptr const *> const *,
                              TAO::Null_RefCount_Policy>
   _tao_tc_CORBA_ComponentIR_UsesDescription (
+    CORBA::tk_struct,
     "IDL:omg.org/CORBA/ComponentIR/UsesDescription:1.0",
     "UsesDescription",
     _tao_fields_CORBA_ComponentIR_UsesDescription,
@@ -255,7 +259,7 @@ namespace CORBA
 // TAO_IDL - Generated from
 // be/be_visitor_typecode/struct_typecode.cpp:34
 
-static TAO::TypeCode::Struct_Field<char const *> _tao_fields_CORBA_ComponentIR_EventPortDescription[] =
+static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_ComponentIR_EventPortDescription[] =
   {
     { "name", &CORBA::_tc_Identifier },
     { "id", &CORBA::_tc_RepositoryId },
@@ -265,10 +269,12 @@ static TAO::TypeCode::Struct_Field<char const *> _tao_fields_CORBA_ComponentIR_E
     
   };
 static TAO::TypeCode::Struct<char const *,
-                             TAO::TypeCode::Struct_Field<char const *> const *,
-                             CORBA::tk_struct,
+                             CORBA::TypeCode_ptr const *,
+                             TAO::TypeCode::Struct_Field<char const *,
+                                                         CORBA::TypeCode_ptr const *> const *,
                              TAO::Null_RefCount_Policy>
   _tao_tc_CORBA_ComponentIR_EventPortDescription (
+    CORBA::tk_struct,
     "IDL:omg.org/CORBA/ComponentIR/EventPortDescription:1.0",
     "EventPortDescription",
     _tao_fields_CORBA_ComponentIR_EventPortDescription,
@@ -375,13 +381,14 @@ namespace CORBA
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:743
+// be/be_visitor_typecode/typecode_defn.cpp:914
 
 namespace TAO
 {
   namespace TypeCode
   {
-    TAO::TypeCode::Sequence<TAO::Null_RefCount_Policy>
+    TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
       CORBA_ComponentIR_ProvidesDescriptionSeq_0 (
         CORBA::tk_sequence,
         &CORBA::ComponentIR::_tc_ProvidesDescription,
@@ -394,6 +401,8 @@ namespace TAO
 }
 
 static TAO::TypeCode::Alias<char const *,
+                            CORBA::TypeCode_ptr const *,
+                            CORBA::tk_alias,
                             TAO::Null_RefCount_Policy>
   _tao_tc_CORBA_ComponentIR_ProvidesDescriptionSeq (
     "IDL:omg.org/CORBA/ComponentIR/ProvidesDescriptionSeq:1.0",
@@ -417,13 +426,14 @@ namespace CORBA
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:743
+// be/be_visitor_typecode/typecode_defn.cpp:914
 
 namespace TAO
 {
   namespace TypeCode
   {
-    TAO::TypeCode::Sequence<TAO::Null_RefCount_Policy>
+    TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
       CORBA_ComponentIR_UsesDescriptionSeq_0 (
         CORBA::tk_sequence,
         &CORBA::ComponentIR::_tc_UsesDescription,
@@ -436,6 +446,8 @@ namespace TAO
 }
 
 static TAO::TypeCode::Alias<char const *,
+                            CORBA::TypeCode_ptr const *,
+                            CORBA::tk_alias,
                             TAO::Null_RefCount_Policy>
   _tao_tc_CORBA_ComponentIR_UsesDescriptionSeq (
     "IDL:omg.org/CORBA/ComponentIR/UsesDescriptionSeq:1.0",
@@ -459,13 +471,14 @@ namespace CORBA
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:743
+// be/be_visitor_typecode/typecode_defn.cpp:914
 
 namespace TAO
 {
   namespace TypeCode
   {
-    TAO::TypeCode::Sequence<TAO::Null_RefCount_Policy>
+    TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
       CORBA_ComponentIR_EventPortDescriptionSeq_0 (
         CORBA::tk_sequence,
         &CORBA::ComponentIR::_tc_EventPortDescription,
@@ -478,6 +491,8 @@ namespace TAO
 }
 
 static TAO::TypeCode::Alias<char const *,
+                            CORBA::TypeCode_ptr const *,
+                            CORBA::tk_alias,
                             TAO::Null_RefCount_Policy>
   _tao_tc_CORBA_ComponentIR_EventPortDescriptionSeq (
     "IDL:omg.org/CORBA/ComponentIR/EventPortDescriptionSeq:1.0",
@@ -498,7 +513,7 @@ namespace CORBA
 // TAO_IDL - Generated from
 // be/be_visitor_typecode/struct_typecode.cpp:34
 
-static TAO::TypeCode::Struct_Field<char const *> _tao_fields_CORBA_ComponentIR_ComponentDescription[] =
+static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_ComponentIR_ComponentDescription[] =
   {
     { "name", &CORBA::_tc_Identifier },
     { "id", &CORBA::_tc_RepositoryId },
@@ -516,10 +531,12 @@ static TAO::TypeCode::Struct_Field<char const *> _tao_fields_CORBA_ComponentIR_C
     
   };
 static TAO::TypeCode::Struct<char const *,
-                             TAO::TypeCode::Struct_Field<char const *> const *,
-                             CORBA::tk_struct,
+                             CORBA::TypeCode_ptr const *,
+                             TAO::TypeCode::Struct_Field<char const *,
+                                                         CORBA::TypeCode_ptr const *> const *,
                              TAO::Null_RefCount_Policy>
   _tao_tc_CORBA_ComponentIR_ComponentDescription (
+    CORBA::tk_struct,
     "IDL:omg.org/CORBA/ComponentIR/ComponentDescription:1.0",
     "ComponentDescription",
     _tao_fields_CORBA_ComponentIR_ComponentDescription,
@@ -602,7 +619,7 @@ namespace CORBA
 // TAO_IDL - Generated from
 // be/be_visitor_typecode/struct_typecode.cpp:34
 
-static TAO::TypeCode::Struct_Field<char const *> _tao_fields_CORBA_ComponentIR_HomeDescription[] =
+static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_ComponentIR_HomeDescription[] =
   {
     { "name", &CORBA::_tc_Identifier },
     { "id", &CORBA::_tc_RepositoryId },
@@ -619,10 +636,12 @@ static TAO::TypeCode::Struct_Field<char const *> _tao_fields_CORBA_ComponentIR_H
     
   };
 static TAO::TypeCode::Struct<char const *,
-                             TAO::TypeCode::Struct_Field<char const *> const *,
-                             CORBA::tk_struct,
+                             CORBA::TypeCode_ptr const *,
+                             TAO::TypeCode::Struct_Field<char const *,
+                                                         CORBA::TypeCode_ptr const *> const *,
                              TAO::Null_RefCount_Policy>
   _tao_tc_CORBA_ComponentIR_HomeDescription (
+    CORBA::tk_struct,
     "IDL:omg.org/CORBA/ComponentIR/HomeDescription:1.0",
     "HomeDescription",
     _tao_fields_CORBA_ComponentIR_HomeDescription,
@@ -649,7 +668,7 @@ TAO::Any_Impl_T<CORBA::ComponentIR::EventDef>::to_object (
   ) const
 {
   _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
+  return true;
 }
 
 // Copying insertion.
@@ -704,7 +723,7 @@ TAO::Any_Impl_T<CORBA::ComponentIR::Container>::to_object (
   ) const
 {
   _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
+  return true;
 }
 
 // Copying insertion.
@@ -759,7 +778,7 @@ TAO::Any_Impl_T<CORBA::ComponentIR::ModuleDef>::to_object (
   ) const
 {
   _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
+  return true;
 }
 
 // Copying insertion.
@@ -814,7 +833,7 @@ TAO::Any_Impl_T<CORBA::ComponentIR::Repository>::to_object (
   ) const
 {
   _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
+  return true;
 }
 
 // Copying insertion.
@@ -869,7 +888,7 @@ TAO::Any_Impl_T<CORBA::ComponentIR::ProvidesDef>::to_object (
   ) const
 {
   _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
+  return true;
 }
 
 // Copying insertion.
@@ -982,7 +1001,7 @@ TAO::Any_Impl_T<CORBA::ComponentIR::UsesDef>::to_object (
   ) const
 {
   _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
+  return true;
 }
 
 // Copying insertion.
@@ -1095,7 +1114,7 @@ TAO::Any_Impl_T<CORBA::ComponentIR::EventPortDef>::to_object (
   ) const
 {
   _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
+  return true;
 }
 
 // Copying insertion.
@@ -1208,7 +1227,7 @@ TAO::Any_Impl_T<CORBA::ComponentIR::EmitsDef>::to_object (
   ) const
 {
   _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
+  return true;
 }
 
 // Copying insertion.
@@ -1263,7 +1282,7 @@ TAO::Any_Impl_T<CORBA::ComponentIR::PublishesDef>::to_object (
   ) const
 {
   _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
+  return true;
 }
 
 // Copying insertion.
@@ -1318,7 +1337,7 @@ TAO::Any_Impl_T<CORBA::ComponentIR::ConsumesDef>::to_object (
   ) const
 {
   _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
+  return true;
 }
 
 // Copying insertion.
@@ -1373,7 +1392,7 @@ TAO::Any_Impl_T<CORBA::ComponentIR::ComponentDef>::to_object (
   ) const
 {
   _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
+  return true;
 }
 
 // Copying insertion.
@@ -1660,7 +1679,7 @@ TAO::Any_Impl_T<CORBA::ComponentIR::FactoryDef>::to_object (
   ) const
 {
   _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
+  return true;
 }
 
 // Copying insertion.
@@ -1715,7 +1734,7 @@ TAO::Any_Impl_T<CORBA::ComponentIR::FinderDef>::to_object (
   ) const
 {
   _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
+  return true;
 }
 
 // Copying insertion.
@@ -1770,7 +1789,7 @@ TAO::Any_Impl_T<CORBA::ComponentIR::HomeDef>::to_object (
   ) const
 {
   _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
+  return true;
 }
 
 // Copying insertion.
diff --git a/TAO/tao/IFR_Client/IFR_ExtendedA.cpp b/TAO/tao/IFR_Client/IFR_ExtendedA.cpp
index c272ef171b7..3205e786427 100644
--- a/TAO/tao/IFR_Client/IFR_ExtendedA.cpp
+++ b/TAO/tao/IFR_Client/IFR_ExtendedA.cpp
@@ -59,7 +59,7 @@ namespace CORBA
 // TAO_IDL - Generated from
 // be/be_visitor_typecode/struct_typecode.cpp:34
 
-static TAO::TypeCode::Struct_Field<char const *> _tao_fields_CORBA_ValueMember[] =
+static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_ValueMember[] =
   {
     { "name", &CORBA::_tc_Identifier },
     { "id", &CORBA::_tc_RepositoryId },
@@ -71,10 +71,12 @@ static TAO::TypeCode::Struct_Field<char const *> _tao_fields_CORBA_ValueMember[]
     
   };
 static TAO::TypeCode::Struct<char const *,
-                             TAO::TypeCode::Struct_Field<char const *> const *,
-                             CORBA::tk_struct,
+                             CORBA::TypeCode_ptr const *,
+                             TAO::TypeCode::Struct_Field<char const *,
+                                                         CORBA::TypeCode_ptr const *> const *,
                              TAO::Null_RefCount_Policy>
   _tao_tc_CORBA_ValueMember (
+    CORBA::tk_struct,
     "IDL:omg.org/CORBA/ValueMember:1.0",
     "ValueMember",
     _tao_fields_CORBA_ValueMember,
@@ -94,13 +96,14 @@ namespace CORBA
 
 
 // TAO_IDL - Generated from
-// be/be_visitor_typecode/typecode_defn.cpp:743
+// be/be_visitor_typecode/typecode_defn.cpp:914
 
 namespace TAO
 {
   namespace TypeCode
   {
-    TAO::TypeCode::Sequence<TAO::Null_RefCount_Policy>
+    TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *,
+                            TAO::Null_RefCount_Policy>
       CORBA_ValueMemberSeq_0 (
         CORBA::tk_sequence,
         &CORBA::_tc_ValueMember,
@@ -113,6 +116,8 @@ namespace TAO
 }
 
 static TAO::TypeCode::Alias<char const *,
+                            CORBA::TypeCode_ptr const *,
+                            CORBA::tk_alias,
                             TAO::Null_RefCount_Policy>
   _tao_tc_CORBA_ValueMemberSeq (
     "IDL:omg.org/CORBA/ValueMemberSeq:1.0",
@@ -148,7 +153,7 @@ namespace CORBA
 // TAO_IDL - Generated from
 // be/be_visitor_typecode/struct_typecode.cpp:34
 
-static TAO::TypeCode::Struct_Field<char const *> _tao_fields_CORBA_ValueDef_FullValueDescription[] =
+static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_ValueDef_FullValueDescription[] =
   {
     { "name", &CORBA::_tc_Identifier },
     { "id", &CORBA::_tc_RepositoryId },
@@ -168,10 +173,12 @@ static TAO::TypeCode::Struct_Field<char const *> _tao_fields_CORBA_ValueDef_Full
     
   };
 static TAO::TypeCode::Struct<char const *,
-                             TAO::TypeCode::Struct_Field<char const *> const *,
-                             CORBA::tk_struct,
+                             CORBA::TypeCode_ptr const *,
+                             TAO::TypeCode::Struct_Field<char const *,
+                                                         CORBA::TypeCode_ptr const *> const *,
                              TAO::Null_RefCount_Policy>
   _tao_tc_CORBA_ValueDef_FullValueDescription (
+    CORBA::tk_struct,
     "IDL:omg.org/CORBA/ValueDef/FullValueDescription:1.0",
     "FullValueDescription",
     _tao_fields_CORBA_ValueDef_FullValueDescription,
@@ -201,7 +208,7 @@ namespace CORBA
 // TAO_IDL - Generated from
 // be/be_visitor_typecode/struct_typecode.cpp:34
 
-static TAO::TypeCode::Struct_Field<char const *> _tao_fields_CORBA_ValueDescription[] =
+static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_ValueDescription[] =
   {
     { "name", &CORBA::_tc_Identifier },
     { "id", &CORBA::_tc_RepositoryId },
@@ -216,10 +223,12 @@ static TAO::TypeCode::Struct_Field<char const *> _tao_fields_CORBA_ValueDescript
     
   };
 static TAO::TypeCode::Struct<char const *,
-                             TAO::TypeCode::Struct_Field<char const *> const *,
-                             CORBA::tk_struct,
+                             CORBA::TypeCode_ptr const *,
+                             TAO::TypeCode::Struct_Field<char const *,
+                                                         CORBA::TypeCode_ptr const *> const *,
                              TAO::Null_RefCount_Policy>
   _tao_tc_CORBA_ValueDescription (
+    CORBA::tk_struct,
     "IDL:omg.org/CORBA/ValueDescription:1.0",
     "ValueDescription",
     _tao_fields_CORBA_ValueDescription,
@@ -236,7 +245,7 @@ namespace CORBA
 // TAO_IDL - Generated from
 // be/be_visitor_typecode/struct_typecode.cpp:34
 
-static TAO::TypeCode::Struct_Field<char const *> _tao_fields_CORBA_ExtValueDef_ExtFullValueDescription[] =
+static TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const _tao_fields_CORBA_ExtValueDef_ExtFullValueDescription[] =
   {
     { "name", &CORBA::_tc_Identifier },
     { "id", &CORBA::_tc_RepositoryId },
@@ -256,10 +265,12 @@ static TAO::TypeCode::Struct_Field<char const *> _tao_fields_CORBA_ExtValueDef_E
     
   };
 static TAO::TypeCode::Struct<char const *,
-                             TAO::TypeCode::Struct_Field<char const *> const *,
-                             CORBA::tk_struct,
+                             CORBA::TypeCode_ptr const *,
+                             TAO::TypeCode::Struct_Field<char const *,
+                                                         CORBA::TypeCode_ptr const *> const *,
                              TAO::Null_RefCount_Policy>
   _tao_tc_CORBA_ExtValueDef_ExtFullValueDescription (
+    CORBA::tk_struct,
     "IDL:omg.org/CORBA/ExtValueDef/ExtFullValueDescription:1.0",
     "ExtFullValueDescription",
     _tao_fields_CORBA_ExtValueDef_ExtFullValueDescription,
@@ -314,7 +325,7 @@ TAO::Any_Impl_T<CORBA::FixedDef>::to_object (
   ) const
 {
   _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
+  return true;
 }
 
 // Copying insertion.
@@ -485,7 +496,7 @@ TAO::Any_Impl_T<CORBA::ValueMemberDef>::to_object (
   ) const
 {
   _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
+  return true;
 }
 
 // Copying insertion.
@@ -540,7 +551,7 @@ TAO::Any_Impl_T<CORBA::ValueDef>::to_object (
   ) const
 {
   _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
+  return true;
 }
 
 // Copying insertion.
@@ -711,7 +722,7 @@ TAO::Any_Impl_T<CORBA::ExtValueDef>::to_object (
   ) const
 {
   _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
+  return true;
 }
 
 // Copying insertion.
@@ -824,7 +835,7 @@ TAO::Any_Impl_T<CORBA::ValueBoxDef>::to_object (
   ) const
 {
   _tao_elem = CORBA::Object::_duplicate (this->value_);
-  return 1;
+  return true;
 }
 
 // Copying insertion.