diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2019-06-20 15:17:51 +0100 |
|---|---|---|
| committer | Jonathan Wakely <redi@gcc.gnu.org> | 2019-06-20 15:17:51 +0100 |
| commit | d306dee31dc030d1a9992927eb17b8171aaf8308 (patch) | |
| tree | 76b446375078bac9129b1fcf197c4417e93a5377 | |
| parent | 73b7f10a557cc13425b6f0494a2b230527ad06a1 (diff) | |
| download | gcc-d306dee31dc030d1a9992927eb17b8171aaf8308.zip gcc-d306dee31dc030d1a9992927eb17b8171aaf8308.tar.gz gcc-d306dee31dc030d1a9992927eb17b8171aaf8308.tar.bz2 | |
Qualify calls to __never_valueless in <variant>
* include/std/variant (_Variant_storage, _Extra_visit_slot_needed):
Qualify calls to __never_valueless.
From-SVN: r272508
| -rw-r--r-- | libstdc++-v3/ChangeLog | 3 | ||||
| -rw-r--r-- | libstdc++-v3/include/std/variant | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index db90efa..d5e4c85 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 c86b0c8..d93ea86 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> |