Only test for !defined(USE_BOOST_FILESYSTEM)
in filesystem.hpp
This commit is contained in:
parent
9f88d4c3a4
commit
93e488a6cf
1 changed files with 2 additions and 2 deletions
|
@ -23,7 +23,7 @@
|
||||||
#ifndef MAPNIK_FILESYSTEM_HPP
|
#ifndef MAPNIK_FILESYSTEM_HPP
|
||||||
#define MAPNIK_FILESYSTEM_HPP
|
#define MAPNIK_FILESYSTEM_HPP
|
||||||
|
|
||||||
#if (__cplusplus >= 201703L) && !defined(USE_BOOST_FILESYSTEM)
|
#if !defined(USE_BOOST_FILESYSTEM)
|
||||||
#include <filesystem>
|
#include <filesystem>
|
||||||
#else
|
#else
|
||||||
#include <boost/filesystem/operations.hpp> // for absolute, exists, etc
|
#include <boost/filesystem/operations.hpp> // for absolute, exists, etc
|
||||||
|
@ -31,7 +31,7 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
namespace mapnik {
|
namespace mapnik {
|
||||||
#if defined(__cpp_lib_filesystem) && !defined(USE_BOOST_FILESYSTEM)
|
#if !defined(USE_BOOST_FILESYSTEM)
|
||||||
namespace fs = std::filesystem;
|
namespace fs = std::filesystem;
|
||||||
using error_code = std::error_code;
|
using error_code = std::error_code;
|
||||||
#else
|
#else
|
||||||
|
|
Loading…
Reference in a new issue