From fbfdb66bcb54f4ce004dd3ec61411d61116392e7 Mon Sep 17 00:00:00 2001 From: Nathan Date: Tue, 18 Mar 2025 03:13:13 -0500 Subject: [PATCH] stop using find. --- src/App.cpp | 37 +++++++++++++++---------------------- 1 file changed, 15 insertions(+), 22 deletions(-) diff --git a/src/App.cpp b/src/App.cpp index c42ddbf..16576ad 100644 --- a/src/App.cpp +++ b/src/App.cpp @@ -48,35 +48,28 @@ bool App::load(std::string lib, std::list blacklist = {}) { Module* m = create(h, App::Get()); - if(!blacklist.empty()) { - std::cout << "second round!\n"; - for(auto it = blacklist.begin(); it != blacklist.end(); it++) { - if(*it == m->getName()) { - std::cout << "Module \"" << *it << "\" is already loaded!\n"; - delete m; - dlclose(h); - return false; - } + for(auto it = blacklist.begin(); it != blacklist.end(); it++) { + if(*it == m->getName()) { + std::cout << "Module \"" << *it << "\" is already loaded!\n"; + delete m; + dlclose(h); + return false; } - std::cout << "not the for loop!\n"; } blacklist.push_back(m->getName()); - if(!m->deps.empty()) { - bool skip = false; + bool skip = false; + for(auto it = m->deps.begin(); it != m->deps.end(); it++) { for(std::string s : blacklist) { - auto it = m->deps.find(s); - if(it != m->deps.end()) + if(it->first == s) skip = true; - if(skip) { - skip = false; - continue; - } else { - std::cout << "it->second: " << it->second << std::endl; - load(it->second, blacklist); - std::cout << "Gets passed load deps!\n"; - } + } + if(skip) { + skip = false; + continue; + } else { + load(it->second, blacklist); } }