Use native for instead BOOST_FOREACH

2 files changed, 4 insertions, 6 deletions

diff --git a/project2/common/variables/literal.cpp b/project2/common/variables/literal.cpp
index 3696346..529be6e 100644
--- a/project2/common/variables/literal.cpp
+++ b/project2/common/variables/literal.cpp
@@ -1,6 +1,5 @@
 #include "literal.h"
 #include "../scripts.h"
-#include <boost/foreach.hpp>
 #include <boost/bind.hpp>
 
 /// Variable implementation whose value is a literal value of some known type
@@ -38,7 +37,7 @@ VariableLiteral::value(ExecContext * ec) const
 		return vals.front()->value(ec);
 	}
 	Glib::ustring v;
-	BOOST_FOREACH(PartCPtr p, vals) {
+	for (PartCPtr p : vals) {
 		p->appendTo(ec, v);
 	}
 	return v;
diff --git a/project2/common/variables/lookup.cpp b/project2/common/variables/lookup.cpp
index b3f9002..c90ce46 100644
--- a/project2/common/variables/lookup.cpp
+++ b/project2/common/variables/lookup.cpp
@@ -4,7 +4,6 @@
 #include "../logger.h"
 #include "../rowProcessor.h"
 #include "../rowSet.h"
-#include <boost/foreach.hpp>
 #include "../scriptLoader.h"
 #include "../scriptStorage.h"
 
@@ -44,7 +43,7 @@ class VariableLookup : public VariableImplDyn, public RowProcessor {
 			}
 			Key k;
 			k.reserve(parameters.size());
-			BOOST_FOREACH(const Parameters::value_type & p, parameters) {
+			for (const Parameters::value_type & p : parameters) {
 				k.push_back(p.second(ec));
 			}
 			return safeMapLookup<NotFound>(map, k);
@@ -52,7 +51,7 @@ class VariableLookup : public VariableImplDyn, public RowProcessor {
 	private:
 		void fillCache(ExecContext * ec) const
 		{
-			BOOST_FOREACH(const RowSets::value_type & rs, rowSets) {
+			for (const RowSets::value_type & rs : rowSets) {
 				rs->execute(filter, boost::bind(&VariableLookup::rowReady, this, _1, ec), ec);
 			}
 			Logger()->messagef(LOG_DEBUG, "%s: %s has filled cached with %zu items",
@@ -61,7 +60,7 @@ class VariableLookup : public VariableImplDyn, public RowProcessor {
 		void rowReady(const RowState * rs, ExecContext * ec) const
 		{
 			Key k;
-			BOOST_FOREACH(const Parameters::value_type & p, parameters) {
+			for (const Parameters::value_type & p : parameters) {
 				k.push_back(rs->getCurrentValue(ec, p.first));
 			}
 			map[k] = rs->getCurrentValue(ec, name);