1 files changed, 24 insertions, 27 deletions

diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp
index 55b51bd98fd..aaa6ddd4387 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_Lock.cpp
@@ -44,13 +44,14 @@ CC_Lock::lock (CORBA::Environment &)
   ACE_DEBUG ((LM_DEBUG,
               "CC_Lock::lock\n"));
   lock_held_++;
+
+  //  if (semaphore_.acquire () == -1)
+  //    TAO_THROW (CORBA::INTERNAL ());
 }
 
 CORBA::Boolean
-CC_Lock::try_lock (CORBA::Environment &ACE_TRY_ENV)
+CC_Lock::try_lock (CORBA::Environment &TAO_IN_ENV)
 {
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
-
   ACE_DEBUG ((LM_DEBUG,
               "CC_Lock::try_lock. "));
 
@@ -73,7 +74,7 @@ CC_Lock::try_lock (CORBA::Environment &ACE_TRY_ENV)
           return 0;
         }
       else
-        ACE_THROW_RETURN (CORBA::INTERNAL (),
+        TAO_THROW_RETURN (CORBA::INTERNAL (),
                           0);
     }
   ACE_DEBUG ((LM_DEBUG,
@@ -84,17 +85,17 @@ CC_Lock::try_lock (CORBA::Environment &ACE_TRY_ENV)
 }
 
 void
-CC_Lock::unlock (CORBA::Environment &ACE_TRY_ENV)
+CC_Lock::unlock (CORBA::Environment &TAO_IN_ENV)
 {
   ACE_DEBUG ((LM_DEBUG,
               "CC_Lock::unlock\n"));
   if (lock_held_ == 0)
-    ACE_THROW (CosConcurrencyControl::LockNotHeld ());
+    TAO_THROW (CosConcurrencyControl::LockNotHeld());
 
   int success = 0; //semaphore_.release ();
 
   if (success == -1)
-    ACE_THROW (CORBA::INTERNAL ());
+    TAO_THROW (CORBA::INTERNAL ());
 
   lock_held_--;
 
@@ -105,9 +106,8 @@ CC_Lock::unlock (CORBA::Environment &ACE_TRY_ENV)
 
 void
 CC_Lock::change_mode (CosConcurrencyControl::lock_mode new_mode,
-                      CORBA::Environment &ACE_TRY_ENV)
+                      CORBA::Environment &TAO_IN_ENV)
 {
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
   ACE_DEBUG ((LM_DEBUG,
               "CC_Lock::change_mode\n"));
 
@@ -116,7 +116,7 @@ CC_Lock::change_mode (CosConcurrencyControl::lock_mode new_mode,
   // write lock
 
   if (lock_held_ == 0)
-    ACE_THROW (CosConcurrencyControl::LockNotHeld ());
+    TAO_THROW (CosConcurrencyControl::LockNotHeld());
 
   this->mode_ = new_mode;
 }
@@ -146,24 +146,21 @@ CC_Lock::GetMode (void)
 }
 
 int
-CC_Lock::GetLocksHeld (void)
+CC_Lock::GetLocksHeld(void)
 {
   return this->lock_held_;
 }
 
 void
-CC_Lock::DecLocksHeld (void)
+CC_Lock::DecLocksHeld(void)
 {
   this->lock_held_--;
 }
 
 void
-CC_Lock::dump (void)
+CC_Lock::dump(void)
 {
-  ACE_DEBUG ((LM_DEBUG,
-              "mode_ %i, lock_held_: %i\n",
-              mode_,
-              lock_held_));
+  printf("mode_ %i, lock_held_: %i\n", mode_, lock_held_);
 }
 
 // The check of compatibility is a hard coded table statically
@@ -190,23 +187,23 @@ CORBA::Boolean CC_Lock::compatible_[NUMBER_OF_LOCK_MODES][NUMBER_OF_LOCK_MODES]
 
 // CC_LockModeterator
 
-CC_LockModeIterator::CC_LockModeIterator (void)
+CC_LockModeIterator::CC_LockModeIterator(void)
   : current_ (CosConcurrencyControl::intention_read)
 {
 }
 
-CC_LockModeIterator::~CC_LockModeIterator (void)
+CC_LockModeIterator::~CC_LockModeIterator(void)
 {
   // Do nothing
 }
-void CC_LockModeIterator::First (void)
+void CC_LockModeIterator::First(void)
 {
   current_ = CosConcurrencyControl::intention_read;
 }
 
-void CC_LockModeIterator::Next (CORBA::Environment &ACE_TRY_ENV)
+void CC_LockModeIterator::Next(CORBA::Environment &TAO_IN_ENV)
 {
-  switch (current_)
+  switch(current_)
     {
     case CosConcurrencyControl::intention_read:
       current_ = CosConcurrencyControl::read;
@@ -221,23 +218,23 @@ void CC_LockModeIterator::Next (CORBA::Environment &ACE_TRY_ENV)
       current_ = CosConcurrencyControl::write;
       break;
     case CosConcurrencyControl::write:
-      ACE_THROW (CORBA::INTERNAL ());
+      TAO_THROW(CORBA::INTERNAL ());
     default:
-      ACE_THROW (CORBA::INTERNAL ());
+      TAO_THROW(CORBA::INTERNAL ());
     }
 }
 
 CORBA::Boolean
-CC_LockModeIterator::IsDone (void)
+CC_LockModeIterator::IsDone(void)
 {
-  if (current_==CosConcurrencyControl::write)
+  if(current_==CosConcurrencyControl::write)
     return 1;
   else
     return 0;
 }
 
 CosConcurrencyControl::lock_mode
-CC_LockModeIterator::GetLockMode (void)
+CC_LockModeIterator::GetLockMode(void)
 {
   return current_;
 }