Fully-qualify some more locales in the tests...

git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@140251 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
David Chisnall 2011-09-21 14:48:49 +00:00
parent eb2c855c44
commit a824f53600
5 changed files with 11 additions and 11 deletions

View File

@ -70,7 +70,7 @@ int main()
t.setp(&p1, &p3); t.setp(&p1, &p3);
test<wchar_t> t2 = t; test<wchar_t> t2 = t;
} }
std::locale::global(std::locale("en_US")); std::locale::global(std::locale("en_US.UTF-8"));
{ {
test<char> t; test<char> t;
test<char> t2 = t; test<char> t2 = t;

View File

@ -42,13 +42,13 @@ int main()
test<wchar_t> t; test<wchar_t> t;
assert(t.getloc().name() == "C"); assert(t.getloc().name() == "C");
} }
std::locale::global(std::locale("en_US")); std::locale::global(std::locale("en_US.UTF-8"));
{ {
test<char> t; test<char> t;
assert(t.getloc().name() == "en_US"); assert(t.getloc().name() == "en_US.UTF-8");
} }
{ {
test<wchar_t> t; test<wchar_t> t;
assert(t.getloc().name() == "en_US"); assert(t.getloc().name() == "en_US.UTF-8");
} }
} }

View File

@ -26,7 +26,7 @@ struct test
void imbue(const std::locale&) void imbue(const std::locale&)
{ {
assert(this->getloc().name() == "en_US"); assert(this->getloc().name() == "en_US.UTF-8");
} }
}; };
@ -36,11 +36,11 @@ int main()
test<char> t; test<char> t;
assert(t.getloc().name() == "C"); assert(t.getloc().name() == "C");
} }
std::locale::global(std::locale("en_US")); std::locale::global(std::locale("en_US.UTF-8"));
{ {
test<char> t; test<char> t;
assert(t.getloc().name() == "en_US"); assert(t.getloc().name() == "en_US.UTF-8");
assert(t.pubimbue(std::locale("fr_FR")).name() == "en_US"); assert(t.pubimbue(std::locale("fr_FR.UTF-8")).name() == "en_US.UTF-8");
assert(t.getloc().name() == "fr_FR"); assert(t.getloc().name() == "fr_FR.UTF-8");
} }
} }

View File

@ -75,7 +75,7 @@ int main()
test<wchar_t> t2; test<wchar_t> t2;
t2 = t; t2 = t;
} }
std::locale::global(std::locale("en_US")); std::locale::global(std::locale("en_US.UTF-8"));
{ {
test<char> t; test<char> t;
test<char> t2; test<char> t2;

View File

@ -85,7 +85,7 @@ int main()
test<wchar_t> t2; test<wchar_t> t2;
swap(t2, t); swap(t2, t);
} }
std::locale::global(std::locale("en_US")); std::locale::global(std::locale("en_US.UTF-8"));
{ {
test<char> t; test<char> t;
test<char> t2; test<char> t2;