Username404-59
/
Yerbacon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix the pairs returned by the futures of the Units set

This commit is contained in:
Username404 2021-09-26 12:38:33 +02:00
parent 700ab109d2
commit 43b4629a6d
Signed by: Username404-59
GPG Key ID: 7AB361FBB257A5D1
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main.cpp
View File

@ -42,10 +42,10 @@ int main(int argc, char* argv[]) {
vector<future<pair<string, optional<Yerbacon::Exception>>>> Units; vector<future<pair<string, optional<Yerbacon::Exception>>>> Units;
const launch& Policy = not parallel ? launch::deferred : launch::async; const launch& Policy = not parallel ? launch::deferred : launch::async;
for (const string_view& fileName: files) { for (const string_view& fileName: files) {
pair<string, optional<Yerbacon::Exception>> returnedPair; Units.push_back(async(Policy, [&fileName, &compile]() {
Units.push_back(async(Policy, [&returnedPair, &fileName, &compile]() { pair<string, optional<Yerbacon::Exception>> resultingPair;
try { try {
returnedPair.first = compile(fileName); resultingPair.first = compile(fileName);
} catch (const Yerbacon::Exception& e) { } catch (const Yerbacon::Exception& e) {
unsigned long lastSlash = 0; unsigned long lastSlash = 0;
unsigned long position1 = fileName.find_last_of('/'); unsigned long position1 = fileName.find_last_of('/');
@ -59,10 +59,10 @@ int main(int argc, char* argv[]) {
} }
#endif #endif
} }
returnedPair.first = fileName.substr(lastSlash + 1); resultingPair.first = fileName.substr(lastSlash + 1);
returnedPair.second.emplace(e); resultingPair.second.emplace(e);
} }
return move(returnedPair); return resultingPair;
})); }));
} }
if (printResult) cout << "~~~~[Yerbacon compilation result]~~~~\n\n"; if (printResult) cout << "~~~~[Yerbacon compilation result]~~~~\n\n";