From 4eeedd31fcaa6d83235ebac0238112bde5374767 Mon Sep 17 00:00:00 2001 From: Chris Beall Date: Thu, 28 Jan 2016 12:00:39 -0500 Subject: [PATCH 1/2] Fix GTSAM_ALLOW_DEPRECATED_SINCE_V4 flag typo --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9d543b87b..9bfa9a758 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -318,7 +318,7 @@ if(GTSAM_ENABLE_CONSISTENCY_CHECKS) add_definitions(-DGTSAM_EXTRA_CONSISTENCY_CHECKS) endif() -if(GTSAM_ENABLE_CONSISTENCY_CHECKS) +if(GTSAM_ALLOW_DEPRECATED_SINCE_V4) add_definitions(-DGTSAM_ALLOW_DEPRECATED_SINCE_V4) endif() From 56992899af64b385808ad11ea46fcaed1e9afe22 Mon Sep 17 00:00:00 2001 From: Chris Beall Date: Thu, 28 Jan 2016 12:35:57 -0500 Subject: [PATCH 2/2] fix trivial compiler error --- gtsam/geometry/Rot3.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gtsam/geometry/Rot3.h b/gtsam/geometry/Rot3.h index 5b7acb4be..264be1537 100644 --- a/gtsam/geometry/Rot3.h +++ b/gtsam/geometry/Rot3.h @@ -493,7 +493,7 @@ namespace gtsam { static Rot3 roll (double t) { return Roll(t); } 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) { - return Rot3::Quaternion q(w, x, y, z); + return Rot3::Quaternion(w, x, y, z); } /// @} #endif