OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

libstdc++ Fix compilation of <stop_token> with Clang

Browse Source 
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.
This commit is contained in:
Jonathan Wakely 2020-03-18 12:55:29 +00:00
parent 07522ae90b
commit e5de406f99
2 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libstdc++-v3/ChangeLog
View File

@ -1,5 +1,8 @@
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
__cpp_lib_concepts before using iter_reference_t.
* include/bits/stream_iterator.h (istream_iterator): Check

12
libstdc++-v3/include/std/stop_token
View File

@ -456,8 +456,20 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
_Stop_state_t* operator->() const noexcept { return _M_ptr; }
#if __cpp_impl_three_way_comparison >= 201907L
friend bool
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:
_Stop_state_t* _M_ptr = nullptr;