From 25a470dcb739ec493208d93d4598557f582db08a Mon Sep 17 00:00:00 2001 From: Mateusz Pusz Date: Tue, 28 May 2019 16:21:28 +0200 Subject: [PATCH] std::conditional_t replaced with custom implementation --- src/include/units/dimension.h | 7 +++---- src/include/units/unit.h | 8 ++++---- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/include/units/dimension.h b/src/include/units/dimension.h index e1e0649f..55c1ea32 100644 --- a/src/include/units/dimension.h +++ b/src/include/units/dimension.h @@ -141,14 +141,13 @@ namespace units { template struct dim_consolidate> { using rest = dim_consolidate_t>; - using type = - std::conditional_t>, dimension, type_list_push_front>; + using type = conditional>, dimension, type_list_push_front>; }; template struct dim_consolidate, exp, ERest...>> { - using type = std::conditional_t>, - dim_consolidate_t, ERest...>>>; + using type = conditional>, + dim_consolidate_t, ERest...>>>; }; } // namespace detail diff --git a/src/include/units/unit.h b/src/include/units/unit.h index bed885d2..e9ea16db 100644 --- a/src/include/units/unit.h +++ b/src/include/units/unit.h @@ -74,8 +74,8 @@ namespace units { template struct get_ratio { using unit_base_dim = get_unit_base_dim::dimension; - using ratio = std::conditional_t::ratio>; + using ratio = conditional::ratio>; }; template @@ -88,8 +88,8 @@ namespace units { template struct ratio_op { - using calc_ratio = std::conditional_t<(UnitExpValue > 0), ratio_multiply, - ratio_divide>; + using calc_ratio = conditional<(UnitExpValue > 0), ratio_multiply, + ratio_divide>; static constexpr int value = UnitExpValue > 0 ? UnitExpValue - 1 : UnitExpValue + 1; using ratio = ratio_op::ratio; };