From bc54b150eaa8271fcbf8aee7bf33782d296d9024 Mon Sep 17 00:00:00 2001
From: David <user@domain.com>
Date: Mon, 8 Oct 2007 17:42:41 +0000
Subject: [PATCH]  - reversed header include order

---
 include/mapnik/libxml2_loader.hpp  |  4 ++++
 src/agg_renderer.cpp               | 25 ++++++++++++++-----------
 src/datasource_cache.cpp           | 16 ++++++++++------
 src/distance.cpp                   |  5 +++--
 src/graphics.cpp                   |  7 ++++---
 src/image_reader.cpp               |  3 ++-
 src/image_util.cpp                 |  8 +++++---
 src/layer.cpp                      | 13 +++++++------
 src/libxml2_loader.cpp             | 12 +++++++-----
 src/line_pattern_symbolizer.cpp    |  7 ++++---
 src/load_map.cpp                   | 25 +++++++++++++------------
 src/map.cpp                        |  2 +-
 src/memory_datasource.cpp          |  4 +++-
 src/placement_finder.cpp           | 19 ++++++++++---------
 src/plugin.cpp                     |  2 +-
 src/png_reader.cpp                 |  3 ++-
 src/point_symbolizer.cpp           |  9 +++++----
 src/polygon_pattern_symbolizer.cpp |  7 ++++---
 src/proj_transform.cpp             |  4 ++--
 src/projection.cpp                 |  4 ++--
 src/save_map.cpp                   | 13 ++++++++-----
 src/scale_denominator.cpp          |  6 ++++--
 src/shield_symbolizer.cpp          |  8 ++++----
 src/text_symbolizer.cpp            |  8 ++++----
 src/tiff_reader.cpp                |  7 +++----
 src/wkb.cpp                        |  1 +
 26 files changed, 127 insertions(+), 95 deletions(-)

diff --git a/include/mapnik/libxml2_loader.hpp b/include/mapnik/libxml2_loader.hpp
index 63ddcfe4e..a9944961d 100644
--- a/include/mapnik/libxml2_loader.hpp
+++ b/include/mapnik/libxml2_loader.hpp
@@ -23,6 +23,10 @@
 #ifndef LOAD_MAP_XML2_INCLUDED
 #define LOAD_MAP_XML2_INCLUDED
 
