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

base_dimension is provided as a const& to the exp type

Browse Source
This commit is contained in:
Mateusz Pusz committed 2019-09-06 10:16:19 +02:00
1 parent 33b6fa9f3f
commit 3bcd80681e
20 files changed
+99 -100
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
@@ -63,18 +63,18 @@ namespace std::experimental::units {
template<typename E, typename... Rest>
struct get_unit_base_dim<dimension<E, Rest...>> {
static_assert(sizeof...(Rest) == 0, "Base unit expected");
using dimension = E::dimension;
static constexpr const base_dimension& dimension = E::dimension;
};
template<typename BaseDimension, typename... Us>
template<const base_dimension& BaseDimension, typename... Us>
struct get_ratio {
using ratio = ::std::experimental::units::ratio<1>;
};
template<typename BaseDimension, typename U, typename... Rest>
template<const base_dimension& BaseDimension, typename U, typename... Rest>
struct get_ratio<BaseDimension, U, Rest...> {
using unit_base_dim = get_unit_base_dim<typename U::dimension::base_type>::dimension;
using ratio = conditional<unit_base_dim::value == BaseDimension::value, typename U::ratio,
static constexpr const base_dimension& unit_base_dim = get_unit_base_dim<typename U::dimension::base_type>::dimension;
using ratio = conditional<&unit_base_dim == &BaseDimension, typename U::ratio,
typename get_ratio<BaseDimension, Rest...>::ratio>;
};
@@ -105,7 +105,7 @@ namespace std::experimental::units {
template<typename E, typename... Rest, typename... Us>
struct derived_ratio<dimension<E, Rest...>, Us...> {
using rest_ratio = derived_ratio<dimension<Rest...>, Us...>::ratio;
using e_ratio = get_ratio<typename E::dimension, Us...>::ratio;
using e_ratio = get_ratio<E::dimension, Us...>::ratio;
using ratio = ratio_op<rest_ratio, E::value, e_ratio>::ratio;
};