Merge remote-tracking branch 'akva2/quell_dune_warnings' into suppress-external-warnings

This commit is contained in:
Atgeirr Flø Rasmussen 2014-04-15 14:35:01 +02:00
commit bd4eef5a86

View File

@ -30,6 +30,8 @@
// the deprecated member anyway (in this compilation unit) // the deprecated member anyway (in this compilation unit)
#define DUNE_COMMON_FIELDVECTOR_SIZE_IS_METHOD 1 #define DUNE_COMMON_FIELDVECTOR_SIZE_IS_METHOD 1
#include "dune_disable_pragmas.h"
// TODO: clean up includes. // TODO: clean up includes.
#include <dune/common/deprecated.hh> #include <dune/common/deprecated.hh>
#include <dune/common/version.hh> #include <dune/common/version.hh>
@ -49,6 +51,8 @@
#include <dune/istl/paamg/fastamg.hh> #include <dune/istl/paamg/fastamg.hh>
#endif #endif
#include "dune_reenable_pragmas.h"
#include <stdexcept> #include <stdexcept>
#include <iostream> #include <iostream>
#include <type_traits> #include <type_traits>