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_Set.cpp | |
| parent | 2431895a54b38e4c0e6444c740ff2298e31e26e2 (diff) | |
| parent | 2e21fa6b925c4572d620248f1b149a5d652836b2 (diff) | |
Merge remote-tracking branch 'origin/master' into mmaps
Diffstat (limited to 'dep/acelite/ace/Future_Set.cpp')
| -rw-r--r-- | dep/acelite/ace/Future_Set.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/dep/acelite/ace/Future_Set.cpp b/dep/acelite/ace/Future_Set.cpp index 986ce948c34..1ba1fd6be66 100644 --- a/dep/acelite/ace/Future_Set.cpp +++ b/dep/acelite/ace/Future_Set.cpp @@ -1,4 +1,4 @@ -// $Id: Future_Set.cpp 91626 2010-09-07 10:59:20Z johnnyw $ +// $Id: Future_Set.cpp 92900 2010-12-17 14:45:11Z mcorino $ #ifndef ACE_FUTURE_SET_CPP #define ACE_FUTURE_SET_CPP @@ -117,7 +117,7 @@ ACE_Future_Set<T>::next_readable (ACE_Future<T> &future, return 0; // Remove the hash map entry with the specified future rep from our map. - FUTURE_HOLDER *future_holder; + FUTURE_HOLDER *future_holder = 0; if (this->future_map_.find (future_rep, future_holder) != -1) { |