OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

opm-common : Always use Opm::filesystem

Browse Source
This commit is contained in:
Magne Sjaastad 2021-04-20 10:53:24 +02:00
parent 7dcc1dc508
commit 8e569bc944
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ThirdParty/custom-opm-common/opm-common/opm/io/eclipse/EclUtil.hpp vendored
View File

@ -39,7 +39,7 @@ namespace Opm { namespace EclIO {
bool is_number(const std::string& numstr); bool is_number(const std::string& numstr);
bool isEqualCaseInsensitive(const std::string& string1, const std::string& string2); bool isEqualCaseInsensitive(const std::string& string1, const std::string& string2);
Opm::filesystem::path findFileCaseInsensitive(const std::filesystem::path& folder, const std::string& filename); Opm::filesystem::path findFileCaseInsensitive(const Opm::filesystem::path& folder, const std::string& filename);
std::tuple<int, int> block_size_data_binary(eclArrType arrType); std::tuple<int, int> block_size_data_binary(eclArrType arrType);
std::tuple<int, int, int> block_size_data_formatted(eclArrType arrType); std::tuple<int, int, int> block_size_data_formatted(eclArrType arrType);

4
ThirdParty/custom-opm-common/opm-common/src/opm/io/eclipse/EclUtil.cpp vendored
View File

@ -94,9 +94,9 @@ bool Opm::EclIO::isEqualCaseInsensitive(const std::string& string1, const std::s
return string1LowerCase == string2LowerCase; return string1LowerCase == string2LowerCase;
} }
std::filesystem::path Opm::EclIO::findFileCaseInsensitive(const std::filesystem::path& folder, const std::string& filename) Opm::filesystem::path Opm::EclIO::findFileCaseInsensitive(const Opm::filesystem::path& folder, const std::string& filename)
{ {
for (auto& p : std::filesystem::directory_iterator(folder)) { for (auto& p : Opm::filesystem::directory_iterator(folder)) {
std::string candidate = p.path().filename().string(); std::string candidate = p.path().filename().string();
if (isEqualCaseInsensitive(filename, candidate)) return p.path(); if (isEqualCaseInsensitive(filename, candidate)) return p.path();