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

Replace ParserState shared_ptr with auto var

Browse Source
This commit is contained in:
Jørgen Kvalsvik
2016-04-27 14:13:09 +02:00
parent 64291e6cca
commit de691c0bd5
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
opm/parser/eclipse/Parser/Parser.cpp
View File

@@ -543,22 +543,22 @@ namespace Opm {
*/
Deck * Parser::newDeckFromFile(const std::string &dataFileName, const ParseContext& parseContext) const {
std::shared_ptr<ParserState> parserState = std::make_shared<ParserState>(parseContext);
parserState->openRootFile( dataFileName );
parseState( *parserState, *this );
applyUnitsToDeck(*parserState->deck);
ParserState parserState( parseContext );
parserState.openRootFile( dataFileName );
parseState( parserState, *this );
applyUnitsToDeck( *parserState.deck );
return parserState->deck;
return parserState.deck;
}
Deck * Parser::newDeckFromString(const std::string &data, const ParseContext& parseContext) const {
std::shared_ptr<ParserState> parserState = std::make_shared<ParserState>(parseContext);
parserState->loadString( data );
ParserState parserState( parseContext );
parserState.loadString( data );
parseState( *parserState, *this );
applyUnitsToDeck(*parserState->deck);
parseState( parserState, *this );
applyUnitsToDeck( *parserState.deck );
return parserState->deck;
return parserState.deck;
}