Pass readValueToken string_view

This commit is contained in:
Jørgen Kvalsvik
2016-03-14 08:55:02 +01:00
parent 1406630aa3
commit cee22efd99

View File

@@ -389,14 +389,14 @@ bool Parser::parseState(std::shared_ptr<ParserState> parserState) const {
else if (parserState->rawKeyword->getKeywordName() == Opm::RawConsts::paths) {
for (size_t i = 0; i < parserState->rawKeyword->size(); i++) {
RawRecordConstPtr record = parserState->rawKeyword->getRecord(i);
std::string pathName = readValueToken<std::string>(record->getItem(0).string());
std::string pathValue = readValueToken<std::string>(record->getItem(1).string());
std::string pathName = readValueToken<std::string>(record->getItem(0));
std::string pathValue = readValueToken<std::string>(record->getItem(1));
parserState->pathMap->insert(std::pair<std::string, std::string>(pathName, pathValue));
}
}
else if (parserState->rawKeyword->getKeywordName() == Opm::RawConsts::include) {
RawRecordConstPtr firstRecord = parserState->rawKeyword->getRecord(0);
std::string includeFileAsString = readValueToken<std::string>(firstRecord->getItem(0).string());
std::string includeFileAsString = readValueToken<std::string>(firstRecord->getItem(0));
boost::filesystem::path includeFile = getIncludeFilePath(*parserState, includeFileAsString);
std::shared_ptr<ParserState> newParserState = parserState->includeState( includeFile );