diff options
Diffstat (limited to 'libcxx')
| -rw-r--r-- | libcxx/include/variant | 21 | ||||
| -rw-r--r-- | libcxx/test/std/utilities/variant/variant.visit/visit.pass.cpp | 3 |
2 files changed, 13 insertions, 11 deletions
diff --git a/libcxx/include/variant b/libcxx/include/variant index f623cddc200..4396f1062f5 100644 --- a/libcxx/include/variant +++ b/libcxx/include/variant @@ -466,17 +466,22 @@ private: return __result{{_VSTD::forward<_Fs>(__fs)...}}; } - template <class _Fp, class... _Vs, size_t... _Is> - inline _LIBCPP_INLINE_VISIBILITY - static constexpr auto __make_dispatch(index_sequence<_Is...>) { - struct __dispatcher { - static constexpr decltype(auto) __dispatch(_Fp __f, _Vs... __vs) { + template <std::size_t... _Is> + struct __dispatcher { + template <class _Fp, class... _Vs> + inline _LIBCPP_INLINE_VISIBILITY + static constexpr decltype(auto) __dispatch(_Fp __f, _Vs... __vs) { return __invoke_constexpr( static_cast<_Fp>(__f), __access::__base::__get_alt<_Is>(static_cast<_Vs>(__vs))...); - } - }; - return _VSTD::addressof(__dispatcher::__dispatch); + } + }; + + template <class _Fp, class... _Vs, size_t... _Is> + inline _LIBCPP_INLINE_VISIBILITY + static constexpr auto __make_dispatch(index_sequence<_Is...>) { + return _VSTD::addressof( + __dispatcher<_Is...>::template __dispatch<_Fp, _Vs...>); } template <size_t _Ip, class _Fp, class... _Vs> diff --git a/libcxx/test/std/utilities/variant/variant.visit/visit.pass.cpp b/libcxx/test/std/utilities/variant/variant.visit/visit.pass.cpp index 610223269cb..46d225883ae 100644 --- a/libcxx/test/std/utilities/variant/variant.visit/visit.pass.cpp +++ b/libcxx/test/std/utilities/variant/variant.visit/visit.pass.cpp @@ -10,9 +10,6 @@ // UNSUPPORTED: c++98, c++03, c++11, c++14 -// FIXME: This test hangs for an unknown reason on Windows. See llvm.org/PR31642 -// UNSUPPORTED: windows - // <variant> // template <class Visitor, class... Variants> // constexpr see below visit(Visitor&& vis, Variants&&... vars); |
