Use L"cat" L"dog" when concatenating string literals. Patch from STL@microsoft.com

git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@273821 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Eric Fiselier 2016-06-26 19:53:46 +00:00
parent 256f000cdc
commit a8c717009e

View File

@ -75,7 +75,7 @@ int main()
}
{
const my_facet f(LOCALE_fr_FR_UTF_8, 1);
const wchar_t in[] = L"Sam 31 d""\xE9""c 23:55:59 2061";
const wchar_t in[] = L"Sam 31 d" L"\xE9" L"c 23:55:59 2061";
err = std::ios_base::goodbit;
t = std::tm();
I i = f.get(I(in), I(in+sizeof(in)/sizeof(in[0])-1), ios, err, &t, 'c');
@ -105,11 +105,11 @@ int main()
{
const my_facet f("ru_RU", 1);
const wchar_t in[] = L"\x441\x443\x431\x431\x43E\x442\x430"
", 31 "
"\x434\x435\x43A\x430\x431\x440\x44F"
" 2061 "
"\x433"
". 23:55:59";
L", 31 "
L"\x434\x435\x43A\x430\x431\x440\x44F"
L" 2061 "
L"\x433"
L". 23:55:59";
err = std::ios_base::goodbit;
t = std::tm();
I i = f.get(I(in), I(in+sizeof(in)/sizeof(in[0])-1), ios, err, &t, 'c');
@ -140,7 +140,7 @@ int main()
{
const my_facet f("zh_CN", 1);
const wchar_t in[] = L"\x516D"
" 12/31 23:55:59 2061";
L" 12/31 23:55:59 2061";
err = std::ios_base::goodbit;
t = std::tm();
I i = f.get(I(in), I(in+sizeof(in)/sizeof(in[0])-1), ios, err, &t, 'c');
@ -157,7 +157,7 @@ int main()
#endif
{
const my_facet f(LOCALE_zh_CN_UTF_8, 1);
const wchar_t in[] = L"23""\x65F6""55""\x5206""59""\x79D2";
const wchar_t in[] = L"23" L"\x65F6" L"55" L"\x5206" L"59" L"\x79D2";
err = std::ios_base::goodbit;
t = std::tm();
I i = f.get(I(in), I(in+sizeof(in)/sizeof(in[0])-1), ios, err, &t, 'X');