[libcxx] r273821 - Use L"cat" L"dog" when concatenating string literals. Patch from STL at microsoft.com

Eric Fiselier via cfe-commits cfe-commits at lists.llvm.org
Sun Jun 26 12:53:46 PDT 2016


Author: ericwf
Date: Sun Jun 26 14:53:46 2016
New Revision: 273821

URL: http://llvm.org/viewvc/llvm-project?rev=273821&view=rev
Log:
Use L"cat" L"dog" when concatenating string literals. Patch from STL at microsoft.com

Modified:
    libcxx/trunk/test/std/localization/locale.categories/category.time/locale.time.get.byname/get_one_wide.pass.cpp

Modified: libcxx/trunk/test/std/localization/locale.categories/category.time/locale.time.get.byname/get_one_wide.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/localization/locale.categories/category.time/locale.time.get.byname/get_one_wide.pass.cpp?rev=273821&r1=273820&r2=273821&view=diff
==============================================================================
--- libcxx/trunk/test/std/localization/locale.categories/category.time/locale.time.get.byname/get_one_wide.pass.cpp (original)
+++ libcxx/trunk/test/std/localization/locale.categories/category.time/locale.time.get.byname/get_one_wide.pass.cpp Sun Jun 26 14:53:46 2016
@@ -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');




More information about the cfe-commits mailing list