commit 43b2afe1a4f79aa8ada8a433169869e21c9231c5
author mtezych <mte.zych@gmail.com> Tue Jan 31 01:31:32 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Jan 31 01:31:32 2017 +0000
tree 02fb6e327a0713250d046364895c36cc7b003cad
parent a27013f655b6c0a1f666dee978a9eb3345a001ac
parent 0d8e22d82ba85778e13da06e92eb1dd0488913de

libsync: Replace inserting tuple into unordered_map in favour of pair. am: 380b2f4fea am: 3500cee3e1 am: 898f852d38
am: e911d262df

Change-Id: I6b600aa714cd01e2d1c0b6cb8e8bedac4d77c374

libsync/tests/sync_test.cpp

diff --git a/libsync/tests/sync_test.cpp b/libsync/tests/sync_test.cpp
index ff8a300..401aaee 100644
--- a/libsync/tests/sync_test.cpp
+++ b/libsync/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.