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

Merge pull request #70 from jlblancoc/fix_msvc 

Fix MSVC build errors
release/4.3a0
Jose Luis Blanco-Claraco 2019-06-15 21:45:45 +02:00 committed by GitHub
parent 6d8ef99215 89f8f50194
commit 391d8b9e15
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -527,7 +527,7 @@ if(GTSAM_UNSTABLE_AVAILABLE)
print_config_flag(${GTSAM_BUILD_UNSTABLE} "Build libgtsam_unstable ") print_config_flag(${GTSAM_BUILD_UNSTABLE} "Build libgtsam_unstable ")
endif() endif()
string(TOUPPER "${CMAKE_BUILD_TYPE}" cmake_build_type_toupper) string(TOUPPER "${CMAKE_BUILD_TYPE}" cmake_build_type_toupper)
print_config_flag(${GTSAM_BUILD_WITH_MARCH_NATIVE} "Build for native architecture ") print_config_flag("${GTSAM_BUILD_WITH_MARCH_NATIVE}" "Build for native architecture ")
if(NOT MSVC AND NOT XCODE_VERSION) if(NOT MSVC AND NOT XCODE_VERSION)
message(STATUS " Build type : ${CMAKE_BUILD_TYPE}") message(STATUS " Build type : ${CMAKE_BUILD_TYPE}")
message(STATUS " C compilation flags : ${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_${cmake_build_type_toupper}}") message(STATUS " C compilation flags : ${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_${cmake_build_type_toupper}}")

4
gtsam/navigation/CombinedImuFactor.h
View File

@ -64,7 +64,7 @@ typedef ManifoldPreintegration PreintegrationType;
* *
* @addtogroup SLAM * @addtogroup SLAM
*/ */
class PreintegratedCombinedMeasurements : public PreintegrationType { class GTSAM_EXPORT PreintegratedCombinedMeasurements : public PreintegrationType {
public: public:
@ -222,7 +222,7 @@ public:
* *
* @addtogroup SLAM * @addtogroup SLAM
*/ */
class CombinedImuFactor: public NoiseModelFactor6<Pose3, Vector3, Pose3, class GTSAM_EXPORT CombinedImuFactor: public NoiseModelFactor6<Pose3, Vector3, Pose3,
Vector3, imuBias::ConstantBias, imuBias::ConstantBias> { Vector3, imuBias::ConstantBias, imuBias::ConstantBias> {
public: public:

4
gtsam/nonlinear/Values-inl.h
View File

@ -145,13 +145,13 @@ namespace gtsam {
boost::make_filter_iterator(filter, boost::make_filter_iterator(filter,
((const Values&) values).begin(), ((const Values&) values).begin(),
((const Values&) values).end()), ((const Values&) values).end()),
&ValuesCastHelper<const ValueType, ConstKeyValuePair, &ValuesCastHelper<ValueType, ConstKeyValuePair,
Values::ConstKeyValuePair>::cast)), constEnd_( Values::ConstKeyValuePair>::cast)), constEnd_(
boost::make_transform_iterator( boost::make_transform_iterator(
boost::make_filter_iterator(filter, boost::make_filter_iterator(filter,
((const Values&) values).end(), ((const Values&) values).end(),
((const Values&) values).end()), ((const Values&) values).end()),
&ValuesCastHelper<const ValueType, ConstKeyValuePair, &ValuesCastHelper<ValueType, ConstKeyValuePair,
Values::ConstKeyValuePair>::cast)) { Values::ConstKeyValuePair>::cast)) {
} }