Kokkos::Experimental::abs -> Kokkos::Experimental::fabs

diff --git a/bundled/boost-1.70.0/include/boost/mpl/print.hpp b/bundled/boost-1.70.0/include/boost/mpl/print.hpp
index 36e25cd3e7d0156ce17461ef789c66065f3c5961..cfbc1196747be648c5fd4176a9ea24c11084efc9 100644 (file)
--- a/bundled/boost-1.70.0/include/boost/mpl/print.hpp
+++ b/bundled/boost-1.70.0/include/boost/mpl/print.hpp
@@ -61,7 +61,7 @@ struct print
 # if defined(__EDG_VERSION__)
            aux::dependent_unsigned<T>::value > -1
 # else 
-           sizeof(T) > -1
+           sizeof(T) > std::size_t(-1)
 # endif 
         };
 #endif 

diff --git a/include/deal.II/base/config.h.in b/include/deal.II/base/config.h.in
index 47e0644ff1e29a04d633ac5b67970ddfade8d4b5..0a36b957ac4bae5370674c6b6d4d58b6e78a1711 100644 (file)
--- a/include/deal.II/base/config.h.in
+++ b/include/deal.II/base/config.h.in
@@ -490,6 +490,7 @@ _Pragma("GCC diagnostic ignored \"-Wint-in-bool-context\"")             \
 _Pragma("GCC diagnostic ignored \"-Wmisleading-indentation\"")          \
 _Pragma("GCC diagnostic ignored \"-Wmissing-field-initializers\"")      \
 _Pragma("GCC diagnostic ignored \"-Wnested-anon-types\"")               \
+_Pragma("GCC diagnostic ignored \"-Wnon-template-friend\"")             \
 _Pragma("GCC diagnostic ignored \"-Wnon-virtual-dtor\"")                \
 _Pragma("GCC diagnostic ignored \"-Wnonnull\"")                         \
 _Pragma("GCC diagnostic ignored \"-Woverflow\"")                        \

diff --git a/include/deal.II/lac/vector_operations_internal.h b/include/deal.II/lac/vector_operations_internal.h
index 8d1de426574f5311b9763a85773d7dee8a193bc9..a8a277f5771f5ec65b8b47e543392e80cbf2932f 100644 (file)
--- a/include/deal.II/lac/vector_operations_internal.h
+++ b/include/deal.II/lac/vector_operations_internal.h
@@ -2529,7 +2529,7 @@ namespace internal
 #if KOKKOS_VERSION < 30400
             update += abs(data.values(i));
 #elif KOKKOS_VERSION < 30700
-            update += Kokkos::Experimental::abs(data.values(i));
+            update += Kokkos::Experimental::fabs(data.values(i));
 #else
             update += Kokkos::abs(data.values(i));
 #endif
@@ -2559,7 +2559,7 @@ namespace internal
             update += pow(fabs(data.values(i)), exp);
 #elif KOKKOS_VERSION < 30700
             update += Kokkos::Experimental::pow(
-              Kokkos::Experimental::abs(data.values(i)), exp);
+              Kokkos::Experimental::fabs(data.values(i)), exp);
 #else
             update += Kokkos::pow(Kokkos::abs(data.values(i)), exp);
 #endif