From 19928a9f3756f77eb220304cef87a8b85c4a3b21 Mon Sep 17 00:00:00 2001 From: Alex Cunningham Date: Fri, 3 Dec 2010 14:28:25 +0000 Subject: [PATCH] Fixed compile bug due to typename keyword appearing outside of templates --- gtsam/inference/IndexFactor.cpp | 4 ++-- gtsam/inference/IndexFactor.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gtsam/inference/IndexFactor.cpp b/gtsam/inference/IndexFactor.cpp index 91af3dc6e..999b82627 100644 --- a/gtsam/inference/IndexFactor.cpp +++ b/gtsam/inference/IndexFactor.cpp @@ -28,9 +28,9 @@ template class FactorBase; IndexFactor::IndexFactor(const IndexConditional& c) : Base(static_cast(c)) {} -pair::shared_ptr, IndexFactor::shared_ptr> IndexFactor::CombineAndEliminate( +pair::shared_ptr, IndexFactor::shared_ptr> IndexFactor::CombineAndEliminate( const FactorGraph& factors, size_t nrFrontals) { - pair::shared_ptr, shared_ptr> result; + pair::shared_ptr, shared_ptr> result; result.second = Combine(factors, VariableSlots(factors)); result.first = result.second->eliminate(nrFrontals); return result; diff --git a/gtsam/inference/IndexFactor.h b/gtsam/inference/IndexFactor.h index 4f3366a8c..a0dd4c6bb 100644 --- a/gtsam/inference/IndexFactor.h +++ b/gtsam/inference/IndexFactor.h @@ -65,7 +65,7 @@ public: /** * Combine and eliminate several factors. */ - static std::pair::shared_ptr, shared_ptr> CombineAndEliminate( + static std::pair::shared_ptr, shared_ptr> CombineAndEliminate( const FactorGraph& factors, size_t nrFrontals=1); /** Create a combined joint factor (new style for EliminationTree). */