1. ByteSwap.h - Removed signed overloads to avoid ambiguity with size_t on different platforms

  2. DataStreamGenerator.cpp - Added static_cast<uint64_t>() for state.ampId and dataSize
  3. ECIHandler.cpp - Added casts for ntpTime

Author: cboulay

mock/include/ByteSwap.h

@@ -1,26 +1,23 @@
 #pragma once
 
+#include <cstdint>
+
 // Cross-platform byte swap utilities
 // MSVC uses _byteswap_*, GCC/Clang use __builtin_bswap*
+// Only unsigned overloads to avoid ambiguity with size_t on different platforms
 
 #ifdef _MSC_VER
 #include <cstdlib>  // for _byteswap_*
 
 inline uint16_t bswap16(uint16_t value) { return _byteswap_ushort(value); }
-inline int16_t bswap16(int16_t value) { return static_cast<int16_t>(_byteswap_ushort(static_cast<uint16_t>(value))); }
 inline uint32_t bswap32(uint32_t value) { return _byteswap_ulong(value); }
-inline int32_t bswap32(int32_t value) { return static_cast<int32_t>(_byteswap_ulong(static_cast<uint32_t>(value))); }
 inline uint64_t bswap64(uint64_t value) { return _byteswap_uint64(value); }
-inline int64_t bswap64(int64_t value) { return static_cast<int64_t>(_byteswap_uint64(static_cast<uint64_t>(value))); }
 
 #else
 // GCC/Clang
 
 inline uint16_t bswap16(uint16_t value) { return __builtin_bswap16(value); }
-inline int16_t bswap16(int16_t value) { return static_cast<int16_t>(__builtin_bswap16(static_cast<uint16_t>(value))); }
 inline uint32_t bswap32(uint32_t value) { return __builtin_bswap32(value); }
-inline int32_t bswap32(int32_t value) { return static_cast<int32_t>(__builtin_bswap32(static_cast<uint32_t>(value))); }
 inline uint64_t bswap64(uint64_t value) { return __builtin_bswap64(value); }
-inline int64_t bswap64(int64_t value) { return static_cast<int64_t>(__builtin_bswap64(static_cast<uint64_t>(value))); }
 
 #endif

mock/src/DataStreamGenerator.cpp

@@ -167,8 +167,8 @@ void DataStreamGenerator::generateSyntheticData(std::vector<uint8_t>& buffer) {
 
         // Write header (network byte order = big endian)
         AmpDataPacketHeader header;
-        header.ampID = bswap64(state.ampId);
-        header.length = bswap64(dataSize);
+        header.ampID = bswap64(static_cast<uint64_t>(state.ampId));
+        header.length = bswap64(static_cast<uint64_t>(dataSize));
         std::memcpy(buffer.data(), &header, sizeof(header));
 
         // Generate sample packets
@@ -187,8 +187,8 @@ void DataStreamGenerator::generateSyntheticData(std::vector<uint8_t>& buffer) {
 
         // Write header
         AmpDataPacketHeader header;
-        header.ampID = bswap64(state.ampId);
-        header.length = bswap64(dataSize);
+        header.ampID = bswap64(static_cast<uint64_t>(state.ampId));
+        header.length = bswap64(static_cast<uint64_t>(dataSize));
         std::memcpy(buffer.data(), &header, sizeof(header));
 
         // Generate sample packets

mock/src/ECIHandler.cpp

@@ -209,7 +209,7 @@ void ECIHandler::handleNTPReturnSynch(std::shared_ptr<asio::ip::tcp::socket> soc
     // Send back 8-byte NTP time (simplified - just use our sync time)
     int64_t ntpTime = syncTime_;
     if (bigEndian_) {
-        ntpTime = bswap64(ntpTime);
+        ntpTime = static_cast<int64_t>(bswap64(static_cast<uint64_t>(ntpTime)));
     }
     asio::write(*socket, asio::buffer(&ntpTime, 8));
 }