blob: 519d8bde2fe6a7f93f1a2c772254b2e25e27d77b (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
|
Don't ever attempt to initialise a std::locale with a UTF-8 locale on Windows -*- Mode: Diff -*-
--- libs/locale/src/boost/locale/std/std_backend.cpp
+++ libs/locale/src/boost/locale/std/std_backend.cpp
@@ -86,6 +86,7 @@
#endif
utf_mode_ = utf8_support::none;
} else {
+ #if !defined(BOOST_WINDOWS)
if(loadable(lid)) {
name_ = lid;
utf_mode_ = utf8_support::native_with_wide;
@@ -98,8 +99,8 @@
utf_mode_ = utf8_support::from_wide;
#endif
}
-#if defined(BOOST_WINDOWS)
- else if(loadable(win_name))
+ #else
+ if(loadable(win_name))
{
name_ = win_name;
utf_mode_ = utf8_support::from_wide;
|