feat: std::format support for compliant compilers added

example/references/box_example.cpp

@@ -101,9 +101,9 @@ int main()
   const Time auto fill_time_left = (height / fill_level - 1) * fill_time;
 
   std::cout << "mp-units box example...\n";
-  std::cout << fmt::format("fill height at {} = {} ({} full)\n", fill_time, fill_level, fill_percent);
-  std::cout << fmt::format("spare_capacity at {} = {}\n", fill_time, spare_capacity);
-  std::cout << fmt::format("input flow rate after {} = {}\n", fill_time, input_flow_rate);
-  std::cout << fmt::format("float rise rate = {}\n", float_rise_rate);
-  std::cout << fmt::format("box full E.T.A. at current flow rate = {}\n", fill_time_left);
+  std::cout << STD_FMT::format("fill height at {} = {} ({} full)\n", fill_time, fill_level, fill_percent);
+  std::cout << STD_FMT::format("spare_capacity at {} = {}\n", fill_time, spare_capacity);
+  std::cout << STD_FMT::format("input flow rate after {} = {}\n", fill_time, input_flow_rate);
+  std::cout << STD_FMT::format("float rise rate = {}\n", float_rise_rate);
+  std::cout << STD_FMT::format("box full E.T.A. at current flow rate = {}\n", fill_time_left);
 }

example/references/clcpp_response.cpp

@@ -123,7 +123,7 @@ void calcs_comparison()
   const length<femtometre, float> L1A = 2.f * fm;
   const length<femtometre, float> L2A = 3.f * fm;
   const length<femtometre, float> LrA = L1A + L2A;
-  fmt::print("{:%.30Q %q}\n + {:%.30Q %q}\n   = {:%.30Q %q}\n\n", L1A, L2A, LrA);
+  std::cout << STD_FMT::format("{:%.30Q %q}\n + {:%.30Q %q}\n   = {:%.30Q %q}\n\n", L1A, L2A, LrA);
 
   std::cout << "The single unit method must convert large\n"
                "or small values in other units to the base unit.\n"
@@ -132,17 +132,17 @@ void calcs_comparison()
   const length<metre, float> L1B = L1A;
   const length<metre, float> L2B = L2A;
   const length<metre, float> LrB = L1B + L2B;
-  fmt::print("{:%.30Q %q}\n + {:%.30Q %q}\n   = {:%.30Q %q}\n\n", L1B, L2B, LrB);
+  std::cout << STD_FMT::format("{:%.30Q %q}\n + {:%.30Q %q}\n   = {:%.30Q %q}\n\n", L1B, L2B, LrB);
 
   std::cout << "In multiplication and division:\n\n";
 
   const area<square_femtometre, float> ArA = L1A * L2A;
-  fmt::print("{:%.30Q %q}\n * {:%.30Q %q}\n   = {:%.30Q %q}\n\n", L1A, L2A, ArA);
+  std::cout << STD_FMT::format("{:%.30Q %q}\n * {:%.30Q %q}\n   = {:%.30Q %q}\n\n", L1A, L2A, ArA);
 
   std::cout << "similar problems arise\n\n";
 
   const area<square_metre, float> ArB = L1B * L2B;
-  fmt::print("{:%.30Q %q}\n * {:%.30Q %q}\n   = {:%.30Q %q}\n\n", L1B, L2B, ArB);
+  std::cout << STD_FMT::format("{:%.30Q %q}\n * {:%.30Q %q}\n   = {:%.30Q %q}\n\n", L1B, L2B, ArB);
 }
 
 }  // namespace

example/references/foot_pound_second.cpp

