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

deduced_unit fixed + unit test for mass unit added

Browse Source
This commit is contained in:
Mateusz Pusz committed 2020-02-10 20:35:32 +01:00
1 parent 1f46ca5f0c
commit 037503cbc6
3 files changed
+16 -3
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/include/units/bits/deduced_unit.h
+2 -1
View File
@@ -61,7 +61,8 @@ struct derived_ratio<exp_list<>, Us...> {
template<typename E, typename... ERest, Unit U, Unit... URest>
struct derived_ratio<exp_list<E, ERest...>, U, URest...> {
using rest_ratio = derived_ratio<exp_list<ERest...>, URest...>::ratio;
using ratio = ratio_op<rest_ratio, E::num, E::den, typename U::ratio>::ratio;
using unit_ratio = ratio_op<rest_ratio, E::num, E::den, typename U::ratio>::ratio;
using ratio = ratio_divide<unit_ratio, typename dimension_unit<typename E::dimension>::ratio>;
};
template<DerivedDimension D, Unit... Us>
src/include/units/physical/si/mass.h
+2 -2
View File
@@ -28,8 +28,8 @@
namespace units::si {
struct kilogram : named_unit<kilogram, "kg", no_prefix> {};
struct gram : named_scaled_unit<gram, "g", prefix, ratio<1, 1'000>, kilogram> {};
struct gram : named_unit<gram, "g", prefix> {};
struct kilogram : prefixed_unit<kilogram, kilo, gram> {};
struct tonne : named_scaled_unit<tonne, "t", prefix, ratio<1'000>, kilogram> {};
struct dalton : named_scaled_unit<dalton, "Da", no_prefix, ratio<16'605'390'666'050, 10'000'000'000'000, -27>, kilogram> {};