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

Qualify calls to __never_valueless in <variant>

Browse Source 
* include/std/variant (_Variant_storage, _Extra_visit_slot_needed):
	Qualify calls to __never_valueless.

From-SVN: r272508
This commit is contained in:
Jonathan Wakely 2019-06-20 15:17:51 +01:00 committed by Jonathan Wakely
parent 73b7f10a55
commit d306dee31d
2 changed files with 6 additions and 3 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 @@
2019-06-20 Jonathan Wakely <jwakely@redhat.com>
* include/std/variant (_Variant_storage, _Extra_visit_slot_needed):
Qualify calls to __never_valueless.
* doc/xml/manual/status_cxx2017.xml: Fix outdated reference to
C++17 working draft.

6
libstdc++-v3/include/std/variant
View File

@ -422,7 +422,7 @@ namespace __variant
constexpr bool
_M_valid() const noexcept
{
if constexpr (__never_valueless<_Types...>())
if constexpr (__variant::__never_valueless<_Types...>())
return true;
return this->_M_index != __index_type(variant_npos);
}
@ -456,7 +456,7 @@ namespace __variant
constexpr bool
_M_valid() const noexcept
{
if constexpr (__never_valueless<_Types...>())
if constexpr (__variant::__never_valueless<_Types...>())
return true;
return this->_M_index != __index_type(variant_npos);
}
@ -799,7 +799,7 @@ namespace __variant
template <typename... _Types>
struct _Variant_never_valueless<variant<_Types...>>
: bool_constant<__never_valueless<_Types...>()> {};
: bool_constant<__variant::__never_valueless<_Types...>()> {};
static constexpr bool value =
(is_same_v<_Maybe_variant_cookie, __variant_cookie>