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

Accomodate older versions of boost::filesystem

Browse Source 
The return type of the path methods has changed in newer version of
Boost; by wrapping them with a new path object we can get a string
in a way that is compatible for both version 2 and 3.

Hat tip: @bska
This commit is contained in:
Roland Kaufmann 2013-11-07 15:10:49 +01:00
parent b0b50618d0
commit 39e7943618
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
opm/core/io/eclipse/EclipseWriter.cpp
View File

@ -807,12 +807,13 @@ EclipseWriter::EclipseWriter (
, uses_ (phaseUsageFromDeck (parser)) {
// get the base name from the name of the deck
boost::filesystem::path deck (params.get <std::string> ("deck_filename"));
if (boost::to_upper_copy (deck.extension ().string ()) == ".DATA") {
baseName_ = deck.stem ().string ();
using boost::filesystem::path;
path deck (params.get <std::string> ("deck_filename"));
if (boost::to_upper_copy (path (deck.extension ()).string ()) == ".DATA") {
baseName_ = path (deck.stem ()).string ();
}
else {
baseName_ = deck.filename ().string ();
baseName_ = path (deck.filename ()).string ();
}
// store in current directory if not explicitly set