Piotr Kubaj
92a0edd07b
MFH: r545180
www/osrm-backend: fix build on GCC architectures
Merge two upstream commits to fix build:
/wrkdirs/usr/ports/www/osrm-backend/work/osrm-backend-5.22.0/src/storage/io_config.cpp: In member function 'bool osrm::storage::IOConfig::IsValid() const':
/wrkdirs/usr/ports/www/osrm-backend/work/osrm-backend-5.22.0/src/storage/io_config.cpp:18:89: error: call of overloaded 'is_regular_file(<brace-enclosed initializer list>)' is ambiguous
18 | if (!boost::filesystem::is_regular_file({base_path.string() + fileName.string()}))
| ^
In file included from /usr/local/include/boost/filesystem.hpp:18,
from /wrkdirs/usr/ports/www/osrm-backend/work/osrm-backend-5.22.0/include/storage/io_config.hpp:8,
from /wrkdirs/usr/ports/www/osrm-backend/work/osrm-backend-5.22.0/src/storage/io_config.cpp:1:
/usr/local/include/boost/filesystem/directory.hpp:171:20: note: candidate: 'bool boost::filesystem::is_regular_file(const boost::filesystem::directory_entry&)'
171 | inline bool is_regular_file(const directory_entry& e) BOOST_NOEXCEPT { return filesystem::is_regular_file(e.status()); }
| ^~~~~~~~~~~~~~~
In file included from /usr/local/include/boost/filesystem.hpp:19,
from /wrkdirs/usr/ports/www/osrm-backend/work/osrm-backend-5.22.0/include/storage/io_config.hpp:8,
from /wrkdirs/usr/ports/www/osrm-backend/work/osrm-backend-5.22.0/src/storage/io_config.cpp:1:
/usr/local/include/boost/filesystem/operations.hpp:169:6: note: candidate: 'bool boost::filesystem::is_regular_file(const boost::filesystem::path&)'
169 | bool is_regular_file(const path& p) {return is_regular_file(detail::status(p));}
| ^~~~~~~~~~~~~~~
Approved by: portmgr (fix build blanket)