Merge pull request #140 from atgeirr/silence-warning

Silence warnings
2016-04-19 14:39:00 +02:00 · 2016-04-19 14:39:00 +02:00 · 13c9df45f6
commit 13c9df45f6
parent ee4dd837ea 0a4578ad15
2 changed files with 3 additions and 1 deletions
--- a/opm/material/constraintsolvers/NcpFlash.hpp
+++ b/opm/material/constraintsolvers/NcpFlash.hpp
@ -38,8 +38,10 @@
 #include <opm/common/ErrorMacros.hpp>
 #include <opm/common/Exceptions.hpp>

+#include <opm/common/utility/platform_dependent/disable_warnings.h>
 #include <dune/common/fvector.hh>
 #include <dune/common/fmatrix.hh>
+#include <opm/common/utility/platform_dependent/reenable_warnings.h>

 #include <limits>
 #include <iostream>
--- a/opm/material/fluidsystems/ParameterCacheBase.hpp
+++ b/opm/material/fluidsystems/ParameterCacheBase.hpp
@ -62,7 +62,7 @@ public:
     *        another parameter cache.
     */
    template <class OtherCache>
-    void assignPersistentData(const OtherCache& other)
+    void assignPersistentData(const OtherCache& /* other */)
    {}

    /*!