diff options
| author | Marshall Clow <mclow.lists@gmail.com> | 2014-06-10 18:46:59 +0000 |
|---|---|---|
| committer | Marshall Clow <mclow.lists@gmail.com> | 2014-06-10 18:46:59 +0000 |
| commit | 98763eb52091bf02f2443d334792b0f79be3d1ed (patch) | |
| tree | 5f546a2a6b60179bccc6f314ee162abcdd27faf4 | |
| parent | 19b1d73e8889cd697b76f8f46327033d8ee4535b (diff) | |
| download | bcm5719-llvm-98763eb52091bf02f2443d334792b0f79be3d1ed.tar.gz bcm5719-llvm-98763eb52091bf02f2443d334792b0f79be3d1ed.zip | |
A bunch of the char.traits tests were using unicode literals. #ifdef those bits out on c++03, since it doesn't support u"" and U "" style strings.
llvm-svn: 210560
18 files changed, 36 insertions, 0 deletions
diff --git a/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/assign2.pass.cpp b/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/assign2.pass.cpp index e395d74a1f2..af87052ff21 100644 --- a/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/assign2.pass.cpp +++ b/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/assign2.pass.cpp @@ -19,8 +19,10 @@ int main() { #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS +#if __cplusplus >= 201103L char16_t c = u'\0'; std::char_traits<char16_t>::assign(c, u'a'); assert(c == u'a'); +#endif #endif // _LIBCPP_HAS_NO_UNICODE_CHARS } diff --git a/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/compare.pass.cpp b/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/compare.pass.cpp index e63113f4d9a..9f8461e0b2b 100644 --- a/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/compare.pass.cpp +++ b/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/compare.pass.cpp @@ -19,6 +19,7 @@ int main() { #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS +#if __cplusplus >= 201103L assert(std::char_traits<char16_t>::compare(u"", u"", 0) == 0); assert(std::char_traits<char16_t>::compare(u"1", u"1", 1) == 0); @@ -38,5 +39,6 @@ int main() assert(std::char_traits<char16_t>::compare(u"223", u"123", 3) > 0); assert(std::char_traits<char16_t>::compare(u"133", u"123", 3) > 0); assert(std::char_traits<char16_t>::compare(u"124", u"123", 3) > 0); +#endif #endif // _LIBCPP_HAS_NO_UNICODE_CHARS } diff --git a/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/eq.pass.cpp b/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/eq.pass.cpp index 8ac9443aaf1..8216934658c 100644 --- a/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/eq.pass.cpp +++ b/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/eq.pass.cpp @@ -19,8 +19,10 @@ int main() { #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS +#if __cplusplus >= 201103L 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')); +#endif #endif // _LIBCPP_HAS_NO_UNICODE_CHARS } diff --git a/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/eq_int_type.pass.cpp b/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/eq_int_type.pass.cpp index f07f9d6f3b1..a20aa7d4718 100644 --- a/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/eq_int_type.pass.cpp +++ b/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/eq_int_type.pass.cpp @@ -19,9 +19,11 @@ int main() { #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS +#if __cplusplus >= 201103L 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')); +#endif assert( std::char_traits<char16_t>::eq_int_type(std::char_traits<char16_t>::eof(), std::char_traits<char16_t>::eof())); #endif // _LIBCPP_HAS_NO_UNICODE_CHARS diff --git a/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/length.pass.cpp b/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/length.pass.cpp index 5cb4629a2ad..9f6acca83e3 100644 --- a/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/length.pass.cpp +++ b/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/length.pass.cpp @@ -19,10 +19,12 @@ int main() { #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS +#if __cplusplus >= 201103L 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); assert(std::char_traits<char16_t>::length(u"aaa") == 3); assert(std::char_traits<char16_t>::length(u"aaaa") == 4); +#endif #endif // _LIBCPP_HAS_NO_UNICODE_CHARS } diff --git a/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/lt.pass.cpp b/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/lt.pass.cpp index d01059ffd74..135ecc05e19 100644 --- a/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/lt.pass.cpp +++ b/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/lt.pass.cpp @@ -19,8 +19,10 @@ int main() { #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS +#if __cplusplus >= 201103L 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')); +#endif #endif // _LIBCPP_HAS_NO_UNICODE_CHARS } diff --git a/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/not_eof.pass.cpp b/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/not_eof.pass.cpp index 126663f3c83..3c213e6e0a3 100644 --- a/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/not_eof.pass.cpp +++ b/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/not_eof.pass.cpp @@ -19,8 +19,10 @@ int main() { #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS +#if __cplusplus >= 201103L 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 assert(std::char_traits<char16_t>::not_eof(0) == 0); assert(std::char_traits<char16_t>::not_eof(std::char_traits<char16_t>::eof()) != std::char_traits<char16_t>::eof()); diff --git a/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/to_char_type.pass.cpp b/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/to_char_type.pass.cpp index d8abfc5f908..ab47403dbe0 100644 --- a/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/to_char_type.pass.cpp +++ b/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/to_char_type.pass.cpp @@ -19,8 +19,10 @@ int main() { #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS +#if __cplusplus >= 201103L 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 assert(std::char_traits<char16_t>::to_char_type(0) == 0); #endif // _LIBCPP_HAS_NO_UNICODE_CHARS } diff --git a/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/to_int_type.pass.cpp b/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/to_int_type.pass.cpp index 40c33656b2f..11eb8f52546 100644 --- a/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/to_int_type.pass.cpp +++ b/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char16_t/to_int_type.pass.cpp @@ -19,8 +19,10 @@ int main() { #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS +#if __cplusplus >= 201103L 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 assert(std::char_traits<char16_t>::to_int_type(0) == 0); #endif // _LIBCPP_HAS_NO_UNICODE_CHARS } diff --git a/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/assign2.pass.cpp b/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/assign2.pass.cpp index 5950898cd2b..35dcd9602d3 100644 --- a/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/assign2.pass.cpp +++ b/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/assign2.pass.cpp @@ -19,8 +19,10 @@ int main() { #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS +#if __cplusplus >= 201103L char32_t c = U'\0'; std::char_traits<char32_t>::assign(c, U'a'); assert(c == U'a'); +#endif #endif // _LIBCPP_HAS_NO_UNICODE_CHARS } diff --git a/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/compare.pass.cpp b/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/compare.pass.cpp index 87dd6f21286..ee3019cf274 100644 --- a/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/compare.pass.cpp +++ b/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/compare.pass.cpp @@ -19,6 +19,7 @@ int main() { #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS +#if __cplusplus >= 201103L assert(std::char_traits<char32_t>::compare(U"", U"", 0) == 0); assert(std::char_traits<char32_t>::compare(U"1", U"1", 1) == 0); @@ -38,5 +39,6 @@ int main() assert(std::char_traits<char32_t>::compare(U"223", U"123", 3) > 0); assert(std::char_traits<char32_t>::compare(U"133", U"123", 3) > 0); assert(std::char_traits<char32_t>::compare(U"124", U"123", 3) > 0); +#endif #endif // _LIBCPP_HAS_NO_UNICODE_CHARS } diff --git a/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/eq.pass.cpp b/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/eq.pass.cpp index 9ed70342737..ffeff0cf45a 100644 --- a/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/eq.pass.cpp +++ b/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/eq.pass.cpp @@ -19,8 +19,10 @@ int main() { #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS +#if __cplusplus >= 201103L 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')); +#endif #endif // _LIBCPP_HAS_NO_UNICODE_CHARS } diff --git a/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/eq_int_type.pass.cpp b/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/eq_int_type.pass.cpp index ec43abc07cb..eb5c6966101 100644 --- a/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/eq_int_type.pass.cpp +++ b/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/eq_int_type.pass.cpp @@ -19,9 +19,11 @@ int main() { #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS +#if __cplusplus >= 201103L 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')); +#endif assert( std::char_traits<char32_t>::eq_int_type(std::char_traits<char32_t>::eof(), std::char_traits<char32_t>::eof())); #endif // _LIBCPP_HAS_NO_UNICODE_CHARS diff --git a/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/length.pass.cpp b/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/length.pass.cpp index 5f55add6448..d80ce051d1f 100644 --- a/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/length.pass.cpp +++ b/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/length.pass.cpp @@ -19,10 +19,12 @@ int main() { #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS +#if __cplusplus >= 201103L 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); assert(std::char_traits<char32_t>::length(U"aaa") == 3); assert(std::char_traits<char32_t>::length(U"aaaa") == 4); +#endif #endif // _LIBCPP_HAS_NO_UNICODE_CHARS } diff --git a/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/lt.pass.cpp b/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/lt.pass.cpp index cb1c0087678..f667507f045 100644 --- a/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/lt.pass.cpp +++ b/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/lt.pass.cpp @@ -19,8 +19,10 @@ int main() { #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS +#if __cplusplus >= 201103L 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')); +#endif #endif // _LIBCPP_HAS_NO_UNICODE_CHARS } diff --git a/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/not_eof.pass.cpp b/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/not_eof.pass.cpp index 2d4768f90e7..d794417bfd7 100644 --- a/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/not_eof.pass.cpp +++ b/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/not_eof.pass.cpp @@ -19,8 +19,10 @@ int main() { #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS +#if __cplusplus >= 201103L 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 assert(std::char_traits<char32_t>::not_eof(0) == 0); assert(std::char_traits<char32_t>::not_eof(std::char_traits<char32_t>::eof()) != std::char_traits<char32_t>::eof()); diff --git a/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/to_char_type.pass.cpp b/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/to_char_type.pass.cpp index 481835c5583..1f67242b2ae 100644 --- a/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/to_char_type.pass.cpp +++ b/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/to_char_type.pass.cpp @@ -19,8 +19,10 @@ int main() { #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS +#if __cplusplus >= 201103L 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 assert(std::char_traits<char32_t>::to_char_type(0) == 0); #endif // _LIBCPP_HAS_NO_UNICODE_CHARS } diff --git a/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/to_int_type.pass.cpp b/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/to_int_type.pass.cpp index 2d35d7f6ae9..a378186bdd6 100644 --- a/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/to_int_type.pass.cpp +++ b/libcxx/test/strings/char.traits/char.traits.specializations/char.traits.specializations.char32_t/to_int_type.pass.cpp @@ -19,8 +19,10 @@ int main() { #ifndef _LIBCPP_HAS_NO_UNICODE_CHARS +#if __cplusplus >= 201103L 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 assert(std::char_traits<char32_t>::to_int_type(0) == 0); #endif // _LIBCPP_HAS_NO_UNICODE_CHARS } |

