mpusz/mp-units
1
0
Fork 1
mirror of https://github.com/mpusz/mp-units.git synced 2025-08-02 20:04:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

type_list moved from mp to units namespace

Browse Source
This commit is contained in:
Mateusz Pusz
2019-05-07 08:28:02 -06:00
parent 0e36a6025f
commit 2d52782407
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/include/units/bits/type_list.h
View File

@@ -24,7 +24,7 @@
#include <type_traits> #include <type_traits>
namespace mp { namespace units {
namespace detail { namespace detail {
@@ -163,4 +163,4 @@ namespace mp {
template<TypeList List, template<typename, typename> typename Pred> template<TypeList List, template<typename, typename> typename Pred>
using type_list_sort_t = typename type_list_sort<List, Pred>::type; using type_list_sort_t = typename type_list_sort<List, Pred>::type;
} // namespace mp } // namespace units

6
src/include/units/dimension.h
View File

@@ -140,7 +140,7 @@ namespace units {
struct dim_consolidate<dimension<E1, ERest...>> { struct dim_consolidate<dimension<E1, ERest...>> {
using rest = dim_consolidate_t<dimension<ERest...>>; using rest = dim_consolidate_t<dimension<ERest...>>;
using type = using type =
std::conditional_t<std::is_same_v<rest, dimension<>>, dimension<E1>, mp::type_list_push_front_t<rest, E1>>; std::conditional_t<std::is_same_v<rest, dimension<>>, dimension<E1>, type_list_push_front_t<rest, E1>>;
}; };
template<typename D, int V1, int V2, Exponent... ERest> template<typename D, int V1, int V2, Exponent... ERest>
@@ -153,7 +153,7 @@ namespace units {
template<Exponent... Es> template<Exponent... Es>
struct make_dimension { struct make_dimension {
using type = mp::type_list_sort_t<detail::dim_consolidate_t<mp::type_list_sort_t<dimension<Es...>, exp_dim_id_less>>, exp_greater_equal>; using type = type_list_sort_t<detail::dim_consolidate_t<type_list_sort_t<dimension<Es...>, exp_dim_id_less>>, exp_greater_equal>;
}; };
template<Exponent... Es> template<Exponent... Es>
@@ -161,7 +161,7 @@ namespace units {
template<Dimension D1, Dimension D2> template<Dimension D1, Dimension D2>
struct merge_dimension { struct merge_dimension {
using type = mp::type_list_sort_t<detail::dim_consolidate_t<mp::type_list_merge_sorted_t<D1, D2, exp_dim_id_less>>, exp_greater_equal>; using type = type_list_sort_t<detail::dim_consolidate_t<type_list_merge_sorted_t<D1, D2, exp_dim_id_less>>, exp_greater_equal>;
}; };
template<Dimension D1, Dimension D2> template<Dimension D1, Dimension D2>

1
test/test_type_list.cpp
View File

@@ -25,7 +25,6 @@
namespace { namespace {
using namespace mp;
using namespace units; using namespace units;
template<typename... Types> template<typename... Types>