From e590adb938951db62a99844d6827ea6a0159df10 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 git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@362465 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/string_view | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/string_view b/include/string_view index d29bcc3e8..aa93e1f6f 100644 --- a/include/string_view +++ b/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