ChangeLogTag: Thu Oct 24 19:32:08 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu>

13 files changed, 56 insertions, 119 deletions

diff --git a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp
index d36dd0c26ce..7f59e17ed6a 100644
--- a/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Asynch_Three_Stage/Connection_Manager.cpp
@@ -436,8 +436,7 @@ Connection_Manager::add_streamctrl (const ACE_CString &flowname,
 {
   // Get the stream controller for this endpoint.
   CORBA::Any_var streamctrl_any =
-    endpoint->get_property_value (ACE_const_cast (CosPropertyService::PropertyName,
-                                                  "Related_StreamCtrl")
+    endpoint->get_property_value ("Related_StreamCtrl"
                                   ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.cpp b/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.cpp
index 82ce568c1af..c5e61528048 100644
--- a/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Component_Switching/Connection_Manager.cpp
@@ -439,8 +439,7 @@ Connection_Manager::add_streamctrl (const ACE_CString &flowname,
 {
   // Get the stream controller for this endpoint.
   CORBA::Any_var streamctrl_any =
-    endpoint->get_property_value (ACE_const_cast (CosPropertyService::PropertyName,
-                                                  "Related_StreamCtrl")
+    endpoint->get_property_value ("Related_StreamCtrl"
                                   ACE_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp
index 9771d3a6410..cd5008b2fd7 100644
--- a/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Simple_Three_Stage/sender.cpp
@@ -20,8 +20,7 @@ Sender_StreamEndPoint::get_callback (const char *,
   ACE_TRY_NEW_ENV
     {
       CORBA::Any_ptr streamctrl_any =
-        this->get_property_value (ACE_const_cast (CosPropertyService::PropertyName,
-                                                  "Related_StreamCtrl"
+        this->get_property_value ("Related_StreamCtrl"
                                   ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
diff --git a/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.cpp b/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.cpp
index abfcdcf8219..02ed8e5d823 100644
--- a/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.cpp
+++ b/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.cpp
@@ -170,11 +170,8 @@ NContextExt_Client_i::run (ACE_ENV_SINGLE_ARG_DECL)
         {
           // Resolve the name using the stringified form of the name
           factory_object =
-            this->naming_context_->resolve_str (
-                ACE_const_cast (const CosNaming::NamingContextExt::StringName,
-                               str_name.in ())
-                ACE_ENV_ARG_PARAMETER
-              );
+            this->naming_context_->resolve_str (str_name.in ()
+                                                ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK_EX (InnerBlock);
         }
       ACE_CATCH (CosNaming::NamingContext::NotFound, ex)
@@ -184,8 +181,7 @@ NContextExt_Client_i::run (ACE_ENV_SINGLE_ARG_DECL)
 
       // Narrow
       Web_Server::Iterator_Factory_var factory =
-        Web_Server::Iterator_Factory::_narrow (factory_object.in () 
-                                               ACE_ENV_ARG_PARAMETER);
+        Web_Server::Iterator_Factory::_narrow (factory_object.in () ACE_ENV_ARG_PARAMETER);
 
       ACE_TRY_CHECK_EX (OuterBlock);
 
@@ -202,11 +198,8 @@ NContextExt_Client_i::run (ACE_ENV_SINGLE_ARG_DECL)
       // Convert the stringified name back as CosNaming::Name and print
       // them out.
       CosNaming::Name *nam =
-        this->naming_context_->to_name (
-            ACE_const_cast (const CosNaming::NamingContextExt::StringName,
-                            str_name.in ())
-            ACE_ENV_ARG_PARAMETER
-          );
+        this->naming_context_->to_name (str_name.in ()
+                                        ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK_EX (OuterBlock);
 
       // Declare a CosNaming::Name variable and assign length to it.
@@ -230,13 +223,9 @@ NContextExt_Client_i::run (ACE_ENV_SINGLE_ARG_DECL)
       CORBA::String_var obj_name = get_name ();
 
       CORBA::String_var url_string =
-        this->naming_context_->to_url (
-            ACE_const_cast (const CosNaming::NamingContextExt::Address,
-                            address.in ()),
-            ACE_const_cast (const CosNaming::NamingContextExt::StringName,
-                            obj_name.in ())
-            ACE_ENV_ARG_PARAMETER
-          );
+        this->naming_context_->to_url (address.in (),
+                                       obj_name.in()
+                                       ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK_EX (OuterBlock);
 
       if (this->view_ == 0)
diff --git a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.cpp b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.cpp
index 34ab1f6fafa..ae8a7fc7dd9 100644
--- a/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.cpp
+++ b/TAO/orbsvcs/tests/LoadBalancing/GenericFactory/Application_Controlled/LB_server.cpp
@@ -139,7 +139,7 @@ LB_server::create_object_group (void)
 {
   ACE_TRY_NEW_ENV
     {
-      const PortableGroup::GroupDomainId repository_id = "IDL:Test/Basic:1.0";
+      const char *repository_id = "IDL:Test/Basic:1.0";
 
       PortableGroup::Criteria criteria (1);
       criteria.length (1);
@@ -154,12 +154,10 @@ LB_server::create_object_group (void)
         PortableGroup::MEMB_APP_CTRL;
       property.val <<= msv;
 
-      this->object_group_ = 
-        this->lm_->create_object (ACE_const_cast (PortableGroup::TypeId,
-                                                  repository_id),
-                                  criteria,
-                                  this->fcid_.out ()
-                                  ACE_ENV_ARG_PARAMETER);
+      this->object_group_ = this->lm_->create_object (repository_id,
+                                                      criteria,
+                                                      this->fcid_.out ()
+                                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
diff --git a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp
index 3fe1b3b75f9..8cef9e7e9e5 100644
--- a/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp
+++ b/TAO/orbsvcs/tests/Log/Basic_Log_Test/Basic_Log_Test.cpp
@@ -697,10 +697,7 @@ int BasicLog_Test::delete_records (CORBA::ULongLong /* numberOfRecords */)
               ACE_U64_TO_U32 (nrecords)));
 
   CORBA::Long retVal =
-    basicLog_->delete_records ("TCL", 
-                               ACE_const_cast (const DsLogAdmin::Constraint,
-                                               "id >= 0")
-                               ACE_ENV_ARG_PARAMETER);
+    basicLog_->delete_records ("TCL", "id >= 0" ACE_ENV_ARG_PARAMETER);
 
   ACE_DEBUG ((LM_DEBUG,
               "Number of records in Log after delete = %d\n",
diff --git a/TAO/orbsvcs/tests/Property/client.cpp b/TAO/orbsvcs/tests/Property/client.cpp
index 829abd81a1d..88e2b054e22 100644
--- a/TAO/orbsvcs/tests/Property/client.cpp
+++ b/TAO/orbsvcs/tests/Property/client.cpp
@@ -141,8 +141,7 @@ Client::test_define_property (ACE_ENV_SINGLE_ARG_DECL)
   ch = '*';
   anyval >>= CORBA::Any::to_char (ch);
 
-  this->propsetdef_->define_property (ACE_const_cast (CosPropertyService::PropertyName,
-                                                      "char_property"),
+  this->propsetdef_->define_property ("char_property",
                                       anyval
                                       ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
@@ -153,8 +152,7 @@ Client::test_define_property (ACE_ENV_SINGLE_ARG_DECL)
   s = 7;
   anyval >>= s;
 
-  propsetdef_->define_property (ACE_const_cast (CosPropertyService::PropertyName,
-                                                "short_property"),
+  propsetdef_->define_property ("short_property",
                                 anyval
                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
@@ -165,8 +163,7 @@ Client::test_define_property (ACE_ENV_SINGLE_ARG_DECL)
   l = 931233;
   anyval >>= l;
   CORBA::Any newany(anyval);
-  propsetdef_->define_property (ACE_const_cast (CosPropertyService::PropertyName,
-                                                "long_property"),
+  propsetdef_->define_property ("long_property",
                                 anyval
                                 ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
@@ -177,8 +174,7 @@ Client::test_define_property (ACE_ENV_SINGLE_ARG_DECL)
   f = 4.14F;
   anyval >>= f;
 
-  propsetdef_->define_property (ACE_const_cast (CosPropertyService::PropertyName,
-                                                "float_property"),
+  propsetdef_->define_property ("float_property",
                                 anyval
                                 ACE_ENV_ARG_PARAMETER);
 
@@ -189,8 +185,7 @@ Client::test_define_property (ACE_ENV_SINGLE_ARG_DECL)
   anyval <<= strvar.in ();
   const char * newstr;
   anyval >>= newstr;
-  propsetdef_->define_property (ACE_const_cast (CosPropertyService::PropertyName,
-                                                "string_property"),
+  propsetdef_->define_property ("string_property",
                                 anyval
                                 ACE_ENV_ARG_PARAMETER);
 
@@ -398,11 +393,8 @@ Client::test_delete_property (const char *property_name
     {
       CORBA::String_var property_name_var (property_name);
 
-      this->propsetdef_->delete_property (
-          ACE_const_cast (CosPropertyService::PropertyName,
-                          property_name_var.in ())
-          ACE_ENV_ARG_PARAMETER
-        );
+      this->propsetdef_->delete_property (property_name_var.in ()
+                                          ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::UserException, ex)
@@ -644,8 +636,7 @@ Client::test_define_property_with_mode (ACE_ENV_SINGLE_ARG_DECL)
   ch = '*';
   anyval >>= CORBA::Any::to_char (ch);
 
-  this->propsetdef_->define_property_with_mode (ACE_const_cast (CosPropertyService::PropertyName,
-                                                                "char_property"),
+  this->propsetdef_->define_property_with_mode ("char_property",
                                                 anyval,
                                                 CosPropertyService::normal
                                                 ACE_ENV_ARG_PARAMETER);
@@ -657,8 +648,7 @@ Client::test_define_property_with_mode (ACE_ENV_SINGLE_ARG_DECL)
   s = 7;
   anyval >>= s;
 
-  propsetdef_->define_property_with_mode (ACE_const_cast (CosPropertyService::PropertyName,
-                                                          "short_property"),
+  propsetdef_->define_property_with_mode ("short_property",
                                           anyval,
                                           CosPropertyService::read_only
                                           ACE_ENV_ARG_PARAMETER);
@@ -682,8 +672,7 @@ Client::test_define_property_with_mode (ACE_ENV_SINGLE_ARG_DECL)
   anyval <<= f;
   f = 4.14F;
   anyval >>= f;
-  propsetdef_->define_property_with_mode (ACE_const_cast (CosPropertyService::PropertyName,
-                                                          "float_property"),
+  propsetdef_->define_property_with_mode ("float_property",
                                           anyval,
                                           CosPropertyService::fixed_readonly
                                           ACE_ENV_ARG_PARAMETER);
@@ -695,8 +684,7 @@ Client::test_define_property_with_mode (ACE_ENV_SINGLE_ARG_DECL)
   const char* newstr;
   anyval >>= newstr;
 
-  propsetdef_->define_property  (ACE_const_cast (CosPropertyService::PropertyName,
-                                                 "string_property"),
+  propsetdef_->define_property  ("string_property",
                                  anyval
                                  ACE_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN ( -1);
@@ -710,10 +698,8 @@ Client::test_get_property_value (ACE_ENV_SINGLE_ARG_DECL)
   ACE_TRY
     {
       // Get the ior property.
-      CORBA::Any_ptr any_ptr = 
-        this->propsetdef_->get_property_value (ACE_const_cast (CosPropertyService::PropertyName,
-                                                               "PropertySetDef_IOR")
-                                               ACE_ENV_ARG_PARAMETER);
+      CORBA::Any_ptr any_ptr = this->propsetdef_->get_property_value ("PropertySetDef_IOR"
+                                                                      ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Check whether the IOR is fine.
diff --git a/TAO/orbsvcs/tests/Property/server.cpp b/TAO/orbsvcs/tests/Property/server.cpp
index b66d0ad52a2..bcaeae71a5f 100644
--- a/TAO/orbsvcs/tests/Property/server.cpp
+++ b/TAO/orbsvcs/tests/Property/server.cpp
@@ -75,8 +75,7 @@ main (int argc, char ** argv)
       //                  ACE_ENV_ARG_PARAMETER);
       // ACE_TRY_CHECK;
 
-      propsetdef_impl->define_property_with_mode (ACE_const_cast (CosPropertyService::PropertyName,
-                                                                  "PropertySetDef_IOR"),
+      propsetdef_impl->define_property_with_mode ("PropertySetDef_IOR",
                                                   any_val,
                                                   CosPropertyService::fixed_readonly
                                                   ACE_ENV_ARG_PARAMETER);
diff --git a/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp b/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp
index ee71d20c050..e4fa0e39cba 100644
--- a/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp
+++ b/TAO/orbsvcs/tests/Trading/Offer_Exporter.cpp
@@ -81,8 +81,7 @@ TAO_Offer_Exporter::export_to (CosTrading::Register_ptr reg
 
           CosTrading::OfferId_var offer_id =
             reg->_cxx_export (offer_obj,
-                              ACE_const_cast (const CosTrading::ServiceTypeName,
-                                              TT_Info::INTERFACE_NAMES[1]),
+                              TT_Info::INTERFACE_NAMES[1],
                               this->props_plotters_[i]
                               ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
@@ -96,8 +95,7 @@ TAO_Offer_Exporter::export_to (CosTrading::Register_ptr reg
           ACE_TRY_CHECK;
 
           offer_id = reg->_cxx_export (offer_obj,
-                                       ACE_const_cast (const CosTrading::ServiceTypeName,
-                                                       TT_Info::INTERFACE_NAMES[2]),
+                                       TT_Info::INTERFACE_NAMES[2],
                                        this->props_printers_[i]
                                        ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
@@ -111,8 +109,7 @@ TAO_Offer_Exporter::export_to (CosTrading::Register_ptr reg
           ACE_TRY_CHECK;
 
           offer_id = reg->_cxx_export (offer_obj,
-                                       ACE_const_cast (const CosTrading::ServiceTypeName,
-                                                       TT_Info::INTERFACE_NAMES[3]),
+                                       TT_Info::INTERFACE_NAMES[3],
                                        this->props_fs_[i]
                                        ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK
@@ -181,9 +178,7 @@ TAO_Offer_Exporter::export_offers_to_all (ACE_ENV_SINGLE_ARG_DECL)
             }
 
           CosTrading::Link::LinkInfo_var link_info =
-            link_if->describe_link (ACE_const_cast (const CosTrading::LinkName,
-                                                    link_name_seq[i].in ())
-                                    ACE_ENV_ARG_PARAMETER);
+            link_if->describe_link (link_name_seq[i] ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           for (int j = 0; j < NUM_OFFERS; j++)
@@ -232,9 +227,7 @@ TAO_Offer_Exporter::withdraw_offers (ACE_ENV_SINGLE_ARG_DECL)
           length = offer_id_seq->length ();
           for (CORBA::ULong i = 0; i < length; i++)
             {
-              this->register_->withdraw (ACE_const_cast (const CosTrading::OfferId,
-                                                         offer_id_seq[i].in ())
-                                         ACE_ENV_ARG_PARAMETER);
+              this->register_->withdraw (offer_id_seq[i] ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
         }
@@ -272,9 +265,7 @@ TAO_Offer_Exporter::describe_offers (ACE_ENV_SINGLE_ARG_DECL)
           for (CORBA::ULong i = 0; i < length; i++)
             {
               CosTrading::Register::OfferInfo_var offer_info =
-                this->register_->describe (ACE_const_cast (const CosTrading::OfferId,
-                                                           offer_id_seq[i].in ())
-                                           ACE_ENV_ARG_PARAMETER);
+                this->register_->describe (offer_id_seq[i] ACE_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               if (this->verbose_)
@@ -334,8 +325,7 @@ TAO_Offer_Exporter::modify_offers (ACE_ENV_SINGLE_ARG_DECL)
 
           for (CORBA::ULong i = 0; i < length; i++)
             {
-              this->register_->modify (ACE_const_cast (const CosTrading::OfferId,
-                                                       offer_id_seq[i].in ()),
+              this->register_->modify (offer_id_seq[i],
                                        del_list,
                                        modify_list
                                        ACE_ENV_ARG_PARAMETER);
@@ -371,26 +361,20 @@ withdraw_offers_using_constraints (ACE_ENV_SINGLE_ARG_DECL)
   ACE_TRY
     {
       this->register_->
-        withdraw_using_constraint (ACE_const_cast (const CosTrading::ServiceTypeName,
-                                                   TT_Info::INTERFACE_NAMES[TT_Info::PLOTTER]),
-                                   ACE_const_cast (const CosTrading::Constraint,
-                                                   constraint)
+        withdraw_using_constraint (TT_Info::INTERFACE_NAMES[TT_Info::PLOTTER],
+                                   constraint
                                    ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       this->register_->
-        withdraw_using_constraint (ACE_const_cast (const CosTrading::ServiceTypeName,
-                                                   TT_Info::INTERFACE_NAMES[TT_Info::PRINTER]),
-                                   ACE_const_cast (const CosTrading::Constraint,
-                                                   constraint)
+        withdraw_using_constraint (TT_Info::INTERFACE_NAMES[TT_Info::PRINTER],
+                                   constraint
                                    ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       this->register_->
-        withdraw_using_constraint (ACE_const_cast (const CosTrading::ServiceTypeName,
-                                                   TT_Info::INTERFACE_NAMES[TT_Info::FILESYSTEM]),
-                                   ACE_const_cast (const CosTrading::Constraint,
-                                                   constraint)
+        withdraw_using_constraint (TT_Info::INTERFACE_NAMES[TT_Info::FILESYSTEM],
+                                   constraint
                                    ACE_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
diff --git a/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp b/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp
index 0f8ab540b42..8e367d0f0d8 100644
--- a/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp
+++ b/TAO/orbsvcs/tests/Trading/Offer_Importer.cpp
@@ -83,9 +83,7 @@ TAO_Offer_Importer::perform_directed_queries (ACE_ENV_SINGLE_ARG_DECL)
         }
 
       CosTrading::Link::LinkInfo_var link_info =
-        link_if->describe_link (ACE_const_cast (const CosTrading::LinkName,
-                                                link_name_seq[0u].in ())
-                                ACE_ENV_ARG_PARAMETER);
+        link_if->describe_link (link_name_seq[0u] ACE_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       CosTrading::Lookup_ptr lookup_if = link_info->target.in ();
@@ -183,12 +181,9 @@ perform_queries_with_policies (const TAO_Policy_Creator& policies
           CosTrading::OfferIterator_out offer_iterator_out (offer_iterator_ptr);
           CosTrading::PolicyNameSeq_out limits_applied_out (limits_applied_ptr);
 
-          this->lookup_->query (ACE_const_cast (const CosTrading::ServiceTypeName,
-                                                TT_Info::QUERIES[i][0]),
-                                ACE_const_cast (const CosTrading::Constraint,
-                                                TT_Info::QUERIES[i][1]),
-                                ACE_const_cast (const CosTrading::Lookup::Preference,
-                                                TT_Info::QUERIES[i][2]),
+          this->lookup_->query (TT_Info::QUERIES[i][0],
+                                TT_Info::QUERIES[i][1],
+                                TT_Info::QUERIES[i][2],
                                 policies.policy_seq (),
                                 desired_props,
                                 8,
diff --git a/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp b/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp
index bd46a35e014..2a60d2a9798 100644
--- a/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp
+++ b/TAO/orbsvcs/tests/Trading/Service_Type_Exporter.cpp
@@ -39,9 +39,7 @@ TAO_Service_Type_Exporter::remove_all_types (ACE_ENV_SINGLE_ARG_DECL)
     {
       ACE_TRY
         {
-          this->repos_->remove_type (ACE_const_cast (const CosTrading::ServiceTypeName,
-                                                     TT_Info::INTERFACE_NAMES[i])
-                                     ACE_ENV_ARG_PARAMETER);
+          this->repos_->remove_type (TT_Info::INTERFACE_NAMES[i] ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCH (CosTrading::UnknownServiceType, excp)
@@ -116,9 +114,7 @@ TAO_Service_Type_Exporter::add_all_types_to_all (ACE_ENV_SINGLE_ARG_DECL)
           ACE_DEBUG ((LM_DEBUG, "Getting link information for %s\n",
                       ACE_static_cast (const char*, link_name_seq[i])));
           CosTrading::Link::LinkInfo_var link_info =
-            link_if->describe_link (ACE_const_cast (const CosTrading::LinkName,
-                                                    link_name_seq[i].in ())
-                                    ACE_ENV_ARG_PARAMETER);
+            link_if->describe_link (link_name_seq[i] ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           ACE_DEBUG ((LM_DEBUG, "Adding service types to %s\n",
@@ -165,10 +161,8 @@ add_all_types_to (CosTradingRepos::ServiceTypeRepository_ptr repos
     {
       ACE_TRY
         {
-          repos->add_type (ACE_const_cast (const CosTrading::ServiceTypeName,
-                                           TT_Info::INTERFACE_NAMES[i]),
-                           ACE_const_cast (const CosTradingRepos::ServiceTypeRepository::Identifier,
-                                           this->type_structs_[i].if_name.in ()),
+          repos->add_type (TT_Info::INTERFACE_NAMES[i],
+                           this->type_structs_[i].if_name,
                            this->type_structs_[i].props,
                            this->type_structs_[i].super_types
                            ACE_ENV_ARG_PARAMETER);
@@ -259,8 +253,7 @@ TAO_Service_Type_Exporter::describe_all_types (ACE_ENV_SINGLE_ARG_DECL)
       for (int i = 0; i < NUM_TYPES; i++)
         {
           CosTradingRepos::ServiceTypeRepository::TypeStruct_var type_struct =
-            this->repos_->describe_type (ACE_const_cast (const CosTrading::ServiceTypeName,
-                                                         TT_Info::INTERFACE_NAMES[i])
+            this->repos_->describe_type (TT_Info::INTERFACE_NAMES[i]
                                          ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
@@ -294,8 +287,7 @@ TAO_Service_Type_Exporter::fully_describe_all_types (ACE_ENV_SINGLE_ARG_DECL)
       for (int i = 0; i < NUM_TYPES; i++)
         {
           CosTradingRepos::ServiceTypeRepository::TypeStruct_var type_struct =
-            this->repos_->fully_describe_type (ACE_const_cast (const CosTrading::ServiceTypeName,
-                                                               TT_Info::INTERFACE_NAMES[i])
+            this->repos_->fully_describe_type (TT_Info::INTERFACE_NAMES[i]
                                                ACE_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
diff --git a/TAO/orbsvcs/tests/Trading/Simple_Dynamic.cpp b/TAO/orbsvcs/tests/Trading/Simple_Dynamic.cpp
index fef5f10f4b8..c28feb6e4f3 100644
--- a/TAO/orbsvcs/tests/Trading/Simple_Dynamic.cpp
+++ b/TAO/orbsvcs/tests/Trading/Simple_Dynamic.cpp
@@ -14,7 +14,7 @@ TAO_Simple_Dynamic_Property<T>::TAO_Simple_Dynamic_Property (const T& dp)
 }
 
 template <class T> CORBA::Any*
-TAO_Simple_Dynamic_Property<T>::evalDP (const CosTrading::PropertyName,
+TAO_Simple_Dynamic_Property<T>::evalDP (const char*,
                                         CORBA::TypeCode_ptr,
                                         const CORBA::Any&
                                         ACE_ENV_ARG_DECL_NOT_USED)
diff --git a/TAO/orbsvcs/tests/Trading/Simple_Dynamic.h b/TAO/orbsvcs/tests/Trading/Simple_Dynamic.h
index 8204458c646..28cf7b442dd 100644
--- a/TAO/orbsvcs/tests/Trading/Simple_Dynamic.h
+++ b/TAO/orbsvcs/tests/Trading/Simple_Dynamic.h
@@ -32,7 +32,7 @@ public:
 
   TAO_Simple_Dynamic_Property (const T& dp);
 
-  virtual CORBA::Any* evalDP (const CosTrading::PropertyName /* name */,
+  virtual CORBA::Any* evalDP (const char* /* name */,
                               CORBA::TypeCode_ptr /* returned_type */,
                               const CORBA::Any& /* extra_info */
                               ACE_ENV_ARG_DECL_NOT_USED)