From 2953217c2c9d43c33079247cc6410e6759db439a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mathieu=20Labb=C3=A9?= Date: Sat, 17 Oct 2015 16:36:34 -0400 Subject: [PATCH] fixed windows build errors --- corelib/include/rtabmap/core/Link.h | 4 +++- corelib/src/rtflann/util/serialization.h | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/corelib/include/rtabmap/core/Link.h b/corelib/include/rtabmap/core/Link.h index 34934fd3..9e559750 100644 --- a/corelib/include/rtabmap/core/Link.h +++ b/corelib/include/rtabmap/core/Link.h @@ -28,12 +28,14 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #ifndef LINK_H_ #define LINK_H_ +#include "rtabmap/core/RtabmapExp.h" // DLL export/import defines + #include #include namespace rtabmap { -class Link +class RTABMAP_EXP Link { public: enum Type {kNeighbor, kGlobalClosure, kLocalSpaceClosure, kLocalTimeClosure, kUserClosure, kVirtualClosure, kUndef}; diff --git a/corelib/src/rtflann/util/serialization.h b/corelib/src/rtflann/util/serialization.h index cc0a5589..8c251661 100644 --- a/corelib/src/rtflann/util/serialization.h +++ b/corelib/src/rtflann/util/serialization.h @@ -110,7 +110,7 @@ BASIC_TYPE_SERIALIZER(bool); // unsigned __int64 ~= unsigned long long // Will throw error on VS2013 #if _MSC_VER != 1800 -BASIC_TYPE_SERIALIZER(unsigned __int64); +//BASIC_TYPE_SERIALIZER(unsigned __int64); #endif #endif