Cosmetic changes

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

diff --git a/source/type.h b/source/type.h
index 72d148a0e16631b2440747fd2c20a1556597b728..0e371e632a9bb4b66aee10520e5aab300726675e 100644 (file)
--- a/source/type.h
+++ b/source/type.h
@@ -1,6 +1,8 @@
 #ifndef MSP_DATAFILE_TYPE_H_
 #define MSP_DATAFILE_TYPE_H_
 
+#include <cstdint>
+#include <msp/core/meta.h>
 #include <msp/strings/lexicalcast.h>
 
 namespace Msp {
@@ -10,8 +12,10 @@ struct Symbol
 {
        std::string name;
 
+       Symbol() = default;
+
        template<typename T>
-       Symbol(const T &n): name(lexical_cast(n)) { }
+       Symbol(const T &n): name(lexical_cast<std::string>(n)) { }
 
        template<typename T> operator T() const { return lexical_cast<T>(name); }
 };
@@ -19,11 +23,7 @@ struct Symbol
 struct IntType
 {
        static const char signature = 'i';
-#ifdef MSVC
-       typedef __int64 Store;
-#else
-       typedef long long int Store;
-#endif
+       typedef std::int64_t Store;
        typedef Store Load;
 };
 
@@ -55,20 +55,26 @@ struct SymbolType
        typedef Symbol Store;
 };
 
-template<typename T>
-struct HasLoadType
+const char valid_signatures[] =
 {
-       struct Yes { char c[2]; };
-       struct No { char c; };
-
-       template<typename U>
-       static Yes f(typename U::LoadType *);
-       template<typename U>
-       static No f(...);
+       IntType::signature,
+       FloatType::signature,
+       BoolType::signature,
+       StringType::signature,
+       SymbolType::signature,
+       0
+};
 
-       enum { value = (sizeof(f<T>(0))==sizeof(Yes)) };
+struct CheckLoadType: Sfinae
+{
+       template<typename T>
+       static Yes f(typename T::LoadType *);
+       using Sfinae::f;
 };
 
+template<typename T>
+struct HasLoadType: Sfinae::Evaluate<CheckLoadType, T> { };
+
 template<typename T, bool lt = HasLoadType<T>::value>
 struct TypeInfo;
 
@@ -90,19 +96,11 @@ struct TypeInfo<long int, false>: IntType { };
 template<>
 struct TypeInfo<unsigned long int, false>: IntType { };
 
-#ifdef MSVC
-template<>
-struct TypeInfo<__int64, false>: IntType { };
-
-template<>
-struct TypeInfo<unsigned __int64, false>: IntType { };
-#else
 template<>
 struct TypeInfo<long long int, false>: IntType { };
 
 template<>
 struct TypeInfo<unsigned long long int, false>: IntType { };
-#endif
 
 template<>
 struct TypeInfo<float, false>: FloatType { };
@@ -116,6 +114,12 @@ struct TypeInfo<bool, false>: BoolType { };
 template<>
 struct TypeInfo<std::string, false>: StringType { };
 
+template<>
+struct TypeInfo<char *, false>: StringType { };
+
+template<>
+struct TypeInfo<const char *, false>: StringType { };
+
 template<typename T>
 struct TypeInfo<const T, false>: TypeInfo<T> { };