Fix compilation for fmtlib 8

nyanpasu64 · Feb 16, 2022 · 2101869 · 2101869
1 parent cf3e495
commit 2101869
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/src/doc/validate.cpp b/src/doc/validate.cpp
@@ -252,7 +252,7 @@ optional<size_t> validate_nchan_matches(
     if (gen_nchan != metadata.nchan) {
         PUSH_ERROR(state,
             "[{0}].size()={1} != chips[{0}]={2}'s channel count ({3})",
-            chip_idx, gen_nchan, metadata.chip_kind, metadata.nchan
+            chip_idx, gen_nchan, (size_t) metadata.chip_kind, metadata.nchan
         );
         return {};
     }

diff --git a/src/doc/validate.h b/src/doc/validate.h
@@ -103,8 +103,10 @@ class ErrorPrefixer {
 
     /// See #define PUSH().
     template <typename... Args>
-    void push(ErrorState & state, Args&&... args) const {
-        fmt::format_to(state.msg, std::forward<Args>(args)...);
+    void push(
+        ErrorState & state, fmt::format_string<Args...> str, Args&&... args
+    ) const {
+        fmt::format_to(std::back_inserter(state.msg), str, std::forward<Args>(args)...);
     }
 
     /// See #define PUSH_LITERAL().
@@ -146,11 +148,11 @@ class ErrorPrefixer {
 ///
 /// See #define PUSH_WARNING() and PUSH_ERROR().
 template <ErrorType type, typename... Args>
-void push_err_fmt(ErrorState & state, Args&&... args) {
+void push_err_fmt(ErrorState & state, fmt::format_string<Args...> str, Args&&... args) {
     size_t prefix = state.msg.size();
 
     // push to end
-    fmt::format_to(state.msg, std::forward<Args>(args)...);
+    fmt::format_to(std::back_inserter(state.msg), str, std::forward<Args>(args)...);
 
     // read message
     state.err.push_back(Error{

diff --git a/src/serialize.cpp b/src/serialize.cpp
@@ -795,7 +795,9 @@ optional<ChipList> load_chips(ErrorState & state, GenChips gen_chips) {
             PUSH_FATAL(err, "[{}]=ChipKind::UNKNOWN, cannot load", i);
             continue;
         default:
-            PUSH_FATAL(err, "[{}]={} (unknown chip kind), cannot load", i, gen_chip);
+            PUSH_FATAL(err,
+                "[{}]={} (unknown chip kind), cannot load", i, (size_t) gen_chip
+            );
             continue;
         }
 
@@ -1234,7 +1236,7 @@ LoadDocumentResult load_impl(kj::InputStream & stream, ErrorState & state) {
         default:
             PUSH_WARNING(state,
                 "accidental_mode={} unrecognized (should be Sharp or Flat), defaulting to Sharp",
-                gen_accidental_mode
+                (size_t) gen_accidental_mode
             );
             return AccidentalMode::Sharp;
     });