OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed: wrong preprocessor check for gcc7

Browse Source
This commit is contained in:
Arne Morten Kvarving 2020-02-14 09:38:33 +01:00
parent ecd8d98aab
commit a049cd5b03
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
opm/common/utility/FileSystem.hpp
View File

@ -19,11 +19,11 @@
#ifndef OPM_FILESYSTEM_HPP #ifndef OPM_FILESYSTEM_HPP
#define OPM_FILESYSTEM_HPP #define OPM_FILESYSTEM_HPP
#if __cplusplus < 201703L || \
#if __cplusplus__ >= 201703L (defined(__GNUC__) && __GNUC__ < 8)
#include <filesystem>
#else
#include <experimental/filesystem> #include <experimental/filesystem>
#else
#include <filesystem>
#endif #endif
#include <string> #include <string>
@ -31,10 +31,11 @@
namespace Opm namespace Opm
{ {
#if __cplusplus__ >= 201703L #if __cplusplus < 201703L || \
namespace filesystem = std::filesystem; (defined(__GNUC__) && __GNUC__ < 8)
#else
namespace filesystem = std::experimental::filesystem; namespace filesystem = std::experimental::filesystem;
#else
namespace filesystem = std::filesystem;
#endif #endif
// A poor man's filesystem::unique_path // A poor man's filesystem::unique_path