From 003ccb427184ffb1c83a7e5b676e8579f4793902 Mon Sep 17 00:00:00 2001 From: Mark Santaniello Date: Tue, 9 Aug 2022 11:02:54 -0700 Subject: [PATCH] Adjust unit test to require __cpp_lib_bit_cast --- include/fmt/format.h | 2 -- test/compile-test.cc | 10 ++++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/include/fmt/format.h b/include/fmt/format.h index 119e36f1..047144cf 100644 --- a/include/fmt/format.h +++ b/include/fmt/format.h @@ -297,8 +297,6 @@ template FMT_CONSTEXPR20 auto bit_cast(const From& from) -> To { #ifdef __cpp_lib_bit_cast if (is_constant_evaluated()) return std::bit_cast(from); -#elif FMT_HAS_BUILTIN(__builtin_bit_cast) - return __builtin_bit_cast(To, from); #endif auto to = To(); // The cast suppresses a bogus -Wclass-memaccess on GCC. diff --git a/test/compile-test.cc b/test/compile-test.cc index 0d62fadb..52f61cb8 100644 --- a/test/compile-test.cc +++ b/test/compile-test.cc @@ -228,9 +228,15 @@ TEST(compile_test, format_to_n) { } TEST(compile_test, formatted_size) { - FMT_CONSTEXPR20 size_t s1 = fmt::formatted_size(FMT_COMPILE("{0}"), 42); +#ifdef __cpp_lib_bit_cast + FMT_CONSTEXPR20 +#endif + size_t s1 = fmt::formatted_size(FMT_COMPILE("{0}"), 42); EXPECT_EQ(2, s1); - FMT_CONSTEXPR20 size_t s2 = fmt::formatted_size(FMT_COMPILE("{0:<4.2f}"), 42.0); +#ifdef __cpp_lib_bit_cast + FMT_CONSTEXPR20 +#endif +size_t s2 = fmt::formatted_size(FMT_COMPILE("{0:<4.2f}"), 42.0); EXPECT_EQ(5, s2); }