From be59ecce61a14ba9ca0f65f6eeb7db83782bac22 Mon Sep 17 00:00:00 2001
From: "Curtis.Bezault" <curtbezault@gmail.com>
Date: Wed, 24 Jul 2019 14:43:44 -0700
Subject: Use correct types

---
 toolsrc/src/vcpkg/build.cpp | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

(limited to 'toolsrc/src')

diff --git a/toolsrc/src/vcpkg/build.cpp b/toolsrc/src/vcpkg/build.cpp
index a5383b2a8..ff3025077 100644
--- a/toolsrc/src/vcpkg/build.cpp
+++ b/toolsrc/src/vcpkg/build.cpp
@@ -711,27 +711,19 @@ namespace vcpkg::Build
                          [](const std::pair<fs::path, std::string>& file_hash)
                          {
                              return std::pair<std::string, std::string>{
-                                 file_hash.first.filename().u8string(),
-                                 file_hash.second
+                                 file_hash.second,
+                                 file_hash.first.filename().u8string()
                              };
                          });
 
-        std::sort(
-            additional_file_hashes.begin(),
-            additional_file_hashes.end(),
-            [](const std::pair<fs::path, std::string>& l,
-               const std::pair<fs::path, std::string>& r)
-            {
-                return l.second < r.second ||
-                    (l.second == r.second && l.first < r.first);
-            });
+        std::sort(additional_file_hashes.begin(), additional_file_hashes.end());
 
         for (auto& hash_file : additional_file_hashes)
         {
             abi_tag_entries.emplace_back(
                 AbiEntry{
-                    std::move(hash_file.first),
-                    std::move(hash_file.second)
+                    std::move(hash_file.second),
+                    std::move(hash_file.first)
                 });
         }
 
-- 
cgit v1.2.3