From: Daniel Arndt Date: Sun, 27 May 2018 16:59:13 +0000 (+0200) Subject: Bugfix: Avoid warnings regarding ABI change X-Git-Tag: v9.1.0-rc1~1067^2~10 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f32748b9c19f867d7fa5a8ab0686d7d67101ef1a;p=dealii.git Bugfix: Avoid warnings regarding ABI change --- diff --git a/cmake/setup_compiler_flags_gnu.cmake b/cmake/setup_compiler_flags_gnu.cmake index 232b15f57a..091b1d00bc 100644 --- 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 bd0ed4e6d4..44728165d3 100644 --- a/include/deal.II/lac/affine_constraints.templates.h +++ b/include/deal.II/lac/affine_constraints.templates.h @@ -458,7 +458,7 @@ AffineConstraints::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( constrained_line->entries[0].first, constrained_line->entries[0].second * weight);