diff options
author | theraven <theraven@FreeBSD.org> | 2012-03-13 14:09:15 +0000 |
---|---|---|
committer | theraven <theraven@FreeBSD.org> | 2012-03-13 14:09:15 +0000 |
commit | baa75b9984d33ea49ffb76a73507b64d879166cc (patch) | |
tree | 491848d33dbdf1751fd52f321d3fbf70a8e616f2 /src/future.cpp | |
parent | d8f28ec8a2faabad3aabb9f7a26755971424ef05 (diff) | |
download | FreeBSD-src-baa75b9984d33ea49ffb76a73507b64d879166cc.zip FreeBSD-src-baa75b9984d33ea49ffb76a73507b64d879166cc.tar.gz |
Import new version of libc++ into vendor branch.
Approved by: dim (mentor)
Diffstat (limited to 'src/future.cpp')
-rw-r--r-- | src/future.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/future.cpp b/src/future.cpp index ff59110..2935711 100644 --- a/src/future.cpp +++ b/src/future.cpp @@ -29,7 +29,7 @@ __future_error_category::name() const _NOEXCEPT string __future_error_category::message(int ev) const { - switch (ev) + switch (static_cast<future_errc>(ev)) { case future_errc::broken_promise: return string("The associated promise has been destructed prior " @@ -152,9 +152,9 @@ __assoc_sub_state::__sub_wait(unique_lock<mutex>& __lk) { if (!__is_ready()) { - if (__state_ & deferred) + if (__state_ & static_cast<unsigned>(deferred)) { - __state_ &= ~deferred; + __state_ &= ~static_cast<unsigned>(deferred); __lk.unlock(); __execute(); } |