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/Future.cpp | |
| parent | 2431895a54b38e4c0e6444c740ff2298e31e26e2 (diff) | |
| parent | 2e21fa6b925c4572d620248f1b149a5d652836b2 (diff) | |
Merge remote-tracking branch 'origin/master' into mmaps
Diffstat (limited to 'dep/acelite/ace/Future.cpp')
| -rw-r--r-- | dep/acelite/ace/Future.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/dep/acelite/ace/Future.cpp b/dep/acelite/ace/Future.cpp index 5ebb550a68c..6544c118582 100644 --- a/dep/acelite/ace/Future.cpp +++ b/dep/acelite/ace/Future.cpp @@ -1,4 +1,4 @@ - // $Id: Future.cpp 91626 2010-09-07 10:59:20Z johnnyw $ + // $Id: Future.cpp 95706 2012-04-18 06:42:16Z johnnyw $ #ifndef ACE_FUTURE_CPP #define ACE_FUTURE_CPP @@ -98,7 +98,7 @@ ACE_Future_Rep<T>::attach (ACE_Future_Rep<T>*& rep) { ACE_ASSERT (rep != 0); // Use value_ready_mutex_ for both condition and ref count management -// ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, r_mon, rep->value_ready_mutex_, 0); + ACE_GUARD_RETURN (ACE_SYNCH_RECURSIVE_MUTEX, r_mon, rep->value_ready_mutex_, 0); ++rep->ref_count_; return rep; } |