ArduCopter: Update clang pragma to check for the version of clang tha…

…t introduces the warning AP_Arming: Update clang pragma to check for the version of clang that introduces the warning
ArduPilot · Oct 29, 2024 · eddf8c1 · eddf8c1
1 parent a6f00a3
commit eddf8c1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/ArduCopter/AP_Arming.cpp b/ArduCopter/AP_Arming.cpp
@@ -1,7 +1,7 @@
 #include "Copter.h"
 
 #pragma GCC diagnostic push
-#if defined(__clang__)
+#if defined(__clang_major__) && __clang_major__ >= 14
 #pragma GCC diagnostic ignored "-Wbitwise-instead-of-logical"
 #endif
 

diff --git a/libraries/AP_Arming/AP_Arming.cpp b/libraries/AP_Arming/AP_Arming.cpp
@@ -175,7 +175,7 @@ extern AP_IOMCU iomcu;
 #endif
 
 #pragma GCC diagnostic push
-#if defined (__clang__)
+#if defined(__clang_major__) && __clang_major__ >= 14
 #pragma GCC diagnostic ignored "-Wbitwise-instead-of-logical"
 #endif