From 3cc653fae1a397d97225e9d01915415504c8cec4 Mon Sep 17 00:00:00 2001
From: Mateusz Pusz <mateusz.pusz@gmail.com>
Date: Wed, 23 Aug 2023 20:01:23 +0200
Subject: [PATCH] build: `fmt` updated to `10.1.0` to enable gcc-13 compilation

---
 conanfile.py                        |  2 +-
 test/unit_test/runtime/fmt_test.cpp | 60 +++++++++++++++++------------
 2 files changed, 36 insertions(+), 26 deletions(-)

diff --git a/conanfile.py b/conanfile.py
index 85d9c5a5..519855a5 100644
--- a/conanfile.py
+++ b/conanfile.py
@@ -105,7 +105,7 @@ class MPUnitsConan(ConanFile):
     def requirements(self):
         self.requires("gsl-lite/0.40.0")
         if self._use_libfmt:
-            self.requires("fmt/10.0.0")
+            self.requires("fmt/10.1.0")
         if self._use_range_v3:
             self.requires("range-v3/0.11.0")
 
diff --git a/test/unit_test/runtime/fmt_test.cpp b/test/unit_test/runtime/fmt_test.cpp
index 85e72b8a..db834f94 100644
--- a/test/unit_test/runtime/fmt_test.cpp
+++ b/test/unit_test/runtime/fmt_test.cpp
@@ -405,48 +405,52 @@ TEST_CASE("format string with only %q should print quantity unit symbol only", "
 
 TEST_CASE("unknown unit modifiers should throw", "[text][fmt][exception]")
 {
+  auto q = 1 * isq::length[m];
+
   SECTION("only the invalid modifier")
   {
-    REQUIRE_THROWS_MATCHES(MP_UNITS_STD_FMT::vformat("{:%xq}", MP_UNITS_STD_FMT::make_format_args(1 * isq::length[m])),
+    REQUIRE_THROWS_MATCHES(MP_UNITS_STD_FMT::vformat("{:%xq}", MP_UNITS_STD_FMT::make_format_args(q)),
                            MP_UNITS_STD_FMT::format_error, Catch::Matchers::Message("invalid unit modifier specified"));
   }
 
   SECTION("invalid modifier in the front")
   {
     REQUIRE_THROWS_MATCHES(
-      MP_UNITS_STD_FMT::vformat("{:%xUdaq}", MP_UNITS_STD_FMT::make_format_args(1 * isq::length[m])),
+      MP_UNITS_STD_FMT::vformat("{:%xUdaq}", MP_UNITS_STD_FMT::make_format_args(q)),
       MP_UNITS_STD_FMT::format_error, Catch::Matchers::Message("invalid unit modifier specified"));
   }
 
   SECTION("invalid modifier in the end")
   {
     REQUIRE_THROWS_MATCHES(
-      MP_UNITS_STD_FMT::vformat("{:%Udaxq}", MP_UNITS_STD_FMT::make_format_args(1 * isq::length[m])),
+      MP_UNITS_STD_FMT::vformat("{:%Udaxq}", MP_UNITS_STD_FMT::make_format_args(q)),
       MP_UNITS_STD_FMT::format_error, Catch::Matchers::Message("invalid unit modifier specified"));
   }
 
   SECTION("invalid modifier in the middle")
   {
     REQUIRE_THROWS_MATCHES(
-      MP_UNITS_STD_FMT::vformat("{:%Udxaq}", MP_UNITS_STD_FMT::make_format_args(1 * isq::length[m])),
+      MP_UNITS_STD_FMT::vformat("{:%Udxaq}", MP_UNITS_STD_FMT::make_format_args(q)),
       MP_UNITS_STD_FMT::format_error, Catch::Matchers::Message("invalid unit modifier specified"));
   }
 }
 
 TEST_CASE("repeated unit modifiers should throw", "[text][fmt][exception]")
 {
+  auto q = 1 * isq::length[m];
+
   SECTION("text encoding")
   {
     REQUIRE_THROWS_MATCHES(
-      MP_UNITS_STD_FMT::vformat("{:%UdaUq}", MP_UNITS_STD_FMT::make_format_args(1 * isq::length[m])),
+      MP_UNITS_STD_FMT::vformat("{:%UdaUq}", MP_UNITS_STD_FMT::make_format_args(q)),
       MP_UNITS_STD_FMT::format_error,
       Catch::Matchers::Message("only one of 'UA' unit modifiers may be used in the format spec"));
     REQUIRE_THROWS_MATCHES(
-      MP_UNITS_STD_FMT::vformat("{:%dUaUq}", MP_UNITS_STD_FMT::make_format_args(1 * isq::length[m])),
+      MP_UNITS_STD_FMT::vformat("{:%dUaUq}", MP_UNITS_STD_FMT::make_format_args(q)),
       MP_UNITS_STD_FMT::format_error,
       Catch::Matchers::Message("only one of 'UA' unit modifiers may be used in the format spec"));
     REQUIRE_THROWS_MATCHES(
-      MP_UNITS_STD_FMT::vformat("{:%dUUaq}", MP_UNITS_STD_FMT::make_format_args(1 * isq::length[m])),
+      MP_UNITS_STD_FMT::vformat("{:%dUUaq}", MP_UNITS_STD_FMT::make_format_args(q)),
       MP_UNITS_STD_FMT::format_error,
       Catch::Matchers::Message("only one of 'UA' unit modifiers may be used in the format spec"));
   }
@@ -454,15 +458,15 @@ TEST_CASE("repeated unit modifiers should throw", "[text][fmt][exception]")
   SECTION("solidus")
   {
     REQUIRE_THROWS_MATCHES(
-      MP_UNITS_STD_FMT::vformat("{:%aUdaq}", MP_UNITS_STD_FMT::make_format_args(1 * isq::length[m])),
+      MP_UNITS_STD_FMT::vformat("{:%aUdaq}", MP_UNITS_STD_FMT::make_format_args(q)),
       MP_UNITS_STD_FMT::format_error,
       Catch::Matchers::Message("only one of 'oan' unit modifiers may be used in the format spec"));
     REQUIRE_THROWS_MATCHES(
-      MP_UNITS_STD_FMT::vformat("{:%daUaq}", MP_UNITS_STD_FMT::make_format_args(1 * isq::length[m])),
+      MP_UNITS_STD_FMT::vformat("{:%daUaq}", MP_UNITS_STD_FMT::make_format_args(q)),
       MP_UNITS_STD_FMT::format_error,
       Catch::Matchers::Message("only one of 'oan' unit modifiers may be used in the format spec"));
     REQUIRE_THROWS_MATCHES(
-      MP_UNITS_STD_FMT::vformat("{:%daaUq}", MP_UNITS_STD_FMT::make_format_args(1 * isq::length[m])),
+      MP_UNITS_STD_FMT::vformat("{:%daaUq}", MP_UNITS_STD_FMT::make_format_args(q)),
       MP_UNITS_STD_FMT::format_error,
       Catch::Matchers::Message("only one of 'oan' unit modifiers may be used in the format spec"));
   }
@@ -470,15 +474,15 @@ TEST_CASE("repeated unit modifiers should throw", "[text][fmt][exception]")
   SECTION("separator")
   {
     REQUIRE_THROWS_MATCHES(
-      MP_UNITS_STD_FMT::vformat("{:%dUadq}", MP_UNITS_STD_FMT::make_format_args(1 * isq::length[m])),
+      MP_UNITS_STD_FMT::vformat("{:%dUadq}", MP_UNITS_STD_FMT::make_format_args(q)),
       MP_UNITS_STD_FMT::format_error,
       Catch::Matchers::Message("only one of 'sd' unit modifiers may be used in the format spec"));
     REQUIRE_THROWS_MATCHES(
-      MP_UNITS_STD_FMT::vformat("{:%dadUq}", MP_UNITS_STD_FMT::make_format_args(1 * isq::length[m])),
+      MP_UNITS_STD_FMT::vformat("{:%dadUq}", MP_UNITS_STD_FMT::make_format_args(q)),
       MP_UNITS_STD_FMT::format_error,
       Catch::Matchers::Message("only one of 'sd' unit modifiers may be used in the format spec"));
     REQUIRE_THROWS_MATCHES(
-      MP_UNITS_STD_FMT::vformat("{:%addUq}", MP_UNITS_STD_FMT::make_format_args(1 * isq::length[m])),
+      MP_UNITS_STD_FMT::vformat("{:%addUq}", MP_UNITS_STD_FMT::make_format_args(q)),
       MP_UNITS_STD_FMT::format_error,
       Catch::Matchers::Message("only one of 'sd' unit modifiers may be used in the format spec"));
   }
@@ -486,18 +490,20 @@ TEST_CASE("repeated unit modifiers should throw", "[text][fmt][exception]")
 
 TEST_CASE("more then one modifier of the same kind should throw", "[text][fmt][exception]")
 {
+  auto q = 1 * isq::length[m];
+
   SECTION("text encoding")
   {
     REQUIRE_THROWS_MATCHES(
-      MP_UNITS_STD_FMT::vformat("{:%UdaAq}", MP_UNITS_STD_FMT::make_format_args(1 * isq::length[m])),
+      MP_UNITS_STD_FMT::vformat("{:%UdaAq}", MP_UNITS_STD_FMT::make_format_args(q)),
       MP_UNITS_STD_FMT::format_error,
       Catch::Matchers::Message("only one of 'UA' unit modifiers may be used in the format spec"));
     REQUIRE_THROWS_MATCHES(
-      MP_UNITS_STD_FMT::vformat("{:%dAaUq}", MP_UNITS_STD_FMT::make_format_args(1 * isq::length[m])),
+      MP_UNITS_STD_FMT::vformat("{:%dAaUq}", MP_UNITS_STD_FMT::make_format_args(q)),
       MP_UNITS_STD_FMT::format_error,
       Catch::Matchers::Message("only one of 'UA' unit modifiers may be used in the format spec"));
     REQUIRE_THROWS_MATCHES(
-      MP_UNITS_STD_FMT::vformat("{:%dAUaq}", MP_UNITS_STD_FMT::make_format_args(1 * isq::length[m])),
+      MP_UNITS_STD_FMT::vformat("{:%dAUaq}", MP_UNITS_STD_FMT::make_format_args(q)),
       MP_UNITS_STD_FMT::format_error,
       Catch::Matchers::Message("only one of 'UA' unit modifiers may be used in the format spec"));
   }
@@ -505,15 +511,15 @@ TEST_CASE("more then one modifier of the same kind should throw", "[text][fmt][e
   SECTION("solidus")
   {
     REQUIRE_THROWS_MATCHES(
-      MP_UNITS_STD_FMT::vformat("{:%aUdnq}", MP_UNITS_STD_FMT::make_format_args(1 * isq::length[m])),
+      MP_UNITS_STD_FMT::vformat("{:%aUdnq}", MP_UNITS_STD_FMT::make_format_args(q)),
       MP_UNITS_STD_FMT::format_error,
       Catch::Matchers::Message("only one of 'oan' unit modifiers may be used in the format spec"));
     REQUIRE_THROWS_MATCHES(
-      MP_UNITS_STD_FMT::vformat("{:%dnUaq}", MP_UNITS_STD_FMT::make_format_args(1 * isq::length[m])),
+      MP_UNITS_STD_FMT::vformat("{:%dnUaq}", MP_UNITS_STD_FMT::make_format_args(q)),
       MP_UNITS_STD_FMT::format_error,
       Catch::Matchers::Message("only one of 'oan' unit modifiers may be used in the format spec"));
     REQUIRE_THROWS_MATCHES(
-      MP_UNITS_STD_FMT::vformat("{:%daoUq}", MP_UNITS_STD_FMT::make_format_args(1 * isq::length[m])),
+      MP_UNITS_STD_FMT::vformat("{:%daoUq}", MP_UNITS_STD_FMT::make_format_args(q)),
       MP_UNITS_STD_FMT::format_error,
       Catch::Matchers::Message("only one of 'oan' unit modifiers may be used in the format spec"));
   }
@@ -521,15 +527,15 @@ TEST_CASE("more then one modifier of the same kind should throw", "[text][fmt][e
   SECTION("separator")
   {
     REQUIRE_THROWS_MATCHES(
-      MP_UNITS_STD_FMT::vformat("{:%dUasq}", MP_UNITS_STD_FMT::make_format_args(1 * isq::length[m])),
+      MP_UNITS_STD_FMT::vformat("{:%dUasq}", MP_UNITS_STD_FMT::make_format_args(q)),
       MP_UNITS_STD_FMT::format_error,
       Catch::Matchers::Message("only one of 'sd' unit modifiers may be used in the format spec"));
     REQUIRE_THROWS_MATCHES(
-      MP_UNITS_STD_FMT::vformat("{:%sadUq}", MP_UNITS_STD_FMT::make_format_args(1 * isq::length[m])),
+      MP_UNITS_STD_FMT::vformat("{:%sadUq}", MP_UNITS_STD_FMT::make_format_args(q)),
       MP_UNITS_STD_FMT::format_error,
       Catch::Matchers::Message("only one of 'sd' unit modifiers may be used in the format spec"));
     REQUIRE_THROWS_MATCHES(
-      MP_UNITS_STD_FMT::vformat("{:%adsUq}", MP_UNITS_STD_FMT::make_format_args(1 * isq::length[m])),
+      MP_UNITS_STD_FMT::vformat("{:%adsUq}", MP_UNITS_STD_FMT::make_format_args(q)),
       MP_UNITS_STD_FMT::format_error,
       Catch::Matchers::Message("only one of 'sd' unit modifiers may be used in the format spec"));
   }
@@ -537,7 +543,9 @@ TEST_CASE("more then one modifier of the same kind should throw", "[text][fmt][e
 
 TEST_CASE("half_high_dot separator requested for ASCII encoding should throw", "[text][fmt][exception]")
 {
-  REQUIRE_THROWS_MATCHES(MP_UNITS_STD_FMT::vformat("{:%dAaq}", MP_UNITS_STD_FMT::make_format_args(1 * isq::length[m])),
+  auto q = 1 * isq::length[m];
+
+  REQUIRE_THROWS_MATCHES(MP_UNITS_STD_FMT::vformat("{:%dAaq}", MP_UNITS_STD_FMT::make_format_args(q)),
                          MP_UNITS_STD_FMT::format_error,
                          Catch::Matchers::Message("half_high_dot unit separator allowed only for Unicode encoding"));
 }
@@ -692,17 +700,19 @@ TEST_CASE("precision specification", "[text][fmt]")
 
 TEST_CASE("precision specification for integral representation should throw", "[text][fmt][exception]")
 {
+  auto q = 1 * isq::length[m];
+
   SECTION("full format {:%Q %q} on a quantity")
   {
     REQUIRE_THROWS_MATCHES(
-      MP_UNITS_STD_FMT::vformat("{:%.1Q %q}", MP_UNITS_STD_FMT::make_format_args(1 * isq::length[m])),
+      MP_UNITS_STD_FMT::vformat("{:%.1Q %q}", MP_UNITS_STD_FMT::make_format_args(q)),
       MP_UNITS_STD_FMT::format_error,
       Catch::Matchers::Message("precision not allowed for integral quantity representation"));
   }
 
   SECTION("value only format {:%Q} on a quantity")
   {
-    REQUIRE_THROWS_MATCHES(MP_UNITS_STD_FMT::vformat("{:%.1Q}", MP_UNITS_STD_FMT::make_format_args(1 * isq::length[m])),
+    REQUIRE_THROWS_MATCHES(MP_UNITS_STD_FMT::vformat("{:%.1Q}", MP_UNITS_STD_FMT::make_format_args(q)),
                            MP_UNITS_STD_FMT::format_error,
                            Catch::Matchers::Message("precision not allowed for integral quantity representation"));
   }