From baa75b9984d33ea49ffb76a73507b64d879166cc Mon Sep 17 00:00:00 2001
From: theraven <theraven@FreeBSD.org>
Date: Tue, 13 Mar 2012 14:09:15 +0000
Subject: Import new version of libc++ into vendor branch.

Approved by:	dim (mentor)
---
 src/future.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/future.cpp')

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();
         }
-- 
cgit v1.1