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

Merge branch 'mapycz-fix-compile-ubuntu-precise'

Browse source
This commit is contained in:
artemp 2014-10-02 15:10:08 +01:00
commit 9b58b65583
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/text/font_feature_settings.cpp
View file

@ -31,6 +31,7 @@
#include <algorithm> #include <algorithm>
#include <cctype> #include <cctype>
#include <sstream> #include <sstream>
#include <functional>
namespace mapnik namespace mapnik
{ {
@ -54,9 +55,11 @@ void font_feature_settings::from_string(std::string const& features)
qi::char_type char_; qi::char_type char_;
qi::as_string_type as_string; qi::as_string_type as_string;
auto app = [&](std::string const& s) { append(s); }; // 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_ - ',')][app] % ',')) if (!qi::parse(features.begin(), features.end(), as_string[+(char_ - ',')][std::bind(append, this, _1)] % ','))
{ {
throw config_error("failed to parse font-feature-settings: '" + features + "'"); throw config_error("failed to parse font-feature-settings: '" + features + "'");
} }
@ -96,4 +99,3 @@ void font_feature_settings::append(std::string const& feature)
} }
} }