summaryrefslogtreecommitdiffstats
path: root/src/future.cpp
diff options
context:
space:
mode:
authorHoward Hinnant <hhinnant@apple.com>2011-12-01 20:21:04 +0000
committerHoward Hinnant <hhinnant@apple.com>2011-12-01 20:21:04 +0000
commitec3773c2dadbeadfc5def927116c2ee9d9c53066 (patch)
tree556cfdc9a9d1d6cb484a88a2771ed9c92c13037a /src/future.cpp
parent9996844df0f22a68a1af6d30c611be1f1ebf1486 (diff)
downloadexternal_libcxx-ec3773c2dadbeadfc5def927116c2ee9d9c53066.tar.gz
external_libcxx-ec3773c2dadbeadfc5def927116c2ee9d9c53066.tar.bz2
external_libcxx-ec3773c2dadbeadfc5def927116c2ee9d9c53066.zip
Quash a whole bunch of warnings
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@145624 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'src/future.cpp')
-rw-r--r--src/future.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/future.cpp b/src/future.cpp
index ff5911059..d5c55b69d 100644
--- a/src/future.cpp
+++ b/src/future.cpp
@@ -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();
}