From 56dcb716e347f91bbf517b35a242508f32c6286b Mon Sep 17 00:00:00 2001
From: Mateusz Pusz <mateusz.pusz@gmail.com>
Date: Thu, 30 Mar 2023 17:04:25 +0200
Subject: [PATCH] fix: some preprocessor branches fixed

---
 example/kalman_filter/kalman.h               | 2 +-
 src/core/include/units/bits/external/hacks.h | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/example/kalman_filter/kalman.h b/example/kalman_filter/kalman.h
index 3a04d8fd..6d11c7d3 100644
--- a/example/kalman_filter/kalman.h
+++ b/example/kalman_filter/kalman.h
@@ -84,7 +84,7 @@ public:
   uncertainty_type uncertainty;
 };
 
-#if UNITS_COMP_CLANG <= 16
+#if UNITS_COMP_CLANG && UNITS_COMP_CLANG <= 16
 
 template<QuantityOrQuantityPoint QQP, units::Quantity U>
 estimation(state<QQP>, U) -> estimation<QQP>;
diff --git a/src/core/include/units/bits/external/hacks.h b/src/core/include/units/bits/external/hacks.h
index f56d2ba4..0f9b54dc 100644
--- a/src/core/include/units/bits/external/hacks.h
+++ b/src/core/include/units/bits/external/hacks.h
@@ -94,7 +94,7 @@
 #include <compare>
 #include <concepts>
 
-#if UNITS_COMP_MSVC || UNITS_COMP_CLANG < 16
+#if UNITS_COMP_MSVC || (UNITS_COMP_CLANG && UNITS_COMP_CLANG < 16)
 
 #define TYPENAME typename
 
@@ -114,7 +114,7 @@
 
 #endif
 
-#if UNITS_COMP_MSVC || UNITS_COMP_GCC < 11
+#if UNITS_COMP_MSVC || (UNITS_COMP_GCC && UNITS_COMP_GCC < 11)
 
 #define UNITS_CONSTRAINED_NTTP_WORKAROUND(X)