Bugfix: Avoid warnings regarding ABI change

diff --git a/cmake/setup_compiler_flags_gnu.cmake b/cmake/setup_compiler_flags_gnu.cmake
index 232b15f57a8852ff35b6802906f34c30df6f09fa..091b1d00bcaedf02a61a0b288d264ec1ad79fa68 100644 (file)
--- a/cmake/setup_compiler_flags_gnu.cmake
+++ b/cmake/setup_compiler_flags_gnu.cmake
@@ -81,6 +81,11 @@ ENABLE_IF_SUPPORTED(DEAL_II_CXX_FLAGS "-Wno-deprecated-declarations")
 #
 ENABLE_IF_SUPPORTED(DEAL_II_CXX_FLAGS "-Wno-literal-suffix")
 
+#
+# Disable warning about ABI changes
+#
+ENABLE_IF_SUPPORTED(DEAL_II_CXX_FLAGS "-Wno-psabi")
+
 IF(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
   #
   # Silence Clang warnings about unused compiler parameters (works around a

diff --git a/include/deal.II/lac/affine_constraints.templates.h b/include/deal.II/lac/affine_constraints.templates.h
index bd0ed4e6d426e77eaf4d313f06197d220c826e95..44728165d37c909c62f2a62fb809fb581a8da2be 100644 (file)
--- a/include/deal.II/lac/affine_constraints.templates.h
+++ b/include/deal.II/lac/affine_constraints.templates.h
@@ -458,7 +458,7 @@ AffineConstraints<number>::close()
 
                     // replace first entry, then tack the rest to the end
                     // of the list
-                    line->entries[entry] = std::make_pair(
+                    line->entries[entry] = std::pair<size_type, number>(
                       constrained_line->entries[0].first,
                       constrained_line->entries[0].second * weight);