From 98a35576c81d717cc6af1881ed8864e93238530b Mon Sep 17 00:00:00 2001 From: Walter Gray Date: Fri, 13 Nov 2020 17:47:40 -0800 Subject: [PATCH] improve test, fix conditional --- test/format-test.cc | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/test/format-test.cc b/test/format-test.cc index 435b137b..594523e3 100644 --- a/test/format-test.cc +++ b/test/format-test.cc @@ -1807,18 +1807,25 @@ fmt::string_view to_string_view(string_like) { return "foo"; } constexpr char with_null[3] = {'{', '}', '\0'}; constexpr char no_null[2] = {'{', '}'}; +static FMT_CONSTEXPR_DECL const char static_with_null[3] = {'{', '}', '\0'}; +static FMT_CONSTEXPR_DECL const wchar_t static_with_null_wide[3] = {'{', '}', '\0'}; +static FMT_CONSTEXPR_DECL const char static_no_null[2] = {'{', '}'}; +static FMT_CONSTEXPR_DECL const wchar_t static_no_null_wide[2] = {'{', '}'}; TEST(FormatTest, CompileTimeString) { - static FMT_CONSTEXPR_DECL const char static_with_null[3] = {'{', '}', '\0'}; - static FMT_CONSTEXPR_DECL const wchar_t static_with_null_wide[3] = {'{', '}', '\0'}; - EXPECT_EQ("42", fmt::format(FMT_STRING("{}"), 42)); EXPECT_EQ(L"42", fmt::format(FMT_STRING(L"{}"), 42)); EXPECT_EQ("foo", fmt::format(FMT_STRING("{}"), string_like())); -#if defined(_MSC_VER) && _MSC_VER <= 1927 + (void)static_with_null; + (void)static_with_null_wide; + (void)static_no_null; + (void)static_no_null_wide; +#if !defined(_MSC_VER) EXPECT_EQ("42", fmt::format(FMT_STRING(static_with_null), 42)); EXPECT_EQ(L"42", fmt::format(FMT_STRING(static_with_null_wide), 42)); + EXPECT_EQ("42", fmt::format(FMT_STRING(static_no_null), 42)); + EXPECT_EQ(L"42", fmt::format(FMT_STRING(static_no_null_wide), 42)); #endif (void)with_null;