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

Merge pull request #4103 from mapnik/boost_1_72

Browse source 
Boost 1_72 support
This commit is contained in:
Artem Pavlenko 2019-12-13 17:07:41 +00:00 committed by GitHub
commit 538eb20264
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
deps/agg/src/agg_pixfmt_rgba.cpp vendored
View file

@ -5,11 +5,14 @@
#include <boost/version.hpp> #include <boost/version.hpp>
#if BOOST_VERSION >= 106900 #if BOOST_VERSION >= 106900
#include <boost/gil.hpp> #include <boost/gil.hpp>
#include <boost/gil/extension/toolbox/color_spaces/hsv.hpp>
#include <boost/gil/extension/toolbox/color_spaces/hsl.hpp>
#else #else
#include <boost/gil/gil_all.hpp> #include <boost/gil/gil_all.hpp>
#endif
#include <boost/gil/extension/toolbox/hsv.hpp> #include <boost/gil/extension/toolbox/hsv.hpp>
#include <boost/gil/extension/toolbox/hsl.hpp> #include <boost/gil/extension/toolbox/hsl.hpp>
#endif
#pragma GCC diagnostic pop #pragma GCC diagnostic pop
namespace agg namespace agg

4
include/mapnik/csv/csv_grammar_x3_def.hpp
View file

@ -32,11 +32,11 @@
namespace mapnik { namespace grammar { namespace mapnik { namespace grammar {
namespace x3 = boost::spirit::x3; namespace x3 = boost::spirit::x3;
namespace ascii = boost::spirit::x3::ascii; namespace standard = boost::spirit::x3::standard;
using x3::lit; using x3::lit;
using x3::lexeme; using x3::lexeme;
using ascii::char_; using standard::char_;
struct unesc_char_ : x3::symbols<char> struct unesc_char_ : x3::symbols<char>
{ {