diff options
Diffstat (limited to 'TAO')
-rw-r--r-- | TAO/ChangeLog | 8 | ||||
-rw-r--r-- | TAO/examples/Load_Balancing/Identity_Server.cpp | 6 | ||||
-rwxr-xr-x | TAO/examples/Load_Balancing_persistent/Identity_Server.cpp | 12 | ||||
-rw-r--r-- | TAO/examples/POA/DSI/client.cpp | 6 |
4 files changed, 24 insertions, 8 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index ab78382ac76..5338d6fc45f 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,11 @@ +Thu Oct 24 10:59:20 2002 Jeff Parsons <parsons@isis-server.isis.vanderbilt.edu> + + * examples/Load_Balancing/Identity_Server.cpp: + * examples/Load_Balancing_persistent/Identity_Server.cpp: + * examples/POA/DSI/client.cpp: + + More replacement of char* with typedef name. + Thu Oct 24 10:39:10 2002 Jeff Parsons <parsons@isis-server.isis.vanderbilt.edu> * orbsvcs/LifeCycle_Service/Factory_Trader.cpp: diff --git a/TAO/examples/Load_Balancing/Identity_Server.cpp b/TAO/examples/Load_Balancing/Identity_Server.cpp index dfc94035395..394c69643f0 100644 --- a/TAO/examples/Load_Balancing/Identity_Server.cpp +++ b/TAO/examples/Load_Balancing/Identity_Server.cpp @@ -107,7 +107,8 @@ Identity_Server::init (int argc, "Group with id <Identity, Random>\n")); Load_Balancer::Object_Group_var random_group = - factory->make_random ("Identity, Random" + factory->make_random (ACE_const_cast (const Load_Balancer::Group_ID, + "Identity, Random") ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -116,7 +117,8 @@ Identity_Server::init (int argc, "Object Group with id <Identity, Round Robin>\n")); Load_Balancer::Object_Group_var rr_group = - factory->make_round_robin ("Identity, Round Robin" + factory->make_round_robin (ACE_const_cast (const Load_Balancer::Group_ID, + "Identity, Round Robin") ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/examples/Load_Balancing_persistent/Identity_Server.cpp b/TAO/examples/Load_Balancing_persistent/Identity_Server.cpp index 5b2aa19c32a..94d95c17e55 100755 --- a/TAO/examples/Load_Balancing_persistent/Identity_Server.cpp +++ b/TAO/examples/Load_Balancing_persistent/Identity_Server.cpp @@ -140,7 +140,8 @@ Identity_Server::register_groups (ACE_ENV_SINGLE_ARG_DECL) // Unbind the previously registered random group. ACE_TRY_EX (UNBIND_RANDOM) { - factory->unbind_random ("Random group" + factory->unbind_random (ACE_const_cast (const Load_Balancer::Group_ID, + "Random group") ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (UNBIND_RANDOM); } @@ -154,7 +155,8 @@ 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 ("Round Robin group" + factory->unbind_round_robin (ACE_const_cast (const Load_Balancer::Group_ID, + "Round Robin group") ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (UNBIND_ROUND); } @@ -168,12 +170,14 @@ 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 ("Random group" + factory->make_random (ACE_const_cast (const Load_Balancer::Group_ID, + "Random group") ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); Load_Balancer::Object_Group_var rr_group = - factory->make_round_robin ("Round Robin group" + factory->make_round_robin (ACE_const_cast (const Load_Balancer::Group_ID, + "Round Robin group") ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (-1); diff --git a/TAO/examples/POA/DSI/client.cpp b/TAO/examples/POA/DSI/client.cpp index dd15e2008f5..dc8578c49b8 100644 --- a/TAO/examples/POA/DSI/client.cpp +++ b/TAO/examples/POA/DSI/client.cpp @@ -167,7 +167,8 @@ main (int argc, char **argv) // Create an employee Database::Entry_var entry = database_agent->create_entry ("irfan", - "Employee", + ACE_const_cast (const Database::Identifier, + "Employee"), employee_attributes ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -203,7 +204,8 @@ main (int argc, char **argv) ACE_OS::strcpy (str, "Database::Entry::destroy"); // Destroy the employee database_agent->destroy_entry ("irfan", - "Employee" + ACE_const_cast (const Database::Identifier, + "Employee") ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; |