changed: move ProductionControls to separate header

and make the class member type with a using statement.
allows for forwarding

CMakeLists_files.cmake

@@ -1099,6 +1099,7 @@ if(ENABLE_ECL_INPUT)
        opm/input/eclipse/Schedule/Well/Well.hpp
        opm/input/eclipse/Schedule/Well/WellEnums.hpp
        opm/input/eclipse/Schedule/Well/WellInjectionControls.hpp
+       opm/input/eclipse/Schedule/Well/WellProductionControls.hpp
        opm/input/eclipse/Schedule/Well/WList.hpp
        opm/input/eclipse/Schedule/Well/NameOrder.hpp
        opm/input/eclipse/Schedule/Well/WellMatcher.hpp

opm/input/eclipse/Schedule/Well/Well.hpp

@@ -33,11 +33,12 @@
 #include <opm/input/eclipse/Deck/UDAValue.hpp>
 #include <opm/input/eclipse/EclipseState/Phase.hpp>
 #include <opm/input/eclipse/Schedule/ScheduleTypes.hpp>
+#include <opm/input/eclipse/Schedule/VFPProdTable.hpp>
 #include <opm/input/eclipse/Schedule/Well/PAvg.hpp>
 #include <opm/input/eclipse/Schedule/Well/PAvgCalculator.hpp>
 #include <opm/input/eclipse/Schedule/Well/WellEnums.hpp>
 #include <opm/input/eclipse/Schedule/Well/WellInjectionControls.hpp>
-#include <opm/input/eclipse/Schedule/VFPProdTable.hpp>
+#include <opm/input/eclipse/Schedule/Well/WellProductionControls.hpp>
 #include <opm/input/eclipse/Units/UnitSystem.hpp>
 
 namespace Opm {
@@ -212,52 +213,7 @@ public:
         }
     };
 
-    struct ProductionControls {
-    public:
-        ProductionControls(int controls_arg) :
-            controls(controls_arg)
-        {
-        }
-
-        ProducerCMode cmode = ProducerCMode::NONE;
-        double oil_rate{0};
-        double water_rate{0};
-        double gas_rate{0};
-        double liquid_rate{0};
-        double resv_rate{0};
-        double bhp_history{0};
-        double thp_history{0};
-        double bhp_limit{0};
-        double thp_limit{0};
-        double alq_value{0};
-        int    vfp_table_number{0};
-        bool   prediction_mode{0};
-
-        bool hasControl(ProducerCMode cmode_arg) const {
-            return (this->controls & static_cast<int>(cmode_arg)) != 0;
-        }
-
-        bool operator==(const ProductionControls& other) const {
-            return this->cmode == other.cmode &&
-                   this->oil_rate == other.oil_rate &&
-                   this->water_rate == other.water_rate &&
-                   this->gas_rate == other.gas_rate &&
-                   this->liquid_rate == other.liquid_rate &&
-                   this->resv_rate == other.resv_rate &&
-                   this->bhp_history == other.bhp_history &&
-                   this->thp_history == other.thp_history &&
-                   this->bhp_limit == other.bhp_limit &&
-                   this->thp_limit == other.thp_limit &&
-                   this->alq_value == other.alq_value &&
-                   this->vfp_table_number == other.vfp_table_number &&
-                   this->prediction_mode == other.prediction_mode;
-        }
-
-
-    private:
-        int controls;
-    };
-
+    using ProductionControls = WellProductionControls;
 
     class WellProductionProperties {
     public:

opm/input/eclipse/Schedule/Well/WellProductionControls.hpp

@@ -0,0 +1,78 @@
+/*
+  Copyright 2019 Equinor ASA.
+
+  This file is part of the Open Porous Media project (OPM).
+
+  OPM is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  OPM is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with OPM.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+
+#ifndef WELL_PRODUCTION_CONTROLS_HPP
+#define WELL_PRODUCTION_CONTROLS_HPP
+
+#include <opm/input/eclipse/Schedule/ScheduleTypes.hpp>
+#include <opm/input/eclipse/Schedule/Well/WellEnums.hpp>
+
+namespace Opm {
+
+struct WellProductionControls {
+public:
+    WellProductionControls(int controls_arg) :
+        controls(controls_arg)
+    {
+    }
+
+    bool hasControl(WellProducerCMode cmode_arg) const
+    {
+        return (this->controls & static_cast<int>(cmode_arg)) != 0;
+    }
+
+    bool operator==(const WellProductionControls& other) const
+    {
+        return this->cmode == other.cmode &&
+               this->oil_rate == other.oil_rate &&
+               this->water_rate == other.water_rate &&
+               this->gas_rate == other.gas_rate &&
+               this->liquid_rate == other.liquid_rate &&
+               this->resv_rate == other.resv_rate &&
+               this->bhp_history == other.bhp_history &&
+               this->thp_history == other.thp_history &&
+               this->bhp_limit == other.bhp_limit &&
+               this->thp_limit == other.thp_limit &&
+               this->alq_value == other.alq_value &&
+               this->vfp_table_number == other.vfp_table_number &&
+               this->prediction_mode == other.prediction_mode;
+    }
+
+    WellProducerCMode cmode = WellProducerCMode::NONE;
+    double oil_rate{0};
+    double water_rate{0};
+    double gas_rate{0};
+    double liquid_rate{0};
+    double resv_rate{0};
+    double bhp_history{0};
+    double thp_history{0};
+    double bhp_limit{0};
+    double thp_limit{0};
+    double alq_value{0};
+    int    vfp_table_number{0};
+    bool   prediction_mode{0};
+
+private:
+    int controls;
+};
+
+}
+
+#endif