github_mirrors/vectorscan
3
0
Fork 1
mirror of https://github.com/VectorCamp/vectorscan.git synced 2025-09-29 19:24:25 +03:00
Code Issues Packages Projects Releases Wiki Activity

container: allow sort_and_unique to have a comparator

Browse Source
This commit is contained in:
Justin Viiret
2017-02-16 11:03:05 +11:00
committed by Matthew Barr
parent cea8f452f2
commit dc50ab291b
2 changed files with 12 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/rose/rose_build_bytecode.cpp
View File

@@ -3658,13 +3658,11 @@ void makeRoleInfixTriggers(RoseBuildImpl &build, build_context &bc,
}
// Order, de-dupe and add instructions to the end of program.
sort(begin(infix_program), end(infix_program),
[](const RoseInstrTriggerInfix &a, const RoseInstrTriggerInfix &b) {
return tie(a.cancel, a.queue, a.event) <
tie(b.cancel, b.queue, b.event);
});
infix_program.erase(unique(begin(infix_program), end(infix_program)),
end(infix_program));
sort_and_unique(infix_program, [](const RoseInstrTriggerInfix &a,
const RoseInstrTriggerInfix &b) {
return tie(a.cancel, a.queue, a.event) <
tie(b.cancel, b.queue, b.event);
});
for (const auto &ri : infix_program) {
program.add_before_end(make_unique<RoseInstrTriggerInfix>(ri));
}
@@ -4163,13 +4161,10 @@ void makePushDelayedInstructions(const RoseBuildImpl &build,
}
}
sort(begin(delay_instructions), end(delay_instructions),
[](const RoseInstrPushDelayed &a, const RoseInstrPushDelayed &b) {
return tie(a.delay, a.index) < tie(b.delay, b.index);
});
delay_instructions.erase(
unique(begin(delay_instructions), end(delay_instructions)),
end(delay_instructions));
sort_and_unique(delay_instructions, [](const RoseInstrPushDelayed &a,
const RoseInstrPushDelayed &b) {
return tie(a.delay, a.index) < tie(b.delay, b.index);
});
for (const auto &ri : delay_instructions) {
program.add_before_end(make_unique<RoseInstrPushDelayed>(ri));