From 7560d7fd7cf290bc43cce75e420db3950c93f98f Mon Sep 17 00:00:00 2001 From: Arne Morten Kvarving Date: Mon, 16 Aug 2021 08:31:46 +0200 Subject: [PATCH] make EclipseState constructor explicit and adjust test code --- opm/parser/eclipse/EclipseState/EclipseState.hpp | 2 +- tests/test_Tables.cpp | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/opm/parser/eclipse/EclipseState/EclipseState.hpp b/opm/parser/eclipse/EclipseState/EclipseState.hpp index 3c9604ccf..16038f26b 100644 --- a/opm/parser/eclipse/EclipseState/EclipseState.hpp +++ b/opm/parser/eclipse/EclipseState/EclipseState.hpp @@ -55,7 +55,7 @@ namespace Opm { }; EclipseState() = default; - EclipseState(const Deck& deck); + explicit EclipseState(const Deck& deck); virtual ~EclipseState() = default; const IOConfig& getIOConfig() const; diff --git a/tests/test_Tables.cpp b/tests/test_Tables.cpp index fec5ea530..cb162bc96 100644 --- a/tests/test_Tables.cpp +++ b/tests/test_Tables.cpp @@ -172,7 +172,7 @@ END Opm::Parser{}.parseString(input) }; - return {deck}; + return Opm::EclipseState{deck}; } std::vector expect_SGFN() @@ -324,7 +324,7 @@ END Opm::Parser{}.parseString(input) }; - return {deck}; + return Opm::EclipseState{deck}; } std::vector expect_SOFN() @@ -495,7 +495,7 @@ END Opm::Parser{}.parseString(input) }; - return {deck}; + return Opm::EclipseState{deck}; } std::vector expect_SGFN() @@ -652,7 +652,7 @@ END Opm::Parser{}.parseString(input) }; - return {deck}; + return Opm::EclipseState{deck}; } std::vector expect_SGFN() @@ -823,7 +823,7 @@ END Opm::Parser{}.parseString(input) }; - return {deck}; + return Opm::EclipseState{deck}; } std::vector expect_SOFN() @@ -1007,7 +1007,7 @@ END Opm::Parser{}.parseString(input) }; - return {deck}; + return Opm::EclipseState{deck}; } std::vector expect_SGFN() @@ -1494,7 +1494,7 @@ namespace { Opm::EclipseState parse(const std::string& rspec, const std::string& props) { - return { + return Opm::EclipseState{ Opm::Parser{}.parseString(rspec + R"(GRID INIT