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

Fix compilation with g++-7 lacking fs::proximate

Browse Source 
Use Opm::prximate instead of fs::proximate. Fixes
compilation issue like
```
opm-common/src/opm/parser/eclipse/Deck/FileDeck.cpp: In member function ‘void Opm::FileDeck::dump_shared(std::ostream&, const string&) const’:
opm-common/src/opm/parser/eclipse/Deck/FileDeck.cpp:331:44: error: ‘proximate’ is not a member of ‘fs’
             std::string include_file = fs::proximate(block.fname, output_dir);
```
This commit is contained in:
Markus Blatt 2021-09-29 16:32:35 +02:00
parent 3369785c7d
commit 49bfad1779
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/opm/parser/eclipse/Deck/FileDeck.cpp
View File

@ -258,7 +258,7 @@ std::string FileDeck::dump_block(const FileDeck::Block& block, const std::string
output_file = fs::path(output_dir) / data_file.value();
else {
// Should ideally use fs::relative()
auto rel_path = fs::proximate(block.fname, this->input_directory);
auto rel_path = proximate(block.fname, this->input_directory);
output_file = output_dir / rel_path;
}
@ -279,7 +279,7 @@ void FileDeck::include_block(const std::string& input_file, const std::string& o
auto stream = context.get_stream(parent);
if (stream.has_value()) {
// Should ideally use fs::relative()
std::string include_file = fs::proximate(output_file, output_dir);
std::string include_file = proximate(output_file, output_dir);
INCLUDE(*stream.value(), include_file);
break;
}
@ -328,7 +328,7 @@ void FileDeck::dump_shared(std::ostream& stream, const std::string& output_dir)
block.dump( out );
} else {
// Should ideally use fs::relative()
std::string include_file = fs::proximate(block.fname, output_dir);
std::string include_file = proximate(block.fname, output_dir);
if (include_file.find(block.fname) == std::string::npos)
INCLUDE(stream, include_file);
else