libstdc++: Fix declarations of variable templates

This code is invalid and rejected by other compilers (see PR 92576).

	* include/bits/regex.h (ranges::__detail::__enable_view_impl): Fix
	declaration.
	* include/bits/stl_multiset.h (ranges::__detail::__enable_view_impl):
	Likewise.
	* include/bits/stl_set.h (ranges::__detail::__enable_view_impl):
	Likewise.
	* include/bits/unordered_set.h (ranges::__detail::__enable_view_impl):
	Likewise.
	* include/debug/multiset.h (ranges::__detail::__enable_view_impl):
	Likewise.
	* include/debug/set.h (ranges::__detail::__enable_view_impl): Likewise.
	* include/debug/unordered_set (ranges::__detail::__enable_view_impl):
	Likewise.

From-SVN: r278440
This commit is contained in:
Jonathan Wakely 2019-11-19 09:34:59 +00:00 committed by Jonathan Wakely
parent 63b8871190
commit 5ecaaf98dc
8 changed files with 23 additions and 7 deletions

View File

@ -1,3 +1,19 @@
2019-11-19 Jonathan Wakely <jwakely@redhat.com>
* include/bits/regex.h (ranges::__detail::__enable_view_impl): Fix
declaration.
* include/bits/stl_multiset.h (ranges::__detail::__enable_view_impl):
Likewise.
* include/bits/stl_set.h (ranges::__detail::__enable_view_impl):
Likewise.
* include/bits/unordered_set.h (ranges::__detail::__enable_view_impl):
Likewise.
* include/debug/multiset.h (ranges::__detail::__enable_view_impl):
Likewise.
* include/debug/set.h (ranges::__detail::__enable_view_impl): Likewise.
* include/debug/unordered_set (ranges::__detail::__enable_view_impl):
Likewise.
2019-11-18 Jonathan Wakely <jwakely@redhat.com>
* include/std/thread: Reduce header dependencies.

View File

@ -2061,7 +2061,7 @@ _GLIBCXX_END_NAMESPACE_CXX11
#if __cplusplus > 201703L
namespace ranges::__detail
{
template<typename _Tp> inline constexpr bool __enable_view_impl;
template<typename _Tp> extern inline const bool __enable_view_impl;
template<typename _Bi_iter, typename _Alloc>
inline constexpr bool __enable_view_impl<match_results<_Bi_iter, _Alloc>>
= false;

View File

@ -1042,7 +1042,7 @@ _GLIBCXX_END_NAMESPACE_CONTAINER
#if __cplusplus > 201703L
namespace ranges::__detail
{
template<typename _Tp> inline constexpr bool __enable_view_impl;
template<typename _Tp> extern inline const bool __enable_view_impl;
template<typename _Key, typename _Compare, typename _Alloc>
inline constexpr bool
__enable_view_impl<_GLIBCXX_STD_C::multiset<_Key, _Compare, _Alloc>>

View File

@ -1054,7 +1054,7 @@ _GLIBCXX_END_NAMESPACE_CONTAINER
#if __cplusplus > 201703L
namespace ranges::__detail
{
template<typename _Tp> inline constexpr bool __enable_view_impl;
template<typename _Tp> extern inline const bool __enable_view_impl;
template<typename _Key, typename _Compare, typename _Alloc>
inline constexpr bool
__enable_view_impl<_GLIBCXX_STD_C::set<_Key, _Compare, _Alloc>> = false;

View File

@ -1775,7 +1775,7 @@ _GLIBCXX_END_NAMESPACE_CONTAINER
#if __cplusplus > 201703L
namespace ranges::__detail
{
template<typename _Tp> inline constexpr bool __enable_view_impl;
template<typename _Tp> extern inline const bool __enable_view_impl;
template<typename _Val, typename _Hash, typename _Eq, typename _Alloc>
inline constexpr bool
__enable_view_impl<_GLIBCXX_STD_C::unordered_set<_Val, _Hash, _Eq,

View File

@ -635,7 +635,7 @@ namespace __debug
_GLIBCXX_BEGIN_NAMESPACE_VERSION
namespace ranges::__detail
{
template<typename _Tp> inline constexpr bool __enable_view_impl;
template<typename _Tp> extern inline const bool __enable_view_impl;
template<typename _Key, typename _Compare, typename _Alloc>
inline constexpr bool
__enable_view_impl<std::__debug::multiset<_Key, _Compare, _Alloc>>

View File

@ -646,7 +646,7 @@ namespace __debug
_GLIBCXX_BEGIN_NAMESPACE_VERSION
namespace ranges::__detail
{
template<typename _Tp> inline constexpr bool __enable_view_impl;
template<typename _Tp> extern inline const bool __enable_view_impl;
template<typename _Key, typename _Compare, typename _Alloc>
inline constexpr bool
__enable_view_impl<std::__debug::set<_Key, _Compare, _Alloc>> = false;

View File

@ -1187,7 +1187,7 @@ namespace __debug
_GLIBCXX_BEGIN_NAMESPACE_VERSION
namespace ranges::__detail
{
template<typename _Tp> inline constexpr bool __enable_view_impl;
template<typename _Tp> extern inline const bool __enable_view_impl;
template<typename _Val, typename _Hash, typename _Eq, typename _Alloc>
inline constexpr bool
__enable_view_impl<std::__debug::unordered_set<_Val, _Hash, _Eq, _Alloc>>