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

Merged in fix/deprecated-flag (pull request #210) 

Fix GTSAM_ALLOW_DEPRECATED_SINCE_V4 flag typo
release/4.3a0
Chris Beall 2016-01-28 14:24:54 -05:00
parent 7f82df21b7 56992899af
commit 4a0dc5e23b
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -318,7 +318,7 @@ if(GTSAM_ENABLE_CONSISTENCY_CHECKS)
add_definitions(-DGTSAM_EXTRA_CONSISTENCY_CHECKS) add_definitions(-DGTSAM_EXTRA_CONSISTENCY_CHECKS)
endif() endif()
if(GTSAM_ENABLE_CONSISTENCY_CHECKS) if(GTSAM_ALLOW_DEPRECATED_SINCE_V4)
add_definitions(-DGTSAM_ALLOW_DEPRECATED_SINCE_V4) add_definitions(-DGTSAM_ALLOW_DEPRECATED_SINCE_V4)
endif() endif()

2
gtsam/geometry/Rot3.h
View File

@ -493,7 +493,7 @@ namespace gtsam {
static Rot3 roll (double t) { return Roll(t); } static Rot3 roll (double t) { return Roll(t); }
static Rot3 ypr(double y, double p, double r) { return Ypr(r,p,y);} static Rot3 ypr(double y, double p, double r) { return Ypr(r,p,y);}
static Rot3 quaternion(double w, double x, double y, double z) { static Rot3 quaternion(double w, double x, double y, double z) {
return Rot3::Quaternion q(w, x, y, z); return Rot3::Quaternion(w, x, y, z);
} }
/// @} /// @}
#endif #endif