i/rtabmap_ros
1
0
Fork 0
mirror of https://github.com/introlab/rtabmap_ros.git synced 2026-10-03 16:27:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed warnings on Windows

Browse Source
This commit is contained in:
matlabbe
2015-11-03 12:49:03 -05:00
parent dc20327a18
commit 620ce51f70
4 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+4 -1
View File
@@ -46,7 +46,7 @@ SET(CMAKE_DEBUG_POSTFIX "d")
IF(WIN32 AND NOT MINGW) IF(WIN32 AND NOT MINGW)
ADD_DEFINITIONS("-DNOMINMAX") ADD_DEFINITIONS("-DNOMINMAX")
ADD_DEFINITIONS("-wd4100 -wd4127 -wd4191 -wd4242 -wd4244 -wd4251 -wd4305 -wd4365 -wd4512 -wd4514 -wd4548 -wd4571 -wd4619 -wd4625 -wd4626 -wd4628 -wd4668 -wd4710 -wd4711 -wd4738 -wd4820 -wd4946 -wd4986") ADD_DEFINITIONS("-wd4100 -wd4127 -wd4150 -wd4191 -wd4242 -wd4244 -wd4251 -wd4305 -wd4365 -wd4512 -wd4514 -wd4548 -wd4571 -wd4619 -wd4625 -wd4626 -wd4628 -wd4668 -wd4710 -wd4711 -wd4738 -wd4820 -wd4946 -wd4986")
ELSE () ELSE ()
ADD_DEFINITIONS( "-Wall" ) ADD_DEFINITIONS( "-Wall" )
ADD_DEFINITIONS("-Wno-unknown-pragmas") ADD_DEFINITIONS("-Wno-unknown-pragmas")
@@ -170,6 +170,9 @@ ENDIF(WITH_FREENECT)
IF(WITH_FREENECT2) IF(WITH_FREENECT2)
FIND_PACKAGE(freenect2 QUIET) FIND_PACKAGE(freenect2 QUIET)
IF(freenect2_FOUND) IF(freenect2_FOUND)
IF(NOT freenect2_INCLUDE_DIRS)
SET(freenect2_INCLUDE_DIRS ${freenect2_INCLUDE_DIR})
ENDIF(NOT freenect2_INCLUDE_DIRS)
MESSAGE(STATUS "Found freenect2: ${freenect2_INCLUDE_DIRS}") MESSAGE(STATUS "Found freenect2: ${freenect2_INCLUDE_DIRS}")
ENDIF(freenect2_FOUND) ENDIF(freenect2_FOUND)
ENDIF(WITH_FREENECT2) ENDIF(WITH_FREENECT2)
corelib/src/Rtabmap.cpp
+1 -1
View File
@@ -1144,7 +1144,7 @@ bool Rtabmap::process(
iter!=statistics_.reducedIds().end(); iter!=statistics_.reducedIds().end();
++iter) ++iter)
{ {
int erased = _optimizedPoses.erase(iter->first); int erased = (int)_optimizedPoses.erase(iter->first);
if(erased) if(erased)
{ {
for(std::multimap<int, Link>::iterator jter = _constraints.begin(); jter!=_constraints.end();) for(std::multimap<int, Link>::iterator jter = _constraints.begin(); jter!=_constraints.end();)
guilib/src/DatabaseViewer.cpp
+2 -2
View File
@@ -1102,9 +1102,9 @@ void DatabaseViewer::updateIds()
//links //links
bool addPose = false; bool addPose = false;
for(std::map<int, Link>::iterator jter=links.find(ids_[i]); jter!=links.end() && jter->first == ids_[i]; ++jter) for(std::multimap<int, Link>::iterator jter=links.find(ids_[i]); jter!=links.end() && jter->first == ids_[i]; ++jter)
{ {
std::map<int, Link>::iterator invertedLinkIter = graph::findLink(links, jter->second.to(), jter->second.from(), false); std::multimap<int, Link>::iterator invertedLinkIter = graph::findLink(links, jter->second.to(), jter->second.from(), false);
if( jter->second.isValid() && // null transform means a rehearsed location if( jter->second.isValid() && // null transform means a rehearsed location
ids.find(jter->second.from()) != ids.end() && ids.find(jter->second.from()) != ids.end() &&
ids.find(jter->second.to()) != ids.end() && ids.find(jter->second.to()) != ids.end() &&
utilite/include/rtabmap/utilite/UStl.h
+2 -2
View File
@@ -614,10 +614,10 @@ inline bool uIsDigit(const char c)
*/ */
inline bool uIsInteger(const std::string & str) inline bool uIsInteger(const std::string & str)
{ {
bool isInteger = str.size(); bool isInteger = str.size()!=0;
for(unsigned int i=0; i<str.size() && isInteger; ++i) for(unsigned int i=0; i<str.size() && isInteger; ++i)
{ {
isInteger = isdigit(str[i]); isInteger = uIsDigit(str[i]);
} }
return isInteger; return isInteger;
} }