libsync: Replace inserting tuple into unordered_map in favour of pair. am: 380b2f4fea am: 3500cee3e1
am: 898f852d38
Change-Id: Ic05dbf0be2ccbb524d984b3bde26a6b70c05320a
Cr-Mirrored-From: https://chromium.googlesource.com/aosp/platform/system/core
Cr-Mirrored-Commit: e911d262dfe105cf990d95fed3e32862a91855a1
diff --git a/tests/sync_test.cpp b/tests/sync_test.cpp
index ff8a300..401aaee 100644
--- a/tests/sync_test.cpp
+++ b/tests/sync_test.cpp
@@ -536,7 +536,7 @@
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 @@
// 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.
