byte swapping

src/sp/common/ByteSwapping.cpp

@@ -1,27 +1,21 @@
 #include <sp/common/ByteSwapping.h>
 
 #ifdef _WIN32
+
 #include <winsock2.h>
+
 #else
+
 #include <arpa/inet.h>
+#include <endian.h>
+
+#define htonll htobe64
+#define ntohll be64toh
+
 #endif
 
-#include <algorithm>
-
 namespace sp {
 
-template <typename T>
-void SwapBytes(T& value) {
-	char* ptr = reinterpret_cast<char*>(&value);
-	std::reverse(ptr, ptr + sizeof(T));
-}
-
-bool IsSystemBigEndian() {
-	static constexpr std::uint16_t test = 10;
-	static const bool isBigEndian = reinterpret_cast<const std::uint8_t*>(&test)[1] == 10;
-	return isBigEndian;
-}
-
 template <>
 void ToNetwork<std::uint16_t>(std::uint16_t& value) {
 	value = htons(value);
@@ -34,9 +28,7 @@ void ToNetwork<std::uint32_t>(std::uint32_t& value) {
 
 template <>
 void ToNetwork<std::uint64_t>(std::uint64_t& value) {
-	if (IsSystemBigEndian())
-		return;
-	SwapBytes(value);
+	value = htonll(value);
 }
 
 template <>
@@ -51,24 +43,7 @@ void FromNetwork<std::uint32_t>(std::uint32_t& value) {
 
 template <>
 void FromNetwork<std::uint64_t>(std::uint64_t& value) {
-	if (IsSystemBigEndian())
-		return;
-	SwapBytes(value);
-}
-
-template <>
-void TrySwapBytes<std::uint16_t>(std::uint16_t& value) {
-	SwapBytes(value);
-}
-
-template <>
-void TrySwapBytes<std::uint32_t>(std::uint32_t& value) {
-	SwapBytes(value);
-}
-
-template <>
-void TrySwapBytes<std::uint64_t>(std::uint64_t& value) {
-	SwapBytes(value);
+	value = ntohll(value);
 }
 
 }  // namespace sp