From 49f5606a679686e512e5c89bb26e024b16a099c3 Mon Sep 17 00:00:00 2001 From: artemp Date: Wed, 20 Jan 2016 14:03:00 +0100 Subject: [PATCH] Revert "expression_test - attempt to fix nested function calls" This reverts commit faaa8412723b8168502132ce78c81fab6dcd7529. --- include/mapnik/expression_grammar_x3_def.hpp | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/include/mapnik/expression_grammar_x3_def.hpp b/include/mapnik/expression_grammar_x3_def.hpp index 10c42d24b..285786379 100644 --- a/include/mapnik/expression_grammar_x3_def.hpp +++ b/include/mapnik/expression_grammar_x3_def.hpp @@ -72,11 +72,6 @@ namespace mapnik { namespace grammar { _val(ctx) = std::move(_attr(ctx)); }; - auto do_copy = [] (auto & ctx) - { - _val(ctx) = _attr(ctx); - }; - auto do_negate = [] (auto & ctx) { _val(ctx) = std::move(unary_node(_attr(ctx))); @@ -392,7 +387,7 @@ namespace mapnik { namespace grammar { | (lit("not") | lit("!") ) > expression[do_not] | - unary_func_expression[do_copy] + unary_func_expression[do_assign] | binary_func_expression[do_assign] |