mirror of https://github.com/CGAL/cgal
This fixes the compilation, but does it the same?
This commit is contained in:
parent
465d2046ae
commit
ac99b93d92
|
|
@ -20,13 +20,7 @@
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
#include <string>
|
#include <string>
|
||||||
|
|
||||||
#include <boost/filesystem/path.hpp>
|
#include <filesystem>
|
||||||
#include <boost/filesystem/operations.hpp>
|
|
||||||
|
|
||||||
#ifndef BOOST_FILESYSTEM_VERSION
|
|
||||||
// That macro was not defined in previous releases of Boost.
|
|
||||||
# define BOOST_FILESYSTEM_VERSION 2
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include <CGAL/IO/binary_file_io.h>
|
#include <CGAL/IO/binary_file_io.h>
|
||||||
|
|
||||||
|
|
@ -60,15 +54,11 @@ public:
|
||||||
}
|
}
|
||||||
display_information(fileName, std::cout);
|
display_information(fileName, std::cout);
|
||||||
|
|
||||||
boost::filesystem::path headerFile(fileName);
|
std::filesystem::path headerFile(fileName);
|
||||||
boost::filesystem::path dataFile(string_field("in"));
|
std::filesystem::path dataFile(string_field("in"));
|
||||||
#if BOOST_FILESYSTEM_VERSION == 2
|
|
||||||
dataFile = boost::filesystem::complete(dataFile,
|
dataFile = std::filesystem::absolute(dataFile);
|
||||||
boost::filesystem::complete(headerFile.parent_path()));
|
#
|
||||||
#else
|
|
||||||
dataFile = boost::filesystem::absolute(dataFile,
|
|
||||||
boost::filesystem::absolute(headerFile.parent_path()));
|
|
||||||
#endif
|
|
||||||
if(!load_data(dataFile.string())) {
|
if(!load_data(dataFile.string())) {
|
||||||
return;
|
return;
|
||||||
err_msg = "Invalid data file \"";
|
err_msg = "Invalid data file \"";
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue