[libcxx] r174636 - More libc++ warning suppression on Linux; no functionality change
Marshall Clow
mclow at qualcomm.com
Thu Feb 7 09:20:56 PST 2013
Author: marshall
Date: Thu Feb 7 11:20:56 2013
New Revision: 174636
URL: http://llvm.org/viewvc/llvm-project?rev=174636&view=rev
Log:
More libc++ warning suppression on Linux; no functionality change
Modified:
libcxx/trunk/src/locale.cpp
Modified: libcxx/trunk/src/locale.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/src/locale.cpp?rev=174636&r1=174635&r2=174636&view=diff
==============================================================================
--- libcxx/trunk/src/locale.cpp (original)
+++ libcxx/trunk/src/locale.cpp Thu Feb 7 11:20:56 2013
@@ -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
}
More information about the cfe-commits
mailing list