diff options
Diffstat (limited to 'test/std/experimental/string.view')
47 files changed, 93 insertions, 54 deletions
diff --git a/test/std/experimental/string.view/string.view.access/data.pass.cpp b/test/std/experimental/string.view/string.view.access/data.pass.cpp index 53e95ddae..4b581d653 100644 --- a/test/std/experimental/string.view/string.view.access/data.pass.cpp +++ b/test/std/experimental/string.view/string.view.access/data.pass.cpp @@ -39,7 +39,7 @@ int main () { test ( U"a", 1 ); #endif -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { constexpr const char *s = "ABC"; constexpr std::experimental::basic_string_view<char> sv( s, 2 ); diff --git a/test/std/experimental/string.view/string.view.access/index.pass.cpp b/test/std/experimental/string.view/string.view.access/index.pass.cpp index 2c1bd1dc9..0cb385eef 100644 --- a/test/std/experimental/string.view/string.view.access/index.pass.cpp +++ b/test/std/experimental/string.view/string.view.access/index.pass.cpp @@ -42,7 +42,7 @@ int main () { test ( U"a", 1 ); #endif -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { constexpr std::experimental::basic_string_view<char> sv ( "ABC", 2 ); static_assert ( sv.length() == 2, "" ); diff --git a/test/std/experimental/string.view/string.view.capacity/capacity.pass.cpp b/test/std/experimental/string.view/string.view.capacity/capacity.pass.cpp index 9f5d86f2f..a5108bf12 100644 --- a/test/std/experimental/string.view/string.view.capacity/capacity.pass.cpp +++ b/test/std/experimental/string.view/string.view.capacity/capacity.pass.cpp @@ -23,7 +23,7 @@ template<typename SV> void test1 () { -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { constexpr SV sv1; static_assert ( sv1.size() == 0, "" ); diff --git a/test/std/experimental/string.view/string.view.comparison/opeq.string_view.pointer.pass.cpp b/test/std/experimental/string.view/string.view.comparison/opeq.string_view.pointer.pass.cpp index 0df37a6ff..bd566a986 100644 --- a/test/std/experimental/string.view/string.view.comparison/opeq.string_view.pointer.pass.cpp +++ b/test/std/experimental/string.view/string.view.comparison/opeq.string_view.pointer.pass.cpp @@ -17,6 +17,7 @@ #include <experimental/string_view> #include <cassert> +#include "test_macros.h" #include "constexpr_char_traits.hpp" template <class S> @@ -49,7 +50,7 @@ int main() test(S("abcdefghijklmnopqrst"), "abcdefghijklmnopqrst", true); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::experimental::basic_string_view<char, constexpr_char_traits<char>> SV; constexpr SV sv1; diff --git a/test/std/experimental/string.view/string.view.comparison/opeq.string_view.string_view.pass.cpp b/test/std/experimental/string.view/string.view.comparison/opeq.string_view.string_view.pass.cpp index 5971f6974..51decdca6 100644 --- a/test/std/experimental/string.view/string.view.comparison/opeq.string_view.string_view.pass.cpp +++ b/test/std/experimental/string.view/string.view.comparison/opeq.string_view.string_view.pass.cpp @@ -16,6 +16,7 @@ #include <experimental/string_view> #include <cassert> +#include "test_macros.h" #include "constexpr_char_traits.hpp" template <class S> @@ -48,7 +49,7 @@ int main() test(S("abcdefghijklmnopqrst"), S("abcdefghijklmnopqrst"), true); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::experimental::basic_string_view<char, constexpr_char_traits<char>> SV; constexpr SV sv1; diff --git a/test/std/experimental/string.view/string.view.comparison/opge.string_view.pointer.pass.cpp b/test/std/experimental/string.view/string.view.comparison/opge.string_view.pointer.pass.cpp index f5bcb7e97..cf8a30a39 100644 --- a/test/std/experimental/string.view/string.view.comparison/opge.string_view.pointer.pass.cpp +++ b/test/std/experimental/string.view/string.view.comparison/opge.string_view.pointer.pass.cpp @@ -17,6 +17,7 @@ #include <experimental/string_view> #include <cassert> +#include "test_macros.h" #include "constexpr_char_traits.hpp" template <class S> @@ -49,7 +50,7 @@ int main() test("abcdefghijklmnopqrst", S("abcdefghijklmnopqrst"), true, true); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::experimental::basic_string_view<char, constexpr_char_traits<char>> SV; constexpr SV sv1; diff --git a/test/std/experimental/string.view/string.view.comparison/opge.string_view.string_view.pass.cpp b/test/std/experimental/string.view/string.view.comparison/opge.string_view.string_view.pass.cpp index e13a4ea11..1bacf285f 100644 --- a/test/std/experimental/string.view/string.view.comparison/opge.string_view.string_view.pass.cpp +++ b/test/std/experimental/string.view/string.view.comparison/opge.string_view.string_view.pass.cpp @@ -16,6 +16,7 @@ #include <experimental/string_view> #include <cassert> +#include "test_macros.h" #include "constexpr_char_traits.hpp" template <class S> @@ -48,7 +49,7 @@ int main() test(S("abcdefghijklmnopqrst"), S("abcdefghijklmnopqrst"), true, true); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::experimental::basic_string_view<char, constexpr_char_traits<char>> SV; constexpr SV sv1; diff --git a/test/std/experimental/string.view/string.view.comparison/opgt.string_view.pointer.pass.cpp b/test/std/experimental/string.view/string.view.comparison/opgt.string_view.pointer.pass.cpp index 63002a5c4..0aae3d41a 100644 --- a/test/std/experimental/string.view/string.view.comparison/opgt.string_view.pointer.pass.cpp +++ b/test/std/experimental/string.view/string.view.comparison/opgt.string_view.pointer.pass.cpp @@ -17,6 +17,7 @@ #include <experimental/string_view> #include <cassert> +#include "test_macros.h" #include "constexpr_char_traits.hpp" template <class S> @@ -49,7 +50,7 @@ int main() test("abcdefghijklmnopqrst", S("abcdefghijklmnopqrst"), false, false); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::experimental::basic_string_view<char, constexpr_char_traits<char>> SV; constexpr SV sv1; diff --git a/test/std/experimental/string.view/string.view.comparison/opgt.string_view.string_view.pass.cpp b/test/std/experimental/string.view/string.view.comparison/opgt.string_view.string_view.pass.cpp index 3047cc7be..e014872a6 100644 --- a/test/std/experimental/string.view/string.view.comparison/opgt.string_view.string_view.pass.cpp +++ b/test/std/experimental/string.view/string.view.comparison/opgt.string_view.string_view.pass.cpp @@ -16,6 +16,7 @@ #include <experimental/string_view> #include <cassert> +#include "test_macros.h" #include "constexpr_char_traits.hpp" template <class S> @@ -48,7 +49,7 @@ int main() test(S("abcdefghijklmnopqrst"), S("abcdefghijklmnopqrst"), false, false); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::experimental::basic_string_view<char, constexpr_char_traits<char>> SV; constexpr SV sv1; diff --git a/test/std/experimental/string.view/string.view.comparison/ople.string_view.pointer.pass.cpp b/test/std/experimental/string.view/string.view.comparison/ople.string_view.pointer.pass.cpp index c542efea9..bdc4c966f 100644 --- a/test/std/experimental/string.view/string.view.comparison/ople.string_view.pointer.pass.cpp +++ b/test/std/experimental/string.view/string.view.comparison/ople.string_view.pointer.pass.cpp @@ -17,6 +17,7 @@ #include <experimental/string_view> #include <cassert> +#include "test_macros.h" #include "constexpr_char_traits.hpp" template <class S> @@ -49,7 +50,7 @@ int main() test("abcdefghijklmnopqrst", S("abcdefghijklmnopqrst"), true, true); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::experimental::basic_string_view<char, constexpr_char_traits<char>> SV; constexpr SV sv1; diff --git a/test/std/experimental/string.view/string.view.comparison/ople.string_view.string_view.pass.cpp b/test/std/experimental/string.view/string.view.comparison/ople.string_view.string_view.pass.cpp index 17219a426..e814283ad 100644 --- a/test/std/experimental/string.view/string.view.comparison/ople.string_view.string_view.pass.cpp +++ b/test/std/experimental/string.view/string.view.comparison/ople.string_view.string_view.pass.cpp @@ -16,6 +16,7 @@ #include <experimental/string_view> #include <cassert> +#include "test_macros.h" #include "constexpr_char_traits.hpp" template <class S> @@ -48,7 +49,7 @@ int main() test(S("abcdefghijklmnopqrst"), S("abcdefghijklmnopqrst"), true, true); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::experimental::basic_string_view<char, constexpr_char_traits<char>> SV; constexpr SV sv1; diff --git a/test/std/experimental/string.view/string.view.comparison/oplt.string_view.pointer.pass.cpp b/test/std/experimental/string.view/string.view.comparison/oplt.string_view.pointer.pass.cpp index 2c0461481..10e82437c 100644 --- a/test/std/experimental/string.view/string.view.comparison/oplt.string_view.pointer.pass.cpp +++ b/test/std/experimental/string.view/string.view.comparison/oplt.string_view.pointer.pass.cpp @@ -17,6 +17,7 @@ #include <experimental/string_view> #include <cassert> +#include "test_macros.h" #include "constexpr_char_traits.hpp" template <class S> @@ -49,7 +50,7 @@ int main() test("abcdefghijklmnopqrst", S("abcdefghijklmnopqrst"), false, false); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::experimental::basic_string_view<char, constexpr_char_traits<char>> SV; constexpr SV sv1; diff --git a/test/std/experimental/string.view/string.view.comparison/oplt.string_view.string_view.pass.cpp b/test/std/experimental/string.view/string.view.comparison/oplt.string_view.string_view.pass.cpp index df9e90893..77d8fa3e5 100644 --- a/test/std/experimental/string.view/string.view.comparison/oplt.string_view.string_view.pass.cpp +++ b/test/std/experimental/string.view/string.view.comparison/oplt.string_view.string_view.pass.cpp @@ -16,6 +16,7 @@ #include <experimental/string_view> #include <cassert> +#include "test_macros.h" #include "constexpr_char_traits.hpp" template <class S> @@ -48,7 +49,7 @@ int main() test(S("abcdefghijklmnopqrst"), S("abcdefghijklmnopqrst"), false, false); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::experimental::basic_string_view<char, constexpr_char_traits<char>> SV; constexpr SV sv1; diff --git a/test/std/experimental/string.view/string.view.comparison/opne.string_view.pointer.pass.cpp b/test/std/experimental/string.view/string.view.comparison/opne.string_view.pointer.pass.cpp index 1deee9ac7..9c13199d2 100644 --- a/test/std/experimental/string.view/string.view.comparison/opne.string_view.pointer.pass.cpp +++ b/test/std/experimental/string.view/string.view.comparison/opne.string_view.pointer.pass.cpp @@ -17,6 +17,7 @@ #include <experimental/string_view> #include <cassert> +#include "test_macros.h" #include "constexpr_char_traits.hpp" template <class S> @@ -49,7 +50,7 @@ int main() test(S("abcdefghijklmnopqrst"), "abcdefghijklmnopqrst", false); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::experimental::basic_string_view<char, constexpr_char_traits<char>> SV; constexpr SV sv1; diff --git a/test/std/experimental/string.view/string.view.comparison/opne.string_view.string_view.pass.cpp b/test/std/experimental/string.view/string.view.comparison/opne.string_view.string_view.pass.cpp index c99489eb3..c74b327f1 100644 --- a/test/std/experimental/string.view/string.view.comparison/opne.string_view.string_view.pass.cpp +++ b/test/std/experimental/string.view/string.view.comparison/opne.string_view.string_view.pass.cpp @@ -16,6 +16,7 @@ #include <experimental/string_view> #include <cassert> +#include "test_macros.h" #include "constexpr_char_traits.hpp" template <class S> @@ -48,7 +49,7 @@ int main() test(S("abcdefghijklmnopqrst"), S("abcdefghijklmnopqrst"), false); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::experimental::basic_string_view<char, constexpr_char_traits<char>> SV; constexpr SV sv1; diff --git a/test/std/experimental/string.view/string.view.cons/default.pass.cpp b/test/std/experimental/string.view/string.view.cons/default.pass.cpp index e817bfffb..37df020e7 100644 --- a/test/std/experimental/string.view/string.view.cons/default.pass.cpp +++ b/test/std/experimental/string.view/string.view.cons/default.pass.cpp @@ -15,9 +15,11 @@ #include <experimental/string_view> #include <cassert> +#include "test_macros.h" + template<typename T> void test () { -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { constexpr T sv1; static_assert ( sv1.size() == 0, "" ); diff --git a/test/std/experimental/string.view/string.view.cons/from_literal.pass.cpp b/test/std/experimental/string.view/string.view.cons/from_literal.pass.cpp index 9de3a3039..a8638389e 100644 --- a/test/std/experimental/string.view/string.view.cons/from_literal.pass.cpp +++ b/test/std/experimental/string.view/string.view.cons/from_literal.pass.cpp @@ -18,6 +18,7 @@ #include <string> #include <cassert> +#include "test_macros.h" #include "constexpr_char_traits.hpp" template<typename CharT> @@ -55,7 +56,7 @@ int main () { test ( U"" ); #endif -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { constexpr std::experimental::basic_string_view<char, constexpr_char_traits<char>> sv1 ( "ABCDE" ); static_assert ( sv1.size() == 5, ""); diff --git a/test/std/experimental/string.view/string.view.cons/from_ptr_len.pass.cpp b/test/std/experimental/string.view/string.view.cons/from_ptr_len.pass.cpp index 663d25e95..c2f312daa 100644 --- a/test/std/experimental/string.view/string.view.cons/from_ptr_len.pass.cpp +++ b/test/std/experimental/string.view/string.view.cons/from_ptr_len.pass.cpp @@ -34,7 +34,7 @@ int main () { test ( "QBCDE", 5 ); test ( "QBCDE", 2 ); test ( "", 0 ); -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { constexpr const char *s = "QBCDE"; constexpr std::experimental::basic_string_view<char> sv1 ( s, 2 ); @@ -46,7 +46,7 @@ int main () { test ( L"QBCDE", 5 ); test ( L"QBCDE", 2 ); test ( L"", 0 ); -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { constexpr const wchar_t *s = L"QBCDE"; constexpr std::experimental::basic_string_view<wchar_t> sv1 ( s, 2 ); @@ -59,7 +59,7 @@ int main () { test ( u"QBCDE", 5 ); test ( u"QBCDE", 2 ); test ( u"", 0 ); -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { constexpr const char16_t *s = u"QBCDE"; constexpr std::experimental::basic_string_view<char16_t> sv1 ( s, 2 ); @@ -71,7 +71,7 @@ int main () { test ( U"QBCDE", 5 ); test ( U"QBCDE", 2 ); test ( U"", 0 ); -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { constexpr const char32_t *s = U"QBCDE"; constexpr std::experimental::basic_string_view<char32_t> sv1 ( s, 2 ); diff --git a/test/std/experimental/string.view/string.view.find/find_char_size.pass.cpp b/test/std/experimental/string.view/string.view.find/find_char_size.pass.cpp index 6e6a1f557..fdaf8aa06 100644 --- a/test/std/experimental/string.view/string.view.find/find_char_size.pass.cpp +++ b/test/std/experimental/string.view/string.view.find/find_char_size.pass.cpp @@ -14,6 +14,7 @@ #include <experimental/string_view> #include <cassert> +#include "test_macros.h" #include "constexpr_char_traits.hpp" template <class S> @@ -66,7 +67,7 @@ int main() test(S("abcdeabcdeabcdeabcde"), 'c', 2); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::experimental::basic_string_view<char, constexpr_char_traits<char>> SV; constexpr SV sv1; diff --git a/test/std/experimental/string.view/string.view.find/find_first_not_of_char_size.pass.cpp b/test/std/experimental/string.view/string.view.find/find_first_not_of_char_size.pass.cpp index 73580aed8..859980af2 100644 --- a/test/std/experimental/string.view/string.view.find/find_first_not_of_char_size.pass.cpp +++ b/test/std/experimental/string.view/string.view.find/find_first_not_of_char_size.pass.cpp @@ -14,6 +14,7 @@ #include <experimental/string_view> #include <cassert> +#include "test_macros.h" #include "constexpr_char_traits.hpp" template <class S> @@ -68,7 +69,7 @@ int main() test(S("laenfsbridchgotmkqpj"), 'q', 0); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::experimental::basic_string_view<char, constexpr_char_traits<char>> SV; constexpr SV sv1; diff --git a/test/std/experimental/string.view/string.view.find/find_first_not_of_pointer_size.pass.cpp b/test/std/experimental/string.view/string.view.find/find_first_not_of_pointer_size.pass.cpp index de93288cc..1f7ce3ef5 100644 --- a/test/std/experimental/string.view/string.view.find/find_first_not_of_pointer_size.pass.cpp +++ b/test/std/experimental/string.view/string.view.find/find_first_not_of_pointer_size.pass.cpp @@ -14,6 +14,7 @@ #include <experimental/string_view> #include <cassert> +#include "test_macros.h" #include "constexpr_char_traits.hpp" template <class S> @@ -149,7 +150,7 @@ int main() test1<S>(); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::experimental::basic_string_view<char, constexpr_char_traits<char>> SV; constexpr SV sv1; diff --git a/test/std/experimental/string.view/string.view.find/find_first_not_of_pointer_size_size.pass.cpp b/test/std/experimental/string.view/string.view.find/find_first_not_of_pointer_size_size.pass.cpp index cfb0029fa..28255dd45 100644 --- a/test/std/experimental/string.view/string.view.find/find_first_not_of_pointer_size_size.pass.cpp +++ b/test/std/experimental/string.view/string.view.find/find_first_not_of_pointer_size_size.pass.cpp @@ -14,6 +14,7 @@ #include <experimental/string_view> #include <cassert> +#include "test_macros.h" #include "constexpr_char_traits.hpp" template <class S> @@ -376,7 +377,7 @@ int main() test3<S>(); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::experimental::basic_string_view<char, constexpr_char_traits<char>> SV; constexpr SV sv1; diff --git a/test/std/experimental/string.view/string.view.find/find_first_of_char_size.pass.cpp b/test/std/experimental/string.view/string.view.find/find_first_of_char_size.pass.cpp index dde2f2c9f..ffafcfc04 100644 --- a/test/std/experimental/string.view/string.view.find/find_first_of_char_size.pass.cpp +++ b/test/std/experimental/string.view/string.view.find/find_first_of_char_size.pass.cpp @@ -14,6 +14,7 @@ #include <experimental/string_view> #include <cassert> +#include "test_macros.h" #include "constexpr_char_traits.hpp" template <class S> @@ -66,7 +67,7 @@ int main() test(S("laenfsbridchgotmkqpj"), 'e', 2); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::experimental::basic_string_view<char, constexpr_char_traits<char>> SV; constexpr SV sv1; diff --git a/test/std/experimental/string.view/string.view.find/find_first_of_pointer_size.pass.cpp b/test/std/experimental/string.view/string.view.find/find_first_of_pointer_size.pass.cpp index e49e82cca..7b37fe057 100644 --- a/test/std/experimental/string.view/string.view.find/find_first_of_pointer_size.pass.cpp +++ b/test/std/experimental/string.view/string.view.find/find_first_of_pointer_size.pass.cpp @@ -14,6 +14,7 @@ #include <experimental/string_view> #include <cassert> +#include "test_macros.h" #include "constexpr_char_traits.hpp" template <class S> @@ -149,7 +150,7 @@ int main() test1<S>(); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::experimental::basic_string_view<char, constexpr_char_traits<char>> SV; constexpr SV sv1; diff --git a/test/std/experimental/string.view/string.view.find/find_first_of_pointer_size_size.pass.cpp b/test/std/experimental/string.view/string.view.find/find_first_of_pointer_size_size.pass.cpp index 1dc8d8547..1f7ea383a 100644 --- a/test/std/experimental/string.view/string.view.find/find_first_of_pointer_size_size.pass.cpp +++ b/test/std/experimental/string.view/string.view.find/find_first_of_pointer_size_size.pass.cpp @@ -14,6 +14,7 @@ #include <experimental/string_view> #include <cassert> +#include "test_macros.h" #include "constexpr_char_traits.hpp" template <class S> @@ -376,7 +377,7 @@ int main() test3<S>(); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::experimental::basic_string_view<char, constexpr_char_traits<char>> SV; constexpr SV sv1; diff --git a/test/std/experimental/string.view/string.view.find/find_last_not_of_char_size.pass.cpp b/test/std/experimental/string.view/string.view.find/find_last_not_of_char_size.pass.cpp index ed1a35e91..307be2370 100644 --- a/test/std/experimental/string.view/string.view.find/find_last_not_of_char_size.pass.cpp +++ b/test/std/experimental/string.view/string.view.find/find_last_not_of_char_size.pass.cpp @@ -14,6 +14,7 @@ #include <experimental/string_view> #include <cassert> +#include "test_macros.h" #include "constexpr_char_traits.hpp" template <class S> @@ -66,7 +67,7 @@ int main() test(S("laenfsbridchgotmkqpj"), 'i', 19); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::experimental::basic_string_view<char, constexpr_char_traits<char>> SV; constexpr SV sv1; diff --git a/test/std/experimental/string.view/string.view.find/find_last_not_of_pointer_size.pass.cpp b/test/std/experimental/string.view/string.view.find/find_last_not_of_pointer_size.pass.cpp index e07c4f361..b0d3f0636 100644 --- a/test/std/experimental/string.view/string.view.find/find_last_not_of_pointer_size.pass.cpp +++ b/test/std/experimental/string.view/string.view.find/find_last_not_of_pointer_size.pass.cpp @@ -14,6 +14,7 @@ #include <experimental/string_view> #include <cassert> +#include "test_macros.h" #include "constexpr_char_traits.hpp" template <class S> @@ -149,7 +150,7 @@ int main() test1<S>(); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::experimental::basic_string_view<char, constexpr_char_traits<char>> SV; constexpr SV sv1; diff --git a/test/std/experimental/string.view/string.view.find/find_last_not_of_pointer_size_size.pass.cpp b/test/std/experimental/string.view/string.view.find/find_last_not_of_pointer_size_size.pass.cpp index 3ddf03365..8a591ccbe 100644 --- a/test/std/experimental/string.view/string.view.find/find_last_not_of_pointer_size_size.pass.cpp +++ b/test/std/experimental/string.view/string.view.find/find_last_not_of_pointer_size_size.pass.cpp @@ -14,6 +14,7 @@ #include <experimental/string_view> #include <cassert> +#include "test_macros.h" #include "constexpr_char_traits.hpp" template <class S> @@ -376,7 +377,7 @@ int main() test3<S>(); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::experimental::basic_string_view<char, constexpr_char_traits<char>> SV; constexpr SV sv1; diff --git a/test/std/experimental/string.view/string.view.find/find_last_of_char_size.pass.cpp b/test/std/experimental/string.view/string.view.find/find_last_of_char_size.pass.cpp index d28e00795..b949eec1b 100644 --- a/test/std/experimental/string.view/string.view.find/find_last_of_char_size.pass.cpp +++ b/test/std/experimental/string.view/string.view.find/find_last_of_char_size.pass.cpp @@ -14,6 +14,7 @@ #include <experimental/string_view> #include <cassert> +#include "test_macros.h" #include "constexpr_char_traits.hpp" template <class S> @@ -66,7 +67,7 @@ int main() test(S("laenfsbridchgotmkqpj"), 'm', 15); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::experimental::basic_string_view<char, constexpr_char_traits<char>> SV; constexpr SV sv1; diff --git a/test/std/experimental/string.view/string.view.find/find_last_of_pointer_size.pass.cpp b/test/std/experimental/string.view/string.view.find/find_last_of_pointer_size.pass.cpp index f01e277f5..3755b2653 100644 --- a/test/std/experimental/string.view/string.view.find/find_last_of_pointer_size.pass.cpp +++ b/test/std/experimental/string.view/string.view.find/find_last_of_pointer_size.pass.cpp @@ -14,6 +14,7 @@ #include <experimental/string_view> #include <cassert> +#include "test_macros.h" #include "constexpr_char_traits.hpp" template <class S> @@ -149,7 +150,7 @@ int main() test1<S>(); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::experimental::basic_string_view<char, constexpr_char_traits<char>> SV; constexpr SV sv1; diff --git a/test/std/experimental/string.view/string.view.find/find_last_of_pointer_size_size.pass.cpp b/test/std/experimental/string.view/string.view.find/find_last_of_pointer_size_size.pass.cpp index a38ffa692..64b29ec7d 100644 --- a/test/std/experimental/string.view/string.view.find/find_last_of_pointer_size_size.pass.cpp +++ b/test/std/experimental/string.view/string.view.find/find_last_of_pointer_size_size.pass.cpp @@ -14,6 +14,7 @@ #include <experimental/string_view> #include <cassert> +#include "test_macros.h" #include "constexpr_char_traits.hpp" template <class S> @@ -376,7 +377,7 @@ int main() test3<S>(); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::experimental::basic_string_view<char, constexpr_char_traits<char>> SV; constexpr SV sv1; diff --git a/test/std/experimental/string.view/string.view.find/find_pointer_size.pass.cpp b/test/std/experimental/string.view/string.view.find/find_pointer_size.pass.cpp index 5ebe414be..bdccb2f22 100644 --- a/test/std/experimental/string.view/string.view.find/find_pointer_size.pass.cpp +++ b/test/std/experimental/string.view/string.view.find/find_pointer_size.pass.cpp @@ -14,6 +14,7 @@ #include <experimental/string_view> #include <cassert> +#include "test_macros.h" #include "constexpr_char_traits.hpp" template <class S> @@ -155,7 +156,7 @@ int main() test1<S>(); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::experimental::basic_string_view<char, constexpr_char_traits<char>> SV; constexpr SV sv1; diff --git a/test/std/experimental/string.view/string.view.find/find_pointer_size_size.pass.cpp b/test/std/experimental/string.view/string.view.find/find_pointer_size_size.pass.cpp index 382cbaf07..856dc4a3a 100644 --- a/test/std/experimental/string.view/string.view.find/find_pointer_size_size.pass.cpp +++ b/test/std/experimental/string.view/string.view.find/find_pointer_size_size.pass.cpp @@ -14,6 +14,7 @@ #include <experimental/string_view> #include <cassert> +#include "test_macros.h" #include "constexpr_char_traits.hpp" template <class S> @@ -376,7 +377,7 @@ int main() test3<S>(); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::experimental::basic_string_view<char, constexpr_char_traits<char>> SV; constexpr SV sv1; diff --git a/test/std/experimental/string.view/string.view.find/find_string_view_size.pass.cpp b/test/std/experimental/string.view/string.view.find/find_string_view_size.pass.cpp index 84132ac7a..f25efdd02 100644 --- a/test/std/experimental/string.view/string.view.find/find_string_view_size.pass.cpp +++ b/test/std/experimental/string.view/string.view.find/find_string_view_size.pass.cpp @@ -14,6 +14,7 @@ #include <experimental/string_view> #include <cassert> +#include "test_macros.h" #include "constexpr_char_traits.hpp" template <class S> @@ -148,7 +149,7 @@ int main() test1<S>(); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::experimental::basic_string_view<char, constexpr_char_traits<char>> SV; constexpr SV sv1; diff --git a/test/std/experimental/string.view/string.view.find/rfind_char_size.pass.cpp b/test/std/experimental/string.view/string.view.find/rfind_char_size.pass.cpp index 9014d888d..f07071101 100644 --- a/test/std/experimental/string.view/string.view.find/rfind_char_size.pass.cpp +++ b/test/std/experimental/string.view/string.view.find/rfind_char_size.pass.cpp @@ -13,6 +13,7 @@ #include <experimental/string_view> #include <cassert> +#include "test_macros.h" #include "constexpr_char_traits.hpp" template <class S> @@ -65,7 +66,7 @@ int main() test(S("abcdeabcdeabcdeabcde"), 'b', 16); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::experimental::basic_string_view<char, constexpr_char_traits<char>> SV; constexpr SV sv1; diff --git a/test/std/experimental/string.view/string.view.find/rfind_pointer_size.pass.cpp b/test/std/experimental/string.view/string.view.find/rfind_pointer_size.pass.cpp index 0559d3121..7a8795be0 100644 --- a/test/std/experimental/string.view/string.view.find/rfind_pointer_size.pass.cpp +++ b/test/std/experimental/string.view/string.view.find/rfind_pointer_size.pass.cpp @@ -13,6 +13,7 @@ #include <experimental/string_view> #include <cassert> +#include "test_macros.h" #include "constexpr_char_traits.hpp" template <class S> @@ -155,7 +156,7 @@ int main() test1<S>(); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::experimental::basic_string_view<char, constexpr_char_traits<char>> SV; constexpr SV sv1; diff --git a/test/std/experimental/string.view/string.view.find/rfind_pointer_size_size.pass.cpp b/test/std/experimental/string.view/string.view.find/rfind_pointer_size_size.pass.cpp index 9116e3aa9..2755d2c56 100644 --- a/test/std/experimental/string.view/string.view.find/rfind_pointer_size_size.pass.cpp +++ b/test/std/experimental/string.view/string.view.find/rfind_pointer_size_size.pass.cpp @@ -13,6 +13,7 @@ #include <experimental/string_view> #include <cassert> +#include "test_macros.h" #include "constexpr_char_traits.hpp" template <class S> @@ -375,7 +376,7 @@ int main() test3<S>(); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::experimental::basic_string_view<char, constexpr_char_traits<char>> SV; constexpr SV sv1; diff --git a/test/std/experimental/string.view/string.view.find/rfind_string_view_size.pass.cpp b/test/std/experimental/string.view/string.view.find/rfind_string_view_size.pass.cpp index 88457c662..e77d668d7 100644 --- a/test/std/experimental/string.view/string.view.find/rfind_string_view_size.pass.cpp +++ b/test/std/experimental/string.view/string.view.find/rfind_string_view_size.pass.cpp @@ -14,6 +14,7 @@ #include <experimental/string_view> #include <cassert> +#include "test_macros.h" #include "constexpr_char_traits.hpp" template <class S> @@ -148,7 +149,7 @@ int main() test1<S>(); } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::experimental::basic_string_view<char, constexpr_char_traits<char>> SV; constexpr SV sv1; 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 8040b81d4..5f28f63f8 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 3a1091e99..0eeafac49 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 @@ -66,7 +66,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.modifiers/clear.pass.cpp b/test/std/experimental/string.view/string.view.modifiers/clear.pass.cpp index 9a4891c8f..00b0661d8 100644 --- a/test/std/experimental/string.view/string.view.modifiers/clear.pass.cpp +++ b/test/std/experimental/string.view/string.view.modifiers/clear.pass.cpp @@ -32,7 +32,7 @@ void test ( const CharT *s, size_t len ) { } } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 constexpr size_t test_ce ( size_t n ) { typedef std::experimental::basic_string_view<char> SV; SV sv1{ "ABCDEFGHIJKL", n }; @@ -60,7 +60,7 @@ int main () { test ( U"", 0 ); #endif -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 static_assert ( test_ce (5) == 0, "" ); #endif diff --git a/test/std/experimental/string.view/string.view.modifiers/remove_prefix.pass.cpp b/test/std/experimental/string.view/string.view.modifiers/remove_prefix.pass.cpp index 4a31486af..03484a0b5 100644 --- a/test/std/experimental/string.view/string.view.modifiers/remove_prefix.pass.cpp +++ b/test/std/experimental/string.view/string.view.modifiers/remove_prefix.pass.cpp @@ -39,7 +39,7 @@ void test ( const CharT *s, size_t len ) { } } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 constexpr size_t test_ce ( size_t n, size_t k ) { typedef std::experimental::basic_string_view<char> SV; SV sv1{ "ABCDEFGHIJKL", n }; @@ -67,7 +67,7 @@ int main () { test ( U"", 0 ); #endif -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { static_assert ( test_ce ( 5, 0 ) == 5, "" ); static_assert ( test_ce ( 5, 1 ) == 4, "" ); diff --git a/test/std/experimental/string.view/string.view.modifiers/remove_suffix.pass.cpp b/test/std/experimental/string.view/string.view.modifiers/remove_suffix.pass.cpp index 9ddc6de84..6b632d0ef 100644 --- a/test/std/experimental/string.view/string.view.modifiers/remove_suffix.pass.cpp +++ b/test/std/experimental/string.view/string.view.modifiers/remove_suffix.pass.cpp @@ -39,7 +39,7 @@ void test ( const CharT *s, size_t len ) { } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 constexpr size_t test_ce ( size_t n, size_t k ) { typedef std::experimental::basic_string_view<char> SV; SV sv1{ "ABCDEFGHIJKL", n }; @@ -67,7 +67,7 @@ int main () { test ( U"", 0 ); #endif -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { static_assert ( test_ce ( 5, 0 ) == 5, "" ); static_assert ( test_ce ( 5, 1 ) == 4, "" ); diff --git a/test/std/experimental/string.view/string.view.modifiers/swap.pass.cpp b/test/std/experimental/string.view/string.view.modifiers/swap.pass.cpp index d747def85..2912fd8b9 100644 --- a/test/std/experimental/string.view/string.view.modifiers/swap.pass.cpp +++ b/test/std/experimental/string.view/string.view.modifiers/swap.pass.cpp @@ -36,7 +36,7 @@ void test ( const CharT *s, size_t len ) { } -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 constexpr size_t test_ce ( size_t n, size_t k ) { typedef std::experimental::basic_string_view<char> SV; SV sv1{ "ABCDEFGHIJKL", n }; @@ -66,7 +66,7 @@ int main () { test ( U"", 0 ); #endif -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { static_assert ( test_ce (2, 3) == 3, "" ); static_assert ( test_ce (5, 3) == 3, "" ); diff --git a/test/std/experimental/string.view/string.view.nonmem/quoted.pass.cpp b/test/std/experimental/string.view/string.view.nonmem/quoted.pass.cpp index 6ba03212d..202e9ced4 100644 --- a/test/std/experimental/string.view/string.view.nonmem/quoted.pass.cpp +++ b/test/std/experimental/string.view/string.view.nonmem/quoted.pass.cpp @@ -16,7 +16,9 @@ #include <experimental/string_view> #include <cassert> -#if _LIBCPP_STD_VER > 11 +#include "test_macros.h" + +#if TEST_STD_VER > 11 // quoted is C++14 only bool is_skipws ( const std::istream *is ) { diff --git a/test/std/experimental/string.view/string.view.ops/compare.pointer.pass.cpp b/test/std/experimental/string.view/string.view.ops/compare.pointer.pass.cpp index 583395451..93014ea11 100644 --- a/test/std/experimental/string.view/string.view.ops/compare.pointer.pass.cpp +++ b/test/std/experimental/string.view/string.view.ops/compare.pointer.pass.cpp @@ -14,6 +14,7 @@ #include <experimental/string_view> #include <cassert> +#include "test_macros.h" #include "constexpr_char_traits.hpp" int sign ( int x ) { return x > 0 ? 1 : ( x < 0 ? -1 : 0 ); } @@ -112,7 +113,7 @@ int main() } #endif -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::experimental::basic_string_view<char, constexpr_char_traits<char>> SV; constexpr SV sv1; diff --git a/test/std/experimental/string.view/string.view.ops/compare.sv.pass.cpp b/test/std/experimental/string.view/string.view.ops/compare.sv.pass.cpp index 4364ab063..ff01daaf1 100644 --- a/test/std/experimental/string.view/string.view.ops/compare.sv.pass.cpp +++ b/test/std/experimental/string.view/string.view.ops/compare.sv.pass.cpp @@ -14,6 +14,7 @@ #include <experimental/string_view> #include <cassert> +#include "test_macros.h" #include "constexpr_char_traits.hpp" int sign ( int x ) { return x > 0 ? 1 : ( x < 0 ? -1 : 0 ); } @@ -106,7 +107,7 @@ int main () { test(U"abcdefghijklmnopqrst", U"abcdefghijklmnopqrst", 0); #endif -#if _LIBCPP_STD_VER > 11 +#if TEST_STD_VER > 11 { typedef std::experimental::basic_string_view<char, constexpr_char_traits<char>> SV; constexpr SV sv1 { "abcde", 5 }; |