sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into conv_simplify

Browse source
This commit is contained in:
artemp 2012-09-18 10:36:14 +01:00
commit 09d11122d5
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/mapnik/json/geometry_parser.hpp
View file

@ -40,7 +40,7 @@ template <typename Iterator> struct geometry_grammar;
MAPNIK_DECL bool from_geojson(std::string const& json, boost::ptr_vector<geometry_type> & paths);
template <typename Iterator>
class geometry_parser : private boost::noncopyable
class MAPNIK_DECL geometry_parser : private boost::noncopyable
{
typedef Iterator iterator_type;
public:

2
include/mapnik/wkt/wkt_factory.hpp
View file

@ -42,7 +42,7 @@ MAPNIK_DECL bool from_wkt(std::string const& wkt, boost::ptr_vector<geometry_typ
#if BOOST_VERSION >= 104700
class wkt_parser : boost::noncopyable
class MAPNIK_DECL wkt_parser : boost::noncopyable
{
typedef std::string::const_iterator iterator_type;
public: