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

View File

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

View File

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

View File

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

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_
adj_.insert(adj_.end(), temp.begin(), temp.end());
//adj_.push_back(temp);
xadj_.push_back(adj_.size());
xadj_.push_back((idx_t)adj_.size());
}
}