From 555fcf375e1c3155e45c854c5b833e98c1548484 Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@dbsgeo.com>
Date: Tue, 5 Mar 2013 05:34:38 -0800
Subject: [PATCH 1/2] iwyu

---
 include/mapnik/json/geometry_grammar.hpp |  4 +---
 src/json/geometry_grammar.cpp            | 17 +++++++++++------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/include/mapnik/json/geometry_grammar.hpp b/include/mapnik/json/geometry_grammar.hpp
index a64ec6f05..32b05ec3d 100644
--- a/include/mapnik/json/geometry_grammar.hpp
+++ b/include/mapnik/json/geometry_grammar.hpp
@@ -29,13 +29,11 @@
 
 // spirit::qi
 #include <boost/spirit/include/qi.hpp>
-#include <boost/spirit/include/phoenix.hpp>
+#include <boost/spirit/include/phoenix_function.hpp>
 
 namespace mapnik { namespace json {
 
 namespace qi = boost::spirit::qi;
-namespace phoenix = boost::phoenix;
-namespace fusion = boost::fusion;
 namespace standard_wide =  boost::spirit::standard_wide;
 using standard_wide::space_type;
 
diff --git a/src/json/geometry_grammar.cpp b/src/json/geometry_grammar.cpp
index e965c3a53..84700633b 100644
--- a/src/json/geometry_grammar.cpp
+++ b/src/json/geometry_grammar.cpp
@@ -28,6 +28,11 @@
 
 // boost
 #include <boost/spirit/include/support_multi_pass.hpp>
+#include <boost/spirit/include/phoenix_object.hpp>
+#include <boost/spirit/include/phoenix_stl.hpp>
+#include <boost/spirit/include/phoenix_operator.hpp>
+#include <iostream>                     // for clog, endl, etc
+#include <string>                       // for string
 
 namespace mapnik { namespace json {
 
@@ -52,9 +57,9 @@ geometry_grammar<Iterator>::geometry_grammar()
     using qi::_pass;
     using qi::fail;
     using qi::on_error;
-    using phoenix::new_;
-    using phoenix::push_back;
-    using phoenix::construct;
+    using boost::phoenix::new_;
+    using boost::phoenix::push_back;
+    using boost::phoenix::construct;
    // Nabialek trick - FIXME: how to bind argument to dispatch rule?
     // geometry = lit("\"geometry\"")
     //    >> lit(':') >> lit('{')
@@ -144,11 +149,11 @@ geometry_grammar<Iterator>::geometry_grammar()
         (
             geometry
             , std::clog
-            << phoenix::val("Error! Expecting ")
+            << boost::phoenix::val("Error! Expecting ")
             << _4                               // what failed?
-            << phoenix::val(" here: \"")
+            << boost::phoenix::val(" here: \"")
             << construct<std::string>(_3, _2)   // iterators to error-pos, end
-            << phoenix::val("\"")
+            << boost::phoenix::val("\"")
             << std::endl
             );
 }

From 7a8d6feb5d6ef31786444a42245e337bd98696b8 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Wed, 6 Mar 2013 10:08:02 +0000
Subject: [PATCH 2/2] + fix typo

---
 src/cairo_renderer.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/cairo_renderer.cpp b/src/cairo_renderer.cpp
index dbab8a6d2..b02b283d5 100644
--- a/src/cairo_renderer.cpp
+++ b/src/cairo_renderer.cpp
@@ -383,7 +383,7 @@ void cairo_renderer_base::process(building_symbolizer const& sym,
                     frame->line_to(x,y);
                     face_segments.push_back(segment_t(x0,y0,x,y));
                 }
-                else if (cm = SEG_CLOSE)
+                else if (cm == SEG_CLOSE)
                 {
                     frame->close_path();
                 }