From ffdab05698de3d2d612f04ffc146381c2362d386 Mon Sep 17 00:00:00 2001
From: Mikko Rasa <tdb@tdb.fi>
Date: Wed, 6 Oct 2021 01:08:46 +0300
Subject: [PATCH] Change remaining fixed-size integers to standard types

---
 source/binaryparser.cpp |  2 +-
 source/binarywriter.cpp |  2 +-
 source/type.h           | 12 ++----------
 3 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/source/binaryparser.cpp b/source/binaryparser.cpp
index a8b350d..e105393 100644
--- a/source/binaryparser.cpp
+++ b/source/binaryparser.cpp
@@ -200,7 +200,7 @@ IntType::Store BinaryParser::parse_int()
 
 FloatType::Store BinaryParser::parse_float()
 {
-	UInt64 encoded = 0;
+	uint64_t encoded = 0;
 	for(unsigned i=0; i<float_precision; i+=8)
 	{
 		int c = in.get();
diff --git a/source/binarywriter.cpp b/source/binarywriter.cpp
index be54844..59ceffe 100644
--- a/source/binarywriter.cpp
+++ b/source/binarywriter.cpp
@@ -167,7 +167,7 @@ void BinaryWriter::write_float(FloatType::Store f)
 		}
 	}
 
-	UInt64 encoded = bf.compose(float_precision);
+	uint64_t encoded = bf.compose(float_precision);
 	for(unsigned i=float_precision/8; i--; )
 		out.put((encoded>>(i*8))&0xFF);
 }
diff --git a/source/type.h b/source/type.h
index fdd040d..151f2ca 100644
--- a/source/type.h
+++ b/source/type.h
@@ -1,7 +1,7 @@
 #ifndef MSP_DATAFILE_TYPE_H_
 #define MSP_DATAFILE_TYPE_H_
 
-#include <msp/core/inttypes.h>
+#include <cstdint>
 #include <msp/core/meta.h>
 #include <msp/strings/lexicalcast.h>
 
@@ -23,7 +23,7 @@ struct Symbol
 struct IntType
 {
 	static const char signature = 'i';
-	typedef Int64 Store;
+	typedef std::int64_t Store;
 	typedef Store Load;
 };
 
@@ -96,19 +96,11 @@ struct TypeInfo<long int, false>: IntType { };
 template<>
 struct TypeInfo<unsigned long int, false>: IntType { };
 
-#if defined(_MSC_VER)
-template<>
-struct TypeInfo<__int64, false>: IntType { };
-
-template<>
-struct TypeInfo<unsigned __int64, false>: IntType { };
-#elif defined(__GNUC__)
 template<>
 struct TypeInfo<long long int, false>: IntType { };
 
 template<>
 struct TypeInfo<unsigned long long int, false>: IntType { };
-#endif
 
 template<>
 struct TypeInfo<float, false>: FloatType { };
-- 
2.43.0