diff --git a/libcxx/docs/ReleaseNotes.rst b/libcxx/docs/ReleaseNotes.rst --- a/libcxx/docs/ReleaseNotes.rst +++ b/libcxx/docs/ReleaseNotes.rst @@ -69,3 +69,5 @@ - The `LIBCXXABI_ENABLE_PIC` CMake option was removed. If you are building your own libc++abi from source and were using `LIBCXXABI_ENABLE_PIC`, please use `CMAKE_POSITION_INDEPENDENT_CODE=ON` instead. + +- When the header is included, it will no longer include transitively. diff --git a/libcxx/include/variant b/libcxx/include/variant --- a/libcxx/include/variant +++ b/libcxx/include/variant @@ -204,7 +204,6 @@ #include <__utility/forward.h> #include <__variant/monostate.h> #include <__tuple> -#include #include #include #include @@ -239,6 +238,19 @@ // Remove this once we drop support for GCC 5. #if _LIBCPP_STD_VER > 14 && !(defined(_LIBCPP_COMPILER_GCC) && _GNUC_VER_NEW < 6000) +// Light N-dimensional array of function pointers. Used in place of std::array to avoid +// adding a dependency. +template +struct __farray { + static_assert(_Size > 0, "N-dimensional array should never be empty in std::visit"); + _Tp __buf_[_Size] = {}; + + _LIBCPP_INLINE_VISIBILITY constexpr + const _Tp &operator[](size_t __n) const noexcept { + return __buf_[__n]; + } +}; + _LIBCPP_NORETURN inline _LIBCPP_INLINE_VISIBILITY _LIBCPP_AVAILABILITY_THROW_BAD_VARIANT_ACCESS @@ -499,7 +511,7 @@ template inline _LIBCPP_INLINE_VISIBILITY - static constexpr auto&& __at(const array<_Tp, _Np>& __elems, + static constexpr auto&& __at(const __farray<_Tp, _Np>& __elems, size_t __index, _Indices... __indices) { return __at(__elems[__index], __indices...); } @@ -515,7 +527,7 @@ inline _LIBCPP_INLINE_VISIBILITY static constexpr auto __make_farray(_Fs&&... __fs) { __std_visit_visitor_return_type_check<__uncvref_t<_Fs>...>(); - using __result = array...>, sizeof...(_Fs)>; + using __result = __farray...>, sizeof...(_Fs)>; return __result{{_VSTD::forward<_Fs>(__fs)...}}; }