From 50bf3956c88ee6341d0023a421d502d604e3da4f Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Sun, 16 Aug 2020 09:16:04 +0200 Subject: Redo modules map as vector --- libbuild2/file.cxx | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'libbuild2/file.cxx') diff --git a/libbuild2/file.cxx b/libbuild2/file.cxx index 81fca32..171d136 100644 --- a/libbuild2/file.cxx +++ b/libbuild2/file.cxx @@ -1448,20 +1448,16 @@ namespace build2 // Finish off initializing bootstrapped modules. // - for (auto& p: root.root_extra->modules) + for (auto& s: root.root_extra->modules) { - module_state& s (p.second); - if (s.boot && s.first) - init_module (root, root, p.first, s.loc); + init_module (root, root, s.name, s.loc); } - for (auto& p: root.root_extra->modules) + for (auto& s: root.root_extra->modules) { - module_state& s (p.second); - if (s.boot && !s.first) - init_module (root, root, p.first, s.loc); + init_module (root, root, s.name, s.loc); } // Load hooks and root.build. -- cgit v1.1