From 1343bdc2371957ae2e0f2a98b38f7c5d5c631f9c Mon Sep 17 00:00:00 2001 From: dtmoodie Date: Tue, 16 Sep 2014 09:29:25 -0400 Subject: [PATCH] Fixed build error on VS 2013 unsigned __int64 ~= unsigned long long. VS2013 will error. --- src/cpp/flann/util/serialization.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/cpp/flann/util/serialization.h b/src/cpp/flann/util/serialization.h index 2e5c588..8c07630 100644 --- a/src/cpp/flann/util/serialization.h +++ b/src/cpp/flann/util/serialization.h @@ -107,8 +107,12 @@ BASIC_TYPE_SERIALIZER(float); BASIC_TYPE_SERIALIZER(double); BASIC_TYPE_SERIALIZER(bool); #ifdef _MSC_VER +// unsigned __int64 ~= unsigned long long +// Will throw error on VS2013 +#if _MSC_VER != 1800 BASIC_TYPE_SERIALIZER(unsigned __int64); #endif +#endif // serializer for std::vector -- GitLab