From 6bc54819f3e979608273ac01ccf07147481a81e0 Mon Sep 17 00:00:00 2001
From: Mateusz Pusz <mateusz.pusz@gmail.com>
Date: Thu, 15 Sep 2022 11:49:37 -0600
Subject: [PATCH] fix: :boom: `standard_gravity` removed from `si2019`
 namespace as it is not an SI defining constant

---
 example/aliases/box_example.cpp               |  2 +-
 example/literals/box_example.cpp              |  2 +-
 example/references/box_example.cpp            |  2 +-
 .../si/include/units/isq/si/constants.h       | 21 ++++++++++++-------
 4 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/example/aliases/box_example.cpp b/example/aliases/box_example.cpp
index 048cdb46..2563de4b 100644
--- a/example/aliases/box_example.cpp
+++ b/example/aliases/box_example.cpp
@@ -40,7 +40,7 @@ namespace {
 
 using namespace units::aliases::isq::si;
 
-inline constexpr auto g = units::isq::si::si2019::standard_gravity<>;  // NOLINT(readability-identifier-length)
+inline constexpr auto g = units::isq::si::standard_gravity<>;  // NOLINT(readability-identifier-length)
 inline constexpr auto air_density = kg_per_m3<>(1.225);
 
 class Box {
diff --git a/example/literals/box_example.cpp b/example/literals/box_example.cpp
index 7716d787..7069cfcf 100644
--- a/example/literals/box_example.cpp
+++ b/example/literals/box_example.cpp
@@ -47,7 +47,7 @@ using kg = si::kilogram;
 using N = si::newton;
 using kgpm3 = si::kilogram_per_metre_cub;
 
-inline constexpr auto g = si::si2019::standard_gravity<>;
+inline constexpr auto g = si::standard_gravity<>;
 inline constexpr si::density<kgpm3> air_density(1.225);
 
 
diff --git a/example/references/box_example.cpp b/example/references/box_example.cpp
index b94c34d2..36d77932 100644
--- a/example/references/box_example.cpp
+++ b/example/references/box_example.cpp
@@ -42,7 +42,7 @@ using namespace units::isq;
 using namespace si::mass_references;
 using namespace si::volume_references;
 
-inline constexpr Acceleration auto g = si::si2019::standard_gravity<>;
+inline constexpr Acceleration auto g = si::standard_gravity<>;
 inline constexpr Density auto air_density = 1.225 * (kg / m3);
 
 class Box {
diff --git a/src/systems/si/include/units/isq/si/constants.h b/src/systems/si/include/units/isq/si/constants.h
index 74209888..217f0416 100644
--- a/src/systems/si/include/units/isq/si/constants.h
+++ b/src/systems/si/include/units/isq/si/constants.h
@@ -32,7 +32,16 @@
 #include <units/isq/si/speed.h>
 #include <units/isq/si/thermodynamic_temperature.h>
 
-namespace units::isq::si::si2019 {
+namespace units::isq::si {
+
+namespace si2019 {
+
+// defining constants
+template<Representation Rep = double>
+inline constexpr auto hyperfine_structure_transition_frequency = frequency<hertz, Rep>(Rep{9'192'631'770});
+
+template<Representation Rep = double>
+inline constexpr auto speed_of_light = speed<metre_per_second, Rep>(299'792'458);
 
 template<Representation Rep = double>
 inline constexpr auto planck_constant = energy<joule, Rep>(6.62607015e-34) * time<second, Rep>(1);
@@ -46,16 +55,12 @@ inline constexpr auto boltzmann_constant = energy<joule, Rep>(1.380649e-23) / th
 template<Representation Rep = double>
 inline constexpr auto avogadro_constant = Rep(6.02214076e23) / amount_of_substance<mole, Rep>(1);
 
-template<Representation Rep = double>
-inline constexpr auto speed_of_light = speed<metre_per_second, Rep>(299'792'458);
-
-template<Representation Rep = double>
-inline constexpr auto hyperfine_structure_transition_frequency = frequency<hertz, Rep>(Rep{9'192'631'770});
-
 template<Representation Rep = double>
 inline constexpr auto luminous_efficacy = luminous_flux<lumen, Rep>(683) / power<watt, Rep>(1);
 
+}  // namespace si2019
+
 template<Representation Rep = double>
 inline constexpr auto standard_gravity = acceleration<metre_per_second_sq, Rep>(9.80665);
 
-}  // namespace units::isq::si::si2019
+}  // namespace units::isq::si