Skip to content

Commit a7d8b74

Browse files
committed
BASIC_TYPE_SERIALIZER __int64 fix
Flann was causing an error when building against VS2015. Aparentely the basic serializer for __int64 is being defined twice.
1 parent 077f230 commit a7d8b74

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/cpp/flann/util/serialization.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ BASIC_TYPE_SERIALIZER(bool);
109109
#ifdef _MSC_VER
110110
// unsigned __int64 ~= unsigned long long
111111
// Will throw error on VS2013
112-
#if _MSC_VER != 1800
112+
#if _MSC_VER < 1900
113113
BASIC_TYPE_SERIALIZER(unsigned __int64);
114114
#endif
115115
#endif

0 commit comments

Comments
 (0)