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

Fix mismerge of broken formatting

Browse Source
This commit is contained in:
Joakim Hove
2018-12-20 16:40:03 +01:00
parent 00d1607347
commit 6832788eef
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
opm/parser/eclipse/Parser/ParseContext.hpp
View File

@@ -299,11 +299,16 @@ namespace Opm {
const static std::string RPT_UNKNOWN_MNEMONIC;
private: void initDefault(); void initEnv(); void envUpdate( const
std::string& envVariable , InputError::Action action ); void
patternUpdate( const std::string& pattern , InputError::Action action);
private:
void initDefault();
void initEnv();
void envUpdate( const std::string& envVariable , InputError::Action action );
void patternUpdate( const std::string& pattern , InputError::Action action);
std::map<std::string , InputError::Action> m_errorContexts;
std::set<std::string> ignore_keywords; }; }
std::set<std::string> ignore_keywords;
};
}
#endif