← Back to branch summary

~ubuntu-branches/ubuntu/trusty/mapnik/trusty

« back to all changes in this revision

Viewing changes to include/mapnik/filter_parser.hpp

  • Committer: Bazaar Package Importer
  • Author(s): Christophe Sauthier
  • Date: 2010-03-18 01:07:40 UTC
  • mfrom: (1.1.4 upstream) (3.1.5 sid)
  • Revision ID: james.westby@ubuntu.com-20100318010740-u01iy3n0ux9xzzir
Tags: 0.7.0-2ubuntu1
https://launchpad.net/bugs/526070
* Merge from debian testing (LP: #526070), remaining changes:
  - Bump boost build-dep and libmapnik-dev depends to boost1.40

Show diffs side-by-side

added added

removed removed

Lines of Context:
include/mapnik/filter_parser.hpp
473
473
                  equation = relation >> *( ( L'=' >> relation)
474
474
                                            [compose_filter<FeatureT,mapnik::equals<value> >(self.filters,self.exprs)]
475
475
                                            | ( L"<>" >> relation)
 
476
                                            [compose_filter<FeatureT,not_equals<value> >(self.filters,self.exprs)]
 
477
                                            | ( L"!=" >> relation)
476
478
                                            [compose_filter<FeatureT,not_equals<value> >(self.filters,self.exprs)]);
477
479
 
478
480
                  cond_expr = equation | (expression)[compose_boolean_filter<FeatureT>(self.filters,self.exprs)];