archive-gh-me/mapnik
1
0
Fork 0
mirror of https://github.com/mapnik/mapnik.git synced 2025-12-08 20:13:09 +00:00
Code Issues Projects Releases Wiki Activity

fix broken python linking after 6a0ce99e22f

Browse Source
This commit is contained in:
Dane Springmeyer 2012-02-22 16:45:02 -08:00
parent 4a3bd9cd58
commit 56aeae1b52
2 changed files with 38 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
include/mapnik/json/geojson_generator.hpp
View File

@ -30,10 +30,12 @@
namespace mapnik { namespace json {
#if BOOST_VERSION >= 104700
template <typename OutputIterator> struct feature_generator_grammar;
template <typename OutputIterator> struct multi_geometry_generator_grammar;
class feature_generator : private boost::noncopyable
class feature_generator : private boost::noncopyable
{
typedef std::back_insert_iterator<std::string> sink_type;
public:
@ -55,6 +57,26 @@ private:
boost::scoped_ptr<multi_geometry_generator_grammar<sink_type> > grammar_;
};
#else
class feature_generator : private boost::noncopyable
{
public:
feature_generator() {}
~feature_generator() {}
bool generate(std::string & geojson, mapnik::Feature const& f);
};
class geometry_generator : private boost::noncopyable
{
public:
geometry_generator() {}
~geometry_generator() {}
bool generate(std::string & geojson, mapnik::geometry_container const& g);
};
#endif
}}

37
src/json/geojson_generator.cpp
View File

@ -22,11 +22,10 @@
// boost
#include <boost/version.hpp>
#include <mapnik/feature.hpp>
#include <mapnik/json/geojson_generator.hpp>
#if BOOST_VERSION >= 104700
#include <mapnik/json/geojson_generator.hpp>
#include <mapnik/json/feature_generator_grammar.hpp>
#include <mapnik/json/geometry_generator_grammar.hpp>
#include <boost/spirit/include/karma.hpp>
@ -66,27 +65,21 @@ bool geometry_generator::generate(std::string & geojson, mapnik::geometry_contai
namespace mapnik { namespace json {
class feature_generator {
public:
bool generate(std::string & geojson, mapnik::Feature const& f)
{
std::ostringstream s;
s << BOOST_VERSION/100000 << "." << BOOST_VERSION/100 % 1000 << "." << BOOST_VERSION % 100;
throw std::runtime_error("feature_generator::generate() requires at least boost 1.47 while your build was compiled against boost " + s.str());
return false;
}
};
bool feature_generator::generate(std::string & geojson, mapnik::Feature const& f)
{
std::ostringstream s;
s << BOOST_VERSION/100000 << "." << BOOST_VERSION/100 % 1000 << "." << BOOST_VERSION % 100;
throw std::runtime_error("feature_generator::generate() requires at least boost 1.47 while your build was compiled against boost " + s.str());
return false;
}
class geometry_generator {
public:
bool generate(std::string & geojson, mapnik::geometry_container const& g)
{
std::ostringstream s;
s << BOOST_VERSION/100000 << "." << BOOST_VERSION/100 % 1000 << "." << BOOST_VERSION % 100;
throw std::runtime_error("geometry_generator::generate() requires at least boost 1.47 while your build was compiled against boost " + s.str());
return false;
}
};
bool geometry_generator::generate(std::string & geojson, mapnik::geometry_container const& g)
{
std::ostringstream s;
s << BOOST_VERSION/100000 << "." << BOOST_VERSION/100 % 1000 << "." << BOOST_VERSION % 100;
throw std::runtime_error("geometry_generator::generate() requires at least boost 1.47 while your build was compiled against boost " + s.str());
return false;
}
}}