X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftype.h;h=0e371e632a9bb4b66aee10520e5aab300726675e;hb=a2cce9e933089f483163456e9872e005c33dd678;hp=fdd040d81adccd82b53b9e9509b48b4348b70ed8;hpb=08ca2d33416e549bd3d071a164ed2a98765dda4b;p=libs%2Fdatafile.git

diff --git a/source/type.h b/source/type.h
index fdd040d..0e371e6 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>
 
@@ -12,7 +12,7 @@ struct Symbol
 {
 	std::string name;
 
-	Symbol() { }
+	Symbol() = default;
 
 	template<typename T>
 	Symbol(const T &n): name(lexical_cast<std::string>(n)) { }
@@ -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 { };