diff options
| author | Marius Kintel <marius@kintel.net> | 2013-06-18 06:16:20 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2013-06-18 06:16:20 (GMT) |
| commit | a0a49b0bc968179b3a1ff65c12cffceb942f538e (patch) | |
| tree | 67698026477492c47933a51303ab339a2d17158c /src/module.cc | |
| parent | f452c986e1639455c518daaa9213af2bb4b672cb (diff) | |
| parent | a126fa826c29b88a9edb3452e407de7f2e5a6c03 (diff) | |
Merge remote-tracking branch 'origin/issue181' into epec-kernel
Conflicts:
src/MainWindow.h
src/ModuleCache.cc
src/mainwin.cc
src/module.cc
src/module.h
src/parsersettings.cc
testdata/modulecache-tests/cascade.sh
testdata/modulecache-tests/cascade2.sh
Diffstat (limited to 'src/module.cc')
| -rw-r--r-- | src/module.cc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/module.cc b/src/module.cc index 8fb8506..9c0272d 100644 --- a/src/module.cc +++ b/src/module.cc @@ -264,6 +264,10 @@ bool FileModule::handleDependencies() // as it will have a relative path. // Iterating manually since we want to modify the container while iterating +<<<<<<< HEAD +======= + std::vector<std::pair<std::string, FileModule*> > modified_modules; +>>>>>>> origin/issue181 FileModule::ModuleContainer::iterator iter = this->usedlibs.begin(); while (iter != this->usedlibs.end()) { FileModule::ModuleContainer::iterator curr = iter++; @@ -293,6 +297,9 @@ bool FileModule::handleDependencies() } } } + BOOST_FOREACH(const FileModule::ModuleContainer::value_type &mod, modified_modules) { + this->usedlibs[mod.first] = mod.second; + } this->is_handling_dependencies = false; return changed; |