[mapnik] 05/06: Update 1002 patch to fix compilation of simple.cpp

[Jérémy Lal]

This is an automated email from the git hooks/post-receive script.

kapouer pushed a commit to branch master
in repository mapnik.

commit 139a46762b5337f399d29be84247d81263cffd77
Author: Jérémy Lal <kapouer at melix.org>
Date:   Fri Apr 4 02:16:43 2014 +0200

    Update 1002 patch to fix compilation of simple.cpp
---
 debian/patches/1002_no-predefined-terminals.patch | 26 +++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/debian/patches/1002_no-predefined-terminals.patch b/debian/patches/1002_no-predefined-terminals.patch
index d260595..7ef7480 100644
--- a/debian/patches/1002_no-predefined-terminals.patch
+++ b/debian/patches/1002_no-predefined-terminals.patch
@@ -1355,3 +1355,29 @@ Last-Update: 2014-04-03
  #define BOOST_TEST_MODULE root_element_test
  
  /*
+--- a/src/text_placements/simple.cpp
++++ b/src/text_placements/simple.cpp
+@@ -39,9 +39,7 @@
+ namespace qi = boost::spirit::qi;
+ namespace phoenix = boost::phoenix;
+ using phoenix::push_back;
+-using boost::spirit::ascii::space;
+ using phoenix::ref;
+-using qi::_1;
+ 
+ bool text_placement_info_simple::next()
+ {
+@@ -141,9 +139,12 @@
+ 
+     } direction_name;
+ 
++    boost::spirit::ascii::space_type space;
++    qi::_1_type _1;
++    qi::float_type float_;
+     std::string::iterator first = positions.begin(),  last = positions.end();
+     qi::phrase_parse(first, last,
+-                     (direction_name[push_back(phoenix::ref(direction_), _1)] % ',') >> *(',' >> qi::float_[push_back(phoenix::ref(text_sizes_), _1)]),
++                     (direction_name[push_back(phoenix::ref(direction_), _1)] % ',') >> *(',' >> float_[push_back(phoenix::ref(text_sizes_), _1)]),
+                      space
+         );
+     if (first != last)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mapnik.git