From d09e8f237a8d2c3ccce077490ee2977bb4de0b7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mathieu=20Labb=C3=A9?= <matlabbe@gmail.com>
Date: Wed, 29 Apr 2015 00:38:00 -0400
Subject: [PATCH] fixed Windows build and some warnings

---
 corelib/src/Memory.cpp  | 2 +-
 corelib/src/Rtabmap.cpp | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/corelib/src/Memory.cpp b/corelib/src/Memory.cpp
index bd463be653..bf14da8667 100644
--- a/corelib/src/Memory.cpp
+++ b/corelib/src/Memory.cpp
@@ -1880,7 +1880,7 @@ Transform Memory::computeVisualTransform(
 			}
 			if(inliers)
 			{
-				*inliers = inliers3D.size();
+				*inliers = (int)inliers3D.size();
 			}
 
 			if(!cameraTransform.isNull())
diff --git a/corelib/src/Rtabmap.cpp b/corelib/src/Rtabmap.cpp
index 800b2179c5..cb7ce6e0b0 100644
--- a/corelib/src/Rtabmap.cpp
+++ b/corelib/src/Rtabmap.cpp
@@ -1349,7 +1349,7 @@ bool Rtabmap::process(const SensorData & data)
 			{
 				nearNodesByDist.insert(std::make_pair(iter->second, iter->first));
 			}
-			for(std::map<float, int>::iterator iter=nearNodesByDist.begin();
+			for(std::multimap<float, int>::iterator iter=nearNodesByDist.begin();
 				iter!=nearNodesByDist.end() && retrievalLocalIds.size() < _maxLocalRetrieved;
 				++iter)
 			{
@@ -1389,7 +1389,7 @@ bool Rtabmap::process(const SensorData & data)
 		// only a loop closure link is added...
 		signaturesRetrieved = _memory->reactivateSignatures(
 				reactivatedIds,
-				_maxRetrieved+retrievalLocalIds.size(), // add path retrieved
+				_maxRetrieved+(unsigned int)retrievalLocalIds.size(), // add path retrieved
 				timeRetrievalDbAccess);
 
 		ULOGGER_INFO("retrieval of %d (db time = %fs)", (int)signaturesRetrieved.size(), timeRetrievalDbAccess);
@@ -1535,7 +1535,7 @@ bool Rtabmap::process(const SensorData & data)
 					_localDetectMaxDiffID);
 
 			std::list<std::map<int, Transform> > forwardPaths = getPaths(forwardPoses);
-			localSpacePaths = forwardPaths.size();
+			localSpacePaths = (int)forwardPaths.size();
 
 			for(std::list<std::map<int, Transform> >::iterator iter=forwardPaths.begin(); iter!=forwardPaths.end(); ++iter)
 			{