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

Down with typename

Browse Source
This commit is contained in:
Mateusz Pusz committed 2019-05-18 13:19:23 +02:00
1 parent d75377ccaf
commit 4b6a7ebb39
7 files changed
+38 -38
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/include/units/unit.h
+6 -6
View File
@@ -62,7 +62,7 @@ namespace units {
template<Exponent E, Exponent... Rest>
struct get_unit_base_dim<dimension<E, Rest...>> {
static_assert(sizeof...(Rest) == 0, "Base unit expected");
using dimension = typename E::dimension;
using dimension = E::dimension;
};
template<typename BaseDimension, Unit... Us>
@@ -72,7 +72,7 @@ namespace units {
template<typename BaseDimension, Unit U, Unit... Rest>
struct get_ratio<BaseDimension, U, Rest...> {
using unit_base_dim = typename get_unit_base_dim<typename U::dimension::base_type>::dimension;
using unit_base_dim = get_unit_base_dim<typename U::dimension::base_type>::dimension;
using ratio = std::conditional_t<unit_base_dim::value == BaseDimension::value, typename U::ratio,
typename get_ratio<BaseDimension, Rest...>::ratio>;
};
@@ -90,7 +90,7 @@ namespace units {
using calc_ratio = std::conditional_t<(UnitExpValue > 0), std::ratio_multiply<Result, UnitRatio>,
std::ratio_divide<Result, UnitRatio>>;
static constexpr int value = UnitExpValue > 0 ? UnitExpValue - 1 : UnitExpValue + 1;
using ratio = typename ratio_op<calc_ratio, value, UnitRatio>::ratio;
using ratio = ratio_op<calc_ratio, value, UnitRatio>::ratio;
};
template<Dimension D, Unit... Us>
@@ -103,9 +103,9 @@ namespace units {
template<Exponent E, Exponent... Rest, Unit... Us>
struct derived_ratio<dimension<E, Rest...>, Us...> {
using rest_ratio = typename derived_ratio<dimension<Rest...>, Us...>::ratio;
using e_ratio = typename get_ratio<typename E::dimension, Us...>::ratio;
using ratio = typename ratio_op<rest_ratio, E::value, e_ratio>::ratio;
using rest_ratio = derived_ratio<dimension<Rest...>, Us...>::ratio;
using e_ratio = get_ratio<typename E::dimension, Us...>::ratio;
using ratio = ratio_op<rest_ratio, E::value, e_ratio>::ratio;
};
}