diff options
Diffstat (limited to 'libcxx/test/std')
4 files changed, 8 insertions, 7 deletions
diff --git a/libcxx/test/std/algorithms/alg.modifying.operations/alg.generate/generate_n.pass.cpp b/libcxx/test/std/algorithms/alg.modifying.operations/alg.generate/generate_n.pass.cpp index 6a014a9c00c..b7322542931 100644 --- a/libcxx/test/std/algorithms/alg.modifying.operations/alg.generate/generate_n.pass.cpp +++ b/libcxx/test/std/algorithms/alg.modifying.operations/alg.generate/generate_n.pass.cpp @@ -15,6 +15,10 @@ // void // generate_n(Iter first, Size n, Generator gen); +#ifdef _MSC_VER +#pragma warning(disable: 4244) // conversion from 'const double' to 'int', possible loss of data +#endif + #include <algorithm> #include <cassert> diff --git a/libcxx/test/std/utilities/template.bitset/bitset.members/to_ullong.pass.cpp b/libcxx/test/std/utilities/template.bitset/bitset.members/to_ullong.pass.cpp index c4a818f60f5..20578511c8c 100644 --- a/libcxx/test/std/utilities/template.bitset/bitset.members/to_ullong.pass.cpp +++ b/libcxx/test/std/utilities/template.bitset/bitset.members/to_ullong.pass.cpp @@ -8,7 +8,6 @@ //===----------------------------------------------------------------------===// // test unsigned long long to_ullong() const; -extern "C" int printf(const char *, ...); #include <bitset> #include <algorithm> @@ -40,7 +39,7 @@ void test_to_ullong() { // test values bigger than can fit into the bitset const unsigned long long val = 0x55AAAAFFFFAAAA55ULL; const bool canFit = N < sizeof(unsigned long long) * CHAR_BIT; - const unsigned long long mask = canFit ? (1ULL << N) - 1 : (unsigned long long)(-1); + const unsigned long long mask = canFit ? (1ULL << (canFit ? N : 0)) - 1 : (unsigned long long)(-1); // avoid compiler warnings std::bitset<N> v(val); assert(v.to_ullong() == (val & mask)); // we shouldn't return bit patterns from outside the limits of the bitset. } diff --git a/libcxx/test/std/utilities/template.bitset/bitset.members/to_ulong.pass.cpp b/libcxx/test/std/utilities/template.bitset/bitset.members/to_ulong.pass.cpp index 536c272e0e0..0872d77bca9 100644 --- a/libcxx/test/std/utilities/template.bitset/bitset.members/to_ulong.pass.cpp +++ b/libcxx/test/std/utilities/template.bitset/bitset.members/to_ulong.pass.cpp @@ -39,9 +39,9 @@ void test_to_ulong() } { // test values bigger than can fit into the bitset - const unsigned long val = 0x5AFFFFA5ULL; + const unsigned long val = 0x5AFFFFA5UL; const bool canFit = N < sizeof(unsigned long) * CHAR_BIT; - const unsigned long mask = canFit ? (1ULL << N) - 1 : (unsigned long)(-1); + const unsigned long mask = canFit ? (1UL << (canFit ? N : 0)) - 1 : (unsigned long)(-1); // avoid compiler warnings std::bitset<N> v(val); assert(v.to_ulong() == (val & mask)); // we shouldn't return bit patterns from outside the limits of the bitset. } diff --git a/libcxx/test/std/utilities/tuple/tuple.general/ignore.pass.cpp b/libcxx/test/std/utilities/tuple/tuple.general/ignore.pass.cpp index 8dae3a5dcb0..a7a0904cf49 100644 --- a/libcxx/test/std/utilities/tuple/tuple.general/ignore.pass.cpp +++ b/libcxx/test/std/utilities/tuple/tuple.general/ignore.pass.cpp @@ -48,9 +48,7 @@ int main() { { static_assert(test_ignore_constexpr(), ""); } -#if defined(_LIBCPP_VERSION) { - static_assert(std::is_trivial<decltype(std::ignore)>::value, ""); + LIBCPP_STATIC_ASSERT(std::is_trivial<decltype(std::ignore)>::value, ""); } -#endif } |
