From 094fffeea79c11f425285d3910acc130ca7071eb Mon Sep 17 00:00:00 2001 From: Richard Roberts Date: Sun, 11 Aug 2013 00:56:50 +0000 Subject: [PATCH] Fixed compile errors on Linux --- gtsam/base/FastMap.h | 2 +- gtsam/base/FastSet.h | 2 +- gtsam/inference/BayesTree-inst.h | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gtsam/base/FastMap.h b/gtsam/base/FastMap.h index 656eb74fd..5015a77d8 100644 --- a/gtsam/base/FastMap.h +++ b/gtsam/base/FastMap.h @@ -59,7 +59,7 @@ public: } /** Handy 'exists' function */ - bool exists(const KEY& e) const { return find(e) != end(); } + bool exists(const KEY& e) const { return this->find(e) != this->end(); } private: /** Serialization function */ diff --git a/gtsam/base/FastSet.h b/gtsam/base/FastSet.h index fe4cc2c80..4c8227c22 100644 --- a/gtsam/base/FastSet.h +++ b/gtsam/base/FastSet.h @@ -92,7 +92,7 @@ public: } /** Handy 'exists' function */ - bool exists(const VALUE& e) const { return find(e) != end(); } + bool exists(const VALUE& e) const { return this->find(e) != this->end(); } /** Print to implement Testable */ void print(const std::string& str = "") const { FastSetTestableHelper::print(*this, str); } diff --git a/gtsam/inference/BayesTree-inst.h b/gtsam/inference/BayesTree-inst.h index 2e18723c2..4bbed8bf0 100644 --- a/gtsam/inference/BayesTree-inst.h +++ b/gtsam/inference/BayesTree-inst.h @@ -339,7 +339,7 @@ namespace gtsam { // Factor the shortcuts to be conditioned on the full root // Get the set of variables to eliminate, which is C1\B. gttic(Full_root_factoring); - boost::shared_ptr p_C1_B; { + boost::shared_ptr p_C1_B; { std::vector C1_minus_B; { FastSet C1_minus_B_set(C1->conditional()->beginParents(), C1->conditional()->endParents()); BOOST_FOREACH(const Index j, *B->conditional()) { @@ -351,7 +351,7 @@ namespace gtsam { boost::tie(p_C1_B, temp_remaining) = FactorGraphType(p_C1_Bred).eliminatePartialMultifrontal(Ordering(C1_minus_B), function); } - boost::shared_ptr p_C2_B; { + boost::shared_ptr p_C2_B; { std::vector C2_minus_B; { FastSet C2_minus_B_set(C2->conditional()->beginParents(), C2->conditional()->endParents()); BOOST_FOREACH(const Index j, *B->conditional()) {