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

fmtlib · Apr 28, 2021 · 355be4b · 355be4b · PeteTheHeat · Jun 15, 2021
1 parent 0cd0fb9
commit 355be4b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/include/fmt/compile.h b/include/fmt/compile.h
@@ -114,7 +114,11 @@ struct is_compiled_string : std::is_base_of<compiled_string, S> {};
     std::string s = fmt::format(FMT_COMPILE("{}"), 42);
   \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
 template <typename Char, size_t N, fixed_string<Char, N> Str>

diff --git a/test/compile-test.cc b/test/compile-test.cc
@@ -155,6 +155,12 @@ TEST(CompileTest, EmptyFormatString) {
   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
 TEST(CompileTest, FormatDefault) {
   EXPECT_EQ("42", fmt::format(FMT_COMPILE("{}"), 42));