diff options
10 files changed, 28 insertions, 15 deletions
diff --git a/libcxx/test/std/containers/associative/map/map.erasure/erase_if.pass.cpp b/libcxx/test/std/containers/associative/map/map.erasure/erase_if.pass.cpp index f7442f4cfb9..af2d35c66ec 100644 --- a/libcxx/test/std/containers/associative/map/map.erasure/erase_if.pass.cpp +++ b/libcxx/test/std/containers/associative/map/map.erasure/erase_if.pass.cpp @@ -24,7 +24,7 @@ M make (Init vals) { M ret; for (int v : vals) - ret[v] = v + 10; + ret[static_cast<typename M::key_type>(v)] = static_cast<typename M::mapped_type>(v + 10); return ret; } diff --git a/libcxx/test/std/containers/associative/multimap/multimap.erasure/erase_if.pass.cpp b/libcxx/test/std/containers/associative/multimap/multimap.erasure/erase_if.pass.cpp index 4655da4b2dc..6f2d56a9730 100644 --- a/libcxx/test/std/containers/associative/multimap/multimap.erasure/erase_if.pass.cpp +++ b/libcxx/test/std/containers/associative/multimap/multimap.erasure/erase_if.pass.cpp @@ -24,7 +24,7 @@ M make (Init vals) { M ret; for (int v : vals) - ret.insert(typename M::value_type(v, v + 10)); + ret.emplace(static_cast<typename M::key_type>(v), static_cast<typename M::mapped_type>(v + 10)); return ret; } diff --git a/libcxx/test/std/containers/sequences/vector/vector.cons/construct_iter_iter.pass.cpp b/libcxx/test/std/containers/sequences/vector/vector.cons/construct_iter_iter.pass.cpp index 28c51eb0348..2b3b212aecd 100644 --- a/libcxx/test/std/containers/sequences/vector/vector.cons/construct_iter_iter.pass.cpp +++ b/libcxx/test/std/containers/sequences/vector/vector.cons/construct_iter_iter.pass.cpp @@ -156,7 +156,14 @@ void test_ctor_with_different_value_type() { // Make sure initialization is performed with each element value, not with // a memory blob. float array[3] = {0.0f, 1.0f, 2.0f}; +#ifdef TEST_COMPILER_C1XX + #pragma warning(push) + #pragma warning(disable: 4244) // conversion from 'float' to 'int', possible loss of data +#endif // TEST_COMPILER_C1XX std::vector<int> v(array, array + 3); +#ifdef TEST_COMPILER_C1XX + #pragma warning(pop) +#endif // TEST_COMPILER_C1XX assert(v[0] == 0); assert(v[1] == 1); assert(v[2] == 2); diff --git a/libcxx/test/std/containers/unord/unord.map/erase_if.pass.cpp b/libcxx/test/std/containers/unord/unord.map/erase_if.pass.cpp index 652e6f6b49f..2f188655ca8 100644 --- a/libcxx/test/std/containers/unord/unord.map/erase_if.pass.cpp +++ b/libcxx/test/std/containers/unord/unord.map/erase_if.pass.cpp @@ -24,7 +24,7 @@ M make (Init vals) { M ret; for (int v : vals) - ret[v] = v + 10; + ret[static_cast<typename M::key_type>(v)] = static_cast<typename M::mapped_type>(v + 10); return ret; } diff --git a/libcxx/test/std/containers/unord/unord.multimap/erase_if.pass.cpp b/libcxx/test/std/containers/unord/unord.multimap/erase_if.pass.cpp index 6da279e915d..23d18872d14 100644 --- a/libcxx/test/std/containers/unord/unord.multimap/erase_if.pass.cpp +++ b/libcxx/test/std/containers/unord/unord.multimap/erase_if.pass.cpp @@ -24,7 +24,7 @@ M make (Init vals) { M ret; for (int v : vals) - ret.insert(typename M::value_type(v, v + 10)); + ret.emplace(static_cast<typename M::key_type>(v), static_cast<typename M::mapped_type>(v + 10)); return ret; } diff --git a/libcxx/test/std/numerics/numarray/template.valarray/valarray.members/max.pass.cpp b/libcxx/test/std/numerics/numarray/template.valarray/valarray.members/max.pass.cpp index fcc57453c05..4c65d7f2119 100644 --- a/libcxx/test/std/numerics/numarray/template.valarray/valarray.members/max.pass.cpp +++ b/libcxx/test/std/numerics/numarray/template.valarray/valarray.members/max.pass.cpp @@ -28,11 +28,6 @@ int main(int, char**) } { typedef double T; - std::valarray<T> v1; - v1.max(); - } - { - typedef double T; T a1[] = {1.5, 2.5, -3, 4, -5.5}; const unsigned N1 = sizeof(a1)/sizeof(a1[0]); std::valarray<T> v1(a1, N1); diff --git a/libcxx/test/std/numerics/numarray/template.valarray/valarray.members/min.pass.cpp b/libcxx/test/std/numerics/numarray/template.valarray/valarray.members/min.pass.cpp index 8534e3fd681..314552aa117 100644 --- a/libcxx/test/std/numerics/numarray/template.valarray/valarray.members/min.pass.cpp +++ b/libcxx/test/std/numerics/numarray/template.valarray/valarray.members/min.pass.cpp @@ -28,11 +28,6 @@ int main(int, char**) } { typedef double T; - std::valarray<T> v1; - v1.min(); - } - { - typedef double T; T a1[] = {1.5, 2.5, -3, 4, 5.5}; const unsigned N1 = sizeof(a1)/sizeof(a1[0]); std::valarray<T> v1(a1, N1); diff --git a/libcxx/test/std/utilities/meta/meta.const.eval/is_constant_evaluated.pass.cpp b/libcxx/test/std/utilities/meta/meta.const.eval/is_constant_evaluated.pass.cpp index e4b8a7575b0..a1fdd288240 100644 --- a/libcxx/test/std/utilities/meta/meta.const.eval/is_constant_evaluated.pass.cpp +++ b/libcxx/test/std/utilities/meta/meta.const.eval/is_constant_evaluated.pass.cpp @@ -34,6 +34,10 @@ template <bool> struct InTemplate {}; int main(int, char**) { #ifdef __cpp_lib_is_constant_evaluated +#ifdef TEST_COMPILER_C1XX + #pragma warning(push) + #pragma warning(disable: 5063) // 'std::is_constant_evaluated' always evaluates to true in manifestly constant-evaluated expressions +#endif // TEST_COMPILER_C1XX // Test the signature { ASSERT_SAME_TYPE(decltype(std::is_constant_evaluated()), bool); @@ -51,6 +55,9 @@ int main(int, char**) static int local_static = std::is_constant_evaluated() ? 42 : -1; assert(local_static == 42); } -#endif +#ifdef TEST_COMPILER_C1XX + #pragma warning(pop) +#endif // TEST_COMPILER_C1XX +#endif // __cpp_lib_is_constant_evaluated return 0; } diff --git a/libcxx/test/support/charconv_test_helpers.h b/libcxx/test/support/charconv_test_helpers.h index f30956e9a73..4ef4288a34f 100644 --- a/libcxx/test/support/charconv_test_helpers.h +++ b/libcxx/test/support/charconv_test_helpers.h @@ -174,6 +174,10 @@ struct roundtrip_test_base r2 = from_chars(buf, r.ptr, x, args...); +#ifdef TEST_COMPILER_C1XX + #pragma warning(push) + #pragma warning(disable: 4127) // conditional expression is constant +#endif // TEST_COMPILER_C1XX if (std::is_signed<T>::value && v < 0 && std::is_unsigned<X>::value) { assert(x == 0xc); @@ -186,6 +190,9 @@ struct roundtrip_test_base assert(r2.ptr == r.ptr); assert(r2.ec == std::errc::result_out_of_range); } +#ifdef TEST_COMPILER_C1XX + #pragma warning(pop) +#endif // TEST_COMPILER_C1XX } } diff --git a/libcxx/test/support/msvc_stdlib_force_include.h b/libcxx/test/support/msvc_stdlib_force_include.h index 2ec74e85a2a..e3352e52043 100644 --- a/libcxx/test/support/msvc_stdlib_force_include.h +++ b/libcxx/test/support/msvc_stdlib_force_include.h @@ -88,5 +88,7 @@ const AssertionDialogAvoider assertion_dialog_avoider{}; #endif #define _LIBCPP_AVAILABILITY_THROW_BAD_ANY_CAST +#define _LIBCPP_SUPPRESS_DEPRECATED_PUSH +#define _LIBCPP_SUPPRESS_DEPRECATED_POP #endif // SUPPORT_MSVC_STDLIB_FORCE_INCLUDE_H |
