From 10f93b5386b4e1427e6acfb937c0a42c63d8d0d0 Mon Sep 17 00:00:00 2001 From: Mateusz Pusz Date: Thu, 28 May 2020 20:45:15 +0200 Subject: [PATCH] Compilation on gcc-9 fixed --- src/include/units/bits/common_quantity.h | 10 +++++++++- src/include/units/bits/external/hacks.h | 1 + 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/include/units/bits/common_quantity.h b/src/include/units/bits/common_quantity.h index 6e9c9640..30d27193 100644 --- a/src/include/units/bits/common_quantity.h +++ b/src/include/units/bits/common_quantity.h @@ -65,12 +65,20 @@ using common_quantity = detail::common_quantity_impl::type; } // namespace units +#if COMP_GCC >= 10 + namespace std { +#else + +namespace concepts { + +#endif + template requires units::equivalent_dim struct common_type { using type = units::common_quantity; }; -} \ No newline at end of file +} diff --git a/src/include/units/bits/external/hacks.h b/src/include/units/bits/external/hacks.h index 674ca8d7..5e4f451d 100644 --- a/src/include/units/bits/external/hacks.h +++ b/src/include/units/bits/external/hacks.h @@ -76,6 +76,7 @@ namespace std { using concepts::convertible_to; using concepts::default_constructible; using concepts::derived_from; + using concepts::equality_comparable; using concepts::equality_comparable_with; // using concepts::floating_point; using concepts::integral;