From 7ee1c48ce5aa69fed105940d6604cd1577281987 Mon Sep 17 00:00:00 2001 From: Richard Roberts Date: Tue, 13 Aug 2013 03:13:14 +0000 Subject: [PATCH] Fixed some compile errors with older boost --- gtsam/inference/BayesTree.cpp | 1 + gtsam/inference/FactorGraph.h | 2 +- gtsam/linear/JacobianFactor-inl.h | 1 + gtsam/nonlinear/ISAM2-impl.cpp | 1 - gtsam/nonlinear/ISAM2.cpp | 1 - 5 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gtsam/inference/BayesTree.cpp b/gtsam/inference/BayesTree.cpp index 53a91ebc2..6d6a4a4d3 100644 --- a/gtsam/inference/BayesTree.cpp +++ b/gtsam/inference/BayesTree.cpp @@ -21,6 +21,7 @@ #include #include +#include namespace gtsam { diff --git a/gtsam/inference/FactorGraph.h b/gtsam/inference/FactorGraph.h index 672fbdaef..4f1c73dcb 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 std::enable_if::value>::type - push_back(boost::shared_ptr& factor) { + push_back(boost::shared_ptr factor) { factors_.push_back(boost::shared_ptr(factor)); } /** Add a factor directly using a shared_ptr */ diff --git a/gtsam/linear/JacobianFactor-inl.h b/gtsam/linear/JacobianFactor-inl.h index d703cde9f..76dea1989 100644 --- a/gtsam/linear/JacobianFactor-inl.h +++ b/gtsam/linear/JacobianFactor-inl.h @@ -21,6 +21,7 @@ #include #include #include +#include #include namespace gtsam { diff --git a/gtsam/nonlinear/ISAM2-impl.cpp b/gtsam/nonlinear/ISAM2-impl.cpp index 92f6425dc..087acdee9 100644 --- a/gtsam/nonlinear/ISAM2-impl.cpp +++ b/gtsam/nonlinear/ISAM2-impl.cpp @@ -21,7 +21,6 @@ #include #include #include -#include using namespace std; diff --git a/gtsam/nonlinear/ISAM2.cpp b/gtsam/nonlinear/ISAM2.cpp index 380b6c87f..68d6870cd 100644 --- a/gtsam/nonlinear/ISAM2.cpp +++ b/gtsam/nonlinear/ISAM2.cpp @@ -19,7 +19,6 @@ #include // for operator += using namespace boost::assign; #include -#include #include namespace br { using namespace boost::range; using namespace boost::adaptors; }