diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2021-06-16 12:47:32 +0100 |
|---|---|---|
| committer | Jonathan Wakely <jwakely@redhat.com> | 2021-06-16 14:31:13 +0100 |
| commit | c25e3bf87975280a603ff18fba387c6707ce4a95 (patch) | |
| tree | 6a2f69adb2898d1804251e015e729daffbc2aa7d | |
| parent | b9e35ee6d64bc9f82b8fe641aa8ac12a9e259fe8 (diff) | |
| download | gcc-c25e3bf87975280a603ff18fba387c6707ce4a95.zip gcc-c25e3bf87975280a603ff18fba387c6707ce4a95.tar.gz gcc-c25e3bf87975280a603ff18fba387c6707ce4a95.tar.bz2 | |
libstdc++: Use named struct for __decay_copy
In r12-1486-gcb326a6442f09cb36b05ce556fc91e10bfeb0cf6 I changed
__decay_copy to be a function object of unnamed class type. This causes
problems when importing the library headers:
error: conflicting global module declaration 'constexpr const std::ranges::__cust_access::<unnamed struct> std::ranges::__cust_access::__decay_copy'
The fix is to use a named struct instead of an anonymous one.
Signed-off-by: Jonathan Wakely <jwakely@redhat.com>
libstdc++-v3/ChangeLog:
* include/bits/iterator_concepts.h (__decay_copy): Name type.
| -rw-r--r-- | libstdc++-v3/include/bits/iterator_concepts.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libstdc++-v3/include/bits/iterator_concepts.h b/libstdc++-v3/include/bits/iterator_concepts.h index d18ae32..11748e5 100644 --- a/libstdc++-v3/include/bits/iterator_concepts.h +++ b/libstdc++-v3/include/bits/iterator_concepts.h @@ -930,7 +930,8 @@ namespace ranges { using std::__detail::__class_or_enum; - struct { + struct _Decay_copy final + { template<typename _Tp> constexpr decay_t<_Tp> operator()(_Tp&& __t) const |