Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Fix MSVC build errors #70

Merged
merged 3 commits into from
Jun 15, 2019
Merged

Fix MSVC build errors #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0fc812f
Missing DLL export macros
jlblancoc Jun 15, 2019
bf20ec9
cmake: fix unset variable for MSVC
jlblancoc Jun 15, 2019
89f8f50
T made non-const for MSVC2017 to build
jlblancoc Jun 15, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -527,7 +527,7 @@ if(GTSAM_UNSTABLE_AVAILABLE)
print_config_flag(${GTSAM_BUILD_UNSTABLE} "Build libgtsam_unstable ")
endif()
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)
message(STATUS " Build type : ${CMAKE_BUILD_TYPE}")
message(STATUS " C compilation flags : ${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_${cmake_build_type_toupper}}")
Expand Down
4 changes: 2 additions & 2 deletions gtsam/navigation/CombinedImuFactor.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ typedef ManifoldPreintegration PreintegrationType;
*
* @addtogroup SLAM
*/
class PreintegratedCombinedMeasurements : public PreintegrationType {
class GTSAM_EXPORT PreintegratedCombinedMeasurements : public PreintegrationType {

public:

Expand Down Expand Up @@ -222,7 +222,7 @@ class PreintegratedCombinedMeasurements : public PreintegrationType {
*
* @addtogroup SLAM
*/
class CombinedImuFactor: public NoiseModelFactor6<Pose3, Vector3, Pose3,
class GTSAM_EXPORT CombinedImuFactor: public NoiseModelFactor6<Pose3, Vector3, Pose3,
Vector3, imuBias::ConstantBias, imuBias::ConstantBias> {
public:

Expand Down
4 changes: 2 additions & 2 deletions gtsam/nonlinear/Values-inl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,13 +145,13 @@ namespace gtsam {
boost::make_filter_iterator(filter,
((const Values&) values).begin(),
((const Values&) values).end()),
&ValuesCastHelper<const ValueType, ConstKeyValuePair,
&ValuesCastHelper<ValueType, ConstKeyValuePair,
Values::ConstKeyValuePair>::cast)), constEnd_(
boost::make_transform_iterator(
boost::make_filter_iterator(filter,
((const Values&) values).end(),
((const Values&) values).end()),
&ValuesCastHelper<const ValueType, ConstKeyValuePair,
&ValuesCastHelper<ValueType, ConstKeyValuePair,
Values::ConstKeyValuePair>::cast)) {
}

Expand Down