Merge branch 'master' into fix/59-deal-with-missing-swap-on-vc-proxy

This is needed to pull in the fix for #88.

dune/common/CMakeLists.txt

@@ -112,6 +112,7 @@ install(FILES
         typetraits.hh
         typeutilities.hh
         unused.hh
+        vc.hh
         version.hh
         visibility.hh
 DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/dune/common)

dune/common/simd.hh

@@ -22,12 +22,9 @@
 #include <type_traits>
 #include <utility>
 
-#if HAVE_VC
-#include <Vc/Vc>
-#endif
-
 #include <dune/common/conditional.hh>
 #include <dune/common/rangeutilities.hh>
+#include <dune/common/vc.hh>
 
 namespace Dune
 {

dune/common/test/fmatrixtest.cc

@@ -15,14 +15,11 @@
 #include <iostream>
 #include <vector>
 
-#if HAVE_VC
-#include <Vc/Vc>
-#endif
-
 #include <dune/common/classname.hh>
 #include <dune/common/fmatrix.hh>
 #include <dune/common/rangeutilities.hh>
 #include <dune/common/simd.hh>
+#include <dune/common/vc.hh>
 
 #include "checkmatrixinterface.hh"
 

dune/common/vc.hh

+#ifndef DUNE_COMMON_VC_HH
+#define DUNE_COMMON_VC_HH
+
+/**
+   \file Compatibility header for including <Vc/Vc>
+
+   Certain versions (1.3.2) of Vc (https://github.com/VcDevel/Vc) have a
+   problem with certain compiler versions (g++ 7.2.0) in c++17 mode, see #88.
+ */
+
+#if HAVE_VC
+
+// include Vc's macro definitions
+#include <Vc/global.h>
+
+// undefine the macro that signals C++17 support, if set
+#ifdef Vc_CXX17
+#undef Vc_CXX17
+#endif
+
+// include the rest of Vc
+#include <Vc/Vc>
+
+#endif // HAVE_VC
+
+#endif // DUNE_COMMON_VC_HH