Clean up Checksum.h

OpenShock · Nov 15, 2024 · c81d86c · c81d86c
1 parent 137a199
commit c81d86c
Showing 1 changed file with 28 additions and 3 deletions.
diff --git a/include/Checksum.h b/include/Checksum.h
@@ -2,16 +2,41 @@
 
 #include <cstdint>
 
+#if __cplusplus >= 202'002L
+#error Take into use C++20 std::integral instead of this macro logic
+#endif
+
+#define SUM8_INT_FN(Type)                                       \
+  constexpr uint8_t Sum8(Type data)                             \
+  {                                                             \
+    uint8_t result = 0;                                         \
+    for (int i = 0; i < sizeof(Type); ++i) {                    \
+      result += static_cast<uint8_t>((data >> (i * 8)) & 0xFF); \
+    }                                                           \
+    return result;                                              \
+  }
+
 namespace OpenShock::Checksum {
-  constexpr uint8_t Sum8(const uint8_t* data, std::size_t size) {
+  constexpr uint8_t Sum8(const uint8_t* data, std::size_t size)
+  {
     uint8_t checksum = 0;
     for (std::size_t i = 0; i < size; ++i) {
       checksum += data[i];
     }
     return checksum;
   }
   template<typename T>
-  constexpr uint8_t Sum8(T data) {
-    return Sum8(reinterpret_cast<uint8_t*>(&data), sizeof(T));
+  constexpr uint8_t Sum8(const T& data)
+  {
+    return Sum8(reinterpret_cast<const uint8_t*>(std::addressof(data)), sizeof(T));
   }
+
+  SUM8_INT_FN(int16_t)
+  SUM8_INT_FN(uint16_t)
+  SUM8_INT_FN(int32_t)
+  SUM8_INT_FN(uint32_t)
+  SUM8_INT_FN(int64_t)
+  SUM8_INT_FN(uint64_t)
 }  // namespace OpenShock::Checksum
+
+#undef SUM8_INT_FN