.

5 files changed, 32 insertions, 4 deletions

diff --git a/ace/Hash_Map_Manager.cpp b/ace/Hash_Map_Manager.cpp
index f2a7375fda5..d673aebe713 100644
--- a/ace/Hash_Map_Manager.cpp
+++ b/ace/Hash_Map_Manager.cpp
@@ -206,6 +206,13 @@ ACE_Hash_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::total_size (void)
   return this->total_size_;
 }
 
+template <class EXT_ID, class INT_ID, class ACE_LOCK> ACE_LOCK &
+ACE_Hash_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::mutex (void)
+{
+  ACE_TRACE ("ACE_Hash_Map_Manager::mutex");
+  return this->lock_;
+}
+
 template <class EXT_ID, class INT_ID, class ACE_LOCK> u_long
 ACE_Hash_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::hash (const EXT_ID &ext_id)
 {
diff --git a/ace/Hash_Map_Manager.h b/ace/Hash_Map_Manager.h
index b043d2fa9c5..3ee3b36e5f7 100644
--- a/ace/Hash_Map_Manager.h
+++ b/ace/Hash_Map_Manager.h
@@ -211,6 +211,13 @@ public:
   size_t total_size (void);
   // Return the total size of the map.
 
+  ACE_LOCK &mutex (void);
+  // Returns a reference to the underlying <ACE_LOCK>.  This makes it
+  // possible to acquire the lock explicitly, which can be useful in
+  // some cases if you instantiate the <ACE_Atomic_Op> with an
+  // <ACE_Recursive_Mutex> or <ACE_Process_Mutex>.  NOTE: the right
+  // name would be lock_, but HP/C++ will choke on that!
+
   void dump (void) const;
   // Dump the state of an object.
 
diff --git a/ace/Map_Manager.cpp b/ace/Map_Manager.cpp
index cef6c579a45..98662f96786 100644
--- a/ace/Map_Manager.cpp
+++ b/ace/Map_Manager.cpp
@@ -583,10 +583,17 @@ ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::total_size (void)
 {
   ACE_TRACE ("ACE_Map_Manager::total_size");
   ACE_WRITE_GUARD_RETURN (ACE_LOCK, ace_mon, this->lock_,
-                          ACE_static_cast(size_t, -1));
+                          ACE_static_cast (size_t, -1));
   return this->total_size_;
 }
 
+template <class EXT_ID, class INT_ID, class ACE_LOCK> ACE_LOCK &
+ACE_Map_Manager<EXT_ID, INT_ID, ACE_LOCK>::mutex (void)
+{
+  ACE_TRACE ("ACE_Map_Manager::mutex");
+  return this->lock_;
+}
+
 // @@ && @@
 
 ACE_ALLOC_HOOK_DEFINE(ACE_Map_Iterator_Base)
diff --git a/ace/Map_Manager.h b/ace/Map_Manager.h
index a6f90cb023c..23512234efd 100644
--- a/ace/Map_Manager.h
+++ b/ace/Map_Manager.h
@@ -169,6 +169,13 @@ public:
   size_t total_size (void);
   // Return the total size of the map.
 
+  ACE_LOCK &mutex (void);
+  // Returns a reference to the underlying <ACE_LOCK>.  This makes it
+  // possible to acquire the lock explicitly, which can be useful in
+  // some cases if you instantiate the <ACE_Atomic_Op> with an
+  // <ACE_Recursive_Mutex> or <ACE_Process_Mutex>.  NOTE: the right
+  // name would be lock_, but HP/C++ will choke on that!
+
   void dump (void) const;
   // Dump the state of an object.
 
diff --git a/ace/Synch_T.h b/ace/Synch_T.h
index ef2617077aa..f0767dc5ebd 100644
--- a/ace/Synch_T.h
+++ b/ace/Synch_T.h
@@ -207,9 +207,9 @@ public:
   ACE_LOCK &mutex (void);
   // Returns a reference to the underlying <ACE_LOCK>.  This makes it
   // possible to acquire the lock explicitly, which can be useful in
-  // some cases *if* you instantiate the <ACE_Atomic_Op> with an
-  // <ACE_Recursive_Mutex>.
-  // NOTE: the right name would be lock_, but HP/C++ will choke on that!
+  // some cases if you instantiate the <ACE_Atomic_Op> with an
+  // <ACE_Recursive_Mutex> or <ACE_Process_Mutex>.  NOTE: the right
+  // name would be lock_, but HP/C++ will choke on that!
 
   TYPE &value_i (void);
   // Explicitly return <value_> (by reference).  This gives the user