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

* restore operator%= support - explicit pnoenix::construct<mapnik::expr_node> on rhs

Browse source 
* move fwd decl into main mapnik namespace
* c++ style formatting
This commit is contained in:
artemp 2013-05-14 12:28:13 +01:00
parent abc5d39dbd
commit d83935a8e0
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/expression_grammar.cpp
View file

@ -34,15 +34,13 @@
#include <boost/spirit/include/phoenix_operator.hpp>
#include <boost/spirit/include/phoenix_object.hpp>
// fwd declare
namespace mapnik {
struct attribute;
struct geometry_type_attribute;
}
namespace mapnik
{
// fwd declare
struct attribute;
struct geometry_type_attribute;
template <typename T0,typename T1>
expr_node regex_match_impl::operator() (T0 & node, T1 const& pattern) const
{
@ -144,7 +142,7 @@ expression_grammar<Iterator>::expression_grammar(mapnik::transcoder const& tr)
multiplicative_expr = unary_expr [_val = _1]
>> *( '*' >> unary_expr [_val *= _1]
| '/' >> unary_expr [_val /= _1]
// | '%' >> unary_expr [_val %= _1] --> FIXME
| '%' >> unary_expr [_val %= construct<mapnik::expr_node>(_1)] //needed by clang++
| regex_match_expr[_val = regex_match_(_val, _1)]
| regex_replace_expr(_val) [_val = _1]
)