Merge branch 'master' into boost_filesystem

Conflicts:
	boost.pri
	src/lexer.l
	tests/CMakeLists.txt

1 files changed, 9 insertions, 6 deletions

diff --git a/src/parser.y b/src/parser.y
index df652f5..1c4a784 100644
--- a/src/parser.y
+++ b/src/parser.y
@@ -586,12 +586,15 @@ AbstractModule *parse(const char *text, const char *path, int debug)
 	if (!module)
 		return NULL;
 
-        BOOST_FOREACH(Module::ModuleContainer::value_type &m, module->usedlibs) {
-		module->usedlibs[m.first] = Module::compile_library(m.first);
-		if (!module->usedlibs[m.first]) {
-			PRINTF("WARNING: Failed to compile library `%s'.", m.first.c_str());
-			module->usedlibs.erase(m.first);
-		}
+        // Iterating manually since we want to modify the container while iterating
+        Module::ModuleContainer::iterator iter = module->usedlibs.begin();
+        while (iter != module->usedlibs.end()) {
+          Module::ModuleContainer::iterator curr = iter++;
+          curr->second = Module::compile_library(curr->first);
+          if (!curr->second) {
+            PRINTF("WARNING: Failed to compile library `%s'.", curr->first.c_str());
+            module->usedlibs.erase(curr);
+          }
 	}
 
 	parser_error_pos = -1;