diff --git a/opm/models/utils/parametersystem.cpp b/opm/models/utils/parametersystem.cpp index 920ca5711..fecd600cc 100644 --- a/opm/models/utils/parametersystem.cpp +++ b/opm/models/utils/parametersystem.cpp @@ -521,18 +521,6 @@ void printUsage(const std::string& helpPreamble, } } -int noPositionalParameters_(std::function, - std::set&, - std::string& errorMsg, - int, - const char** argv, - int paramIdx, - int) -{ - errorMsg = std::string("Illegal parameter \"")+argv[paramIdx]+"\"."; - return 0; -} - void parseParameterFile(const std::string& fileName, bool overwrite) { std::set seenKeys; @@ -594,8 +582,8 @@ void parseParameterFile(const std::string& fileName, bool overwrite) std::string parseCommandLineOptions(int argc, const char **argv, - const std::string& helpPreamble, - const PositionalArgumentCallback& posArgCallback) + const PositionalArgumentCallback& posArgCallback, + const std::string& helpPreamble) { // handle the "--help" parameter if (!helpPreamble.empty()) { diff --git a/opm/models/utils/parametersystem.hpp b/opm/models/utils/parametersystem.hpp index b131ed18c..e915c8b32 100644 --- a/opm/models/utils/parametersystem.hpp +++ b/opm/models/utils/parametersystem.hpp @@ -191,17 +191,6 @@ void printUsage(const std::string& helpPreamble, std::ostream& os = std::cerr, const bool showAll = false); -/// \cond 0 -int noPositionalParameters_(std::function, - std::set&, - std::string& errorMsg, - int, - const char** argv, - int paramIdx, - int); - -/// \endcond - //! \brief Callback function for command line parsing. using PositionalArgumentCallback = std::function, @@ -230,8 +219,8 @@ using PositionalArgumentCallback = std::function, + std::set&, + std::string&, + int, + const char**, + int, + int) -> int + { + assert("Should not be here!"); + return 0; + }; + + + Opm::Parameters::parseCommandLineOptions(5, argv, noPositional); BOOST_CHECK_EQUAL(Opm::Parameters::IsSet(), true); BOOST_CHECK_EQUAL(Opm::Parameters::IsSet(), true);