Skip to content
Snippets Groups Projects
Commit ff6b7336 authored by René Fritze's avatar René Fritze
Browse files

Merge branch 'master' into less_shared_ptr

parents 4ba7278e 8e40648a
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
config.h.cmake
+ 4
− 0
View file @ ff6b7336
...@@ -32,6 +32,10 @@ ...@@ -32,6 +32,10 @@
#define DS_FINAL ${DS_FINAL} #define DS_FINAL ${DS_FINAL}
#define HAVE_DUNE_FEM_PARAMETER_REPLACE 0 #define HAVE_DUNE_FEM_PARAMETER_REPLACE 0
#ifndef HAVE_ALUGRID
# define DUNE_FEM_DONT_WARN_IN_COMM_MANAGER 1
#endif
/*** Silence implicitly False evaluation of undefined macro warnings ****/ /*** Silence implicitly False evaluation of undefined macro warnings ****/
#ifndef HAVE_DUNE_FEM #ifndef HAVE_DUNE_FEM
# define HAVE_FUNE_FEM 0 # define HAVE_FUNE_FEM 0
......
dune/stuff/common/disable_warnings.hh
+ 1
− 0
View file @ ff6b7336
...@@ -41,4 +41,5 @@ ...@@ -41,4 +41,5 @@
#pragma GCC diagnostic ignored "-Wreorder" #pragma GCC diagnostic ignored "-Wreorder"
#pragma GCC diagnostic ignored "-Wuninitialized" #pragma GCC diagnostic ignored "-Wuninitialized"
#pragma GCC diagnostic ignored "-Wunused-local-typedefs" #pragma GCC diagnostic ignored "-Wunused-local-typedefs"
#pragma GCC diagnostic ignored "-Wundef"
#endif #endif
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment