diff options
author | Marshall Clow <mclow.lists@gmail.com> | 2013-10-13 05:02:45 +0400 |
---|---|---|
committer | Marshall Clow <mclow.lists@gmail.com> | 2013-10-13 05:02:45 +0400 |
commit | 9f21325ac732ab6f0b57dbad7f2099b0679156cf (patch) | |
tree | 8c97dae1f6757cc93526f8c6b9a6da98d058f9cb /libcxx/include/future | |
parent | 8d0f2f3ae3bc24a7847ce0984612653e60dcfb09 (diff) |
Patch from GM to make more implicit bools explicit since we can't stop MSVC warning about this in headers and to warn is the MSVC default. No functionality change.
llvm-svn: 192548
Diffstat (limited to 'libcxx/include/future')
-rw-r--r-- | libcxx/include/future | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libcxx/include/future b/libcxx/include/future index 2d969df1b539..ff8e59b17a90 100644 --- a/libcxx/include/future +++ b/libcxx/include/future @@ -542,14 +542,14 @@ public: __state_ |= __future_attached; } _LIBCPP_INLINE_VISIBILITY - bool __has_future_attached() const {return __state_ & __future_attached;} + bool __has_future_attached() const {return (__state_ & __future_attached) != 0;} _LIBCPP_INLINE_VISIBILITY void __set_deferred() {__state_ |= deferred;} void __make_ready(); _LIBCPP_INLINE_VISIBILITY - bool __is_ready() const {return __state_ & ready;} + bool __is_ready() const {return (__state_ & ready) != 0;} void set_value(); void set_value_at_thread_exit(); |