Dep/ACE: Upgrade ACE -library to 5.8.3

--HG-- branch : trunk
2010-11-04 05:30:29 +01:00
parent 2604250c3c
commit 9b16ee203f
581 changed files with 10265 additions and 14303 deletions
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 //
-// $Id: Mutex.inl 80826 2008-03-04 14:51:23Z wotte $
+// $Id: Mutex.inl 91626 2010-09-07 10:59:20Z johnnyw $


 #include "ace/OS_NS_sys_mman.h"
@@ -51,6 +51,17 @@ ACE_Mutex::lock (void) const
  return this->lock_;
 }

+ACE_INLINE ACE_mutex_t &
+ACE_Mutex::lock (void)
+{
+// ACE_TRACE ("ACE_Mutex::lock");
+#if defined (ACE_HAS_PTHREADS) || defined(ACE_HAS_STHREADS)
+  if (this->process_lock_)
+    return *this->process_lock_;
+#endif /* ACE_HAS_PTHREADS || ACE_HAS_STHREADS */
+  return this->lock_;
+}
+
 ACE_INLINE int
 ACE_Mutex::tryacquire_write (void)
 {