Author: marshall Date: Mon Jul 23 20:56:38 2018 New Revision: 337809 URL: http://llvm.org/viewvc/llvm-project?rev=337809&view=rev Log: fix nesting of namespace and standard-version check. Also include <__config>
Modified: libcxx/trunk/include/span Modified: libcxx/trunk/include/span URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/span?rev=337809&r1=337808&r2=337809&view=diff ============================================================================== --- libcxx/trunk/include/span (original) +++ libcxx/trunk/include/span Mon Jul 23 20:56:38 2018 @@ -140,6 +140,7 @@ template<class Container> */ +#include <__config> #include <cstddef> // for ptrdiff_t #include <iterator> // for iterators #include <array> // for array @@ -600,7 +601,8 @@ template<class _Container> template<class _Container> span(const _Container&) -> span<const typename _Container::value_type>; +#endif // _LIBCPP_STD_VER > 17 + _LIBCPP_END_NAMESPACE_STD -#endif // _LIBCPP_STD_VER > 17 #endif // _LIBCPP_SPAN _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits