diff options
| author | Marshall Clow <mclow@qualcomm.com> | 2013-02-07 17:20:56 +0000 |
|---|---|---|
| committer | Marshall Clow <mclow@qualcomm.com> | 2013-02-07 17:20:56 +0000 |
| commit | d58e0f5505297e2e318606c6cf0b5c706994b6df (patch) | |
| tree | 8c5a2cb4e6230bf8b82b533a45f2180d059644a6 /libcxx | |
| parent | e679798315f79877c20917b33a9102e5ee058f07 (diff) | |
| download | bcm5719-llvm-d58e0f5505297e2e318606c6cf0b5c706994b6df.tar.gz bcm5719-llvm-d58e0f5505297e2e318606c6cf0b5c706994b6df.zip | |
More libc++ warning suppression on Linux; no functionality change
llvm-svn: 174636
Diffstat (limited to 'libcxx')
| -rw-r--r-- | libcxx/src/locale.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/libcxx/src/locale.cpp b/libcxx/src/locale.cpp index db24e7e9850..214979036cc 100644 --- a/libcxx/src/locale.cpp +++ b/libcxx/src/locale.cpp @@ -32,6 +32,10 @@ #endif // _!WIN32 #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 #ifdef __cloc_defined @@ -1596,9 +1600,9 @@ int codecvt<wchar_t, char, mbstate_t>::do_max_length() const _NOEXCEPT { #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 - return __l == 0 ? 1 : __mb_cur_max_l(__l); + return __l == 0 ? 1 : static_cast<int>(__mb_cur_max_l(__l)); #endif } |
