More locale cleanups. Fully specify locales in iostream tests.
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@140247 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
		| @@ -33,7 +33,7 @@ void f1(std::ios_base::event ev, std::ios_base& stream, int index) | ||||
|         assert(!f1_called); | ||||
|         assert( f2_called); | ||||
|         assert( f3_called); | ||||
|         assert(stream.getloc().name() == "en_US"); | ||||
|         assert(stream.getloc().name() == "en_US.UTF-8"); | ||||
|         assert(index == 4); | ||||
|         f1_called = true; | ||||
|     } | ||||
| @@ -46,7 +46,7 @@ void f2(std::ios_base::event ev, std::ios_base& stream, int index) | ||||
|         assert(!f1_called); | ||||
|         assert(!f2_called); | ||||
|         assert( f3_called); | ||||
|         assert(stream.getloc().name() == "en_US"); | ||||
|         assert(stream.getloc().name() == "en_US.UTF-8"); | ||||
|         assert(index == 5); | ||||
|         f2_called = true; | ||||
|     } | ||||
| @@ -59,7 +59,7 @@ void f3(std::ios_base::event ev, std::ios_base& stream, int index) | ||||
|         assert(!f1_called); | ||||
|         assert(!f2_called); | ||||
|         assert(!f3_called); | ||||
|         assert(stream.getloc().name() == "en_US"); | ||||
|         assert(stream.getloc().name() == "en_US.UTF-8"); | ||||
|         assert(index == 6); | ||||
|         f3_called = true; | ||||
|     } | ||||
| @@ -72,9 +72,9 @@ int main() | ||||
|         ios.register_callback(f1, 4); | ||||
|         ios.register_callback(f2, 5); | ||||
|         ios.register_callback(f3, 6); | ||||
|         std::locale l = ios.imbue(std::locale("en_US")); | ||||
|         std::locale l = ios.imbue(std::locale("en_US.UTF-8")); | ||||
|         assert(l.name() == std::string("C")); | ||||
|         assert(ios.getloc().name() == std::string("en_US")); | ||||
|         assert(ios.getloc().name() == std::string("en_US.UTF-8")); | ||||
|         assert(f1_called); | ||||
|         assert(f2_called); | ||||
|         assert(f3_called); | ||||
| @@ -88,10 +88,10 @@ int main() | ||||
|         ios.register_callback(f1, 4); | ||||
|         ios.register_callback(f2, 5); | ||||
|         ios.register_callback(f3, 6); | ||||
|         std::locale l = ios.imbue(std::locale("en_US")); | ||||
|         std::locale l = ios.imbue(std::locale("en_US.UTF-8")); | ||||
|         assert(l.name() == std::string("C")); | ||||
|         assert(ios.getloc().name() == std::string("en_US")); | ||||
|         assert(sb.getloc().name() == std::string("en_US")); | ||||
|         assert(ios.getloc().name() == std::string("en_US.UTF-8")); | ||||
|         assert(sb.getloc().name() == std::string("en_US.UTF-8")); | ||||
|         assert(f1_called); | ||||
|         assert(f2_called); | ||||
|         assert(f3_called); | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 David Chisnall
					David Chisnall