@@ -59,7 +59,7 @@ struct Ship {
 template<class ...Args, units::Quantity Q>
 auto fmt_line(const Q a)
 {
-  return fmt::format("{:22}", a) + (fmt::format(",{:20}", units::quantity_cast<Args>(a)) + ...);
+  return STD_FMT::format("{:22}", a) + (STD_FMT::format(",{:20}", units::quantity_cast<Args>(a)) + ...);
 }
 
 // Print the ship details in the units as defined in the Ship struct, in other si::imperial units, and in SI
@@ -67,17 +67,17 @@ void print_details(std::string_view description, const Ship& ship)
 {
   using namespace units::isq::si::fps::references;
   const auto waterDensity = 62.4 * (lb / ft3);
-  std::cout << fmt::format("{}\n", description);
-  std::cout << fmt::format("{:20} : {}\n", "length",               fmt_line<si::fps::length<si::fps::yard>, si::length<si::metre>>(ship.length))
-            << fmt::format("{:20} : {}\n", "draft",                fmt_line<si::fps::length<si::fps::yard>, si::length<si::metre>>(ship.draft))
-            << fmt::format("{:20} : {}\n", "beam",                 fmt_line<si::fps::length<si::fps::yard>, si::length<si::metre>>(ship.beam))
-            << fmt::format("{:20} : {}\n", "mass",                 fmt_line<si::fps::mass<si::fps::long_ton>, si::mass<si::tonne>>(ship.mass))
-            << fmt::format("{:20} : {}\n", "speed",                fmt_line<si::fps::speed<si::fps::knot>, si::speed<si::kilometre_per_hour>>(ship.speed))
-            << fmt::format("{:20} : {}\n", "power",                fmt_line<si::fps::power<si::fps::horse_power>, si::power<si::kilowatt>>(ship.power))
-            << fmt::format("{:20} : {}\n", "main guns",            fmt_line<si::fps::length<si::fps::inch>, si::length<si::millimetre>>(ship.mainGuns))
-            << fmt::format("{:20} : {}\n", "fire shells weighing", fmt_line<si::fps::mass<si::fps::long_ton>, si::mass<si::kilogram>>(ship.shellMass))
-            << fmt::format("{:20} : {}\n", "fire shells at",       fmt_line<si::fps::speed<si::fps::mile_per_hour>, si::speed<si::kilometre_per_hour>>(ship.shellSpeed))
-            << fmt::format("{:20} : {}\n", "volume underwater",    fmt_line<si::volume<si::cubic_metre>, si::volume<si::litre>>(ship.mass / waterDensity));
+  std::cout << STD_FMT::format("{}\n", description);
+  std::cout << STD_FMT::format("{:20} : {}\n", "length",               fmt_line<si::fps::length<si::fps::yard>, si::length<si::metre>>(ship.length))
+            << STD_FMT::format("{:20} : {}\n", "draft",                fmt_line<si::fps::length<si::fps::yard>, si::length<si::metre>>(ship.draft))
+            << STD_FMT::format("{:20} : {}\n", "beam",                 fmt_line<si::fps::length<si::fps::yard>, si::length<si::metre>>(ship.beam))
+            << STD_FMT::format("{:20} : {}\n", "mass",                 fmt_line<si::fps::mass<si::fps::long_ton>, si::mass<si::tonne>>(ship.mass))
+            << STD_FMT::format("{:20} : {}\n", "speed",                fmt_line<si::fps::speed<si::fps::knot>, si::speed<si::kilometre_per_hour>>(ship.speed))
+            << STD_FMT::format("{:20} : {}\n", "power",                fmt_line<si::fps::power<si::fps::horse_power>, si::power<si::kilowatt>>(ship.power))
+            << STD_FMT::format("{:20} : {}\n", "main guns",            fmt_line<si::fps::length<si::fps::inch>, si::length<si::millimetre>>(ship.mainGuns))
+            << STD_FMT::format("{:20} : {}\n", "fire shells weighing", fmt_line<si::fps::mass<si::fps::long_ton>, si::mass<si::kilogram>>(ship.shellMass))
+            << STD_FMT::format("{:20} : {}\n", "fire shells at",       fmt_line<si::fps::speed<si::fps::mile_per_hour>, si::speed<si::kilometre_per_hour>>(ship.shellSpeed))
+            << STD_FMT::format("{:20} : {}\n", "volume underwater",    fmt_line<si::volume<si::cubic_metre>, si::volume<si::litre>>(ship.mass / waterDensity));
 }
 
 int main()

example/references/glide_computer_example.cpp

@@ -21,16 +21,11 @@
 // SOFTWARE.
 
 #include "glide_computer.h"
-#include <units/bits/external/hacks.h>
+#include <units/bits/fmt_hacks.h>
 #include <units/chrono.h>
 #include <units/generic/dimensionless.h>
 #include <units/isq/si/international/length.h>
 
-UNITS_DIAGNOSTIC_PUSH
-UNITS_DIAGNOSTIC_IGNORE_UNREACHABLE
-#include <fmt/format.h>
-UNITS_DIAGNOSTIC_POP
-
 #include <array>
 #include <exception>
 #include <iostream>
@@ -90,7 +85,7 @@ void print(const R& gliders)
     std::cout << "- Name: " << g.name << "\n";
     std::cout << "- Polar:\n";
     for (const auto& p : g.polar)
-      fmt::print("  * {:%.4Q %q} @ {:%.1Q %q} -> {:%.1Q %q}\n", p.climb, p.v, units::quantity_cast<units::one>(glide_ratio(g.polar[0])));
+      std::cout << STD_FMT::format("  * {:%.4Q %q} @ {:%.1Q %q} -> {:%.1Q %q}\n", p.climb, p.v, units::quantity_cast<units::one>(glide_ratio(g.polar[0])));
     std::cout << "\n";
   }
 }
