maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

More libc++ warning suppression on Linux; no functionality change 

llvm-svn: 174636
This commit is contained in:
Marshall Clow 2013-02-07 17:20:56 +00:00
parent e679798315
commit d58e0f5505
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libcxx/src/locale.cpp
View File

@ -32,6 +32,10 @@
#endif // _!WIN32 #endif // _!WIN32
#include <stdlib.h> #include <stdlib.h>
// On Linux, wint_t and wchar_t have different signed-ness, and this causes
// lots of noise in the build log, but no bugs that I know of.
#pragma clang diagnostic ignored "-Wsign-conversion"
_LIBCPP_BEGIN_NAMESPACE_STD _LIBCPP_BEGIN_NAMESPACE_STD
#ifdef __cloc_defined #ifdef __cloc_defined
@ -1596,9 +1600,9 @@ int
codecvt<wchar_t, char, mbstate_t>::do_max_length() const _NOEXCEPT codecvt<wchar_t, char, mbstate_t>::do_max_length() const _NOEXCEPT
{ {
#ifdef _LIBCPP_LOCALE__L_EXTENSIONS #ifdef _LIBCPP_LOCALE__L_EXTENSIONS
return __l == 0 ? 1 : MB_CUR_MAX_L(__l); return __l == 0 ? 1 : static_cast<int>( MB_CUR_MAX_L(__l));
#else #else
return __l == 0 ? 1 : __mb_cur_max_l(__l); return __l == 0 ? 1 : static_cast<int>(__mb_cur_max_l(__l));
#endif #endif
} }