Fixed some compile errors with older boost

release/4.3a0
Richard Roberts 2013-08-13 03:13:14 +00:00
parent 5d0f8399ed
commit 7ee1c48ce5
5 changed files with 3 additions and 3 deletions

View File

@ -21,6 +21,7 @@
#include <gtsam/inference/BayesTree.h> #include <gtsam/inference/BayesTree.h>
#include <boost/foreach.hpp> #include <boost/foreach.hpp>
#include <iostream>
namespace gtsam { namespace gtsam {

View File

@ -150,7 +150,7 @@ namespace gtsam {
/** Add a factor directly using a shared_ptr */ /** Add a factor directly using a shared_ptr */
template<class DERIVEDFACTOR> template<class DERIVEDFACTOR>
typename std::enable_if<std::is_base_of<FactorType, DERIVEDFACTOR>::value>::type typename std::enable_if<std::is_base_of<FactorType, DERIVEDFACTOR>::value>::type
push_back(boost::shared_ptr<DERIVEDFACTOR>& factor) { push_back(boost::shared_ptr<DERIVEDFACTOR> factor) {
factors_.push_back(boost::shared_ptr<FACTOR>(factor)); } factors_.push_back(boost::shared_ptr<FACTOR>(factor)); }
/** Add a factor directly using a shared_ptr */ /** Add a factor directly using a shared_ptr */

View File

@ -21,6 +21,7 @@
#include <gtsam/linear/linearExceptions.h> #include <gtsam/linear/linearExceptions.h>
#include <boost/range/adaptor/transformed.hpp> #include <boost/range/adaptor/transformed.hpp>
#include <boost/range/join.hpp> #include <boost/range/join.hpp>
#include <boost/range/algorithm/copy.hpp>
#include <boost/foreach.hpp> #include <boost/foreach.hpp>
namespace gtsam { namespace gtsam {

View File

@ -21,7 +21,6 @@
#include <gtsam/base/debug.h> #include <gtsam/base/debug.h>
#include <functional> #include <functional>
#include <boost/range/adaptors.hpp> #include <boost/range/adaptors.hpp>
#include <boost/range/algorithm.hpp>
using namespace std; using namespace std;

View File

@ -19,7 +19,6 @@
#include <boost/assign/std/list.hpp> // for operator += #include <boost/assign/std/list.hpp> // for operator +=
using namespace boost::assign; using namespace boost::assign;
#include <boost/range/adaptors.hpp> #include <boost/range/adaptors.hpp>
#include <boost/range/algorithm.hpp>
#include <boost/algorithm/string.hpp> #include <boost/algorithm/string.hpp>
namespace br { using namespace boost::range; using namespace boost::adaptors; } namespace br { using namespace boost::range; using namespace boost::adaptors; }