diff options
| author | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2005-01-28 15:56:34 +0000 |
|---|---|---|
| committer | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2005-01-28 15:56:34 +0000 |
| commit | a280fda6cbbc4c1688305d3b3108e89f2657f4b1 (patch) | |
| tree | ea3bf16505af6f1653b00cd354fcc1910e6db6df /TAO/orbsvcs/tests/Concurrency | |
| parent | 8e2623740409f370574b2550fdaafd6ac2b74712 (diff) | |
| download | ATCD-a280fda6cbbc4c1688305d3b3108e89f2657f4b1.tar.gz | |
ChangeLogTag: Fri Jan 28 07:53:34 2005 J.T. Conklin <jtc@acorntoolworks.com>
Diffstat (limited to 'TAO/orbsvcs/tests/Concurrency')
| -rw-r--r-- | TAO/orbsvcs/tests/Concurrency/CC_test_utils.cpp | 12 | ||||
| -rw-r--r-- | TAO/orbsvcs/tests/Concurrency/CC_tests.cpp | 16 |
2 files changed, 14 insertions, 14 deletions
diff --git a/TAO/orbsvcs/tests/Concurrency/CC_test_utils.cpp b/TAO/orbsvcs/tests/Concurrency/CC_test_utils.cpp index 8559173030b..f88b2b65f7e 100644 --- a/TAO/orbsvcs/tests/Concurrency/CC_test_utils.cpp +++ b/TAO/orbsvcs/tests/Concurrency/CC_test_utils.cpp @@ -27,21 +27,21 @@ ACE_RCSID(Concurrency, CC_test_utils, "$Id$") char *CC_TestUtils::get_lock_mode_name (CosConcurrencyControl::lock_mode mode) { if (mode==CosConcurrencyControl::read) - return ACE_const_cast (char*, "read"); + return const_cast<char*> ("read"); if (mode==CosConcurrencyControl::write) - return ACE_const_cast (char*, "write"); + return const_cast<char*> ("write"); if (mode==CosConcurrencyControl::upgrade) - return ACE_const_cast (char*, "upgrade"); + return const_cast<char*> ("upgrade"); if (mode==CosConcurrencyControl::intention_read) - return ACE_const_cast (char*, "intention_read"); + return const_cast<char*> ("intention_read"); if (mode==CosConcurrencyControl::intention_write) - return ACE_const_cast (char*, "intention_write"); + return const_cast<char*> ("intention_write"); - return ACE_const_cast (char*, "unknown lock mode"); + return const_cast<char*> ("unknown lock mode"); } CosConcurrencyControl::LockSet_ptr diff --git a/TAO/orbsvcs/tests/Concurrency/CC_tests.cpp b/TAO/orbsvcs/tests/Concurrency/CC_tests.cpp index 01af67d07b7..5dfccef2eb5 100644 --- a/TAO/orbsvcs/tests/Concurrency/CC_tests.cpp +++ b/TAO/orbsvcs/tests/Concurrency/CC_tests.cpp @@ -65,21 +65,21 @@ char * CC_Test::get_lock_mode_name (CosConcurrencyControl::lock_mode mode) { if (mode==CosConcurrencyControl::read) - return ACE_const_cast (char *, "read"); + return const_cast<char *> ("read"); if (mode==CosConcurrencyControl::write) - return ACE_const_cast (char *, "write"); + return const_cast<char *> ("write"); if (mode==CosConcurrencyControl::upgrade) - return ACE_const_cast (char *, "upgrade"); + return const_cast<char *> ("upgrade"); if (mode==CosConcurrencyControl::intention_read) - return ACE_const_cast (char *, "intension_read"); + return const_cast<char *> ("intension_read"); if (mode==CosConcurrencyControl::intention_write) - return ACE_const_cast (char *, "intension_write"); + return const_cast<char *> ("intension_write"); - return ACE_const_cast (char *, "unknown lock mode"); + return const_cast<char *> ("unknown lock mode"); } // ================================ @@ -232,7 +232,7 @@ Test_Use_Already_Created_LockSet::run (int /* times_to_run */) ACE_TRY { CORBA::Object_var ccls_obj = - this->naming_service_->get_obj_from_name (ACE_const_cast (char *, ""), + this->naming_service_->get_obj_from_name (const_cast<char *> (""), my_name_ ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -279,7 +279,7 @@ Test_Unlock_Already_Created_LockSet::run (int /* times_to_run */) ACE_TRY { CORBA::Object_var ccls_obj = - this->naming_service_->get_obj_from_name (ACE_const_cast (char *, ""), my_name_ + this->naming_service_->get_obj_from_name (const_cast<char *> (""), my_name_ ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; |