From bce4590404aaf19f11ef5f45bea0384907648cb0 Mon Sep 17 00:00:00 2001 From: Arne Morten Kvarving Date: Thu, 29 Apr 2021 09:05:00 +0200 Subject: [PATCH] ebos headers: use forwarding --- ebos/ebos_blackoil.hh | 9 +++++---- ebos/ebos_brine.hh | 15 ++++++++------- ebos/ebos_energy.hh | 9 ++++++--- ebos/ebos_extbo.hh | 15 ++++++++------- ebos/ebos_foam.hh | 9 ++++++--- ebos/ebos_gasoil.hh | 9 ++++++--- ebos/ebos_gaswater.hh | 15 +++++++++------ ebos/ebos_oilwater.hh | 9 ++++++--- ebos/ebos_oilwater_polymer.hh | 9 ++++++--- ebos/ebos_polymer.hh | 9 ++++++--- ebos/ebos_solvent.hh | 9 ++++++--- 11 files changed, 72 insertions(+), 45 deletions(-) diff --git a/ebos/ebos_blackoil.hh b/ebos/ebos_blackoil.hh index e8a6a11fa..b89193cf4 100644 --- a/ebos/ebos_blackoil.hh +++ b/ebos/ebos_blackoil.hh @@ -28,14 +28,15 @@ #ifndef EBOS_BLACK_OIL_HH #define EBOS_BLACK_OIL_HH -#include -#include -#include - #include #include namespace Opm { + +class Deck; +class ErrorGuard; +class ParseContext; + bool ebosBlackOilDeckFileNameIsSet(int argc, char** argv); std::string ebosBlackOilGetDeckFileName(int argc, char** argv); std::unique_ptr ebosBlackOilCreateParseContext(int argc, char** argv); diff --git a/ebos/ebos_brine.hh b/ebos/ebos_brine.hh index 4afc8ee2e..d7e257f0c 100644 --- a/ebos/ebos_brine.hh +++ b/ebos/ebos_brine.hh @@ -28,15 +28,16 @@ #ifndef EBOS_BRINE_HH #define EBOS_BRINE_HH -#include -#include -#include - namespace Opm { + +class Deck; +class ErrorGuard; +class ParseContext; + void ebosBrineSetDeck(Opm::Deck* deck, - Opm::ParseContext* parseContext, - Opm::ErrorGuard* errorGuard, - double externalSetupTime); + Opm::ParseContext* parseContext, + Opm::ErrorGuard* errorGuard, + double externalSetupTime); int ebosBrineMain(int argc, char** argv); } diff --git a/ebos/ebos_energy.hh b/ebos/ebos_energy.hh index 6efa6b57a..fc51486ea 100644 --- a/ebos/ebos_energy.hh +++ b/ebos/ebos_energy.hh @@ -28,11 +28,14 @@ #ifndef EBOS_ENERGY_HH #define EBOS_ENERGY_HH -#include -#include -#include +#include namespace Opm { + +class Deck; +class ErrorGuard; +class ParseContext; + void ebosEnergySetDeck(std::unique_ptr deck, std::unique_ptr parseContext, std::unique_ptr errorGuard, diff --git a/ebos/ebos_extbo.hh b/ebos/ebos_extbo.hh index ff23754d9..b37bd9abb 100644 --- a/ebos/ebos_extbo.hh +++ b/ebos/ebos_extbo.hh @@ -28,15 +28,16 @@ #ifndef EBOS_EXTBO_HH #define EBOS_EXTBO_HH -#include -#include -#include - namespace Opm { + +class Deck; +class ErrorGuard; +class ParseContext; + void ebosExtboSetDeck(Opm::Deck* deck, - Opm::ParseContext* parseContext, - Opm::ErrorGuard* errorGuard, - double externalSetupTime); + Opm::ParseContext* parseContext, + Opm::ErrorGuard* errorGuard, + double externalSetupTime); int ebosExtboMain(int argc, char** argv); } diff --git a/ebos/ebos_foam.hh b/ebos/ebos_foam.hh index afbf36e07..aa2843df8 100644 --- a/ebos/ebos_foam.hh +++ b/ebos/ebos_foam.hh @@ -28,11 +28,14 @@ #ifndef EBOS_FOAM_HH #define EBOS_FOAM_HH -#include -#include -#include +#include namespace Opm { + +class Deck; +class ErrorGuard; +class ParseContext; + void ebosFoamSetDeck(std::unique_ptr deck, std::unique_ptr parseContext, std::unique_ptr errorGuard, diff --git a/ebos/ebos_gasoil.hh b/ebos/ebos_gasoil.hh index d67c98f40..79e008034 100644 --- a/ebos/ebos_gasoil.hh +++ b/ebos/ebos_gasoil.hh @@ -28,11 +28,14 @@ #ifndef EBOS_GAS_OIL_HH #define EBOS_GAS_OIL_HH -#include -#include -#include +#include namespace Opm { + +class Deck; +class ErrorGuard; +class ParseContext; + void ebosGasOilSetDeck(std::unique_ptr deck, std::unique_ptr parseContext, std::unique_ptr errorGuard, diff --git a/ebos/ebos_gaswater.hh b/ebos/ebos_gaswater.hh index 3d7bff617..0b79cf16d 100644 --- a/ebos/ebos_gaswater.hh +++ b/ebos/ebos_gaswater.hh @@ -28,15 +28,18 @@ #ifndef EBOS_GAS_WATER_HH #define EBOS_GAS_WATER_HH -#include -#include -#include +#include namespace Opm { + +class Deck; +class ErrorGuard; +class ParseContext; + void ebosGasWaterSetDeck(std::unique_ptr deck, - std::unique_ptr parseContext, - std::unique_ptr errorGuard, - double externalSetupTime); + std::unique_ptr parseContext, + std::unique_ptr errorGuard, + double externalSetupTime); int ebosGasWaterMain(int argc, char** argv); } diff --git a/ebos/ebos_oilwater.hh b/ebos/ebos_oilwater.hh index b97b98691..e71b78259 100644 --- a/ebos/ebos_oilwater.hh +++ b/ebos/ebos_oilwater.hh @@ -28,11 +28,14 @@ #ifndef EBOS_OIL_WATER_HH #define EBOS_OIL_WATER_HH -#include -#include -#include +#include namespace Opm { + +class Deck; +class ErrorGuard; +class ParseContext; + void ebosOilWaterSetDeck(std::unique_ptr deck, std::unique_ptr parseContext, std::unique_ptr errorGuard, diff --git a/ebos/ebos_oilwater_polymer.hh b/ebos/ebos_oilwater_polymer.hh index 3248d7e92..2a642df03 100644 --- a/ebos/ebos_oilwater_polymer.hh +++ b/ebos/ebos_oilwater_polymer.hh @@ -28,11 +28,14 @@ #ifndef EBOS_OIL_WATER_POLYMER_HH #define EBOS_OIL_WATER_POLYMER_HH -#include -#include -#include +#include namespace Opm { + +class Deck; +class ErrorGuard; +class ParseContext; + void ebosOilWaterPolymerSetDeck(std::unique_ptr deck, std::unique_ptr parseContext, std::unique_ptr errorGuard, diff --git a/ebos/ebos_polymer.hh b/ebos/ebos_polymer.hh index d2bbd8281..0269bf459 100644 --- a/ebos/ebos_polymer.hh +++ b/ebos/ebos_polymer.hh @@ -28,11 +28,14 @@ #ifndef EBOS_POLYMER_HH #define EBOS_POLYMER_HH -#include -#include -#include +#include namespace Opm { + +class Deck; +class ParseContext; +class ErrorGuard; + void ebosPolymerSetDeck(std::unique_ptr deck, std::unique_ptr parseContext, std::unique_ptr errorGuard, diff --git a/ebos/ebos_solvent.hh b/ebos/ebos_solvent.hh index 3981099a5..07c058eb9 100644 --- a/ebos/ebos_solvent.hh +++ b/ebos/ebos_solvent.hh @@ -28,11 +28,14 @@ #ifndef EBOS_SOLVENT_HH #define EBOS_SOLVENT_HH -#include -#include -#include +#include namespace Opm { + +class Deck; +class ErrorGuard; +class ParseContext; + void ebosSolventSetDeck(std::unique_ptr deck, std::unique_ptr parseContext, std::unique_ptr errorGuard,