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

box2d_impl - use templated functor instead of generic lambdas + restor safe_cast<T> on assignment

Browse source
This commit is contained in:
artemp 2016-08-22 10:37:10 +01:00
parent 45dd2754db
commit 3f0a3ee063
1 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
include/mapnik/box2d_impl.hpp
View file

@ -51,10 +51,16 @@ BOOST_FUSION_ADAPT_TPL_STRUCT(
namespace mapnik {
namespace detail {
auto minx = [](auto& ctx) { _val(ctx) = _attr(ctx); };
auto miny = [](auto& ctx) { _val(ctx) = _attr(ctx); };
auto maxx = [](auto& ctx) { _val(ctx) = _attr(ctx); };
auto maxy = [](auto& ctx) { _val(ctx) = _attr(ctx); };
template <typename T>
struct assign
{
template <typename Context>
void operator() (Context & ctx) const
{
_val(ctx) = safe_cast<T>(_attr(ctx));
}
};
}
template <typename T>
@ -361,10 +367,10 @@ bool box2d<T>::from_string(std::string const& str)
boost::spirit::x3::ascii::space_type space;
bool r = boost::spirit::x3::phrase_parse(str.begin(),
str.end(),
double_[detail::minx] >> -lit(',') >>
double_[detail::miny] >> -lit(',') >>
double_[detail::maxx] >> -lit(',') >>
double_[detail::maxy],
double_[detail::assign<T>()] >> -lit(',') >>
double_[detail::assign<T>()] >> -lit(',') >>
double_[detail::assign<T>()] >> -lit(',') >>
double_[detail::assign<T>()],
space,
*this);
return r;