From 3a033781cdac634557ac820c614658f89349b8c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johel=20Ernesto=20Guerrero=20Pe=C3=B1a?= Date: Sun, 21 Feb 2021 15:41:22 -0400 Subject: [PATCH] test: fix warnings (quantity(_kind)_test.cpp) --- src/include/units/bits/external/hacks.h | 2 +- src/include/units/quantity_cast.h | 6 +++--- src/include/units/quantity_point.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/include/units/bits/external/hacks.h b/src/include/units/bits/external/hacks.h index 77311c01..2eef7ba8 100644 --- a/src/include/units/bits/external/hacks.h +++ b/src/include/units/bits/external/hacks.h @@ -31,7 +31,7 @@ #define COMP_MSVC _MSC_VER #endif -#if COMP_CLANG +#if COMP_CLANG && false #include #include diff --git a/src/include/units/quantity_cast.h b/src/include/units/quantity_cast.h index b3195e37..38f821a9 100644 --- a/src/include/units/quantity_cast.h +++ b/src/include/units/quantity_cast.h @@ -65,7 +65,7 @@ inline constexpr ratio quantity_ratio> = [] }(); template -constexpr ratio cast_ratio(const QFrom& from, const QTo& to) +inline constexpr ratio cast_ratio = [] { using FromU = TYPENAME QFrom::unit; using ToU = TYPENAME QTo::unit; @@ -75,7 +75,7 @@ constexpr ratio cast_ratio(const QFrom& from, const QTo& to) else { return quantity_ratio / quantity_ratio; } -} +}(); template struct cast_traits; @@ -118,7 +118,7 @@ template R using traits = detail::cast_traits; using ratio_type = TYPENAME traits::ratio_type; using rep_type = TYPENAME traits::rep_type; - constexpr auto c_ratio = detail::cast_ratio(quantity(), To()); + constexpr auto c_ratio = detail::cast_ratio, To>; if constexpr (treat_as_floating_point) { return To(static_cast(static_cast(q.count()) * diff --git a/src/include/units/quantity_point.h b/src/include/units/quantity_point.h index dcb982f2..e2253ca6 100644 --- a/src/include/units/quantity_point.h +++ b/src/include/units/quantity_point.h @@ -116,7 +116,7 @@ public: } constexpr quantity_point& operator+=(const quantity_type& q) - requires requires(quantity_type q) { q += q; } + requires requires { q_ += q; } { q_ += q; return *this;