changed: drop gcc7 compatibility

this means getting rid of the Opm::filesystem namespace
and directly using std::filesystem, as well as dropping
some of the compat code for the tr filesystem.

we still need the FileSystem.hpp/cpp files though as unique_path
is not part of std::filesystem.
This commit is contained in:
Arne Morten Kvarving
2021-11-01 12:29:05 +01:00
parent f12f77ba46
commit 6465cfe1ea
52 changed files with 231 additions and 427 deletions

View File

@@ -30,13 +30,13 @@
#include <opm/output/eclipse/RestartIO.hpp>
#include <opm/common/utility/FileSystem.hpp>
#include <opm/common/ErrorMacros.hpp>
#include <opm/common/utility/numeric/cmp.hpp>
#include <algorithm>
#include <chrono>
#include <cmath>
#include <filesystem>
#include <iomanip>
#include <iostream>
#include <set>
@@ -998,7 +998,7 @@ void ECLRegressionTest::results_smry()
}
}
namespace fs = Opm::filesystem;
namespace fs = std::filesystem;
std::string rsm_file = rootName2 + ".RSM";
if (fs::is_regular_file(fs::path(rsm_file))) {
auto rsm = ERsm(rsm_file);

View File

@@ -18,6 +18,7 @@
*/
#include <cmath>
#include <filesystem>
#include <iomanip>
#include <iostream>
#include <tuple>
@@ -99,7 +100,7 @@ int main(int argc, char **argv) {
std::unique_ptr<Opm::EclIO::ExtESmry> ext_esmry;
std::string filename = argv[argOffset];
Opm::filesystem::path inputFileName(filename);
std::filesystem::path inputFileName(filename);
if (inputFileName.extension()=="")
inputFileName+=".SMSPEC";