Commit e5de406f by Jonathan Wakely

libstdc++ Fix compilation of <stop_token> with Clang

Clang 9 supports C++20 via -std=c++2a but doesn't support three-way
comparisons, so <stop_token> fails to compile. When the compiler doesn't
support default comparisons, this patch defines operator== and
operator!= for the _Stop_state_ref class. That is enough for the header
to be compiled with Clang. It allows operator== for stop_token and
stop_source to work, but not operator!= because that isn't explicitly
defined.

	* include/std/stop_token (stop_token::_Stop_state_ref): Define
	comparison operators explicitly if the compiler won't synthesize them.
parent 07522ae9
2020-03-18 Jonathan Wakely <jwakely@redhat.com> 2020-03-18 Jonathan Wakely <jwakely@redhat.com>
* include/std/stop_token (stop_token::_Stop_state_ref): Define
comparison operators explicitly if the compiler won't synthesize them.
* include/bits/stl_algobase.h (__lexicographical_compare_aux): Check * include/bits/stl_algobase.h (__lexicographical_compare_aux): Check
__cpp_lib_concepts before using iter_reference_t. __cpp_lib_concepts before using iter_reference_t.
* include/bits/stream_iterator.h (istream_iterator): Check * include/bits/stream_iterator.h (istream_iterator): Check
......
...@@ -456,8 +456,20 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -456,8 +456,20 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
_Stop_state_t* operator->() const noexcept { return _M_ptr; } _Stop_state_t* operator->() const noexcept { return _M_ptr; }
#if __cpp_impl_three_way_comparison >= 201907L
friend bool friend bool
operator==(const _Stop_state_ref&, const _Stop_state_ref&) = default; operator==(const _Stop_state_ref&, const _Stop_state_ref&) = default;
#else
friend bool
operator==(const _Stop_state_ref& __lhs, const _Stop_state_ref& __rhs)
noexcept
{ return __lhs._M_ptr == __rhs._M_ptr; }
friend bool
operator!=(const _Stop_state_ref& __lhs, const _Stop_state_ref& __rhs)
noexcept
{ return __lhs._M_ptr != __rhs._M_ptr; }
#endif
private: private:
_Stop_state_t* _M_ptr = nullptr; _Stop_state_t* _M_ptr = nullptr;
......
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