diff options
| author | Marshall Clow <mclow.lists@gmail.com> | 2019-06-04 02:07:11 +0000 |
|---|---|---|
| committer | Marshall Clow <mclow.lists@gmail.com> | 2019-06-04 02:07:11 +0000 |
| commit | f67524d4006c1080997fdead8af9fcba6cfc7e6e (patch) | |
| tree | a02ed1680ccba0e0fd9ef18e9c63a2cb08df0c8a /libcxx/include/string_view | |
| parent | 59839124f49d69bb4846b2f9c622054c534a63cd (diff) | |
| download | bcm5719-llvm-f67524d4006c1080997fdead8af9fcba6cfc7e6e.tar.gz bcm5719-llvm-f67524d4006c1080997fdead8af9fcba6cfc7e6e.zip | |
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
Diffstat (limited to 'libcxx/include/string_view')
| -rw-r--r-- | libcxx/include/string_view | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libcxx/include/string_view b/libcxx/include/string_view index d29bcc3e8c1..aa93e1f6fa7 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 |
