diff --git a/test/std/re/re.alg/re.alg.match/awk.pass.cpp b/test/std/re/re.alg/re.alg.match/awk.pass.cpp index d2065a03..e4b2f3ec 100644 --- a/test/std/re/re.alg/re.alg.match/awk.pass.cpp +++ b/test/std/re/re.alg/re.alg.match/awk.pass.cpp @@ -19,9 +19,10 @@ #include #include - #include "test_iterators.h" +#include "platform_support.h" // locale name macros + int main() { /* { @@ -613,7 +614,7 @@ int main() std::regex_constants::awk))); assert(m.size() == 0); } - std::locale::global(std::locale("cs_CZ.ISO8859-2")); + std::locale::global(std::locale(LOCALE_cs_CZ_ISO8859_2)); */ { std::cmatch m; const char s[] = "m"; @@ -1294,7 +1295,7 @@ int main() std::regex_constants::awk))); assert(m.size() == 0); } - std::locale::global(std::locale("cs_CZ.ISO8859-2")); + std::locale::global(std::locale(LOCALE_cs_CZ_ISO8859_2)); { std::wcmatch m; const wchar_t s[] = L"m"; diff --git a/test/std/re/re.alg/re.alg.match/basic.pass.cpp b/test/std/re/re.alg/re.alg.match/basic.pass.cpp index 4139cea3..2ddc07a2 100644 --- a/test/std/re/re.alg/re.alg.match/basic.pass.cpp +++ b/test/std/re/re.alg/re.alg.match/basic.pass.cpp @@ -23,9 +23,10 @@ #include #include - #include "test_iterators.h" +#include "platform_support.h" // locale name macros + int main() { { @@ -619,7 +620,7 @@ int main() std::regex_constants::basic))); assert(m.size() == 0); } - std::locale::global(std::locale("cs_CZ.ISO8859-2")); + std::locale::global(std::locale(LOCALE_cs_CZ_ISO8859_2)); { std::cmatch m; const char s[] = "m"; @@ -1287,7 +1288,7 @@ int main() std::regex_constants::basic))); assert(m.size() == 0); } - std::locale::global(std::locale("cs_CZ.ISO8859-2")); + std::locale::global(std::locale(LOCALE_cs_CZ_ISO8859_2)); { std::wcmatch m; const wchar_t s[] = L"m"; diff --git a/test/std/re/re.alg/re.alg.match/ecma.pass.cpp b/test/std/re/re.alg/re.alg.match/ecma.pass.cpp index 38540560..785a61c4 100644 --- a/test/std/re/re.alg/re.alg.match/ecma.pass.cpp +++ b/test/std/re/re.alg/re.alg.match/ecma.pass.cpp @@ -23,9 +23,10 @@ #include #include - #include "test_iterators.h" +#include "platform_support.h" // locale name macros + int main() { { @@ -581,7 +582,7 @@ int main() assert(!std::regex_match(s, m, std::regex("[a[.hyphen.]z]"))); assert(m.size() == 0); } - std::locale::global(std::locale("cs_CZ.ISO8859-2")); + std::locale::global(std::locale(LOCALE_cs_CZ_ISO8859_2)); { std::cmatch m; const char s[] = "m"; @@ -1246,7 +1247,7 @@ int main() assert(!std::regex_match(s, m, std::wregex(L"[a[.hyphen.]z]"))); assert(m.size() == 0); } - std::locale::global(std::locale("cs_CZ.ISO8859-2")); + std::locale::global(std::locale(LOCALE_cs_CZ_ISO8859_2)); { std::wcmatch m; const wchar_t s[] = L"m"; diff --git a/test/std/re/re.alg/re.alg.match/extended.pass.cpp b/test/std/re/re.alg/re.alg.match/extended.pass.cpp index c54825de..9ca31d18 100644 --- a/test/std/re/re.alg/re.alg.match/extended.pass.cpp +++ b/test/std/re/re.alg/re.alg.match/extended.pass.cpp @@ -23,9 +23,10 @@ #include #include - #include "test_iterators.h" +#include "platform_support.h" // locale name macros + int main() { { @@ -617,7 +618,7 @@ int main() std::regex_constants::extended))); assert(m.size() == 0); } - std::locale::global(std::locale("cs_CZ.ISO8859-2")); + std::locale::global(std::locale(LOCALE_cs_CZ_ISO8859_2)); { std::cmatch m; const char s[] = "m"; @@ -1283,7 +1284,7 @@ int main() std::regex_constants::extended))); assert(m.size() == 0); } - std::locale::global(std::locale("cs_CZ.ISO8859-2")); + std::locale::global(std::locale(LOCALE_cs_CZ_ISO8859_2)); { std::wcmatch m; const wchar_t s[] = L"m"; diff --git a/test/std/re/re.alg/re.alg.search/awk.pass.cpp b/test/std/re/re.alg/re.alg.search/awk.pass.cpp index 521e98b3..7fc1b3fc 100644 --- a/test/std/re/re.alg/re.alg.search/awk.pass.cpp +++ b/test/std/re/re.alg/re.alg.search/awk.pass.cpp @@ -23,9 +23,10 @@ #include #include - #include "test_iterators.h" +#include "platform_support.h" // locale name macros + int main() { { @@ -689,7 +690,7 @@ int main() std::regex_constants::awk))); assert(m.size() == 0); } - std::locale::global(std::locale("cs_CZ.ISO8859-2")); + std::locale::global(std::locale(LOCALE_cs_CZ_ISO8859_2)); { std::cmatch m; const char s[] = "m"; @@ -1460,7 +1461,7 @@ int main() std::regex_constants::awk))); assert(m.size() == 0); } - std::locale::global(std::locale("cs_CZ.ISO8859-2")); + std::locale::global(std::locale(LOCALE_cs_CZ_ISO8859_2)); { std::wcmatch m; const wchar_t s[] = L"m"; diff --git a/test/std/re/re.alg/re.alg.search/basic.pass.cpp b/test/std/re/re.alg/re.alg.search/basic.pass.cpp index 838294e9..bdfcd9cc 100644 --- a/test/std/re/re.alg/re.alg.search/basic.pass.cpp +++ b/test/std/re/re.alg/re.alg.search/basic.pass.cpp @@ -23,9 +23,10 @@ #include #include - #include "test_iterators.h" +#include "platform_support.h" // locale name macros + int main() { { @@ -691,7 +692,7 @@ int main() std::regex_constants::basic))); assert(m.size() == 0); } - std::locale::global(std::locale("cs_CZ.ISO8859-2")); + std::locale::global(std::locale(LOCALE_cs_CZ_ISO8859_2)); { std::cmatch m; const char s[] = "m"; @@ -1449,7 +1450,7 @@ int main() std::regex_constants::basic))); assert(m.size() == 0); } - std::locale::global(std::locale("cs_CZ.ISO8859-2")); + std::locale::global(std::locale(LOCALE_cs_CZ_ISO8859_2)); { std::wcmatch m; const wchar_t s[] = L"m"; diff --git a/test/std/re/re.alg/re.alg.search/ecma.pass.cpp b/test/std/re/re.alg/re.alg.search/ecma.pass.cpp index 2796850f..fb9fc26a 100644 --- a/test/std/re/re.alg/re.alg.search/ecma.pass.cpp +++ b/test/std/re/re.alg/re.alg.search/ecma.pass.cpp @@ -23,9 +23,10 @@ #include #include - #include "test_iterators.h" +#include "platform_support.h" // locale name macros + int main() { { @@ -671,7 +672,7 @@ int main() assert(!std::regex_search(s, m, std::regex("[a[.hyphen.]z]"))); assert(m.size() == 0); } - std::locale::global(std::locale("cs_CZ.ISO8859-2")); + std::locale::global(std::locale(LOCALE_cs_CZ_ISO8859_2)); { std::cmatch m; const char s[] = "m"; @@ -1450,7 +1451,7 @@ int main() assert(!std::regex_search(s, m, std::wregex(L"[a[.hyphen.]z]"))); assert(m.size() == 0); } - std::locale::global(std::locale("cs_CZ.ISO8859-2")); + std::locale::global(std::locale(LOCALE_cs_CZ_ISO8859_2)); { std::wcmatch m; const wchar_t s[] = L"m"; diff --git a/test/std/re/re.alg/re.alg.search/extended.pass.cpp b/test/std/re/re.alg/re.alg.search/extended.pass.cpp index a8a121bd..81eef2f9 100644 --- a/test/std/re/re.alg/re.alg.search/extended.pass.cpp +++ b/test/std/re/re.alg/re.alg.search/extended.pass.cpp @@ -23,9 +23,10 @@ #include #include - #include "test_iterators.h" +#include "platform_support.h" // locale name macros + int main() { { @@ -689,7 +690,7 @@ int main() std::regex_constants::extended))); assert(m.size() == 0); } - std::locale::global(std::locale("cs_CZ.ISO8859-2")); + std::locale::global(std::locale(LOCALE_cs_CZ_ISO8859_2)); { std::cmatch m; const char s[] = "m"; @@ -1445,7 +1446,7 @@ int main() std::regex_constants::extended))); assert(m.size() == 0); } - std::locale::global(std::locale("cs_CZ.ISO8859-2")); + std::locale::global(std::locale(LOCALE_cs_CZ_ISO8859_2)); { std::wcmatch m; const wchar_t s[] = L"m"; diff --git a/test/std/re/re.traits/lookup_collatename.pass.cpp b/test/std/re/re.traits/lookup_collatename.pass.cpp index d495f8aa..a7cd5f07 100644 --- a/test/std/re/re.traits/lookup_collatename.pass.cpp +++ b/test/std/re/re.traits/lookup_collatename.pass.cpp @@ -25,6 +25,8 @@ #include #include "test_iterators.h" +#include "platform_support.h" // locale name macros + template void test(const char_type* A, const std::basic_string& expected) @@ -108,7 +110,7 @@ int main() test("tild", std::string("")); test("ch", std::string("")); - std::locale::global(std::locale("cs_CZ.ISO8859-2")); + std::locale::global(std::locale(LOCALE_cs_CZ_ISO8859_2)); test("ch", std::string("ch")); std::locale::global(std::locale("C")); @@ -184,7 +186,7 @@ int main() test(L"tild", std::wstring(L"")); test(L"ch", std::wstring(L"")); - std::locale::global(std::locale("cs_CZ.ISO8859-2")); + std::locale::global(std::locale(LOCALE_cs_CZ_ISO8859_2)); test(L"ch", std::wstring(L"ch")); std::locale::global(std::locale("C")); } diff --git a/test/std/re/re.traits/transform.pass.cpp b/test/std/re/re.traits/transform.pass.cpp index c3bce793..85235e04 100644 --- a/test/std/re/re.traits/transform.pass.cpp +++ b/test/std/re/re.traits/transform.pass.cpp @@ -21,6 +21,8 @@ #include #include "test_iterators.h" +#include "platform_support.h" // locale name macros + int main() { { @@ -29,7 +31,7 @@ int main() const char B[] = "B"; typedef forward_iterator F; assert(t.transform(F(a), F(a+1)) > t.transform(F(B), F(B+1))); - t.imbue(std::locale("cs_CZ.ISO8859-2")); + t.imbue(std::locale(LOCALE_cs_CZ_ISO8859_2)); assert(t.transform(F(a), F(a+1)) < t.transform(F(B), F(B+1))); } { @@ -38,7 +40,7 @@ int main() const wchar_t B[] = L"B"; typedef forward_iterator F; assert(t.transform(F(a), F(a+1)) > t.transform(F(B), F(B+1))); - t.imbue(std::locale("cs_CZ.ISO8859-2")); + t.imbue(std::locale(LOCALE_cs_CZ_ISO8859_2)); assert(t.transform(F(a), F(a+1)) < t.transform(F(B), F(B+1))); } } diff --git a/test/std/re/re.traits/transform_primary.pass.cpp b/test/std/re/re.traits/transform_primary.pass.cpp index 28734d62..438cd754 100644 --- a/test/std/re/re.traits/transform_primary.pass.cpp +++ b/test/std/re/re.traits/transform_primary.pass.cpp @@ -22,6 +22,8 @@ #include #include "test_iterators.h" +#include "platform_support.h" // locale name macros + int main() { { @@ -31,7 +33,7 @@ int main() typedef forward_iterator F; assert(t.transform_primary(F(A), F(A+1)) != t.transform_primary(F(Aacute), F(Aacute+1))); - t.imbue(std::locale("cs_CZ.ISO8859-2")); + t.imbue(std::locale(LOCALE_cs_CZ_ISO8859_2)); assert(t.transform_primary(F(A), F(A+1)) == t.transform_primary(F(Aacute), F(Aacute+1))); } @@ -42,7 +44,7 @@ int main() typedef forward_iterator F; assert(t.transform_primary(F(A), F(A+1)) != t.transform_primary(F(Aacute), F(Aacute+1))); - t.imbue(std::locale("cs_CZ.ISO8859-2")); + t.imbue(std::locale(LOCALE_cs_CZ_ISO8859_2)); assert(t.transform_primary(F(A), F(A+1)) == t.transform_primary(F(Aacute), F(Aacute+1))); }