From a0c625256719ec04b1be948bccb57c776774c7ef Mon Sep 17 00:00:00 2001 From: Mateusz Pusz Date: Tue, 19 Apr 2022 18:45:13 +0200 Subject: [PATCH] refactor: `mi(naut)` renamed to `nmi` Relates to #357 --- src/systems/si-fps/include/units/isq/si/fps/length.h | 2 +- .../include/units/isq/si/international/length.h | 2 +- test/unit_test/runtime/fmt_units_test.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/systems/si-fps/include/units/isq/si/fps/length.h b/src/systems/si-fps/include/units/isq/si/fps/length.h index c037afe1..a4307180 100644 --- a/src/systems/si-fps/include/units/isq/si/fps/length.h +++ b/src/systems/si-fps/include/units/isq/si/fps/length.h @@ -52,7 +52,7 @@ struct kiloyard : prefixed_unit {}; struct mile : named_scaled_unit {}; -struct nautical_mile : named_scaled_unit {}; +struct nautical_mile : named_scaled_unit {}; struct dim_length : isq::dim_length {}; diff --git a/src/systems/si-international/include/units/isq/si/international/length.h b/src/systems/si-international/include/units/isq/si/international/length.h index 38b7eac3..e37944a0 100644 --- a/src/systems/si-international/include/units/isq/si/international/length.h +++ b/src/systems/si-international/include/units/isq/si/international/length.h @@ -56,7 +56,7 @@ struct mile : named_scaled_unit {}; +struct nautical_mile : named_scaled_unit {}; // thou // https://en.wikipedia.org/wiki/Thousandth_of_an_inch diff --git a/test/unit_test/runtime/fmt_units_test.cpp b/test/unit_test/runtime/fmt_units_test.cpp index c94c3734..8414e5a0 100644 --- a/test/unit_test/runtime/fmt_units_test.cpp +++ b/test/unit_test/runtime/fmt_units_test.cpp @@ -65,7 +65,7 @@ TEST_CASE("std::format on synthesized unit symbols", "[text][fmt]") CHECK(STD_FMT::format("{}", 1_q_fathom_us) == "1 fathom(us)"); CHECK(STD_FMT::format("{}", 1_q_mi) == "1 mi"); CHECK(STD_FMT::format("{}", 1_q_mi_us) == "1 mi(us)"); - CHECK(STD_FMT::format("{}", 1_q_naut_mi) == "1 mi(naut)"); + CHECK(STD_FMT::format("{}", 1_q_naut_mi) == "1 nmi"); CHECK(STD_FMT::format("{}", 1_q_ch) == "1 ch"); CHECK(STD_FMT::format("{}", 1_q_rd) == "1 rd"); CHECK(STD_FMT::format("{}", 1_q_thou) == "1 thou");