Index: libcxx/test/std/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char16_t_in.pass.cpp =================================================================== --- libcxx/test/std/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char16_t_in.pass.cpp +++ libcxx/test/std/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char16_t_in.pass.cpp @@ -29,7 +29,7 @@ int main(int, char**) { std::locale l = std::locale::classic(); - const char from[] = "some text"; + const char* from = reinterpret_cast(u8"some text"); F::intern_type to[9]; const F& f = std::use_facet(l); std::mbstate_t mbs = {}; Index: libcxx/test/std/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char16_t_length.pass.cpp =================================================================== --- libcxx/test/std/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char16_t_length.pass.cpp +++ libcxx/test/std/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char16_t_length.pass.cpp @@ -27,7 +27,7 @@ std::locale l = std::locale::classic(); const F& f = std::use_facet(l); std::mbstate_t mbs = {}; - const char from[] = "some text"; + const char* from = reinterpret_cast(u8"some text"); assert(f.length(mbs, from, from+10, 0) == 0); assert(f.length(mbs, from, from+10, 8) == 8); assert(f.length(mbs, from, from+10, 9) == 9); Index: libcxx/test/std/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char32_t_in.pass.cpp =================================================================== --- libcxx/test/std/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char32_t_in.pass.cpp +++ libcxx/test/std/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char32_t_in.pass.cpp @@ -29,7 +29,7 @@ int main(int, char**) { std::locale l = std::locale::classic(); - const char from[] = "some text"; + const char* from = reinterpret_cast(u8"some text"); F::intern_type to[9]; const F& f = std::use_facet(l); std::mbstate_t mbs = {}; Index: libcxx/test/std/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char32_t_length.pass.cpp =================================================================== --- libcxx/test/std/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char32_t_length.pass.cpp +++ libcxx/test/std/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char32_t_length.pass.cpp @@ -27,7 +27,7 @@ std::locale l = std::locale::classic(); const F& f = std::use_facet(l); std::mbstate_t mbs = {}; - const char from[] = "some text"; + const char* from = reinterpret_cast(u8"some text"); assert(f.length(mbs, from, from+10, 0) == 0); assert(f.length(mbs, from, from+10, 8) == 8); assert(f.length(mbs, from, from+10, 9) == 9);