Skip to content

Commit 04b4a56

Browse files
committed
Merge pull request flann-lib#210 from dtmoodie/master
Fixed build error on VS 2013
2 parents 4b9c8a9 + 1343bdc commit 04b4a56

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

src/cpp/flann/util/serialization.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,12 @@ BASIC_TYPE_SERIALIZER(float);
107107
BASIC_TYPE_SERIALIZER(double);
108108
BASIC_TYPE_SERIALIZER(bool);
109109
#ifdef _MSC_VER
110+
// unsigned __int64 ~= unsigned long long
111+
// Will throw error on VS2013
112+
#if _MSC_VER != 1800
110113
BASIC_TYPE_SERIALIZER(unsigned __int64);
111114
#endif
115+
#endif
112116

113117

114118
// serializer for std::vector

0 commit comments

Comments
 (0)