feedc0de/mp-units
1
0
Fork 0
forked from mpusz/mp-units
Code Pull Requests Activity

refactor: short units inlined subnamespaces introduced to limit possible name clashes

Browse Source
This commit is contained in:
Mateusz Pusz
2022-09-09 11:50:47 +02:00
parent 1a2c215578
commit 1c7ea89771
1 changed files with 20 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
example/v2_framework.cpp
View File

@@ -122,28 +122,27 @@ inline constexpr struct watt : named_unit<"W", joule / second> {
namespace short_units { namespace short_units {
// TODO collide with reference names inline namespace length_units {
// inline namespace length {
inline constexpr auto m = metre; inline constexpr auto m = metre;
inline constexpr auto km = kilometre; inline constexpr auto km = kilometre;
inline constexpr auto au = astronomical_unit; inline constexpr auto au = astronomical_unit;
// } // namespace length } // namespace length_units
// inline namespace area { inline namespace area_units {
inline constexpr auto m2 = square_metre; inline constexpr auto m2 = square_metre;
// } }
// inline namespace volume { inline namespace volume_units {
inline constexpr auto m3 = cubic_metre; inline constexpr auto m3 = cubic_metre;
// } }
// inline namespace time { inline namespace time_units {
inline constexpr auto s = second; inline constexpr auto s = second;
inline constexpr auto min = minute; inline constexpr auto min = minute;
@@ -152,45 +151,45 @@ inline constexpr auto d = day;
inline constexpr auto s2 = second_squared; inline constexpr auto s2 = second_squared;
// } // namespace time } // namespace time_units
// inline namespace mass { inline namespace mass_units {
inline constexpr auto g = gram; inline constexpr auto g = gram;
inline constexpr auto kg = kilogram; inline constexpr auto kg = kilogram;
inline constexpr auto t = tonne; inline constexpr auto t = tonne;
// } // namespace mass } // namespace mass_units
// inline namespace frequency { inline namespace frequency_units {
inline constexpr auto Hz = hertz; inline constexpr auto Hz = hertz;
// } }
// inline namespace force { inline namespace force_units {
inline constexpr auto N = newton; inline constexpr auto N = newton;
// } }
// inline namespace pressure { inline namespace pressure_units {
inline constexpr auto Pa = pascal; inline constexpr auto Pa = pascal;
// } }
// inline namespace energy { inline namespace energy_units {
inline constexpr auto J = joule; inline constexpr auto J = joule;
// } }
// inline namespace power { inline namespace power_units {
inline constexpr auto W = watt; inline constexpr auto W = watt;
// } }
} // namespace short_units } // namespace short_units