diff options
Diffstat (limited to 'ace/Recursive_Thread_Mutex.cpp')
| -rw-r--r-- | ace/Recursive_Thread_Mutex.cpp | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/ace/Recursive_Thread_Mutex.cpp b/ace/Recursive_Thread_Mutex.cpp index ccb59b1064d..15a809ed898 100644 --- a/ace/Recursive_Thread_Mutex.cpp +++ b/ace/Recursive_Thread_Mutex.cpp @@ -1,3 +1,4 @@ +/* -*- C++ -*- */ /** * @file Recursive_Thread_Mutex.cpp * @@ -20,8 +21,6 @@ ACE_RCSID(ace, Recursive_Thread_Mutex, "$Id$") -ACE_BEGIN_VERSIONED_NAMESPACE_DECL - ACE_ALLOC_HOOK_DEFINE(ACE_Recursive_Thread_Mutex) ACE_Recursive_Thread_Mutex::ACE_Recursive_Thread_Mutex (const ACE_TCHAR *name, @@ -92,11 +91,8 @@ ACE_Recursive_Thread_Mutex::get_nesting_level (void) #elif defined (ACE_HAS_RECURSIVE_MUTEXES) // Nothing inside of a CRITICAL_SECTION object should ever be // accessed directly. It is documented to change at any time. -# if defined (ACE_WIN64) && !defined(_M_AMD64) - // Things are different on Windows XP 64-bit. However, as of Feb 2006 - // Windows XP 64-bit edition on Intel EM64T w/ VC8, LockCount is - // decremented at first acquire and then doesn't change. RecursionCount, - // however, works the same as Win32, below. +# if defined (ACE_WIN64) + // Things are different on Windows XP 64-bit return this->lock_.LockCount + 1; # elif defined (ACE_WIN32) // This is really a Win32-ism... @@ -146,6 +142,4 @@ ACE_Recursive_Thread_Mutex::dump (void) const #endif /* ACE_HAS_DUMP */ } -ACE_END_VERSIONED_NAMESPACE_DECL - #endif /* ACE_HAS_THREADS */ |