diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2019-05-15 22:19:39 +0100 |
|---|---|---|
| committer | Jonathan Wakely <redi@gcc.gnu.org> | 2019-05-15 22:19:39 +0100 |
| commit | e5d7010bb30b136e06f31edd197b6dca9f04f7cb (patch) | |
| tree | 9aebe5745ef6ab2444b939668762bf68d085aea2 | |
| parent | 47805f5712322379e683028df4f9a0b0366075a9 (diff) | |
| download | gcc-e5d7010bb30b136e06f31edd197b6dca9f04f7cb.zip gcc-e5d7010bb30b136e06f31edd197b6dca9f04f7cb.tar.gz gcc-e5d7010bb30b136e06f31edd197b6dca9f04f7cb.tar.bz2 | |
Qualify calls in std::visit and std::visit<R>
* include/std/variant (visit, visit<R>): Qualify calls to __do_visit.
From-SVN: r271268
| -rw-r--r-- | libstdc++-v3/ChangeLog | 4 | ||||
| -rw-r--r-- | libstdc++-v3/include/std/variant | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index ecdba1d..b5e6c97 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,7 @@ +2019-05-15 Jonathan Wakely <jwakely@redhat.com> + + * include/std/variant (visit, visit<R>): Qualify calls to __do_visit. + 2019-05-14 Jonathan Wakely <jwakely@redhat.com> * testsuite/util/testsuite_allocator.h (NullablePointer::operator bool): diff --git a/libstdc++-v3/include/std/variant b/libstdc++-v3/include/std/variant index dc4bbb7..8c710c3 100644 --- a/libstdc++-v3/include/std/variant +++ b/libstdc++-v3/include/std/variant @@ -1637,8 +1637,8 @@ namespace __variant using _Tag = __detail::__variant::__deduce_visit_result<_Result_type>; - return __do_visit<_Tag>(std::forward<_Visitor>(__visitor), - std::forward<_Variants>(__variants)...); + return std::__do_visit<_Tag>(std::forward<_Visitor>(__visitor), + std::forward<_Variants>(__variants)...); } #if __cplusplus > 201703L @@ -1649,8 +1649,8 @@ namespace __variant if ((__variants.valueless_by_exception() || ...)) __throw_bad_variant_access("Unexpected index"); - return __do_visit<_Res>(std::forward<_Visitor>(__visitor), - std::forward<_Variants>(__variants)...); + return std::__do_visit<_Res>(std::forward<_Visitor>(__visitor), + std::forward<_Variants>(__variants)...); } #endif |