mpusz/mp-units
1
0
Fork 1
mirror of https://github.com/mpusz/mp-units.git synced 2025-07-30 10:27:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

Compilation on gcc-9 fixed

Browse Source
This commit is contained in:
Mateusz Pusz
2020-05-28 20:45:15 +02:00
parent 86b9177816
commit 10f93b5386
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/include/units/bits/common_quantity.h
View File

@ -65,12 +65,20 @@ using common_quantity = detail::common_quantity_impl<Q1, Q2, Rep>::type;
} // namespace units } // namespace units
#if COMP_GCC >= 10
namespace std { namespace std {
#else
namespace concepts {
#endif
template<units::Quantity Q1, units::Quantity Q2> template<units::Quantity Q1, units::Quantity Q2>
requires units::equivalent_dim<typename Q1::dimension, typename Q2::dimension> requires units::equivalent_dim<typename Q1::dimension, typename Q2::dimension>
struct common_type<Q1, Q2> { struct common_type<Q1, Q2> {
using type = units::common_quantity<Q1, Q2>; using type = units::common_quantity<Q1, Q2>;
}; };
} }

1
src/include/units/bits/external/hacks.h vendored
View File

@ -76,6 +76,7 @@ namespace std {
using concepts::convertible_to; using concepts::convertible_to;
using concepts::default_constructible; using concepts::default_constructible;
using concepts::derived_from; using concepts::derived_from;
using concepts::equality_comparable;
using concepts::equality_comparable_with; using concepts::equality_comparable_with;
// using concepts::floating_point; // using concepts::floating_point;
using concepts::integral; using concepts::integral;