Merge pull request #14786 from masterleinad/fix_check_for_always_inline

Fix DEAL_II_COMPILER_HAS_ATTRIBUTE_ALWAYS_INLINE with -Werror
dealii · Feb 11, 2023 · 0b08728 · 0b08728
2 parents 2fe6d39 + 29cb95c
commit 0b08728
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/cmake/checks/check_02_compiler_features.cmake b/cmake/checks/check_02_compiler_features.cmake
@@ -276,7 +276,7 @@ endif()
 #
 CHECK_CXX_SOURCE_COMPILES(
   "
-          __attribute__((always_inline)) int fn () { return 0; }
+          __attribute__((always_inline)) inline int fn () { return 0; }
           int main () { return fn(); }
   "
   DEAL_II_COMPILER_HAS_ATTRIBUTE_ALWAYS_INLINE

diff --git a/cmake/setup_compiler_flags_intel.cmake b/cmake/setup_compiler_flags_intel.cmake
@@ -48,6 +48,7 @@ enable_if_supported(DEAL_II_CXX_FLAGS "-w2")
 # Disable remarks like "Inlining inhibited by limit max-size"
 #
 enable_if_supported(DEAL_II_CXX_FLAGS "-diag-disable=remark")
+enable_if_supported(DEAL_II_CXX_FLAGS "-diag-disable=16219")
 
 #
 # Disable some warnings that lead to a lot of false positives: