diff options
| author | Nay <dnpd.dd@gmail.com> | 2012-09-17 23:50:08 +0100 |
|---|---|---|
| committer | Nay <dnpd.dd@gmail.com> | 2012-09-17 23:50:08 +0100 |
| commit | 23961d0dce22e234e62f116469f04bb62d8986a7 (patch) | |
| tree | ab271f0a3fffa8f21f9ac7fd669f457beb9eb356 /dep/acelite/ace/Thread_Mutex.h | |
| parent | 2431895a54b38e4c0e6444c740ff2298e31e26e2 (diff) | |
| parent | 2e21fa6b925c4572d620248f1b149a5d652836b2 (diff) | |
Merge remote-tracking branch 'origin/master' into mmaps
Diffstat (limited to 'dep/acelite/ace/Thread_Mutex.h')
| -rw-r--r-- | dep/acelite/ace/Thread_Mutex.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/dep/acelite/ace/Thread_Mutex.h b/dep/acelite/ace/Thread_Mutex.h index 7bda270e5d3..71fff2db17b 100644 --- a/dep/acelite/ace/Thread_Mutex.h +++ b/dep/acelite/ace/Thread_Mutex.h @@ -4,7 +4,7 @@ /** * @file Thread_Mutex.h * - * $Id: Thread_Mutex.h 92060 2010-09-27 18:08:48Z johnnyw $ + * $Id: Thread_Mutex.h 96061 2012-08-16 09:36:07Z mcorino $ * * Moved from Synch.h. * @@ -49,7 +49,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL */ class ACE_Export ACE_Thread_Mutex { - friend class ACE_Condition_Thread_Mutex; public: /// Constructor. ACE_Thread_Mutex (const ACE_TCHAR *name = 0, |