From fc7e07137dec0774feb711f70ef6fa4a79037692 Mon Sep 17 00:00:00 2001 From: Artem Pavlenko Date: Fri, 27 Jan 2012 13:23:15 +0000 Subject: [PATCH] removing as it doesn't belong in here. --- src/filter_factory.cpp | 30 +----------------------------- 1 file changed, 1 insertion(+), 29 deletions(-) diff --git a/src/filter_factory.cpp b/src/filter_factory.cpp index f55cd096c..6726cb3f2 100644 --- a/src/filter_factory.cpp +++ b/src/filter_factory.cpp @@ -50,35 +50,7 @@ public: } else { - // Backward compatiblity for version pre 2.0.0 - // To be removed in 2.1.0... - if (!boost::algorithm::icontains(str,"'") - && !boost::algorithm::icontains(str,"[") - && !boost::algorithm::icontains(str,"]") - && !boost::algorithm::icontains(str," ") - && !boost::algorithm::icontains(str,"\"")) - { - - expression_ptr expr1(new expr_node(true)); - mapnik::expression_grammar g1(tr); - std::string str1("[" + str + "]"); - std::string::const_iterator itr1 = str1.begin(); - std::string::const_iterator end1 = str1.end(); - bool r1 = boost::spirit::qi::phrase_parse(itr1,end1,g1, boost::spirit::standard_wide::space,*expr1); - if (r1 && itr1==end1) - { - std::clog << "Deprecation Warning: symbolizer value now an expression, please wrap properly in brackets like \"" + str1 + "\"\n"; - return expr1; - } - else - { - throw config_error( "Failed to parse expression: \"" + str + "\"" ); - } - } - else - { - throw config_error( "Failed to parse expression: \"" + str + "\"" ); - } + throw config_error( "Failed to parse expression: \"" + str + "\"" ); } } };