From 5c37845c75c521050c51efbdea88c37fc69256b7 Mon Sep 17 00:00:00 2001 From: Chris Beall Date: Tue, 13 Aug 2013 04:01:23 +0000 Subject: [PATCH] minor fix for Mac/Clang --- gtsam/inference/FactorGraph.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/gtsam/inference/FactorGraph.h b/gtsam/inference/FactorGraph.h index 03b930241..0af0eb6b9 100644 --- a/gtsam/inference/FactorGraph.h +++ b/gtsam/inference/FactorGraph.h @@ -150,7 +150,7 @@ namespace gtsam { /** Add a factor directly using a shared_ptr */ template - typename boost::enable_if>::type + typename boost::enable_if >::type push_back(boost::shared_ptr factor) { factors_.push_back(boost::shared_ptr(factor)); } @@ -160,13 +160,13 @@ namespace gtsam { /** push back many factors with an iterator over shared_ptr (factors are not copied) */ template - typename boost::enable_if>::type + typename boost::enable_if >::type push_back(ITERATOR firstFactor, ITERATOR lastFactor) { factors_.insert(end(), firstFactor, lastFactor); } /** push back many factors as shared_ptr's in a container (factors are not copied) */ template - typename boost::enable_if>::type + typename boost::enable_if >::type push_back(const CONTAINER& container) { push_back(container.begin(), container.end()); } @@ -174,7 +174,7 @@ namespace gtsam { /** push back a BayesTree as a collection of factors. NOTE: This should be hidden in derived * classes in favor of a type-specialized version that calls this templated function. */ template - typename boost::enable_if>::type + typename boost::enable_if >::type push_back(const BayesTree& bayesTree) { bayesTree.addFactorsToGraph(*this); } @@ -233,13 +233,13 @@ namespace gtsam { /** Add a factor by value, will be copy-constructed (use push_back with a shared_ptr to avoid * the copy). */ template - typename boost::enable_if>::type + typename boost::enable_if >::type push_back(const DERIVEDFACTOR& factor) { factors_.push_back(boost::make_shared(factor)); } /** push back many factors with an iterator over plain factors (factors are copied) */ template - typename boost::enable_if>::type + typename boost::enable_if >::type push_back(ITERATOR firstFactor, ITERATOR lastFactor) { for(ITERATOR f = firstFactor; f != lastFactor; ++f) push_back(*f); @@ -247,7 +247,7 @@ namespace gtsam { /** push back many factors as non-pointer objects in a container (factors are copied) */ template - typename boost::enable_if>::type + typename boost::enable_if >::type push_back(const CONTAINER& container) { push_back(container.begin(), container.end()); }