diff --git a/README.md b/README.md index 1aaa2f99..38b2ad0a 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,9 @@ analysis and unit/quantity manipulation. The basic idea and design heavily bases Here is a small example of possible operations: ```cpp -#include +#include +#include +#include using namespace units::physical::si; @@ -57,8 +59,8 @@ and dimensional analysis can be performed without sacrificing on accuracy. Pleas the below example for a quick preview of basic library features: ```cpp -#include -#include +#include +#include #include #include diff --git a/docs/quick_start.rst b/docs/quick_start.rst index 5ef379e5..0390a587 100644 --- a/docs/quick_start.rst +++ b/docs/quick_start.rst @@ -3,7 +3,9 @@ Quick Start Here is a small example of possible operations:: - #include + #include + #include + #include using namespace units::physical::si; @@ -27,7 +29,7 @@ Here is a small example of possible operations:: .. admonition:: Try it on Compiler Explorer - `Example #1 `_ + `Example #1 `_ This library requires some C++20 features (concepts, classes as :abbr:`NTTP (Non-Type Template Parameter)`, ...). Thanks to them the user gets a powerful @@ -35,8 +37,8 @@ but still easy to use interface where all unit conversions and dimensional analy performed without sacrificing on accuracy. Please see the below example for a quick preview of basic library features:: - #include - #include + #include + #include #include #include diff --git a/docs_disabled/reference/systems/physical/si/absorbed_dose.rst b/docs_disabled/reference/systems/physical/si/absorbed_dose.rst index 481f8211..42ef860d 100644 --- a/docs_disabled/reference/systems/physical/si/absorbed_dose.rst +++ b/docs_disabled/reference/systems/physical/si/absorbed_dose.rst @@ -1,4 +1,4 @@ Absorbed Dose ============= -.. doxygenfile:: si/bits/derived/absorbed_dose.h +.. doxygenfile:: si/derived/absorbed_dose.h diff --git a/docs_disabled/reference/systems/physical/si/acceleration.rst b/docs_disabled/reference/systems/physical/si/acceleration.rst index a7b16f2a..cf021fa2 100644 --- a/docs_disabled/reference/systems/physical/si/acceleration.rst +++ b/docs_disabled/reference/systems/physical/si/acceleration.rst @@ -1,4 +1,4 @@ Acceleration ============ -.. doxygenfile:: si/bits/derived/acceleration.h +.. doxygenfile:: si/derived/acceleration.h diff --git a/docs_disabled/reference/systems/physical/si/area.rst b/docs_disabled/reference/systems/physical/si/area.rst index 678e233d..5c12f807 100644 --- a/docs_disabled/reference/systems/physical/si/area.rst +++ b/docs_disabled/reference/systems/physical/si/area.rst @@ -1,4 +1,4 @@ Area ==== -.. doxygenfile:: si/bits/derived/area.h +.. doxygenfile:: si/derived/area.h diff --git a/docs_disabled/reference/systems/physical/si/capacitance.rst b/docs_disabled/reference/systems/physical/si/capacitance.rst index 9c913215..cf5ace80 100644 --- a/docs_disabled/reference/systems/physical/si/capacitance.rst +++ b/docs_disabled/reference/systems/physical/si/capacitance.rst @@ -1,4 +1,4 @@ Capacitance =========== -.. doxygenfile:: si/bits/derived/capacitance.h +.. doxygenfile:: si/derived/capacitance.h diff --git a/docs_disabled/reference/systems/physical/si/catalytic_activity.rst b/docs_disabled/reference/systems/physical/si/catalytic_activity.rst index 1392ab86..a0b9c877 100644 --- a/docs_disabled/reference/systems/physical/si/catalytic_activity.rst +++ b/docs_disabled/reference/systems/physical/si/catalytic_activity.rst @@ -1,4 +1,4 @@ Catalytic Activity ================== -.. doxygenfile:: si/bits/derived/catalytic_activity.h +.. doxygenfile:: si/derived/catalytic_activity.h diff --git a/docs_disabled/reference/systems/physical/si/cgs/acceleration.rst b/docs_disabled/reference/systems/physical/si/cgs/acceleration.rst index f5e1a293..c961855a 100644 --- a/docs_disabled/reference/systems/physical/si/cgs/acceleration.rst +++ b/docs_disabled/reference/systems/physical/si/cgs/acceleration.rst @@ -1,4 +1,4 @@ Acceleration ============ -.. doxygenfile:: si/cgs/bits/derived/acceleration.h +.. doxygenfile:: si/cgs/derived/acceleration.h diff --git a/docs_disabled/reference/systems/physical/si/cgs/area.rst b/docs_disabled/reference/systems/physical/si/cgs/area.rst index 0ae1e7c1..55ab28ef 100644 --- a/docs_disabled/reference/systems/physical/si/cgs/area.rst +++ b/docs_disabled/reference/systems/physical/si/cgs/area.rst @@ -1,4 +1,4 @@ Area ==== -.. doxygenfile:: si/cgs/bits/derived/area.h +.. doxygenfile:: si/cgs/derived/area.h diff --git a/docs_disabled/reference/systems/physical/si/cgs/energy.rst b/docs_disabled/reference/systems/physical/si/cgs/energy.rst index ea7ec696..462af4d1 100644 --- a/docs_disabled/reference/systems/physical/si/cgs/energy.rst +++ b/docs_disabled/reference/systems/physical/si/cgs/energy.rst @@ -1,4 +1,4 @@ Energy ====== -.. doxygenfile:: si/cgs/bits/derived/energy.h +.. doxygenfile:: si/cgs/derived/energy.h diff --git a/docs_disabled/reference/systems/physical/si/cgs/force.rst b/docs_disabled/reference/systems/physical/si/cgs/force.rst index e8c6646e..a466f661 100644 --- a/docs_disabled/reference/systems/physical/si/cgs/force.rst +++ b/docs_disabled/reference/systems/physical/si/cgs/force.rst @@ -1,4 +1,4 @@ Force ===== -.. doxygenfile:: si/cgs/bits/derived/force.h +.. doxygenfile:: si/cgs/derived/force.h diff --git a/docs_disabled/reference/systems/physical/si/cgs/power.rst b/docs_disabled/reference/systems/physical/si/cgs/power.rst index 664ea3a6..f7f79e6d 100644 --- a/docs_disabled/reference/systems/physical/si/cgs/power.rst +++ b/docs_disabled/reference/systems/physical/si/cgs/power.rst @@ -1,4 +1,4 @@ Power ===== -.. doxygenfile:: si/cgs/bits/derived/power.h +.. doxygenfile:: si/cgs/derived/power.h diff --git a/docs_disabled/reference/systems/physical/si/cgs/pressure.rst b/docs_disabled/reference/systems/physical/si/cgs/pressure.rst index c123be47..6f280d60 100644 --- a/docs_disabled/reference/systems/physical/si/cgs/pressure.rst +++ b/docs_disabled/reference/systems/physical/si/cgs/pressure.rst @@ -1,4 +1,4 @@ Pressure ======== -.. doxygenfile:: si/cgs/bits/derived/pressure.h +.. doxygenfile:: si/cgs/derived/pressure.h diff --git a/docs_disabled/reference/systems/physical/si/cgs/speed.rst b/docs_disabled/reference/systems/physical/si/cgs/speed.rst index 2b123163..619b4828 100644 --- a/docs_disabled/reference/systems/physical/si/cgs/speed.rst +++ b/docs_disabled/reference/systems/physical/si/cgs/speed.rst @@ -1,4 +1,4 @@ Speed ===== -.. doxygenfile:: si/cgs/bits/derived/speed.h +.. doxygenfile:: si/cgs/derived/speed.h diff --git a/docs_disabled/reference/systems/physical/si/charge_density.rst b/docs_disabled/reference/systems/physical/si/charge_density.rst index cc851c97..fbbb1666 100644 --- a/docs_disabled/reference/systems/physical/si/charge_density.rst +++ b/docs_disabled/reference/systems/physical/si/charge_density.rst @@ -1,4 +1,4 @@ Charge Density ============== -.. doxygenfile:: si/bits/derived/charge_density.h +.. doxygenfile:: si/derived/charge_density.h diff --git a/docs_disabled/reference/systems/physical/si/concentration.rst b/docs_disabled/reference/systems/physical/si/concentration.rst index 76632cbf..37b46d99 100644 --- a/docs_disabled/reference/systems/physical/si/concentration.rst +++ b/docs_disabled/reference/systems/physical/si/concentration.rst @@ -1,4 +1,4 @@ Concentration ============= -.. doxygenfile:: si/bits/derived/conductance.h +.. doxygenfile:: si/derived/conductance.h diff --git a/docs_disabled/reference/systems/physical/si/conductance.rst b/docs_disabled/reference/systems/physical/si/conductance.rst index 965337fb..c86f2c29 100644 --- a/docs_disabled/reference/systems/physical/si/conductance.rst +++ b/docs_disabled/reference/systems/physical/si/conductance.rst @@ -1,4 +1,4 @@ Conductance =========== -.. doxygenfile:: si/bits/derived/conductance.h +.. doxygenfile:: si/derived/conductance.h diff --git a/docs_disabled/reference/systems/physical/si/current_density.rst b/docs_disabled/reference/systems/physical/si/current_density.rst index 0c6fc038..0a914697 100644 --- a/docs_disabled/reference/systems/physical/si/current_density.rst +++ b/docs_disabled/reference/systems/physical/si/current_density.rst @@ -1,4 +1,4 @@ Current density =============== -.. doxygenfile:: si/bits/derived/current_density.h +.. doxygenfile:: si/derived/current_density.h diff --git a/docs_disabled/reference/systems/physical/si/density.rst b/docs_disabled/reference/systems/physical/si/density.rst index 1121c118..932f6416 100644 --- a/docs_disabled/reference/systems/physical/si/density.rst +++ b/docs_disabled/reference/systems/physical/si/density.rst @@ -1,4 +1,4 @@ Density ======= -.. doxygenfile:: si/bits/derived/density.h +.. doxygenfile:: si/derived/density.h diff --git a/docs_disabled/reference/systems/physical/si/dynamic_viscosity.rst b/docs_disabled/reference/systems/physical/si/dynamic_viscosity.rst index 81b5a9ee..66e206e9 100644 --- a/docs_disabled/reference/systems/physical/si/dynamic_viscosity.rst +++ b/docs_disabled/reference/systems/physical/si/dynamic_viscosity.rst @@ -1,4 +1,4 @@ Dynamic Viscosity ================= -.. doxygenfile:: si/bits/derived/dynamic_viscosity.h +.. doxygenfile:: si/derived/dynamic_viscosity.h diff --git a/docs_disabled/reference/systems/physical/si/electric_charge.rst b/docs_disabled/reference/systems/physical/si/electric_charge.rst index 639781e9..5df2f87c 100644 --- a/docs_disabled/reference/systems/physical/si/electric_charge.rst +++ b/docs_disabled/reference/systems/physical/si/electric_charge.rst @@ -1,4 +1,4 @@ Electric Charge =============== -.. doxygenfile:: si/bits/derived/electric_charge.h +.. doxygenfile:: si/derived/electric_charge.h diff --git a/docs_disabled/reference/systems/physical/si/electric_field_strength.rst b/docs_disabled/reference/systems/physical/si/electric_field_strength.rst index 039e39bb..159c835d 100644 --- a/docs_disabled/reference/systems/physical/si/electric_field_strength.rst +++ b/docs_disabled/reference/systems/physical/si/electric_field_strength.rst @@ -1,4 +1,4 @@ Electric Field Strength ======================= -.. doxygenfile:: si/bits/derived/electric_field_strength.h +.. doxygenfile:: si/derived/electric_field_strength.h diff --git a/docs_disabled/reference/systems/physical/si/energy.rst b/docs_disabled/reference/systems/physical/si/energy.rst index 5e49c77e..e1ae0ac2 100644 --- a/docs_disabled/reference/systems/physical/si/energy.rst +++ b/docs_disabled/reference/systems/physical/si/energy.rst @@ -1,4 +1,4 @@ Energy ====== -.. doxygenfile:: si/bits/derived/energy.h +.. doxygenfile:: si/derived/energy.h diff --git a/docs_disabled/reference/systems/physical/si/force.rst b/docs_disabled/reference/systems/physical/si/force.rst index 05c927f9..fe8a749b 100644 --- a/docs_disabled/reference/systems/physical/si/force.rst +++ b/docs_disabled/reference/systems/physical/si/force.rst @@ -1,4 +1,4 @@ Force ===== -.. doxygenfile:: si/bits/derived/force.h +.. doxygenfile:: si/derived/force.h diff --git a/docs_disabled/reference/systems/physical/si/fps/acceleration.rst b/docs_disabled/reference/systems/physical/si/fps/acceleration.rst index 937d8a76..1606bf02 100644 --- a/docs_disabled/reference/systems/physical/si/fps/acceleration.rst +++ b/docs_disabled/reference/systems/physical/si/fps/acceleration.rst @@ -1,4 +1,4 @@ Acceleration ============ -.. doxygenfile:: si/fps/bits/derived/acceleration.h +.. doxygenfile:: si/fps/derived/acceleration.h diff --git a/docs_disabled/reference/systems/physical/si/fps/area.rst b/docs_disabled/reference/systems/physical/si/fps/area.rst index 20387808..efa08ed3 100644 --- a/docs_disabled/reference/systems/physical/si/fps/area.rst +++ b/docs_disabled/reference/systems/physical/si/fps/area.rst @@ -1,4 +1,4 @@ Area ==== -.. doxygenfile:: si/fps/bits/derived/area.h +.. doxygenfile:: si/fps/derived/area.h diff --git a/docs_disabled/reference/systems/physical/si/fps/density.rst b/docs_disabled/reference/systems/physical/si/fps/density.rst index 5bb9e9b4..a00d29e3 100644 --- a/docs_disabled/reference/systems/physical/si/fps/density.rst +++ b/docs_disabled/reference/systems/physical/si/fps/density.rst @@ -1,4 +1,4 @@ Density ======= -.. doxygenfile:: si/fps/bits/derived/density.h +.. doxygenfile:: si/fps/derived/density.h diff --git a/docs_disabled/reference/systems/physical/si/fps/energy.rst b/docs_disabled/reference/systems/physical/si/fps/energy.rst index 9110e21b..85b16ae8 100644 --- a/docs_disabled/reference/systems/physical/si/fps/energy.rst +++ b/docs_disabled/reference/systems/physical/si/fps/energy.rst @@ -1,4 +1,4 @@ Energy ====== -.. doxygenfile:: si/fps/bits/derived/energy.h +.. doxygenfile:: si/fps/derived/energy.h diff --git a/docs_disabled/reference/systems/physical/si/fps/force.rst b/docs_disabled/reference/systems/physical/si/fps/force.rst index 05edb60c..3643bbb3 100644 --- a/docs_disabled/reference/systems/physical/si/fps/force.rst +++ b/docs_disabled/reference/systems/physical/si/fps/force.rst @@ -1,4 +1,4 @@ Force ===== -.. doxygenfile:: si/fps/bits/derived/force.h +.. doxygenfile:: si/fps/derived/force.h diff --git a/docs_disabled/reference/systems/physical/si/fps/power.rst b/docs_disabled/reference/systems/physical/si/fps/power.rst index 63fa88ed..c4d3c31f 100644 --- a/docs_disabled/reference/systems/physical/si/fps/power.rst +++ b/docs_disabled/reference/systems/physical/si/fps/power.rst @@ -1,4 +1,4 @@ Power ===== -.. doxygenfile:: si/fps/bits/derived/power.h +.. doxygenfile:: si/fps/derived/power.h diff --git a/docs_disabled/reference/systems/physical/si/fps/pressure.rst b/docs_disabled/reference/systems/physical/si/fps/pressure.rst index 59d8cbeb..f330a15b 100644 --- a/docs_disabled/reference/systems/physical/si/fps/pressure.rst +++ b/docs_disabled/reference/systems/physical/si/fps/pressure.rst @@ -1,4 +1,4 @@ Pressure ======== -.. doxygenfile:: si/fps/bits/derived/pressure.h +.. doxygenfile:: si/fps/derived/pressure.h diff --git a/docs_disabled/reference/systems/physical/si/fps/speed.rst b/docs_disabled/reference/systems/physical/si/fps/speed.rst index f81f3b65..def1a20f 100644 --- a/docs_disabled/reference/systems/physical/si/fps/speed.rst +++ b/docs_disabled/reference/systems/physical/si/fps/speed.rst @@ -1,4 +1,4 @@ Speed ===== -.. doxygenfile:: si/fps/bits/derived/speed.h +.. doxygenfile:: si/fps/derived/speed.h diff --git a/docs_disabled/reference/systems/physical/si/fps/volume.rst b/docs_disabled/reference/systems/physical/si/fps/volume.rst index f93ba602..90cb67bb 100644 --- a/docs_disabled/reference/systems/physical/si/fps/volume.rst +++ b/docs_disabled/reference/systems/physical/si/fps/volume.rst @@ -1,4 +1,4 @@ Volume ====== -.. doxygenfile:: si/fps/bits/derived/volume.h +.. doxygenfile:: si/fps/derived/volume.h diff --git a/docs_disabled/reference/systems/physical/si/frequency.rst b/docs_disabled/reference/systems/physical/si/frequency.rst index 79240051..f96af4e4 100644 --- a/docs_disabled/reference/systems/physical/si/frequency.rst +++ b/docs_disabled/reference/systems/physical/si/frequency.rst @@ -1,4 +1,4 @@ Frequency ========= -.. doxygenfile:: si/bits/derived/frequency.h +.. doxygenfile:: si/derived/frequency.h diff --git a/docs_disabled/reference/systems/physical/si/heat_capacity.rst b/docs_disabled/reference/systems/physical/si/heat_capacity.rst index c02b7023..7d10fdef 100644 --- a/docs_disabled/reference/systems/physical/si/heat_capacity.rst +++ b/docs_disabled/reference/systems/physical/si/heat_capacity.rst @@ -1,4 +1,4 @@ Heat Capacity ============= -.. doxygenfile:: si/bits/derived/heat_capacity.h +.. doxygenfile:: si/derived/heat_capacity.h diff --git a/docs_disabled/reference/systems/physical/si/inductance.rst b/docs_disabled/reference/systems/physical/si/inductance.rst index 26edb4bb..4de852e3 100644 --- a/docs_disabled/reference/systems/physical/si/inductance.rst +++ b/docs_disabled/reference/systems/physical/si/inductance.rst @@ -1,4 +1,4 @@ Inductance ========== -.. doxygenfile:: si/bits/derived/inductance.h +.. doxygenfile:: si/derived/inductance.h diff --git a/docs_disabled/reference/systems/physical/si/international/area.rst b/docs_disabled/reference/systems/physical/si/international/area.rst index e46a4a1f..4f52a6c2 100644 --- a/docs_disabled/reference/systems/physical/si/international/area.rst +++ b/docs_disabled/reference/systems/physical/si/international/area.rst @@ -1,4 +1,4 @@ Area ==== -.. doxygenfile:: si/international/bits/derived/area.h +.. doxygenfile:: si/international/derived/area.h diff --git a/docs_disabled/reference/systems/physical/si/international/speed.rst b/docs_disabled/reference/systems/physical/si/international/speed.rst index 8a94051c..8e817de4 100644 --- a/docs_disabled/reference/systems/physical/si/international/speed.rst +++ b/docs_disabled/reference/systems/physical/si/international/speed.rst @@ -1,4 +1,4 @@ Speed ===== -.. doxygenfile:: speed/bits/derived/speed.h +.. doxygenfile:: speed/derived/speed.h diff --git a/docs_disabled/reference/systems/physical/si/international/volume.rst b/docs_disabled/reference/systems/physical/si/international/volume.rst index 6327de38..31a4e91a 100644 --- a/docs_disabled/reference/systems/physical/si/international/volume.rst +++ b/docs_disabled/reference/systems/physical/si/international/volume.rst @@ -1,4 +1,4 @@ Volume ====== -.. doxygenfile:: si/international/bits/derived/volume.h +.. doxygenfile:: si/international/derived/volume.h diff --git a/docs_disabled/reference/systems/physical/si/luminous_intensity.rst b/docs_disabled/reference/systems/physical/si/luminous_intensity.rst index 0f02de5b..085ec8ba 100644 --- a/docs_disabled/reference/systems/physical/si/luminous_intensity.rst +++ b/docs_disabled/reference/systems/physical/si/luminous_intensity.rst @@ -1,4 +1,4 @@ Luminous Intensity ================== -.. doxygenfile:: si/bits/derived/luminous_intensity.h +.. doxygenfile:: si/derived/luminous_intensity.h diff --git a/docs_disabled/reference/systems/physical/si/magnetic_flux.rst b/docs_disabled/reference/systems/physical/si/magnetic_flux.rst index 32bd0fb2..cdb1042f 100644 --- a/docs_disabled/reference/systems/physical/si/magnetic_flux.rst +++ b/docs_disabled/reference/systems/physical/si/magnetic_flux.rst @@ -1,4 +1,4 @@ Magnetic Flux ============= -.. doxygenfile:: si/bits/derived/magnetic_flux.h +.. doxygenfile:: si/derived/magnetic_flux.h diff --git a/docs_disabled/reference/systems/physical/si/magnetic_induction.rst b/docs_disabled/reference/systems/physical/si/magnetic_induction.rst index 1077ab9e..9be12cbc 100644 --- a/docs_disabled/reference/systems/physical/si/magnetic_induction.rst +++ b/docs_disabled/reference/systems/physical/si/magnetic_induction.rst @@ -1,4 +1,4 @@ Magnetic Induction ================== -.. doxygenfile:: si/bits/derived/magnetic_induction.h +.. doxygenfile:: si/derived/magnetic_induction.h diff --git a/docs_disabled/reference/systems/physical/si/molar_energy.rst b/docs_disabled/reference/systems/physical/si/molar_energy.rst index ba9f2194..026125cb 100644 --- a/docs_disabled/reference/systems/physical/si/molar_energy.rst +++ b/docs_disabled/reference/systems/physical/si/molar_energy.rst @@ -1,4 +1,4 @@ Molar Energy ============ -.. doxygenfile:: si/bits/derived/molar_energy.h +.. doxygenfile:: si/derived/molar_energy.h diff --git a/docs_disabled/reference/systems/physical/si/momentum.rst b/docs_disabled/reference/systems/physical/si/momentum.rst index 78b9dbd9..87417312 100644 --- a/docs_disabled/reference/systems/physical/si/momentum.rst +++ b/docs_disabled/reference/systems/physical/si/momentum.rst @@ -1,4 +1,4 @@ Momentum ======== -.. doxygenfile:: si/bits/derived/momentum.h +.. doxygenfile:: si/derived/momentum.h diff --git a/docs_disabled/reference/systems/physical/si/permeability.rst b/docs_disabled/reference/systems/physical/si/permeability.rst index e92aba75..1ac577a3 100644 --- a/docs_disabled/reference/systems/physical/si/permeability.rst +++ b/docs_disabled/reference/systems/physical/si/permeability.rst @@ -1,4 +1,4 @@ Permeability ============ -.. doxygenfile:: si/bits/derived/permeability.h +.. doxygenfile:: si/derived/permeability.h diff --git a/docs_disabled/reference/systems/physical/si/permittivity.rst b/docs_disabled/reference/systems/physical/si/permittivity.rst index 52b413b2..d7688c85 100644 --- a/docs_disabled/reference/systems/physical/si/permittivity.rst +++ b/docs_disabled/reference/systems/physical/si/permittivity.rst @@ -1,4 +1,4 @@ Permittivity ============ -.. doxygenfile:: si/bits/derived/permittivity.h +.. doxygenfile:: si/derived/permittivity.h diff --git a/docs_disabled/reference/systems/physical/si/power.rst b/docs_disabled/reference/systems/physical/si/power.rst index fd0ea27d..a49f0e27 100644 --- a/docs_disabled/reference/systems/physical/si/power.rst +++ b/docs_disabled/reference/systems/physical/si/power.rst @@ -1,4 +1,4 @@ Power ===== -.. doxygenfile:: si/bits/derived/power.h +.. doxygenfile:: si/derived/power.h diff --git a/docs_disabled/reference/systems/physical/si/prefixes.rst b/docs_disabled/reference/systems/physical/si/prefixes.rst index 3dadaae4..ccf56a14 100644 --- a/docs_disabled/reference/systems/physical/si/prefixes.rst +++ b/docs_disabled/reference/systems/physical/si/prefixes.rst @@ -1,4 +1,4 @@ Prefixes ======== -.. doxygenfile:: si/bits/derived/prefixes.h +.. doxygenfile:: si/derived/prefixes.h diff --git a/docs_disabled/reference/systems/physical/si/pressure.rst b/docs_disabled/reference/systems/physical/si/pressure.rst index 24f7f608..1c731c04 100644 --- a/docs_disabled/reference/systems/physical/si/pressure.rst +++ b/docs_disabled/reference/systems/physical/si/pressure.rst @@ -1,4 +1,4 @@ Pressure ======== -.. doxygenfile:: si/bits/derived/pressure.h +.. doxygenfile:: si/derived/pressure.h diff --git a/docs_disabled/reference/systems/physical/si/resistance.rst b/docs_disabled/reference/systems/physical/si/resistance.rst index 0b77a921..113f5870 100644 --- a/docs_disabled/reference/systems/physical/si/resistance.rst +++ b/docs_disabled/reference/systems/physical/si/resistance.rst @@ -1,4 +1,4 @@ Resistance ========== -.. doxygenfile:: si/bits/derived/resistance.h +.. doxygenfile:: si/derived/resistance.h diff --git a/docs_disabled/reference/systems/physical/si/speed.rst b/docs_disabled/reference/systems/physical/si/speed.rst index 73c2161f..17692856 100644 --- a/docs_disabled/reference/systems/physical/si/speed.rst +++ b/docs_disabled/reference/systems/physical/si/speed.rst @@ -1,4 +1,4 @@ Speed ===== -.. doxygenfile:: si/bits/derived/speed.h +.. doxygenfile:: si/derived/speed.h diff --git a/docs_disabled/reference/systems/physical/si/surface_tension.rst b/docs_disabled/reference/systems/physical/si/surface_tension.rst index 69e433de..fe3d620e 100644 --- a/docs_disabled/reference/systems/physical/si/surface_tension.rst +++ b/docs_disabled/reference/systems/physical/si/surface_tension.rst @@ -1,4 +1,4 @@ Surface Tension =============== -.. doxygenfile:: si/bits/derived/surface_tension.h +.. doxygenfile:: si/derived/surface_tension.h diff --git a/docs_disabled/reference/systems/physical/si/thermal_conductivity.rst b/docs_disabled/reference/systems/physical/si/thermal_conductivity.rst index ae139aba..396f48c9 100644 --- a/docs_disabled/reference/systems/physical/si/thermal_conductivity.rst +++ b/docs_disabled/reference/systems/physical/si/thermal_conductivity.rst @@ -1,4 +1,4 @@ Thermal Conductivity ==================== -.. doxygenfile:: si/bits/derived/thermal_conductivity.h +.. doxygenfile:: si/derived/thermal_conductivity.h diff --git a/docs_disabled/reference/systems/physical/si/voltage.rst b/docs_disabled/reference/systems/physical/si/voltage.rst index bb191d31..9fefdaa2 100644 --- a/docs_disabled/reference/systems/physical/si/voltage.rst +++ b/docs_disabled/reference/systems/physical/si/voltage.rst @@ -1,4 +1,4 @@ Voltage ======= -.. doxygenfile:: si/bits/derived/voltage.h +.. doxygenfile:: si/derived/voltage.h diff --git a/docs_disabled/reference/systems/physical/si/volume.rst b/docs_disabled/reference/systems/physical/si/volume.rst index 8c137348..6de41df1 100644 --- a/docs_disabled/reference/systems/physical/si/volume.rst +++ b/docs_disabled/reference/systems/physical/si/volume.rst @@ -1,4 +1,4 @@ Volume ====== -.. doxygenfile:: si/bits/derived/volume.h +.. doxygenfile:: si/derived/volume.h diff --git a/example/alternative_namespaces/acceleration.h b/example/alternative_namespaces/acceleration.h index 6877f608..e631d743 100644 --- a/example/alternative_namespaces/acceleration.h +++ b/example/alternative_namespaces/acceleration.h @@ -1,7 +1,7 @@ #pragma once -#include +#include namespace units{ namespace experimental{ diff --git a/example/alternative_namespaces/area.h b/example/alternative_namespaces/area.h index f4a5de07..7532451c 100644 --- a/example/alternative_namespaces/area.h +++ b/example/alternative_namespaces/area.h @@ -1,7 +1,7 @@ #pragma once -#include +#include namespace area { diff --git a/example/alternative_namespaces/capacitor_time_curve.cpp b/example/alternative_namespaces/capacitor_time_curve.cpp index 8006f3ff..c6590808 100644 --- a/example/alternative_namespaces/capacitor_time_curve.cpp +++ b/example/alternative_namespaces/capacitor_time_curve.cpp @@ -20,7 +20,9 @@ physical_quantities */ -#include +#include +#include +#include #include #include "./voltage.h" #include diff --git a/example/alternative_namespaces/density.h b/example/alternative_namespaces/density.h index 4c461abe..7d8b9882 100644 --- a/example/alternative_namespaces/density.h +++ b/example/alternative_namespaces/density.h @@ -2,7 +2,7 @@ #pragma once -#include +#include namespace units{ namespace experimental{ diff --git a/example/alternative_namespaces/force.h b/example/alternative_namespaces/force.h index b1ea9ce7..4efc348c 100644 --- a/example/alternative_namespaces/force.h +++ b/example/alternative_namespaces/force.h @@ -1,7 +1,7 @@ #pragma once -#include +#include namespace units{ namespace experimental{ diff --git a/example/alternative_namespaces/length.h b/example/alternative_namespaces/length.h index feb62bc8..7275027d 100644 --- a/example/alternative_namespaces/length.h +++ b/example/alternative_namespaces/length.h @@ -2,12 +2,12 @@ #pragma once -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include namespace units{ namespace experimental{ diff --git a/example/alternative_namespaces/mass.h b/example/alternative_namespaces/mass.h index af6d4fd6..1d3e74a8 100644 --- a/example/alternative_namespaces/mass.h +++ b/example/alternative_namespaces/mass.h @@ -2,7 +2,7 @@ #pragma once -#include +#include namespace units{ namespace experimental{ diff --git a/example/alternative_namespaces/time.h b/example/alternative_namespaces/time.h index d13903fe..1660e7a0 100644 --- a/example/alternative_namespaces/time.h +++ b/example/alternative_namespaces/time.h @@ -1,7 +1,7 @@ #pragma once -#include +#include // named qtime due to conflict with time_t time(time_t*) namespace q_time { diff --git a/example/alternative_namespaces/units_str.h b/example/alternative_namespaces/units_str.h index 2dffc459..ba68a736 100644 --- a/example/alternative_namespaces/units_str.h +++ b/example/alternative_namespaces/units_str.h @@ -1,6 +1,5 @@ #pragma once -#include #include #include // get at the units text of the quantity, without its numeric value diff --git a/example/alternative_namespaces/voltage.h b/example/alternative_namespaces/voltage.h index d18fa9c0..e409d4b5 100644 --- a/example/alternative_namespaces/voltage.h +++ b/example/alternative_namespaces/voltage.h @@ -2,7 +2,7 @@ #pragma once -#include +#include namespace units{ namespace experimental{ diff --git a/example/alternative_namespaces/volume.h b/example/alternative_namespaces/volume.h index 2476df49..0f21df37 100644 --- a/example/alternative_namespaces/volume.h +++ b/example/alternative_namespaces/volume.h @@ -2,7 +2,7 @@ #pragma once -#include +#include namespace units{ namespace experimental{ diff --git a/example/avg_speed.cpp b/example/avg_speed.cpp index 6999c2c5..cde2eb99 100644 --- a/example/avg_speed.cpp +++ b/example/avg_speed.cpp @@ -20,9 +20,9 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#include -#include -#include +#include +#include +#include #include namespace { diff --git a/example/box_example.cpp b/example/box_example.cpp index 99e32dbc..6ebafbe2 100644 --- a/example/box_example.cpp +++ b/example/box_example.cpp @@ -1,4 +1,11 @@ -#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/example/capacitor_time_curve.cpp b/example/capacitor_time_curve.cpp index 34f7ded5..b08a0da4 100644 --- a/example/capacitor_time_curve.cpp +++ b/example/capacitor_time_curve.cpp @@ -20,7 +20,10 @@ physical_quantities */ -#include +#include +#include +#include +#include #include #include diff --git a/example/clcpp_response.cpp b/example/clcpp_response.cpp index 89473a31..37bace5a 100644 --- a/example/clcpp_response.cpp +++ b/example/clcpp_response.cpp @@ -16,12 +16,15 @@ */ #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include namespace { diff --git a/example/conversion_factor.cpp b/example/conversion_factor.cpp index 94f4861c..0df01fa4 100644 --- a/example/conversion_factor.cpp +++ b/example/conversion_factor.cpp @@ -15,7 +15,7 @@ along with this program. If not, see http://www.gnu.org/licenses./ */ -#include +#include #include #include diff --git a/example/experimental_angle.cpp b/example/experimental_angle.cpp index 4e46fba1..19ae993f 100644 --- a/example/experimental_angle.cpp +++ b/example/experimental_angle.cpp @@ -22,7 +22,9 @@ #include #include -#include +#include +#include +#include #include using namespace units; diff --git a/example/foot_pound_second.cpp b/example/foot_pound_second.cpp index 4166f56c..a0d3d186 100644 --- a/example/foot_pound_second.cpp +++ b/example/foot_pound_second.cpp @@ -22,8 +22,17 @@ #include #include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/example/glide_computer.cpp b/example/glide_computer.cpp index 53678cfa..8d2c726b 100644 --- a/example/glide_computer.cpp +++ b/example/glide_computer.cpp @@ -22,8 +22,8 @@ #include #include -#include -#include +#include +#include #include #include #include diff --git a/example/hello_units.cpp b/example/hello_units.cpp index 8bae2b25..8a0f73ed 100644 --- a/example/hello_units.cpp +++ b/example/hello_units.cpp @@ -21,8 +21,8 @@ // SOFTWARE. #include -#include -#include +#include +#include #include using namespace units::physical; diff --git a/example/kalman_filter-alpha_beta_filter_example2.cpp b/example/kalman_filter-alpha_beta_filter_example2.cpp index 46869653..e614d08a 100644 --- a/example/kalman_filter-alpha_beta_filter_example2.cpp +++ b/example/kalman_filter-alpha_beta_filter_example2.cpp @@ -1,5 +1,5 @@ #include -#include +#include #include #include diff --git a/example/linear_algebra.cpp b/example/linear_algebra.cpp index 3e92115f..fabbe13d 100644 --- a/example/linear_algebra.cpp +++ b/example/linear_algebra.cpp @@ -20,7 +20,9 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#include +#include +#include +#include #include #include #include diff --git a/example/measurement.cpp b/example/measurement.cpp index ffe86334..76daef09 100644 --- a/example/measurement.cpp +++ b/example/measurement.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 #include #include diff --git a/example/total_energy.cpp b/example/total_energy.cpp index bf794316..fff77463 100644 --- a/example/total_energy.cpp +++ b/example/total_energy.cpp @@ -20,8 +20,11 @@ // 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 diff --git a/example/unknown_dimension.cpp b/example/unknown_dimension.cpp index 1220fa7c..19c527e2 100644 --- a/example/unknown_dimension.cpp +++ b/example/unknown_dimension.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 { @@ -40,7 +40,6 @@ void example() Time auto t1 = 10_q_s; Speed auto v1 = avg_speed(d1, t1); - // TODO: check if below is still true after adding whole SI module auto temp1 = v1 * 50_q_m; // produces intermediate unknown dimension with 'unknown_coherent_unit' as its 'coherent_unit' Speed auto v2 = temp1 / 100_q_m; // back to known dimensions again Length auto d2 = v2 * 60_q_s; diff --git a/src/include/units/data/data.h b/src/include/units/data/data.h index 1624b184..a07e6dc7 100644 --- a/src/include/units/data/data.h +++ b/src/include/units/data/data.h @@ -22,8 +22,6 @@ #pragma once -#define MP_UNITS_SYSTEM_DATA - #include -#include +#include #include diff --git a/src/include/units/data/bits/derived/bitrate.h b/src/include/units/data/derived/bitrate.h similarity index 94% rename from src/include/units/data/bits/derived/bitrate.h rename to src/include/units/data/derived/bitrate.h index cd7bd65b..9b844437 100644 --- a/src/include/units/data/bits/derived/bitrate.h +++ b/src/include/units/data/derived/bitrate.h @@ -22,12 +22,6 @@ #pragma once -#ifndef MP_UNITS_SYSTEM_DATA - -#error "Please do not include this file directly. Use `units/physical/data/data.h` to prevent potential ODR violation issues." - -#endif - #include #include #include diff --git a/src/include/units/physical/bits/dimensions.h b/src/include/units/physical/bits/dimensions.h deleted file mode 100644 index 7d4bc6c8..00000000 --- a/src/include/units/physical/bits/dimensions.h +++ /dev/null @@ -1,73 +0,0 @@ -// The MIT License (MIT) -// -// Copyright (c) 2018 Mateusz Pusz -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights -// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -// copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in all -// copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -// SOFTWARE. - -#pragma once - -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -// TODO Add when downcasting issue is solved -// #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -// TODO Add when downcasting issue is solved -// #include -#include -#include -#include -#include -#include -#include -#include -#include -#include diff --git a/src/include/units/physical/dimensions.h b/src/include/units/physical/dimensions.h index 239d19a0..c7e44ca0 100644 --- a/src/include/units/physical/dimensions.h +++ b/src/include/units/physical/dimensions.h @@ -22,50 +22,49 @@ #pragma once -#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 // TODO Add when downcasting issue is solved -// #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 // TODO Add when downcasting issue is solved -// #include -#include -#include -#include -#include -#include -#include -#include -#include -#include +// #include +#include +#include +#include +#include +#include +#include +#include +#include +#include diff --git a/src/include/units/physical/bits/absorbed_dose.h b/src/include/units/physical/dimensions/absorbed_dose.h similarity index 94% rename from src/include/units/physical/bits/absorbed_dose.h rename to src/include/units/physical/dimensions/absorbed_dose.h index e85bd209..1e6e65e2 100644 --- a/src/include/units/physical/bits/absorbed_dose.h +++ b/src/include/units/physical/dimensions/absorbed_dose.h @@ -23,8 +23,8 @@ #pragma once #include -#include -#include +#include +#include namespace units::physical { diff --git a/src/include/units/physical/bits/acceleration.h b/src/include/units/physical/dimensions/acceleration.h similarity index 94% rename from src/include/units/physical/bits/acceleration.h rename to src/include/units/physical/dimensions/acceleration.h index 0e4a6ad3..86b94505 100644 --- a/src/include/units/physical/bits/acceleration.h +++ b/src/include/units/physical/dimensions/acceleration.h @@ -23,8 +23,8 @@ #pragma once #include -#include -#include +#include +#include namespace units::physical { diff --git a/src/include/units/physical/bits/amount_of_substance.h b/src/include/units/physical/dimensions/amount_of_substance.h similarity index 100% rename from src/include/units/physical/bits/amount_of_substance.h rename to src/include/units/physical/dimensions/amount_of_substance.h diff --git a/src/include/units/physical/bits/angular_velocity.h b/src/include/units/physical/dimensions/angular_velocity.h similarity index 97% rename from src/include/units/physical/bits/angular_velocity.h rename to src/include/units/physical/dimensions/angular_velocity.h index 17692931..1e50a165 100644 --- a/src/include/units/physical/bits/angular_velocity.h +++ b/src/include/units/physical/dimensions/angular_velocity.h @@ -24,7 +24,7 @@ #include #include -#include +#include namespace units::physical { diff --git a/src/include/units/physical/bits/area.h b/src/include/units/physical/dimensions/area.h similarity index 96% rename from src/include/units/physical/bits/area.h rename to src/include/units/physical/dimensions/area.h index e6871deb..4a6356dc 100644 --- a/src/include/units/physical/bits/area.h +++ b/src/include/units/physical/dimensions/area.h @@ -23,7 +23,7 @@ #pragma once #include -#include +#include namespace units::physical { diff --git a/src/include/units/physical/bits/capacitance.h b/src/include/units/physical/dimensions/capacitance.h similarity index 93% rename from src/include/units/physical/bits/capacitance.h rename to src/include/units/physical/dimensions/capacitance.h index 55fa0a25..acb96153 100644 --- a/src/include/units/physical/bits/capacitance.h +++ b/src/include/units/physical/dimensions/capacitance.h @@ -23,8 +23,8 @@ #pragma once #include -#include -#include +#include +#include namespace units::physical { diff --git a/src/include/units/physical/bits/catalytic_activity.h b/src/include/units/physical/dimensions/catalytic_activity.h similarity index 93% rename from src/include/units/physical/bits/catalytic_activity.h rename to src/include/units/physical/dimensions/catalytic_activity.h index a9114bbd..e7b0f19b 100644 --- a/src/include/units/physical/bits/catalytic_activity.h +++ b/src/include/units/physical/dimensions/catalytic_activity.h @@ -22,9 +22,9 @@ #pragma once -#include +#include #include -#include +#include namespace units::physical { diff --git a/src/include/units/physical/bits/charge_density.h b/src/include/units/physical/dimensions/charge_density.h similarity index 94% rename from src/include/units/physical/bits/charge_density.h rename to src/include/units/physical/dimensions/charge_density.h index 62d56f25..81e1c7e5 100644 --- a/src/include/units/physical/bits/charge_density.h +++ b/src/include/units/physical/dimensions/charge_density.h @@ -23,8 +23,8 @@ #pragma once #include -#include -#include +#include +#include namespace units::physical { diff --git a/src/include/units/physical/bits/concentration.h b/src/include/units/physical/dimensions/concentration.h similarity index 93% rename from src/include/units/physical/bits/concentration.h rename to src/include/units/physical/dimensions/concentration.h index e978de19..b9ec9752 100644 --- a/src/include/units/physical/bits/concentration.h +++ b/src/include/units/physical/dimensions/concentration.h @@ -23,8 +23,8 @@ #pragma once #include -#include -#include +#include +#include namespace units::physical { diff --git a/src/include/units/physical/bits/conductance.h b/src/include/units/physical/dimensions/conductance.h similarity index 96% rename from src/include/units/physical/bits/conductance.h rename to src/include/units/physical/dimensions/conductance.h index eb8912d5..f089b465 100644 --- a/src/include/units/physical/bits/conductance.h +++ b/src/include/units/physical/dimensions/conductance.h @@ -23,7 +23,7 @@ #pragma once #include -#include +#include namespace units::physical { diff --git a/src/include/units/physical/bits/current_density.h b/src/include/units/physical/dimensions/current_density.h similarity index 93% rename from src/include/units/physical/bits/current_density.h rename to src/include/units/physical/dimensions/current_density.h index 0bd9ec3c..bcad7e87 100644 --- a/src/include/units/physical/bits/current_density.h +++ b/src/include/units/physical/dimensions/current_density.h @@ -23,8 +23,8 @@ #pragma once #include -#include -#include +#include +#include namespace units::physical { diff --git a/src/include/units/physical/bits/density.h b/src/include/units/physical/dimensions/density.h similarity index 94% rename from src/include/units/physical/bits/density.h rename to src/include/units/physical/dimensions/density.h index 95bb0fc7..f7834888 100644 --- a/src/include/units/physical/bits/density.h +++ b/src/include/units/physical/dimensions/density.h @@ -23,8 +23,8 @@ #pragma once #include -#include -#include +#include +#include namespace units::physical { diff --git a/src/include/units/physical/bits/dynamic_viscosity.h b/src/include/units/physical/dimensions/dynamic_viscosity.h similarity index 94% rename from src/include/units/physical/bits/dynamic_viscosity.h rename to src/include/units/physical/dimensions/dynamic_viscosity.h index bc2533db..a35cf5cc 100644 --- a/src/include/units/physical/bits/dynamic_viscosity.h +++ b/src/include/units/physical/dimensions/dynamic_viscosity.h @@ -23,8 +23,8 @@ #pragma once #include -#include -#include +#include +#include namespace units::physical { diff --git a/src/include/units/physical/bits/electric_charge.h b/src/include/units/physical/dimensions/electric_charge.h similarity index 93% rename from src/include/units/physical/bits/electric_charge.h rename to src/include/units/physical/dimensions/electric_charge.h index 3289edbc..cad8cf09 100644 --- a/src/include/units/physical/bits/electric_charge.h +++ b/src/include/units/physical/dimensions/electric_charge.h @@ -23,8 +23,8 @@ #pragma once #include -#include -#include +#include +#include namespace units::physical { diff --git a/src/include/units/physical/bits/electric_current.h b/src/include/units/physical/dimensions/electric_current.h similarity index 100% rename from src/include/units/physical/bits/electric_current.h rename to src/include/units/physical/dimensions/electric_current.h diff --git a/src/include/units/physical/bits/electric_field_strength.h b/src/include/units/physical/dimensions/electric_field_strength.h similarity index 94% rename from src/include/units/physical/bits/electric_field_strength.h rename to src/include/units/physical/dimensions/electric_field_strength.h index b1e213c0..7506378c 100644 --- a/src/include/units/physical/bits/electric_field_strength.h +++ b/src/include/units/physical/dimensions/electric_field_strength.h @@ -23,8 +23,8 @@ #pragma once #include -#include -#include +#include +#include namespace units::physical { diff --git a/src/include/units/physical/bits/energy.h b/src/include/units/physical/dimensions/energy.h similarity index 94% rename from src/include/units/physical/bits/energy.h rename to src/include/units/physical/dimensions/energy.h index ba1c722e..94bbeb87 100644 --- a/src/include/units/physical/bits/energy.h +++ b/src/include/units/physical/dimensions/energy.h @@ -23,8 +23,8 @@ #pragma once #include -#include -#include +#include +#include namespace units::physical { diff --git a/src/include/units/physical/bits/energy_density.h b/src/include/units/physical/dimensions/energy_density.h similarity index 94% rename from src/include/units/physical/bits/energy_density.h rename to src/include/units/physical/dimensions/energy_density.h index fe9c6808..c46dcad7 100644 --- a/src/include/units/physical/bits/energy_density.h +++ b/src/include/units/physical/dimensions/energy_density.h @@ -23,8 +23,8 @@ #pragma once #include -#include -#include +#include +#include namespace units::physical { diff --git a/src/include/units/physical/bits/force.h b/src/include/units/physical/dimensions/force.h similarity index 93% rename from src/include/units/physical/bits/force.h rename to src/include/units/physical/dimensions/force.h index 8ad9b197..e6504c99 100644 --- a/src/include/units/physical/bits/force.h +++ b/src/include/units/physical/dimensions/force.h @@ -22,9 +22,9 @@ #pragma once -#include +#include #include -#include +#include namespace units::physical { diff --git a/src/include/units/physical/bits/frequency.h b/src/include/units/physical/dimensions/frequency.h similarity index 97% rename from src/include/units/physical/bits/frequency.h rename to src/include/units/physical/dimensions/frequency.h index 40f71561..6c33ee10 100644 --- a/src/include/units/physical/bits/frequency.h +++ b/src/include/units/physical/dimensions/frequency.h @@ -23,7 +23,7 @@ #pragma once #include -#include +#include namespace units::physical { diff --git a/src/include/units/physical/bits/heat_capacity.h b/src/include/units/physical/dimensions/heat_capacity.h similarity index 90% rename from src/include/units/physical/bits/heat_capacity.h rename to src/include/units/physical/dimensions/heat_capacity.h index 41497dc3..7d3068cb 100644 --- a/src/include/units/physical/bits/heat_capacity.h +++ b/src/include/units/physical/dimensions/heat_capacity.h @@ -22,11 +22,11 @@ #pragma once -#include +#include #include -#include -#include -#include +#include +#include +#include namespace units::physical { diff --git a/src/include/units/physical/bits/inductance.h b/src/include/units/physical/dimensions/inductance.h similarity index 93% rename from src/include/units/physical/bits/inductance.h rename to src/include/units/physical/dimensions/inductance.h index 3343b6ae..53a5f482 100644 --- a/src/include/units/physical/bits/inductance.h +++ b/src/include/units/physical/dimensions/inductance.h @@ -23,8 +23,8 @@ #pragma once #include -#include -#include +#include +#include namespace units::physical { diff --git a/src/include/units/physical/bits/length.h b/src/include/units/physical/dimensions/length.h similarity index 100% rename from src/include/units/physical/bits/length.h rename to src/include/units/physical/dimensions/length.h diff --git a/src/include/units/physical/bits/luminance.h b/src/include/units/physical/dimensions/luminance.h similarity index 93% rename from src/include/units/physical/bits/luminance.h rename to src/include/units/physical/dimensions/luminance.h index 592897b9..6fa966ed 100644 --- a/src/include/units/physical/bits/luminance.h +++ b/src/include/units/physical/dimensions/luminance.h @@ -23,8 +23,8 @@ #pragma once #include -#include -#include +#include +#include namespace units::physical { diff --git a/src/include/units/physical/bits/luminous_intensity.h b/src/include/units/physical/dimensions/luminous_intensity.h similarity index 100% rename from src/include/units/physical/bits/luminous_intensity.h rename to src/include/units/physical/dimensions/luminous_intensity.h diff --git a/src/include/units/physical/bits/magnetic_flux.h b/src/include/units/physical/dimensions/magnetic_flux.h similarity index 93% rename from src/include/units/physical/bits/magnetic_flux.h rename to src/include/units/physical/dimensions/magnetic_flux.h index d413cb24..b39e29c1 100644 --- a/src/include/units/physical/bits/magnetic_flux.h +++ b/src/include/units/physical/dimensions/magnetic_flux.h @@ -22,9 +22,9 @@ #pragma once -#include +#include #include -#include +#include namespace units::physical { diff --git a/src/include/units/physical/bits/magnetic_induction.h b/src/include/units/physical/dimensions/magnetic_induction.h similarity index 91% rename from src/include/units/physical/bits/magnetic_induction.h rename to src/include/units/physical/dimensions/magnetic_induction.h index c19a6042..579b3cd5 100644 --- a/src/include/units/physical/bits/magnetic_induction.h +++ b/src/include/units/physical/dimensions/magnetic_induction.h @@ -23,9 +23,9 @@ #pragma once #include -#include -#include -#include +#include +#include +#include namespace units::physical { diff --git a/src/include/units/physical/bits/mass.h b/src/include/units/physical/dimensions/mass.h similarity index 100% rename from src/include/units/physical/bits/mass.h rename to src/include/units/physical/dimensions/mass.h diff --git a/src/include/units/physical/bits/molar_energy.h b/src/include/units/physical/dimensions/molar_energy.h similarity index 93% rename from src/include/units/physical/bits/molar_energy.h rename to src/include/units/physical/dimensions/molar_energy.h index 7e1f48cc..57df33c4 100644 --- a/src/include/units/physical/bits/molar_energy.h +++ b/src/include/units/physical/dimensions/molar_energy.h @@ -22,9 +22,9 @@ #pragma once -#include +#include #include -#include +#include namespace units::physical { diff --git a/src/include/units/physical/bits/momentum.h b/src/include/units/physical/dimensions/momentum.h similarity index 97% rename from src/include/units/physical/bits/momentum.h rename to src/include/units/physical/dimensions/momentum.h index 319a741e..309851df 100644 --- a/src/include/units/physical/bits/momentum.h +++ b/src/include/units/physical/dimensions/momentum.h @@ -23,7 +23,7 @@ #pragma once #include -#include +#include namespace units::physical { diff --git a/src/include/units/physical/bits/permeability.h b/src/include/units/physical/dimensions/permeability.h similarity index 94% rename from src/include/units/physical/bits/permeability.h rename to src/include/units/physical/dimensions/permeability.h index 382e22c6..af4d393d 100644 --- a/src/include/units/physical/bits/permeability.h +++ b/src/include/units/physical/dimensions/permeability.h @@ -23,8 +23,8 @@ #pragma once #include -#include -#include +#include +#include namespace units::physical { diff --git a/src/include/units/physical/bits/permittivity.h b/src/include/units/physical/dimensions/permittivity.h similarity index 93% rename from src/include/units/physical/bits/permittivity.h rename to src/include/units/physical/dimensions/permittivity.h index 82f91b88..e71d92bb 100644 --- a/src/include/units/physical/bits/permittivity.h +++ b/src/include/units/physical/dimensions/permittivity.h @@ -22,9 +22,9 @@ #pragma once -#include +#include #include -#include +#include namespace units::physical { diff --git a/src/include/units/physical/bits/power.h b/src/include/units/physical/dimensions/power.h similarity index 94% rename from src/include/units/physical/bits/power.h rename to src/include/units/physical/dimensions/power.h index 2c1a3aed..9b0c7ed8 100644 --- a/src/include/units/physical/bits/power.h +++ b/src/include/units/physical/dimensions/power.h @@ -23,8 +23,8 @@ #pragma once #include -#include -#include +#include +#include namespace units::physical { diff --git a/src/include/units/physical/bits/pressure.h b/src/include/units/physical/dimensions/pressure.h similarity index 94% rename from src/include/units/physical/bits/pressure.h rename to src/include/units/physical/dimensions/pressure.h index 6391c370..8fe7f9a7 100644 --- a/src/include/units/physical/bits/pressure.h +++ b/src/include/units/physical/dimensions/pressure.h @@ -22,9 +22,9 @@ #pragma once -#include +#include #include -#include +#include namespace units::physical { diff --git a/src/include/units/physical/bits/radioactivity.h b/src/include/units/physical/dimensions/radioactivity.h similarity index 97% rename from src/include/units/physical/bits/radioactivity.h rename to src/include/units/physical/dimensions/radioactivity.h index c21bc10e..b82e94a1 100644 --- a/src/include/units/physical/bits/radioactivity.h +++ b/src/include/units/physical/dimensions/radioactivity.h @@ -23,7 +23,7 @@ #pragma once #include -#include +#include namespace units::physical { diff --git a/src/include/units/physical/bits/resistance.h b/src/include/units/physical/dimensions/resistance.h similarity index 93% rename from src/include/units/physical/bits/resistance.h rename to src/include/units/physical/dimensions/resistance.h index 6fea2236..e36180b0 100644 --- a/src/include/units/physical/bits/resistance.h +++ b/src/include/units/physical/dimensions/resistance.h @@ -23,8 +23,8 @@ #pragma once #include -#include -#include +#include +#include namespace units::physical { diff --git a/src/include/units/physical/bits/speed.h b/src/include/units/physical/dimensions/speed.h similarity index 94% rename from src/include/units/physical/bits/speed.h rename to src/include/units/physical/dimensions/speed.h index 088d0c9d..2a6ba185 100644 --- a/src/include/units/physical/bits/speed.h +++ b/src/include/units/physical/dimensions/speed.h @@ -23,8 +23,8 @@ #pragma once #include -#include -#include +#include +#include namespace units::physical { diff --git a/src/include/units/physical/bits/surface_tension.h b/src/include/units/physical/dimensions/surface_tension.h similarity index 94% rename from src/include/units/physical/bits/surface_tension.h rename to src/include/units/physical/dimensions/surface_tension.h index 8ad9c8d9..9b1a5f22 100644 --- a/src/include/units/physical/bits/surface_tension.h +++ b/src/include/units/physical/dimensions/surface_tension.h @@ -23,8 +23,8 @@ #pragma once #include -#include -#include +#include +#include namespace units::physical { diff --git a/src/include/units/physical/bits/thermal_conductivity.h b/src/include/units/physical/dimensions/thermal_conductivity.h similarity index 91% rename from src/include/units/physical/bits/thermal_conductivity.h rename to src/include/units/physical/dimensions/thermal_conductivity.h index 4374c3c7..0123deee 100644 --- a/src/include/units/physical/bits/thermal_conductivity.h +++ b/src/include/units/physical/dimensions/thermal_conductivity.h @@ -23,9 +23,9 @@ #pragma once #include -#include -#include -#include +#include +#include +#include namespace units::physical { diff --git a/src/include/units/physical/bits/thermodynamic_temperature.h b/src/include/units/physical/dimensions/thermodynamic_temperature.h similarity index 100% rename from src/include/units/physical/bits/thermodynamic_temperature.h rename to src/include/units/physical/dimensions/thermodynamic_temperature.h diff --git a/src/include/units/physical/bits/time.h b/src/include/units/physical/dimensions/time.h similarity index 100% rename from src/include/units/physical/bits/time.h rename to src/include/units/physical/dimensions/time.h diff --git a/src/include/units/physical/bits/torque.h b/src/include/units/physical/dimensions/torque.h similarity index 97% rename from src/include/units/physical/bits/torque.h rename to src/include/units/physical/dimensions/torque.h index b20a1660..b635306a 100644 --- a/src/include/units/physical/bits/torque.h +++ b/src/include/units/physical/dimensions/torque.h @@ -24,7 +24,7 @@ #include #include -#include +#include namespace units::physical { diff --git a/src/include/units/physical/bits/voltage.h b/src/include/units/physical/dimensions/voltage.h similarity index 93% rename from src/include/units/physical/bits/voltage.h rename to src/include/units/physical/dimensions/voltage.h index ed974892..c3f99d6e 100644 --- a/src/include/units/physical/bits/voltage.h +++ b/src/include/units/physical/dimensions/voltage.h @@ -23,8 +23,8 @@ #pragma once #include -#include -#include +#include +#include namespace units::physical { diff --git a/src/include/units/physical/bits/volume.h b/src/include/units/physical/dimensions/volume.h similarity index 96% rename from src/include/units/physical/bits/volume.h rename to src/include/units/physical/dimensions/volume.h index 218fd3ba..62800ada 100644 --- a/src/include/units/physical/bits/volume.h +++ b/src/include/units/physical/dimensions/volume.h @@ -23,7 +23,7 @@ #pragma once #include -#include +#include namespace units::physical { diff --git a/src/include/units/physical/si/base/amount_of_substance.h b/src/include/units/physical/si/base/amount_of_substance.h index 68bf984f..17a42658 100644 --- a/src/include/units/physical/si/base/amount_of_substance.h +++ b/src/include/units/physical/si/base/amount_of_substance.h @@ -22,7 +22,7 @@ #pragma once -#include +#include #include #include diff --git a/src/include/units/physical/si/base/electric_current.h b/src/include/units/physical/si/base/electric_current.h index db2caa20..b24d4f4d 100644 --- a/src/include/units/physical/si/base/electric_current.h +++ b/src/include/units/physical/si/base/electric_current.h @@ -22,7 +22,7 @@ #pragma once -#include +#include #include #include diff --git a/src/include/units/physical/si/base/length.h b/src/include/units/physical/si/base/length.h index b2aae6cb..477a4c68 100644 --- a/src/include/units/physical/si/base/length.h +++ b/src/include/units/physical/si/base/length.h @@ -22,7 +22,7 @@ #pragma once -#include +#include #include #include diff --git a/src/include/units/physical/si/base/luminous_intensity.h b/src/include/units/physical/si/base/luminous_intensity.h index 82cdda12..4ac111e4 100644 --- a/src/include/units/physical/si/base/luminous_intensity.h +++ b/src/include/units/physical/si/base/luminous_intensity.h @@ -22,7 +22,7 @@ #pragma once -#include +#include #include #include diff --git a/src/include/units/physical/si/base/mass.h b/src/include/units/physical/si/base/mass.h index d39e7417..9f3fe0b1 100644 --- a/src/include/units/physical/si/base/mass.h +++ b/src/include/units/physical/si/base/mass.h @@ -22,7 +22,7 @@ #pragma once -#include +#include #include #include diff --git a/src/include/units/physical/si/base/thermodynamic_temperature.h b/src/include/units/physical/si/base/thermodynamic_temperature.h index e75b7c3c..e2f6e147 100644 --- a/src/include/units/physical/si/base/thermodynamic_temperature.h +++ b/src/include/units/physical/si/base/thermodynamic_temperature.h @@ -22,7 +22,7 @@ #pragma once -#include +#include #include namespace units::physical::si { diff --git a/src/include/units/physical/si/base/time.h b/src/include/units/physical/si/base/time.h index d6f6aea8..a18d8413 100644 --- a/src/include/units/physical/si/base/time.h +++ b/src/include/units/physical/si/base/time.h @@ -22,7 +22,7 @@ #pragma once -#include +#include #include #include diff --git a/src/include/units/physical/si/cgs/base/length.h b/src/include/units/physical/si/cgs/base/length.h index 0eca93d7..1ab6e0c5 100644 --- a/src/include/units/physical/si/cgs/base/length.h +++ b/src/include/units/physical/si/cgs/base/length.h @@ -22,7 +22,6 @@ #pragma once -#include #include #include diff --git a/src/include/units/physical/si/cgs/base/mass.h b/src/include/units/physical/si/cgs/base/mass.h index 22b51fa2..6a4a30fd 100644 --- a/src/include/units/physical/si/cgs/base/mass.h +++ b/src/include/units/physical/si/cgs/base/mass.h @@ -22,7 +22,6 @@ #pragma once -#include #include #include diff --git a/src/include/units/physical/si/cgs/base/time.h b/src/include/units/physical/si/cgs/base/time.h index 40a1900d..5e40151c 100644 --- a/src/include/units/physical/si/cgs/base/time.h +++ b/src/include/units/physical/si/cgs/base/time.h @@ -22,7 +22,6 @@ #pragma once -#include #include #include diff --git a/src/include/units/physical/si/cgs/cgs.h b/src/include/units/physical/si/cgs/cgs.h index 4a4b9eb1..18ece1ef 100644 --- a/src/include/units/physical/si/cgs/cgs.h +++ b/src/include/units/physical/si/cgs/cgs.h @@ -22,16 +22,14 @@ #pragma once -#define MP_UNITS_SYSTEM_SI_CGS - #include #include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include diff --git a/src/include/units/physical/si/cgs/bits/derived/acceleration.h b/src/include/units/physical/si/cgs/derived/acceleration.h similarity index 87% rename from src/include/units/physical/si/cgs/bits/derived/acceleration.h rename to src/include/units/physical/si/cgs/derived/acceleration.h index e969a273..e4776469 100644 --- a/src/include/units/physical/si/cgs/bits/derived/acceleration.h +++ b/src/include/units/physical/si/cgs/derived/acceleration.h @@ -22,14 +22,8 @@ #pragma once -#ifndef MP_UNITS_SYSTEM_SI_CGS - -#error "Please do not include this file directly. Use `units/physical/si/cgs/cgs.h` to prevent potential ODR violation issues." - -#endif - -#include -#include +#include +#include #include namespace units::physical::si::cgs { diff --git a/src/include/units/physical/si/cgs/bits/derived/area.h b/src/include/units/physical/si/cgs/derived/area.h similarity index 87% rename from src/include/units/physical/si/cgs/bits/derived/area.h rename to src/include/units/physical/si/cgs/derived/area.h index ef6e35b3..b812fcdc 100644 --- a/src/include/units/physical/si/cgs/bits/derived/area.h +++ b/src/include/units/physical/si/cgs/derived/area.h @@ -22,15 +22,8 @@ #pragma once -#ifndef MP_UNITS_SYSTEM_SI_CGS - -#error "Please do not include this file directly. Use `units/physical/si/cgs/cgs.h` to prevent potential ODR violation issues." - -#endif - -#include +#include #include -#include #include namespace units::physical::si::cgs { diff --git a/src/include/units/physical/si/cgs/bits/derived/energy.h b/src/include/units/physical/si/cgs/derived/energy.h similarity index 87% rename from src/include/units/physical/si/cgs/bits/derived/energy.h rename to src/include/units/physical/si/cgs/derived/energy.h index e556509f..045c696f 100644 --- a/src/include/units/physical/si/cgs/bits/derived/energy.h +++ b/src/include/units/physical/si/cgs/derived/energy.h @@ -22,14 +22,8 @@ #pragma once -#ifndef MP_UNITS_SYSTEM_SI_CGS - -#error "Please do not include this file directly. Use `units/physical/si/cgs/cgs.h` to prevent potential ODR violation issues." - -#endif - -#include -#include +#include +#include #include #include diff --git a/src/include/units/physical/si/cgs/bits/derived/force.h b/src/include/units/physical/si/cgs/derived/force.h similarity index 87% rename from src/include/units/physical/si/cgs/bits/derived/force.h rename to src/include/units/physical/si/cgs/derived/force.h index df2b605e..194bf77d 100644 --- a/src/include/units/physical/si/cgs/bits/derived/force.h +++ b/src/include/units/physical/si/cgs/derived/force.h @@ -22,14 +22,8 @@ #pragma once -#ifndef MP_UNITS_SYSTEM_SI_CGS - -#error "Please do not include this file directly. Use `units/physical/si/cgs/cgs.h` to prevent potential ODR violation issues." - -#endif - -#include -#include +#include +#include #include #include #include diff --git a/src/include/units/physical/si/cgs/bits/derived/power.h b/src/include/units/physical/si/cgs/derived/power.h similarity index 87% rename from src/include/units/physical/si/cgs/bits/derived/power.h rename to src/include/units/physical/si/cgs/derived/power.h index b987d564..06e84ce0 100644 --- a/src/include/units/physical/si/cgs/bits/derived/power.h +++ b/src/include/units/physical/si/cgs/derived/power.h @@ -22,14 +22,8 @@ #pragma once -#ifndef MP_UNITS_SYSTEM_SI_CGS - -#error "Please do not include this file directly. Use `units/physical/si/cgs/cgs.h` to prevent potential ODR violation issues." - -#endif - -#include -#include +#include +#include #include #include diff --git a/src/include/units/physical/si/cgs/bits/derived/pressure.h b/src/include/units/physical/si/cgs/derived/pressure.h similarity index 85% rename from src/include/units/physical/si/cgs/bits/derived/pressure.h rename to src/include/units/physical/si/cgs/derived/pressure.h index 32a8a54c..9f13f87c 100644 --- a/src/include/units/physical/si/cgs/bits/derived/pressure.h +++ b/src/include/units/physical/si/cgs/derived/pressure.h @@ -22,15 +22,9 @@ #pragma once -#ifndef MP_UNITS_SYSTEM_SI_CGS - -#error "Please do not include this file directly. Use `units/physical/si/cgs/cgs.h` to prevent potential ODR violation issues." - -#endif - -#include -#include -#include +#include +#include +#include #include #include diff --git a/src/include/units/physical/si/cgs/bits/derived/speed.h b/src/include/units/physical/si/cgs/derived/speed.h similarity index 90% rename from src/include/units/physical/si/cgs/bits/derived/speed.h rename to src/include/units/physical/si/cgs/derived/speed.h index 96811c29..79f80d70 100644 --- a/src/include/units/physical/si/cgs/bits/derived/speed.h +++ b/src/include/units/physical/si/cgs/derived/speed.h @@ -22,13 +22,7 @@ #pragma once -#ifndef MP_UNITS_SYSTEM_SI_CGS - -#error "Please do not include this file directly. Use `units/physical/si/cgs/cgs.h` to prevent potential ODR violation issues." - -#endif - -#include +#include #include #include #include diff --git a/src/include/units/physical/si/constants.h b/src/include/units/physical/si/constants.h index fcf9d7fc..0a2af419 100644 --- a/src/include/units/physical/si/constants.h +++ b/src/include/units/physical/si/constants.h @@ -22,7 +22,13 @@ #pragma once -#include +#include +#include +#include +#include +#include +#include +#include namespace units::physical::si::si2019 { diff --git a/src/include/units/physical/si/bits/derived/absorbed_dose.h b/src/include/units/physical/si/derived/absorbed_dose.h similarity index 96% rename from src/include/units/physical/si/bits/derived/absorbed_dose.h rename to src/include/units/physical/si/derived/absorbed_dose.h index 40a59fea..9feb64d8 100644 --- a/src/include/units/physical/si/bits/derived/absorbed_dose.h +++ b/src/include/units/physical/si/derived/absorbed_dose.h @@ -22,14 +22,8 @@ #pragma once -#ifndef MP_UNITS_SYSTEM_SI - -#error "Please do not include this file directly. Use `units/physical/si/si.h` to prevent potential ODR violation issues." - -#endif - -#include -#include +#include +#include #include #include diff --git a/src/include/units/physical/si/bits/derived/acceleration.h b/src/include/units/physical/si/derived/acceleration.h similarity index 88% rename from src/include/units/physical/si/bits/derived/acceleration.h rename to src/include/units/physical/si/derived/acceleration.h index 46f243d0..ba75ca1e 100644 --- a/src/include/units/physical/si/bits/derived/acceleration.h +++ b/src/include/units/physical/si/derived/acceleration.h @@ -22,14 +22,8 @@ #pragma once -#ifndef MP_UNITS_SYSTEM_SI - -#error "Please do not include this file directly. Use `units/physical/si/si.h` to prevent potential ODR violation issues." - -#endif - -#include -#include +#include +#include #include namespace units::physical::si { diff --git a/src/include/units/physical/si/bits/derived/angular_velocity.h b/src/include/units/physical/si/derived/angular_velocity.h similarity index 90% rename from src/include/units/physical/si/bits/derived/angular_velocity.h rename to src/include/units/physical/si/derived/angular_velocity.h index f217e15b..f4b56b7e 100644 --- a/src/include/units/physical/si/bits/derived/angular_velocity.h +++ b/src/include/units/physical/si/derived/angular_velocity.h @@ -22,13 +22,7 @@ #pragma once -#ifndef MP_UNITS_SYSTEM_SI - -#error "Please do not include this file directly. Use `units/physical/si/si.h` to prevent potential ODR violation issues." - -#endif - -#include +#include #include #include diff --git a/src/include/units/physical/si/bits/derived/area.h b/src/include/units/physical/si/derived/area.h similarity index 97% rename from src/include/units/physical/si/bits/derived/area.h rename to src/include/units/physical/si/derived/area.h index d3055d14..99a69d5f 100644 --- a/src/include/units/physical/si/bits/derived/area.h +++ b/src/include/units/physical/si/derived/area.h @@ -22,13 +22,7 @@ #pragma once -#ifndef MP_UNITS_SYSTEM_SI - -#error "Please do not include this file directly. Use `units/physical/si/si.h` to prevent potential ODR violation issues." - -#endif - -#include +#include #include #include diff --git a/src/include/units/physical/si/bits/derived/capacitance.h b/src/include/units/physical/si/derived/capacitance.h similarity index 95% rename from src/include/units/physical/si/bits/derived/capacitance.h rename to src/include/units/physical/si/derived/capacitance.h index 7ee7cdfc..6e3ca871 100644 --- a/src/include/units/physical/si/bits/derived/capacitance.h +++ b/src/include/units/physical/si/derived/capacitance.h @@ -22,15 +22,9 @@ #pragma once -#ifndef MP_UNITS_SYSTEM_SI - -#error "Please do not include this file directly. Use `units/physical/si/si.h` to prevent potential ODR violation issues." - -#endif - -#include -#include -#include +#include +#include +#include #include #include diff --git a/src/include/units/physical/si/bits/derived/catalytic_activity.h b/src/include/units/physical/si/derived/catalytic_activity.h similarity index 97% rename from src/include/units/physical/si/bits/derived/catalytic_activity.h rename to src/include/units/physical/si/derived/catalytic_activity.h index 1a7187b0..db5d296d 100644 --- a/src/include/units/physical/si/bits/derived/catalytic_activity.h +++ b/src/include/units/physical/si/derived/catalytic_activity.h @@ -22,13 +22,7 @@ #pragma once -#ifndef MP_UNITS_SYSTEM_SI - -#error "Please do not include this file directly. Use `units/physical/si/si.h` to prevent potential ODR violation issues." - -#endif - -#include +#include #include #include #include diff --git a/src/include/units/physical/si/bits/derived/charge_density.h b/src/include/units/physical/si/derived/charge_density.h similarity index 90% rename from src/include/units/physical/si/bits/derived/charge_density.h rename to src/include/units/physical/si/derived/charge_density.h index 7402c39c..a3483936 100644 --- a/src/include/units/physical/si/bits/derived/charge_density.h +++ b/src/include/units/physical/si/derived/charge_density.h @@ -22,14 +22,8 @@ #pragma once -#ifndef MP_UNITS_SYSTEM_SI - -#error "Please do not include this file directly. Use `units/physical/si/si.h` to prevent potential ODR violation issues." - -#endif - -#include -#include +#include +#include #include #include #include diff --git a/src/include/units/physical/si/bits/derived/concentration.h b/src/include/units/physical/si/derived/concentration.h similarity index 90% rename from src/include/units/physical/si/bits/derived/concentration.h rename to src/include/units/physical/si/derived/concentration.h index ff6a1a5f..a8579247 100644 --- a/src/include/units/physical/si/bits/derived/concentration.h +++ b/src/include/units/physical/si/derived/concentration.h @@ -22,13 +22,7 @@ #pragma once -#ifndef MP_UNITS_SYSTEM_SI - -#error "Please do not include this file directly. Use `units/physical/si/si.h` to prevent potential ODR violation issues." - -#endif - -#include +#include #include #include #include diff --git a/src/include/units/physical/si/bits/derived/conductance.h b/src/include/units/physical/si/derived/conductance.h similarity index 96% rename from src/include/units/physical/si/bits/derived/conductance.h rename to src/include/units/physical/si/derived/conductance.h index c8e9a1f9..a5fdf39c 100644 --- a/src/include/units/physical/si/bits/derived/conductance.h +++ b/src/include/units/physical/si/derived/conductance.h @@ -22,14 +22,8 @@ #pragma once -#ifndef MP_UNITS_SYSTEM_SI - -#error "Please do not include this file directly. Use `units/physical/si/si.h` to prevent potential ODR violation issues." - -#endif - -#include -#include +#include +#include #include #include diff --git a/src/include/units/physical/si/bits/derived/current_density.h b/src/include/units/physical/si/derived/current_density.h similarity index 90% rename from src/include/units/physical/si/bits/derived/current_density.h rename to src/include/units/physical/si/derived/current_density.h index a727515d..1ca4065d 100644 --- a/src/include/units/physical/si/bits/derived/current_density.h +++ b/src/include/units/physical/si/derived/current_density.h @@ -22,13 +22,7 @@ #pragma once -#ifndef MP_UNITS_SYSTEM_SI - -#error "Please do not include this file directly. Use `units/physical/si/si.h` to prevent potential ODR violation issues." - -#endif - -#include +#include #include #include #include diff --git a/src/include/units/physical/si/bits/derived/density.h b/src/include/units/physical/si/derived/density.h similarity index 90% rename from src/include/units/physical/si/bits/derived/density.h rename to src/include/units/physical/si/derived/density.h index 172133b4..52b32275 100644 --- a/src/include/units/physical/si/bits/derived/density.h +++ b/src/include/units/physical/si/derived/density.h @@ -22,13 +22,7 @@ #pragma once -#ifndef MP_UNITS_SYSTEM_SI - -#error "Please do not include this file directly. Use `units/physical/si/si.h` to prevent potential ODR violation issues." - -#endif - -#include +#include #include #include #include diff --git a/src/include/units/physical/si/bits/derived/dynamic_viscosity.h b/src/include/units/physical/si/derived/dynamic_viscosity.h similarity index 88% rename from src/include/units/physical/si/bits/derived/dynamic_viscosity.h rename to src/include/units/physical/si/derived/dynamic_viscosity.h index 73e11062..8757770a 100644 --- a/src/include/units/physical/si/bits/derived/dynamic_viscosity.h +++ b/src/include/units/physical/si/derived/dynamic_viscosity.h @@ -22,15 +22,9 @@ #pragma once -#ifndef MP_UNITS_SYSTEM_SI - -#error "Please do not include this file directly. Use `units/physical/si/si.h` to prevent potential ODR violation issues." - -#endif - -#include +#include #include -#include +#include #include namespace units::physical::si { diff --git a/src/include/units/physical/si/bits/derived/electric_charge.h b/src/include/units/physical/si/derived/electric_charge.h similarity index 90% rename from src/include/units/physical/si/bits/derived/electric_charge.h rename to src/include/units/physical/si/derived/electric_charge.h index fc5c9367..b0c1fee9 100644 --- a/src/include/units/physical/si/bits/derived/electric_charge.h +++ b/src/include/units/physical/si/derived/electric_charge.h @@ -22,13 +22,7 @@ #pragma once -#ifndef MP_UNITS_SYSTEM_SI - -#error "Please do not include this file directly. Use `units/physical/si/si.h` to prevent potential ODR violation issues." - -#endif - -#include +#include #include #include #include diff --git a/src/include/units/physical/si/bits/derived/electric_field_strength.h b/src/include/units/physical/si/derived/electric_field_strength.h similarity index 88% rename from src/include/units/physical/si/bits/derived/electric_field_strength.h rename to src/include/units/physical/si/derived/electric_field_strength.h index fff193fe..d3af926f 100644 --- a/src/include/units/physical/si/bits/derived/electric_field_strength.h +++ b/src/include/units/physical/si/derived/electric_field_strength.h @@ -22,14 +22,8 @@ #pragma once -#ifndef MP_UNITS_SYSTEM_SI - -#error "Please do not include this file directly. Use `units/physical/si/si.h` to prevent potential ODR violation issues." - -#endif - -#include -#include +#include +#include #include namespace units::physical::si { diff --git a/src/include/units/physical/si/bits/derived/energy.h b/src/include/units/physical/si/derived/energy.h similarity index 96% rename from src/include/units/physical/si/bits/derived/energy.h rename to src/include/units/physical/si/derived/energy.h index 0a9a9559..9c2b231f 100644 --- a/src/include/units/physical/si/bits/derived/energy.h +++ b/src/include/units/physical/si/derived/energy.h @@ -22,14 +22,8 @@ #pragma once -#ifndef MP_UNITS_SYSTEM_SI - -#error "Please do not include this file directly. Use `units/physical/si/si.h` to prevent potential ODR violation issues." - -#endif - -#include -#include +#include +#include #include #include diff --git a/src/include/units/physical/si/bits/derived/force.h b/src/include/units/physical/si/derived/force.h similarity index 96% rename from src/include/units/physical/si/bits/derived/force.h rename to src/include/units/physical/si/derived/force.h index 5083db95..cf1882c1 100644 --- a/src/include/units/physical/si/bits/derived/force.h +++ b/src/include/units/physical/si/derived/force.h @@ -22,14 +22,8 @@ #pragma once -#ifndef MP_UNITS_SYSTEM_SI - -#error "Please do not include this file directly. Use `units/physical/si/si.h` to prevent potential ODR violation issues." - -#endif - -#include -#include +#include +#include #include #include #include diff --git a/src/include/units/physical/si/bits/derived/frequency.h b/src/include/units/physical/si/derived/frequency.h similarity index 96% rename from src/include/units/physical/si/bits/derived/frequency.h rename to src/include/units/physical/si/derived/frequency.h index 6c5b8063..c804f23d 100644 --- a/src/include/units/physical/si/bits/derived/frequency.h +++ b/src/include/units/physical/si/derived/frequency.h @@ -22,13 +22,7 @@ #pragma once -#ifndef MP_UNITS_SYSTEM_SI - -#error "Please do not include this file directly. Use `units/physical/si/si.h` to prevent potential ODR violation issues." - -#endif - -#include +#include #include #include diff --git a/src/include/units/physical/si/bits/derived/heat_capacity.h b/src/include/units/physical/si/derived/heat_capacity.h similarity index 92% rename from src/include/units/physical/si/bits/derived/heat_capacity.h rename to src/include/units/physical/si/derived/heat_capacity.h index ece7e069..e0fcc2c2 100644 --- a/src/include/units/physical/si/bits/derived/heat_capacity.h +++ b/src/include/units/physical/si/derived/heat_capacity.h @@ -22,15 +22,9 @@ #pragma once -#ifndef MP_UNITS_SYSTEM_SI - -#error "Please do not include this file directly. Use `units/physical/si/si.h` to prevent potential ODR violation issues." - -#endif - -#include +#include #include -#include +#include #include #include #include diff --git a/src/include/units/physical/si/bits/derived/inductance.h b/src/include/units/physical/si/derived/inductance.h similarity index 96% rename from src/include/units/physical/si/bits/derived/inductance.h rename to src/include/units/physical/si/derived/inductance.h index e9586347..397eb50d 100644 --- a/src/include/units/physical/si/bits/derived/inductance.h +++ b/src/include/units/physical/si/derived/inductance.h @@ -22,14 +22,8 @@ #pragma once -#ifndef MP_UNITS_SYSTEM_SI - -#error "Please do not include this file directly. Use `units/physical/si/si.h` to prevent potential ODR violation issues." - -#endif - -#include -#include +#include +#include #include #include diff --git a/src/include/units/physical/si/bits/derived/luminance.h b/src/include/units/physical/si/derived/luminance.h similarity index 90% rename from src/include/units/physical/si/bits/derived/luminance.h rename to src/include/units/physical/si/derived/luminance.h index f5939723..1e7f060c 100644 --- a/src/include/units/physical/si/bits/derived/luminance.h +++ b/src/include/units/physical/si/derived/luminance.h @@ -22,13 +22,7 @@ #pragma once -#ifndef MP_UNITS_SYSTEM_SI - -#error "Please do not include this file directly. Use `units/physical/si/si.h` to prevent potential ODR violation issues." - -#endif - -#include +#include #include #include #include diff --git a/src/include/units/physical/si/bits/derived/magnetic_flux.h b/src/include/units/physical/si/derived/magnetic_flux.h similarity index 95% rename from src/include/units/physical/si/bits/derived/magnetic_flux.h rename to src/include/units/physical/si/derived/magnetic_flux.h index 23bcdf1d..6f9927a4 100644 --- a/src/include/units/physical/si/bits/derived/magnetic_flux.h +++ b/src/include/units/physical/si/derived/magnetic_flux.h @@ -22,15 +22,9 @@ #pragma once -#ifndef MP_UNITS_SYSTEM_SI - -#error "Please do not include this file directly. Use `units/physical/si/si.h` to prevent potential ODR violation issues." - -#endif - -#include -#include -#include +#include +#include +#include #include namespace units::physical::si { diff --git a/src/include/units/physical/si/bits/derived/magnetic_induction.h b/src/include/units/physical/si/derived/magnetic_induction.h similarity index 96% rename from src/include/units/physical/si/bits/derived/magnetic_induction.h rename to src/include/units/physical/si/derived/magnetic_induction.h index 2ca02587..b048e3ee 100644 --- a/src/include/units/physical/si/bits/derived/magnetic_induction.h +++ b/src/include/units/physical/si/derived/magnetic_induction.h @@ -22,14 +22,8 @@ #pragma once -#ifndef MP_UNITS_SYSTEM_SI - -#error "Please do not include this file directly. Use `units/physical/si/si.h` to prevent potential ODR violation issues." - -#endif - -#include -#include +#include +#include #include #include #include diff --git a/src/include/units/physical/si/bits/derived/molar_energy.h b/src/include/units/physical/si/derived/molar_energy.h similarity index 88% rename from src/include/units/physical/si/bits/derived/molar_energy.h rename to src/include/units/physical/si/derived/molar_energy.h index aaaa0ef0..4dfc6f26 100644 --- a/src/include/units/physical/si/bits/derived/molar_energy.h +++ b/src/include/units/physical/si/derived/molar_energy.h @@ -22,14 +22,8 @@ #pragma once -#ifndef MP_UNITS_SYSTEM_SI - -#error "Please do not include this file directly. Use `units/physical/si/si.h` to prevent potential ODR violation issues." - -#endif - -#include -#include +#include +#include #include #include #include diff --git a/src/include/units/physical/si/bits/derived/momentum.h b/src/include/units/physical/si/derived/momentum.h similarity index 88% rename from src/include/units/physical/si/bits/derived/momentum.h rename to src/include/units/physical/si/derived/momentum.h index 9313dafa..5273d379 100644 --- a/src/include/units/physical/si/bits/derived/momentum.h +++ b/src/include/units/physical/si/derived/momentum.h @@ -22,15 +22,9 @@ #pragma once -#ifndef MP_UNITS_SYSTEM_SI - -#error "Please do not include this file directly. Use `units/physical/si/si.h` to prevent potential ODR violation issues." - -#endif - -#include +#include #include -#include +#include #include namespace units::physical::si { diff --git a/src/include/units/physical/si/bits/derived/permeability.h b/src/include/units/physical/si/derived/permeability.h similarity index 87% rename from src/include/units/physical/si/bits/derived/permeability.h rename to src/include/units/physical/si/derived/permeability.h index 08a6a8c6..88040be5 100644 --- a/src/include/units/physical/si/bits/derived/permeability.h +++ b/src/include/units/physical/si/derived/permeability.h @@ -22,14 +22,8 @@ #pragma once -#ifndef MP_UNITS_SYSTEM_SI - -#error "Please do not include this file directly. Use `units/physical/si/si.h` to prevent potential ODR violation issues." - -#endif - -#include -#include +#include +#include #include #include diff --git a/src/include/units/physical/si/bits/derived/permittivity.h b/src/include/units/physical/si/derived/permittivity.h similarity index 87% rename from src/include/units/physical/si/bits/derived/permittivity.h rename to src/include/units/physical/si/derived/permittivity.h index 0b2e1cbb..5aa4842a 100644 --- a/src/include/units/physical/si/bits/derived/permittivity.h +++ b/src/include/units/physical/si/derived/permittivity.h @@ -22,14 +22,8 @@ #pragma once -#ifndef MP_UNITS_SYSTEM_SI - -#error "Please do not include this file directly. Use `units/physical/si/si.h` to prevent potential ODR violation issues." - -#endif - -#include -#include +#include +#include #include #include diff --git a/src/include/units/physical/si/bits/derived/power.h b/src/include/units/physical/si/derived/power.h similarity index 95% rename from src/include/units/physical/si/bits/derived/power.h rename to src/include/units/physical/si/derived/power.h index 8d440497..80345275 100644 --- a/src/include/units/physical/si/bits/derived/power.h +++ b/src/include/units/physical/si/derived/power.h @@ -22,14 +22,8 @@ #pragma once -#ifndef MP_UNITS_SYSTEM_SI - -#error "Please do not include this file directly. Use `units/physical/si/si.h` to prevent potential ODR violation issues." - -#endif - -#include -#include +#include +#include #include #include diff --git a/src/include/units/physical/si/bits/derived/pressure.h b/src/include/units/physical/si/derived/pressure.h similarity index 96% rename from src/include/units/physical/si/bits/derived/pressure.h rename to src/include/units/physical/si/derived/pressure.h index adc0bd03..ac33f941 100644 --- a/src/include/units/physical/si/bits/derived/pressure.h +++ b/src/include/units/physical/si/derived/pressure.h @@ -22,15 +22,9 @@ #pragma once -#ifndef MP_UNITS_SYSTEM_SI - -#error "Please do not include this file directly. Use `units/physical/si/si.h` to prevent potential ODR violation issues." - -#endif - -#include -#include -#include +#include +#include +#include #include #include diff --git a/src/include/units/physical/si/bits/derived/resistance.h b/src/include/units/physical/si/derived/resistance.h similarity index 96% rename from src/include/units/physical/si/bits/derived/resistance.h rename to src/include/units/physical/si/derived/resistance.h index 37e82f3e..b7b4c199 100644 --- a/src/include/units/physical/si/bits/derived/resistance.h +++ b/src/include/units/physical/si/derived/resistance.h @@ -22,14 +22,8 @@ #pragma once -#ifndef MP_UNITS_SYSTEM_SI - -#error "Please do not include this file directly. Use `units/physical/si/si.h` to prevent potential ODR violation issues." - -#endif - -#include -#include +#include +#include #include #include #include diff --git a/src/include/units/physical/si/bits/derived/speed.h b/src/include/units/physical/si/derived/speed.h similarity index 91% rename from src/include/units/physical/si/bits/derived/speed.h rename to src/include/units/physical/si/derived/speed.h index b31e0028..8313f80a 100644 --- a/src/include/units/physical/si/bits/derived/speed.h +++ b/src/include/units/physical/si/derived/speed.h @@ -22,13 +22,7 @@ #pragma once -#ifndef MP_UNITS_SYSTEM_SI - -#error "Please do not include this file directly. Use `units/physical/si/si.h` to prevent potential ODR violation issues." - -#endif - -#include +#include #include #include #include diff --git a/src/include/units/physical/si/bits/derived/surface_tension.h b/src/include/units/physical/si/derived/surface_tension.h similarity index 88% rename from src/include/units/physical/si/bits/derived/surface_tension.h rename to src/include/units/physical/si/derived/surface_tension.h index 2c117cfc..7f38a400 100644 --- a/src/include/units/physical/si/bits/derived/surface_tension.h +++ b/src/include/units/physical/si/derived/surface_tension.h @@ -22,14 +22,8 @@ #pragma once -#ifndef MP_UNITS_SYSTEM_SI - -#error "Please do not include this file directly. Use `units/physical/si/si.h` to prevent potential ODR violation issues." - -#endif - -#include -#include +#include +#include #include namespace units::physical::si { diff --git a/src/include/units/physical/si/bits/derived/thermal_conductivity.h b/src/include/units/physical/si/derived/thermal_conductivity.h similarity index 88% rename from src/include/units/physical/si/bits/derived/thermal_conductivity.h rename to src/include/units/physical/si/derived/thermal_conductivity.h index cc8e3ba4..56bbfea7 100644 --- a/src/include/units/physical/si/bits/derived/thermal_conductivity.h +++ b/src/include/units/physical/si/derived/thermal_conductivity.h @@ -22,14 +22,8 @@ #pragma once -#ifndef MP_UNITS_SYSTEM_SI - -#error "Please do not include this file directly. Use `units/physical/si/si.h` to prevent potential ODR violation issues." - -#endif - -#include -#include +#include +#include #include #include diff --git a/src/include/units/physical/si/bits/derived/torque.h b/src/include/units/physical/si/derived/torque.h similarity index 88% rename from src/include/units/physical/si/bits/derived/torque.h rename to src/include/units/physical/si/derived/torque.h index e6c267d3..cfeb4f9f 100644 --- a/src/include/units/physical/si/bits/derived/torque.h +++ b/src/include/units/physical/si/derived/torque.h @@ -22,14 +22,8 @@ #pragma once -#ifndef MP_UNITS_SYSTEM_SI - -#error "Please do not include this file directly. Use `units/physical/si/si.h` to prevent potential ODR violation issues." - -#endif - -#include -#include +#include +#include #include #include #include diff --git a/src/include/units/physical/si/bits/derived/voltage.h b/src/include/units/physical/si/derived/voltage.h similarity index 96% rename from src/include/units/physical/si/bits/derived/voltage.h rename to src/include/units/physical/si/derived/voltage.h index 4e49d896..0b88343f 100644 --- a/src/include/units/physical/si/bits/derived/voltage.h +++ b/src/include/units/physical/si/derived/voltage.h @@ -22,15 +22,9 @@ #pragma once -#ifndef MP_UNITS_SYSTEM_SI - -#error "Please do not include this file directly. Use `units/physical/si/si.h` to prevent potential ODR violation issues." - -#endif - -#include +#include #include -#include +#include #include #include diff --git a/src/include/units/physical/si/bits/derived/volume.h b/src/include/units/physical/si/derived/volume.h similarity index 98% rename from src/include/units/physical/si/bits/derived/volume.h rename to src/include/units/physical/si/derived/volume.h index 60adf264..24005c9f 100644 --- a/src/include/units/physical/si/bits/derived/volume.h +++ b/src/include/units/physical/si/derived/volume.h @@ -22,13 +22,7 @@ #pragma once -#ifndef MP_UNITS_SYSTEM_SI - -#error "Please do not include this file directly. Use `units/physical/si/si.h` to prevent potential ODR violation issues." - -#endif - -#include +#include #include #include diff --git a/src/include/units/physical/si/fps/base/length.h b/src/include/units/physical/si/fps/base/length.h index d0d8174b..8d2255ef 100644 --- a/src/include/units/physical/si/fps/base/length.h +++ b/src/include/units/physical/si/fps/base/length.h @@ -22,7 +22,6 @@ #pragma once -#include #include #include diff --git a/src/include/units/physical/si/fps/base/mass.h b/src/include/units/physical/si/fps/base/mass.h index 711efd15..a79f94fb 100644 --- a/src/include/units/physical/si/fps/base/mass.h +++ b/src/include/units/physical/si/fps/base/mass.h @@ -22,7 +22,6 @@ #pragma once -#include #include #include diff --git a/src/include/units/physical/si/fps/base/time.h b/src/include/units/physical/si/fps/base/time.h index 04c258d3..b9a00c71 100644 --- a/src/include/units/physical/si/fps/base/time.h +++ b/src/include/units/physical/si/fps/base/time.h @@ -22,7 +22,6 @@ #pragma once -#include #include #include diff --git a/src/include/units/physical/si/fps/base_quantities.h b/src/include/units/physical/si/fps/base_quantities.h deleted file mode 100644 index cb7089af..00000000 --- a/src/include/units/physical/si/fps/base_quantities.h +++ /dev/null @@ -1,27 +0,0 @@ -// The MIT License (MIT) -// -// Copyright (c) 2018 Mateusz Pusz -// -// Permission is hereby granted, free of charge, to any person obtaining a copy -// of this software and associated documentation files (the "Software"), to deal -// in the Software without restriction, including without limitation the rights -// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -// copies of the Software, and to permit persons to whom the Software is -// furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in all -// copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -// SOFTWARE. - -#pragma once - -#include -#include -#include diff --git a/src/include/units/physical/si/fps/bits/derived/acceleration.h b/src/include/units/physical/si/fps/derived/acceleration.h similarity index 87% rename from src/include/units/physical/si/fps/bits/derived/acceleration.h rename to src/include/units/physical/si/fps/derived/acceleration.h index 62fbe038..67ec4609 100644 --- a/src/include/units/physical/si/fps/bits/derived/acceleration.h +++ b/src/include/units/physical/si/fps/derived/acceleration.h @@ -22,14 +22,8 @@ #pragma once -#ifndef MP_UNITS_SYSTEM_SI_FPS - -#error "Please do not include this file directly. Use `units/physical/si/fps/fps.h` to prevent potential ODR violation issues." - -#endif - -#include -#include +#include +#include #include namespace units::physical::si::fps { diff --git a/src/include/units/physical/si/fps/bits/derived/area.h b/src/include/units/physical/si/fps/derived/area.h similarity index 89% rename from src/include/units/physical/si/fps/bits/derived/area.h rename to src/include/units/physical/si/fps/derived/area.h index c564a511..11fd430d 100644 --- a/src/include/units/physical/si/fps/bits/derived/area.h +++ b/src/include/units/physical/si/fps/derived/area.h @@ -22,13 +22,7 @@ #pragma once -#ifndef MP_UNITS_SYSTEM_SI_FPS - -#error "Please do not include this file directly. Use `units/physical/si/fps/fps.h` to prevent potential ODR violation issues." - -#endif - -#include +#include #include #include diff --git a/src/include/units/physical/si/fps/bits/derived/density.h b/src/include/units/physical/si/fps/derived/density.h similarity index 90% rename from src/include/units/physical/si/fps/bits/derived/density.h rename to src/include/units/physical/si/fps/derived/density.h index 13e351d6..9ebaf613 100644 --- a/src/include/units/physical/si/fps/bits/derived/density.h +++ b/src/include/units/physical/si/fps/derived/density.h @@ -22,13 +22,7 @@ #pragma once -#ifndef MP_UNITS_SYSTEM_SI_FPS - -#error "Please do not include this file directly. Use `units/physical/si/fps/fps.h` to prevent potential ODR violation issues." - -#endif - -#include +#include #include #include #include diff --git a/src/include/units/physical/si/fps/bits/derived/energy.h b/src/include/units/physical/si/fps/derived/energy.h similarity index 89% rename from src/include/units/physical/si/fps/bits/derived/energy.h rename to src/include/units/physical/si/fps/derived/energy.h index 9c24cf72..55669164 100644 --- a/src/include/units/physical/si/fps/bits/derived/energy.h +++ b/src/include/units/physical/si/fps/derived/energy.h @@ -22,14 +22,8 @@ #pragma once -#ifndef MP_UNITS_SYSTEM_SI_FPS - -#error "Please do not include this file directly. Use `units/physical/si/fps/fps.h` to prevent potential ODR violation issues." - -#endif - -#include -#include +#include +#include #include #include diff --git a/src/include/units/physical/si/fps/bits/derived/force.h b/src/include/units/physical/si/fps/derived/force.h similarity index 90% rename from src/include/units/physical/si/fps/bits/derived/force.h rename to src/include/units/physical/si/fps/derived/force.h index c001edbd..4e2008b2 100644 --- a/src/include/units/physical/si/fps/bits/derived/force.h +++ b/src/include/units/physical/si/fps/derived/force.h @@ -22,14 +22,8 @@ #pragma once -#ifndef MP_UNITS_SYSTEM_SI_FPS - -#error "Please do not include this file directly. Use `units/physical/si/fps/fps.h` to prevent potential ODR violation issues." - -#endif - -#include -#include +#include +#include #include #include #include diff --git a/src/include/units/physical/si/fps/bits/derived/power.h b/src/include/units/physical/si/fps/derived/power.h similarity index 90% rename from src/include/units/physical/si/fps/bits/derived/power.h rename to src/include/units/physical/si/fps/derived/power.h index a27e84b7..2bad905e 100644 --- a/src/include/units/physical/si/fps/bits/derived/power.h +++ b/src/include/units/physical/si/fps/derived/power.h @@ -22,14 +22,8 @@ #pragma once -#ifndef MP_UNITS_SYSTEM_SI_FPS - -#error "Please do not include this file directly. Use `units/physical/si/fps/fps.h` to prevent potential ODR violation issues." - -#endif - -#include -#include +#include +#include #include #include diff --git a/src/include/units/physical/si/fps/bits/derived/pressure.h b/src/include/units/physical/si/fps/derived/pressure.h similarity index 89% rename from src/include/units/physical/si/fps/bits/derived/pressure.h rename to src/include/units/physical/si/fps/derived/pressure.h index 919560db..53016007 100644 --- a/src/include/units/physical/si/fps/bits/derived/pressure.h +++ b/src/include/units/physical/si/fps/derived/pressure.h @@ -22,15 +22,9 @@ #pragma once -#ifndef MP_UNITS_SYSTEM_SI_FPS - -#error "Please do not include this file directly. Use `units/physical/si/fps/fps.h` to prevent potential ODR violation issues." - -#endif - -#include -#include -#include +#include +#include +#include #include #include diff --git a/src/include/units/physical/si/fps/bits/derived/speed.h b/src/include/units/physical/si/fps/derived/speed.h similarity index 92% rename from src/include/units/physical/si/fps/bits/derived/speed.h rename to src/include/units/physical/si/fps/derived/speed.h index 7b1f5f34..982b18aa 100644 --- a/src/include/units/physical/si/fps/bits/derived/speed.h +++ b/src/include/units/physical/si/fps/derived/speed.h @@ -22,13 +22,7 @@ #pragma once -#ifndef MP_UNITS_SYSTEM_SI_FPS - -#error "Please do not include this file directly. Use `units/physical/si/fps/fps.h` to prevent potential ODR violation issues." - -#endif - -#include +#include #include #include #include diff --git a/src/include/units/physical/si/fps/bits/derived/volume.h b/src/include/units/physical/si/fps/derived/volume.h similarity index 90% rename from src/include/units/physical/si/fps/bits/derived/volume.h rename to src/include/units/physical/si/fps/derived/volume.h index bccc76d9..3cf4c29c 100644 --- a/src/include/units/physical/si/fps/bits/derived/volume.h +++ b/src/include/units/physical/si/fps/derived/volume.h @@ -22,13 +22,7 @@ #pragma once -#ifndef MP_UNITS_SYSTEM_SI_FPS - -#error "Please do not include this file directly. Use `units/physical/si/fps/fps.h` to prevent potential ODR violation issues." - -#endif - -#include +#include #include #include diff --git a/src/include/units/physical/si/fps/fps.h b/src/include/units/physical/si/fps/fps.h index 49c30dfe..277e00de 100644 --- a/src/include/units/physical/si/fps/fps.h +++ b/src/include/units/physical/si/fps/fps.h @@ -22,18 +22,16 @@ #pragma once -#define MP_UNITS_SYSTEM_SI_FPS - #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include diff --git a/src/include/units/physical/si/iau/iau.h b/src/include/units/physical/si/iau/iau.h index 38410d3f..c6dc24dd 100644 --- a/src/include/units/physical/si/iau/iau.h +++ b/src/include/units/physical/si/iau/iau.h @@ -22,6 +22,4 @@ #pragma once -#define MP_UNITS_SYSTEM_SI_IAU - #include diff --git a/src/include/units/physical/si/imperial/imperial.h b/src/include/units/physical/si/imperial/imperial.h index 38b6cbaf..4d442900 100644 --- a/src/include/units/physical/si/imperial/imperial.h +++ b/src/include/units/physical/si/imperial/imperial.h @@ -22,6 +22,4 @@ #pragma once -#define MP_UNITS_SYSTEM_SI_IMPERIAL - #include diff --git a/src/include/units/physical/si/international/bits/derived/area.h b/src/include/units/physical/si/international/derived/area.h similarity index 87% rename from src/include/units/physical/si/international/bits/derived/area.h rename to src/include/units/physical/si/international/derived/area.h index d7828604..4d68177f 100644 --- a/src/include/units/physical/si/international/bits/derived/area.h +++ b/src/include/units/physical/si/international/derived/area.h @@ -22,13 +22,7 @@ #pragma once -#ifndef MP_UNITS_SYSTEM_SI_INTERNATIONAL - -#error "Please do not include this file directly. Use `units/physical/si/international/international.h` to prevent potential ODR violation issues." - -#endif - -#include +#include #include namespace units::physical::si::international { diff --git a/src/include/units/physical/si/international/bits/derived/speed.h b/src/include/units/physical/si/international/derived/speed.h similarity index 87% rename from src/include/units/physical/si/international/bits/derived/speed.h rename to src/include/units/physical/si/international/derived/speed.h index 3271b99c..525a949f 100644 --- a/src/include/units/physical/si/international/bits/derived/speed.h +++ b/src/include/units/physical/si/international/derived/speed.h @@ -22,13 +22,7 @@ #pragma once -#ifndef MP_UNITS_SYSTEM_SI_INTERNATIONAL - -#error "Please do not include this file directly. Use `units/physical/si/international/international.h` to prevent potential ODR violation issues." - -#endif - -#include +#include #include namespace units::physical::si::international { diff --git a/src/include/units/physical/si/international/bits/derived/volume.h b/src/include/units/physical/si/international/derived/volume.h similarity index 87% rename from src/include/units/physical/si/international/bits/derived/volume.h rename to src/include/units/physical/si/international/derived/volume.h index 7c855cf8..0c44a997 100644 --- a/src/include/units/physical/si/international/bits/derived/volume.h +++ b/src/include/units/physical/si/international/derived/volume.h @@ -22,13 +22,7 @@ #pragma once -#ifndef MP_UNITS_SYSTEM_SI_INTERNATIONAL - -#error "Please do not include this file directly. Use `units/physical/si/international/international.h` to prevent potential ODR violation issues." - -#endif - -#include +#include #include namespace units::physical::si::international { diff --git a/src/include/units/physical/si/international/international.h b/src/include/units/physical/si/international/international.h index 5d749f33..9f9fbf1a 100644 --- a/src/include/units/physical/si/international/international.h +++ b/src/include/units/physical/si/international/international.h @@ -22,10 +22,8 @@ #pragma once -#define MP_UNITS_SYSTEM_SI_INTERNATIONAL - #include -#include -#include -#include +#include +#include +#include diff --git a/src/include/units/physical/si/si.h b/src/include/units/physical/si/si.h index 46a70c69..b0839d8b 100644 --- a/src/include/units/physical/si/si.h +++ b/src/include/units/physical/si/si.h @@ -22,8 +22,6 @@ #pragma once -#define MP_UNITS_SYSTEM_SI - #include #include #include @@ -32,41 +30,41 @@ #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 +#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/src/include/units/physical/si/typographic/typographic.h b/src/include/units/physical/si/typographic/typographic.h index 2134b2ac..75fab2a3 100644 --- a/src/include/units/physical/si/typographic/typographic.h +++ b/src/include/units/physical/si/typographic/typographic.h @@ -22,6 +22,4 @@ #pragma once -#define MP_UNITS_SYSTEM_SI_TYPOGRAPHIC - #include diff --git a/src/include/units/physical/si/us/us.h b/src/include/units/physical/si/us/us.h index 8df8166f..8d96bb6e 100644 --- a/src/include/units/physical/si/us/us.h +++ b/src/include/units/physical/si/us/us.h @@ -22,6 +22,4 @@ #pragma once -#define MP_UNITS_SYSTEM_SI_US - #include diff --git a/test/unit_test/runtime/distribution_test.cpp b/test/unit_test/runtime/distribution_test.cpp index 850b00ed..d72600a0 100644 --- a/test/unit_test/runtime/distribution_test.cpp +++ b/test/unit_test/runtime/distribution_test.cpp @@ -22,7 +22,7 @@ #include #include -#include +#include #include using namespace units; diff --git a/test/unit_test/static/cgs_test.cpp b/test/unit_test/static/cgs_test.cpp index 86341c71..d560f029 100644 --- a/test/unit_test/static/cgs_test.cpp +++ b/test/unit_test/static/cgs_test.cpp @@ -21,6 +21,16 @@ // SOFTWARE. #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace { diff --git a/test/unit_test/static/custom_unit_test.cpp b/test/unit_test/static/custom_unit_test.cpp index e8b35f8e..15846639 100644 --- a/test/unit_test/static/custom_unit_test.cpp +++ b/test/unit_test/static/custom_unit_test.cpp @@ -21,7 +21,10 @@ // SOFTWARE. #include "test_tools.h" -#include +#include +#include +#include +#include #include namespace { diff --git a/test/unit_test/static/fps_test.cpp b/test/unit_test/static/fps_test.cpp index 3e57ec71..9f33d8eb 100644 --- a/test/unit_test/static/fps_test.cpp +++ b/test/unit_test/static/fps_test.cpp @@ -21,6 +21,16 @@ // SOFTWARE. #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace { diff --git a/test/unit_test/static/si_cgs_test.cpp b/test/unit_test/static/si_cgs_test.cpp index 36e868e7..977a06e3 100644 --- a/test/unit_test/static/si_cgs_test.cpp +++ b/test/unit_test/static/si_cgs_test.cpp @@ -20,8 +20,26 @@ // 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 namespace { diff --git a/test/unit_test/static/si_fps_test.cpp b/test/unit_test/static/si_fps_test.cpp index ce36a7a5..22c32b23 100644 --- a/test/unit_test/static/si_fps_test.cpp +++ b/test/unit_test/static/si_fps_test.cpp @@ -20,8 +20,26 @@ // 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 namespace { diff --git a/test/unit_test/static/us_test.cpp b/test/unit_test/static/us_test.cpp index 884e8b04..d9c1b5c1 100644 --- a/test/unit_test/static/us_test.cpp +++ b/test/unit_test/static/us_test.cpp @@ -20,16 +20,14 @@ // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // SOFTWARE. -#include -#include -#include +#include +#include #include namespace { using namespace units; using namespace units::physical::si; -using namespace units::physical::si::us; using namespace units::physical::si::international; /* ************** BASE DIMENSIONS **************** */ diff --git a/test_package/test_package.cpp b/test_package/test_package.cpp index 87dd8f34..46ad6baf 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 using namespace units::physical;