mirror/fmt
1
0
Fork 0
mirror of https://github.com/fmtlib/fmt.git synced 2025-04-10 21:44:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make FMT_COMPILE fallback on runtime without if constexpr (#2261)

Browse Source
This commit is contained in:
Victor Zverovich 2021-04-28 09:11:47 -07:00
parent 0cd0fb9184
commit 355be4b13f
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/fmt/compile.h
View File

@ -114,7 +114,11 @@ struct is_compiled_string : std::is_base_of<compiled_string, S> {};
std::string s = fmt::format(FMT_COMPILE("{}"), 42); std::string s = fmt::format(FMT_COMPILE("{}"), 42);
\endrst \endrst
*/ */
#define FMT_COMPILE(s) FMT_STRING_IMPL(s, fmt::detail::compiled_string) #ifdef __cpp_if_constexpr
# define FMT_COMPILE(s) FMT_STRING_IMPL(s, fmt::detail::compiled_string)
#else
# define FMT_COMPILE(s) FMT_STRING(s)
#endif
#if FMT_USE_NONTYPE_TEMPLATE_PARAMETERS #if FMT_USE_NONTYPE_TEMPLATE_PARAMETERS
template <typename Char, size_t N, fixed_string<Char, N> Str> template <typename Char, size_t N, fixed_string<Char, N> Str>

6
test/compile-test.cc
View File

@ -155,6 +155,12 @@ TEST(CompileTest, EmptyFormatString) {
EXPECT_EQ(fmt::format(f), ""); EXPECT_EQ(fmt::format(f), "");
} }
TEST(CompileTest, CompileFallback) {
// FMT_COMPILE should fallback on runtime formatting when `if constexpr` is
// not available.
EXPECT_EQ("42", fmt::format(FMT_COMPILE("{}"), 42));
}
#ifdef __cpp_if_constexpr #ifdef __cpp_if_constexpr
TEST(CompileTest, FormatDefault) { TEST(CompileTest, FormatDefault) {
EXPECT_EQ("42", fmt::format(FMT_COMPILE("{}"), 42)); EXPECT_EQ("42", fmt::format(FMT_COMPILE("{}"), 42));