From 7cc5346c1152f1e403b2764a1ea96efd982cb8d1 Mon Sep 17 00:00:00 2001 From: Justin Viiret Date: Thu, 2 Jun 2016 14:19:30 +1000 Subject: [PATCH] assign groups: turn pair into a tuple --- src/rose/rose_build_groups.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/rose/rose_build_groups.cpp b/src/rose/rose_build_groups.cpp index e1a130ef..5e477e3b 100644 --- a/src/rose/rose_build_groups.cpp +++ b/src/rose/rose_build_groups.cpp @@ -212,7 +212,7 @@ void assignGroupsToLiterals(RoseBuildImpl &build) { } u32 min_start_group = counter; - priority_queue, u32> > pq; + priority_queue> pq; // Second pass: the other literals. for (const auto &e : literals.right) { @@ -225,12 +225,11 @@ void assignGroupsToLiterals(RoseBuildImpl &build) { } assert(!eligibleForAlwaysOnGroup(build, id)); - pq.push(make_pair(make_pair(-(s32)literal_info[id].vertices.size(), - -(s32)lit.s.length()), id)); + pq.emplace(-(s32)info.vertices.size(), -(s32)lit.s.length(), id); } vector long_lits; while (!pq.empty()) { - u32 id = pq.top().second; + u32 id = get<2>(pq.top()); pq.pop(); UNUSED const rose_literal_id &lit = literals.right.at(id); DEBUG_PRINTF("assigning groups to lit %u (v %zu l %zu)\n", id,