ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "libsync: Replace inserting tuple into unordered_map in favour of pair."

Browse source
This commit is contained in:
Treehugger Robot 2017-01-31 01:14:15 +00:00 • committed by Gerrit Code Review
commit 0617179c8c
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libsync/tests/sync_test.cpp
View file

@ -536,7 +536,7 @@ TEST_P(MergeStressTest, RandomMerge) {
ASSERT_TRUE(fence.isValid());
unordered_map<int, int> fenceMap;
fenceMap.insert(make_tuple(0, 0));
fenceMap.insert(make_pair(0, 0));
// Randomly create syncpoints out of a fixed set of timelines, and merge them together.
for (int i = 0; i < mergeCount; i++) {
@ -549,12 +549,12 @@ TEST_P(MergeStressTest, RandomMerge) {
// Keep track of the latest syncpoint in each timeline.
auto itr = fenceMap.find(timelineOffset);
if (itr == end(fenceMap)) {
fenceMap.insert(tie(timelineOffset, syncPoint));
fenceMap.insert(make_pair(timelineOffset, syncPoint));
}
else {
int oldSyncPoint = itr->second;
fenceMap.erase(itr);
fenceMap.insert(tie(timelineOffset, max(syncPoint, oldSyncPoint)));
fenceMap.insert(make_pair(timelineOffset, max(syncPoint, oldSyncPoint)));
}
// Merge.