diff --git a/example/ex2/ex2.cpp b/example/ex2/ex2.cpp index 3fc1c94f..936704d9 100644 --- a/example/ex2/ex2.cpp +++ b/example/ex2/ex2.cpp @@ -8,7 +8,7 @@ int main () { namespace q = xo::qty::qty; namespace su = xo::qty::su; - using xo::qty::with_units; + using xo::qty::with_units_from; using xo::qty::quantity; using xo::flatstring; using namespace std; @@ -31,7 +31,7 @@ main () { cerr << "a2: " << a2 << endl; constexpr auto au = q::meter / (q::second * q::second); - constexpr auto a3 = with_units(a, au); + constexpr auto a3 = with_units_from(a, au); static_assert(a3.abbrev() == flatstring("m.s^-2")); diff --git a/include/xo/unit/quantity.hpp b/include/xo/unit/quantity.hpp index de061b1f..5b3a810c 100644 --- a/include/xo/unit/quantity.hpp +++ b/include/xo/unit/quantity.hpp @@ -231,7 +231,7 @@ namespace xo { && Q1::always_constexpr_unit && Q2::always_constexpr_unit) constexpr auto - with_units(const Q1 & x, const Q2 & y) + with_units_from(const Q1 & x, const Q2 & y) { return x.template rescale(); }