From f67524d4006c1080997fdead8af9fcba6cfc7e6e Mon Sep 17 00:00:00 2001 From: Marshall Clow Date: Tue, 4 Jun 2019 02:07:11 +0000 Subject: [PATCH] We had a _LIBCPP_ASSERT commented out because gcc 4.9 didn't like it. We (LLVM) now require GCC 5.1, so that's not a problem any more. Re-enable the assertion. Fixes PR#36863 llvm-svn: 362465 --- libcxx/include/string_view | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libcxx/include/string_view b/libcxx/include/string_view index d29bcc3..aa93e1f 100644 --- a/libcxx/include/string_view +++ b/libcxx/include/string_view @@ -228,9 +228,9 @@ public: basic_string_view(const _CharT* __s, size_type __len) _NOEXCEPT : __data(__s), __size(__len) { -// #if _LIBCPP_STD_VER > 11 -// _LIBCPP_ASSERT(__len == 0 || __s != nullptr, "string_view::string_view(_CharT *, size_t): received nullptr"); -// #endif +#if _LIBCPP_STD_VER > 11 + _LIBCPP_ASSERT(__len == 0 || __s != nullptr, "string_view::string_view(_CharT *, size_t): received nullptr"); +#endif } _LIBCPP_CONSTEXPR _LIBCPP_INLINE_VISIBILITY -- 2.7.4