ChangeLogTag: Sat Dec 14 19:56:13 2002 Jeff Parsons <j.parsons@vanderbilt.edu>

41 files changed, 720 insertions, 600 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 1c94338a815..0643251a72e 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,49 @@
+Sat Dec 14 19:56:13 2002  Jeff Parsons <j.parsons@vanderbilt.edu>
+
+        * TAO_IDL/be/be_visitor_exception/any_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_structure/any_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_union/any_op_cs.cpp:
+        * orbsvcs/orbsvcs/IFRService/AliasDef_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/ArrayDef_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/AttributeDef_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/ConstantDef_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/Contained_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/Container_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/EnumDef_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/ExceptionDef_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/IRObject_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/IRObject_i.h:
+        * orbsvcs/orbsvcs/IFRService/InterfaceDef_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/OperationDef_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/Repository_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/SequenceDef_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/StructDef_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.cpp:
+        * orbsvcs/orbsvcs/IFRService/ValueDef_i.cpp:
+        * orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp:
+        * orbsvcs/tests/InterfaceRepo/IFR_Test/run_test.pl:
+        * orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.cpp:
+        * orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.h:
+        * tao/Any.cpp:
+        * tao/Any.h:
+        * tao/Any_T.cpp:
+        * tao/Any_T.h:
+        * tao/Any_T.inl:
+        * tao/Typecode.cpp:
+        * tao/Typecode.i:
+        * tao/IFR_Client/IFR_BaseC.cpp:
+        * tao/IFR_Client/IFR_BasicC.cpp:
+        * tao/IFR_Client/IFR_ComponentsC.cpp:
+        * tao/IFR_Client/IFR_ExtendedC.cpp:
+        * tao/TypeCodeFactory/TypeCodeFactory_i.cpp:
+        * tao/TypeCodeFactory/TypeCodeFactory_i.h:
+
+	  Debugging the interaction of the optimized IFR and the new
+	  Any implementation.
+
 Fri Dec 13 14:30:19 2002  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * orbsvcs/tests/InterfaceRepo/InterfaceRepo.dsw:
diff --git a/TAO/TAO_IDL/be/be_visitor_exception/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_exception/any_op_cs.cpp
index a28ae69b8d5..03a865cd57b 100644
--- a/TAO/TAO_IDL/be/be_visitor_exception/any_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_exception/any_op_cs.cpp
@@ -64,6 +64,7 @@ be_visitor_exception_any_op_cs::visit_exception (be_exception *node)
       << "TAO::Any_Dual_Impl_T<" << node->name () << ">::insert_copy ("
       << be_idt << be_idt_nl
       << "_tao_any," << be_nl
+      << node->name () << "::_tao_any_destructor," << be_nl
       << node->tc_name () << "," << be_nl
       << "_tao_elem" << be_uidt_nl
       << ");" << be_uidt << be_uidt_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp
index cb76cb1e6be..cd511a70aef 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp
@@ -63,6 +63,7 @@ be_visitor_sequence_any_op_cs::visit_sequence (be_sequence *node)
       << "TAO::Any_Dual_Impl_T<" << node->name () << ">::insert_copy ("
       << be_idt << be_idt_nl
       << "_tao_any," << be_nl
+      << node->name () << "::_tao_any_destructor," << be_nl
       << node->tc_name () << "," << be_nl
       << "_tao_elem" << be_uidt_nl
       << ");" << be_uidt << be_uidt_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp
index 2b5ab74967a..b6cdd411a4e 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/cdr_op_cs.cpp
@@ -122,7 +122,7 @@ be_visitor_sequence_cdr_op_cs::visit_sequence (be_sequence *node)
   this->ctx_->node (node);
 
   *os << be_nl << be_nl << "// TAO_IDL - Generated from" << be_nl
-    << "// " << __FILE__ << ":" << __LINE__;
+    << "// " << __FILE__ << ":" << __LINE__ << be_nl << be_nl;
 
   // If we're an anonymous sequence, we must protect against
   // being declared more than once.
diff --git a/TAO/TAO_IDL/be/be_visitor_structure/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_structure/any_op_cs.cpp
index 5787d809410..d4fc6497d06 100644
--- a/TAO/TAO_IDL/be/be_visitor_structure/any_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_structure/any_op_cs.cpp
@@ -63,6 +63,7 @@ be_visitor_structure_any_op_cs::visit_structure (be_structure *node)
       << "TAO::Any_Dual_Impl_T<" << node->name () << ">::insert_copy ("
       << be_idt << be_idt_nl
       << "_tao_any," << be_nl
+      << node->name () << "::_tao_any_destructor," << be_nl
       << node->tc_name () << "," << be_nl
       << "_tao_elem" << be_uidt_nl
       << ");" << be_uidt << be_uidt_nl
diff --git a/TAO/TAO_IDL/be/be_visitor_union/any_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union/any_op_cs.cpp
index 39be4dc2798..fc97c9ea7c3 100644
--- a/TAO/TAO_IDL/be/be_visitor_union/any_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_union/any_op_cs.cpp
@@ -63,6 +63,7 @@ be_visitor_union_any_op_cs::visit_union (be_union *node)
       << "TAO::Any_Dual_Impl_T<" << node->name () << ">::insert_copy ("
       << be_idt << be_idt_nl
       << "_tao_any," << be_nl
+      << node->name () << "::_tao_any_destructor," << be_nl
       << node->tc_name () << "," << be_nl
       << "_tao_elem" << be_uidt_nl
       << ");" << be_uidt << be_uidt_nl
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.cpp
index 304ee27f298..760844a505b 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/AliasDef_i.cpp
@@ -118,11 +118,11 @@ TAO_AliasDef_i::original_type_def_i (CORBA::IDLType_ptr original_type_def
                                      ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  CORBA::String_var original_type =
+  char *original_type =
     this->reference_to_path (original_type_def);
 
   this->repo_->config ()->set_string_value (this->section_key_,
                                             "original_type",
-                                            original_type.in ());
+                                            original_type);
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.cpp
index cfb58e1f3b7..2bc66837d7d 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ArrayDef_i.cpp
@@ -211,12 +211,12 @@ TAO_ArrayDef_i::element_type_def_i (CORBA::IDLType_ptr element_type_def
   this->destroy_element_type (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  CORBA::String_var new_element_path =
+  char *new_element_path =
     this->reference_to_path (element_type_def);
 
   this->repo_->config ()->set_string_value (this->section_key_,
                                             "element_path",
-                                            new_element_path.in ());
+                                            new_element_path);
 }
 
 void
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.cpp
index 6d1dc2bf062..51fc73ffd77 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/AttributeDef_i.cpp
@@ -140,12 +140,12 @@ TAO_AttributeDef_i::type_def_i (CORBA::IDLType_ptr type_def
                                 ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  CORBA::String_var type_path =
+  char *type_path =
     this->reference_to_path (type_def);
 
   this->repo_->config ()->set_string_value (this->section_key_,
                                             "type_path",
-                                            type_path.in ());
+                                            type_path);
 }
 
 CORBA::AttributeMode
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.cpp
index 90dc0aca568..1fb89f43ecf 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ConstantDef_i.cpp
@@ -159,11 +159,11 @@ TAO_ConstantDef_i::type_def_i (CORBA::IDLType_ptr type_def
                                ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  CORBA::String_var type_path = this->reference_to_path (type_def);
+  char *type_path = this->reference_to_path (type_def);
 
   this->repo_->config ()->set_string_value (this->section_key_,
                                             "type_path",
-                                            type_path.in ());
+                                            type_path);
 }
 
 CORBA::Any *
@@ -204,13 +204,20 @@ TAO_ConstantDef_i::value_i (ACE_ENV_SINGLE_ARG_DECL)
 
   CORBA::Any *retval = 0;
   ACE_NEW_THROW_EX (retval,
-                    CORBA::Any (tc.in (),
-                                0,
-                                TAO_ENCAP_BYTE_ORDER,
-                                &mb),
+                    CORBA::Any,
+                    CORBA::NO_MEMORY ());
+  ACE_CHECK_RETURN (0);
+
+  TAO::Unknown_IDL_Type *impl = 0;
+  ACE_NEW_THROW_EX (impl,
+                    TAO::Unknown_IDL_Type (tc._retn (),
+                                           &mb,
+                                           TAO_ENCAP_BYTE_ORDER,
+                                           1),
                     CORBA::NO_MEMORY ());
   ACE_CHECK_RETURN (0);
 
