only call register_ptr_to_python for BOOST_VERSION 1.60 (ref #104)

artemp · artemp · commit f4b395a8575b · 2016-08-10T14:17:27.000+01:00
diff --git a/src/mapnik_datasource.cpp b/src/mapnik_datasource.cpp
@@ -195,7 +195,6 @@ void export_datasource()
              "These vary depending on the type of data source.")
         .def(self == self)
         ;
-    register_ptr_to_python<std::shared_ptr<datasource> >();
 
     def("CreateDatasource",&create_datasource);
 
diff --git a/src/mapnik_feature.cpp b/src/mapnik_feature.cpp
@@ -230,5 +230,4 @@ void export_feature()
         .def("from_geojson",from_geojson_impl)
         .staticmethod("from_geojson")
         ;
-    register_ptr_to_python<std::shared_ptr<mapnik::feature_impl> >();
 }
diff --git a/src/mapnik_featureset.cpp b/src/mapnik_featureset.cpp
@@ -63,5 +63,4 @@ void export_featureset()
         // Python2 support
         .def("next", next)
         ;
-    register_ptr_to_python<std::shared_ptr<mapnik::Featureset> >();
 }
diff --git a/src/mapnik_geometry.cpp b/src/mapnik_geometry.cpp
@@ -282,5 +282,4 @@ void export_geometry()
         //.def("to_svg",&to_svg)
         // TODO add other geometry_type methods
         ;
-    register_ptr_to_python<std::shared_ptr<geometry<double>> >();
 }
diff --git a/src/mapnik_image.cpp b/src/mapnik_image.cpp
@@ -467,6 +467,5 @@ void export_image()
         .staticmethod("from_cairo")
 #endif
         ;
-    register_ptr_to_python<std::shared_ptr<image_any> >();
 
 }
diff --git a/src/mapnik_python.cpp b/src/mapnik_python.cpp
@@ -1068,6 +1068,13 @@ BOOST_PYTHON_MODULE(_mapnik)
     python_optional<mapnik::text_transform_e>();
     register_ptr_to_python<mapnik::expression_ptr>();
     register_ptr_to_python<mapnik::path_expression_ptr>();
+#if BOOST_VERSION == 106000 // ref #104
+    register_ptr_to_python<std::shared_ptr<mapnik::geometry::geometry<double> > >();
+    register_ptr_to_python<std::shared_ptr<mapnik::datasource> >();
+    register_ptr_to_python<std::shared_ptr<mapnik::feature_impl> >();
+    register_ptr_to_python<std::shared_ptr<mapnik::Featureset> >();
+    register_ptr_to_python<std::shared_ptr<mapnik::image_any> >();
+#endif
     to_python_converter<mapnik::value_holder,mapnik_param_to_python>();
     to_python_converter<mapnik::value,mapnik_value_to_python>();
     to_python_converter<mapnik::enumeration_wrapper,mapnik_enumeration_wrapper_to_python>();

Original file line number	Diff line number	Diff line change
`@@ -195,7 +195,6 @@ void export_datasource()`
`195`	`195`	`"These vary depending on the type of data source.")`
`196`	`196`	`.def(self == self)`
`197`	`197`	`;`
`198`		`- register_ptr_to_python<std::shared_ptr<datasource> >();`
`199`	`198`
`200`	`199`	`def("CreateDatasource",&create_datasource);`
`201`	`200`
Original file line number	Diff line number	Diff line change
`@@ -230,5 +230,4 @@ void export_feature()`
`230`	`230`	`.def("from_geojson",from_geojson_impl)`
`231`	`231`	`.staticmethod("from_geojson")`
`232`	`232`	`;`
`233`		`- register_ptr_to_python<std::shared_ptr<mapnik::feature_impl> >();`
`234`	`233`	`}`
Original file line number	Diff line number	Diff line change
`@@ -63,5 +63,4 @@ void export_featureset()`
`63`	`63`	`// Python2 support`
`64`	`64`	`.def("next", next)`
`65`	`65`	`;`
`66`		`- register_ptr_to_python<std::shared_ptr<mapnik::Featureset> >();`
`67`	`66`	`}`
Original file line number	Diff line number	Diff line change
`@@ -282,5 +282,4 @@ void export_geometry()`
`282`	`282`	`//.def("to_svg",&to_svg)`
`283`	`283`	`// TODO add other geometry_type methods`
`284`	`284`	`;`
`285`		`- register_ptr_to_python<std::shared_ptr<geometry<double>> >();`
`286`	`285`	`}`
Original file line number	Diff line number	Diff line change
`@@ -467,6 +467,5 @@ void export_image()`
`467`	`467`	`.staticmethod("from_cairo")`
`468`	`468`	`#endif`
`469`	`469`	`;`
`470`		`- register_ptr_to_python<std::shared_ptr<image_any> >();`
`471`	`470`
`472`	`471`	`}`