diff options
Diffstat (limited to 'test/std/experimental/string.view/string.view.iterators')
3 files changed, 10 insertions, 8 deletions
diff --git a/test/std/experimental/string.view/string.view.iterators/begin.pass.cpp b/test/std/experimental/string.view/string.view.iterators/begin.pass.cpp index 8040b81d4efe..5f28f63f8275 100644 --- a/test/std/experimental/string.view/string.view.iterators/begin.pass.cpp +++ b/test/std/experimental/string.view/string.view.iterators/begin.pass.cpp @@ -58,7 +58,7 @@ int main() test(u32string_view{U"123"}); #endif -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { constexpr string_view sv { "123", 3 }; constexpr u16string_view u16sv {u"123", 3 }; diff --git a/test/std/experimental/string.view/string.view.iterators/end.pass.cpp b/test/std/experimental/string.view/string.view.iterators/end.pass.cpp index 3a1091e9983c..1f22b3fbe4ba 100644 --- a/test/std/experimental/string.view/string.view.iterators/end.pass.cpp +++ b/test/std/experimental/string.view/string.view.iterators/end.pass.cpp @@ -12,6 +12,7 @@ // constexpr const_iterator end() const; #include <experimental/string_view> +#include <cstddef> #include <cassert> #include "test_macros.h" @@ -38,9 +39,9 @@ test(S s) assert(ce2 != s.begin()); } - assert( e - s.begin() == s.size()); - assert(ce1 - cs.begin() == cs.size()); - assert(ce2 - s.cbegin() == s.size()); + assert( e - s.begin() == static_cast<std::ptrdiff_t>(s.size())); + assert(ce1 - cs.begin() == static_cast<std::ptrdiff_t>(cs.size())); + assert(ce2 - s.cbegin() == static_cast<std::ptrdiff_t>(s.size())); assert( e == ce1); assert( e == ce2); @@ -66,7 +67,7 @@ int main() test(u32string_view{U"123"}); #endif -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { constexpr string_view sv { "123", 3 }; constexpr u16string_view u16sv {u"123", 3 }; diff --git a/test/std/experimental/string.view/string.view.iterators/rend.pass.cpp b/test/std/experimental/string.view/string.view.iterators/rend.pass.cpp index 55e28a266948..bd24c327e090 100644 --- a/test/std/experimental/string.view/string.view.iterators/rend.pass.cpp +++ b/test/std/experimental/string.view/string.view.iterators/rend.pass.cpp @@ -12,6 +12,7 @@ // constexpr const_iterator rend() const; #include <experimental/string_view> +#include <cstddef> #include <cassert> #include "test_macros.h" @@ -38,9 +39,9 @@ test(S s) assert(ce2 != s.rbegin()); } - assert( e - s.rbegin() == s.size()); - assert(ce1 - cs.rbegin() == cs.size()); - assert(ce2 - s.crbegin() == s.size()); + assert( e - s.rbegin() == static_cast<std::ptrdiff_t>(s.size())); + assert(ce1 - cs.rbegin() == static_cast<std::ptrdiff_t>(cs.size())); + assert(ce2 - s.crbegin() == static_cast<std::ptrdiff_t>(s.size())); assert( e == ce1); assert( e == ce2); |