From c93136e81b12909463d1810bdff962c08a2f2889 Mon Sep 17 00:00:00 2001 From: Andy Little Date: Fri, 10 Jan 2020 16:21:49 +0000 Subject: [PATCH] physical/si/density : change UDL from kg_per_m3 to kgpm3 (and then fix example/box_example) --- example/box_example.cpp | 14 +++++++------- src/include/units/physical/si/density.h | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/example/box_example.cpp b/example/box_example.cpp index 880409dd..ed2820ed 100644 --- a/example/box_example.cpp +++ b/example/box_example.cpp @@ -23,10 +23,10 @@ namespace{ namespace acceleration{ template - using m_per_s2 = units::si::acceleration; + using mps2 = units::si::acceleration; template - constexpr m_per_s2<> g{static_cast(9.80665)}; + constexpr mps2<> g{static_cast(9.80665)}; } namespace force{ @@ -44,7 +44,7 @@ namespace{ namespace density { template - using kg_per_m3 = units::si::density; + using kgpm3 = units::si::density; } namespace volume { @@ -82,16 +82,16 @@ struct Box{ struct contents{ contents():density{air_density}{} - density::kg_per_m3<> density; + density::kgpm3<> density; }contents; - void set_contents_density(density::kg_per_m3<> const & density_in) + void set_contents_density(density::kgpm3<> const & density_in) { assert( density_in > air_density ); contents.density = density_in; } - static constexpr density::kg_per_m3<> air_density{1.225}; + static constexpr density::kgpm3<> air_density{1.225}; length::m<> length; length::m<> width; @@ -104,7 +104,7 @@ using namespace units::si::literals; int main() { auto box = Box{1000.0mm, 500.0mm, 200.0mm}; - box.set_contents_density(1000.0kg_per_m3); + box.set_contents_density(1000.0kgpm3); auto fill_time = 200.0s; // time since starting fill auto measured_mass = 20.0kg; // measured mass at fill_time diff --git a/src/include/units/physical/si/density.h b/src/include/units/physical/si/density.h index c87172de..d82aada4 100644 --- a/src/include/units/physical/si/density.h +++ b/src/include/units/physical/si/density.h @@ -39,8 +39,8 @@ using density = quantity; inline namespace literals { -constexpr auto operator"" kg_per_m3(unsigned long long l) { return density(l); } -constexpr auto operator"" kg_per_m3(long double l) { return density(l); } +constexpr auto operator"" kgpm3(unsigned long long l) { return density(l); } +constexpr auto operator"" kgpm3(long double l) { return density(l); } } // namespace literals