diff options
author | Derek Murray <mrry@google.com> | 2016-09-29 12:52:54 -0700 |
---|---|---|
committer | Derek Murray <mrry@google.com> | 2016-09-29 12:52:54 -0700 |
commit | 1d2c7b6c7376f396c8c7dd9b6afd2d4f83f3cb05 (patch) | |
tree | 8143d7fee4d1410eb73d5166bcd53a852b9e5122 | |
parent | b9bad65bf32cebc6210b4da9251919503d479dbd (diff) | |
download | protobuf-1d2c7b6c7376f396c8c7dd9b6afd2d4f83f3cb05.tar.gz protobuf-1d2c7b6c7376f396c8c7dd9b6afd2d4f83f3cb05.tar.bz2 protobuf-1d2c7b6c7376f396c8c7dd9b6afd2d4f83f3cb05.zip |
Fix MSVC build when HAVE_LONG_LONG is defined.
-rw-r--r-- | src/google/protobuf/stubs/type_traits.h | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/google/protobuf/stubs/type_traits.h b/src/google/protobuf/stubs/type_traits.h index 8d48c6aa..3ab5ea7d 100644 --- a/src/google/protobuf/stubs/type_traits.h +++ b/src/google/protobuf/stubs/type_traits.h @@ -139,18 +139,10 @@ template<> struct is_integral<int> : true_type { }; template<> struct is_integral<unsigned int> : true_type { }; template<> struct is_integral<long> : true_type { }; template<> struct is_integral<unsigned long> : true_type { }; -#ifdef HAVE_LONG_LONG +#if defined(HAVE_LONG_LONG) || defined(_MSC_VER) template<> struct is_integral<long long> : true_type { }; template<> struct is_integral<unsigned long long> : true_type { }; #endif -#if defined(_MSC_VER) -// With VC, __int8, __int16, and __int32 are synonymous with standard types -// with the same size, but __int64 has not equivalent (i.e., it's neither -// long, nor long long and should be treated differnetly). -// https://msdn.microsoft.com/en-us/library/29dh1w7z.aspx -template<> struct is_integral<__int64> : true_type { }; -template<> struct is_integral<unsigned __int64> : true_type {}; -#endif template <class T> struct is_integral<const T> : is_integral<T> { }; template <class T> struct is_integral<volatile T> : is_integral<T> { }; template <class T> struct is_integral<const volatile T> : is_integral<T> { }; |