mirror of
https://github.com/mpusz/mp-units.git
synced 2025-08-05 05:04:27 +02:00
Merge pull request #379 from chiphogg/chiphogg/mag_
Explicitly qualify `mag<>` that initializes `mag` member
This commit is contained in:
@@ -34,7 +34,7 @@ namespace units {
|
|||||||
template<typename Rep, typename Period>
|
template<typename Rep, typename Period>
|
||||||
struct quantity_like_traits<std::chrono::duration<Rep, Period>> {
|
struct quantity_like_traits<std::chrono::duration<Rep, Period>> {
|
||||||
private:
|
private:
|
||||||
static constexpr auto mag = mag<ratio(Period::num, Period::den)>();
|
static constexpr auto mag = ::units::mag<ratio(Period::num, Period::den)>();
|
||||||
public:
|
public:
|
||||||
using dimension = isq::si::dim_time;
|
using dimension = isq::si::dim_time;
|
||||||
using unit = downcast_unit<dimension, mag>;
|
using unit = downcast_unit<dimension, mag>;
|
||||||
@@ -48,7 +48,7 @@ struct clock_origin : point_origin<isq::si::dim_time> {};
|
|||||||
template<typename C, typename Rep, typename Period>
|
template<typename C, typename Rep, typename Period>
|
||||||
struct quantity_point_like_traits<std::chrono::time_point<C, std::chrono::duration<Rep, Period>>> {
|
struct quantity_point_like_traits<std::chrono::time_point<C, std::chrono::duration<Rep, Period>>> {
|
||||||
private:
|
private:
|
||||||
static constexpr auto mag = mag<ratio(Period::num, Period::den)>();
|
static constexpr auto mag = ::units::mag<ratio(Period::num, Period::den)>();
|
||||||
public:
|
public:
|
||||||
using origin = clock_origin<C>;
|
using origin = clock_origin<C>;
|
||||||
using unit = downcast_unit<typename origin::dimension, mag>;
|
using unit = downcast_unit<typename origin::dimension, mag>;
|
||||||
|
Reference in New Issue
Block a user