*** empty log message ***

13 files changed, 59 insertions, 59 deletions

diff --git a/ace/Free_List.cpp b/ace/Free_List.cpp
index 60cfb167d5e..36b9ad8e563 100644
--- a/ace/Free_List.cpp
+++ b/ace/Free_List.cpp
@@ -54,7 +54,7 @@ ACE_Locked_Free_List<T, ACE_LOCK>::~ACE_Locked_Free_List (void)
 template <class T, class ACE_LOCK> void 
 ACE_Locked_Free_List<T, ACE_LOCK>::alloc (size_t n)
 {
-  ACE_MT (ACE_GUARD (LOCK, ace_mon, this->mutex_));
+  ACE_MT (ACE_GUARD (ACE_LOCK, ace_mon, this->mutex_));
 
   for (; n > 0; n--)
     {
@@ -71,7 +71,7 @@ ACE_Locked_Free_List<T, ACE_LOCK>::alloc (size_t n)
 template <class T, class ACE_LOCK> void 
 ACE_Locked_Free_List<T, ACE_LOCK>::dealloc (size_t n)
 {
-  ACE_MT (ACE_GUARD (LOCK, ace_mon, this->mutex_));
+  ACE_MT (ACE_GUARD (ACE_LOCK, ace_mon, this->mutex_));
 
   for (; this->free_list_ != NULL && n > 0;
        n--)
diff --git a/ace/Free_List.i b/ace/Free_List.i
index 406f40aef54..daf8b15984f 100644
--- a/ace/Free_List.i
+++ b/ace/Free_List.i
@@ -7,7 +7,7 @@
 template <class T, class ACE_LOCK> ACE_INLINE void 
 ACE_Locked_Free_List<T, ACE_LOCK>::add (T *element)
 {
-  ACE_MT (ACE_GUARD (LOCK, ace_mon, this->mutex_));
+  ACE_MT (ACE_GUARD (ACE_LOCK, ace_mon, this->mutex_));
 
   // Check to see that we not at the high water mark.
   if (this->mode_ == ACE_PURE_FREE_LIST 
@@ -28,7 +28,7 @@ ACE_Locked_Free_List<T, ACE_LOCK>::add (T *element)
 template <class T, class ACE_LOCK> ACE_INLINE T *
 ACE_Locked_Free_List<T, ACE_LOCK>::remove (void)
 {
-  ACE_MT (ACE_GUARD_RETURN (LOCK, ace_mon, this->mutex_, 0));
+  ACE_MT (ACE_GUARD_RETURN (ACE_LOCK, ace_mon, this->mutex_, 0));
 
   // If we are at the low water mark, add some nodes
   if (this->mode_ != ACE_PURE_FREE_LIST && this->size_ <= this->lwm_)
@@ -60,7 +60,7 @@ ACE_Locked_Free_List<T, ACE_LOCK>::size (void)
 template <class T, class ACE_LOCK> ACE_INLINE void 
 ACE_Locked_Free_List<T, ACE_LOCK>::resize (size_t newsize)
 {
-  ACE_MT (ACE_GUARD (LOCK, ace_mon, this->mutex_));
+  ACE_MT (ACE_GUARD (ACE_LOCK, ace_mon, this->mutex_));
 
   // Check if we are allowed to resize
   if (this->mode_ != ACE_PURE_FREE_LIST)
diff --git a/ace/Hash_Map_Manager.cpp b/ace/Hash_Map_Manager.cpp
index 2288a4de9cb..2a3640eef7b 100644
--- a/ace/Hash_Map_Manager.cpp
+++ b/ace/Hash_Map_Manager.cpp
@@ -101,7 +101,7 @@ template <class EXT_ID, class INT_ID, class ACE_LOCK> int
 ACE_Hash_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::open (size_t size,
 						  ACE_Allocator *alloc)
 {
-  ACE_WRITE_GUARD_RETURN (LOCK, ace_mon, this->lock_, -1);
+  ACE_WRITE_GUARD_RETURN (ACE_LOCK, ace_mon, this->lock_, -1);
 
   if (alloc == 0)
     alloc = ACE_Allocator::instance ();
@@ -176,7 +176,7 @@ ACE_Hash_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::close_i (void)
 template <class EXT_ID, class INT_ID, class ACE_LOCK> int
 ACE_Hash_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::close (void)
 {
-  ACE_WRITE_GUARD_RETURN (LOCK, ace_mon, this->lock_, -1);
+  ACE_WRITE_GUARD_RETURN (ACE_LOCK, ace_mon, this->lock_, -1);
 
   return this->close_i ();
 }
@@ -243,7 +243,7 @@ template <class EXT_ID, class INT_ID, class ACE_LOCK> int
 ACE_Hash_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::bind (const EXT_ID &ext_id,
 						  const INT_ID &int_id)
 {
-  ACE_WRITE_GUARD_RETURN (LOCK, ace_mon, this->lock_, -1);
+  ACE_WRITE_GUARD_RETURN (ACE_LOCK, ace_mon, this->lock_, -1);
 
   return this->bind_i (ext_id, int_id);
 }
@@ -282,7 +282,7 @@ template <class EXT_ID, class INT_ID, class ACE_LOCK> int
 ACE_Hash_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::trybind (const EXT_ID &ext_id,
 						     INT_ID &int_id)
 {
-  ACE_WRITE_GUARD_RETURN (LOCK, ace_mon, this->lock_, -1);
+  ACE_WRITE_GUARD_RETURN (ACE_LOCK, ace_mon, this->lock_, -1);
 
   return this->trybind_i (ext_id, int_id);
 }
@@ -327,7 +327,7 @@ template <class EXT_ID, class INT_ID, class ACE_LOCK> int
 ACE_Hash_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::unbind (const EXT_ID &ext_id,
 						    INT_ID &int_id)
 {
-  ACE_WRITE_GUARD_RETURN (LOCK, ace_mon, this->lock_, -1);
+  ACE_WRITE_GUARD_RETURN (ACE_LOCK, ace_mon, this->lock_, -1);
 
   return this->unbind_i (ext_id, int_id);
 }
@@ -335,7 +335,7 @@ ACE_Hash_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::unbind (const EXT_ID &ext_id,
 template <class EXT_ID, class INT_ID, class ACE_LOCK> int 
 ACE_Hash_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::unbind (const EXT_ID &ext_id)
 {
-  ACE_WRITE_GUARD_RETURN (LOCK, ace_mon, this->lock_, -1);
+  ACE_WRITE_GUARD_RETURN (ACE_LOCK, ace_mon, this->lock_, -1);
 
   return this->unbind_i (ext_id) == -1 ? -1 : 0;
 }
@@ -407,7 +407,7 @@ template <class EXT_ID, class INT_ID, class ACE_LOCK> int
 ACE_Hash_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::find (const EXT_ID &ext_id,
 						  INT_ID &int_id)
 {
-  ACE_READ_GUARD_RETURN (LOCK, ace_mon, this->lock_, -1);
+  ACE_READ_GUARD_RETURN (ACE_LOCK, ace_mon, this->lock_, -1);
 
   return this->find_i (ext_id, int_id);
 }
@@ -415,7 +415,7 @@ ACE_Hash_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::find (const EXT_ID &ext_id,
 template <class EXT_ID, class INT_ID, class ACE_LOCK> int 
 ACE_Hash_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::find (const EXT_ID &ext_id)
 {
-  ACE_READ_GUARD_RETURN (LOCK, ace_mon, this->lock_, -1);
+  ACE_READ_GUARD_RETURN (ACE_LOCK, ace_mon, this->lock_, -1);
 
   return this->find_i (ext_id);
 }
@@ -447,7 +447,7 @@ ACE_Hash_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::rebind (const EXT_ID &ext_id,
 						    EXT_ID &old_ext_id, 
 						    INT_ID &old_int_id)
 {
-  ACE_WRITE_GUARD_RETURN (LOCK, ace_mon, this->lock_, -1);
+  ACE_WRITE_GUARD_RETURN (ACE_LOCK, ace_mon, this->lock_, -1);
 
   return this->rebind_i (ext_id, int_id, old_ext_id, old_int_id);
 }
@@ -477,7 +477,7 @@ ACE_Hash_Map_Iterator<EXT_ID, INT_ID, ACE_LOCK>::ACE_Hash_Map_Iterator (ACE_Hash
 template <class EXT_ID, class INT_ID, class ACE_LOCK>  int
 ACE_Hash_Map_Iterator<EXT_ID, INT_ID, ACE_LOCK>::next (ACE_Hash_Map_Entry<EXT_ID, INT_ID> *&entry)
 {
-  ACE_READ_GUARD_RETURN (LOCK, ace_mon, this->map_man_.lock_, -1);
+  ACE_READ_GUARD_RETURN (ACE_LOCK, ace_mon, this->map_man_.lock_, -1);
 
   if (this->map_man_.table_ != 0 
       && this->index_ < this->map_man_.total_size_
@@ -493,7 +493,7 @@ ACE_Hash_Map_Iterator<EXT_ID, INT_ID, ACE_LOCK>::next (ACE_Hash_Map_Entry<EXT_ID
 template <class EXT_ID, class INT_ID, class ACE_LOCK>  int
 ACE_Hash_Map_Iterator<EXT_ID, INT_ID, ACE_LOCK>::done (void) const
 {
-  ACE_READ_GUARD_RETURN (LOCK, ace_mon, this->map_man_.lock_, -1);
+  ACE_READ_GUARD_RETURN (ACE_LOCK, ace_mon, this->map_man_.lock_, -1);
 
   if (this->map_man_.table_ != 0 
       && this->index_ < this->map_man_.total_size_
@@ -506,7 +506,7 @@ ACE_Hash_Map_Iterator<EXT_ID, INT_ID, ACE_LOCK>::done (void) const
 template <class EXT_ID, class INT_ID, class ACE_LOCK> int
 ACE_Hash_Map_Iterator<EXT_ID, INT_ID, ACE_LOCK>::advance (void) 
 {
-  ACE_READ_GUARD_RETURN (LOCK, ace_mon, this->map_man_.lock_, -1);
+  ACE_READ_GUARD_RETURN (ACE_LOCK, ace_mon, this->map_man_.lock_, -1);
 
   if (this->map_man_.table_ == 0)
     return -1;
diff --git a/ace/Hash_Map_Manager.h b/ace/Hash_Map_Manager.h
index 22244bb2035..e08c45f0a64 100644
--- a/ace/Hash_Map_Manager.h
+++ b/ace/Hash_Map_Manager.h
@@ -204,7 +204,7 @@ protected:
   ACE_Allocator *allocator_;
   // Pointer to a memory allocator.
 
-  LOCK lock_; 
+  ACE_LOCK lock_; 
   // Synchronization variable for the MT_SAFE <ACE_Map_Manager>.
 
 private:
diff --git a/ace/Local_Name_Space_T.h b/ace/Local_Name_Space_T.h
index c0335d4227c..186b6f6ede3 100644
--- a/ace/Local_Name_Space_T.h
+++ b/ace/Local_Name_Space_T.h
@@ -231,7 +231,7 @@ private:
   TCHAR context_file_[MAXPATHLEN + MAXNAMELEN];
   // Name of the file used as the backing store.
 
-  LOCK *lock_;
+  ACE_LOCK *lock_;
   // Synchronization variable.
 };
 
diff --git a/ace/Map_Manager.cpp b/ace/Map_Manager.cpp
index 3ffc34011a7..92b8c8ac105 100644
--- a/ace/Map_Manager.cpp
+++ b/ace/Map_Manager.cpp
@@ -86,7 +86,7 @@ template <class EXT_ID, class INT_ID, class ACE_LOCK> int
 ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::close (void)
 {
   ACE_TRACE ("ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::close");
-  ACE_WRITE_GUARD_RETURN (LOCK, ace_mon, this->lock_, -1);
+  ACE_WRITE_GUARD_RETURN (ACE_LOCK, ace_mon, this->lock_, -1);
 
   return this->close_i ();
 }
@@ -162,7 +162,7 @@ ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::open (size_t size,
 					     ACE_Allocator *alloc)
 {
   ACE_TRACE ("ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::open");
-  ACE_WRITE_GUARD_RETURN (LOCK, ace_mon, this->lock_, -1);
+  ACE_WRITE_GUARD_RETURN (ACE_LOCK, ace_mon, this->lock_, -1);
 
   if (alloc == 0)
     alloc = ACE_Allocator::instance ();
@@ -292,7 +292,7 @@ ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::trybind (const EXT_ID &ext_id,
                                                 INT_ID &int_id)
 {
   ACE_TRACE ("ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::trybind");
-  ACE_WRITE_GUARD_RETURN (LOCK, ace_mon, this->lock_, -1);
+  ACE_WRITE_GUARD_RETURN (ACE_LOCK, ace_mon, this->lock_, -1);
 
   return this->trybind_i (ext_id, int_id);
 }
@@ -310,7 +310,7 @@ template <class EXT_ID, class INT_ID, class ACE_LOCK> int
 ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::find (const EXT_ID &ext_id)
 {
   ACE_TRACE ("ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::find");
-  ACE_READ_GUARD_RETURN (LOCK, ace_mon, this->lock_, -1);
+  ACE_READ_GUARD_RETURN (ACE_LOCK, ace_mon, this->lock_, -1);
 
   return this->find_i (ext_id);
 }
@@ -476,7 +476,7 @@ ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::unbind (const EXT_ID &ext_id,
                                                INT_ID &int_id)
 {
   ACE_TRACE ("ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::unbind");
-  ACE_WRITE_GUARD_RETURN (LOCK, ace_mon, this->lock_, -1);
+  ACE_WRITE_GUARD_RETURN (ACE_LOCK, ace_mon, this->lock_, -1);
 
   return this->unbind_i (ext_id, int_id);
 }
@@ -486,7 +486,7 @@ ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::bind (const EXT_ID &ext_id,
                                              const INT_ID &int_id)
 {
   ACE_TRACE ("ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::bind");
-  ACE_WRITE_GUARD_RETURN (LOCK, ace_mon, this->lock_, -1);
+  ACE_WRITE_GUARD_RETURN (ACE_LOCK, ace_mon, this->lock_, -1);
 
   return this->bind_i (ext_id, int_id);
 }
@@ -498,7 +498,7 @@ ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::rebind (const EXT_ID &ext_id,
                                                INT_ID &old_int_id)
 {
   ACE_TRACE ("ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::rebind");
-  ACE_WRITE_GUARD_RETURN (LOCK, ace_mon, this->lock_, -1);
+  ACE_WRITE_GUARD_RETURN (ACE_LOCK, ace_mon, this->lock_, -1);
 
   return this->rebind_i (ext_id, int_id, old_ext_id, old_int_id);
 }
@@ -508,7 +508,7 @@ ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::find (const EXT_ID &ext_id,
                                              INT_ID &int_id)
 {
   ACE_TRACE ("ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::find");
-  ACE_READ_GUARD_RETURN (LOCK, ace_mon, this->lock_, -1);
+  ACE_READ_GUARD_RETURN (ACE_LOCK, ace_mon, this->lock_, -1);
 
   return this->find_i (ext_id, int_id);
 }
@@ -528,7 +528,7 @@ template <class EXT_ID, class INT_ID, class ACE_LOCK> int
 ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::unbind (const EXT_ID &ext_id)
 {
   ACE_TRACE ("ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::unbind");
-  ACE_WRITE_GUARD_RETURN (LOCK, ace_mon, this->lock_, -1);
+  ACE_WRITE_GUARD_RETURN (ACE_LOCK, ace_mon, this->lock_, -1);
   return this->unbind_i (ext_id) == -1 ? -1 : 0;
 }
 
@@ -536,7 +536,7 @@ template <class EXT_ID, class INT_ID, class ACE_LOCK> size_t
 ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::current_size (void)
 {
   ACE_TRACE ("ACE_Map_Manager::current_size");
-  ACE_WRITE_GUARD_RETURN (LOCK, ace_mon, this->lock_, (size_t) -1);
+  ACE_WRITE_GUARD_RETURN (ACE_LOCK, ace_mon, this->lock_, (size_t) -1);
   return this->cur_size_;
 }
 
@@ -544,7 +544,7 @@ template <class EXT_ID, class INT_ID, class ACE_LOCK> size_t
 ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::total_size (void)
 {
   ACE_TRACE ("ACE_Map_Manager::total_size");
-  ACE_WRITE_GUARD_RETURN (LOCK, ace_mon, this->lock_, (size_t) -1);
+  ACE_WRITE_GUARD_RETURN (ACE_LOCK, ace_mon, this->lock_, (size_t) -1);
   return this->total_size_;
 }
 
@@ -574,7 +574,7 @@ template <class EXT_ID, class INT_ID, class ACE_LOCK> int
 ACE_Map_Iterator<EXT_ID, INT_ID, ACE_LOCK>::next (ACE_Map_Entry<EXT_ID, INT_ID> *&mm) 
 {
   ACE_TRACE ("ACE_Map_Iterator<EXT_ID, INT_ID, ACE_LOCK>::next");
-  ACE_READ_GUARD_RETURN (LOCK, ace_mon, this->map_man_.lock_, -1);
+  ACE_READ_GUARD_RETURN (ACE_LOCK, ace_mon, this->map_man_.lock_, -1);
 
   if (this->map_man_.search_structure_ != 0 
       // Note that this->next_ is never negative at this point...
@@ -591,7 +591,7 @@ template <class EXT_ID, class INT_ID, class ACE_LOCK> int
 ACE_Map_Iterator<EXT_ID, INT_ID, ACE_LOCK>::done (void) const
 {
   ACE_TRACE ("ACE_Map_Iterator<EXT_ID, INT_ID, ACE_LOCK>::done");
-  ACE_READ_GUARD_RETURN (LOCK, ace_mon, this->map_man_.lock_, -1);
+  ACE_READ_GUARD_RETURN (ACE_LOCK, ace_mon, this->map_man_.lock_, -1);
 
   return this->map_man_.search_structure_ == 0
     // Note that this->next_ is never negative at this point...
@@ -602,7 +602,7 @@ template <class EXT_ID, class INT_ID, class ACE_LOCK> int
 ACE_Map_Iterator<EXT_ID, INT_ID, ACE_LOCK>::advance (void) 
 {
   ACE_TRACE ("ACE_Map_Iterator<EXT_ID, INT_ID, ACE_LOCK>::advance");
-  ACE_READ_GUARD_RETURN (LOCK, ace_mon, this->map_man_.lock_, -1);
+  ACE_READ_GUARD_RETURN (ACE_LOCK, ace_mon, this->map_man_.lock_, -1);
 
   for (++this->next_;
        size_t (this->next_) < this->map_man_.cur_size_
@@ -639,7 +639,7 @@ template <class EXT_ID, class INT_ID, class ACE_LOCK> int
 ACE_Map_Reverse_Iterator<EXT_ID, INT_ID, ACE_LOCK>::next (ACE_Map_Entry<EXT_ID, INT_ID> *&mm) 
 {
   ACE_TRACE ("ACE_Map_Reverse_Iterator<EXT_ID, INT_ID, ACE_LOCK>::next");
-  ACE_READ_GUARD_RETURN (LOCK, ace_mon, this->map_man_.lock_, -1);
+  ACE_READ_GUARD_RETURN (ACE_LOCK, ace_mon, this->map_man_.lock_, -1);
 
   if (this->map_man_.search_structure_ != 0 && this->next_ >= 0)
     {
@@ -654,7 +654,7 @@ template <class EXT_ID, class INT_ID, class ACE_LOCK> int
 ACE_Map_Reverse_Iterator<EXT_ID, INT_ID, ACE_LOCK>::done (void) const
 {
   ACE_TRACE ("ACE_Map_Reverse_Iterator<EXT_ID, INT_ID, ACE_LOCK>::done");
-  ACE_READ_GUARD_RETURN (LOCK, ace_mon, this->map_man_.lock_, -1);
+  ACE_READ_GUARD_RETURN (ACE_LOCK, ace_mon, this->map_man_.lock_, -1);
 
   return this->map_man_.search_structure_ == 0 || this->next_ < 0;
 }
@@ -663,7 +663,7 @@ template <class EXT_ID, class INT_ID, class ACE_LOCK> int
 ACE_Map_Reverse_Iterator<EXT_ID, INT_ID, ACE_LOCK>::advance (void) 
 {
   ACE_TRACE ("ACE_Map_Reverse_Iterator<EXT_ID, INT_ID, ACE_LOCK>::advance");
-  ACE_READ_GUARD_RETURN (LOCK, ace_mon, this->map_man_.lock_, -1);
+  ACE_READ_GUARD_RETURN (ACE_LOCK, ace_mon, this->map_man_.lock_, -1);
 
   for (--this->next_;
        this->next_ >= 0
diff --git a/ace/Map_Manager.h b/ace/Map_Manager.h
index 5f90fc8f279..62eaf46bfa7 100644
--- a/ace/Map_Manager.h
+++ b/ace/Map_Manager.h
@@ -213,7 +213,7 @@ protected:
   ACE_Allocator *allocator_;
   // Pointer to a memory allocator.
 
-  LOCK lock_; 
+  ACE_LOCK lock_; 
   // Synchronization variable for the MT_SAFE <ACE_Map_Manager>.
 
   int equal (const EXT_ID &id1, const EXT_ID &id2);
diff --git a/ace/Singleton.cpp b/ace/Singleton.cpp
index 812688b01e1..bdde77ad1b5 100644
--- a/ace/Singleton.cpp
+++ b/ace/Singleton.cpp
@@ -65,7 +65,7 @@ ACE_Singleton<TYPE, ACE_LOCK>::instance (void)
   // Perform the Double-Check pattern...
   if (singleton == 0)
     {
-      ACE_GUARD_RETURN (LOCK, ace_mon, (ACE_Singleton<TYPE, ACE_LOCK>::singleton_lock_i ()), 0);
+      ACE_GUARD_RETURN (ACE_LOCK, ace_mon, (ACE_Singleton<TYPE, ACE_LOCK>::singleton_lock_i ()), 0);
 
       if (singleton == 0)
         {
@@ -124,7 +124,7 @@ ACE_TSS_Singleton<TYPE, ACE_LOCK>::instance (void)
   // Perform the Double-Check pattern...                                        
   if (singleton_ == 0)
     {
-      ACE_GUARD_RETURN (LOCK, ace_mon, ace_singleton_lock_, 0);
+      ACE_GUARD_RETURN (ACE_LOCK, ace_mon, ace_singleton_lock_, 0);
 
       if (singleton_ == 0)
         {
@@ -142,7 +142,7 @@ ACE_TSS_Singleton<TYPE, ACE_LOCK>::instance (void)
   // Perform the Double-Check pattern...
   if (singleton_ == 0)
     {
-      ACE_GUARD_RETURN (LOCK, ace_mon, (ACE_TSS_Singleton<TYPE, ACE_LOCK>::ace_singleton_lock_), 0);
+      ACE_GUARD_RETURN (ACE_LOCK, ace_mon, (ACE_TSS_Singleton<TYPE, ACE_LOCK>::ace_singleton_lock_), 0);
 
       if (singleton_ == 0)
         {
diff --git a/ace/Singleton.h b/ace/Singleton.h
index 1f0b57f1a47..034c2ee2ae7 100644
--- a/ace/Singleton.h
+++ b/ace/Singleton.h
@@ -62,14 +62,14 @@ protected:
   static ACE_Singleton<TYPE, ACE_LOCK> *singleton_;
   // Pointer to the Singleton (ACE_Cleanup) instance.
 
-  static LOCK ace_singleton_lock_;
+  static ACE_LOCK ace_singleton_lock_;
   // Lock the creation of the singleton.
 #endif /* ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES */
 
   static ACE_Singleton<TYPE, ACE_LOCK> *&instance_i (void);
   // Get pointer to the Singleton instance.
 
-  static LOCK &singleton_lock_i (void);
+  static ACE_LOCK &singleton_lock_i (void);
   // Get reference to Singleton lock.
 };
 
@@ -114,7 +114,7 @@ protected:
   static ACE_TSS_Singleton<TYPE, ACE_LOCK> *singleton_;
   // Pointer to the Singleton (ACE_Cleanup) instance.
 
-  static LOCK ace_singleton_lock_;
+  static ACE_LOCK ace_singleton_lock_;
   // Lock the creation of the singleton.
 #endif /* ACE_LACKS_STATIC_DATA_MEMBER_TEMPLATES */
 };
diff --git a/ace/Timer_Hash_T.cpp b/ace/Timer_Hash_T.cpp
index db1e65fd325..a8740dd1669 100644
--- a/ace/Timer_Hash_T.cpp
+++ b/ace/Timer_Hash_T.cpp
@@ -242,7 +242,7 @@ template <class TYPE, class FUNCTOR, class ACE_LOCK, class BUCKET>
 ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET>::~ACE_Timer_Hash_T (void)
 {
   ACE_TRACE ("ACE_Timer_Hash_T::~ACE_Timer_Hash_T");
-  ACE_MT (ACE_GUARD (LOCK, ace_mon, this->mutex_));
+  ACE_MT (ACE_GUARD (ACE_LOCK, ace_mon, this->mutex_));
 
   delete iterator_;
 
@@ -318,7 +318,7 @@ ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET>::schedule (const TYPE &type,
 						 const ACE_Time_Value &interval)
 {
   ACE_TRACE ("ACE_Timer_Hash_T::schedule");
-  ACE_MT (ACE_GUARD_RETURN (LOCK, ace_mon, this->mutex_, -1));
+  ACE_MT (ACE_GUARD_RETURN (ACE_LOCK, ace_mon, this->mutex_, -1));
 
   size_t position = future_time.usec () % this->table_size_;
 
@@ -347,7 +347,7 @@ ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET>::cancel (long timer_id,
 					       int dont_call)
 {
   ACE_TRACE ("ACE_Timer_Hash_T::cancel");
-  ACE_MT (ACE_GUARD_RETURN (LOCK, ace_mon, this->mutex_, -1));
+  ACE_MT (ACE_GUARD_RETURN (ACE_LOCK, ace_mon, this->mutex_, -1));
 
   // Make sure we are getting a valid <timer_id>, not an error
   // returned by schedule ()
@@ -377,7 +377,7 @@ ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET>::cancel (const TYPE &type,
 {
   ACE_TRACE ("ACE_Timer_Hash_T::cancel");
 
-  ACE_MT (ACE_GUARD_RETURN (LOCK, ace_mon, this->mutex_, -1));
+  ACE_MT (ACE_GUARD_RETURN (ACE_LOCK, ace_mon, this->mutex_, -1));
 
   size_t i; // loop  variable
 
@@ -449,7 +449,7 @@ template <class TYPE, class FUNCTOR, class ACE_LOCK, class BUCKET> int
 ACE_Timer_Hash_T<TYPE, FUNCTOR, ACE_LOCK, BUCKET>::expire (const ACE_Time_Value &cur_time)
 {
   ACE_TRACE ("ACE_Timer_Hash_T::expire");
-  ACE_MT (ACE_GUARD_RETURN (LOCK, ace_mon, this->mutex_, -1));
+  ACE_MT (ACE_GUARD_RETURN (ACE_LOCK, ace_mon, this->mutex_, -1));
 
   int number_of_timers_expired = 0;
 
diff --git a/ace/Timer_Heap_T.cpp b/ace/Timer_Heap_T.cpp
index eee7b78d2d5..7590b021852 100644
--- a/ace/Timer_Heap_T.cpp
+++ b/ace/Timer_Heap_T.cpp
@@ -520,7 +520,7 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::schedule (const TYPE &type,
 {
   ACE_TRACE ("ACE_Timer_Heap::schedule");
 
-  ACE_MT (ACE_GUARD_RETURN (LOCK, ace_mon, this->mutex_, -1));
+  ACE_MT (ACE_GUARD_RETURN (ACE_LOCK, ace_mon, this->mutex_, -1));
 
   if (this->cur_size_ < this->max_size_)
     {
@@ -557,7 +557,7 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::cancel (long timer_id,
 					       int dont_call)
 {
   ACE_TRACE ("ACE_Timer_Heap::cancel");
-  ACE_MT (ACE_GUARD_RETURN (LOCK, ace_mon, this->mutex_, -1));
+  ACE_MT (ACE_GUARD_RETURN (ACE_LOCK, ace_mon, this->mutex_, -1));
 
   // Locate the ACE_Timer_Node that corresponds to the timer_id.
 
@@ -598,7 +598,7 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::cancel (const TYPE &type,
 					       int dont_call)
 {
   ACE_TRACE ("ACE_Timer_Heap::cancel");
-  ACE_MT (ACE_GUARD_RETURN (LOCK, ace_mon, this->mutex_, -1));
+  ACE_MT (ACE_GUARD_RETURN (ACE_LOCK, ace_mon, this->mutex_, -1));
 
   int number_of_cancellations = 0;
 
diff --git a/ace/Timer_List_T.cpp b/ace/Timer_List_T.cpp
index e0750ea575a..67ad64a0eac 100644
--- a/ace/Timer_List_T.cpp
+++ b/ace/Timer_List_T.cpp
@@ -105,7 +105,7 @@ template <class TYPE, class FUNCTOR, class ACE_LOCK>
 ACE_Timer_List_T<TYPE, FUNCTOR, ACE_LOCK>::~ACE_Timer_List_T (void)
 {
   ACE_TRACE ("ACE_Timer_List_T::~ACE_Timer_List_T");
-  ACE_MT (ACE_GUARD (LOCK, ace_mon, this->mutex_));
+  ACE_MT (ACE_GUARD (ACE_LOCK, ace_mon, this->mutex_));
   
   delete iterator_;
 
@@ -175,7 +175,7 @@ ACE_Timer_List_T<TYPE, FUNCTOR, ACE_LOCK>::schedule (const TYPE &type,
 						 const ACE_Time_Value &interval)
 {
   ACE_TRACE ("ACE_Timer_List_T::schedule");
-  ACE_MT (ACE_GUARD_RETURN (LOCK, ace_mon, this->mutex_, -1));
+  ACE_MT (ACE_GUARD_RETURN (ACE_LOCK, ace_mon, this->mutex_, -1));
 
   // Place in the middle of the list where it belongs (i.e., sorted in
   // ascending order of absolute time to expire).
@@ -210,7 +210,7 @@ ACE_Timer_List_T<TYPE, FUNCTOR, ACE_LOCK>::cancel (long timer_id,
 					       int dont_call)
 {
   ACE_TRACE ("ACE_Timer_List_T::cancel");
-  ACE_MT (ACE_GUARD_RETURN (LOCK, ace_mon, this->mutex_, -1));
+  ACE_MT (ACE_GUARD_RETURN (ACE_LOCK, ace_mon, this->mutex_, -1));
 
   // Make sure we are getting a valid <timer_id>, not an error
   // returned by schedule ()
@@ -247,7 +247,7 @@ ACE_Timer_List_T<TYPE, FUNCTOR, ACE_LOCK>::cancel (const TYPE &type,
 					       int dont_call)
 {
   ACE_TRACE ("ACE_Timer_List_T::cancel");
-  ACE_MT (ACE_GUARD_RETURN (LOCK, ace_mon, this->mutex_, -1));
+  ACE_MT (ACE_GUARD_RETURN (ACE_LOCK, ace_mon, this->mutex_, -1));
 
   ACE_Timer_Node_T<TYPE> *curr = this->head_->get_next ();
 
diff --git a/ace/Timer_Wheel_T.cpp b/ace/Timer_Wheel_T.cpp
index aad3cf50380..ba2c1296e57 100644
--- a/ace/Timer_Wheel_T.cpp
+++ b/ace/Timer_Wheel_T.cpp
@@ -224,7 +224,7 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK>::schedule (const TYPE &type,
 						  const ACE_Time_Value &interval)
 {
   ACE_TRACE ("ACE_Timer_Wheel_T::schedule");
-  ACE_MT (ACE_GUARD_RETURN (LOCK, ace_mon, this->mutex_, -1));
+  ACE_MT (ACE_GUARD_RETURN (ACE_LOCK, ace_mon, this->mutex_, -1));
 
   ACE_Timer_Node_T<TYPE> *tempnode = this->alloc_node ();
 
@@ -261,7 +261,7 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK>::cancel (const TYPE &type,
 						int dont_call_handle_close)
 {
   ACE_TRACE ("ACE_Timer_Wheel_T::cancel");
-  ACE_MT (ACE_GUARD_RETURN (LOCK, ace_mon, this->mutex_, -1));
+  ACE_MT (ACE_GUARD_RETURN (ACE_LOCK, ace_mon, this->mutex_, -1));
 
   int number_of_cancellations = 0;
   size_t i;
@@ -331,7 +331,7 @@ ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK>::cancel (long timer_id,
 						int dont_call_handle_close)
 {
   ACE_TRACE ("ACE_Timer_Wheel_T::cancel");
-  ACE_MT (ACE_GUARD_RETURN (LOCK, ace_mon, this->mutex_, -1));
+  ACE_MT (ACE_GUARD_RETURN (ACE_LOCK, ace_mon, this->mutex_, -1));
 
   // Make sure we are getting a valid <timer_id>, not an error
   // returned by schedule ()
@@ -508,7 +508,7 @@ template <class TYPE, class FUNCTOR, class ACE_LOCK> int
 ACE_Timer_Wheel_T<TYPE, FUNCTOR, ACE_LOCK>::expire (const ACE_Time_Value &cur_time)
 {
   ACE_TRACE ("ACE_Timer_Wheel_T::expire");
-  ACE_MT (ACE_GUARD_RETURN (LOCK, ace_mon, this->mutex_, -1));
+  ACE_MT (ACE_GUARD_RETURN (ACE_LOCK, ace_mon, this->mutex_, -1));
 
   int number_of_timers_expired = 0;
   size_t i;