mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-25 15:35:23 +00:00
Code Issues Projects Releases Wiki Activity

fix: boost::filesystem::canonical() available from version 1.48.

Browse Source
This commit is contained in:
dteviot 2015-02-26 20:07:23 +13:00
parent 931c95d0b1
commit 72e94380be
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
apps/mwiniimporter/importer.cpp
View File

@ -8,6 +8,7 @@
#include <sstream> #include <sstream>
#include <components/misc/stringops.hpp> #include <components/misc/stringops.hpp>
#include <boost/version.hpp>
#include <boost/filesystem.hpp> #include <boost/filesystem.hpp>
#include <boost/filesystem/fstream.hpp> #include <boost/filesystem/fstream.hpp>
@ -885,10 +886,10 @@ std::time_t MwIniImporter::lastWriteTime(const boost::filesystem::path& filename
std::time_t writeTime(defaultTime); std::time_t writeTime(defaultTime);
if (boost::filesystem::exists(filename)) if (boost::filesystem::exists(filename))
{ {
// FixMe: remove #if when Boost on Travis Linux updated // FixMe: remove #if when Boost dependency for Linux builds updated
// Travis seems to be using older version of boost for Linux // This allows Linux to build until then
// This should allow things to build until fixed #if (BOOST_VERSION >= 104800)
#if BOOST_FILESYSTEM_VERSION == 3 // need to resolve any symlinks so that we get time of file, not symlink
boost::filesystem::path resolved = boost::filesystem::canonical(filename); boost::filesystem::path resolved = boost::filesystem::canonical(filename);
#else #else
boost::filesystem::path resolved = filename; boost::filesystem::path resolved = filename;