Fix compile errors under MSVC, remove PLATFORM_* macros in favor of compiler builtin macros, and add win32 support to FileStream

1 files changed, 14 insertions, 14 deletions

diff --git a/core/src/Utils/IO/DataStream.cpp b/core/src/Utils/IO/DataStream.cpp
index bfc6252..c0797e3 100644
--- a/core/src/Utils/IO/DataStream.cpp
+++ b/core/src/Utils/IO/DataStream.cpp
@@ -21,7 +21,7 @@ static uint16_t ByteSwap(uint16_t n)
 static uint32_t ByteSwap(uint32_t n)
 {
 #ifdef _MSC_VER
-	// TODO
+	return _byteswap_ulong(n);
 #else
 	return __builtin_bswap32(n);
 #endif
@@ -30,7 +30,7 @@ static uint32_t ByteSwap(uint32_t n)
 static uint64_t ByteSwap(uint64_t n)
 {
 #ifdef _MSC_VER
-	// TODO
+	return _byteswap_uint64(n);
 #else
 	return __builtin_bswap64(n);
 #endif
@@ -62,34 +62,34 @@ InputDataStream::InputDataStream(InputFileStream stream)
 
 void InputDataStream::ReadBytes(size_t byteCount, std::byte* buffer)
 {
-	mBackend.ReadBytes(static_cast<std::streamsize>(byteCount),reinterpret_cast<std::byte*>(buffer));
+	mBackend.ReadBytes(static_cast<std::streamsize>(byteCount), reinterpret_cast<std::byte*>(buffer));
 }
 
 void InputDataStream::ReadBytes(size_t byteCount, char* buffer)
 {
-	mBackend.ReadBytes(static_cast<std::streamsize>(byteCount),reinterpret_cast<std::byte*>(buffer));
+	mBackend.ReadBytes(static_cast<std::streamsize>(byteCount), reinterpret_cast<std::byte*>(buffer));
 }
 
 void InputDataStream::ReadBytes(size_t byteCount, signed char* buffer)
 {
-	mBackend.ReadBytes(static_cast<std::streamsize>(byteCount),reinterpret_cast<std::byte*>(buffer));
+	mBackend.ReadBytes(static_cast<std::streamsize>(byteCount), reinterpret_cast<std::byte*>(buffer));
 }
 
 void InputDataStream::ReadBytes(size_t byteCount, unsigned char* buffer)
 {
-	mBackend.ReadBytes(static_cast<std::streamsize>(byteCount),reinterpret_cast<std::byte*>(buffer));
+	mBackend.ReadBytes(static_cast<std::streamsize>(byteCount), reinterpret_cast<std::byte*>(buffer));
 }
 
 void InputDataStream::Read(int8_t& n)
 {
 	// sizeof() of a reference type yields the size of the reference
-	mBackend.ReadBytes(sizeof(n),reinterpret_cast<std::byte*>(&n));
+	mBackend.ReadBytes(sizeof(n), reinterpret_cast<std::byte*>(&n));
 }
 
 void InputDataStream::Read(int16_t& n)
 {
 	int16_t tmp;
-	mBackend.ReadBytes(sizeof(tmp),reinterpret_cast<std::byte*>(&tmp));
+	mBackend.ReadBytes(sizeof(tmp), reinterpret_cast<std::byte*>(&tmp));
 	if (GetEndianness() != std::endian::native) {
 		n = ::ByteSwap(tmp);
 	} else {
@@ -100,7 +100,7 @@ void InputDataStream::Read(int16_t& n)
 void InputDataStream::Read(int32_t& n)
 {
 	int32_t tmp;
-	mBackend.ReadBytes(sizeof(tmp),reinterpret_cast<std::byte*>(&tmp));
+	mBackend.ReadBytes(sizeof(tmp), reinterpret_cast<std::byte*>(&tmp));
 	if (GetEndianness() != std::endian::native) {
 		n = ::ByteSwap(tmp);
 	} else {
@@ -111,7 +111,7 @@ void InputDataStream::Read(int32_t& n)
 void InputDataStream::Read(int64_t& n)
 {
 	int64_t tmp;
-	mBackend.ReadBytes(sizeof(tmp),reinterpret_cast<std::byte*>(&tmp));
+	mBackend.ReadBytes(sizeof(tmp), reinterpret_cast<std::byte*>(&tmp));
 	if (GetEndianness() != std::endian::native) {
 		n = ::ByteSwap(tmp);
 	} else {
@@ -121,13 +121,13 @@ void InputDataStream::Read(int64_t& n)
 
 void InputDataStream::Read(uint8_t& n)
 {
-	mBackend.ReadBytes(sizeof(n),reinterpret_cast<std::byte*>(&n));
+	mBackend.ReadBytes(sizeof(n), reinterpret_cast<std::byte*>(&n));
 }
 
 void InputDataStream::Read(uint16_t& n)
 {
 	uint16_t tmp;
-	mBackend.ReadBytes(sizeof(tmp),reinterpret_cast<std::byte*>(&tmp));
+	mBackend.ReadBytes(sizeof(tmp), reinterpret_cast<std::byte*>(&tmp));
 	if (GetEndianness() != std::endian::native) {
 		n = ::ByteSwap(tmp);
 	} else {
@@ -138,7 +138,7 @@ void InputDataStream::Read(uint16_t& n)
 void InputDataStream::Read(uint32_t& n)
 {
 	uint32_t tmp;
-	mBackend.ReadBytes(sizeof(tmp),reinterpret_cast<std::byte*>(&tmp));
+	mBackend.ReadBytes(sizeof(tmp), reinterpret_cast<std::byte*>(&tmp));
 	if (GetEndianness() != std::endian::native) {
 		n = ::ByteSwap(tmp);
 	} else {
@@ -149,7 +149,7 @@ void InputDataStream::Read(uint32_t& n)
 void InputDataStream::Read(uint64_t& n)
 {
 	uint64_t tmp;
-	mBackend.ReadBytes(sizeof(tmp),reinterpret_cast<std::byte*>(&tmp));
+	mBackend.ReadBytes(sizeof(tmp), reinterpret_cast<std::byte*>(&tmp));
 	if (GetEndianness() != std::endian::native) {
 		n = ::ByteSwap(tmp);
 	} else {