12345qiupeng
/
gtsam
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Correcting warnings on windows

release/4.3a0
Andrew Melim 2014-11-24 13:31:47 -05:00
parent b76185cf5e
commit ce93030b00
4 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -95,6 +95,8 @@ if(MSVC)
add_definitions(-DBOOST_ALL_NO_LIB) add_definitions(-DBOOST_ALL_NO_LIB)
add_definitions(-DBOOST_ALL_DYN_LINK) add_definitions(-DBOOST_ALL_DYN_LINK)
endif() endif()
# Also disable certain warnings
add_definitions(/wd4503)
endif() endif()
find_package(Boost 1.43 COMPONENTS serialization system filesystem thread program_options date_time regex timer chrono) find_package(Boost 1.43 COMPONENTS serialization system filesystem thread program_options date_time regex timer chrono)

14
gtsam/3rdparty/metis-5.1.0/include/metis.h vendored
View File

@ -65,17 +65,29 @@
#ifndef _GKLIB_H_ #ifndef _GKLIB_H_
#ifdef COMPILER_MSC #ifdef COMPILER_MSC
#include <limits.h> #include <limits.h>
typedef __int32 int32_t; typedef __int32 int32_t;
typedef __int64 int64_t; typedef __int64 int64_t;
#define PRId32 "I32d" #define PRId32 "I32d"
#define PRId64 "I64d" #define PRId64 "I64d"
#define SCNd32 "ld" #define SCNd32 "ld"
#define SCNd64 "I64d" #define SCNd64 "I64d"
#ifndef INT32_MIN
#define INT32_MIN ((int32_t)_I32_MIN) #define INT32_MIN ((int32_t)_I32_MIN)
#endif
#ifndef INT32_MAX
#define INT32_MAX _I32_MAX #define INT32_MAX _I32_MAX
#endif
#ifndef INT64_MIN
#define INT64_MIN ((int64_t)_I64_MIN) #define INT64_MIN ((int64_t)_I64_MIN)
#endif
#ifndef INT64_MAX
#define INT64_MAX _I64_MAX #define INT64_MAX _I64_MAX
#endif
#else #else
#include <inttypes.h> #include <inttypes.h>
#endif #endif

4
gtsam/CMakeLists.txt
View File

@ -5,7 +5,7 @@ set (gtsam_subdirs
base base
geometry geometry
inference inference
symbolic symbolic
discrete discrete
linear linear
nonlinear nonlinear
@ -69,7 +69,7 @@ set(gtsam_srcs
${base_srcs} ${base_srcs}
${geometry_srcs} ${geometry_srcs}
${inference_srcs} ${inference_srcs}
${symbolic_srcs} ${symbolic_srcs}
${discrete_srcs} ${discrete_srcs}
${linear_srcs} ${linear_srcs}
${nonlinear_srcs} ${nonlinear_srcs}

2
gtsam/inference/MetisIndex-inl.h
View File

@ -78,7 +78,7 @@ void MetisIndex::augment(const FactorGraph<FACTOR>& factors)
// Insert each index's set in order by appending them to the end of adj_ // Insert each index's set in order by appending them to the end of adj_
adj_.insert(adj_.end(), temp.begin(), temp.end()); adj_.insert(adj_.end(), temp.begin(), temp.end());
//adj_.push_back(temp); //adj_.push_back(temp);
xadj_.push_back(adj_.size()); xadj_.push_back((idx_t)adj_.size());
} }
} }