Clean up conflicts

include/ccmath/detail/compare/isnan.hpp

@@ -23,6 +23,7 @@ namespace ccm
 	 * @return True if the number is NaN, false otherwise.
 	 */
 	template <typename T, std::enable_if_t<!std::is_integral_v<T>, int> = 0>
+<<<<<<< HEAD
 	[[nodiscard]] inline constexpr bool isnan(T x) noexcept
 	{
 #if defined(__GNUC__)
@@ -31,6 +32,16 @@ namespace ccm
 		return x != x; // NOLINT
 #endif
 	}
+=======
+    [[nodiscard]] inline constexpr bool isnan(T x) noexcept
+    {
+		#if defined(__GNUC__)
+			return __builtin_isnan(x); // GCC and Clang implement this as constexpr
+		#else // If we can't use the builtin, fallback to this comparison and hope for the best.
+			return x != x; // NOLINT
+		#endif
+    }
+>>>>>>> 35921f6a7694983073fd81e0894043b36543469f
 
 	/**
 	 * @brief Check if the given number is NaN.

temp_exe/main.cpp

@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2024-Present Ian Pike
+ * Copyright (c) 2024-Present ccmath contributors
+ *
+ * This library is provided under the MIT License.
+ * See LICENSE for more information.
+ */
+
+//#include <cmath>
+#include <iostream>
+
+#include "ccmath/ccmath.hpp"
+
+#include <cmath>
+
+
+int main()
+{
+
+
+// EXPECT_EQ(ccm::signbit(-0.0), std::signbit(-0.0));
+
+    constexpr double a = -0.0;
+	constexpr double val = ccm::signbit(a);
+	static_assert(val == true, "ccm::signbit(-0.0) != true");
+
+	// 	EXPECT_EQ(ccm::trunc(-std::numeric_limits<double>::quiet_NaN()), std::trunc(-std::numeric_limits<double>::quiet_NaN()));
+
+	constexpr double b = -std::numeric_limits<double>::quiet_NaN();
+	constexpr double val2 = ccm::trunc(b);
+	static_assert(ccm::isnan(val2), "ccm::trunc(-std::numeric_limits<double>::quiet_NaN()) != std::trunc(-std::numeric_limits<double>::quiet_NaN())");
+
+
+	double b2 = ccm::trunc(-std::numeric_limits<double>::quiet_NaN());
+
+    return 0;
+}