Change remaining fixed-size integers to standard types

[libs/datafile.git] / source / type.h

diff --git a/source/type.h b/source/type.h
index fdd040d81adccd82b53b9e9509b48b4348b70ed8..151f2ca96624f1da495d41c4f1179c8b597599d1 100644 (file)
--- 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 { };