Commit 7127be45 authored by Marco Clemencic's avatar Marco Clemencic

Merge branch 'cxx20-20200611' into 'master'

Fixes for c++20

See merge request !1085
parents f4d7918c a7363786
Pipeline #1726317 passed with stages
in 41 minutes and 23 seconds
......@@ -719,11 +719,15 @@ namespace Gaudi {
}
};
#if __cpp_impl_three_way_comparison < 201711
// Don't want this with c++20 --- it'll just call itself.
// The default c++20 rules will properly use Property::operator==.
/// delegate (value == property) to property operator==
template <class T, class TP, class V, class H>
bool operator==( const T& v, const Property<TP, V, H>& p ) {
return p == v;
}
#endif
/// delegate (value != property) to property operator!=
template <class T, class TP, class V, class H>
......
......@@ -126,9 +126,9 @@ namespace GaudiUtils {
/// allocator (could be useful for optimizations)
typedef ALLOCATOR allocator_type;
/// the types to conform STL
typedef typename ALLOCATOR::const_reference reference;
typedef typename ALLOCATOR::value_type const& reference;
/// the types to conform STL
typedef typename ALLOCATOR::const_reference const_reference;
typedef typename ALLOCATOR::value_type const& const_reference;
/// the types to conform STL
typedef typename ALLOCATOR::size_type size_type;
/// the types to conform STL
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment