12345qiupeng
/
gtsam
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed 'typeof' that is not supported by matlab compiler

release/4.3a0
Richard Roberts 2012-01-02 20:13:01 +00:00
parent 30508264d5
commit 69428c50fb
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
gtsam/inference/FactorGraph-inl.h
View File

@ -29,8 +29,7 @@
#include <boost/foreach.hpp> #include <boost/foreach.hpp>
#include <boost/tuple/tuple.hpp> #include <boost/tuple/tuple.hpp>
#include <boost/format.hpp> #include <boost/format.hpp>
#include <boost/lambda/bind.hpp> #include <boost/bind.hpp>
#include <boost/lambda/lambda.hpp>
#include <boost/graph/prim_minimum_spanning_tree.hpp> #include <boost/graph/prim_minimum_spanning_tree.hpp>
#include <boost/iterator/transform_iterator.hpp> #include <boost/iterator/transform_iterator.hpp>
@ -108,16 +107,10 @@ namespace gtsam {
template<class DERIVED, class KEY> template<class DERIVED, class KEY>
typename DERIVED::shared_ptr Combine(const FactorGraph<DERIVED>& factors, typename DERIVED::shared_ptr Combine(const FactorGraph<DERIVED>& factors,
const FastMap<KEY, std::vector<KEY> >& variableSlots) { const FastMap<KEY, std::vector<KEY> >& variableSlots) {
typedef const FastMap<KEY, std::vector<KEY> > VariableSlots; typedef const pair<const KEY, std::vector<KEY> > KeySlotPair;
typedef typeof(boost::lambda::bind(&VariableSlots::value_type::first, boost::lambda::_1)) return typename DERIVED::shared_ptr(new DERIVED(
FirstGetter; boost::make_transform_iterator(variableSlots.begin(), boost::bind(&KeySlotPair::first, _1)),
typedef boost::transform_iterator<FirstGetter, boost::make_transform_iterator(variableSlots.end(), boost::bind(&KeySlotPair::first, _1))));
typename VariableSlots::const_iterator, KEY, KEY> IndexIterator;
FirstGetter firstGetter(boost::lambda::bind(
&VariableSlots::value_type::first, boost::lambda::_1));
IndexIterator keysBegin(variableSlots.begin(), firstGetter);
IndexIterator keysEnd(variableSlots.end(), firstGetter);
return typename DERIVED::shared_ptr(new DERIVED(keysBegin, keysEnd));
} }
/* ************************************************************************* */ /* ************************************************************************* */