Added more GTSAM_DEPRECATED directives

borglab · Jan 3, 2022 · cf50d10 · cf50d10
1 parent 754d036
commit cf50d10
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/gtsam/geometry/Cal3.h b/gtsam/geometry/Cal3.h
@@ -172,7 +172,7 @@ class GTSAM_EXPORT Cal3 {
 
 #ifdef GTSAM_ALLOW_DEPRECATED_SINCE_V42
   /** @deprecated The following function has been deprecated, use K above */
-  Matrix3 matrix() const { return K(); }
+  Matrix3 GTSAM_DEPRECATED matrix() const { return K(); }
 #endif
 
   /// Return inverted calibration matrix inv(K)

diff --git a/gtsam/geometry/Cal3Bundler.h b/gtsam/geometry/Cal3Bundler.h
@@ -99,10 +99,10 @@ class GTSAM_EXPORT Cal3Bundler : public Cal3 {
 
 #ifdef GTSAM_ALLOW_DEPRECATED_SINCE_V42
   /// get parameter u0
-  inline double u0() const { return u0_; }
+  inline double GTSAM_DEPRECATED u0() const { return u0_; }
 
   /// get parameter v0
-  inline double v0() const { return v0_; }
+  inline double GTSAM_DEPRECATED v0() const { return v0_; }
 #endif
 
   /**

diff --git a/gtsam/geometry/SimpleCamera.cpp b/gtsam/geometry/SimpleCamera.cpp
@@ -22,7 +22,7 @@
 namespace gtsam {
 
 #ifdef GTSAM_ALLOW_DEPRECATED_SINCE_V42
-  SimpleCamera simpleCamera(const Matrix34& P) {
+  SimpleCamera GTSAM_DEPRECATED simpleCamera(const Matrix34& P) {
 
     // P = [A|a] = s K cRw [I|-T], with s the unknown scale
     Matrix3 A = P.topLeftCorner(3, 3);

diff --git a/gtsam/linear/GaussianConditional.cpp b/gtsam/linear/GaussianConditional.cpp
@@ -194,7 +194,8 @@ namespace gtsam {
 
   /* ************************************************************************* */
 #ifdef GTSAM_ALLOW_DEPRECATED_SINCE_V42
-  void GaussianConditional::scaleFrontalsBySigma(VectorValues& gy) const {
+  void GTSAM_DEPRECATED
+  GaussianConditional::scaleFrontalsBySigma(VectorValues& gy) const {
     DenseIndex vectorPosition = 0;
     for (const_iterator frontal = beginFrontals(); frontal != endFrontals(); ++frontal) {
       gy[*frontal].array() *= model_->sigmas().segment(vectorPosition, getDim(frontal)).array();