Fix weird C preprocessor conflicts (#101)

PX4 · Nov 1, 2019 · 445f58d · 445f58d
1 parent 215203f
commit 445f58d
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 14 deletions.
diff --git a/matrix/Dual.hpp b/matrix/Dual.hpp
@@ -234,24 +234,42 @@ Dual<Scalar, N> min(const Dual<Scalar, N>& a, const Dual<Scalar, N>& b)
 }
 
 // isnan
+template <typename Scalar>
+bool IsNan(Scalar a)
+{
+    return isnan(a);
+}
+
 template <typename Scalar, size_t N>
-bool isnan(const Dual<Scalar, N>& a)
+bool IsNan(const Dual<Scalar, N>& a)
 {
-    return isnan(a.value);
+    return IsNan(a.value);
 }
 
 // isfinite
+template <typename Scalar>
+bool IsFinite(Scalar a)
+{
+    return isfinite(a);
+}
+
 template <typename Scalar, size_t N>
-bool isfinite(const Dual<Scalar, N>& a)
+bool IsFinite(const Dual<Scalar, N>& a)
 {
-    return isfinite(a.value);
+    return IsFinite(a.value);
 }
 
 // isinf
+template <typename Scalar>
+bool IsInf(Scalar a)
+{
+    return isinf(a);
+}
+
 template <typename Scalar, size_t N>
-bool isinf(const Dual<Scalar, N>& a)
+bool IsInf(const Dual<Scalar, N>& a)
 {
-    return isinf(a.value);
+    return IsInf(a.value);
 }
 
 // trig

diff --git a/test/dual.cpp b/test/dual.cpp
@@ -167,21 +167,21 @@ int main()
 
     {
         // isnan
-        TEST(!isnan(a));
+        TEST(!IsNan(a));
         Dual<float, 1> c(sqrt(-1.f),0);
-        TEST(isnan(c));
+        TEST(IsNan(c));
     }
 
     {
         // isfinite/isinf
-        TEST(isfinite(a));
-        TEST(!isinf(a));
+        TEST(IsFinite(a));
+        TEST(!IsInf(a));
         Dual<float, 1> c(sqrt(-1.f),0);
-        TEST(!isfinite(c));
-        TEST(!isinf(c));
+        TEST(!IsFinite(c));
+        TEST(!IsInf(c));
         Dual<float, 1> d(INFINITY,0);
-        TEST(!isfinite(d));
-        TEST(isinf(d));
+        TEST(!IsFinite(d));
+        TEST(IsInf(d));
     }
 
     {