0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

gettext: fix build with Boost.Locale 1.81

Browse source 
See https://github.com/boostorg/locale/pull/128/
This commit is contained in:
Đoàn Trần Công Danh 2022-11-28 23:21:38 +07:00 • committed by Steve Cotton
parent 699e50a485
commit fd96415bdf
1 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/gettext.cpp
View file

@ -25,6 +25,7 @@
#include <mutex>
#include <boost/locale.hpp>
#include <set>
#include <type_traits>
#if defined(__GNUC__)
#pragma GCC diagnostic push
@ -223,8 +224,13 @@ namespace
}
generator_.use_ansi_encoding(false);
#if BOOST_VERSION < 108100
generator_.categories(bl::message_facet | bl::information_facet | bl::collation_facet | bl::formatting_facet | bl::convert_facet);
generator_.characters(bl::char_facet);
#else
generator_.categories(bl::category_t::message | bl::category_t::information | bl::category_t::collation | bl::category_t::formatting | bl::category_t::convert);
generator_.characters(bl::char_facet_t::char_f);
#endif
// We cannot have current_locale_ be a non boost-generated locale since it might not supply
// the bl::info facet. As soon as we add message paths, update_locale_internal might fail,
// for example because of invalid .mo files. So make sure we call it at least once before adding paths/domains
@ -367,7 +373,12 @@ namespace
if(std::has_facet<bl::collator<char>>(current_locale_)) {
res << "has bl::collator<char> facet, ";
}
#if BOOST_VERSION < 108100
res << "generator categories='" << generator_.categories() << "'";
#else
res << "generator categories='" <<
static_cast<std::underlying_type<bl::category_t>::type>(generator_.categories()) << "'";
#endif
return res.str();
}