+#include <boost/property_tree/ptree.hpp>
+
+#include <string>
+
 namespace mapnik 
 {
     void read_xml2( std::string const & filename, boost::property_tree::ptree & pt);
diff --git a/src/agg_renderer.cpp b/src/agg_renderer.cpp
index ca369d18a..4b942feb8 100644
--- a/src/agg_renderer.cpp
+++ b/src/agg_renderer.cpp
@@ -21,12 +21,13 @@
  *****************************************************************************/
 //$Id$
 
-// stl
-#include <iostream>
-// boost
-#include <boost/utility.hpp>
-#include <boost/scoped_ptr.hpp>
-#include <boost/tuple/tuple.hpp>
+// mapnik
+#include <mapnik/agg_renderer.hpp>
+
+#include <mapnik/image_util.hpp>
+#include <mapnik/unicode.hpp>
+#include <mapnik/placement_finder.hpp>
+
 // agg
 #include "agg_basics.h"
 //#include "agg_rendering_buffer.h"
@@ -59,11 +60,13 @@
 #include "agg_renderer_outline_image.h"
 #include "agg_vpgen_clip_polyline.h"
 
-// mapnik
-#include <mapnik/image_util.hpp>
-#include <mapnik/agg_renderer.hpp>
-#include <mapnik/unicode.hpp>
-#include <mapnik/placement_finder.hpp>
+// boost
+#include <boost/utility.hpp>
+#include <boost/scoped_ptr.hpp>
+#include <boost/tuple/tuple.hpp>
+
+// stl
+#include <iostream>
 
 namespace mapnik 
 {
diff --git a/src/datasource_cache.cpp b/src/datasource_cache.cpp
index 42f49d0fc..bf6d7db27 100644
--- a/src/datasource_cache.cpp
+++ b/src/datasource_cache.cpp
@@ -21,19 +21,23 @@
  *****************************************************************************/
 //$Id: datasource_cache.cpp 23 2005-03-22 22:16:34Z pavlenko $
 
-// stl
-#include <algorithm>
-#include <stdexcept>
+// mapnik
+#include <mapnik/datasource_cache.hpp>
+
+#include <mapnik/config_error.hpp>
+
 // boost
 #include <boost/thread/mutex.hpp>
 #include <boost/filesystem/operations.hpp>
 #include <boost/algorithm/string.hpp>
-// mapnik
-#include <mapnik/datasource_cache.hpp>
-#include <mapnik/config_error.hpp>
+
 // ltdl
 #include <ltdl.h>
 
+// stl
+#include <algorithm>
+#include <stdexcept>
+
 namespace mapnik
 {
    using namespace std;
diff --git a/src/distance.cpp b/src/distance.cpp
index a91891fef..efe89570c 100644
--- a/src/distance.cpp
+++ b/src/distance.cpp
@@ -21,10 +21,11 @@
  *****************************************************************************/
 
 //$Id$
-#include <cmath>
-#include <mapnik/ellipsoid.hpp>
 #include <mapnik/distance.hpp>
 
+#include <mapnik/ellipsoid.hpp>
+#include <cmath>
+
 namespace mapnik {
     
     static const double deg2rad = 0.0174532925199432958;
diff --git a/src/graphics.cpp b/src/graphics.cpp
index a46e007b5..4c7c49da3 100644
--- a/src/graphics.cpp
+++ b/src/graphics.cpp
@@ -21,14 +21,15 @@
  *****************************************************************************/
 //$Id: graphics.cpp 17 2005-03-08 23:58:43Z pavlenko $
 
+// mapnik
+#include <mapnik/graphics.hpp>
+
+#include <mapnik/image_util.hpp>
 // stl
 #include <cassert>
 #include <string.h>
 #include <stack>
 #include <iostream>
-// mapnik
-#include <mapnik/graphics.hpp>
-#include <mapnik/image_util.hpp>
 
 namespace mapnik
 {
diff --git a/src/image_reader.cpp b/src/image_reader.cpp
index baf42992f..2a161afa1 100644
--- a/src/image_reader.cpp
+++ b/src/image_reader.cpp
@@ -21,9 +21,10 @@
  *****************************************************************************/
 //$Id: image_reader.cpp 17 2005-03-08 23:58:43Z pavlenko $
 
-#include <mapnik/factory.hpp>
 #include <mapnik/image_reader.hpp>
 
+#include <mapnik/factory.hpp>
+
 namespace mapnik
 {  
     typedef factory<ImageReader,std::string, 
diff --git a/src/image_util.cpp b/src/image_util.cpp
index df0d8f6ad..203bd73b3 100644
--- a/src/image_util.cpp
+++ b/src/image_util.cpp
@@ -22,12 +22,11 @@
 
 //$Id: image_util.cpp 36 2005-04-05 14:32:18Z pavlenko $
 
-// stl
-#include <string>
 // mapnik
+#include <mapnik/image_util.hpp>
+
 #include <mapnik/graphics.hpp>
 #include <mapnik/memory.hpp>
-#include <mapnik/image_util.hpp>
 #include <mapnik/image_view.hpp>
 // jpeg png
 extern "C"
@@ -36,6 +35,9 @@ extern "C"
 #include <jpeglib.h>
 }
 
+// stl
+#include <string>
+
 namespace mapnik
 { 
     template <typename T>
diff --git a/src/layer.cpp b/src/layer.cpp
index 3479de4fb..bb36f8d60 100644
--- a/src/layer.cpp
+++ b/src/layer.cpp
@@ -22,16 +22,17 @@
 
 //$Id: layer.cpp 17 2005-03-08 23:58:43Z pavlenko $
 
-// stl
-#include <string>
-#include <iostream>
-// boost
-#include <boost/shared_ptr.hpp>
 // mapnik
+#include <mapnik/layer.hpp>
+
 #include <mapnik/style.hpp>
 #include <mapnik/datasource.hpp>
 #include <mapnik/datasource_cache.hpp>
-#include <mapnik/layer.hpp>
+// boost
+#include <boost/shared_ptr.hpp>
+// stl
+#include <string>
+#include <iostream>
 
 using namespace std;
 using boost::shared_ptr;
diff --git a/src/libxml2_loader.cpp b/src/libxml2_loader.cpp
index a0aac5c45..70303c291 100644
--- a/src/libxml2_loader.cpp
+++ b/src/libxml2_loader.cpp
@@ -20,15 +20,17 @@
  *
  *****************************************************************************/
 
-#include <libxml/parser.h>
-#include <libxml/tree.h>
-#include <libxml/parserInternals.h>
- 
+#include <mapnik/libxml2_loader.hpp>
+
+#include <mapnik/config_error.hpp>
+
 #include <boost/utility.hpp>
 #include <boost/property_tree/ptree.hpp>
 #include <boost/filesystem/operations.hpp>
 
-#include <mapnik/config_error.hpp>
+#include <libxml/parser.h>
+#include <libxml/tree.h>
+#include <libxml/parserInternals.h>
 
 #include <iostream>
 
diff --git a/src/line_pattern_symbolizer.cpp b/src/line_pattern_symbolizer.cpp
index 209c7be80..eaea4b694 100644
--- a/src/line_pattern_symbolizer.cpp
+++ b/src/line_pattern_symbolizer.cpp
@@ -21,11 +21,12 @@
  *****************************************************************************/
 
 //$Id$
+// mapnik
+#include <mapnik/line_pattern_symbolizer.hpp>
+
+#include <mapnik/image_reader.hpp>
 // stl
 #include <iostream>
-// mapnik
-#include <mapnik/image_reader.hpp>
-#include <mapnik/line_pattern_symbolizer.hpp>
 
 namespace mapnik
 {
diff --git a/src/load_map.cpp b/src/load_map.cpp
index 8c7d22393..4fe359ff0 100644
--- a/src/load_map.cpp
+++ b/src/load_map.cpp
@@ -19,18 +19,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *
  *****************************************************************************/
-// stl
-#include <iostream>
-// boost
-#include <boost/optional.hpp>
-#include <boost/algorithm/string.hpp>
-#include <boost/lexical_cast.hpp>
-#include <boost/tokenizer.hpp>
-#include <boost/property_tree/ptree.hpp>
-#include <boost/property_tree/xml_parser.hpp>
-#include <boost/static_assert.hpp>
-
 // mapnik
+#include <mapnik/load_map.hpp>
+
 #include <mapnik/image_reader.hpp>
 #include <mapnik/color.hpp>
 #include <mapnik/color_factory.hpp>
@@ -41,7 +32,17 @@
 
 #include <mapnik/ptree_helpers.hpp>
 #include <mapnik/libxml2_loader.hpp>
-#include <mapnik/load_map.hpp>
+
+// boost
+#include <boost/optional.hpp>
+#include <boost/algorithm/string.hpp>
+#include <boost/lexical_cast.hpp>
+#include <boost/tokenizer.hpp>
+#include <boost/property_tree/ptree.hpp>
+#include <boost/property_tree/xml_parser.hpp>
+#include <boost/static_assert.hpp>
+// stl
+#include <iostream>
 
 using boost::lexical_cast;
 using boost::bad_lexical_cast;
diff --git a/src/map.cpp b/src/map.cpp
index 2711ed3fe..4abe31da2 100644
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -21,13 +21,13 @@
  *****************************************************************************/
 
 //$Id: map.cpp 17 2005-03-08 23:58:43Z pavlenko $,
+#include <mapnik/map.hpp>
 
 #include <mapnik/style.hpp>
 #include <mapnik/datasource.hpp>
 #include <mapnik/projection.hpp>
 #include <mapnik/filter_featureset.hpp>
 #include <mapnik/hit_test_filter.hpp>
-#include <mapnik/map.hpp>
 
 namespace mapnik
 {
diff --git a/src/memory_datasource.cpp b/src/memory_datasource.cpp
index 8be71d23d..542ee9632 100644
--- a/src/memory_datasource.cpp
+++ b/src/memory_datasource.cpp
@@ -21,8 +21,10 @@
  *****************************************************************************/
 
 //$Id$
-#include <algorithm>
+#include <mapnik/memory_datasource.hpp>
+
 #include <mapnik/memory_featureset.hpp>
+#include <algorithm>
 
 namespace mapnik {
     
diff --git a/src/placement_finder.cpp b/src/placement_finder.cpp
index 3706d98b3..b0736d186 100644
--- a/src/placement_finder.cpp
+++ b/src/placement_finder.cpp
@@ -23,9 +23,13 @@
 
 //$Id$
 
-//stl
-#include <string>
-#include <vector>
+//mapnik
+#include <mapnik/placement_finder.hpp>
+
+#include <mapnik/geometry.hpp>
+#include <mapnik/text_path.hpp>
+#include <mapnik/shield_symbolizer.hpp>
+#include <mapnik/text_symbolizer.hpp>
 
 // boost
 #include <boost/shared_ptr.hpp>
@@ -34,12 +38,9 @@
 #include <boost/thread/mutex.hpp>
 #include <boost/tuple/tuple.hpp>
 
-//mapnik
-#include <mapnik/geometry.hpp>
-#include <mapnik/placement_finder.hpp>
-#include <mapnik/text_path.hpp>
-#include <mapnik/shield_symbolizer.hpp>
-#include <mapnik/text_symbolizer.hpp>
+//stl
+#include <string>
+#include <vector>
 
 #ifndef M_PI
 #define M_PI 3.14159265358979323846
diff --git a/src/plugin.cpp b/src/plugin.cpp
index ec1dde550..dc87920b9 100644
--- a/src/plugin.cpp
+++ b/src/plugin.cpp
@@ -22,8 +22,8 @@
 
 //$Id: plugin.cpp 17 2005-03-08 23:58:43Z pavlenko $
 
-#include <ltdl.h>
 #include <mapnik/plugin.hpp>
+#include <ltdl.h>
 
 namespace mapnik
 {
diff --git a/src/png_reader.cpp b/src/png_reader.cpp
index c1390666a..3b53ef034 100644
--- a/src/png_reader.cpp
+++ b/src/png_reader.cpp
@@ -22,7 +22,6 @@
 
 //$Id: png_reader.cpp 33 2005-04-04 13:01:03Z pavlenko $
 
-#include <iostream>
 #include <mapnik/image_reader.hpp>
 
 extern "C"
@@ -30,6 +29,8 @@ extern "C"
 #include <png.h>
 }
 
+#include <iostream>
+
 namespace mapnik
 {
     class PngReader : public ImageReader 
diff --git a/src/point_symbolizer.cpp b/src/point_symbolizer.cpp
index 5b1c6167b..d9aee8ea2 100644
--- a/src/point_symbolizer.cpp
+++ b/src/point_symbolizer.cpp
@@ -21,14 +21,15 @@
  *****************************************************************************/
 
 //$Id$
-// stl
-#include <iostream>
-// boost
-#include <boost/scoped_ptr.hpp>
 // mapnik
 #include <mapnik/point_symbolizer.hpp>
+
 #include <mapnik/image_data.hpp>
 #include <mapnik/image_reader.hpp>
+// boost
+#include <boost/scoped_ptr.hpp>
+// stl
+#include <iostream>
 
 namespace mapnik
 {
diff --git a/src/polygon_pattern_symbolizer.cpp b/src/polygon_pattern_symbolizer.cpp
index 3ab5d8c2e..237fa6d43 100644
--- a/src/polygon_pattern_symbolizer.cpp
+++ b/src/polygon_pattern_symbolizer.cpp
@@ -20,11 +20,12 @@
  *
  *****************************************************************************/
 //$Id$
+// mapnik
+#include <mapnik/polygon_pattern_symbolizer.hpp>
+
+#include <mapnik/image_reader.hpp>
 // stl
 #include <iostream>
-// mapnik
-#include <mapnik/image_reader.hpp>
-#include <mapnik/polygon_pattern_symbolizer.hpp>
 
 namespace mapnik
 {
diff --git a/src/proj_transform.cpp b/src/proj_transform.cpp
index 40b438f2c..94d5bf1b5 100644
--- a/src/proj_transform.cpp
+++ b/src/proj_transform.cpp
@@ -22,10 +22,10 @@
 
 //$Id$
 
-#include <proj_api.h>
-
 #include <mapnik/proj_transform.hpp>
 
+#include <proj_api.h>
+
 namespace mapnik {
     
     proj_transform::proj_transform(projection const& source, 
diff --git a/src/projection.cpp b/src/projection.cpp
index a6660def3..61e4fced3 100644
--- a/src/projection.cpp
+++ b/src/projection.cpp
@@ -22,10 +22,10 @@
 
 //$Id$
 
-// proj4
-#include <proj_api.h>
 // mapnik
 #include <mapnik/projection.hpp>
+// proj4
+#include <proj_api.h>
 
 namespace mapnik {
     projection::projection(std::string  params)
diff --git a/src/save_map.cpp b/src/save_map.cpp
index 527bbe7e2..9d0741434 100644
--- a/src/save_map.cpp
+++ b/src/save_map.cpp
@@ -20,8 +20,11 @@
  *
  *****************************************************************************/
 // $Id$
-// stl
-#include <iostream>
+// mapnik
+#include <mapnik/save_map.hpp>
+
+#include <mapnik/ptree_helpers.hpp>
+
 // boost
 #include <boost/algorithm/string.hpp>
 #include <boost/lexical_cast.hpp>
@@ -29,9 +32,9 @@
 #include <boost/optional.hpp>
 #include <boost/property_tree/ptree.hpp>
 #include <boost/property_tree/xml_parser.hpp>
-// mapnik
-#include <mapnik/save_map.hpp>
-#include <mapnik/ptree_helpers.hpp>
+
+// stl
+#include <iostream>
 
 namespace mapnik 
 {
diff --git a/src/scale_denominator.cpp b/src/scale_denominator.cpp
index 01515b6d0..58c7ce373 100644
--- a/src/scale_denominator.cpp
+++ b/src/scale_denominator.cpp
@@ -21,10 +21,12 @@
  *****************************************************************************/
 
 //$Id$
-#include <cmath>
-#include <mapnik/map.hpp>
 #include <mapnik/scale_denominator.hpp>
 
+#include <mapnik/map.hpp>
+
+#include <cmath>
+
 namespace mapnik {
  
     static const double pi = 3.14159265359; 
diff --git a/src/shield_symbolizer.cpp b/src/shield_symbolizer.cpp
index 6c2bae2d5..13906c7b2 100644
--- a/src/shield_symbolizer.cpp
+++ b/src/shield_symbolizer.cpp
@@ -23,14 +23,14 @@
 
 //$Id$
 
-// stl
-#include <iostream>
-// boost
-#include <boost/scoped_ptr.hpp>
 // mapnik
 #include <mapnik/shield_symbolizer.hpp>
 #include <mapnik/image_data.hpp>
 #include <mapnik/image_reader.hpp>
+// boost
+#include <boost/scoped_ptr.hpp>
+// stl
+#include <iostream>
 
 namespace mapnik
 {
diff --git a/src/text_symbolizer.cpp b/src/text_symbolizer.cpp
index 3f6a6e5d6..83e99dd11 100644
--- a/src/text_symbolizer.cpp
+++ b/src/text_symbolizer.cpp
@@ -22,12 +22,12 @@
 
 //$Id$
 
-//stl
-#include <iostream>
-// boost
-#include <boost/scoped_ptr.hpp>
 //mapnik
 #include <mapnik/text_symbolizer.hpp>
+// boost
+#include <boost/scoped_ptr.hpp>
+//stl
+#include <iostream>
 
 static const char * label_placement_strings[] = {
     "point",
diff --git a/src/tiff_reader.cpp b/src/tiff_reader.cpp
index ced3f4615..293e00505 100644
--- a/src/tiff_reader.cpp
+++ b/src/tiff_reader.cpp
@@ -21,16 +21,15 @@
  *****************************************************************************/
 
 //$Id: tiff_reader.cpp 17 2005-03-08 23:58:43Z pavlenko $
-// stl
-#include <iostream>
-#include "boost/filesystem/operations.hpp"
 // mapnik
 #include <mapnik/image_reader.hpp>
-
+#include "boost/filesystem/operations.hpp"
 extern "C" 
 {
    #include <tiffio.h>    
 }
+// stl
+#include <iostream>
 
 namespace mapnik 
 {
diff --git a/src/wkb.cpp b/src/wkb.cpp
index cb9f6b250..26c2d88c7 100644
--- a/src/wkb.cpp
+++ b/src/wkb.cpp
@@ -23,6 +23,7 @@
 //$Id: wkb.cpp 19 2005-03-22 13:53:27Z pavlenko $
 
 #include <mapnik/wkb.hpp>
+
 #include <mapnik/geom_util.hpp>
 #include <mapnik/feature.hpp>