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

Silence various warnings discovered with new version of clang.

Browse Source
This commit is contained in:
Atgeirr Flø Rasmussen 2019-01-08 14:51:20 +01:00
parent 85949d44ac
commit db90ecd88c
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/opm/output/eclipse/Tables.cpp
View File

@ -189,7 +189,7 @@ namespace { namespace SatFunc {
const auto& pc = t.getPcogColumn();
std::transform(std::begin(pc), std::end(pc),
linTable.column(tableID, primID, 2),
[&units, uPress](const double Pc) -> double
[&units](const double Pc) -> double
{
return units.from_si(uPress, Pc);
});
@ -264,7 +264,7 @@ namespace { namespace SatFunc {
const auto& pc = t.getPcogColumn();
std::transform(std::begin(pc), std::end(pc),
linTable.column(tableID, primID, 2),
[&units, uPress](const double Pc) -> double
[&units](const double Pc) -> double
{
return units.from_si(uPress, Pc);
});
@ -916,7 +916,7 @@ namespace { namespace SatFunc {
const auto& pc = t.getPcowColumn();
std::transform(std::begin(pc), std::end(pc),
linTable.column(tableID, primID, 2),
[&units, uPress](const double Pc) -> double
[&units](const double Pc) -> double
{
return units.from_si(uPress, Pc);
});
@ -991,7 +991,7 @@ namespace { namespace SatFunc {
const auto& pc = t.getPcowColumn();
std::transform(std::begin(pc), std::end(pc),
linTable.column(tableID, primID, 2),
[&units, uPress](const double Pc) -> double
[&units](const double Pc) -> double
{
return units.from_si(uPress, Pc);
});

8
src/opm/parser/eclipse/EclipseState/IOConfig/RestartConfig.cpp
View File

@ -327,8 +327,8 @@ inline std::map< std::string, int > RPT( const DeckKeyword& keyword,
if (is_int(deck_items[index])) {
if (stack.size() < 2) {
std::string msg = "Can not interpret " + keyword.name() + " at " + keyword.getFileName() + "(" + std::to_string( keyword.getLineNumber() ) + ")";
throw std::invalid_argument(msg);
std::string errmsg = "Can not interpret " + keyword.name() + " at " + keyword.getFileName() + "(" + std::to_string( keyword.getLineNumber() ) + ")";
throw std::invalid_argument(errmsg);
}
if (stack.back() == "=") {
@ -340,8 +340,8 @@ inline std::map< std::string, int > RPT( const DeckKeyword& keyword,
stack.clear();
items.push_back( mnemonic + "=" + deck_items[index]);
} else {
std::string msg = "Can not interpret " + keyword.name() + " at " + keyword.getFileName() + "(" + std::to_string( keyword.getLineNumber() ) + ")";
throw std::invalid_argument(msg);
std::string errmsg = "Can not interpret " + keyword.name() + " at " + keyword.getFileName() + "(" + std::to_string( keyword.getLineNumber() ) + ")";
throw std::invalid_argument(errmsg);
}
} else

2
src/opm/parser/eclipse/EclipseState/SummaryConfig/SummaryConfig.cpp
View File

@ -224,7 +224,7 @@ inline void keywordB( SummaryConfig::keyword_list& list,
}
}
inline void keywordR2R( SummaryConfig::keyword_list& list,
inline void keywordR2R( SummaryConfig::keyword_list& /* list */,
const ParseContext& parseContext,
ErrorGuard& errors,
const DeckKeyword& keyword)

2
tests/parser/ParseContext_EXIT1.cpp
View File

@ -50,7 +50,7 @@ void test_exit(Opm::InputError::Action action) {
std::exit(EXIT_FAILURE);
}
int main(int argc, char ** argv) {
int main() {
test_exit(Opm::InputError::Action::EXIT1);
test_exit(Opm::InputError::Action::DELAYED_EXIT1);
}

2
tests/test_Summary.cpp
View File

@ -1199,7 +1199,7 @@ struct MessageBuffer
template <class T>
void write( const T& value )
{
str_.write( (char *) &value, sizeof(value) );
str_.write( (const char *) &value, sizeof(value) );
}
void write( const std::string& str)