summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarshall Clow <mclow.lists@gmail.com>2018-07-24 03:56:38 +0000
committerMarshall Clow <mclow.lists@gmail.com>2018-07-24 03:56:38 +0000
commit35773f5517ff66ba56fefcfe5aea70c3a18c81d5 (patch)
tree606d9cbdeb06ea9e15395d0cb8d828c68500413b
parent8bbf22ed72c7f25976714d4901aaa3d303c3044e (diff)
downloadbcm5719-llvm-35773f5517ff66ba56fefcfe5aea70c3a18c81d5.tar.gz
bcm5719-llvm-35773f5517ff66ba56fefcfe5aea70c3a18c81d5.zip
fix nesting of namespace and standard-version check. Also include <__config>
llvm-svn: 337809
-rw-r--r--libcxx/include/span4
1 files changed, 3 insertions, 1 deletions
diff --git a/libcxx/include/span b/libcxx/include/span
index b1a13dd0244..db8f836f918 100644
--- a/libcxx/include/span
+++ b/libcxx/include/span
@@ -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
OpenPOWER on IntegriCloud