@@ -320,7 +320,7 @@ public:
320
320
_LIBCPP_CONSTEXPR _LIBCPP_HIDE_FROM_ABI basic_string_view (const _CharT* __s, size_type __len) _NOEXCEPT
321
321
_LIBCPP_DIAGNOSE_NULLPTR_IF(__len != 0 && __s == nullptr , " if len is not zero" )
322
322
: __data_(__s), __size_(__len) {
323
- # if _LIBCPP_STD_VER >= 14
323
+ # if !defined(_LIBCPP_CXX03_LANG) && (!defined(_LIBCPP_COMPILER_GCC) || _LIBCPP_STD_VER >= 14)
324
324
// Allocations must fit in `ptrdiff_t` for pointer arithmetic to work. If `__len` exceeds it, the input
325
325
// range could not have been valid. Most likely the caller underflowed some arithmetic and inadvertently
326
326
// passed in a negative length.
@@ -502,7 +502,6 @@ public:
502
502
// find
503
503
_LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_HIDE_FROM_ABI size_type
504
504
find (basic_string_view __s, size_type __pos = 0 ) const _NOEXCEPT {
505
- _LIBCPP_ASSERT_NON_NULL (__s.size () == 0 || __s.data () != nullptr , " string_view::find(): received nullptr" );
506
505
return std::__str_find<value_type, size_type, traits_type, npos>(data (), size (), __s.data (), __pos, __s.size ());
507
506
}
508
507
@@ -527,7 +526,6 @@ public:
527
526
// rfind
528
527
_LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_HIDE_FROM_ABI size_type
529
528
rfind (basic_string_view __s, size_type __pos = npos) const _NOEXCEPT {
530
- _LIBCPP_ASSERT_NON_NULL (__s.size () == 0 || __s.data () != nullptr , " string_view::find(): received nullptr" );
531
529
return std::__str_rfind<value_type, size_type, traits_type, npos>(data (), size (), __s.data (), __pos, __s.size ());
532
530
}
533
531
@@ -553,7 +551,6 @@ public:
553
551
// find_first_of
554
552
_LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_HIDE_FROM_ABI size_type
555
553
find_first_of (basic_string_view __s, size_type __pos = 0 ) const _NOEXCEPT {
556
- _LIBCPP_ASSERT_NON_NULL (__s.size () == 0 || __s.data () != nullptr , " string_view::find_first_of(): received nullptr" );
557
554
return std::__str_find_first_of<value_type, size_type, traits_type, npos>(
558
555
data (), size (), __s.data (), __pos, __s.size ());
559
556
}
@@ -580,7 +577,6 @@ public:
580
577
// find_last_of
581
578
_LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_HIDE_FROM_ABI size_type
582
579
find_last_of (basic_string_view __s, size_type __pos = npos) const _NOEXCEPT {
583
- _LIBCPP_ASSERT_NON_NULL (__s.size () == 0 || __s.data () != nullptr , " string_view::find_last_of(): received nullptr" );
584
580
return std::__str_find_last_of<value_type, size_type, traits_type, npos>(
585
581
data (), size (), __s.data (), __pos, __s.size ());
586
582
}
@@ -607,8 +603,6 @@ public:
607
603
// find_first_not_of
608
604
_LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_HIDE_FROM_ABI size_type
609
605
find_first_not_of (basic_string_view __s, size_type __pos = 0 ) const _NOEXCEPT {
610
- _LIBCPP_ASSERT_NON_NULL (
611
- __s.size () == 0 || __s.data () != nullptr , " string_view::find_first_not_of(): received nullptr" );
612
606
return std::__str_find_first_not_of<value_type, size_type, traits_type, npos>(
613
607
data (), size (), __s.data (), __pos, __s.size ());
614
608
}
@@ -635,8 +629,6 @@ public:
635
629
// find_last_not_of
636
630
_LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_HIDE_FROM_ABI size_type
637
631
find_last_not_of (basic_string_view __s, size_type __pos = npos) const _NOEXCEPT {
638
- _LIBCPP_ASSERT_NON_NULL (
639
- __s.size () == 0 || __s.data () != nullptr , " string_view::find_last_not_of(): received nullptr" );
640
632
return std::__str_find_last_not_of<value_type, size_type, traits_type, npos>(
641
633
data (), size (), __s.data (), __pos, __s.size ());
642
634
}
0 commit comments