LineageOS/android_external_libcxx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix C++03 test failures caused by static_assert emulation

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@302871 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Eric Fiselier
2017-05-12 03:53:56 +00:00
parent e250cc68ce
commit db15e80b33
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/std/localization/locales/locale.convenience/conversions/conversions.string/converted.pass.cpp
View File

@@ -30,7 +30,7 @@ struct TestHelper<CharT, 4> {
template <class CharT> template <class CharT>
void TestHelper<CharT, 2>::test() { void TestHelper<CharT, 2>::test() {
static_assert(std::is_same<CharT, wchar_t>::value, ""); static_assert((std::is_same<CharT, wchar_t>::value), "");
{ {
typedef std::codecvt_utf8<CharT> Codecvt; typedef std::codecvt_utf8<CharT> Codecvt;
typedef std::wstring_convert<Codecvt> Myconv; typedef std::wstring_convert<Codecvt> Myconv;
@@ -47,7 +47,7 @@ void TestHelper<CharT, 2>::test() {
template <class CharT> template <class CharT>
void TestHelper<CharT, 4>::test() { void TestHelper<CharT, 4>::test() {
static_assert(std::is_same<CharT, wchar_t>::value, ""); static_assert((std::is_same<CharT, wchar_t>::value), "");
{ {
typedef std::codecvt_utf8<CharT> Codecvt; typedef std::codecvt_utf8<CharT> Codecvt;
typedef std::wstring_convert<Codecvt> Myconv; typedef std::wstring_convert<Codecvt> Myconv;

4
test/std/localization/locales/locale.convenience/conversions/conversions.string/from_bytes.pass.cpp
View File

@@ -33,7 +33,7 @@ struct TestHelper<CharT, 4> {
template <class CharT> template <class CharT>
void TestHelper<CharT, 2>::test() { void TestHelper<CharT, 2>::test() {
static_assert(std::is_same<CharT, wchar_t>::value, ""); static_assert((std::is_same<CharT, wchar_t>::value), "");
{ {
std::wstring_convert<std::codecvt_utf8<CharT> > myconv; std::wstring_convert<std::codecvt_utf8<CharT> > myconv;
std::string bs("\xE1\x80\x85\x00"); std::string bs("\xE1\x80\x85\x00");
@@ -52,7 +52,7 @@ void TestHelper<CharT, 2>::test() {
template <class CharT> template <class CharT>
void TestHelper<CharT, 4>::test() { void TestHelper<CharT, 4>::test() {
static_assert(std::is_same<CharT, wchar_t>::value, ""); static_assert((std::is_same<CharT, wchar_t>::value), "");
{ {
std::wstring_convert<std::codecvt_utf8<CharT> > myconv; std::wstring_convert<std::codecvt_utf8<CharT> > myconv;
std::string bs("\xF1\x80\x80\x83"); std::string bs("\xF1\x80\x80\x83");

4
test/std/localization/locales/locale.convenience/conversions/conversions.string/to_bytes.pass.cpp
View File

@@ -33,7 +33,7 @@ struct TestHelper<CharT, 4> {
template <class CharT> template <class CharT>
void TestHelper<CharT, 2>::test() { void TestHelper<CharT, 2>::test() {
static_assert(std::is_same<CharT, wchar_t>::value, ""); static_assert((std::is_same<CharT, wchar_t>::value), "");
{ {
std::wstring_convert<std::codecvt_utf8<CharT> > myconv; std::wstring_convert<std::codecvt_utf8<CharT> > myconv;
std::wstring ws(1, CharT(0x1005)); std::wstring ws(1, CharT(0x1005));
@@ -52,7 +52,7 @@ void TestHelper<CharT, 2>::test() {
template <class CharT> template <class CharT>
void TestHelper<CharT, 4>::test() { void TestHelper<CharT, 4>::test() {
static_assert(std::is_same<CharT, wchar_t>::value, ""); static_assert((std::is_same<CharT, wchar_t>::value), "");
{ {
std::wstring_convert<std::codecvt_utf8<CharT> > myconv; std::wstring_convert<std::codecvt_utf8<CharT> > myconv;
std::wstring ws(1, CharT(0x40003)); std::wstring ws(1, CharT(0x40003));