diff options
| author | Nay <dnpd.dd@gmail.com> | 2012-09-17 23:21:01 +0100 |
|---|---|---|
| committer | Nay <dnpd.dd@gmail.com> | 2012-09-17 23:21:01 +0100 |
| commit | 2e21fa6b925c4572d620248f1b149a5d652836b2 (patch) | |
| tree | d0ff026bc848d7ee466c9b793f42fb9ec4f07f62 /dep/acelite/ace/Condition_T.cpp | |
| parent | 6ebc6b9a76d0a4576306d777b35ec1a37d3ec5da (diff) | |
Core/Dependencies: Update ACE to v6.1.4 (Windows only)
Tested in multiple configurations
.diff with TC changes added
Diffstat (limited to 'dep/acelite/ace/Condition_T.cpp')
| -rw-r--r-- | dep/acelite/ace/Condition_T.cpp | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/dep/acelite/ace/Condition_T.cpp b/dep/acelite/ace/Condition_T.cpp index ae75d9ff359..4b5e32d09f9 100644 --- a/dep/acelite/ace/Condition_T.cpp +++ b/dep/acelite/ace/Condition_T.cpp @@ -1,4 +1,4 @@ -// $Id: Condition_T.cpp 89127 2010-02-22 19:58:18Z schmidt $ +// $Id: Condition_T.cpp 96077 2012-08-20 08:13:23Z johnnyw $ #ifndef ACE_CONDITION_T_CPP #define ACE_CONDITION_T_CPP @@ -15,6 +15,7 @@ #if !defined (__ACE_INLINE__) #include "ace/Condition_T.inl" +#include "ace/Time_Value.h" #endif /* __ACE_INLINE__ */ ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -72,6 +73,22 @@ ACE_Condition<MUTEX>::ACE_Condition (MUTEX &m, } template <class MUTEX> +ACE_Condition<MUTEX>::ACE_Condition (MUTEX &m, + const ACE_Condition_Attributes &attributes, + const ACE_TCHAR *name, + void *arg) + : mutex_ (m) +{ +// ACE_TRACE ("ACE_Condition<MUTEX>::ACE_Condition<MUTEX>"); + if (ACE_OS::cond_init (&this->cond_, + const_cast<ACE_condattr_t &> (attributes.attributes ()), + name, arg) != 0) + ACE_ERROR ((LM_ERROR, + ACE_TEXT ("%p\n"), + ACE_TEXT ("ACE_Condition::ACE_Condition"))); +} + +template <class MUTEX> ACE_Condition<MUTEX>::~ACE_Condition (void) { // ACE_TRACE ("ACE_Condition<MUTEX>::~ACE_Condition"); |
