summaryrefslogtreecommitdiffstats
path: root/libcxx/test/support
diff options
context:
space:
mode:
Diffstat (limited to 'libcxx/test/support')
-rw-r--r--libcxx/test/support/charconv_test_helpers.h7
-rw-r--r--libcxx/test/support/msvc_stdlib_force_include.h2
2 files changed, 9 insertions, 0 deletions
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
OpenPOWER on IntegriCloud