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

+ re-arrange expression

Browse source
This commit is contained in:
artemp 2013-05-08 17:21:34 +01:00
parent 75aa6e94d8
commit 656c9e724f
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
include/mapnik/expression_optimizer.hpp
View file

@ -86,9 +86,18 @@ struct optimize : boost::static_visitor< std::tuple<T,bool> >
auto rv = boost::get<mapnik::value_type>(std::get<0>(right));
return return_type(node_type(operation(lv,rv)),true);
}
else
if (std::get<1>(right))
{
return return_type(node_type(binary_node<Tag>(std::get<0>(right),
std::get<0>(left))), false);
}
if (std::get<1>(left))
{
return return_type(node_type(binary_node<Tag>(std::get<0>(left),
std::get<0>(right))),false);
std::get<0>(right))), false);
}
return return_type(node_type(x),false);
}
template <typename Tag>