From 38f9103e43df6535a3dcb4f54f99e7582666fe64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Kvalsvik?= Date: Sun, 25 Sep 2016 18:29:35 +0200 Subject: [PATCH] Widen rates bitmask to 32 bits. --- opm/output/data/Wells.hpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/opm/output/data/Wells.hpp b/opm/output/data/Wells.hpp index c52dca416..5c849235c 100644 --- a/opm/output/data/Wells.hpp +++ b/opm/output/data/Wells.hpp @@ -24,6 +24,7 @@ #include #include #include +#include #include namespace Opm { @@ -41,9 +42,7 @@ namespace Opm { */ public: - using enum_size = uint16_t; - - enum class opt : enum_size { + enum class opt : uint32_t { wat = (1 << 0), oil = (1 << 1), gas = (1 << 2), @@ -51,6 +50,8 @@ namespace Opm { solvent = (1 << 4), }; + using enum_size = std::underlying_type< opt >::type; + /// Query if a value is set. inline bool has( opt ) const;