From a57e7721dec9c7ac368ae5a9d8be374e4c25c7cb Mon Sep 17 00:00:00 2001
From: brunsch <brunsch@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>
Date: Tue, 12 May 1998 20:43:37 +0000
Subject: Got rid of some warnings on NT.

---
 TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp')

diff --git a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp
index 412d47091ae..2b3fdc6439c 100644
--- a/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp
+++ b/TAO/orbsvcs/orbsvcs/Concurrency/CC_LockSet.cpp
@@ -70,7 +70,8 @@ CC_LockSet::lock (CosConcurrencyControl::lock_mode mode,
     }
   TAO_TRY
     {
-      lock_->lock (_env);
+      lock_->lock (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
     }
   TAO_CATCHANY
     {
@@ -90,7 +91,8 @@ CC_LockSet::try_lock (CosConcurrencyControl::lock_mode mode,
               "CC_LockSet::try_lock\n"));
   TAO_TRY
     {
-      return lock_->try_lock (_env);
+      return lock_->try_lock (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
     }
   TAO_CATCHANY
     {
@@ -111,7 +113,8 @@ CC_LockSet::unlock (CosConcurrencyControl::lock_mode mode,
               "CC_LockSet::unlock\n"));
   TAO_TRY
     {
-      lock_->unlock (_env);
+      lock_->unlock (TAO_TRY_ENV);
+      TAO_CHECK_ENV;
     }
   TAO_CATCHANY
     {
@@ -133,7 +136,8 @@ CC_LockSet::change_mode (CosConcurrencyControl::lock_mode held_mode,
               "CC_LockSet::change_mode\n"));
   TAO_TRY
     {
-      lock_->change_mode (new_mode, _env);
+      lock_->change_mode (new_mode, TAO_TRY_ENV);
+      TAO_CHECK_ENV;
     }
   TAO_CATCHANY
     {
-- 
cgit v1.2.1