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

changed: don't use parameter names that conflicts with member function names

Browse Source 
quells warnings (with gcc 4.8)
This commit is contained in:
Arne Morten Kvarving
2014-05-08 16:25:34 +02:00
parent 8cb2646995
commit 670e8b692b
17 changed files with 53 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
opm/parser/eclipse/Parser/ParserKeyword.cpp
View File

@@ -66,9 +66,9 @@ namespace Opm {
m_fixedSize = fixedKeywordSize;
}
ParserKeyword::ParserKeyword(const std::string& name, const std::string& sizeKeyword, const std::string& sizeItem, ParserKeywordActionEnum action, bool isTableCollection) {
ParserKeyword::ParserKeyword(const std::string& name, const std::string& sizeKeyword, const std::string& sizeItem, ParserKeywordActionEnum action, bool _isTableCollection) {
commonInit(name, OTHER_KEYWORD_IN_DECK , action);
m_isTableCollection = isTableCollection;
m_isTableCollection = _isTableCollection;
initSizeKeyword(sizeKeyword, sizeItem);
}
@@ -441,23 +441,23 @@ namespace Opm {
(m_isDataKeyword == other.m_isDataKeyword) &&
(m_isTableCollection == other.m_isTableCollection) &&
(m_action == other.m_action)) {
bool equal = false;
bool equal_ = false;
switch (m_keywordSizeType) {
case FIXED:
if (m_fixedSize == other.m_fixedSize)
equal = true;
equal_ = true;
break;
case OTHER_KEYWORD_IN_DECK:
if ((m_sizeDefinitionPair.first == other.m_sizeDefinitionPair.first) &&
(m_sizeDefinitionPair.second == other.m_sizeDefinitionPair.second))
equal = true;
equal_ = true;
break;
default:
equal = true;
equal_ = true;
break;
}
return equal;
return equal_;
} else
return false;
}