diff options
| author | Howard Hinnant <hhinnant@apple.com> | 2013-07-11 23:51:05 +0000 |
|---|---|---|
| committer | Howard Hinnant <hhinnant@apple.com> | 2013-07-11 23:51:05 +0000 |
| commit | 6d8a38c5371fd9101780110c6fe3789045426cf2 (patch) | |
| tree | 491040eeeecfa2231da942c82f8e3527d4a12221 | |
| parent | 9b9c78a9299a27802d431d92c36d4d55c37ae93f (diff) | |
| download | bcm5719-llvm-6d8a38c5371fd9101780110c6fe3789045426cf2.tar.gz bcm5719-llvm-6d8a38c5371fd9101780110c6fe3789045426cf2.zip | |
Port make_[un]signed tests to platforms where sizeof(wchar_t) == 2.
llvm-svn: 186136
| -rw-r--r-- | libcxx/test/utilities/meta/meta.trans/meta.trans.sign/make_signed.pass.cpp | 4 | ||||
| -rw-r--r-- | libcxx/test/utilities/meta/meta.trans/meta.trans.sign/make_unsigned.pass.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/libcxx/test/utilities/meta/meta.trans/meta.trans.sign/make_signed.pass.cpp b/libcxx/test/utilities/meta/meta.trans/meta.trans.sign/make_signed.pass.cpp index 8acc01a1b69..6e265a05a8d 100644 --- a/libcxx/test/utilities/meta/meta.trans/meta.trans.sign/make_signed.pass.cpp +++ b/libcxx/test/utilities/meta/meta.trans/meta.trans.sign/make_signed.pass.cpp @@ -43,8 +43,8 @@ int main() test_make_signed< unsigned long, long >(); test_make_signed< long long, signed long long >(); test_make_signed< unsigned long long, signed long long >(); - test_make_signed< wchar_t, int >(); - test_make_signed< const wchar_t, const int >(); + test_make_signed< wchar_t, std::conditional<sizeof(wchar_t) == 4, int, short>::type >(); + test_make_signed< const wchar_t, std::conditional<sizeof(wchar_t) == 4, const int, const short>::type >(); test_make_signed< const Enum, const int >(); test_make_signed< BigEnum, std::conditional<sizeof(long) == 4, long long, long>::type >(); } diff --git a/libcxx/test/utilities/meta/meta.trans/meta.trans.sign/make_unsigned.pass.cpp b/libcxx/test/utilities/meta/meta.trans/meta.trans.sign/make_unsigned.pass.cpp index 492e01fba02..5e432b5231d 100644 --- a/libcxx/test/utilities/meta/meta.trans/meta.trans.sign/make_unsigned.pass.cpp +++ b/libcxx/test/utilities/meta/meta.trans/meta.trans.sign/make_unsigned.pass.cpp @@ -43,8 +43,8 @@ int main() test_make_unsigned<unsigned long, unsigned long> (); test_make_unsigned<long long, unsigned long long> (); test_make_unsigned<unsigned long long, unsigned long long> (); - test_make_unsigned<wchar_t, unsigned int> (); - test_make_unsigned<const wchar_t, const unsigned int> (); + test_make_unsigned<wchar_t, std::conditional<sizeof(wchar_t) == 4, unsigned int, unsigned short>::type> (); + test_make_unsigned<const wchar_t, std::conditional<sizeof(wchar_t) == 4, const unsigned int, const unsigned short>::type> (); test_make_unsigned<const Enum, const unsigned int> (); test_make_unsigned<BigEnum, std::conditional<sizeof(long) == 4, unsigned long long, unsigned long>::type> (); |
