From f01883b08b9399be07c029ba9996270b86c83935 Mon Sep 17 00:00:00 2001 From: Alex Cunningham Date: Thu, 15 Aug 2013 14:40:01 +0000 Subject: [PATCH] With Richard: changing from "unsafe_erase" to "erase" --- gtsam/inference/BayesTree-inst.h | 4 ++-- gtsam/nonlinear/ISAM2-impl.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gtsam/inference/BayesTree-inst.h b/gtsam/inference/BayesTree-inst.h index ce8f67a1f..4bbed8bf0 100644 --- a/gtsam/inference/BayesTree-inst.h +++ b/gtsam/inference/BayesTree-inst.h @@ -416,7 +416,7 @@ namespace gtsam { child->parent_ = typename Clique::weak_ptr(); BOOST_FOREACH(Key j, clique->conditional()->frontals()) { - nodes_.unsafe_erase(j); + nodes_.erase(j); } } @@ -495,7 +495,7 @@ namespace gtsam { // Remove this node from the nodes index BOOST_FOREACH(Key j, (*clique)->conditional()->frontals()) { - nodes_.unsafe_erase(j); } + nodes_.erase(j); } // Erase the parent and children pointers (*clique)->parent_.reset(); diff --git a/gtsam/nonlinear/ISAM2-impl.cpp b/gtsam/nonlinear/ISAM2-impl.cpp index 6325fae03..087acdee9 100644 --- a/gtsam/nonlinear/ISAM2-impl.cpp +++ b/gtsam/nonlinear/ISAM2-impl.cpp @@ -55,7 +55,7 @@ void ISAM2::Impl::RemoveVariables(const FastSet& unusedKeys, const std::vec deltaNewton.erase(key); RgProd.erase(key); replacedKeys.erase(key); - nodes.unsafe_erase(key); + nodes.erase(key); theta.erase(key); fixedVariables.erase(key); }