From 971e01fdd7170f28651532f122e4d03b1ffeda7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Atgeirr=20Fl=C3=B8=20Rasmussen?= <atgeirr@sintef.no>
Date: Wed, 27 Aug 2014 19:56:13 +0200
Subject: [PATCH] Suppress warnings of various kinds.

---
 opm/autodiff/BlackoilPropsAd.cpp         | 2 +-
 opm/autodiff/BlackoilPropsAdFromDeck.hpp | 4 ++--
 opm/autodiff/GeoProps.hpp                | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/opm/autodiff/BlackoilPropsAd.cpp b/opm/autodiff/BlackoilPropsAd.cpp
index 50025ff16..6d323531d 100644
--- a/opm/autodiff/BlackoilPropsAd.cpp
+++ b/opm/autodiff/BlackoilPropsAd.cpp
@@ -898,7 +898,7 @@ namespace Opm
     }
     
     /// Update for max oil saturation.
-    void BlackoilPropsAd::updateSatOilMax(const std::vector<double>& saturation)
+    void BlackoilPropsAd::updateSatOilMax(const std::vector<double>& /*saturation*/)
     {
         OPM_THROW(std::logic_error, "BlackoilPropsAd class does not support this functionality.");
     }
diff --git a/opm/autodiff/BlackoilPropsAdFromDeck.hpp b/opm/autodiff/BlackoilPropsAdFromDeck.hpp
index 8042c4d4d..1672fa290 100644
--- a/opm/autodiff/BlackoilPropsAdFromDeck.hpp
+++ b/opm/autodiff/BlackoilPropsAdFromDeck.hpp
@@ -410,8 +410,8 @@ namespace Opm
         std::unique_ptr<SaturationPropsInterface> satprops_;
 
         PhaseUsage phase_usage_;
-        bool has_vapoil_;
-        bool has_disgas_;
+        // bool has_vapoil_;
+        // bool has_disgas_;
 
         // The PVT region which is to be used for each cell
         std::vector<int> cellPvtRegionIdx_;
diff --git a/opm/autodiff/GeoProps.hpp b/opm/autodiff/GeoProps.hpp
index 93b8e7a92..75c037952 100644
--- a/opm/autodiff/GeoProps.hpp
+++ b/opm/autodiff/GeoProps.hpp
@@ -32,14 +32,14 @@
 
 #include <Eigen/Eigen>
 
-#include "reenable_warning_pragmas.h"
-
 #ifdef HAVE_DUNE_CORNERPOINT
 #include <dune/common/version.hh>
 #include <dune/grid/CpGrid.hpp>
 #include <dune/grid/common/mcmgmapper.hh>
 #endif
 
+#include "reenable_warning_pragmas.h"
+
 #include <cstddef>
 
 namespace Opm