diff options
Diffstat (limited to 'test/std/strings/char.traits/char.traits.specializations')
19 files changed, 67 insertions, 26 deletions
diff --git a/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char/lt.pass.cpp b/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char/lt.pass.cpp index 3ff9c0f1ff92b..9b552347fe9eb 100644 --- a/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char/lt.pass.cpp +++ b/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char/lt.pass.cpp @@ -1,6 +1,6 @@  //===----------------------------------------------------------------------===//  // -//                     The LLVM Compiler Infrastructure +//					   The LLVM Compiler Infrastructure  //  // This file is dual licensed under the MIT and the University of Illinois Open  // Source Licenses. See LICENSE.TXT for details. @@ -18,11 +18,16 @@  int main()  { -    char c = '\0'; -    assert(!std::char_traits<char>::lt('a', 'a')); -    assert( std::char_traits<char>::lt('A', 'a')); -    assert(!std::char_traits<char>::lt('A' + 127, 'a')); -    assert(!std::char_traits<char>::lt('A' - 127, 'a')); -    assert( std::char_traits<char>::lt('A', 'a' + 127)); -    assert( std::char_traits<char>::lt('A', 'a' - 127)); +	assert( std::char_traits<char>::lt('\0', 'A')); +	assert(!std::char_traits<char>::lt('A', '\0')); + +	assert(!std::char_traits<char>::lt('a', 'a')); +	assert( std::char_traits<char>::lt('A', 'a')); +	assert(!std::char_traits<char>::lt('a', 'A')); + +	assert( std::char_traits<char>::lt('a', 'z')); +	assert( std::char_traits<char>::lt('A', 'Z')); + +	assert( std::char_traits<char>::lt(' ', 'A')); +	assert( std::char_traits<char>::lt('A', '~'));  } diff --git a/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/assign2.pass.cpp b/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/assign2.pass.cpp index af87052ff2194..7f223af57414c 100644 --- a/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/assign2.pass.cpp +++ b/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/assign2.pass.cpp @@ -16,10 +16,12 @@  #include <string>  #include <cassert> +#include "test_macros.h" +  int main()  {  #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11      char16_t c = u'\0';      std::char_traits<char16_t>::assign(c, u'a');      assert(c == u'a'); diff --git a/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/compare.pass.cpp b/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/compare.pass.cpp index b5039072dbfda..7356097a66771 100644 --- a/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/compare.pass.cpp +++ b/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/compare.pass.cpp @@ -16,10 +16,12 @@  #include <string>  #include <cassert> +#include "test_macros.h" +  int main()  {  #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11      assert(std::char_traits<char16_t>::compare(u"", u"", 0) == 0);      assert(std::char_traits<char16_t>::compare(NULL, NULL, 0) == 0); diff --git a/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/eq.pass.cpp b/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/eq.pass.cpp index 8216934658ce9..1ae4cb8fe8d92 100644 --- a/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/eq.pass.cpp +++ b/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/eq.pass.cpp @@ -16,10 +16,12 @@  #include <string>  #include <cassert> +#include "test_macros.h" +  int main()  {  #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11      char16_t c = u'\0';      assert(std::char_traits<char16_t>::eq(u'a', u'a'));      assert(!std::char_traits<char16_t>::eq(u'a', u'A')); diff --git a/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/eq_int_type.pass.cpp b/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/eq_int_type.pass.cpp index a20aa7d471895..42546f450fc7f 100644 --- a/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/eq_int_type.pass.cpp +++ b/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/eq_int_type.pass.cpp @@ -16,10 +16,12 @@  #include <string>  #include <cassert> +#include "test_macros.h" +  int main()  {  #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11      assert( std::char_traits<char16_t>::eq_int_type(u'a', u'a'));      assert(!std::char_traits<char16_t>::eq_int_type(u'a', u'A'));      assert(!std::char_traits<char16_t>::eq_int_type(std::char_traits<char16_t>::eof(), u'A')); diff --git a/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/length.pass.cpp b/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/length.pass.cpp index 9f6acca83e368..ff5a2a934a9fc 100644 --- a/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/length.pass.cpp +++ b/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/length.pass.cpp @@ -16,10 +16,12 @@  #include <string>  #include <cassert> +#include "test_macros.h" +  int main()  {  #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11      assert(std::char_traits<char16_t>::length(u"") == 0);      assert(std::char_traits<char16_t>::length(u"a") == 1);      assert(std::char_traits<char16_t>::length(u"aa") == 2); diff --git a/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/lt.pass.cpp b/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/lt.pass.cpp index 135ecc05e1996..b27ee06f4a594 100644 --- a/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/lt.pass.cpp +++ b/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/lt.pass.cpp @@ -16,10 +16,12 @@  #include <string>  #include <cassert> +#include "test_macros.h" +  int main()  {  #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11      char16_t c = u'\0';      assert(!std::char_traits<char16_t>::lt(u'a', u'a'));      assert( std::char_traits<char16_t>::lt(u'A', u'a')); diff --git a/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/not_eof.pass.cpp b/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/not_eof.pass.cpp index 3c213e6e0a37c..af9378073bec1 100644 --- a/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/not_eof.pass.cpp +++ b/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/not_eof.pass.cpp @@ -16,10 +16,12 @@  #include <string>  #include <cassert> +#include "test_macros.h" +  int main()  {  #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11      assert(std::char_traits<char16_t>::not_eof(u'a') == u'a');      assert(std::char_traits<char16_t>::not_eof(u'A') == u'A');  #endif diff --git a/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/to_char_type.pass.cpp b/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/to_char_type.pass.cpp index ab47403dbe01b..2a679d0cf4208 100644 --- a/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/to_char_type.pass.cpp +++ b/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/to_char_type.pass.cpp @@ -16,10 +16,12 @@  #include <string>  #include <cassert> +#include "test_macros.h" +  int main()  {  #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11      assert(std::char_traits<char16_t>::to_char_type(u'a') == u'a');      assert(std::char_traits<char16_t>::to_char_type(u'A') == u'A');  #endif diff --git a/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/to_int_type.pass.cpp b/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/to_int_type.pass.cpp index 11eb8f5254664..93861461baaf1 100644 --- a/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/to_int_type.pass.cpp +++ b/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/to_int_type.pass.cpp @@ -16,10 +16,12 @@  #include <string>  #include <cassert> +#include "test_macros.h" +  int main()  {  #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11      assert(std::char_traits<char16_t>::to_int_type(u'a') == u'a');      assert(std::char_traits<char16_t>::to_int_type(u'A') == u'A');  #endif diff --git a/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/assign2.pass.cpp b/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/assign2.pass.cpp index 35dcd9602d3cf..6cd55ea58bff2 100644 --- a/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/assign2.pass.cpp +++ b/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/assign2.pass.cpp @@ -16,10 +16,12 @@  #include <string>  #include <cassert> +#include "test_macros.h" +  int main()  {  #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11      char32_t c = U'\0';      std::char_traits<char32_t>::assign(c, U'a');      assert(c == U'a'); diff --git a/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/compare.pass.cpp b/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/compare.pass.cpp index 25f2099896a64..2671b5624100f 100644 --- a/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/compare.pass.cpp +++ b/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/compare.pass.cpp @@ -16,10 +16,12 @@  #include <string>  #include <cassert> +#include "test_macros.h" +  int main()  {  #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11      assert(std::char_traits<char32_t>::compare(U"", U"", 0) == 0);      assert(std::char_traits<char32_t>::compare(NULL, NULL, 0) == 0); diff --git a/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/eq.pass.cpp b/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/eq.pass.cpp index ffeff0cf45a40..0284d9f7933b9 100644 --- a/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/eq.pass.cpp +++ b/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/eq.pass.cpp @@ -16,10 +16,12 @@  #include <string>  #include <cassert> +#include "test_macros.h" +  int main()  {  #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11      char32_t c = U'\0';      assert(std::char_traits<char32_t>::eq(U'a', U'a'));      assert(!std::char_traits<char32_t>::eq(U'a', U'A')); diff --git a/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/eq_int_type.pass.cpp b/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/eq_int_type.pass.cpp index eb5c696610146..d39798c74bb62 100644 --- a/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/eq_int_type.pass.cpp +++ b/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/eq_int_type.pass.cpp @@ -16,10 +16,12 @@  #include <string>  #include <cassert> +#include "test_macros.h" +  int main()  {  #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11      assert( std::char_traits<char32_t>::eq_int_type(U'a', U'a'));      assert(!std::char_traits<char32_t>::eq_int_type(U'a', U'A'));      assert(!std::char_traits<char32_t>::eq_int_type(std::char_traits<char32_t>::eof(), U'A')); diff --git a/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/length.pass.cpp b/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/length.pass.cpp index d80ce051d1fa7..e0bee5dc50800 100644 --- a/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/length.pass.cpp +++ b/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/length.pass.cpp @@ -16,10 +16,12 @@  #include <string>  #include <cassert> +#include "test_macros.h" +  int main()  {  #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11      assert(std::char_traits<char32_t>::length(U"") == 0);      assert(std::char_traits<char32_t>::length(U"a") == 1);      assert(std::char_traits<char32_t>::length(U"aa") == 2); diff --git a/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/lt.pass.cpp b/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/lt.pass.cpp index f667507f04571..9816df7387097 100644 --- a/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/lt.pass.cpp +++ b/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/lt.pass.cpp @@ -16,10 +16,12 @@  #include <string>  #include <cassert> +#include "test_macros.h" +  int main()  {  #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11      char32_t c = U'\0';      assert(!std::char_traits<char32_t>::lt(U'a', U'a'));      assert( std::char_traits<char32_t>::lt(U'A', U'a')); diff --git a/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/not_eof.pass.cpp b/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/not_eof.pass.cpp index d794417bfd7aa..b83fd0fe07fff 100644 --- a/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/not_eof.pass.cpp +++ b/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/not_eof.pass.cpp @@ -16,10 +16,12 @@  #include <string>  #include <cassert> +#include "test_macros.h" +  int main()  {  #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11      assert(std::char_traits<char32_t>::not_eof(U'a') == U'a');      assert(std::char_traits<char32_t>::not_eof(U'A') == U'A');  #endif diff --git a/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/to_char_type.pass.cpp b/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/to_char_type.pass.cpp index 1f67242b2aec5..c9820424fb667 100644 --- a/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/to_char_type.pass.cpp +++ b/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/to_char_type.pass.cpp @@ -16,10 +16,12 @@  #include <string>  #include <cassert> +#include "test_macros.h" +  int main()  {  #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11      assert(std::char_traits<char32_t>::to_char_type(U'a') == U'a');      assert(std::char_traits<char32_t>::to_char_type(U'A') == U'A');  #endif diff --git a/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/to_int_type.pass.cpp b/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/to_int_type.pass.cpp index a378186bdd6fb..801c4cf7cddf5 100644 --- a/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/to_int_type.pass.cpp +++ b/test/std/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/to_int_type.pass.cpp @@ -16,10 +16,12 @@  #include <string>  #include <cassert> +#include "test_macros.h" +  int main()  {  #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS -#if __cplusplus >= 201103L +#if TEST_STD_VER >= 11      assert(std::char_traits<char32_t>::to_int_type(U'a') == U'a');      assert(std::char_traits<char32_t>::to_int_type(U'A') == U'A');  #endif  | 
