generic-library/cxx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@192548 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Marshall Clow 2013-10-13 01:02:45 +00:00
parent 0f91166ef8
commit 9de3d4cab3
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/future
View File

@ -542,14 +542,14 @@ public:
__state_ |= __future_attached; __state_ |= __future_attached;
} }
_LIBCPP_INLINE_VISIBILITY _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 _LIBCPP_INLINE_VISIBILITY
void __set_deferred() {__state_ |= deferred;} void __set_deferred() {__state_ |= deferred;}
void __make_ready(); void __make_ready();
_LIBCPP_INLINE_VISIBILITY _LIBCPP_INLINE_VISIBILITY
bool __is_ready() const {return __state_ & ready;} bool __is_ready() const {return (__state_ & ready) != 0;}
void set_value(); void set_value();
void set_value_at_thread_exit(); void set_value_at_thread_exit();

2
include/locale
View File

@ -3331,7 +3331,7 @@ money_get<_CharT, _InputIterator>::__do_get(iter_type& __b, iter_type __e,
bool __more_needed = __trailing_sign || bool __more_needed = __trailing_sign ||
(__p < 2) || (__p < 2) ||
(__p == 2 && __pat.field[3] != static_cast<char>(money_base::none)); (__p == 2 && __pat.field[3] != static_cast<char>(money_base::none));
bool __sb = __flags & ios_base::showbase; bool __sb = (__flags & ios_base::showbase) != 0;
if (__sb || __more_needed) if (__sb || __more_needed)
{ {
typename string_type::const_iterator __sym_space_end = __sym.begin(); typename string_type::const_iterator __sym_space_end = __sym.begin();

8
src/strstream.cpp
View File

@ -229,8 +229,8 @@ strstreambuf::pos_type
strstreambuf::seekoff(off_type __off, ios_base::seekdir __way, ios_base::openmode __which) strstreambuf::seekoff(off_type __off, ios_base::seekdir __way, ios_base::openmode __which)
{ {
off_type __p(-1); off_type __p(-1);
bool pos_in = __which & ios::in; bool pos_in = (__which & ios::in) != 0;
bool pos_out = __which & ios::out; bool pos_out = (__which & ios::out) != 0;
bool legal = false; bool legal = false;
switch (__way) switch (__way)
{ {
@ -287,8 +287,8 @@ strstreambuf::pos_type
strstreambuf::seekpos(pos_type __sp, ios_base::openmode __which) strstreambuf::seekpos(pos_type __sp, ios_base::openmode __which)
{ {
off_type __p(-1); off_type __p(-1);
bool pos_in = __which & ios::in; bool pos_in = (__which & ios::in) != 0;
bool pos_out = __which & ios::out; bool pos_out = (__which & ios::out) != 0;
if (pos_in || pos_out) if (pos_in || pos_out)
{ {
if (!((pos_in && gptr() == nullptr) || (pos_out && pptr() == nullptr))) if (!((pos_in && gptr() == nullptr) || (pos_out && pptr() == nullptr)))