Preparations for boost fpclassify replacement

Author: tstenner

src/portable_archive/portable_archive_includes.hpp

@@ -96,18 +96,45 @@
 #include <boost/endian/conversion.hpp>
 #include <boost/math/special_functions/fpclassify.hpp>
 
-// namespace alias fp_classify
-namespace fp = lslboost::math;
-
-// namespace alias endian
-namespace endian = lslboost::endian;
-
 // generic type traits for numeric types
+#include "portable_archive_exception.hpp"
+#include <cstdint>
 #include <type_traits>
 
-#include <boost/cstdint.hpp>
+namespace lsl {
+/*template<typename T>
+int fpclassify(T val) { return std::fpclassify(val); }*/
+namespace detail {
 
-#include "portable_archive_exception.hpp"
+template <typename T> struct fp_traits_consts {};
+template <> struct fp_traits_consts<double> {
+	using bits = uint64_t;
+	static constexpr bits sign = (0x80000000ull) << 32, exponent = (0x7ff00000ll) << 32,
+						  significand = ((0x000fffffll) << 32) + (0xfffffffful);
+};
+template <> struct fp_traits_consts<float> {
+	using bits = uint32_t;
+	static constexpr bits sign = 0x80000000u, exponent = 0x7f800000, significand = 0x007fffff;
+	static void get_bits(float src, bits &dst) { std::memcpy(&dst, &src, sizeof(src)); }
+	static void set_bits(float &dst, bits src) { std::memcpy(&dst, &src, sizeof(src)); }
+};
+
+template <typename T> struct fp_traits {
+	using type = fp_traits_consts<T>;
+	static void get_bits(double src, typename type::bits &dst) {
+		std::memcpy(&dst, &src, sizeof(src));
+	}
+	static void set_bits(double &dst, typename type::bits src) {
+		std::memcpy(&dst, &src, sizeof(src));
+	}
+};
+
+} // namespace detail
+} // namespace lsl
+
+namespace fp = lslboost::math;
+// namespace alias endian
+namespace endian = lslboost::endian;
 
 // hint from Johan Rade: on VMS there is still support for
 // the VAX floating point format and this macro detects it

src/portable_archive/portable_oarchive.hpp

@@ -1,7 +1,8 @@
 #pragma once
 
-#include <ostream>
 #include "portable_archive_includes.hpp"
+#include <cstring>
+#include <ostream>
 
 #ifdef SLIMARCHIVE
 #include "slimarchive.hpp"
@@ -10,29 +11,6 @@
 #include <boost/archive/basic_binary_oarchive.hpp>
 #endif
 
-#include <cstring>
-
-template <typename T> struct FPTraits {};
-template <> struct FPTraits<double> {
-	using bits = uint64_t;
-	static constexpr bits sign = (0x80000000ull) << 32, exponent = (0x7ff00000ll) << 32,
-						  significand = ((0x000fffffll) << 32) + (0xfffffffful);
-	static bits get_bits(double f) {
-		bits b;
-		std::memcpy(&b, &f, sizeof(bits));
-		return b;
-	}
-};
-template <> struct FPTraits<float> {
-	using bits = uint32_t;
-	static constexpr bits sign = 0x80000000u, exponent = 0x7f800000, significand = 0x007fffff;
-	static bits get_bits(float f) {
-		bits b;
-		std::memcpy(&b, &f, sizeof(bits));
-		return b;
-	}
-};
-
 namespace eos {
 
 	// IMPORTANT: We are fixing the lslboost serialization archive version
@@ -214,7 +192,7 @@ namespace eos {
 		save(const T & t, dummy<3> = 0)
 		{
 			using traits = typename fp::detail::fp_traits<T>::type;
-			using newtraits = FPTraits<T>;
+			using newtraits = typename lsl::detail::fp_traits<T>::type;
 			static_assert(std::is_same<typename traits::bits, typename newtraits::bits>::value,
 				"Wrong corresponding int type");