Merge branch 'master' into map_for_periodic_grid

Conflicts:
	dune/stuff/discretefunction/projection/heterogenous.hh
	dune/stuff/grid/periodicview.hh

dune/stuff/functions/interfaces.hh

@@ -40,7 +40,7 @@
 #include <dune/stuff/aliases.hh>
 #include <dune/stuff/common/exceptions.hh>
 #include <dune/stuff/common/memory.hh>
-
+#include <dune/stuff/common/type_utils.hh>
 
 namespace Dune {
 namespace Stuff {

dune/stuff/test/functions_combined.cc

@@ -99,16 +99,15 @@ TYPED_TEST(DifferenceFunctionTest, evaluate_check)
 
 #else // HAVE_DUNE_GRID
 
-#if DS_COMPILE_DISABLED_TESTS
-TYPED_TEST(DISABLED_FlatTopFunctionTest, static_interface_check)
+// no-compile placeholders to mark disabled tests in test-binary output
+TEST(DISABLED_FlatTopFunctionTest, static_interface_check)
 {
 }
-TYPED_TEST(DISABLED_DifferenceFunctionTest, dynamic_interface_check)
+TEST(DISABLED_DifferenceFunctionTest, dynamic_interface_check)
 {
 }
-TYPED_TEST(DISABLED_DifferenceFunctionTest, evaluate_check)
+TEST(DISABLED_DifferenceFunctionTest, evaluate_check)
 {
 }
-#endif
 
 #endif // HAVE_DUNE_GRID

dune/stuff/test/functions_flattop.cc

@@ -129,22 +129,21 @@ TYPED_TEST(FlatTopFunctionTest, evaluate_check)
 
 #else // HAVE_DUNE_GRID
 
-#if DS_COMPILE_DISABLED_TESTS
-TYPED_TEST(DISABLED_FlatTopFunctionTest, static_interface_check)
+// no-compile placeholders to mark disabled tests in test-binary output
+TEST(DISABLED_FlatTopFunctionTest, static_interface_check)
 {
 }
-TYPED_TEST(DISABLED_FlatTopFunctionTest, static_create_check)
+TEST(DISABLED_FlatTopFunctionTest, static_create_check)
 {
 }
-TYPED_TEST(DISABLED_FlatTopFunctionTest, dynamic_interface_check)
+TEST(DISABLED_FlatTopFunctionTest, dynamic_interface_check)
 {
 }
-TYPED_TEST(DISABLED_FlatTopFunctionTest, copy_check)
+TEST(DISABLED_FlatTopFunctionTest, copy_check)
 {
 }
-TYPED_TEST(DISABLED_FlatTopFunctionTest, evaluate_check)
+TEST(DISABLED_FlatTopFunctionTest, evaluate_check)
 {
 }
-#endif
 
 #endif // HAVE_DUNE_GRID