refactor value related objects into include/value dir

benchmark/bench_framework.hpp

@@ -4,7 +4,7 @@
 // mapnik
 #include <mapnik/debug.hpp>
 #include <mapnik/params.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <mapnik/safe_cast.hpp>
 #include "../test/cleanup.hpp"
 

include/mapnik/attribute.hpp

@@ -24,7 +24,7 @@
 #define MAPNIK_ATTRIBUTE_HPP
 
 // mapnik
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <mapnik/value.hpp>
 #include <mapnik/util/geometry_to_ds_type.hpp>
 // stl

include/mapnik/expression_evaluator.hpp

@@ -25,7 +25,7 @@
 
 // mapnik
 #include <mapnik/attribute.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <mapnik/expression_node.hpp>
 #include <mapnik/function_call.hpp>
 #include <mapnik/util/variant.hpp>

include/mapnik/expression_grammar_impl.hpp

@@ -27,7 +27,7 @@
 #include <mapnik/expression_node.hpp>
 #include <mapnik/expression_grammar.hpp>
 #include <mapnik/unicode.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <mapnik/function_call.hpp>
 
 #pragma GCC diagnostic push

include/mapnik/expression_node.hpp

@@ -24,7 +24,7 @@
 #define MAPNIK_EXPRESSION_NODE_HPP
 
 // mapnik
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <mapnik/value.hpp>
 #include <mapnik/config.hpp>
 #include <mapnik/unicode.hpp>

include/mapnik/expression_node_types.hpp

@@ -25,7 +25,7 @@
 
 // mapnik
 #include <mapnik/config.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <mapnik/util/variant.hpp>
 
 namespace mapnik

include/mapnik/feature.hpp

@@ -25,7 +25,7 @@
 
 // mapnik
 #include <mapnik/config.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <mapnik/value.hpp>
 #include <mapnik/box2d.hpp>
 #include <mapnik/geometry.hpp>

include/mapnik/feature_factory.hpp

@@ -25,7 +25,7 @@
 
 // mapnik
 #include <mapnik/feature.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 
 // boost
 //#include <boost/pool/pool_alloc.hpp>

include/mapnik/group/group_symbolizer_helper.hpp

@@ -25,7 +25,7 @@
 //mapnik
 #include <mapnik/text/symbolizer_helpers.hpp>
 #include <mapnik/text/placements/base.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <mapnik/pixel_position.hpp>
 
 namespace mapnik {

include/mapnik/json/generic_json.hpp

@@ -23,7 +23,7 @@
 #ifndef MAPNIK_GENERIC_JSON_HPP
 #define MAPNIK_GENERIC_JSON_HPP
 
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <mapnik/util/variant.hpp>
 #include <mapnik/json/value_converters.hpp>
 

include/mapnik/json/properties_generator_grammar.hpp

@@ -23,7 +23,7 @@
 #ifndef MAPNIK_JSON_PROPERTIES_GENERATOR_GRAMMAR_HPP
 #define MAPNIK_JSON_PROPERTIES_GENERATOR_GRAMMAR_HPP
 
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <mapnik/value.hpp>
 
 #pragma GCC diagnostic push

include/mapnik/label_collision_detector.hpp

@@ -26,7 +26,7 @@
 // mapnik
 #include <mapnik/quad_tree.hpp>
 #include <mapnik/util/noncopyable.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 
 #pragma GCC diagnostic push
 #include <mapnik/warning_ignore.hpp>

include/mapnik/params.hpp

@@ -25,7 +25,7 @@
 
 // mapnik
 #include <mapnik/config.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <mapnik/util/variant.hpp>
 
 #pragma GCC diagnostic push

include/mapnik/params_impl.hpp

@@ -25,7 +25,7 @@
 
 // mapnik
 #include <mapnik/params.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <mapnik/boolean.hpp>
 #include <mapnik/util/conversions.hpp>
 

include/mapnik/svg/output/svg_generator.hpp

@@ -30,7 +30,7 @@
 #include <mapnik/svg/geometry_svg_generator.hpp>
 #include <mapnik/svg/output/svg_output_attributes.hpp>
 #include <mapnik/util/noncopyable.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 
 
 namespace mapnik { namespace svg {

include/mapnik/svg/svg_renderer_agg.hpp

@@ -27,7 +27,7 @@
 #include <mapnik/svg/svg_path_attributes.hpp>
 #include <mapnik/gradient.hpp>
 #include <mapnik/box2d.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <mapnik/util/noncopyable.hpp>
 
 #if defined(GRID_RENDERER)

include/mapnik/symbolizer_base.hpp

@@ -25,7 +25,7 @@
 
 // mapnik
 #include <mapnik/config.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <mapnik/expression.hpp>
 #include <mapnik/path_expression.hpp>
 #include <mapnik/symbolizer_keys.hpp>

include/mapnik/symbolizer_default_values.hpp

@@ -29,7 +29,7 @@
 #include <mapnik/image_scaling.hpp>
 #include <mapnik/simplify.hpp>
 #include <mapnik/color.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <type_traits>
 
 

include/mapnik/text/itemizer.hpp

@@ -25,7 +25,7 @@
 
 //mapnik
 #include <mapnik/text/evaluated_format_properties_ptr.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <mapnik/util/noncopyable.hpp>
 #include <mapnik/config.hpp>
 

include/mapnik/text/text_layout.hpp

@@ -23,7 +23,7 @@
 #define MAPNIK_TEXT_LAYOUT_HPP
 
 //mapnik
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <mapnik/pixel_position.hpp>
 #include <mapnik/box2d.hpp>
 #include <mapnik/attribute.hpp>

include/mapnik/transform_expression.hpp

@@ -26,7 +26,7 @@
 // mapnik
 #include <mapnik/config.hpp>
 #include <mapnik/attribute.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <mapnik/expression_node_types.hpp>
 #include <mapnik/expression_node.hpp>
 #include <mapnik/util/variant.hpp>

include/mapnik/unicode.hpp

@@ -26,7 +26,7 @@
 //mapnik
 #include <mapnik/config.hpp>
 #include <mapnik/util/noncopyable.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 
 // std
 #include <cstdint>

include/mapnik/util/conversions.hpp

@@ -25,7 +25,7 @@
 
 // mapnik
 #include <mapnik/config.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 
 // stl
 #include <iosfwd>

include/mapnik/value.hpp

@@ -25,8 +25,8 @@
 
 // mapnik
 #include <mapnik/config.hpp>
-#include <mapnik/value_types.hpp>
-#include <mapnik/value_hash.hpp>
+#include <mapnik/value/types.hpp>
+#include <mapnik/value/hash.hpp>
 #include <mapnik/util/variant.hpp>
 
 
@@ -115,7 +115,7 @@ operator << (std::basic_ostream<charT,traits>& out,
 // hash function
 inline std::size_t hash_value(value const& val)
 {
-    return mapnik_hash_value(val);
+    return mapnik::value_hash(val);
 }
 
 } // namespace value_adl_barrier
@@ -157,7 +157,7 @@ struct hash<mapnik::value>
 {
     size_t operator()(mapnik::value const& val) const
     {
-        return mapnik::mapnik_hash_value(val);
+        return mapnik::value_hash(val);
     }
 };
 

include/mapnik/value/error.hpp

@@ -28,20 +28,19 @@
 #include <exception>
 #include <string>
 
-namespace mapnik {
+namespace mapnik { namespace value {
 
-class value_error : public std::exception
+class error : public std::exception
 {
 public:
-    value_error() :
+    error() :
         what_() {}
 
-    value_error( std::string const& what ) :
+    error( std::string const& what ) :
         what_( what )
-    {
-    }
+    {}
 
-    virtual ~value_error() throw() {}
+    virtual ~error() throw() {}
 
     virtual const char * what() const throw()
     {
@@ -56,6 +55,7 @@ public:
 protected:
     mutable std::string what_;
 };
-}
+
+}}
 
 #endif // MAPNIK_VALUE_ERROR_HPP

include/mapnik/value/hash.hpp

@@ -25,7 +25,7 @@
 
 // mapnik
 #include <mapnik/util/variant.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 // stl
 #include <functional>
 
@@ -35,7 +35,9 @@
 
 #pragma GCC diagnostic pop
 
-namespace mapnik { namespace detail {
+namespace mapnik {
+
+namespace detail {
 
 inline void hash_combine(std::size_t & seed, std::size_t val)
 {
@@ -70,7 +72,7 @@ struct value_hasher
 } // namespace  detail
 
 template <typename T>
-std::size_t mapnik_hash_value(T const& val)
+std::size_t value_hash(T const& val)
 {
     std::size_t seed = 0;
     detail::hash_combine(seed, util::apply_visitor(detail::value_hasher(), val));

include/mapnik/vertex_converters.hpp

@@ -32,7 +32,7 @@
 #include <mapnik/simplify.hpp>
 #include <mapnik/simplify_converter.hpp>
 #include <mapnik/util/noncopyable.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <mapnik/symbolizer_enumerations.hpp>
 #include <mapnik/symbolizer_keys.hpp>
 #include <mapnik/symbolizer.hpp>

include/mapnik/xml_attribute_cast.hpp

@@ -25,7 +25,7 @@
 
 //mapnik
 #include <mapnik/debug.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <mapnik/xml_tree.hpp>
 #include <mapnik/enumeration.hpp>
 #include <mapnik/boolean.hpp>

plugins/input/csv/csv_datasource.cpp

@@ -40,7 +40,7 @@
 #include <mapnik/geometry.hpp>
 #include <mapnik/geometry/boost_adapters.hpp>
 #include <mapnik/util/geometry_to_ds_type.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <mapnik/util/fs.hpp>
 #include <mapnik/make_unique.hpp>
 #include <mapnik/util/spatial_index.hpp>

plugins/input/csv/csv_datasource.hpp

@@ -31,7 +31,7 @@
 #include <mapnik/box2d.hpp>
 #include <mapnik/coord.hpp>
 #include <mapnik/feature_layer_desc.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include "csv_utils.hpp"
 
 #pragma GCC diagnostic push

plugins/input/csv/csv_utils.hpp

@@ -26,7 +26,7 @@
 // mapnik
 #include <mapnik/box2d.hpp>
 #include <mapnik/geometry.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <mapnik/util/conversions.hpp>
 #include <mapnik/util/trim.hpp>
 #include <mapnik/csv/csv_types.hpp>

plugins/input/gdal/gdal_datasource.cpp

@@ -28,7 +28,7 @@
 #include <mapnik/boolean.hpp>
 #include <mapnik/geom_util.hpp>
 #include <mapnik/timer.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 
 #include <gdal_version.h>
 

plugins/input/geojson/geojson_datasource.cpp

@@ -40,7 +40,7 @@
 #include <mapnik/feature.hpp>
 #include <mapnik/feature_factory.hpp>
 #include <mapnik/feature_kv_iterator.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <mapnik/box2d.hpp>
 #include <mapnik/debug.hpp>
 #include <mapnik/proj_transform.hpp>

plugins/input/ogr/ogr_featureset.cpp

@@ -22,14 +22,14 @@
 
 // mapnik
 #include <mapnik/global.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <mapnik/debug.hpp>
 #include <mapnik/box2d.hpp>
 #include <mapnik/feature.hpp>
 #include <mapnik/feature_layer_desc.hpp>
 #include <mapnik/wkb.hpp>
 #include <mapnik/unicode.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <mapnik/feature_factory.hpp>
 #include <mapnik/geometry/correct.hpp>
 

plugins/input/ogr/ogr_index_featureset.cpp

@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 // mapnik
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <mapnik/global.hpp>
 #include <mapnik/debug.hpp>
 #include <mapnik/box2d.hpp>

plugins/input/pgraster/pgraster_datasource.cpp

@@ -36,7 +36,7 @@
 #include <mapnik/sql_utils.hpp>
 #include <mapnik/util/conversions.hpp>
 #include <mapnik/timer.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 
 #pragma GCC diagnostic push
 #include <mapnik/warning_ignore.hpp>

plugins/input/pgraster/pgraster_datasource.hpp

@@ -36,7 +36,7 @@
 #include <mapnik/coord.hpp>
 #include <mapnik/feature_layer_desc.hpp>
 #include <mapnik/unicode.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 
 // boost
 #include <boost/optional.hpp>

plugins/input/pgraster/pgraster_featureset.cpp

@@ -34,7 +34,7 @@
 #include <mapnik/global.hpp>
 #include <mapnik/debug.hpp>
 #include <mapnik/unicode.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <mapnik/feature_factory.hpp>
 #include <mapnik/view_transform.hpp>
 #include <mapnik/raster.hpp>

plugins/input/postgis/postgis_datasource.cpp

@@ -33,7 +33,7 @@
 #include <mapnik/sql_utils.hpp>
 #include <mapnik/util/conversions.hpp>
 #include <mapnik/timer.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 
 #pragma GCC diagnostic push
 #include <mapnik/warning_ignore.hpp>

plugins/input/postgis/postgis_datasource.hpp

@@ -32,7 +32,7 @@
 #include <mapnik/coord.hpp>
 #include <mapnik/feature_layer_desc.hpp>
 #include <mapnik/unicode.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <mapnik/attribute.hpp>
 
 // boost

plugins/input/postgis/postgis_featureset.cpp

@@ -30,7 +30,7 @@
 #include <mapnik/debug.hpp>
 #include <mapnik/wkb.hpp>
 #include <mapnik/unicode.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <mapnik/feature_factory.hpp>
 #include <mapnik/util/conversions.hpp>
 #include <mapnik/util/trim.hpp>

plugins/input/shape/dbfile.cpp

@@ -20,7 +20,7 @@
  *
  *****************************************************************************/
 // mapnik
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <mapnik/global.hpp>
 #include <mapnik/util/utf_conv_win.hpp>
 #include <mapnik/unicode.hpp>

plugins/input/shape/shape_datasource.cpp

@@ -40,7 +40,7 @@
 #include <mapnik/util/conversions.hpp>
 #include <mapnik/geom_util.hpp>
 #include <mapnik/timer.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 
 // stl
 #include <fstream>

plugins/input/shape/shape_datasource.hpp

@@ -31,7 +31,7 @@
 #include <mapnik/box2d.hpp>
 #include <mapnik/coord.hpp>
 #include <mapnik/feature_layer_desc.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 
 // boost
 #include <boost/optional.hpp>

plugins/input/shape/shape_featureset.hpp

@@ -28,7 +28,7 @@
 #include <mapnik/geom_util.hpp>
 #include <mapnik/feature.hpp>
 #include <mapnik/unicode.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 
 #include "shape_io.hpp"
 

plugins/input/shape/shape_index_featureset.hpp

@@ -31,7 +31,7 @@
 #include <mapnik/geom_util.hpp>
 #include <mapnik/feature.hpp>
 #include <mapnik/unicode.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 
 // boost
 

plugins/input/sqlite/sqlite_datasource.hpp

@@ -32,7 +32,7 @@
 #include <mapnik/coord.hpp>
 #include <mapnik/feature_layer_desc.hpp>
 #include <mapnik/wkb.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 
 // boost
 #include <boost/optional.hpp>

plugins/input/sqlite/sqlite_featureset.cpp

@@ -28,7 +28,7 @@
 #include <mapnik/feature_layer_desc.hpp>
 #include <mapnik/wkb.hpp>
 #include <mapnik/unicode.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <mapnik/feature_factory.hpp>
 #include <mapnik/geometry/is_empty.hpp>
 #include <mapnik/geometry/envelope.hpp>

plugins/input/topojson/topojson_datasource.cpp

@@ -31,7 +31,7 @@
 
 // mapnik
 #include <mapnik/unicode.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <mapnik/box2d.hpp>
 #include <mapnik/geometry/boost_adapters.hpp>
 #include <mapnik/json/topojson_grammar.hpp>

src/conversions.cpp

@@ -22,7 +22,7 @@
 
 // mapnik
 #include <mapnik/util/conversions.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 
 #include <cstring>
 #include <algorithm>

src/expression_node.cpp

@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 #include <mapnik/expression_node.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <mapnik/util/noncopyable.hpp>
 #include <mapnik/safe_cast.hpp>
 

src/expression_string.cpp

@@ -27,7 +27,7 @@
 #include <mapnik/expression_node_types.hpp>
 #include <mapnik/expression_node.hpp>
 #include <mapnik/attribute.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <mapnik/value.hpp>
 
 namespace mapnik

src/group/group_symbolizer_helper.cpp

@@ -28,7 +28,7 @@
 #include <mapnik/vertex_processor.hpp>
 #include <mapnik/debug.hpp>
 #include <mapnik/symbolizer.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <mapnik/text/placements/base.hpp>
 #include <mapnik/text/placements/dummy.hpp>
 #include <mapnik/vertex_cache.hpp>

src/params.cpp

@@ -24,7 +24,7 @@
 #include <mapnik/boolean.hpp>
 #include <mapnik/params.hpp>
 #include <mapnik/params_impl.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 
 namespace mapnik {
 

src/raster_colorizer.cpp

@@ -22,7 +22,7 @@
 
 // mapnik
 #include <mapnik/debug.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <mapnik/value.hpp> // for to_double
 #include <mapnik/feature.hpp>
 #include <mapnik/raster.hpp>

src/text/symbolizer_helpers.cpp

@@ -36,7 +36,7 @@
 #include <mapnik/parse_path.hpp>
 #include <mapnik/debug.hpp>
 #include <mapnik/symbolizer.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <mapnik/text/placement_finder_impl.hpp>
 #include <mapnik/text/placements/base.hpp>
 #include <mapnik/text/placements/dummy.hpp>

src/unicode.cpp

@@ -22,7 +22,7 @@
 
 // mapnik
 #include <mapnik/unicode.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 
 // std
 #include <stdexcept>

src/value.cpp

@@ -22,7 +22,7 @@
 
 // mapnik
 #include <mapnik/value.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <mapnik/util/conversions.hpp>
 
 // stl

test/unit/core/comparison_test.cpp

@@ -1,7 +1,6 @@
-
 #include "catch.hpp"
 
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <mapnik/value.hpp>
 
 TEST_CASE("comparison")

test/unit/core/conversions_test.cpp

@@ -1,7 +1,6 @@
-
 #include "catch.hpp"
 
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <mapnik/value.hpp>
 #include <mapnik/unicode.hpp>
 #include <mapnik/util/conversions.hpp>

test/unit/core/params_test.cpp

@@ -1,8 +1,7 @@
-
 #include "catch.hpp"
 
 #include <iostream>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <mapnik/params.hpp>
 #include <mapnik/boolean.hpp>
 

test/unit/core/value_test.cpp

@@ -1,7 +1,6 @@
-
 #include "catch.hpp"
 
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <mapnik/value.hpp>
 
 TEST_CASE("mapnik::value")

test/unit/font/fontset_runtime_test.cpp

@@ -1,4 +1,3 @@
-
 #include "catch.hpp"
 
 #include <mapnik/memory_datasource.hpp>
@@ -12,7 +11,7 @@
 #include <mapnik/rule.hpp>
 #include <mapnik/feature_type_style.hpp>
 #include <mapnik/agg_renderer.hpp>
-#include <mapnik/value_types.hpp>
+#include <mapnik/value/types.hpp>
 #include <mapnik/symbolizer.hpp>
 #include <mapnik/text/placements/dummy.hpp>
 #include <mapnik/text/formatting/text.hpp>