diff options
author | Alon Zakai <alonzakai@gmail.com> | 2013-08-08 19:57:52 -0700 |
---|---|---|
committer | Alon Zakai <alonzakai@gmail.com> | 2013-08-08 19:57:52 -0700 |
commit | 5bc9fceed3002e0b24a3510f12779fc1243c4c07 (patch) | |
tree | 3ace3d12e614e27cece95fad1eef96bae0d52409 /system/lib/libcxx/hash.cpp | |
parent | 6c275bebb45d6aac7e4a024b825ab34971b178d2 (diff) | |
parent | 32b77e92823f0cd6837b85f3c6208715fb0e757b (diff) |
Merge pull request #1480 from waywardmonkeys/update-libcxx-part-20
Update libcxx
Diffstat (limited to 'system/lib/libcxx/hash.cpp')
-rw-r--r-- | system/lib/libcxx/hash.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/system/lib/libcxx/hash.cpp b/system/lib/libcxx/hash.cpp index a0135002..388ab2eb 100644 --- a/system/lib/libcxx/hash.cpp +++ b/system/lib/libcxx/hash.cpp @@ -12,7 +12,9 @@ #include "stdexcept" #include "type_traits" +#ifdef __clang__ #pragma clang diagnostic ignored "-Wtautological-constant-out-of-range-compare" +#endif _LIBCPP_BEGIN_NAMESPACE_STD @@ -155,6 +157,8 @@ __check_for_overflow(size_t N) #ifndef _LIBCPP_NO_EXCEPTIONS if (N > 0xFFFFFFFB) throw overflow_error("__next_prime overflow"); +#else + (void)N; #endif } @@ -166,6 +170,8 @@ __check_for_overflow(size_t N) #ifndef _LIBCPP_NO_EXCEPTIONS if (N > 0xFFFFFFFFFFFFFFC5ull) throw overflow_error("__next_prime overflow"); +#else + (void)N; #endif } |