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

Use boost::filesystem when __cplusplus < 201703L

Browse source
This commit is contained in:
Artem Pavlenko 2023-02-26 14:40:00 +00:00
parent 8839f5774a
commit 1351d90d51
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
utils/mapnik-render/mapnik-render.cpp
View file

@ -23,8 +23,9 @@ MAPNIK_DISABLE_WARNING_POP
#include <filesystem> #include <filesystem>
namespace fs = std::filesystem; namespace fs = std::filesystem;
#else #else
#include <experimental/filesystem> //#include <experimental/filesystem>
namespace fs = std::experimental::filesystem; #include <boost/filesystem.hpp>
namespace fs = boost::filesystem;
#endif #endif
BOOST_FUSION_ADAPT_STRUCT(mapnik::box2d<double>, (double, minx_)(double, miny_)(double, maxx_)(double, maxy_)) BOOST_FUSION_ADAPT_STRUCT(mapnik::box2d<double>, (double, minx_)(double, miny_)(double, maxx_)(double, maxy_))
@ -148,7 +149,7 @@ int main(int argc, char** argv)
{ {
fs::path p(vm["plugins-dir"].as<std::string>()); fs::path p(vm["plugins-dir"].as<std::string>());
p = p.parent_path() / "fonts"; p = p.parent_path() / "fonts";
mapnik::freetype_engine::register_fonts(p, true); mapnik::freetype_engine::register_fonts(p.c_str(), true);
} }
catch (...) catch (...)
{} {}