From 2f9484c74b5385b0fe4e1d8fc6102a181b64741e Mon Sep 17 00:00:00 2001
From: Walter Gray <walter.gray@getcruise.com>
Date: Mon, 30 Nov 2020 11:05:50 -0800
Subject: [PATCH] fix chrono

---
 include/fmt/chrono.h             | 10 +++++-----
 test/enforce-compiletime-test.cc |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/include/fmt/chrono.h b/include/fmt/chrono.h
index d68d8c9a..4c055516 100644
--- a/include/fmt/chrono.h
+++ b/include/fmt/chrono.h
@@ -769,7 +769,7 @@ template <typename Char, typename Rep, typename OutputIt,
           FMT_ENABLE_IF(std::is_integral<Rep>::value)>
 OutputIt format_duration_value(OutputIt out, Rep val, int) {
   static FMT_CONSTEXPR_DECL const Char format[] = {'{', '}', 0};
-  return format_to(out, compile_string_to_view(format), val);
+  return format_to(out, FMT_STRING(format), val);
 }
 
 template <typename Char, typename Rep, typename OutputIt,
@@ -778,9 +778,9 @@ OutputIt format_duration_value(OutputIt out, Rep val, int precision) {
   static FMT_CONSTEXPR_DECL const Char pr_f[] = {'{', ':', '.', '{',
                                                  '}', 'f', '}', 0};
   if (precision >= 0)
-    return format_to(out, compile_string_to_view(pr_f), val, precision);
+    return format_to(out, FMT_STRING(pr_f), val, precision);
   static FMT_CONSTEXPR_DECL const Char fp_f[] = {'{', ':', 'g', '}', 0};
-  return format_to(out, compile_string_to_view(fp_f), val);
+  return format_to(out, FMT_STRING(fp_f), val);
 }
 
 template <typename Char, typename OutputIt>
@@ -802,10 +802,10 @@ OutputIt format_duration_unit(OutputIt out) {
     return copy_unit(string_view(unit), out, Char());
   static FMT_CONSTEXPR_DECL const Char num_f[] = {'[', '{', '}', ']', 's', 0};
   if (const_check(Period::den == 1))
-    return format_to(out, compile_string_to_view(num_f), Period::num);
+    return format_to(out, FMT_STRING(num_f), Period::num);
   static FMT_CONSTEXPR_DECL const Char num_def_f[] = {'[', '{', '}', '/', '{',
                                                       '}', ']', 's', 0};
-  return format_to(out, compile_string_to_view(num_def_f), Period::num,
+  return format_to(out, FMT_STRING(num_def_f), Period::num,
                    Period::den);
 }
 
diff --git a/test/enforce-compiletime-test.cc b/test/enforce-compiletime-test.cc
index 0260187e..70e0e846 100644
--- a/test/enforce-compiletime-test.cc
+++ b/test/enforce-compiletime-test.cc
@@ -279,13 +279,13 @@ TEST(FormatTest, FmtStringInTemplate) {
 #include "fmt/chrono.h"
 
 #ifndef FMT_STATIC_THOUSANDS_SEPARATOR
-/*
+
 TEST(ChronoTest, FormatDefault) {
   EXPECT_EQ("42s", fmt::format(FMT_STRING("{}"), std::chrono::seconds(42)));
 }
 
 TEST(ChronoTest, FormatWide) {
-  EXPECT_EQ(L"42s", fmt::format(L"{}", std::chrono::seconds(42)));
+  EXPECT_EQ(L"42s", fmt::format(FMT_STRING(L"{}"), std::chrono::seconds(42)));
 }
 
 typedef std::chrono::duration<double, std::milli> dms;
@@ -327,7 +327,7 @@ TEST(ChronoTest, FormatFullSpecsQq) {
 TEST(ChronoTest, UnsignedDuration) {
   EXPECT_EQ("42s", fmt::format(FMT_STRING("{}"), std::chrono::duration<unsigned>(42)));
 }
-*/
+
 #endif  // FMT_STATIC_THOUSANDS_SEPARATOR