From 69428c50fb7ccb4526bec5b86c9bdc3c435ec2bd Mon Sep 17 00:00:00 2001
From: Richard Roberts <richard.jw.roberts@gmail.com>
Date: Mon, 2 Jan 2012 20:13:01 +0000
Subject: [PATCH] Removed 'typeof' that is not supported by matlab compiler

---
 gtsam/inference/FactorGraph-inl.h | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/gtsam/inference/FactorGraph-inl.h b/gtsam/inference/FactorGraph-inl.h
index 72c07f82a..9772cc790 100644
--- a/gtsam/inference/FactorGraph-inl.h
+++ b/gtsam/inference/FactorGraph-inl.h
@@ -29,8 +29,7 @@
 #include <boost/foreach.hpp>
 #include <boost/tuple/tuple.hpp>
 #include <boost/format.hpp>
-#include <boost/lambda/bind.hpp>
-#include <boost/lambda/lambda.hpp>
+#include <boost/bind.hpp>
 #include <boost/graph/prim_minimum_spanning_tree.hpp>
 #include <boost/iterator/transform_iterator.hpp>
 
@@ -108,16 +107,10 @@ namespace gtsam {
 	template<class DERIVED, class KEY>
 	typename DERIVED::shared_ptr Combine(const FactorGraph<DERIVED>& factors,
 			const FastMap<KEY, std::vector<KEY> >& variableSlots) {
-		typedef const FastMap<KEY, std::vector<KEY> > VariableSlots;
-		typedef typeof(boost::lambda::bind(&VariableSlots::value_type::first, boost::lambda::_1))
-				FirstGetter;
-		typedef boost::transform_iterator<FirstGetter,
-				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));
+		typedef const pair<const KEY, std::vector<KEY> > KeySlotPair;
+		return typename DERIVED::shared_ptr(new DERIVED(
+		    boost::make_transform_iterator(variableSlots.begin(), boost::bind(&KeySlotPair::first, _1)),
+		    boost::make_transform_iterator(variableSlots.end(), boost::bind(&KeySlotPair::first, _1))));
 	}
 
   /* ************************************************************************* */