undo deprecation in BayesTree until later

borglab · Jan 7, 2022 · 79cb4d0 · 79cb4d0
1 parent 3fe3a47
commit 79cb4d0
Showing 1 changed file with 2 additions and 7 deletions.
diff --git a/gtsam/inference/BayesTree.h b/gtsam/inference/BayesTree.h
@@ -72,7 +72,8 @@ namespace gtsam {
   public:
     typedef CLIQUE Clique; ///< The clique type, normally BayesTreeClique
     typedef boost::shared_ptr<Clique> sharedClique; ///< Shared pointer to a clique
-
+    typedef Clique Node; ///< Synonym for Clique (TODO: remove)
+    typedef sharedClique sharedNode; ///< Synonym for sharedClique (TODO: remove)
     typedef typename CLIQUE::ConditionalType ConditionalType;
     typedef boost::shared_ptr<ConditionalType> sharedConditional;
     typedef typename CLIQUE::BayesNetType BayesNetType;
@@ -268,12 +269,6 @@ namespace gtsam {
 
     /// @}
 
-#ifdef GTSAM_ALLOW_DEPRECATED_SINCE_V42
-  public:
-    typedef GTSAM_DEPRECATED Clique Node; ///< Synonym for Clique (TODO: remove)
-    typedef GTSAM_DEPRECATED sharedClique sharedNode; ///< Synonym for sharedClique (TODO: remove)
-#endif
-
   }; // BayesTree
 
   /* ************************************************************************* */