+  retval->replace (impl);
   safety.release ();
   return retval;
 }
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.cpp
index 6d0ed974e7a..d3201dc1def 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/Contained_i.cpp
@@ -523,12 +523,10 @@ TAO_Contained_i::move_i (CORBA::Container_ptr new_container,
     }
   else
     {
-      CORBA::String_var tmp = this->reference_to_path (new_container);
-
       // The only case where a container is not also a contained is
       // CORBA::Repository, which is covered by the other IF branch, so
       // we're ok here.
-      ACE_TString container_path (tmp.in ());
+      ACE_TString container_path (this->reference_to_path (new_container));
       contained_impl = this->path_to_contained (container_path);
 
       CORBA::Repository_var your_repo =
@@ -992,11 +990,11 @@ TAO_Contained_i::move_pre_process (CORBA::Container_ptr container,
                                    ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  CORBA::String_var container_path = this->reference_to_path (container);
+  char *container_path = this->reference_to_path (container);
 
   ACE_Configuration_Section_Key container_key;
   this->repo_->config ()->expand_path (this->repo_->root_key (),
-                                       container_path.in (),
+                                       container_path,
                                        container_key,
                                        0);
 
@@ -1066,10 +1064,9 @@ TAO_Contained_i::move_contents (CORBA::Container_ptr new_container
       for (u_int i = 0; i < count; ++i)
         {
           ACE_Configuration_Section_Key defn_key;
-          CORBA::String_var section_name = this->int_to_string (i);
           status =
             this->repo_->config ()->open_section (defns_key,
-                                                  section_name.in (),
+                                                  this->int_to_string (i),
                                                   0,
                                                   defn_key);
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Container_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/Container_i.cpp
index e550625dd11..66cb8ec6c6c 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/Container_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/Container_i.cpp
@@ -446,11 +446,10 @@ TAO_Container_i::contents_i (CORBA::DefinitionKind limit_type,
 
       for (u_int i = 0; i < count; ++i)
         {
-          CORBA::String_var section_name = this->int_to_string (i);
           ACE_Configuration_Section_Key defn_key;
           status =
             this->repo_->config ()->open_section (defns_key,
-                                                  section_name.in (),
+                                                  this->int_to_string (i),
                                                   0,
                                                   defn_key);
 
@@ -674,9 +673,7 @@ TAO_Container_i::describe_contents_i (CORBA::DefinitionKind limit_type,
 
   for (CORBA::ULong i = 0; i < ret_len; ++i)
     {
-      tmp = this->reference_to_path (contents[i]);
-
-      ACE_TString contained_path (tmp.in ());
+      ACE_TString contained_path (this->reference_to_path (contents[i]));
       impl = this->path_to_contained (contained_path);
 
       desc = impl->describe_i (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -839,11 +836,11 @@ TAO_Container_i::create_constant_i (const char *id,
 
 
   // Get the path to our type and store it.
-  CORBA::String_var type_path = this->reference_to_path (type);
+  char *type_path = this->reference_to_path (type);
 
   this->repo_->config ()->set_string_value (new_key,
                                             "type_path",
-                                            type_path.in ());
+                                            type_path);
 
   // Store the value.
   ACE_Message_Block *mb = value._tao_get_cdr ();
@@ -962,16 +959,15 @@ TAO_Container_i::create_struct_i (const char *id,
   this->repo_->config ()->set_integer_value (refs_key,
                                              "count",
                                              count);
+  char *member_path = 0;
 
   // Create a section for each member. We just store the
   // member name and the path to its database entry.
   for (CORBA::ULong i = 0; i < count; ++i)
     {
       ACE_Configuration_Section_Key member_key;
-      CORBA::String_var section_name = this->int_to_string (i);
-
       this->repo_->config ()->open_section (refs_key,
-                                            section_name.in (),
+                                            this->int_to_string (i),
                                             1,
                                             member_key);
 
@@ -979,12 +975,12 @@ TAO_Container_i::create_struct_i (const char *id,
                                                 "name",
                                                 members[i].name.in ());
 
-      CORBA::String_var member_path = 
+      member_path = 
         this->reference_to_path (members[i].type_def.in ());
 
       this->repo_->config ()->set_string_value (member_key,
                                                 "path",
-                                                member_path.in ());
+                                                member_path);
     }
 
   CORBA::DefinitionKind def_kind = 
@@ -1078,11 +1074,11 @@ TAO_Container_i::create_union_i (const char *id,
                                           CORBA::dk_Union);
 
   // Add a field to hold the path to the discriminator type.
-  CORBA::String_var disc_path = this->reference_to_path (discriminator_type);
+  char *disc_path = this->reference_to_path (discriminator_type);
 
   this->repo_->config ()->set_string_value (new_key,
                                             "disc_path",
-                                            disc_path.in ());
+                                            disc_path);
 
   ACE_Configuration_Section_Key refs_key;
 
@@ -1096,15 +1092,15 @@ TAO_Container_i::create_union_i (const char *id,
   this->repo_->config ()->set_integer_value (refs_key,
                                              "count",
                                              count);
+  char *member_path = 0;
 
   // Create a section for each member. We store the member
   // name, its label value, and the path to its database entry.
   for (CORBA::ULong i = 0; i < count; ++i)
     {
       ACE_Configuration_Section_Key member_key;
-      CORBA::String_var section_name = this->int_to_string (i);
       this->repo_->config ()->open_section (refs_key,
-                                            section_name.in (),
+                                            this->int_to_string (i),
                                             1,
                                             member_key);
 
@@ -1112,12 +1108,12 @@ TAO_Container_i::create_union_i (const char *id,
                                                 "name",
                                                 members[i].name.in ());
 
-      CORBA::String_var member_path =
+      member_path =
         this->reference_to_path (members[i].type_def.in ());
 
       this->repo_->config ()->set_string_value (member_key,
                                                 "path",
-                                                member_path.in ());
+                                                member_path);
 
       this->store_label (member_key,
                          members[i].label
@@ -1222,9 +1218,8 @@ TAO_Container_i::create_enum_i (const char *id,
   for (CORBA::ULong i = 0; i < count; i++)
     {
       ACE_Configuration_Section_Key member_key;
-      CORBA::String_var section_name = this->int_to_string (i);
       this->repo_->config ()->open_section (new_key,
-                                            section_name.in (),
+                                            this->int_to_string (i),
                                             1,
                                             member_key);
 
@@ -1321,11 +1316,11 @@ TAO_Container_i::create_alias_i (const char *id,
                                           CORBA::dk_Alias);
 
   // Get the path to our original type and store it.
-  CORBA::String_var unalias_path = this->reference_to_path (original_type);
+  char *unalias_path = this->reference_to_path (original_type);
 
   this->repo_->config ()->set_string_value (new_key,
                                             "original_type",
-                                            unalias_path.in ());
+                                            unalias_path);
 
   // Create the object reference.
   CORBA::Object_var obj =
@@ -1413,18 +1408,17 @@ TAO_Container_i::create_interface_i (const char *id,
                                             "inherited",
                                             1,
                                             inherited_key);
+      char *inherited_path = 0;
 
       // Store the path to each base interface.
       for (CORBA::ULong i = 0; i < length; ++i)
         {
-          CORBA::String_var inherited_path = 
+          inherited_path = 
             this->reference_to_path (base_interfaces[i]);
 
-          CORBA::String_var section_name = this->int_to_string (i);
-
           this->repo_->config ()->set_string_value (inherited_key,
-                                                    section_name.in (),
-                                                    inherited_path.in ());
+                                                    this->int_to_string (i),
+                                                    inherited_path);
         }
     }
 
@@ -1554,11 +1548,11 @@ TAO_Container_i::create_value_box_i (const char *id,
                                           CORBA::dk_ValueBox);
 
   // Get the path to our original type and store it.
-  CORBA::String_var boxed_path = this->reference_to_path (original_type_def);
+  char *boxed_path = this->reference_to_path (original_type_def);
 
   this->repo_->config ()->set_string_value (new_key,
                                             "boxed_type",
-                                            boxed_path.in ());
+                                            boxed_path);
 
   // Create the object reference.
   CORBA::Object_var obj =
@@ -1645,15 +1639,15 @@ TAO_Container_i::create_exception_i (const char *id,
   this->repo_->config ()->set_integer_value (refs_key,
                                              "count",
                                              count);
+  char *member_path = 0;
 
   // Create a section for each member. We just store the
   // member name and the path to its database entry.
   for (CORBA::ULong i = 0; i < count; ++i)
     {
       ACE_Configuration_Section_Key member_key;
-      CORBA::String_var section_name = this->int_to_string (i);
       this->repo_->config ()->open_section (refs_key,
-                                            section_name.in (),
+                                            this->int_to_string (i),
                                             1,
                                             member_key);
 
@@ -1661,12 +1655,12 @@ TAO_Container_i::create_exception_i (const char *id,
                                                 "name",
                                                 members[i].name.in ());
 
-      CORBA::String_var member_path = 
+      member_path = 
         this->reference_to_path (members[i].type_def.in ());
 
       this->repo_->config ()->set_string_value (member_key,
                                                 "path",
-                                                member_path.in ());
+                                                member_path);
     }
 
   // Create the object reference.
@@ -1833,18 +1827,17 @@ TAO_Container_i::create_abstract_interface_i (
                                             "inherited",
                                             1,
                                             inherited_key);
+      char *inherited_path = 0;
 
       // Store the path to each base interface.
       for (CORBA::ULong i = 0; i < length; ++i)
         {
-          CORBA::String_var inherited_path = 
+          inherited_path = 
             this->reference_to_path (base_interfaces[i]);
 
-          CORBA::String_var section_name = this->int_to_string (i);
-
           this->repo_->config ()->set_string_value (inherited_key,
-                                                    section_name.in (),
-                                                    inherited_path.in ());
+                                                    this->int_to_string (i),
+                                                    inherited_path);
         }
     }
 
@@ -1938,18 +1931,17 @@ TAO_Container_i::create_local_interface_i (
                                             "inherited",
                                             1,
                                             inherited_key);
+      char *inherited_path = 0;
 
       // Store the path to each base interface.
       for (CORBA::ULong i = 0; i < length; ++i)
         {
-          CORBA::String_var inherited_path =
+          inherited_path =
             this->reference_to_path (base_interfaces[i]);
 
-          CORBA::String_var section_name = this->int_to_string (i);
-
           this->repo_->config ()->set_string_value (inherited_key,
-                                                    section_name.in (),
-                                                    inherited_path.in ());
+                                                    this->int_to_string (i),
+                                                    inherited_path);
         }
     }
 
@@ -2470,9 +2462,9 @@ TAO_Container_i::create_common (
                                              "count",
                                              defn_count);
 
-  CORBA::String_var section_name = this->int_to_string (defn_count);
+  char *section_name = this->int_to_string (defn_count);
   this->repo_->config ()->open_section (sub_key,
-                                        section_name.in (),
+                                        section_name,
                                         1,
                                         new_key);
 
@@ -2544,7 +2536,7 @@ TAO_Container_i::create_common (
     }
 
   path += sub_section;
-  path += section_name.in ();
+  path += section_name;
 
   // Store our path under our global repo id for fast lookup.
   this->repo_->config ()->set_string_value (this->repo_->repo_ids_key (),
@@ -2781,9 +2773,8 @@ TAO_Container_i::update_refs (const char *path,
 
   // Add a new reference.
   ACE_Configuration_Section_Key new_key;
-  CORBA::String_var new_section_name = this->int_to_string (count);
   this->repo_->config ()->open_section (refs_key,
-                                        new_section_name.in (),
+                                        this->int_to_string (count),
                                         1,
                                         new_key);
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.cpp
index 9185580bf31..4d5a83bd1b3 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/EnumDef_i.cpp
@@ -94,9 +94,8 @@ TAO_EnumDef_i::members_i (ACE_ENV_SINGLE_ARG_DECL)
   for (u_int i = 0; i < count; ++i)
     {
       ACE_Configuration_Section_Key member_key;
-      CORBA::String_var section_name = this->int_to_string (i);
       this->repo_->config ()->open_section (this->section_key_,
-                                            section_name.in (),
+                                            this->int_to_string (i),
                                             0,
                                             member_key);
 
@@ -142,13 +141,12 @@ TAO_EnumDef_i::members_i (const CORBA::EnumMemberSeq &members
  for (CORBA::ULong i = 0; i < count; ++i)
     {
       ACE_Configuration_Section_Key member_key;
-      CORBA::String_var section_name = this->int_to_string (i);
       this->repo_->config ()->open_section (this->section_key_,
-                                            section_name.in (),
+                                            this->int_to_string (i),
                                             1,
                                             member_key);
 
-      ACE_TString member_name (members[i]);
+      ACE_TString member_name (members[i].in ());
       this->repo_->config ()->set_string_value (member_key,
                                                 "name",
                                                 member_name);
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.cpp
index 170b8c897cc..dc9291ce411 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ExceptionDef_i.cpp
@@ -181,9 +181,8 @@ TAO_ExceptionDef_i::members_i (ACE_ENV_SINGLE_ARG_DECL)
   for (u_int i = 0; i < count; ++i)
     {
       ACE_Configuration_Section_Key member_key;
-      CORBA::String_var section_name = this->int_to_string (i);
       this->repo_->config ()->open_section (refs_key,
-                                            section_name.in (),
+                                            this->int_to_string (i),
                                             0,
                                             member_key);
 
@@ -309,15 +308,15 @@ TAO_ExceptionDef_i::members_i (const CORBA::StructMemberSeq &members
                                             "refs",
                                             1,
                                             refs_key);
+      char *path = 0;
 
       // Create a section for each new member. We just store the
       // member name and the path to its database entry.
       for (CORBA::ULong i = 0; i < count; ++i)
         {
           ACE_Configuration_Section_Key member_key;
-          CORBA::String_var section_name = this->int_to_string (i);
           this->repo_->config ()->open_section (refs_key,
-                                                section_name.in (),
+                                                this->int_to_string (i),
                                                 1,
                                                 member_key);
 
@@ -326,12 +325,12 @@ TAO_ExceptionDef_i::members_i (const CORBA::StructMemberSeq &members
                                                     "name",
                                                     name);
 
-          CORBA::String_var path = 
+          path = 
             this->reference_to_path (members[i].type_def.in ());
 
           this->repo_->config ()->set_string_value (member_key,
                                                     "path",
-                                                    path.in ());
+                                                    path);
         }
 
       this->repo_->config ()->set_integer_value (refs_key,
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.cpp
index 530ef8158d9..34465bbb440 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.cpp
@@ -6,8 +6,8 @@
 #include "IDLType_i.h"
 #include "Contained_i.h"
 
-#include "tao/Object_KeyC.h"
 #include "tao/PortableServer/POA.h"
+#include "tao/ORB_Core.h"
 
 ACE_RCSID (IFR_Service, 
            IRObject_i, 
@@ -33,12 +33,22 @@ void
 TAO_IRObject_i::update_key (ACE_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  PortableServer::ObjectId_var oid =
-    this->repo_->poa_current ()->get_object_id ();
-  ACE_CHECK;
+  TAO_POA_Current_Impl *pc_impl =
+    ACE_static_cast (TAO_POA_Current_Impl *,
+                     TAO_TSS_RESOURCES::instance ()->poa_current_impl_);
+
+  TAO_ObjectKey object_key = pc_impl->object_key ();
+  PortableServer::ObjectId object_id;
+  int status = TAO_POA::parse_ir_object_key (object_key,
+                                             object_id);
+  if (status != 0)
+    {
+      ACE_DEBUG ((LM_DEBUG,
+                  "update_key - parse_ir_object_key failed\n"));
+      return;
+    }
 
-  CORBA::String_var oid_string =
-    PortableServer::ObjectId_to_string (oid.in ());
+  char *oid_string = this->oid_to_string (object_id);
 
   if (oid_string[0U] == '\0')
     {
@@ -46,9 +56,9 @@ TAO_IRObject_i::update_key (ACE_ENV_SINGLE_ARG_DECL)
       return;
     }
 
-  int status = 
+  status = 
     this->repo_->config ()->expand_path (this->repo_->root_key (),
-                                         oid_string.in (),
+                                         oid_string,
                                          this->section_key_,
                                          0);
 
@@ -60,21 +70,21 @@ TAO_IRObject_i::update_key (ACE_ENV_SINGLE_ARG_DECL)
 }
 
 char *
-TAO_IRObject_i::int_to_string (CORBA::ULong number) const
+TAO_IRObject_i::int_to_string (CORBA::ULong number)
 {
-  char retval[9];
-
-  ACE_OS::sprintf (retval, "%8.8X", number);
-
-  return CORBA::string_dup (retval);
+  static char hex_string[9];
+  ACE_OS::sprintf ((char *) hex_string, 
+                   "%8.8X", 
+                   number);
+  return (char *) hex_string;
 }
 
 char *
 TAO_IRObject_i::reference_to_path (CORBA::IRObject_ptr obj)
 {
   PortableServer::ObjectId object_id;
-  TAO_ObjectKey_var object_key = obj->_key ();
-  int status = TAO_POA::parse_ir_object_key (object_key.in (),
+  TAO_ObjectKey object_key = obj->_object_key ();
+  int status = TAO_POA::parse_ir_object_key (object_key,
                                              object_id);
   if (status != 0)
     {
@@ -83,7 +93,7 @@ TAO_IRObject_i::reference_to_path (CORBA::IRObject_ptr obj)
       return 0;
     }
 
-  return PortableServer::ObjectId_to_string (object_id);
+  return this->oid_to_string (object_id);
 }
 
 CORBA::DefinitionKind
@@ -114,8 +124,7 @@ TAO_IRObject_i::path_to_def_kind (ACE_TString &path)
 CORBA::DefinitionKind 
 TAO_IRObject_i::reference_to_def_kind (CORBA::IRObject_ptr obj)
 {
-  CORBA::String_var tmp = this->reference_to_path (obj);
-  ACE_TString path (tmp.in ());
+  ACE_TString path (this->reference_to_path (obj));
   return this->path_to_def_kind (path);
 }
 
@@ -305,3 +314,18 @@ TAO_IRObject_i::create_objref (CORBA::DefinitionKind def_kind,
                                         ACE_ENV_ARG_PARAMETER);
 }
 
+char *
+TAO_IRObject_i::oid_to_string (PortableServer::ObjectId &oid)
+{
+  static char oid_string[2 * 1024];
+  CORBA::ULong length = oid.length ();
+
+  // Copy the data.
+  ACE_OS::memcpy (oid_string, 
+                  oid.get_buffer (), 
+                  length);
+
+  // Null terminate the string.
+  oid_string[length] = '\0';
+  return oid_string;
+}
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.h b/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.h
index 3bd1d8087fa..2964bafb17b 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.h
+++ b/TAO/orbsvcs/orbsvcs/IFRService/IRObject_i.h
@@ -78,7 +78,7 @@ public:
   // Plug in the section key.
 
 protected:
-  char *int_to_string (CORBA::ULong number) const;
+  char *int_to_string (CORBA::ULong number);
   // Convert an unsigned int to a string of its hex form.
 
   void update_key (ACE_ENV_SINGLE_ARG_DECL)
@@ -121,6 +121,10 @@ protected:
 
   ACE_Configuration_Section_Key tmp_key_;
   // To hold a key created by one method for another method to use.
+
+private:
+  char *oid_to_string (PortableServer::ObjectId &oid);
+  // Used by a couple of the above methods.
 };
 
 #if defined(_MSC_VER) && (_MSC_VER >= 1200)
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.cpp
index adae526309b..5f7cc21afb2 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/InterfaceDef_i.cpp
@@ -122,7 +122,7 @@ TAO_InterfaceDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL)
   CORBA::RepositoryIdSeq repo_ids (length);
   repo_ids.length (length);
 
-  CORBA::String_var base_path;
+  char *base_path = 0;
   ACE_Configuration_Section_Key base_key;
 
   for (i = 0; i < length; ++i)
@@ -130,7 +130,7 @@ TAO_InterfaceDef_i::describe_i (ACE_ENV_SINGLE_ARG_DECL)
       base_path = this->reference_to_path (bases[i]);
 
       this->repo_->config ()->expand_path (this->repo_->root_key (),
-                                           base_path.in (),
+                                           base_path,
                                            base_key,
                                            0);
 
@@ -288,7 +288,8 @@ TAO_InterfaceDef_i::base_interfaces_i (const CORBA::InterfaceDefSeq &base_interf
                                         1,
                                         inherited_key);
 
-  CORBA::String_var name, inherited_path, section_name;
+  CORBA::String_var name;
+  char *inherited_path = 0;
   PortableServer::ObjectId_var oid;
   ACE_Configuration_Section_Key base_key;
 
@@ -297,7 +298,7 @@ TAO_InterfaceDef_i::base_interfaces_i (const CORBA::InterfaceDefSeq &base_interf
       inherited_path = this->reference_to_path (base_interfaces[i]);
 
       this->repo_->config ()->expand_path (this->repo_->root_key (),
-                                           inherited_path.in (),
+                                           inherited_path,
                                            base_key,
                                            0);
 
@@ -313,11 +314,9 @@ TAO_InterfaceDef_i::base_interfaces_i (const CORBA::InterfaceDefSeq &base_interf
           return;
         }
 
-      section_name = this->int_to_string (i);
-
       this->repo_->config ()->set_string_value (inherited_key,
-                                                section_name.in (),
-                                                inherited_path.in ());
+                                                this->int_to_string (i),
+                                                inherited_path);
     }
 }
 
@@ -362,7 +361,7 @@ TAO_InterfaceDef_i::is_a_i (const char *interface_id
   CORBA::ULong length = bases->length ();
 
   PortableServer::ObjectId_var oid;
-  CORBA::String_var base_path;
+  char *base_path = 0;
   ACE_Configuration_Section_Key base_key;
 
   for (CORBA::ULong i = 0; i < length; ++i)
@@ -370,7 +369,7 @@ TAO_InterfaceDef_i::is_a_i (const char *interface_id
       base_path = this->reference_to_path (bases[i]);
 
       this->repo_->config ()->expand_path (this->repo_->root_key (),
-                                           base_path.in (),
+                                           base_path,
                                            base_key,
                                            0);
 
@@ -455,10 +454,9 @@ TAO_InterfaceDef_i::describe_interface_i (ACE_ENV_SINGLE_ARG_DECL)
       for (u_int j = 0; j < count; ++j)
         {
           ACE_Configuration_Section_Key op_key;
-          CORBA::String_var section_name = this->int_to_string (j);
           status =
             this->repo_->config ()->open_section (ops_key,
-                                                  section_name.in (),
+                                                  this->int_to_string (j),
                                                   0,
                                                   op_key);
 
@@ -506,10 +504,9 @@ TAO_InterfaceDef_i::describe_interface_i (ACE_ENV_SINGLE_ARG_DECL)
       for (u_int j = 0; j < count; ++j)
         {
           ACE_Configuration_Section_Key attr_key;
-          CORBA::String_var section_name = this->int_to_string (j);
           status =
             this->repo_->config ()->open_section (attrs_key,
-                                                  section_name.in (),
+                                                  this->int_to_string (j),
                                                   0,
                                                   attr_key);
 
@@ -547,7 +544,7 @@ TAO_InterfaceDef_i::describe_interface_i (ACE_ENV_SINGLE_ARG_DECL)
   repo_ids.length (length);
 
   PortableServer::ObjectId_var oid;
-  CORBA::String_var base_path;
+  char *base_path = 0;
   ACE_Configuration_Section_Key base_key;
 
   for (i = 0; i < length; ++i)
@@ -555,7 +552,7 @@ TAO_InterfaceDef_i::describe_interface_i (ACE_ENV_SINGLE_ARG_DECL)
       base_path = this->reference_to_path (bases[i]);
 
       this->repo_->config ()->expand_path (this->repo_->root_key (),
-                                           base_path.in (),
+                                           base_path,
                                            base_key,
                                            0);
 
@@ -648,11 +645,11 @@ TAO_InterfaceDef_i::create_attribute_i (
                                           CORBA::dk_Attribute);
 
   // Store the path to the attribute's type definition.
-  CORBA::String_var type_path = this->reference_to_path (type);
+  char *type_path = this->reference_to_path (type);
 
   this->repo_->config ()->set_string_value (new_key,
                                             "type_path",
-                                            type_path.in ());
+                                            type_path);
 
   // Store the attribute's mode.
   this->repo_->config ()->set_integer_value (new_key,
@@ -683,18 +680,17 @@ TAO_InterfaceDef_i::create_attribute_i (
                                             "get_excepts",
                                             1,
                                             get_excepts_key);
+      char *get_except_path = 0;
 
       // Store the paths to the 'get' exceptions.
       for (i = 0; i < length; ++i)
         {
-          CORBA::String_var get_except_path =
+          get_except_path =
             this->reference_to_path (get_exceptions[i]);
 
-          CORBA::String_var section_name = this->int_to_string (i);
-
           this->repo_->config ()->set_string_value (get_excepts_key,
-                                                    section_name.in (),
-                                                    get_except_path.in ());
+                                                    this->int_to_string (i),
+                                                    get_except_path);
         }
     }
 
@@ -708,18 +704,17 @@ TAO_InterfaceDef_i::create_attribute_i (
                                             "put_excepts",
                                             1,
                                             put_excepts_key);
+      char *put_except_path = 0;
 
       // Store the paths to the 'put' exceptions.
       for (i = 0; i < length; ++i)
         {
-          CORBA::String_var put_except_path =
+          put_except_path =
             this->reference_to_path (put_exceptions[i]);
 
-          CORBA::String_var section_name = this->int_to_string (i);
-
           this->repo_->config ()->set_string_value (put_excepts_key,
-                                                    section_name.in (),
-                                                    put_except_path.in ());
+                                                    this->int_to_string (i),
+                                                    put_except_path);
         }
     }
 
@@ -810,9 +805,7 @@ TAO_InterfaceDef_i::create_operation_i (const char *id,
                                           CORBA::dk_Operation);
 
   // Get the TypeCode for the return type.
-  CORBA::String_var tmp = this->reference_to_path (result);
-
-  ACE_TString result_path (tmp.in ());
+  ACE_TString result_path (this->reference_to_path (result));
   TAO_IDLType_i *result_impl = this->path_to_idltype (result_path);
 
   CORBA::TypeCode_var rettype = 
@@ -855,6 +848,7 @@ TAO_InterfaceDef_i::create_operation_i (const char *id,
       this->repo_->config ()->set_integer_value (params_key,
                                                  "count",
                                                  length);
+      char *type_path = 0;
 
       for (i = 0; i < length; ++i)
         {
@@ -867,22 +861,20 @@ TAO_InterfaceDef_i::create_operation_i (const char *id,
             }
 
           ACE_Configuration_Section_Key param_key;
-          CORBA::String_var section_name = this->int_to_string (i);
-
           this->repo_->config ()->open_section (params_key,
-                                                section_name.in (),
+                                                this->int_to_string (i),
                                                 1,
                                                 param_key);
 
           this->repo_->config ()->set_string_value (param_key,
                                                     "name",
                                                     params[i].name.in ());
-          CORBA::String_var type_path =
+          type_path =
             this->reference_to_path (params[i].type_def.in ());
 
           this->repo_->config ()->set_string_value (param_key,
                                                     "type_path",
-                                                    type_path.in ());
+                                                    type_path);
 
           this->repo_->config ()->set_integer_value (param_key,
                                                      "mode",
@@ -909,17 +901,16 @@ TAO_InterfaceDef_i::create_operation_i (const char *id,
                                             "excepts",
                                             1,
                                             excepts_key);
+      char *type_path = 0;
 
       for (i = 0; i < length; ++i)
         {
-          CORBA::String_var type_path = 
+          type_path = 
             this->reference_to_path (exceptions[i]);
 
-          CORBA::String_var section_name = this->int_to_string (i);
-
           this->repo_->config ()->set_string_value (excepts_key,
-                                                    section_name.in (),
-                                                    type_path.in ());
+                                                    this->int_to_string (i),
+                                                    type_path);
         }
     }
 
@@ -937,10 +928,8 @@ TAO_InterfaceDef_i::create_operation_i (const char *id,
 
       for (i = 0; i < length; ++i)
         {
-          CORBA::String_var section_name = this->int_to_string (i);
-
           this->repo_->config ()->set_string_value (contexts_key,
-                                                    section_name.in (),
+                                                    this->int_to_string (i),
                                                     contexts[i].in ());
         }
     }
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.cpp
index a378a6057f3..9c7bbb47d0d 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/OperationDef_i.cpp
@@ -138,11 +138,11 @@ TAO_OperationDef_i::result_def_i (CORBA::IDLType_ptr result_def
                                   ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  CORBA::String_var result_path = this->reference_to_path (result_def);
+  char *result_path = this->reference_to_path (result_def);
 
   this->repo_->config ()->set_string_value (this->section_key_,
                                             "result",
-                                            result_path.in ());
+                                            result_path);
 }
 
 CORBA::ParDescriptionSeq *
@@ -181,12 +181,10 @@ TAO_OperationDef_i::params_i (ACE_ENV_SINGLE_ARG_DECL)
 
       for (i = 0; i < count; ++i)
         {
-          CORBA::String_var section_name = this->int_to_string (i);
-
           ACE_Configuration_Section_Key param_key;
           status =
             this->repo_->config ()->open_section (params_key,
-                                                  section_name.in (),
+                                                  this->int_to_string (i),
                                                   0,
                                                   param_key);
 
@@ -294,26 +292,25 @@ TAO_OperationDef_i::params_i (const CORBA::ParDescriptionSeq &params
   this->repo_->config ()->set_integer_value (params_key,
                                              "count",
                                              length);
+  char *type_path = 0;
 
   for (CORBA::ULong i = 0; i < length; ++i)
     {
       ACE_Configuration_Section_Key param_key;
-      CORBA::String_var section_name = this->int_to_string (i);
-
       this->repo_->config ()->open_section (params_key,
-                                            section_name.in (),
+                                            this->int_to_string (i),
                                             1,
                                             param_key);
 
       this->repo_->config ()->set_string_value (param_key,
                                                 "name",
                                                 params[i].name.in ());
-      CORBA::String_var type_path = 
+      type_path = 
         this->reference_to_path (params[i].type_def.in ());
 
       this->repo_->config ()->set_string_value (param_key,
                                                 "type_path",
-                                                type_path.in ());
+                                                type_path);
 
       this->repo_->config ()->set_integer_value (param_key,
                                                  "mode",
@@ -398,7 +395,6 @@ TAO_OperationDef_i::contexts_i (ACE_ENV_SINGLE_ARG_DECL)
   if (status == 0)
     {
       int index = 0;
-      CORBA::String_var field_name = this->int_to_string (index);
       ACE_TString context;
 
       // Don't have to worry about gaps here - contexts are not
@@ -406,12 +402,11 @@ TAO_OperationDef_i::contexts_i (ACE_ENV_SINGLE_ARG_DECL)
       // make a change one has to call the mutator version of this
       // function and make a completely new list.
       while (this->repo_->config ()->get_string_value (contexts_key,
-                                                       field_name.in (),
+                                                       this->int_to_string (index++),
                                                        context)
               == 0)
         {
           context_queue.enqueue_tail (context);
-          field_name = this->int_to_string (++index);
         }
     }
 
@@ -472,10 +467,8 @@ TAO_OperationDef_i::contexts_i (const CORBA::ContextIdSeq &contexts
 
   for (CORBA::ULong i = 0; i < length; ++i)
     {
-      CORBA::String_var section_name = this->int_to_string (i);
-
       this->repo_->config ()->set_string_value (contexts_key,
-                                                section_name.in (),
+                                                this->int_to_string (i),
                                                 contexts[i].in ());
     }
 }
@@ -597,16 +590,14 @@ TAO_OperationDef_i::exceptions_i (const CORBA::ExceptionDefSeq &exceptions
                                         "excepts",
                                         1,
                                         excepts_key);
+  char *type_path = 0;
 
   for (CORBA::ULong i = 0; i < length; ++i)
     {
-      CORBA::String_var type_path = this->reference_to_path (exceptions[i]);
-
-      CORBA::String_var section_name = this->int_to_string (i);
-
+      type_path = this->reference_to_path (exceptions[i]);
       this->repo_->config ()->set_string_value (excepts_key,
-                                                section_name.in (),
-                                                type_path.in ());
+                                                this->int_to_string (i),
+                                                type_path);
     }
 
 }
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp
index 7a67899eb73..70e52b536c3 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/Repository_i.cpp
@@ -252,7 +252,7 @@ TAO_Repository_i::create_string_i (CORBA::ULong bound
                                     "count",
                                     count);
 
-  CORBA::String_var name = this->int_to_string (count++);
+  char *name = this->int_to_string (count++);
   this->config_->set_integer_value (this->strings_key_,
                                     "count",
                                     count);
@@ -260,7 +260,7 @@ TAO_Repository_i::create_string_i (CORBA::ULong bound
   // Make new database entry.
   ACE_Configuration_Section_Key new_key;
   this->config_->open_section (this->strings_key_,
-                               name.in (),
+                               name,
                                1,
                                new_key);
 
@@ -274,11 +274,11 @@ TAO_Repository_i::create_string_i (CORBA::ULong bound
 
   this->config_->set_string_value (new_key,
                                    "name",
-                                   name.in ());
+                                   name);
 
   // Create the object reference.
   ACE_TString obj_id ("strings\\");
-  obj_id += name.in ();
+  obj_id += name;
 
   CORBA::Object_var obj = this->create_objref (CORBA::dk_String,
                                                obj_id.c_str ()
@@ -310,7 +310,7 @@ TAO_Repository_i::create_wstring_i (CORBA::ULong bound
                                     "count",
                                     count);
 
-  CORBA::String_var name = this->int_to_string (count++);
+  char *name = this->int_to_string (count++);
   this->config_->set_integer_value (this->wstrings_key_,
                                     "count",
                                     count);
@@ -318,7 +318,7 @@ TAO_Repository_i::create_wstring_i (CORBA::ULong bound
   // Make new database entry.
   ACE_Configuration_Section_Key new_key;
   this->config_->open_section (this->wstrings_key_,
-                               name.in (),
+                               name,
                                1,
                                new_key);
 
@@ -332,11 +332,11 @@ TAO_Repository_i::create_wstring_i (CORBA::ULong bound
 
   this->config_->set_string_value (new_key,
                                    "name",
-                                   name.in ());
+                                   name);
 
   // Create the object reference.
   ACE_TString obj_id ("wstrings\\");
-  obj_id += name.in ();
+  obj_id += name;
 
   CORBA::Object_var obj = this->create_objref (CORBA::dk_Wstring,
                                                obj_id.c_str ()
@@ -371,7 +371,7 @@ TAO_Repository_i::create_sequence_i (CORBA::ULong bound,
                                     "count",
                                     count);
 
-  CORBA::String_var name = this->int_to_string (count++);
+  char *name = this->int_to_string (count++);
   this->config_->set_integer_value (this->sequences_key_,
                                     "count",
                                     count);
@@ -379,7 +379,7 @@ TAO_Repository_i::create_sequence_i (CORBA::ULong bound,
   // Make new database entry.
   ACE_Configuration_Section_Key new_key;
   this->config_->open_section (this->sequences_key_,
-                               name.in (),
+                               name,
                                1,
                                new_key);
 
@@ -396,19 +396,19 @@ TAO_Repository_i::create_sequence_i (CORBA::ULong bound,
   // Set the "name" for destroy to use.
   this->config_->set_string_value (new_key,
                                    "name",
-                                   name.in ());
+                                   name);
 
-  CORBA::String_var element_path =
+  char *element_path =
     this->reference_to_path (element_type);
 
   // To get key to element type.
   this->config_->set_string_value (new_key,
                                    "element_path",
-                                   element_path.in ());
+                                   element_path);
 
   // Create the object reference.
   ACE_TString obj_id ("sequences\\");
-  obj_id += name.in ();
+  obj_id += name;
 
   CORBA::Object_var obj = this->create_objref (CORBA::dk_Sequence,
                                                obj_id.c_str ()
@@ -443,7 +443,7 @@ TAO_Repository_i::create_array_i (CORBA::ULong length,
                                     "count",
                                     count);
 
-  CORBA::String_var name = this->int_to_string (count++);
+  char *name = this->int_to_string (count++);
   this->config_->set_integer_value (this->arrays_key_,
                                     "count",
                                     count);
@@ -451,7 +451,7 @@ TAO_Repository_i::create_array_i (CORBA::ULong length,
   // Make new database entry.
   ACE_Configuration_Section_Key new_key;
   this->config_->open_section (this->arrays_key_,
-                               name.in (),
+                               name,
                                1,
                                new_key);
 
@@ -468,19 +468,19 @@ TAO_Repository_i::create_array_i (CORBA::ULong length,
   // Set the "name" for destroy to use.
   this->config_->set_string_value (new_key,
                                    "name",
-                                   name.in ());
+                                   name);
 
-  CORBA::String_var element_path =
+  char *element_path =
     this->reference_to_path (element_type);
 
   // To get key to element type.
   this->config_->set_string_value (new_key,
                                    "element_path",
-                                   element_path.in ());
+                                   element_path);
 
   // Create the object reference.
   ACE_TString obj_id ("arrays\\");
-  obj_id += name.in ();
+  obj_id += name;
 
   CORBA::Object_var obj = this->create_objref (CORBA::dk_Array,
                                                obj_id.c_str ()
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.cpp
index 5ff80f9919b..16a5377a5b4 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/SequenceDef_i.cpp
@@ -210,11 +210,11 @@ TAO_SequenceDef_i::element_type_def_i (CORBA::IDLType_ptr element_type_def
   this->destroy_element_type (ACE_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  CORBA::String_var element_path = reference_to_path (element_type_def);
+  char *element_path = reference_to_path (element_type_def);
 
   this->repo_->config ()->set_string_value (this->section_key_,
                                             "element_path",
-                                            element_path.in ());
+                                            element_path);
 }
 
 void
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.cpp
index c30dbc4f200..b76f02245be 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/StructDef_i.cpp
@@ -123,9 +123,8 @@ TAO_StructDef_i::members_i (ACE_ENV_SINGLE_ARG_DECL)
   for (u_int i = 0; i < count; ++i)
     {
       ACE_Configuration_Section_Key member_key;
-      CORBA::String_var section_name = this->int_to_string (i);
       this->repo_->config ()->open_section (refs_key,
-                                            section_name.in (),
+                                            this->int_to_string (i),
                                             0,
                                             member_key);
 
@@ -245,15 +244,15 @@ TAO_StructDef_i::members_i (const CORBA::StructMemberSeq &members
                                         "refs",
                                         1,
                                         refs_key);
+  char *path = 0;
 
   // Create a section for each new member. We just store the
   // member name and the path to its database entry.
   for (CORBA::ULong i = 0; i < count; ++i)
     {
-      CORBA::String_var section_name = this->int_to_string (i);
       ACE_Configuration_Section_Key member_key;
       this->repo_->config ()->open_section (refs_key,
-                                            section_name.in (),
+                                            this->int_to_string (i),
                                             1,
                                             member_key);
 
@@ -261,12 +260,12 @@ TAO_StructDef_i::members_i (const CORBA::StructMemberSeq &members
                                                 "name",
                                                 members[i].name.in ());
 
-      CORBA::String_var path = 
+      path = 
         this->reference_to_path (members[i].type_def.in ());
 
       this->repo_->config ()->set_string_value (member_key,
                                                 "path",
-                                                path.in ());
+                                                path);
     }
 
   this->repo_->config ()->set_integer_value (refs_key,
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp
index f4150203505..e4160cfe96e 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/UnionDef_i.cpp
@@ -171,12 +171,12 @@ TAO_UnionDef_i::discriminator_type_def_i (
   )
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  CORBA::String_var disc_path = 
+  char *disc_path = 
     this->reference_to_path (discriminator_type_def);
 
   this->repo_->config ()->set_string_value (this->section_key_,
                                             "disc_path",
-                                            disc_path.in ());
+                                            disc_path);
 }
 
 CORBA::UnionMemberSeq *
@@ -211,10 +211,8 @@ TAO_UnionDef_i::members_i (ACE_ENV_SINGLE_ARG_DECL)
   for (u_int i = 0; i < count; ++i)
     {
       ACE_Configuration_Section_Key member_key;
-      CORBA::String_var section_name = this->int_to_string (i);
-
       if (this->repo_->config ()->open_section (refs_key,
-                                                section_name.in (),
+                                                this->int_to_string (i),
                                                 0,
                                                 member_key)
            == 0)
@@ -326,15 +324,15 @@ TAO_UnionDef_i::members_i (const CORBA::UnionMemberSeq &members
   this->repo_->config ()->set_integer_value (refs_key,
                                              "count",
                                              count);
+  char *member_path = 0;
 
   // Create a section for each member. We store the member
   // name, its label value, and the path to its database entry.
   for (CORBA::ULong i = 0; i < count; i++)
     {
       ACE_Configuration_Section_Key member_key;
-      char *section_name = this->int_to_string (i);
       this->repo_->config ()->open_section (refs_key,
-                                            section_name,
+                                            this->int_to_string (i),
                                             1,
                                             member_key);
 
@@ -342,12 +340,12 @@ TAO_UnionDef_i::members_i (const CORBA::UnionMemberSeq &members
                                                 "name",
                                                 members[i].name.in ());
 
-      CORBA::String_var member_path = 
+      member_path = 
         this->reference_to_path (members[i].type_def.in ());
 
       this->repo_->config ()->set_string_value (member_key,
                                                 "path",
-                                                member_path.in ());
+                                                member_path);
 
       this->store_label (member_key,
                          members[i].label
@@ -423,9 +421,13 @@ TAO_UnionDef_i::fetch_label (const ACE_Configuration_Section_Key member_key,
     {
       TAO_OutputCDR cdr;
       cdr.write_ulong (ACE_static_cast (CORBA::ULong, value));
-      member.label._tao_replace (tc.in (),
-                                 TAO_ENCAP_BYTE_ORDER,
-                                 cdr.begin ());
+      TAO::Unknown_IDL_Type *impl = 0;
+      ACE_NEW (impl,
+               TAO::Unknown_IDL_Type (tc._retn (),
+                                      cdr.begin (),
+                                      TAO_ENCAP_BYTE_ORDER,
+                                      1));
+      member.label.replace (impl);
       break;
     }
     default:
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.cpp
index b822dc00df2..1334e4ab1f8 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ValueBoxDef_i.cpp
@@ -120,10 +120,10 @@ TAO_ValueBoxDef_i::original_type_def_i (CORBA::IDLType_ptr original_type_def
                                         ACE_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  CORBA::String_var boxed_type = this->reference_to_path (original_type_def);
+  char *boxed_type = this->reference_to_path (original_type_def);
 
   this->repo_->config ()->set_string_value (this->section_key_,
                                             "boxed_type",
-                                            boxed_type.in ());
+                                            boxed_type);
 }
 
diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.cpp b/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.cpp
index 1d0b9fc675e..f9deff32400 100644
--- a/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.cpp
@@ -195,7 +195,8 @@ TAO_ValueDef_i::supported_interfaces_i (
                                         1,
                                         supports_key);
 
-  CORBA::String_var supported_name, supported_path;
+  CORBA::String_var supported_name;
+  char *supported_path = 0;
   PortableServer::ObjectId_var oid;
   ACE_Configuration_Section_Key supported_key;
 
@@ -204,7 +205,7 @@ TAO_ValueDef_i::supported_interfaces_i (
       supported_path = this->reference_to_path (supported_interfaces[i]);
 
       this->repo_->config ()->expand_path (this->repo_->root_key (),
-                                           supported_path.in (),
+                                           supported_path,
                                            supported_key,
                                            1);
 
@@ -223,7 +224,7 @@ TAO_ValueDef_i::supported_interfaces_i (
 
       this->repo_->config ()->set_string_value (supported_key,
                                                 supported_name.in (),
-                                                supported_path.in ());
+                                                supported_path);
     }
 }
 
@@ -286,9 +287,8 @@ TAO_ValueDef_i::initializers_i (ACE_ENV_SINGLE_ARG_PARAMETER)
 
       for (CORBA::ULong j = 0; j < member_count; ++j)
         {
-          CORBA::String_var section_name = this->int_to_string (j);
           this->repo_->config ()->open_section (initializer_key,
-                                                section_name.in (),
+                                                this->int_to_string (j),
                                                 0,
                                                 member_key);
           this->repo_->config ()->get_string_value (
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp
index 89544592930..9146da5e428 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.cpp
@@ -1318,10 +1318,13 @@ Admin_Client::union_test (ACE_ENV_SINGLE_ARG_DECL)
   ACE_CHECK;
   TAO_OutputCDR maker2;
   maker2.write_ulong (3);  // THREE
-  CORBA::Any any2 (d_type.in (),
-                   0,
-                   TAO_ENCAP_BYTE_ORDER,
-                   maker2.begin ());
+  TAO::Unknown_IDL_Type *impl2 = 0;
+  ACE_NEW (impl2,
+           TAO::Unknown_IDL_Type (d_type.in (),
+                                  maker2.begin (),
+                                  TAO_ENCAP_BYTE_ORDER));
+  CORBA::Any any2;
+  any2.replace (impl2);
   u_members[0].label = any2;
 
   u_members[1].name = CORBA::string_dup ("longval");
@@ -1331,10 +1334,13 @@ Admin_Client::union_test (ACE_ENV_SINGLE_ARG_DECL)
   u_members[1].type = CORBA::TypeCode::_duplicate (CORBA::_tc_void);
   TAO_OutputCDR maker0;
   maker0.write_ulong (2);  // TWO
-  CORBA::Any any0 (d_type.in (),
-                   0,
-                   TAO_ENCAP_BYTE_ORDER,
-                   maker0.begin ());
+  TAO::Unknown_IDL_Type *impl0 = 0;
+  ACE_NEW (impl0,
+           TAO::Unknown_IDL_Type (d_type.in (),
+                                  maker0.begin (),
+                                  TAO_ENCAP_BYTE_ORDER));
+  CORBA::Any any0;
+  any0.replace (impl0);
   u_members[1].label = any0;
 
   u_members[2].name = CORBA::string_dup ("structval");
@@ -1343,10 +1349,13 @@ Admin_Client::union_test (ACE_ENV_SINGLE_ARG_DECL)
 
   TAO_OutputCDR maker1;
   maker1.write_ulong (0); // ZERO
-  CORBA::Any any1 (d_type.in (),
-                   0,
-                   TAO_ENCAP_BYTE_ORDER,
-                   maker1.begin ());
+  TAO::Unknown_IDL_Type *impl1 = 0;
+  ACE_NEW (impl1,
+           TAO::Unknown_IDL_Type (d_type.in (),
+                                  maker1.begin (),
+                                  TAO_ENCAP_BYTE_ORDER));
+  CORBA::Any any1;
+  any1.replace (impl1);
   u_members[2].label = any1;
 
   u_members[3].name = CORBA::string_dup ("stringval");
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/run_test.pl b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/run_test.pl
index 03b00dcb3fb..68c665cd201 100755
--- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/run_test.pl
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/run_test.pl
@@ -8,12 +8,13 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
 use lib "../../../../../bin";
 use PerlACE::Run_Test;
 
-$locking = "-m";
+$locking = "";
 
 $iorfile = "if_repo.ior";
 
 $status = 0;
 
+$nice = "-ORBDottedDecimalAddresses 1";
 $debug = "";
 $test = "";
 $iterations = "";
@@ -38,7 +39,7 @@ for ($i = 0; $i <= $#ARGV; $i++) {
 
 unlink $iorfile;
 
-$SV = new PerlACE::Process ("../../../IFR_Service/IFR_Service", " $locking");
+$SV = new PerlACE::Process ("../../../IFR_Service/IFR_Service", " $nice " . " $locking");
 $CL = new PerlACE::Process ("IFR_Test", 
                             "-ORBInitRef InterfaceRepository=file://$iorfile"
                             . " $debug $test $iterations");
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.cpp b/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.cpp
index 7ef04f82260..34a43bae08e 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.cpp
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.cpp
@@ -93,20 +93,29 @@ Latency_Query_Client::init (int argc,
 int
 Latency_Query_Client::run (void)
 {
-  CORBA::DefinitionKind dk;
+//  CORBA::DefinitionKind dk;
+  CORBA::AttributeMode am;
 
   ACE_TRY_NEW_ENV
     {
       for (int j = 0; j < 100; ++j)
         {
+          am = this->attr_->mode (ACE_ENV_SINGLE_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+
+          if (am != CORBA::ATTR_NORMAL)
+            {
+              return -1;
+            }
+/*
           dk = this->tdef_->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER);
+          ACE_TRY_CHECK;
 
           if (dk != CORBA::dk_Alias)
             {
               return -1;
             }
-
-          ACE_TRY_CHECK;
+*/
         }
 
       ACE_Sample_History history (this->iterations_);
@@ -116,7 +125,8 @@ Latency_Query_Client::run (void)
         {
           ACE_hrtime_t start = ACE_OS::gethrtime ();
 
-          dk = this->tdef_->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER);
+          am = this->attr_->mode (ACE_ENV_SINGLE_ARG_PARAMETER);
+//          dk = this->tdef_->def_kind (ACE_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           ACE_hrtime_t now = ACE_OS::gethrtime ();
@@ -202,6 +212,52 @@ Latency_Query_Client::parse_args (int argc,
 int
 Latency_Query_Client::populate_ifr (ACE_ENV_SINGLE_ARG_DECL)
 {
+  CORBA::Contained_var irobj = this->repo_->lookup_id ("IDL:dummy/attr:1.0"
+                                                       ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (-1);
+
+  if (! CORBA::is_nil (irobj.in ()))
+    {
+      this->attr_ = CORBA::AttributeDef::_narrow (irobj.in ()
+                                                  ACE_ENV_ARG_PARAMETER);
+      ACE_CHECK_RETURN (-1);
+
+      if (CORBA::is_nil (this->attr_.in ()))
+        {
+          ACE_ERROR_RETURN ((LM_ERROR,
+                             "Latency_Query_Client::populate_ifr - "
+                             "AttributeDef::_narrow returned null\n"),
+                            -1);
+        }
+
+      return 0;
+    }
+
+  CORBA::InterfaceDefSeq in_bases (0);
+  in_bases.length (0);
+
+  CORBA::InterfaceDef_var iface =
+    this->repo_->create_interface ("IDL:dummy:1.0",
+                                   "dummy",
+                                   "1.0",
+                                   in_bases
+                                   ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (-1);
+
+  CORBA::PrimitiveDef_var p_long =
+    this->repo_->get_primitive (CORBA::pk_long
+                                ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (-1);
+
+  this->attr_ =
+    iface->create_attribute ("IDL:dummt/attr:1.0",
+                             "attr",
+                             "1.0",
+                             p_long.in (),
+                             CORBA::ATTR_NORMAL
+                             ACE_ENV_ARG_PARAMETER);
+  ACE_CHECK_RETURN (-1);
+/*
   CORBA::Contained_var irobj = this->repo_->lookup_id ("IDL:longtype:1.0"
                                                        ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
@@ -251,7 +307,7 @@ Latency_Query_Client::populate_ifr (ACE_ENV_SINGLE_ARG_DECL)
                          "create_alias returned null\n"),
                         -1);
     }
-
+*/
   return 0;
 }
 
diff --git a/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.h b/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.h
index 18b8164a0ea..531ec6addb4 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.h
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Latency_Test/Latency_Query_Client.h
@@ -67,8 +67,11 @@ private:
   CORBA::Repository_var repo_;
   // Storage of the IFR reference.
 
-  CORBA::AliasDef_var tdef_;
+//  CORBA::AliasDef_var tdef_;
   // Storage of the typedef definition that we will query.
+
+  CORBA::AttributeDef_var attr_;
+  // Storage of the attribute definition we will query.
 };
 
 #endif /* LATENCY_QUERY_CLIENT_H */
diff --git a/TAO/tao/Any.cpp b/TAO/tao/Any.cpp
index b56c2e4d660..c80a7b9565e 100644
--- a/TAO/tao/Any.cpp
+++ b/TAO/tao/Any.cpp
@@ -28,7 +28,7 @@ CORBA::Any::~Any (void)
 {
   if (this->impl_ != 0)
     {
-      this->impl_->free_value ();
+      this->impl_->_remove_ref ();
     }
 }
 
@@ -247,12 +247,14 @@ TAO::Any_Impl::_remove_ref (void)
 // =======================================================================
 
 TAO::Unknown_IDL_Type::Unknown_IDL_Type (CORBA::TypeCode_ptr tc,
-                                         ACE_Message_Block *mb,
-                                         int byte_order)
+                                         const ACE_Message_Block *mb,
+                                         int byte_order,
+                                         CORBA::Boolean release_tc)
   : TAO::Any_Impl (0,
                    tc),
-    cdr_ (mb),
-    byte_order_ (byte_order)
+    cdr_ (ACE_Message_Block::duplicate (mb)),
+    byte_order_ (byte_order),
+    release_tc_ (release_tc)
 {
 }
 
@@ -292,8 +294,11 @@ TAO::Unknown_IDL_Type::marshal_value (TAO_OutputCDR &cdr)
 void
 TAO::Unknown_IDL_Type::free_value (void)
 {
-//  CORBA::release (this->type_);
-//  this->type_ = CORBA::TypeCode::_nil ();
+  if (this->release_tc_ == 1)
+    {
+      CORBA::release (this->type_);
+    }
+
   ACE_Message_Block::release (this->cdr_);
 }
 
@@ -399,21 +404,18 @@ operator>> (TAO_InputCDR &cdr, CORBA::Any &any)
       // space in the message block.
       size_t size = end - begin;
 
-      ACE_Message_Block *mb = 0;
-      ACE_NEW_RETURN (mb,
-                      ACE_Message_Block (size + 2 * ACE_CDR::MAX_ALIGNMENT),
-                      0);
+      ACE_Message_Block mb (size + 2 * ACE_CDR::MAX_ALIGNMENT);
 
-      ACE_CDR::mb_align (mb);
+      ACE_CDR::mb_align (&mb);
       ptr_arith_t offset = ptr_arith_t (begin) % ACE_CDR::MAX_ALIGNMENT;
-      mb->rd_ptr (offset);
-      mb->wr_ptr (offset + size);
-      ACE_OS::memcpy (mb->rd_ptr (), begin, size);
+      mb.rd_ptr (offset);
+      mb.wr_ptr (offset + size);
+      ACE_OS::memcpy (mb.rd_ptr (), begin, size);
 
       TAO::Unknown_IDL_Type *impl = 0;
       ACE_NEW_RETURN (impl,
                       TAO::Unknown_IDL_Type (tc,
-                                             mb,
+                                             &mb,
                                              cdr.byte_order ()),
                       0);
 
@@ -615,9 +617,12 @@ operator<<= (CORBA::Any &any, CORBA::TypeCode_ptr tc)
 void
 operator<<= (CORBA::Any &any, const CORBA::Exception &exception)
 {
-  TAO::Any_Dual_Impl_T<CORBA::Exception>::insert_copy (any,
-                                                       exception._type (),
-                                                       exception);
+  TAO::Any_Dual_Impl_T<CORBA::Exception>::insert_copy (
+      any,
+      CORBA::Exception::_tao_any_destructor,
+      exception._type (),
+      exception
+    );
 }
 
 // Insertion of CORBA::Exception - non-copying.
@@ -972,6 +977,17 @@ TAO::Any_Basic_Impl_T<CORBA::LongDouble>::create_empty (
 
 // Specializations for CORBA::Exception
 
+TAO::Any_Dual_Impl_T<CORBA::Exception>::Any_Dual_Impl_T (
+    _tao_destructor destructor,
+    CORBA::TypeCode_ptr tc,
+    const CORBA::Exception & val
+  )
+  : Any_Impl (destructor,
+              tc)
+{
+  this->value_ = val._tao_duplicate ();
+}
+
 CORBA::Boolean
 TAO::Any_Dual_Impl_T<CORBA::Exception>::marshal_value (TAO_OutputCDR &cdr)
 {
diff --git a/TAO/tao/Any.h b/TAO/tao/Any.h
index 5bcf72a0e05..eb7315a2bbe 100644
--- a/TAO/tao/Any.h
+++ b/TAO/tao/Any.h
@@ -332,12 +332,13 @@ namespace TAO
     TAO_SYNCH_MUTEX * refcount_lock_;
   };
 
-  class Unknown_IDL_Type : public Any_Impl
+  class TAO_Export Unknown_IDL_Type : public Any_Impl
   {
   public:
     Unknown_IDL_Type (CORBA::TypeCode_ptr,
-                      ACE_Message_Block *,
-                      int byte_order);
+                      const ACE_Message_Block *,
+                      int byte_order,
+                      CORBA::Boolean release_tc = 0);
     virtual ~Unknown_IDL_Type (void);
 
     virtual CORBA::Boolean marshal_value (TAO_OutputCDR &);
@@ -350,6 +351,7 @@ namespace TAO
   private:
     ACE_Message_Block *cdr_;
     int byte_order_;
+    CORBA::Boolean release_tc_;
   };
 };
 
diff --git a/TAO/tao/Any_T.cpp b/TAO/tao/Any_T.cpp
index a05219bf5d1..88372080b1b 100644
--- a/TAO/tao/Any_T.cpp
+++ b/TAO/tao/Any_T.cpp
@@ -677,12 +677,14 @@ TAO::Any_Dual_Impl_T<T>::Any_Dual_Impl_T (_tao_destructor destructor,
 }
 
 template<typename T>
-TAO::Any_Dual_Impl_T<T>::Any_Dual_Impl_T (CORBA::TypeCode_ptr tc,
+TAO::Any_Dual_Impl_T<T>::Any_Dual_Impl_T (_tao_destructor destructor,
+                                          CORBA::TypeCode_ptr tc,
                                           const T & val)
   : Any_Impl (0,
               tc)
 {
-  *this->value_ = val;
+  ACE_NEW (this->value_,
+           T (val));
 }
 
 template<typename T>
@@ -715,12 +717,14 @@ TAO::Any_Dual_Impl_T<T>::insert (CORBA::Any & any,
 template<typename T>
 void
 TAO::Any_Dual_Impl_T<T>::insert_copy (CORBA::Any & any,
+                                      _tao_destructor destructor,
                                       CORBA::TypeCode_ptr tc,
                                       const T & value)
 {
   Any_Dual_Impl_T<T> *new_impl = 0;
   ACE_NEW (new_impl,
-           Any_Dual_Impl_T (tc,
+           Any_Dual_Impl_T (destructor,
+                            tc,
                             value));
   any.replace (new_impl);
 }
@@ -757,11 +761,15 @@ TAO::Any_Dual_Impl_T<T>::extract (const CORBA::Any & any,
           return 1;
         }
 
+      T *empty_value = 0;
+      ACE_NEW_RETURN (empty_value,
+                      T,
+                      0);
       TAO::Any_Dual_Impl_T<T> *replacement = 0;
       ACE_NEW_RETURN (replacement,
                       TAO::Any_Dual_Impl_T<T> (destructor,
                                                any_tc,
-                                               0),
+                                               empty_value),
                       0);
                       
       auto_ptr<TAO::Any_Dual_Impl_T<T> > replacement_safety (replacement);
diff --git a/TAO/tao/Any_T.h b/TAO/tao/Any_T.h
index 8991f7debdc..bf62c0f2316 100644
--- a/TAO/tao/Any_T.h
+++ b/TAO/tao/Any_T.h
@@ -217,7 +217,8 @@ namespace TAO
     Any_Dual_Impl_T (_tao_destructor destructor,
                      CORBA::TypeCode_ptr,
                      T * const);
-    Any_Dual_Impl_T (CORBA::TypeCode_ptr,
+    Any_Dual_Impl_T (_tao_destructor destructor,
+                     CORBA::TypeCode_ptr,
                      const T &);
     Any_Dual_Impl_T (CORBA::TypeCode_ptr);
     virtual ~Any_Dual_Impl_T (void);
@@ -227,6 +228,7 @@ namespace TAO
                         CORBA::TypeCode_ptr,
                         T * const);
     static void insert_copy (CORBA::Any &, 
+                             _tao_destructor destructor,
                              CORBA::TypeCode_ptr,
                              const T &);
     static CORBA::Boolean extract (const CORBA::Any &,
diff --git a/TAO/tao/Any_T.inl b/TAO/tao/Any_T.inl
index d5e80f26606..8332f234b7d 100644
--- a/TAO/tao/Any_T.inl
+++ b/TAO/tao/Any_T.inl
@@ -123,6 +123,6 @@ TAO::Any_Dual_Impl_T<T>::demarshal_value (TAO_InputCDR &cdr)
 template<typename T> ACE_INLINE const void *
 TAO::Any_Dual_Impl_T<T>::value (void) const
 {
-  return &this->value_;
+  return this->value_;
 }
 
diff --git a/TAO/tao/IFR_Client/IFR_BaseC.cpp b/TAO/tao/IFR_Client/IFR_BaseC.cpp
index 21e8e68deab..8c730cc9e83 100644
--- a/TAO/tao/IFR_Client/IFR_BaseC.cpp
+++ b/TAO/tao/IFR_Client/IFR_BaseC.cpp
@@ -190,7 +190,7 @@ static const CORBA::Long _oc_CORBA_DefinitionKind[] =
   ACE_NTOHL (0x6e697469), 
   ACE_NTOHL (0x6f6e4b69), 
   ACE_NTOHL (0x6e640000),  // name = DefinitionKind
-  26, // member count
+  36, // member count
   8,
   ACE_NTOHL (0x646b5f6e), 
   ACE_NTOHL (0x6f6e6500),  // name = dk_none
@@ -304,6 +304,46 @@ static const CORBA::Long _oc_CORBA_DefinitionKind[] =
   ACE_NTOHL (0x496e7465), 
   ACE_NTOHL (0x72666163), 
   ACE_NTOHL (0x65000000),  // name = dk_LocalInterface
+  13,
+  ACE_NTOHL (0x646b5f43), 
+  ACE_NTOHL (0x6f6d706f), 
+  ACE_NTOHL (0x6e656e74), 
+  ACE_NTOHL (0x0),  // name = dk_Component
+  8,
+  ACE_NTOHL (0x646b5f48), 
+  ACE_NTOHL (0x6f6d6500),  // name = dk_Home
+  11,
+  ACE_NTOHL (0x646b5f46), 
+  ACE_NTOHL (0x6163746f), 
+  ACE_NTOHL (0x72790000),  // name = dk_Factory
+  10,
+  ACE_NTOHL (0x646b5f46), 
+  ACE_NTOHL (0x696e6465), 
+  ACE_NTOHL (0x72000000),  // name = dk_Finder
+  9,
+  ACE_NTOHL (0x646b5f45), 
+  ACE_NTOHL (0x6d697473), 
+  ACE_NTOHL (0x0),  // name = dk_Emits
+  13,
+  ACE_NTOHL (0x646b5f50), 
+  ACE_NTOHL (0x75626c69), 
+  ACE_NTOHL (0x73686573), 
+  ACE_NTOHL (0x0),  // name = dk_Publishes
+  12,
+  ACE_NTOHL (0x646b5f43), 
+  ACE_NTOHL (0x6f6e7375), 
+  ACE_NTOHL (0x6d657300),  // name = dk_Consumes
+  12,
+  ACE_NTOHL (0x646b5f50), 
+  ACE_NTOHL (0x726f7669), 
+  ACE_NTOHL (0x64657300),  // name = dk_Provides
+  8,
+  ACE_NTOHL (0x646b5f55), 
+  ACE_NTOHL (0x73657300),  // name = dk_Uses
+  9,
+  ACE_NTOHL (0x646b5f45), 
+  ACE_NTOHL (0x76656e74), 
+  ACE_NTOHL (0x0),  // name = dk_Event
   };
 
 static CORBA::TypeCode _tc_TAO_tc_CORBA_DefinitionKind (
@@ -5402,7 +5442,7 @@ static const CORBA::Long _oc_CORBA_Contained_Description[] =
   ACE_NTOHL (0x6b696e64), 
   ACE_NTOHL (0x0),  // name = kind
     CORBA::tk_enum, // typecode kind
-  524, // encapsulation length
+  684, // encapsulation length
 TAO_ENCAP_BYTE_ORDER, // byte order
     37,
     ACE_NTOHL (0x49444c3a), 
@@ -5420,7 +5460,7 @@ TAO_ENCAP_BYTE_ORDER, // byte order
     ACE_NTOHL (0x6e697469), 
     ACE_NTOHL (0x6f6e4b69), 
     ACE_NTOHL (0x6e640000),  // name = DefinitionKind
-    26, // member count
+    36, // member count
     8,
     ACE_NTOHL (0x646b5f6e), 
     ACE_NTOHL (0x6f6e6500),  // name = dk_none
@@ -5534,6 +5574,46 @@ TAO_ENCAP_BYTE_ORDER, // byte order
     ACE_NTOHL (0x496e7465), 
     ACE_NTOHL (0x72666163), 
     ACE_NTOHL (0x65000000),  // name = dk_LocalInterface
+    13,
+    ACE_NTOHL (0x646b5f43), 
+    ACE_NTOHL (0x6f6d706f), 
+    ACE_NTOHL (0x6e656e74), 
+    ACE_NTOHL (0x0),  // name = dk_Component
+    8,
+    ACE_NTOHL (0x646b5f48), 
+    ACE_NTOHL (0x6f6d6500),  // name = dk_Home
+    11,
+    ACE_NTOHL (0x646b5f46), 
+    ACE_NTOHL (0x6163746f), 
+    ACE_NTOHL (0x72790000),  // name = dk_Factory
+    10,
+    ACE_NTOHL (0x646b5f46), 
+    ACE_NTOHL (0x696e6465), 
+    ACE_NTOHL (0x72000000),  // name = dk_Finder
+    9,
+    ACE_NTOHL (0x646b5f45), 
+    ACE_NTOHL (0x6d697473), 
+    ACE_NTOHL (0x0),  // name = dk_Emits
+    13,
+    ACE_NTOHL (0x646b5f50), 
+    ACE_NTOHL (0x75626c69), 
+    ACE_NTOHL (0x73686573), 
+    ACE_NTOHL (0x0),  // name = dk_Publishes
+    12,
+    ACE_NTOHL (0x646b5f43), 
+    ACE_NTOHL (0x6f6e7375), 
+    ACE_NTOHL (0x6d657300),  // name = dk_Consumes
+    12,
+    ACE_NTOHL (0x646b5f50), 
+    ACE_NTOHL (0x726f7669), 
+    ACE_NTOHL (0x64657300),  // name = dk_Provides
+    8,
+    ACE_NTOHL (0x646b5f55), 
+    ACE_NTOHL (0x73657300),  // name = dk_Uses
+    9,
+    ACE_NTOHL (0x646b5f45), 
+    ACE_NTOHL (0x76656e74), 
+    ACE_NTOHL (0x0),  // name = dk_Event
     
   6,
   ACE_NTOHL (0x76616c75), 
@@ -14620,7 +14700,7 @@ static const CORBA::Long _oc_CORBA_Container_Description[] =
   ACE_NTOHL (0x6b696e64), 
   ACE_NTOHL (0x0),  // name = kind
     CORBA::tk_enum, // typecode kind
-  524, // encapsulation length
+  684, // encapsulation length
 TAO_ENCAP_BYTE_ORDER, // byte order
     37,
     ACE_NTOHL (0x49444c3a), 
@@ -14638,7 +14718,7 @@ TAO_ENCAP_BYTE_ORDER, // byte order
     ACE_NTOHL (0x6e697469), 
     ACE_NTOHL (0x6f6e4b69), 
     ACE_NTOHL (0x6e640000),  // name = DefinitionKind
-    26, // member count
+    36, // member count
     8,
     ACE_NTOHL (0x646b5f6e), 
     ACE_NTOHL (0x6f6e6500),  // name = dk_none
@@ -14752,6 +14832,46 @@ TAO_ENCAP_BYTE_ORDER, // byte order
     ACE_NTOHL (0x496e7465), 
     ACE_NTOHL (0x72666163), 
     ACE_NTOHL (0x65000000),  // name = dk_LocalInterface
+    13,
+    ACE_NTOHL (0x646b5f43), 
+    ACE_NTOHL (0x6f6d706f), 
+    ACE_NTOHL (0x6e656e74), 
+    ACE_NTOHL (0x0),  // name = dk_Component
+    8,
+    ACE_NTOHL (0x646b5f48), 
+    ACE_NTOHL (0x6f6d6500),  // name = dk_Home
+    11,
+    ACE_NTOHL (0x646b5f46), 
+    ACE_NTOHL (0x6163746f), 
+    ACE_NTOHL (0x72790000),  // name = dk_Factory
+    10,
+    ACE_NTOHL (0x646b5f46), 
+    ACE_NTOHL (0x696e6465), 
+    ACE_NTOHL (0x72000000),  // name = dk_Finder
+    9,
+    ACE_NTOHL (0x646b5f45), 
+    ACE_NTOHL (0x6d697473), 
+    ACE_NTOHL (0x0),  // name = dk_Emits
+    13,
+    ACE_NTOHL (0x646b5f50), 
+    ACE_NTOHL (0x75626c69), 
+    ACE_NTOHL (0x73686573), 
+    ACE_NTOHL (0x0),  // name = dk_Publishes
+    12,
+    ACE_NTOHL (0x646b5f43), 
+    ACE_NTOHL (0x6f6e7375), 
+    ACE_NTOHL (0x6d657300),  // name = dk_Consumes
+    12,
+    ACE_NTOHL (0x646b5f50), 
+    ACE_NTOHL (0x726f7669), 
+    ACE_NTOHL (0x64657300),  // name = dk_Provides
+    8,
+    ACE_NTOHL (0x646b5f55), 
+    ACE_NTOHL (0x73657300),  // name = dk_Uses
+    9,
+    ACE_NTOHL (0x646b5f45), 
+    ACE_NTOHL (0x76656e74), 
+    ACE_NTOHL (0x0),  // name = dk_Event
     
   6,
   ACE_NTOHL (0x76616c75), 
@@ -14926,10 +15046,10 @@ static const CORBA::Long _oc_CORBA_Container_DescriptionSeq[] =
   ACE_NTOHL (0x696f6e53), 
   ACE_NTOHL (0x65710000),  // name = DescriptionSeq
     CORBA::tk_sequence, // typecode kind
-  736, // encapsulation length
+  896, // encapsulation length
     TAO_ENCAP_BYTE_ORDER, // byte order
     CORBA::tk_struct, // typecode kind
-    720, // encapsulation length
+    880, // encapsulation length
       TAO_ENCAP_BYTE_ORDER, // byte order
       44,
       ACE_NTOHL (0x49444c3a), 
@@ -14975,7 +15095,7 @@ static const CORBA::Long _oc_CORBA_Container_DescriptionSeq[] =
       ACE_NTOHL (0x6b696e64), 
       ACE_NTOHL (0x0),  // name = kind
             CORBA::tk_enum, // typecode kind
-      524, // encapsulation length
+      684, // encapsulation length
 TAO_ENCAP_BYTE_ORDER, // byte order
         37,
         ACE_NTOHL (0x49444c3a), 
@@ -14993,7 +15113,7 @@ TAO_ENCAP_BYTE_ORDER, // byte order
         ACE_NTOHL (0x6e697469), 
         ACE_NTOHL (0x6f6e4b69), 
         ACE_NTOHL (0x6e640000),  // name = DefinitionKind
-        26, // member count
+        36, // member count
         8,
         ACE_NTOHL (0x646b5f6e), 
         ACE_NTOHL (0x6f6e6500),  // name = dk_none
@@ -15107,6 +15227,46 @@ TAO_ENCAP_BYTE_ORDER, // byte order
         ACE_NTOHL (0x496e7465), 
         ACE_NTOHL (0x72666163), 
         ACE_NTOHL (0x65000000),  // name = dk_LocalInterface
+        13,
+        ACE_NTOHL (0x646b5f43), 
+        ACE_NTOHL (0x6f6d706f), 
+        ACE_NTOHL (0x6e656e74), 
+        ACE_NTOHL (0x0),  // name = dk_Component
+        8,
+        ACE_NTOHL (0x646b5f48), 
+        ACE_NTOHL (0x6f6d6500),  // name = dk_Home
+        11,
+        ACE_NTOHL (0x646b5f46), 
+        ACE_NTOHL (0x6163746f), 
+        ACE_NTOHL (0x72790000),  // name = dk_Factory
+        10,
+        ACE_NTOHL (0x646b5f46), 
+        ACE_NTOHL (0x696e6465), 
+        ACE_NTOHL (0x72000000),  // name = dk_Finder
+        9,
+        ACE_NTOHL (0x646b5f45), 
+        ACE_NTOHL (0x6d697473), 
+        ACE_NTOHL (0x0),  // name = dk_Emits
+        13,
+        ACE_NTOHL (0x646b5f50), 
+        ACE_NTOHL (0x75626c69), 
+        ACE_NTOHL (0x73686573), 
+        ACE_NTOHL (0x0),  // name = dk_Publishes
+        12,
+        ACE_NTOHL (0x646b5f43), 
+        ACE_NTOHL (0x6f6e7375), 
+        ACE_NTOHL (0x6d657300),  // name = dk_Consumes
+        12,
+        ACE_NTOHL (0x646b5f50), 
+        ACE_NTOHL (0x726f7669), 
+        ACE_NTOHL (0x64657300),  // name = dk_Provides
+        8,
+        ACE_NTOHL (0x646b5f55), 
+        ACE_NTOHL (0x73657300),  // name = dk_Uses
+        9,
+        ACE_NTOHL (0x646b5f45), 
+        ACE_NTOHL (0x76656e74), 
+        ACE_NTOHL (0x0),  // name = dk_Event
         
       6,
       ACE_NTOHL (0x76616c75), 
@@ -17343,6 +17503,7 @@ void operator<<= (
 {
   TAO::Any_Dual_Impl_T<CORBA::Contained::Description>::insert_copy (
       _tao_any,
+      CORBA::Contained::Description::_tao_any_destructor,
       CORBA::Contained::_tc_Description,
       _tao_elem
     );
@@ -17400,6 +17561,7 @@ void operator<<= (
 {
   TAO::Any_Dual_Impl_T<CORBA::ContainedSeq>::insert_copy (
       _tao_any,
+      CORBA::ContainedSeq::_tao_any_destructor,
       CORBA::_tc_ContainedSeq,
       _tao_elem
     );
@@ -17457,6 +17619,7 @@ void operator<<= (
 {
   TAO::Any_Dual_Impl_T<CORBA::InterfaceDefSeq>::insert_copy (
       _tao_any,
+      CORBA::InterfaceDefSeq::_tao_any_destructor,
       CORBA::_tc_InterfaceDefSeq,
       _tao_elem
     );
@@ -17514,6 +17677,7 @@ void operator<<= (
 {
   TAO::Any_Dual_Impl_T<CORBA::ValueDefSeq>::insert_copy (
       _tao_any,
+      CORBA::ValueDefSeq::_tao_any_destructor,
       CORBA::_tc_ValueDefSeq,
       _tao_elem
     );
@@ -17571,6 +17735,7 @@ void operator<<= (
 {
   TAO::Any_Dual_Impl_T<CORBA::AbstractInterfaceDefSeq>::insert_copy (
       _tao_any,
+      CORBA::AbstractInterfaceDefSeq::_tao_any_destructor,
       CORBA::_tc_AbstractInterfaceDefSeq,
       _tao_elem
     );
@@ -17628,6 +17793,7 @@ void operator<<= (
 {
   TAO::Any_Dual_Impl_T<CORBA::LocalInterfaceDefSeq>::insert_copy (
       _tao_any,
+      CORBA::LocalInterfaceDefSeq::_tao_any_destructor,
       CORBA::_tc_LocalInterfaceDefSeq,
       _tao_elem
     );
@@ -17685,6 +17851,7 @@ void operator<<= (
 {
   TAO::Any_Dual_Impl_T<CORBA::StructMember>::insert_copy (
       _tao_any,
+      CORBA::StructMember::_tao_any_destructor,
       CORBA::_tc_StructMember,
       _tao_elem
     );
@@ -17742,6 +17909,7 @@ void operator<<= (
 {
   TAO::Any_Dual_Impl_T<CORBA::StructMemberSeq>::insert_copy (
       _tao_any,
+      CORBA::StructMemberSeq::_tao_any_destructor,
       CORBA::_tc_StructMemberSeq,
       _tao_elem
     );
@@ -17799,6 +17967,7 @@ void operator<<= (
 {
   TAO::Any_Dual_Impl_T<CORBA::Initializer>::insert_copy (
       _tao_any,
+      CORBA::Initializer::_tao_any_destructor,
       CORBA::_tc_Initializer,
       _tao_elem
     );
@@ -17856,6 +18025,7 @@ void operator<<= (
 {
   TAO::Any_Dual_Impl_T<CORBA::InitializerSeq>::insert_copy (
       _tao_any,
+      CORBA::InitializerSeq::_tao_any_destructor,
       CORBA::_tc_InitializerSeq,
       _tao_elem
     );
@@ -17913,6 +18083,7 @@ void operator<<= (
 {
   TAO::Any_Dual_Impl_T<CORBA::UnionMember>::insert_copy (
       _tao_any,
+      CORBA::UnionMember::_tao_any_destructor,
       CORBA::_tc_UnionMember,
       _tao_elem
     );
@@ -17970,6 +18141,7 @@ void operator<<= (
 {
   TAO::Any_Dual_Impl_T<CORBA::UnionMemberSeq>::insert_copy (
       _tao_any,
+      CORBA::UnionMemberSeq::_tao_any_destructor,
       CORBA::_tc_UnionMemberSeq,
       _tao_elem
     );
@@ -18027,6 +18199,7 @@ void operator<<= (
 {
   TAO::Any_Dual_Impl_T<CORBA::EnumMemberSeq>::insert_copy (
       _tao_any,
+      CORBA::EnumMemberSeq::_tao_any_destructor,
       CORBA::_tc_EnumMemberSeq,
       _tao_elem
     );
@@ -18136,6 +18309,7 @@ void operator<<= (
 {
   TAO::Any_Dual_Impl_T<CORBA::Container::Description>::insert_copy (
       _tao_any,
+      CORBA::Container::Description::_tao_any_destructor,
       CORBA::Container::_tc_Description,
       _tao_elem
     );
@@ -18193,6 +18367,7 @@ void operator<<= (
 {
   TAO::Any_Dual_Impl_T<CORBA::Container::DescriptionSeq>::insert_copy (
       _tao_any,
+      CORBA::Container::DescriptionSeq::_tao_any_destructor,
       CORBA::Container::_tc_DescriptionSeq,
       _tao_elem
     );
@@ -18354,6 +18529,7 @@ void operator<<= (
 {
   TAO::Any_Dual_Impl_T<CORBA::TypeDescription>::insert_copy (
       _tao_any,
+      CORBA::TypeDescription::_tao_any_destructor,
       CORBA::_tc_TypeDescription,
       _tao_elem
     );
@@ -18401,7 +18577,7 @@ CORBA::Boolean operator>>= (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -18444,7 +18620,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -18487,7 +18663,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -18554,7 +18730,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -18621,7 +18797,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -18688,7 +18864,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -18755,7 +18931,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -18822,7 +18998,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -18888,7 +19064,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -18954,7 +19130,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -19020,7 +19196,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -19086,7 +19262,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -19152,7 +19328,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -19195,7 +19371,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -19238,7 +19414,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
diff --git a/TAO/tao/IFR_Client/IFR_BasicC.cpp b/TAO/tao/IFR_Client/IFR_BasicC.cpp
index 62eb8ef49bf..52ef03f24a4 100644
--- a/TAO/tao/IFR_Client/IFR_BasicC.cpp
+++ b/TAO/tao/IFR_Client/IFR_BasicC.cpp
@@ -36102,6 +36102,7 @@ void operator<<= (
 {
   TAO::Any_Dual_Impl_T<CORBA::ModuleDescription>::insert_copy (
       _tao_any,
+      CORBA::ModuleDescription::_tao_any_destructor,
       CORBA::_tc_ModuleDescription,
       _tao_elem
     );
@@ -36211,6 +36212,7 @@ void operator<<= (
 {
   TAO::Any_Dual_Impl_T<CORBA::ConstantDescription>::insert_copy (
       _tao_any,
+      CORBA::ConstantDescription::_tao_any_destructor,
       CORBA::_tc_ConstantDescription,
       _tao_elem
     );
@@ -36840,6 +36842,7 @@ void operator<<= (
 {
   TAO::Any_Dual_Impl_T<CORBA::ExceptionDescription>::insert_copy (
       _tao_any,
+      CORBA::ExceptionDescription::_tao_any_destructor,
       CORBA::_tc_ExceptionDescription,
       _tao_elem
     );
@@ -36897,6 +36900,7 @@ void operator<<= (
 {
   TAO::Any_Dual_Impl_T<CORBA::ExceptionDefSeq>::insert_copy (
       _tao_any,
+      CORBA::ExceptionDefSeq::_tao_any_destructor,
       CORBA::_tc_ExceptionDefSeq,
       _tao_elem
     );
@@ -36954,6 +36958,7 @@ void operator<<= (
 {
   TAO::Any_Dual_Impl_T<CORBA::ExcDescriptionSeq>::insert_copy (
       _tao_any,
+      CORBA::ExcDescriptionSeq::_tao_any_destructor,
       CORBA::_tc_ExcDescriptionSeq,
       _tao_elem
     );
@@ -37091,6 +37096,7 @@ void operator<<= (
 {
   TAO::Any_Dual_Impl_T<CORBA::AttributeDescription>::insert_copy (
       _tao_any,
+      CORBA::AttributeDescription::_tao_any_destructor,
       CORBA::_tc_AttributeDescription,
       _tao_elem
     );
@@ -37176,6 +37182,7 @@ void operator<<= (
 {
   TAO::Any_Dual_Impl_T<CORBA::ParameterDescription>::insert_copy (
       _tao_any,
+      CORBA::ParameterDescription::_tao_any_destructor,
       CORBA::_tc_ParameterDescription,
       _tao_elem
     );
@@ -37233,6 +37240,7 @@ void operator<<= (
 {
   TAO::Any_Dual_Impl_T<CORBA::ParDescriptionSeq>::insert_copy (
       _tao_any,
+      CORBA::ParDescriptionSeq::_tao_any_destructor,
       CORBA::_tc_ParDescriptionSeq,
       _tao_elem
     );
@@ -37290,6 +37298,7 @@ void operator<<= (
 {
   TAO::Any_Dual_Impl_T<CORBA::ContextIdSeq>::insert_copy (
       _tao_any,
+      CORBA::ContextIdSeq::_tao_any_destructor,
       CORBA::_tc_ContextIdSeq,
       _tao_elem
     );
@@ -37399,6 +37408,7 @@ void operator<<= (
 {
   TAO::Any_Dual_Impl_T<CORBA::OperationDescription>::insert_copy (
       _tao_any,
+      CORBA::OperationDescription::_tao_any_destructor,
       CORBA::_tc_OperationDescription,
       _tao_elem
     );
@@ -37456,6 +37466,7 @@ void operator<<= (
 {
   TAO::Any_Dual_Impl_T<CORBA::RepositoryIdSeq>::insert_copy (
       _tao_any,
+      CORBA::RepositoryIdSeq::_tao_any_destructor,
       CORBA::_tc_RepositoryIdSeq,
       _tao_elem
     );
@@ -37513,6 +37524,7 @@ void operator<<= (
 {
   TAO::Any_Dual_Impl_T<CORBA::OpDescriptionSeq>::insert_copy (
       _tao_any,
+      CORBA::OpDescriptionSeq::_tao_any_destructor,
       CORBA::_tc_OpDescriptionSeq,
       _tao_elem
     );
@@ -37570,6 +37582,7 @@ void operator<<= (
 {
   TAO::Any_Dual_Impl_T<CORBA::AttrDescriptionSeq>::insert_copy (
       _tao_any,
+      CORBA::AttrDescriptionSeq::_tao_any_destructor,
       CORBA::_tc_AttrDescriptionSeq,
       _tao_elem
     );
@@ -37679,6 +37692,7 @@ void operator<<= (
 {
   TAO::Any_Dual_Impl_T<CORBA::InterfaceDef::FullInterfaceDescription>::insert_copy (
       _tao_any,
+      CORBA::InterfaceDef::FullInterfaceDescription::_tao_any_destructor,
       CORBA::InterfaceDef::_tc_FullInterfaceDescription,
       _tao_elem
     );
@@ -37736,6 +37750,7 @@ void operator<<= (
 {
   TAO::Any_Dual_Impl_T<CORBA::InterfaceDescription>::insert_copy (
       _tao_any,
+      CORBA::InterfaceDescription::_tao_any_destructor,
       CORBA::_tc_InterfaceDescription,
       _tao_elem
     );
@@ -37887,7 +37902,7 @@ operator>>= (
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -37930,7 +37945,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -37973,7 +37988,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -38016,7 +38031,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -38059,7 +38074,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -38102,7 +38117,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -38145,7 +38160,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -38188,7 +38203,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -38231,7 +38246,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -38274,7 +38289,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -38317,7 +38332,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -38360,7 +38375,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -38403,7 +38418,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -38446,7 +38461,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -38489,7 +38504,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -38556,7 +38571,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -38622,7 +38637,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -38665,7 +38680,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -38731,7 +38746,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -38797,7 +38812,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -38840,7 +38855,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -38906,7 +38921,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -38972,7 +38987,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -39038,7 +39053,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -39081,7 +39096,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -39124,7 +39139,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
diff --git a/TAO/tao/IFR_Client/IFR_ComponentsC.cpp b/TAO/tao/IFR_Client/IFR_ComponentsC.cpp
index 5fa43ba528a..1bb77e451a8 100644
--- a/TAO/tao/IFR_Client/IFR_ComponentsC.cpp
+++ b/TAO/tao/IFR_Client/IFR_ComponentsC.cpp
@@ -47,188 +47,6 @@
 // TAO_IDL - Generated from
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
 
-static const CORBA::Long _oc_IR_DefinitionKind[] =
-{
-  TAO_ENCAP_BYTE_ORDER, // byte order
-  34,
-  ACE_NTOHL (0x49444c3a), 
-  ACE_NTOHL (0x6f6d672e), 
-  ACE_NTOHL (0x6f72672f), 
-  ACE_NTOHL (0x49522f44), 
-  ACE_NTOHL (0x6566696e), 
-  ACE_NTOHL (0x6974696f), 
-  ACE_NTOHL (0x6e4b696e), 
-  ACE_NTOHL (0x643a312e), 
-  ACE_NTOHL (0x30000000),  // repository ID = IDL:omg.org/IR/DefinitionKind:1.0
-  15,
-  ACE_NTOHL (0x44656669), 
-  ACE_NTOHL (0x6e697469), 
-  ACE_NTOHL (0x6f6e4b69), 
-  ACE_NTOHL (0x6e640000),  // name = DefinitionKind
-  34, // member count
-  8,
-  ACE_NTOHL (0x646b5f6e), 
-  ACE_NTOHL (0x6f6e6500),  // name = dk_none
-  7,
-  ACE_NTOHL (0x646b5f61), 
-  ACE_NTOHL (0x6c6c0000),  // name = dk_all
-  13,
-  ACE_NTOHL (0x646b5f41), 
-  ACE_NTOHL (0x74747269), 
-  ACE_NTOHL (0x62757465), 
-  ACE_NTOHL (0x0),  // name = dk_Attribute
-  12,
-  ACE_NTOHL (0x646b5f43), 
-  ACE_NTOHL (0x6f6e7374), 
-  ACE_NTOHL (0x616e7400),  // name = dk_Constant
-  13,
-  ACE_NTOHL (0x646b5f45), 
-  ACE_NTOHL (0x78636570), 
-  ACE_NTOHL (0x74696f6e), 
-  ACE_NTOHL (0x0),  // name = dk_Exception
-  13,
-  ACE_NTOHL (0x646b5f49), 
-  ACE_NTOHL (0x6e746572), 
-  ACE_NTOHL (0x66616365), 
-  ACE_NTOHL (0x0),  // name = dk_Interface
-  10,
-  ACE_NTOHL (0x646b5f4d), 
-  ACE_NTOHL (0x6f64756c), 
-  ACE_NTOHL (0x65000000),  // name = dk_Module
-  13,
-  ACE_NTOHL (0x646b5f4f), 
-  ACE_NTOHL (0x70657261), 
-  ACE_NTOHL (0x74696f6e), 
-  ACE_NTOHL (0x0),  // name = dk_Operation
-  11,
-  ACE_NTOHL (0x646b5f54), 
-  ACE_NTOHL (0x79706564), 
-  ACE_NTOHL (0x65660000),  // name = dk_Typedef
-  9,
-  ACE_NTOHL (0x646b5f41), 
-  ACE_NTOHL (0x6c696173), 
-  ACE_NTOHL (0x0),  // name = dk_Alias
-  10,
-  ACE_NTOHL (0x646b5f53), 
-  ACE_NTOHL (0x74727563), 
-  ACE_NTOHL (0x74000000),  // name = dk_Struct
-  9,
-  ACE_NTOHL (0x646b5f55), 
-  ACE_NTOHL (0x6e696f6e), 
-  ACE_NTOHL (0x0),  // name = dk_Union
-  8,
-  ACE_NTOHL (0x646b5f45), 
-  ACE_NTOHL (0x6e756d00),  // name = dk_Enum
-  13,
-  ACE_NTOHL (0x646b5f50), 
-  ACE_NTOHL (0x72696d69), 
-  ACE_NTOHL (0x74697665), 
-  ACE_NTOHL (0x0),  // name = dk_Primitive
-  10,
-  ACE_NTOHL (0x646b5f53), 
-  ACE_NTOHL (0x7472696e), 
-  ACE_NTOHL (0x67000000),  // name = dk_String
-  12,
-  ACE_NTOHL (0x646b5f53), 
-  ACE_NTOHL (0x65717565), 
-  ACE_NTOHL (0x6e636500),  // name = dk_Sequence
-  9,
-  ACE_NTOHL (0x646b5f41), 
-  ACE_NTOHL (0x72726179), 
-  ACE_NTOHL (0x0),  // name = dk_Array
-  14,
-  ACE_NTOHL (0x646b5f52), 
-  ACE_NTOHL (0x65706f73), 
-  ACE_NTOHL (0x69746f72), 
-  ACE_NTOHL (0x79000000),  // name = dk_Repository
-  11,
-  ACE_NTOHL (0x646b5f57), 
-  ACE_NTOHL (0x73747269), 
-  ACE_NTOHL (0x6e670000),  // name = dk_Wstring
-  9,
-  ACE_NTOHL (0x646b5f46), 
-  ACE_NTOHL (0x69786564), 
-  ACE_NTOHL (0x0),  // name = dk_Fixed
-  9,
-  ACE_NTOHL (0x646b5f56), 
-  ACE_NTOHL (0x616c7565), 
-  ACE_NTOHL (0x0),  // name = dk_Value
-  12,
-  ACE_NTOHL (0x646b5f56), 
-  ACE_NTOHL (0x616c7565), 
-  ACE_NTOHL (0x426f7800),  // name = dk_ValueBox
-  15,
-  ACE_NTOHL (0x646b5f56), 
-  ACE_NTOHL (0x616c7565), 
-  ACE_NTOHL (0x4d656d62), 
-  ACE_NTOHL (0x65720000),  // name = dk_ValueMember
-  10,
-  ACE_NTOHL (0x646b5f4e), 
-  ACE_NTOHL (0x61746976), 
-  ACE_NTOHL (0x65000000),  // name = dk_Native
-  13,
-  ACE_NTOHL (0x646b5f43), 
-  ACE_NTOHL (0x6f6d706f), 
-  ACE_NTOHL (0x6e656e74), 
-  ACE_NTOHL (0x0),  // name = dk_Component
-  8,
-  ACE_NTOHL (0x646b5f48), 
-  ACE_NTOHL (0x6f6d6500),  // name = dk_Home
-  11,
-  ACE_NTOHL (0x646b5f46), 
-  ACE_NTOHL (0x6163746f), 
-  ACE_NTOHL (0x72790000),  // name = dk_Factory
-  10,
-  ACE_NTOHL (0x646b5f46), 
-  ACE_NTOHL (0x696e6465), 
-  ACE_NTOHL (0x72000000),  // name = dk_Finder
-  14,
-  ACE_NTOHL (0x646b5f50), 
-  ACE_NTOHL (0x72696d61), 
-  ACE_NTOHL (0x72794b65), 
-  ACE_NTOHL (0x79000000),  // name = dk_PrimaryKey
-  9,
-  ACE_NTOHL (0x646b5f45), 
-  ACE_NTOHL (0x6d697473), 
-  ACE_NTOHL (0x0),  // name = dk_Emits
-  13,
-  ACE_NTOHL (0x646b5f50), 
-  ACE_NTOHL (0x75626c69), 
-  ACE_NTOHL (0x73686573), 
-  ACE_NTOHL (0x0),  // name = dk_Publishes
-  12,
-  ACE_NTOHL (0x646b5f43), 
-  ACE_NTOHL (0x6f6e7375), 
-  ACE_NTOHL (0x6d657300),  // name = dk_Consumes
-  12,
-  ACE_NTOHL (0x646b5f50), 
-  ACE_NTOHL (0x726f7669), 
-  ACE_NTOHL (0x64657300),  // name = dk_Provides
-  8,
-  ACE_NTOHL (0x646b5f55), 
-  ACE_NTOHL (0x73657300),  // name = dk_Uses
-  };
-
-static CORBA::TypeCode _tc_TAO_tc_IR_DefinitionKind (
-    CORBA::tk_enum,
-    sizeof (_oc_IR_DefinitionKind),
-    (char *) &_oc_IR_DefinitionKind,
-    0,
-    sizeof (IR::DefinitionKind)
-  );
-
-TAO_NAMESPACE_TYPE (CORBA::TypeCode_ptr)
-TAO_NAMESPACE_BEGIN (IR)
-TAO_NAMESPACE_DEFINE (
-    ::CORBA::TypeCode_ptr,
-    _tc_DefinitionKind,
-    &_tc_TAO_tc_IR_DefinitionKind
-  )
-TAO_NAMESPACE_END
-
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284
-
 static const CORBA::Long _oc_IR_Identifier[] =
 {
     TAO_ENCAP_BYTE_ORDER, // byte order
@@ -23099,34 +22917,6 @@ void IR::HomeDescription::_tao_any_destructor (void *_tao_void_pointer)
   delete tmp;
 }
 
-// TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/any_op_cs.cpp:52
-
-void operator<<= (
-    CORBA::Any &_tao_any,
-    IR::DefinitionKind _tao_elem
-  )
-{
-  TAO::Any_Basic_Impl_T<IR::DefinitionKind>::insert (
-      _tao_any,
-      IR::_tc_DefinitionKind,
-      _tao_elem
-    );
-}
-
-CORBA::Boolean operator>>= (
-    const CORBA::Any &_tao_any,
-    IR::DefinitionKind &_tao_elem
-  )
-{
-  return
-    TAO::Any_Basic_Impl_T<IR::DefinitionKind>::extract (
-        _tao_any,
-        IR::_tc_DefinitionKind,
-        _tao_elem 
-      );
-}
-
 // TAO_IDL - Generated from 
 // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/any_op_cs.cpp:54
 
@@ -23138,6 +22928,7 @@ void operator<<= (
 {
   TAO::Any_Dual_Impl_T<IR::RepositoryIdSeq>::insert_copy (
       _tao_any,
+      IR::RepositoryIdSeq::_tao_any_destructor,
       IR::_tc_RepositoryIdSeq,
       _tao_elem
     );
@@ -23195,6 +22986,7 @@ void operator<<= (
 {
   TAO::Any_Dual_Impl_T<IR::ComponentDefSeq>::insert_copy (
       _tao_any,
+      IR::ComponentDefSeq::_tao_any_destructor,
       IR::_tc_ComponentDefSeq,
       _tao_elem
     );
@@ -23252,6 +23044,7 @@ void operator<<= (
 {
   TAO::Any_Dual_Impl_T<IR::ProvidesDefSeq>::insert_copy (
       _tao_any,
+      IR::ProvidesDefSeq::_tao_any_destructor,
       IR::_tc_ProvidesDefSeq,
       _tao_elem
     );
@@ -23309,6 +23102,7 @@ void operator<<= (
 {
   TAO::Any_Dual_Impl_T<IR::UsesDefSeq>::insert_copy (
       _tao_any,
+      IR::UsesDefSeq::_tao_any_destructor,
       IR::_tc_UsesDefSeq,
       _tao_elem
     );
@@ -23366,6 +23160,7 @@ void operator<<= (
 {
   TAO::Any_Dual_Impl_T<IR::HomeDefSeq>::insert_copy (
       _tao_any,
+      IR::HomeDefSeq::_tao_any_destructor,
       IR::_tc_HomeDefSeq,
       _tao_elem
     );
@@ -23423,6 +23218,7 @@ void operator<<= (
 {
   TAO::Any_Dual_Impl_T<IR::EmitsDefSeq>::insert_copy (
       _tao_any,
+      IR::EmitsDefSeq::_tao_any_destructor,
       IR::_tc_EmitsDefSeq,
       _tao_elem
     );
@@ -23480,6 +23276,7 @@ void operator<<= (
 {
   TAO::Any_Dual_Impl_T<IR::PublishesDefSeq>::insert_copy (
       _tao_any,
+      IR::PublishesDefSeq::_tao_any_destructor,
       IR::_tc_PublishesDefSeq,
       _tao_elem
     );
@@ -23537,6 +23334,7 @@ void operator<<= (
 {
   TAO::Any_Dual_Impl_T<IR::ConsumesDefSeq>::insert_copy (
       _tao_any,
+      IR::ConsumesDefSeq::_tao_any_destructor,
       IR::_tc_ConsumesDefSeq,
       _tao_elem
     );
@@ -23594,6 +23392,7 @@ void operator<<= (
 {
   TAO::Any_Dual_Impl_T<IR::FactoryDefSeq>::insert_copy (
       _tao_any,
+      IR::FactoryDefSeq::_tao_any_destructor,
       IR::_tc_FactoryDefSeq,
       _tao_elem
     );
@@ -23651,6 +23450,7 @@ void operator<<= (
 {
   TAO::Any_Dual_Impl_T<IR::FinderDefSeq>::insert_copy (
       _tao_any,
+      IR::FinderDefSeq::_tao_any_destructor,
       IR::_tc_FinderDefSeq,
       _tao_elem
     );
@@ -23812,6 +23612,7 @@ void operator<<= (
 {
   TAO::Any_Dual_Impl_T<IR::ProvidesDescription>::insert_copy (
       _tao_any,
+      IR::ProvidesDescription::_tao_any_destructor,
       IR::_tc_ProvidesDescription,
       _tao_elem
     );
@@ -23921,6 +23722,7 @@ void operator<<= (
 {
   TAO::Any_Dual_Impl_T<IR::UsesDescription>::insert_copy (
       _tao_any,
+      IR::UsesDescription::_tao_any_destructor,
       IR::_tc_UsesDescription,
       _tao_elem
     );
@@ -23978,6 +23780,7 @@ void operator<<= (
 {
   TAO::Any_Dual_Impl_T<IR::ProvidesDescSeq>::insert_copy (
       _tao_any,
+      IR::ProvidesDescSeq::_tao_any_destructor,
       IR::_tc_ProvidesDescSeq,
       _tao_elem
     );
@@ -24035,6 +23838,7 @@ void operator<<= (
 {
   TAO::Any_Dual_Impl_T<IR::UsesDescSeq>::insert_copy (
       _tao_any,
+      IR::UsesDescSeq::_tao_any_destructor,
       IR::_tc_UsesDescSeq,
       _tao_elem
     );
@@ -24144,6 +23948,7 @@ void operator<<= (
 {
   TAO::Any_Dual_Impl_T<IR::EventDescription>::insert_copy (
       _tao_any,
+      IR::EventDescription::_tao_any_destructor,
       IR::_tc_EventDescription,
       _tao_elem
     );
@@ -24409,6 +24214,7 @@ void operator<<= (
 {
   TAO::Any_Dual_Impl_T<IR::ComponentDescription>::insert_copy (
       _tao_any,
+      IR::ComponentDescription::_tao_any_destructor,
       IR::_tc_ComponentDescription,
       _tao_elem
     );
@@ -24518,6 +24324,7 @@ void operator<<= (
 {
   TAO::Any_Dual_Impl_T<IR::PrimaryKeyDescription>::insert_copy (
       _tao_any,
+      IR::PrimaryKeyDescription::_tao_any_destructor,
       IR::_tc_PrimaryKeyDescription,
       _tao_elem
     );
@@ -24731,6 +24538,7 @@ void operator<<= (
 {
   TAO::Any_Dual_Impl_T<IR::HomeDescription>::insert_copy (
       _tao_any,
+      IR::HomeDescription::_tao_any_destructor,
       IR::_tc_HomeDescription,
       _tao_elem
     );
@@ -24778,7 +24586,7 @@ CORBA::Boolean operator>>= (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -24844,7 +24652,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -24911,7 +24719,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -24978,7 +24786,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -25045,7 +24853,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -25112,7 +24920,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -25179,7 +24987,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -25246,7 +25054,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -25313,7 +25121,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -25380,7 +25188,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -25447,7 +25255,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -25490,7 +25298,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -25533,7 +25341,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -25576,7 +25384,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -25642,7 +25450,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -25708,7 +25516,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -25751,7 +25559,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -25794,7 +25602,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -25837,7 +25645,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -25880,7 +25688,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -25923,7 +25731,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -25966,7 +25774,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -26009,7 +25817,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -26052,7 +25860,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
diff --git a/TAO/tao/IFR_Client/IFR_ExtendedC.cpp b/TAO/tao/IFR_Client/IFR_ExtendedC.cpp
index 50412b02ce2..5f1f755b47a 100644
--- a/TAO/tao/IFR_Client/IFR_ExtendedC.cpp
+++ b/TAO/tao/IFR_Client/IFR_ExtendedC.cpp
@@ -13587,6 +13587,7 @@ void operator<<= (
 {
   TAO::Any_Dual_Impl_T<CORBA::ValueMember>::insert_copy (
       _tao_any,
+      CORBA::ValueMember::_tao_any_destructor,
       CORBA::_tc_ValueMember,
       _tao_elem
     );
@@ -13644,6 +13645,7 @@ void operator<<= (
 {
   TAO::Any_Dual_Impl_T<CORBA::ValueMemberSeq>::insert_copy (
       _tao_any,
+      CORBA::ValueMemberSeq::_tao_any_destructor,
       CORBA::_tc_ValueMemberSeq,
       _tao_elem
     );
@@ -13805,6 +13807,7 @@ void operator<<= (
 {
   TAO::Any_Dual_Impl_T<CORBA::ValueDef::FullValueDescription>::insert_copy (
       _tao_any,
+      CORBA::ValueDef::FullValueDescription::_tao_any_destructor,
       CORBA::ValueDef::_tc_FullValueDescription,
       _tao_elem
     );
@@ -13862,6 +13865,7 @@ void operator<<= (
 {
   TAO::Any_Dual_Impl_T<CORBA::ValueDescription>::insert_copy (
       _tao_any,
+      CORBA::ValueDescription::_tao_any_destructor,
       CORBA::_tc_ValueDescription,
       _tao_elem
     );
@@ -13961,7 +13965,7 @@ operator>>= (
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -14004,7 +14008,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:103
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_sequence/cdr_op_cs.cpp:125
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -14070,7 +14074,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -14113,7 +14117,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
@@ -14156,7 +14160,7 @@ CORBA::Boolean operator>> (
 }
 
 // TAO_IDL - Generated from
-// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:63
+// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/cdr_op_cs.cpp:94
 
 CORBA::Boolean operator<< (
     TAO_OutputCDR &strm,
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp
index 07d0f42def6..a4f1960780d 100644
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp
+++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.cpp
@@ -349,14 +349,8 @@ TAO_TypeCodeFactory_i::create_enum_tc (
 
   cdr << id;
 
-  this->string_pad (cdr,
-                    ACE_OS::strlen (id) + 1);
-
   cdr << name;
 
-  this->string_pad (cdr,
-                    ACE_OS::strlen (name) + 1);
-
   CORBA::ULong len = members.length ();
 
   cdr << len;
@@ -377,9 +371,6 @@ TAO_TypeCodeFactory_i::create_enum_tc (
         }
 
       cdr << members[index].in ();
-
-      this->string_pad (cdr,
-                        ACE_OS::strlen (members[index].in ()) + 1);
     }
 
   ACE_Message_Block consolidated_block;
@@ -443,14 +434,8 @@ TAO_TypeCodeFactory_i::create_alias_tc (
 
   cdr << id;
 
-  this->string_pad (cdr,
-                    ACE_OS::strlen (id) + 1);
-
   cdr << name;
 
-  this->string_pad (cdr,
-                    ACE_OS::strlen (name) + 1);
-
   cdr << original_type;
 
   ACE_Message_Block consolidated_block;
@@ -1094,14 +1079,8 @@ TAO_TypeCodeFactory_i::struct_except_tc_common (
 
   cdr << id;
 
-  this->string_pad (cdr,
-                    ACE_OS::strlen (id) + 1);
-
   cdr << name;
 
-  this->string_pad (cdr,
-                    ACE_OS::strlen (name) + 1);
-
   // Number of members..
   CORBA::ULong len = members.length ();
 
@@ -1150,9 +1129,6 @@ TAO_TypeCodeFactory_i::struct_except_tc_common (
 
       cdr << member_name;
 
-      this->string_pad (cdr,
-                        ACE_OS::strlen (member_name) + 1);
-
       cdr << tc_holder;
     }
 
@@ -1421,18 +1397,6 @@ TAO_TypeCodeFactory_i::valid_disc_type (CORBA::TypeCode_ptr tc
   return 0;
 }
 
-void
-TAO_TypeCodeFactory_i::string_pad (TAO_OutputCDR &cdr,
-                                   CORBA::ULong slen)
-{
-  CORBA::ULong padlen = (4 - (slen % 4)) % 4;
-
-  for (CORBA::ULong i = 0; i < padlen; ++i)
-    {
-      cdr.write_char ('\0');
-    }
-}
-
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 
 template class ACE_Hash_Map_Entry<ACE_CString, int>;
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.h b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.h
index 0eb249d5b81..5bc62f0b2b6 100644
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.h
+++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.h
@@ -233,11 +233,6 @@ private:
   CORBA::Boolean valid_disc_type (CORBA::TypeCode_ptr tc
                                   ACE_ENV_ARG_DECL);
 
-  /// A string in a TAO typecode contains padding to give it a
-  /// total size which is a multiple of 4 bytes.
-  void string_pad (TAO_OutputCDR &cdr,
-                   CORBA::ULong slen);
-
   /// Prohibited
   TAO_TypeCodeFactory_i (const TAO_TypeCodeFactory_i &src);
   TAO_TypeCodeFactory_i &operator= (const TAO_TypeCodeFactory_i &src);
diff --git a/TAO/tao/Typecode.cpp b/TAO/tao/Typecode.cpp
index 3d749c46f5c..8fe41e5999a 100644
--- a/TAO/tao/Typecode.cpp
+++ b/TAO/tao/Typecode.cpp
@@ -860,7 +860,7 @@ CORBA_TypeCode::equ_common (CORBA::TypeCode_ptr tc,
       // typecode kinds are same
       return rcvr->private_equal (tcvar.in (),
                                   equiv_only
-                                   ACE_ENV_ARG_PARAMETER);
+                                  ACE_ENV_ARG_PARAMETER);
     }
 
   CORBA::TCKind kind = tc->kind (ACE_ENV_SINGLE_ARG_PARAMETER);
@@ -2427,7 +2427,7 @@ CORBA_TypeCode::private_member_label (CORBA::ULong n
       int retval =
         TAO_Marshal_Object::perform_skip (disc_tc,
                                           &temp
-                                           ACE_ENV_ARG_PARAMETER);
+                                          ACE_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       if (retval != CORBA::TypeCode::TRAVERSE_CONTINUE)
@@ -2465,7 +2465,7 @@ CORBA_TypeCode::private_member_label (CORBA::ULong n
           retval =
             TAO_Marshal_Object::perform_skip (disc_tc,
                                               &stream
-                                               ACE_ENV_ARG_PARAMETER);
+                                              ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (0);
 
           if (retval != CORBA::TypeCode::TRAVERSE_CONTINUE)
@@ -2481,7 +2481,7 @@ CORBA_TypeCode::private_member_label (CORBA::ULong n
             TAO_Marshal_Object::perform_append (label_tc,
                                                 &stream,
                                                 &out
-                                                 ACE_ENV_ARG_PARAMETER);
+                                                ACE_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (0);
 
           if (retval != CORBA::TypeCode::TRAVERSE_CONTINUE)
@@ -2490,14 +2490,24 @@ CORBA_TypeCode::private_member_label (CORBA::ULong n
             }
         }
 
+      TAO::Unknown_IDL_Type *impl = 0;
+      ACE_NEW_THROW_EX (impl,
+                        TAO::Unknown_IDL_Type (
+                            CORBA::TypeCode::_duplicate (label_tc),
+                            out.begin (),
+                            ACE_CDR_BYTE_ORDER,
+                            1
+                          ),
+                        CORBA::NO_MEMORY ());
+      ACE_CHECK_RETURN (0);
+
       ACE_NEW_THROW_EX (label_list[i],
-                        CORBA::Any (label_tc,
-                                    0,
-                                    ACE_CDR_BYTE_ORDER,
-                                    out.begin ()),
+                        CORBA::Any,
                         CORBA::NO_MEMORY ());
       ACE_CHECK_RETURN (0);
 
+      label_list[i]->replace (impl);
+
       if (stream.skip_string () == 0
           || this->skip_typecode (stream) == 0)
         {
diff --git a/TAO/tao/Typecode.i b/TAO/tao/Typecode.i
index 4066b436c19..06df6cd888b 100644
--- a/TAO/tao/Typecode.i
+++ b/TAO/tao/Typecode.i
@@ -48,7 +48,7 @@ CORBA_TypeCode::equivalent (CORBA::TypeCode_ptr tc
 {
   return this->equ_common (tc,
                            1
-                            ACE_ENV_ARG_PARAMETER);
+                           ACE_ENV_ARG_PARAMETER);
 }
 
 // Returns true if the two typecodes are identical.
@@ -58,7 +58,7 @@ CORBA_TypeCode::equal (CORBA::TypeCode_ptr tc
 {
   return this->equ_common (tc,
                            0
-                            ACE_ENV_ARG_PARAMETER);
+                           ACE_ENV_ARG_PARAMETER);
 }
 
 // returns the Repository ID