Skip to content

Commit 6e3c451

Browse files
authored
Merging OSX and Haiku cases
1 parent e1df989 commit 6e3c451

1 file changed

Lines changed: 2 additions & 8 deletions

File tree

libs/common/src/LocaleHelper.cpp

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -72,16 +72,10 @@ std::locale createUtf8Locale()
7272
// On windows we want to enforce the encoding (mostly UTF8) so use boost to generate it
7373
return boost::locale::generator().generate("");
7474
}
75-
#elif BOOST_OS_MACOS
75+
#elif BOOST_OS_MACOS || BOOST_OS_HAIKU
7676
std::locale createUtf8Locale()
7777
{
78-
// Don't change the locale on OSX. Using "" fails with 'locale::facet::_S_create_c_locale name not valid'
79-
return LocaleHelper::getBfsDefaultLocale();
80-
}
81-
#elif BOOST_OS_HAIKU
82-
std::locale createUtf8Locale()
83-
{
84-
// Don't change the locale on HAIKU. Using "" fails with 'locale::facet::_S_create_c_locale name not valid'
78+
// Don't change the locale on OSX or HAIKU. Using "" fails with 'locale::facet::_S_create_c_locale name not valid'
8579
return LocaleHelper::getBfsDefaultLocale();
8680
}
8781
#else

0 commit comments

Comments
 (0)