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

Merge pull request #182 from atgeirr/warning-suppresssion

Browse Source 
Warning suppresssion
This commit is contained in:
Joakim Hove
2014-04-17 22:34:08 +02:00
parent 475f1aede6 6b4ad26a9a
commit 86ee7b5805
10 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
opm/json/JsonObject.cpp
View File

@@ -53,9 +53,9 @@ namespace Json {
JsonObject::JsonObject(const boost::filesystem::path& jsonFile ) {
std::ifstream stream(jsonFile.string().c_str());
if (stream) {
std::string content( (std::istreambuf_iterator<char>(stream)),
std::string content_from_file( (std::istreambuf_iterator<char>(stream)),
(std::istreambuf_iterator<char>()));
initialize( content );
initialize( content_from_file );
} else
throw std::invalid_argument("Loading json from file: " + jsonFile.string() + " failed.");
}

2
opm/parser/eclipse/Applications/Schedule.cpp
View File

@@ -11,7 +11,7 @@
#include <opm/parser/eclipse/EclipseState/Schedule/Schedule.hpp>
int main(int argc, char** argv) {
int main(int /* argc */, char** argv) {
Opm::ParserPtr parser(new Opm::Parser());
std::string file = argv[1];
Opm::DeckConstPtr deck = parser->parseFile(file, false);

2
opm/parser/eclipse/Deck/DeckItem.hpp
View File

@@ -66,7 +66,7 @@ namespace Opm {
throw std::logic_error("This implementation of DeckItem does not support string");
}
virtual std::string getTrimmedString(size_t index) const {
virtual std::string getTrimmedString(size_t /* index */) const {
throw std::logic_error("This implementation of DeckItem does not support trimmed strings");
}

2
opm/parser/eclipse/EclipseState/Grid/EclipseGrid.cpp
View File

@@ -163,7 +163,7 @@ namespace Opm {
std::vector<double> EclipseGrid::createDVector(const std::vector<int>& dims , size_t dim , const std::string& DKey , const std::string& DVKey, std::shared_ptr<const GRIDSection> gridSection) {
std::vector<double> EclipseGrid::createDVector(const std::vector<int>& dims , size_t /* dim */, const std::string& DKey , const std::string& DVKey, std::shared_ptr<const GRIDSection> gridSection) {
size_t volume = dims[0] * dims[1] * dims[2];
size_t area = dims[0] * dims[1];
std::vector<double> D;

32
opm/parser/eclipse/EclipseState/Schedule/Well.hpp
View File

@@ -59,22 +59,22 @@ namespace Opm {
controlMode = WellProducer::ORAT;
}
bool hasProductionControl(WellProducer::ControlModeEnum controlMode) const {
if (productionControls & controlMode)
bool hasProductionControl(WellProducer::ControlModeEnum controlModeArg) const {
if (productionControls & controlModeArg)
return true;
else
return false;
}
void dropProductionControl(WellProducer::ControlModeEnum controlMode) {
if ((productionControls & controlMode) != 0) {
productionControls -= controlMode;
void dropProductionControl(WellProducer::ControlModeEnum controlModeArg) {
if ((productionControls & controlModeArg) != 0) {
productionControls -= controlModeArg;
}
}
void addProductionControl(WellProducer::ControlModeEnum controlMode) {
if ((productionControls & controlMode) == 0) {
productionControls += controlMode;
void addProductionControl(WellProducer::ControlModeEnum controlModeArg) {
if ((productionControls & controlModeArg) == 0) {
productionControls += controlModeArg;
}
}
} WellProductionProperties;
@@ -101,22 +101,22 @@ namespace Opm {
controlMode = WellInjector::RATE;
}
bool hasInjectionControl(WellInjector::ControlModeEnum controlMode) const {
if (injectionControls & controlMode)
bool hasInjectionControl(WellInjector::ControlModeEnum controlModeArg) const {
if (injectionControls & controlModeArg)
return true;
else
return false;
}
void dropInjectionControl(WellInjector::ControlModeEnum controlMode) {
if ((injectionControls & controlMode) != 0) {
injectionControls -= controlMode;
void dropInjectionControl(WellInjector::ControlModeEnum controlModeArg) {
if ((injectionControls & controlModeArg) != 0) {
injectionControls -= controlModeArg;
}
}
void addInjectionControl(WellInjector::ControlModeEnum controlMode) {
if ((injectionControls & controlMode) == 0) {
injectionControls += controlMode;
void addInjectionControl(WellInjector::ControlModeEnum controlModeArg) {
if ((injectionControls & controlModeArg) == 0) {
injectionControls += controlModeArg;
}
}
} WellInjectionProperties;

4
opm/parser/eclipse/Parser/ParserItem.cpp
View File

@@ -48,11 +48,11 @@ namespace Opm {
return 0;
}
const std::string& ParserItem::getDimension(size_t index) const {
const std::string& ParserItem::getDimension(size_t /* index */) const {
throw std::invalid_argument("Should not call this ... \n");
}
void ParserItem::push_backDimension(const std::string& dimension) {
void ParserItem::push_backDimension(const std::string& /* dimension */) {
throw std::invalid_argument("Should not call this ... \n");
}

2
opm/parser/eclipse/Parser/createDefaultKeywordList.cpp
View File

@@ -240,7 +240,7 @@ void ensurePath( const char * file_name ) {
}
int main(int argc , char ** argv) {
int main(int /* argc */, char ** argv) {
const char * config_root = argv[1];
const char * source_file_name = argv[2];
const char * test_file_name = argv[3];

4
opm/parser/eclipse/Parser/tests/ParserTests.cpp
View File

@@ -282,8 +282,8 @@ ParserKeywordPtr setupParserKeywordInt(std::string name, int numberOfItems) {
ParserRecordPtr parserRecord = parserKeyword->getRecord();
for (int i = 0; i < numberOfItems; i++) {
std::string name = "ITEM_" + boost::lexical_cast<std::string>(i);
ParserItemPtr intItem(new ParserIntItem(name, SINGLE));
std::string another_name = "ITEM_" + boost::lexical_cast<std::string>(i);
ParserItemPtr intItem(new ParserIntItem(another_name, SINGLE));
parserRecord->addItem(intItem);
}

2
opm/parser/eclipse/Parser/tests/createInlineItemTest.cpp
View File

@@ -159,7 +159,7 @@ void endTest(std::ofstream& of) {
}
int main(int argc , char ** argv) {
int main(int /* argc */ , char ** argv) {
const char * test_src = argv[1];
const char * test_module = argv[2];
std::ofstream of( test_src );

2
opm/parser/eclipse/RawDeck/StarToken.hpp
View File

@@ -32,7 +32,7 @@ namespace Opm {
bool tokenContainsStar(const std::string& token);
template <class T>
T readValueToken(const std::string& valueToken) {
T readValueToken(const std::string& /* valueToken */) {
return 0;
}