From 7d70e6b1ce633b94cd5ac689ac0796c5764c00f9 Mon Sep 17 00:00:00 2001 From: Mateusz Pusz Date: Tue, 6 Aug 2019 10:44:25 +0200 Subject: [PATCH] Predefined dimensions moved to a dedicated directory --- README.md | 1 + example/example.cpp | 2 +- .../units/{ => dimensions}/acceleration.h | 2 +- src/include/units/{ => dimensions}/area.h | 2 +- .../units/{ => dimensions}/capacitance.h | 4 +- src/include/units/{ => dimensions}/current.h | 0 .../units/{ => dimensions}/electric_charge.h | 4 +- src/include/units/{ => dimensions}/energy.h | 4 +- src/include/units/{ => dimensions}/force.h | 6 +-- .../units/{ => dimensions}/frequency.h | 2 +- src/include/units/{ => dimensions}/length.h | 0 .../{ => dimensions}/luminous_intensity.h | 0 src/include/units/{ => dimensions}/mass.h | 0 src/include/units/{ => dimensions}/power.h | 2 +- src/include/units/{ => dimensions}/pressure.h | 2 +- .../units/{ => dimensions}/substance.h | 0 .../units/{ => dimensions}/temperature.h | 0 src/include/units/{ => dimensions}/time.h | 0 src/include/units/{ => dimensions}/velocity.h | 4 +- src/include/units/{ => dimensions}/voltage.h | 8 ++-- src/include/units/{ => dimensions}/volume.h | 2 +- test/unit_test/test_quantity.cpp | 4 +- test/unit_test/test_units.cpp | 38 +++++++++---------- test_package/test_package.cpp | 2 +- 24 files changed, 45 insertions(+), 44 deletions(-) rename src/include/units/{ => dimensions}/acceleration.h (98%) rename src/include/units/{ => dimensions}/area.h (98%) rename src/include/units/{ => dimensions}/capacitance.h (96%) rename src/include/units/{ => dimensions}/current.h (100%) rename src/include/units/{ => dimensions}/electric_charge.h (96%) rename src/include/units/{ => dimensions}/energy.h (96%) rename src/include/units/{ => dimensions}/force.h (95%) rename src/include/units/{ => dimensions}/frequency.h (99%) rename src/include/units/{ => dimensions}/length.h (100%) rename src/include/units/{ => dimensions}/luminous_intensity.h (100%) rename src/include/units/{ => dimensions}/mass.h (100%) rename src/include/units/{ => dimensions}/power.h (98%) rename src/include/units/{ => dimensions}/pressure.h (98%) rename src/include/units/{ => dimensions}/substance.h (100%) rename src/include/units/{ => dimensions}/temperature.h (100%) rename src/include/units/{ => dimensions}/time.h (100%) rename src/include/units/{ => dimensions}/velocity.h (97%) rename src/include/units/{ => dimensions}/voltage.h (92%) rename src/include/units/{ => dimensions}/volume.h (98%) diff --git a/README.md b/README.md index 58aa9089..6fa87fc1 100644 --- a/README.md +++ b/README.md @@ -65,6 +65,7 @@ NOTE: This library as of now compiles correctly only with gcc-9.1 and newer. - Added a few more derived dimensions - `meter` renamed to `metre` - Missing `operator*` added + - Predefined dimensions moved to a dedicated directory - 0.2.0 July 18, 2019 - Added C++20 features supported by gcc-9.1 (std::remove_cvref_t, down with typename, std::type_identity) diff --git a/example/example.cpp b/example/example.cpp index a222eb02..ef262987 100644 --- a/example/example.cpp +++ b/example/example.cpp @@ -20,7 +20,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#include +#include #include namespace { diff --git a/src/include/units/acceleration.h b/src/include/units/dimensions/acceleration.h similarity index 98% rename from src/include/units/acceleration.h rename to src/include/units/dimensions/acceleration.h index ea3e06c1..d3c43e58 100644 --- a/src/include/units/acceleration.h +++ b/src/include/units/dimensions/acceleration.h @@ -22,7 +22,7 @@ #pragma once -#include +#include namespace std::experimental::units { diff --git a/src/include/units/area.h b/src/include/units/dimensions/area.h similarity index 98% rename from src/include/units/area.h rename to src/include/units/dimensions/area.h index 19ddab67..5245f13c 100644 --- a/src/include/units/area.h +++ b/src/include/units/dimensions/area.h @@ -22,7 +22,7 @@ #pragma once -#include +#include namespace std::experimental::units { diff --git a/src/include/units/capacitance.h b/src/include/units/dimensions/capacitance.h similarity index 96% rename from src/include/units/capacitance.h rename to src/include/units/dimensions/capacitance.h index a0e738e3..db3b3b00 100644 --- a/src/include/units/capacitance.h +++ b/src/include/units/dimensions/capacitance.h @@ -23,8 +23,8 @@ #pragma once #include -#include -#include +#include +#include namespace std::experimental::units { diff --git a/src/include/units/current.h b/src/include/units/dimensions/current.h similarity index 100% rename from src/include/units/current.h rename to src/include/units/dimensions/current.h diff --git a/src/include/units/electric_charge.h b/src/include/units/dimensions/electric_charge.h similarity index 96% rename from src/include/units/electric_charge.h rename to src/include/units/dimensions/electric_charge.h index dead8689..1f84ac79 100644 --- a/src/include/units/electric_charge.h +++ b/src/include/units/dimensions/electric_charge.h @@ -23,8 +23,8 @@ #pragma once #include -#include -#include +#include +#include namespace std::experimental::units { diff --git a/src/include/units/energy.h b/src/include/units/dimensions/energy.h similarity index 96% rename from src/include/units/energy.h rename to src/include/units/dimensions/energy.h index 4d0a3c9b..89114dc7 100644 --- a/src/include/units/energy.h +++ b/src/include/units/dimensions/energy.h @@ -23,8 +23,8 @@ #pragma once #include -#include -#include +#include +#include namespace std::experimental::units { diff --git a/src/include/units/force.h b/src/include/units/dimensions/force.h similarity index 95% rename from src/include/units/force.h rename to src/include/units/dimensions/force.h index d594c054..a0162efd 100644 --- a/src/include/units/force.h +++ b/src/include/units/dimensions/force.h @@ -23,9 +23,9 @@ #pragma once #include -#include -#include -#include +#include +#include +#include namespace std::experimental::units { diff --git a/src/include/units/frequency.h b/src/include/units/dimensions/frequency.h similarity index 99% rename from src/include/units/frequency.h rename to src/include/units/dimensions/frequency.h index d6bc837c..cfcad63d 100644 --- a/src/include/units/frequency.h +++ b/src/include/units/dimensions/frequency.h @@ -23,7 +23,7 @@ #pragma once #include -#include +#include namespace std::experimental::units { diff --git a/src/include/units/length.h b/src/include/units/dimensions/length.h similarity index 100% rename from src/include/units/length.h rename to src/include/units/dimensions/length.h diff --git a/src/include/units/luminous_intensity.h b/src/include/units/dimensions/luminous_intensity.h similarity index 100% rename from src/include/units/luminous_intensity.h rename to src/include/units/dimensions/luminous_intensity.h diff --git a/src/include/units/mass.h b/src/include/units/dimensions/mass.h similarity index 100% rename from src/include/units/mass.h rename to src/include/units/dimensions/mass.h diff --git a/src/include/units/power.h b/src/include/units/dimensions/power.h similarity index 98% rename from src/include/units/power.h rename to src/include/units/dimensions/power.h index 00fcedac..ad4aee0d 100644 --- a/src/include/units/power.h +++ b/src/include/units/dimensions/power.h @@ -23,7 +23,7 @@ #pragma once #include -#include +#include namespace std::experimental::units { diff --git a/src/include/units/pressure.h b/src/include/units/dimensions/pressure.h similarity index 98% rename from src/include/units/pressure.h rename to src/include/units/dimensions/pressure.h index 73804590..6b8e655a 100644 --- a/src/include/units/pressure.h +++ b/src/include/units/dimensions/pressure.h @@ -23,7 +23,7 @@ #pragma once #include -#include +#include namespace std::experimental::units { diff --git a/src/include/units/substance.h b/src/include/units/dimensions/substance.h similarity index 100% rename from src/include/units/substance.h rename to src/include/units/dimensions/substance.h diff --git a/src/include/units/temperature.h b/src/include/units/dimensions/temperature.h similarity index 100% rename from src/include/units/temperature.h rename to src/include/units/dimensions/temperature.h diff --git a/src/include/units/time.h b/src/include/units/dimensions/time.h similarity index 100% rename from src/include/units/time.h rename to src/include/units/dimensions/time.h diff --git a/src/include/units/velocity.h b/src/include/units/dimensions/velocity.h similarity index 97% rename from src/include/units/velocity.h rename to src/include/units/dimensions/velocity.h index 99c8ac79..f7ca35fe 100644 --- a/src/include/units/velocity.h +++ b/src/include/units/dimensions/velocity.h @@ -22,8 +22,8 @@ #pragma once -#include -#include +#include +#include namespace std::experimental::units { diff --git a/src/include/units/voltage.h b/src/include/units/dimensions/voltage.h similarity index 92% rename from src/include/units/voltage.h rename to src/include/units/dimensions/voltage.h index 12ea01fa..7ee661bf 100644 --- a/src/include/units/voltage.h +++ b/src/include/units/dimensions/voltage.h @@ -23,10 +23,10 @@ #pragma once #include -#include -#include -#include -#include +#include +#include +#include +#include namespace std::experimental::units { diff --git a/src/include/units/volume.h b/src/include/units/dimensions/volume.h similarity index 98% rename from src/include/units/volume.h rename to src/include/units/dimensions/volume.h index 106edc1a..f53ff1a7 100644 --- a/src/include/units/volume.h +++ b/src/include/units/dimensions/volume.h @@ -22,7 +22,7 @@ #pragma once -#include +#include namespace std::experimental::units { diff --git a/test/unit_test/test_quantity.cpp b/test/unit_test/test_quantity.cpp index 2322869b..c13fc0da 100644 --- a/test/unit_test/test_quantity.cpp +++ b/test/unit_test/test_quantity.cpp @@ -20,8 +20,8 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#include "units/velocity.h" -#include "units/frequency.h" +#include "units/dimensions/velocity.h" +#include "units/dimensions/frequency.h" #include #include diff --git a/test/unit_test/test_units.cpp b/test/unit_test/test_units.cpp index c559d131..1013f4c6 100644 --- a/test/unit_test/test_units.cpp +++ b/test/unit_test/test_units.cpp @@ -20,27 +20,27 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include -#include -#include -#include -#include +#include +#include +#include +#include #include diff --git a/test_package/test_package.cpp b/test_package/test_package.cpp index 3d0278ee..0233c92a 100644 --- a/test_package/test_package.cpp +++ b/test_package/test_package.cpp @@ -20,7 +20,7 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#include +#include #include namespace stde = std::experimental;