diff --git a/example/aliases/foot_pound_second.cpp b/example/aliases/foot_pound_second.cpp index 12b1082d..8890a92f 100644 --- a/example/aliases/foot_pound_second.cpp +++ b/example/aliases/foot_pound_second.cpp @@ -26,6 +26,7 @@ #include #include #include +#include #include #include #include @@ -68,7 +69,7 @@ void print_details(std::string_view description, const Ship& ship) << STD_FMT::format("{:20} : {}\n", "beam", fmt_line, si::length::m<>>(ship.beam)) << STD_FMT::format("{:20} : {}\n", "mass", fmt_line, si::mass::t<>>(ship.mass)) << STD_FMT::format("{:20} : {}\n", "speed", - fmt_line, si::speed::km_per_h<>>(ship.speed)) + fmt_line, si::speed::km_per_h<>>(ship.speed)) << STD_FMT::format("{:20} : {}\n", "power", fmt_line, si::power::kW<>>(ship.power)) << STD_FMT::format("{:20} : {}\n", "main guns", fmt_line, si::length::mm<>>(ship.mainGuns)) @@ -101,7 +102,7 @@ int main() auto iowa = Ship{.length{ft<>(860.)}, .draft{ft<>(37.) + in<>(2.)}, .beam{ft<>(108.) + in<>(2.)}, - .speed{kn<>(33)}, + .speed{international::kn<>(33)}, .mass{lton<>(57'540)}, .mainGuns{in<>(16)}, .shellMass{lb<>(2700)}, @@ -112,7 +113,7 @@ int main() auto kgv = Ship{.length{ft<>(745.1)}, .draft{ft<>(33.) + in<>(7.5)}, .beam{ft<>(103.2) + in<>(2.5)}, - .speed{kn<>(28.3)}, + .speed{international::kn<>(28.3)}, .mass{lton<>(42'245)}, .mainGuns{in<>(14)}, .shellMass{lb<>(1'590)}, diff --git a/example/literals/foot_pound_second.cpp b/example/literals/foot_pound_second.cpp index 67d1d296..01f8d285 100644 --- a/example/literals/foot_pound_second.cpp +++ b/example/literals/foot_pound_second.cpp @@ -26,6 +26,7 @@ #include #include #include +#include #include #include #include @@ -73,8 +74,9 @@ void print_details(std::string_view description, const Ship& ship) fmt_line, si::length>(ship.beam)) << STD_FMT::format("{:20} : {}\n", "mass", fmt_line, si::mass>(ship.mass)) - << STD_FMT::format("{:20} : {}\n", "speed", - fmt_line, si::speed>(ship.speed)) + << STD_FMT::format( + "{:20} : {}\n", "speed", + fmt_line, si::speed>(ship.speed)) << STD_FMT::format("{:20} : {}\n", "power", fmt_line, si::power>(ship.power)) << STD_FMT::format("{:20} : {}\n", "main guns", @@ -108,7 +110,7 @@ int main() auto iowa = Ship{.length{860._q_ft}, .draft{37._q_ft + 2._q_in}, .beam{108._q_ft + 2._q_in}, - .speed{33_q_kn}, + .speed{si::speed{33}}, .mass{57'540_q_lton}, .mainGuns{16_q_in}, .shellMass{2700_q_lb}, @@ -119,7 +121,7 @@ int main() auto kgv = Ship{.length{745.1_q_ft}, .draft{33._q_ft + 7.5_q_in}, .beam{103.2_q_ft + 2.5_q_in}, - .speed{28.3_q_kn}, + .speed{si::speed{28.3}}, .mass{42'245_q_lton}, .mainGuns{14_q_in}, .shellMass{1'590_q_lb}, diff --git a/example/references/foot_pound_second.cpp b/example/references/foot_pound_second.cpp index ca1f5447..0833fa6b 100644 --- a/example/references/foot_pound_second.cpp +++ b/example/references/foot_pound_second.cpp @@ -28,6 +28,7 @@ #include #include #include +#include #include #include #include @@ -76,8 +77,9 @@ void print_details(std::string_view description, const Ship& ship) fmt_line, si::length>(ship.beam)) << STD_FMT::format("{:20} : {}\n", "mass", fmt_line, si::mass>(ship.mass)) - << STD_FMT::format("{:20} : {}\n", "speed", - fmt_line, si::speed>(ship.speed)) + << STD_FMT::format( + "{:20} : {}\n", "speed", + fmt_line, si::speed>(ship.speed)) << STD_FMT::format("{:20} : {}\n", "power", fmt_line, si::power>(ship.power)) << STD_FMT::format("{:20} : {}\n", "main guns", @@ -112,7 +114,7 @@ int main() auto iowa = Ship{.length{860. * ft}, .draft{37. * ft + 2. * in}, .beam{108. * ft + 2. * in}, - .speed{33 * kn}, + .speed{33 * units::isq::si::international::references::kn}, .mass{57'540 * lton}, .mainGuns{16 * in}, .shellMass{2700 * lb}, @@ -123,7 +125,7 @@ int main() auto kgv = Ship{.length{745.1 * ft}, .draft{33. * ft + 7.5 * in}, .beam{103.2 * ft + 2.5 * in}, - .speed{28.3 * kn}, + .speed{28.3 * units::isq::si::international::references::kn}, .mass{42'245 * lton}, .mainGuns{14 * in}, .shellMass{1'590 * lb},