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

derived_units now stores a type provided as a template parameter rather than its value

Browse Source
This commit is contained in:
Mateusz Pusz
2019-10-15 15:20:37 +02:00
parent 7e31dfe37e
commit c3c5a740d9
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/include/units/unit.h
View File

@@ -147,22 +147,22 @@ namespace units {
template<typename Child, typename Symbol, Dimension D> template<typename Child, typename Symbol, Dimension D>
struct derived_unit<Child, Symbol, D> : downcast_helper<Child, unit<D, ratio<1>>> { struct derived_unit<Child, Symbol, D> : downcast_helper<Child, unit<D, ratio<1>>> {
static constexpr auto symbol = Symbol::c_str(); using symbol = Symbol;
}; };
template<typename Child, typename Symbol, Dimension D, Ratio R> template<typename Child, typename Symbol, Dimension D, Ratio R>
struct derived_unit<Child, Symbol, D, R> : downcast_helper<Child, unit<D, R>> { struct derived_unit<Child, Symbol, D, R> : downcast_helper<Child, unit<D, R>> {
static constexpr auto symbol = Symbol::c_str(); using symbol = Symbol;
}; };
template<typename Child, typename Symbol, Unit U> template<typename Child, typename Symbol, Unit U>
struct derived_unit<Child, Symbol, U> : downcast_helper<Child, U> { struct derived_unit<Child, Symbol, U> : downcast_helper<Child, U> {
static constexpr auto symbol = Symbol::c_str(); using symbol = Symbol;
}; };
template<typename Child, typename Symbol, Dimension D, Unit U, Unit... Us> template<typename Child, typename Symbol, Dimension D, Unit U, Unit... Us>
struct derived_unit<Child, Symbol, D, U, Us...> : downcast_helper<Child, detail::make_derived_unit<D, U, Us...>> { struct derived_unit<Child, Symbol, D, U, Us...> : downcast_helper<Child, detail::make_derived_unit<D, U, Us...>> {
static constexpr auto symbol = Symbol::c_str(); using symbol = Symbol;
}; };
// SI prefixes // SI prefixes

2
test/unit_test/runtime/print_helpers.h
View File

@@ -30,7 +30,7 @@ namespace units {
template<typename Unit, typename Rep> template<typename Unit, typename Rep>
std::ostream& operator<<(std::ostream& os, const quantity<Unit, Rep>& value) std::ostream& operator<<(std::ostream& os, const quantity<Unit, Rep>& value)
{ {
return os << value.count() << Unit::symbol; return os << value.count() << Unit::symbol::c_str();
} }
} }