sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix compile on windows of font_feature_settings.cpp - refs #2489

Browse source
This commit is contained in:
Dane Springmeyer 2014-10-02 16:31:16 -07:00
parent 75df4b12fd
commit f81fc53cbc
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/text/font_feature_settings.cpp
View file

@ -26,6 +26,7 @@
// boost
#include <boost/spirit/include/qi.hpp>
#include <boost/version.hpp>
// stl
#include <algorithm>
@ -55,11 +56,16 @@ void font_feature_settings::from_string(std::string const& features)
qi::char_type char_;
qi::as_string_type as_string;
#if BOOST_VERSION <= 104800
// Call correct overload.
using std::placeholders::_1;
void (font_feature_settings::*append)(std::string const&) = &font_feature_settings::append;
if (!qi::parse(features.begin(), features.end(), as_string[+(char_ - ',')][std::bind(append, this, _1)] % ','))
#else
auto app = [&](std::string const& s) { append(s); };
if (!qi::parse(features.begin(), features.end(), as_string[+(char_ - ',')][app] % ','))
#endif
{
throw config_error("failed to parse font-feature-settings: '" + features + "'");
}