From: Jonathan Wakely <jwakely@redhat.com>
Date: Thu, 20 Jun 2019 14:17:51 +0000 (+0100)
Subject: Qualify calls to __never_valueless in <variant>
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d306dee31dc030d1a9992927eb17b8171aaf8308;p=gcc.git

Qualify calls to __never_valueless in <variant>

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

From-SVN: r272508
---

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index db90efad5bf..d5e4c85b072 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -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.
 
diff --git a/libstdc++-v3/include/std/variant b/libstdc++-v3/include/std/variant
index c86b0c8ccf3..d93ea86ea29 100644
--- a/libstdc++-v3/include/std/variant
+++ b/libstdc++-v3/include/std/variant
@@ -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>