diff options
author | bala <bala@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-10-25 00:40:19 +0000 |
---|---|---|
committer | bala <bala@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-10-25 00:40:19 +0000 |
commit | 6add26de444f2ee728ab1f54d619eb6966f0237e (patch) | |
tree | 7186f9cc2016f800491b0c27a7e73fb24ce91220 /TAO/examples | |
parent | 77514a55589ec9f60354b1960af4b6afc52c45dc (diff) | |
download | ATCD-6add26de444f2ee728ab1f54d619eb6966f0237e.tar.gz |
ChangeLogTag: Thu Oct 24 19:32:08 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu>
Diffstat (limited to 'TAO/examples')
-rw-r--r-- | TAO/examples/Load_Balancing/Identity_Client.cpp | 3 | ||||
-rw-r--r-- | TAO/examples/Load_Balancing/Identity_Server.cpp | 6 | ||||
-rw-r--r-- | TAO/examples/Load_Balancing/Load_Balancer_i.cpp | 14 | ||||
-rw-r--r-- | TAO/examples/Load_Balancing/Load_Balancer_i.h | 14 | ||||
-rwxr-xr-x | TAO/examples/Load_Balancing_persistent/Identity_Client.cpp | 3 | ||||
-rwxr-xr-x | TAO/examples/Load_Balancing_persistent/Identity_Server.cpp | 12 | ||||
-rwxr-xr-x | TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp | 18 | ||||
-rwxr-xr-x | TAO/examples/Load_Balancing_persistent/Load_Balancer_i.h | 20 | ||||
-rw-r--r-- | TAO/examples/OBV/Typed_Events/Event_Types_impl.cpp | 6 | ||||
-rw-r--r-- | TAO/examples/POA/DSI/Database_i.cpp | 6 | ||||
-rw-r--r-- | TAO/examples/POA/DSI/Database_i.h | 6 | ||||
-rw-r--r-- | TAO/examples/POA/DSI/client.cpp | 6 | ||||
-rw-r--r-- | TAO/examples/RTCORBA/Activity/Activity.cpp | 3 |
13 files changed, 53 insertions, 64 deletions
diff --git a/TAO/examples/Load_Balancing/Identity_Client.cpp b/TAO/examples/Load_Balancing/Identity_Client.cpp index bdd5b71ed33..4fb31825759 100644 --- a/TAO/examples/Load_Balancing/Identity_Client.cpp +++ b/TAO/examples/Load_Balancing/Identity_Client.cpp @@ -130,8 +130,7 @@ Identity_Client::run (ACE_ENV_SINGLE_ARG_DECL) "Identity_Client: Requesting Object Group " "with id <%s>\n", group_name)); Load_Balancer::Object_Group_var object_group = - factory->resolve (ACE_const_cast (const Load_Balancer::Group_ID, - group_name) + factory->resolve (group_name ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); diff --git a/TAO/examples/Load_Balancing/Identity_Server.cpp b/TAO/examples/Load_Balancing/Identity_Server.cpp index 394c69643f0..dfc94035395 100644 --- a/TAO/examples/Load_Balancing/Identity_Server.cpp +++ b/TAO/examples/Load_Balancing/Identity_Server.cpp @@ -107,8 +107,7 @@ Identity_Server::init (int argc, "Group with id <Identity, Random>\n")); Load_Balancer::Object_Group_var random_group = - factory->make_random (ACE_const_cast (const Load_Balancer::Group_ID, - "Identity, Random") + factory->make_random ("Identity, Random" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -117,8 +116,7 @@ Identity_Server::init (int argc, "Object Group with id <Identity, Round Robin>\n")); Load_Balancer::Object_Group_var rr_group = - factory->make_round_robin (ACE_const_cast (const Load_Balancer::Group_ID, - "Identity, Round Robin") + factory->make_round_robin ("Identity, Round Robin" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/examples/Load_Balancing/Load_Balancer_i.cpp b/TAO/examples/Load_Balancing/Load_Balancer_i.cpp index 6dd12dea7a3..78537a45bd4 100644 --- a/TAO/examples/Load_Balancing/Load_Balancer_i.cpp +++ b/TAO/examples/Load_Balancing/Load_Balancer_i.cpp @@ -32,7 +32,7 @@ Object_Group_Factory_i::remove_group (const ACE_CString &id, } Load_Balancer::Object_Group_ptr -Object_Group_Factory_i::make_round_robin (const Load_Balancer::Group_ID id +Object_Group_Factory_i::make_round_robin (const char * id ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::duplicate_group)) @@ -43,7 +43,7 @@ Object_Group_Factory_i::make_round_robin (const Load_Balancer::Group_ID id } Load_Balancer::Object_Group_ptr -Object_Group_Factory_i::make_random (const Load_Balancer::Group_ID id +Object_Group_Factory_i::make_random (const char * id ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::duplicate_group)) @@ -55,7 +55,7 @@ Object_Group_Factory_i::make_random (const Load_Balancer::Group_ID id Load_Balancer::Object_Group_ptr Object_Group_Factory_i::make_group (int random, - const Load_Balancer::Group_ID id + const char * id ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::duplicate_group)) @@ -122,7 +122,7 @@ Object_Group_Factory_i::make_group (int random, } Load_Balancer::Object_Group_ptr -Object_Group_Factory_i::resolve (const Load_Balancer::Group_ID id +Object_Group_Factory_i::resolve (const char * id ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::no_such_group)) @@ -256,7 +256,7 @@ Object_Group_i::bind (const Load_Balancer::Member & member } void -Object_Group_i::unbind (const Load_Balancer::Member_ID id +Object_Group_i::unbind (const char * id ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::no_such_member)) @@ -286,7 +286,7 @@ Object_Group_i::unbind (const Load_Balancer::Member_ID id } CORBA::Object_ptr -Object_Group_i::resolve_with_id (const Load_Balancer::Member_ID id +Object_Group_i::resolve_with_id (const char * id ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::no_such_member)) @@ -458,7 +458,7 @@ RR_Object_Group::resolve (ACE_ENV_SINGLE_ARG_DECL) } void -RR_Object_Group::unbind (const Load_Balancer::Member_ID id +RR_Object_Group::unbind (const char *id ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::no_such_member)) diff --git a/TAO/examples/Load_Balancing/Load_Balancer_i.h b/TAO/examples/Load_Balancing/Load_Balancer_i.h index c6f786da3ab..55a649c273e 100644 --- a/TAO/examples/Load_Balancing/Load_Balancer_i.h +++ b/TAO/examples/Load_Balancing/Load_Balancer_i.h @@ -58,7 +58,7 @@ public: // = Load_Balancer::Object_Group_Factory idl methods. - Load_Balancer::Object_Group_ptr make_round_robin (const Load_Balancer::Group_ID id + Load_Balancer::Object_Group_ptr make_round_robin (const char * id ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::duplicate_group)); @@ -68,7 +68,7 @@ public: // factory, and hasn't been destroyed, a <duplicate_group> // exception is thrown. - Load_Balancer::Object_Group_ptr make_random (const Load_Balancer::Group_ID id + Load_Balancer::Object_Group_ptr make_random (const char * id ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::duplicate_group)); @@ -78,7 +78,7 @@ public: // factory, and hasn't been destroyed, a <duplicate_group> // exception is thrown. - Load_Balancer::Object_Group_ptr resolve (const Load_Balancer::Group_ID id + Load_Balancer::Object_Group_ptr resolve (const char * id ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::no_such_group)); @@ -115,7 +115,7 @@ private: // = Helper methods. Load_Balancer::Object_Group_ptr make_group (int random, - const Load_Balancer::Group_ID id + const char * id ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::duplicate_group)); @@ -183,7 +183,7 @@ public: // group already contains a member with the same <Member_ID>, a // <duplicate_member> exceptions is thrown. - void unbind (const Load_Balancer::Member_ID id + void unbind (const char * id ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::no_such_member)); @@ -199,7 +199,7 @@ public: // ``round robin.'' If the group contains no members, <no_such_member> // exception is thrown. - CORBA::Object_ptr resolve_with_id (const Load_Balancer::Member_ID id + CORBA::Object_ptr resolve_with_id (const char * id ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::no_such_member)); @@ -294,7 +294,7 @@ public: ~RR_Object_Group (void); // Destructor. - void unbind (const Load_Balancer::Member_ID id + void unbind (const char * id ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::no_such_member)); diff --git a/TAO/examples/Load_Balancing_persistent/Identity_Client.cpp b/TAO/examples/Load_Balancing_persistent/Identity_Client.cpp index 42fa18798b4..d8843235965 100755 --- a/TAO/examples/Load_Balancing_persistent/Identity_Client.cpp +++ b/TAO/examples/Load_Balancing_persistent/Identity_Client.cpp @@ -156,8 +156,7 @@ Identity_Client::run (ACE_ENV_SINGLE_ARG_DECL) #endif /*TAO_MEASURE_STATS*/ // Remote call object_group = - factory->resolve (ACE_const_cast (const Load_Balancer::Group_ID, - group_name) + factory->resolve (group_name ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); diff --git a/TAO/examples/Load_Balancing_persistent/Identity_Server.cpp b/TAO/examples/Load_Balancing_persistent/Identity_Server.cpp index 94d95c17e55..5b2aa19c32a 100755 --- a/TAO/examples/Load_Balancing_persistent/Identity_Server.cpp +++ b/TAO/examples/Load_Balancing_persistent/Identity_Server.cpp @@ -140,8 +140,7 @@ Identity_Server::register_groups (ACE_ENV_SINGLE_ARG_DECL) // Unbind the previously registered random group. ACE_TRY_EX (UNBIND_RANDOM) { - factory->unbind_random (ACE_const_cast (const Load_Balancer::Group_ID, - "Random group") + factory->unbind_random ("Random group" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (UNBIND_RANDOM); } @@ -155,8 +154,7 @@ Identity_Server::register_groups (ACE_ENV_SINGLE_ARG_DECL) // Unbind the previously registered round robin group ACE_TRY_EX (UNBIND_ROUND) { - factory->unbind_round_robin (ACE_const_cast (const Load_Balancer::Group_ID, - "Round Robin group") + factory->unbind_round_robin ("Round Robin group" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (UNBIND_ROUND); } @@ -170,14 +168,12 @@ Identity_Server::register_groups (ACE_ENV_SINGLE_ARG_DECL) // We want to make two groups Random & Round Robin. Load_Balancer::Object_Group_var random_group = - factory->make_random (ACE_const_cast (const Load_Balancer::Group_ID, - "Random group") + factory->make_random ("Random group" ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); Load_Balancer::Object_Group_var rr_group = - factory->make_round_robin (ACE_const_cast (const Load_Balancer::Group_ID, - "Round Robin group") + factory->make_round_robin ("Round Robin group" ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); diff --git a/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp b/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp index 82cc60d6e08..30bb0dd6831 100755 --- a/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp +++ b/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.cpp @@ -47,7 +47,7 @@ Object_Group_Factory_i::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) Load_Balancer::Object_Group_ptr -Object_Group_Factory_i::make_round_robin (const Load_Balancer::Group_ID id +Object_Group_Factory_i::make_round_robin (const char * id ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::duplicate_group)) @@ -78,7 +78,7 @@ Object_Group_Factory_i::make_round_robin (const Load_Balancer::Group_ID id } void -Object_Group_Factory_i::unbind_round_robin (const Load_Balancer::Group_ID id +Object_Group_Factory_i::unbind_round_robin (const char * id ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::no_such_group)) @@ -119,7 +119,7 @@ Object_Group_Factory_i::unbind_round_robin (const Load_Balancer::Group_ID id } Load_Balancer::Object_Group_ptr -Object_Group_Factory_i::make_random (const Load_Balancer::Group_ID id +Object_Group_Factory_i::make_random (const char * id ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::duplicate_group)) @@ -151,7 +151,7 @@ Object_Group_Factory_i::make_random (const Load_Balancer::Group_ID id void -Object_Group_Factory_i::unbind_random (const Load_Balancer::Group_ID id +Object_Group_Factory_i::unbind_random (const char * id ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::no_such_group)) @@ -192,7 +192,7 @@ Object_Group_Factory_i::unbind_random (const Load_Balancer::Group_ID id Load_Balancer::Object_Group_ptr Object_Group_Factory_i::make_group (int random, - const Load_Balancer::Group_ID id + const char * id ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::duplicate_group)) @@ -308,7 +308,7 @@ Object_Group_Factory_i::make_group (int random, Load_Balancer::Object_Group_ptr -Object_Group_Factory_i::resolve (const Load_Balancer::Group_ID id +Object_Group_Factory_i::resolve (const char * id ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::no_such_group)) @@ -698,7 +698,7 @@ Object_Group_i::bind (const Load_Balancer::Member & member } void -Object_Group_i::unbind (const Load_Balancer::Member_ID id +Object_Group_i::unbind (const char * id ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::no_such_member)) @@ -752,7 +752,7 @@ Object_Group_i::unbind (const Load_Balancer::Member_ID id } char * -Object_Group_i::resolve_with_id (const Load_Balancer::Member_ID id +Object_Group_i::resolve_with_id (const char * id ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::no_such_member)) @@ -948,7 +948,7 @@ RR_Object_Group::resolve (ACE_ENV_SINGLE_ARG_DECL) } void -RR_Object_Group::unbind (const Load_Balancer::Member_ID id +RR_Object_Group::unbind (const char *id ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::no_such_member)) diff --git a/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.h b/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.h index 3a413e1b40f..7eff01186b3 100755 --- a/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.h +++ b/TAO/examples/Load_Balancing_persistent/Load_Balancer_i.h @@ -73,7 +73,7 @@ public: // = Load_Balancer::Object_Group_Factory idl methods. - Load_Balancer::Object_Group_ptr make_round_robin (const Load_Balancer::Group_ID id + Load_Balancer::Object_Group_ptr make_round_robin (const char * id ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::duplicate_group)); @@ -83,13 +83,13 @@ public: // factory, and hasn't been destroyed, a <duplicate_group> // exception is thrown. - void unbind_round_robin (const Load_Balancer::Group_ID id + void unbind_round_robin (const char *id ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::no_such_group)); - Load_Balancer::Object_Group_ptr make_random (const Load_Balancer::Group_ID id + Load_Balancer::Object_Group_ptr make_random (const char * id ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::duplicate_group)); @@ -99,12 +99,12 @@ public: // factory, and hasn't been destroyed, a <duplicate_group> // exception is thrown. - void unbind_random (const Load_Balancer::Group_ID id + void unbind_random (const char *id ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::no_such_group)); - Load_Balancer::Object_Group_ptr resolve (const Load_Balancer::Group_ID id + Load_Balancer::Object_Group_ptr resolve (const char * id ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::no_such_group)); @@ -137,7 +137,7 @@ private: // = Helper methods. Load_Balancer::Object_Group_ptr make_group (int random, - const Load_Balancer::Group_ID id + const char * id ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::duplicate_group)); @@ -229,7 +229,7 @@ public: // group already contains a member with the same <Member_ID>, a // <duplicate_member> exceptions is thrown. - void unbind (const Load_Balancer::Group_ID id + void unbind (const char * id ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::no_such_member)); @@ -245,7 +245,7 @@ public: // ``round robin.'' If the group contains no members, <no_such_member> // exception is thrown. - char * resolve_with_id (const Load_Balancer::Group_ID id + char * resolve_with_id (const char * id ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::no_such_member)); @@ -329,7 +329,7 @@ public: PortableServer::POA_ptr poa); // Constructor. - void unbind (const Load_Balancer::Group_ID id + void unbind (const char * id ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::no_such_member)); @@ -337,7 +337,7 @@ public: // Object_Group_i to make sure <resolve> // works correctly. - Load_Balancer::Group_ID resolve (ACE_ENV_SINGLE_ARG_DECL) + char * resolve (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Load_Balancer::no_such_member)); // Returns a member object from this <Object_Group> in accordance with diff --git a/TAO/examples/OBV/Typed_Events/Event_Types_impl.cpp b/TAO/examples/OBV/Typed_Events/Event_Types_impl.cpp index 163bfcbb0c1..dbc3fd4b4ff 100644 --- a/TAO/examples/OBV/Typed_Events/Event_Types_impl.cpp +++ b/TAO/examples/OBV/Typed_Events/Event_Types_impl.cpp @@ -265,8 +265,8 @@ Event_List_impl::store_event (Event* e ACE_ENV_ARG_DECL_NOT_USED) // guard against the access to the list from another thread. // But this is omitted in this example. - Event_List_Link_var new_link (ACE_static_cast (Event_List_Link*, - new Event_List_Link_impl (e))); + Event_List_Link_var new_link (ACE_static_cast(Event_List_Link*, + new Event_List_Link_impl (e))); // We need a new link to store the reference to the event e. // But if we'd had assigned the newly created instance directly through @@ -295,7 +295,7 @@ Event_List_impl::store_event (Event* e ACE_ENV_ARG_DECL_NOT_USED) else { last_link_cache_->attach_next_link (new_link); - last_link_cache_ = new_link.in (); + last_link_cache_ = new_link; } } diff --git a/TAO/examples/POA/DSI/Database_i.cpp b/TAO/examples/POA/DSI/Database_i.cpp index 1cfb2213e9f..fb953ff8b78 100644 --- a/TAO/examples/POA/DSI/Database_i.cpp +++ b/TAO/examples/POA/DSI/Database_i.cpp @@ -149,7 +149,7 @@ DatabaseImpl::Agent::~Agent (void) Database::Entry_ptr DatabaseImpl::Agent::create_entry (const char *key, - const Database::Identifier entry_type, + const char *entry_type, const Database::NVPairSequence &initial_attributes ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, @@ -219,7 +219,7 @@ DatabaseImpl::Agent::create_entry (const char *key, Database::Entry_ptr DatabaseImpl::Agent::find_entry (const char *key, - const Database::Identifier entry_type + const char *entry_type ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Database::Unknown_Type, @@ -275,7 +275,7 @@ DatabaseImpl::Agent::find_entry (const char *key, void DatabaseImpl::Agent::destroy_entry (const char *key, - const Database::Identifier entry_type + const char *entry_type ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Database::Unknown_Type, diff --git a/TAO/examples/POA/DSI/Database_i.h b/TAO/examples/POA/DSI/Database_i.h index 4ed48fddd2a..25c120a7b0e 100644 --- a/TAO/examples/POA/DSI/Database_i.h +++ b/TAO/examples/POA/DSI/Database_i.h @@ -76,7 +76,7 @@ public: ~Agent (void); virtual Database::Entry_ptr create_entry (const char *key, - const Database::Identifier entry_type, + const char *entry_type, const Database::NVPairSequence &initial_attributes ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, @@ -84,14 +84,14 @@ public: Database::Duplicate_Key)); virtual Database::Entry_ptr find_entry (const char *key, - const Database::Identifier entry_type + const char *entry_type ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Database::Unknown_Type, Database::Not_Found)); virtual void destroy_entry (const char *key, - const Database::Identifier entry_type + const char *entry_type ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException, Database::Unknown_Type, diff --git a/TAO/examples/POA/DSI/client.cpp b/TAO/examples/POA/DSI/client.cpp index dc8578c49b8..dd15e2008f5 100644 --- a/TAO/examples/POA/DSI/client.cpp +++ b/TAO/examples/POA/DSI/client.cpp @@ -167,8 +167,7 @@ main (int argc, char **argv) // Create an employee Database::Entry_var entry = database_agent->create_entry ("irfan", - ACE_const_cast (const Database::Identifier, - "Employee"), + "Employee", employee_attributes ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -204,8 +203,7 @@ main (int argc, char **argv) ACE_OS::strcpy (str, "Database::Entry::destroy"); // Destroy the employee database_agent->destroy_entry ("irfan", - ACE_const_cast (const Database::Identifier, - "Employee") + "Employee" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/examples/RTCORBA/Activity/Activity.cpp b/TAO/examples/RTCORBA/Activity/Activity.cpp index 73a4eeb00fd..1d9a3966392 100644 --- a/TAO/examples/RTCORBA/Activity/Activity.cpp +++ b/TAO/examples/RTCORBA/Activity/Activity.cpp @@ -198,8 +198,7 @@ Activity::activate_job_list (ACE_ENV_SINGLE_ARG_DECL) const ACE_CString &job_name = job->name (); CosNaming::Name_var name = - this->naming_->to_name (ACE_const_cast (const CosNaming::NamingContextExt::StringName, - job_name.c_str ()) + this->naming_->to_name (job_name.c_str () ACE_ENV_ARG_PARAMETER); ACE_CHECK; |