@@ -104,8 +99,8 @@ void print(const R& conditions)
   for (const auto& c : conditions) {
     std::cout << "- " << c.first << "\n";
     const auto& w = c.second;
-    std::cout << "  * Cloud base:        " << fmt::format("{:%.0Q %q}", w.cloud_base) << " AGL\n";
-    std::cout << "  * Thermals strength: " << fmt::format("{:%.1Q %q}", w.thermal_strength) << "\n";
+    std::cout << "  * Cloud base:        " << STD_FMT::format("{:%.0Q %q}", w.cloud_base) << " AGL\n";
+    std::cout << "  * Thermals strength: " << STD_FMT::format("{:%.1Q %q}", w.thermal_strength) << "\n";
     std::cout << "\n";
   }
 }
@@ -117,7 +112,7 @@ void print(const R& waypoints)
   std::cout << "Waypoints:\n";
   std::cout << "==========\n";
   for (const auto& w : waypoints)
-    std::cout << fmt::format("- {}: {} {}, {:%.1Q %q}\n", w.name, w.pos.lat, w.pos.lon, w.alt);
+    std::cout << STD_FMT::format("- {}: {} {}, {:%.1Q %q}\n", w.name, w.pos.lat, w.pos.lon, w.alt);
   std::cout << "\n";
 }
 
@@ -128,11 +123,11 @@ void print(const task& t)
 
   std::cout << "- Start: " << t.get_start().name << "\n";
   std::cout << "- Finish: " << t.get_finish().name << "\n";
-  std::cout << "- Length:  " << fmt::format("{:%.1Q %q}", t.get_length()) << "\n";
+  std::cout << "- Length:  " << STD_FMT::format("{:%.1Q %q}", t.get_length()) << "\n";
 
   std::cout << "- Legs: " << "\n";
   for (const auto& l : t.get_legs())
-    std::cout << fmt::format("  * {} -> {} ({:%.1Q %q})\n", l.begin().name, l.end().name, l.get_length());
+    std::cout << STD_FMT::format("  * {} -> {} ({:%.1Q %q})\n", l.begin().name, l.end().name, l.get_length());
   std::cout << "\n";
 }
 
@@ -140,7 +135,7 @@ void print(const safety& s)
 {
   std::cout << "Safety:\n";
   std::cout << "=======\n";
-  std::cout << "- Min AGL separation: " << fmt::format("{:%.0Q %q}", s.min_agl_height) << "\n";
+  std::cout << "- Min AGL separation: " << STD_FMT::format("{:%.0Q %q}", s.min_agl_height) << "\n";
   std::cout << "\n";
 }
 
@@ -149,8 +144,8 @@ void print(const aircraft_tow& tow)
   std::cout << "Tow:\n";
   std::cout << "====\n";
   std::cout << "- Type:        aircraft\n";
-  std::cout << "- Height:      " << fmt::format("{:%.0Q %q}", tow.height_agl) << "\n";
-  std::cout << "- Performance: " << fmt::format("{:%.1Q %q}", tow.performance) << "\n";
+  std::cout << "- Height:      " << STD_FMT::format("{:%.0Q %q}", tow.height_agl) << "\n";
+  std::cout << "- Performance: " << STD_FMT::format("{:%.1Q %q}", tow.performance) << "\n";
   std::cout << "\n";
 }
 
@@ -179,7 +174,7 @@ void example()
     for (const auto& c : weather_conditions) {
       std::string txt = "Scenario: Glider = " + g.name + ", Weather = " + c.first;
       std::cout << txt << "\n";
-      fmt::print("{0:=^{1}}\n\n", "", txt.size());
+      std::cout << STD_FMT::format("{0:=^{1}}\n\n", "", txt.size());
 
       estimate(start_time, g, c.second, t, sfty, tow);
 

example/references/linear_algebra.cpp

@@ -36,7 +36,7 @@ std::ostream& operator<<(std::ostream& os, const vector<ET, OT>& v)
 {
   os << "|";
   for (auto i = 0U; i < v.size(); ++i) {
-    os << fmt::format(" {:>9}", v(i));
+    os << STD_FMT::format(" {:>9}", v(i));
   }
   os << " |";
   return os;
@@ -48,7 +48,7 @@ std::ostream& operator<<(std::ostream& os, const matrix<ET, OT>& v)
   for (auto i = 0U; i < v.rows(); ++i) {
     os << "|";
     for (auto j = 0U; j < v.columns(); ++j) {
-      os << fmt::format(" {:>9}", v(i, j));
+      os << STD_FMT::format(" {:>9}", v(i, j));
     }
     os << (i != v.rows() - 1U ? " |\n" : " |");
   }