From b66861e2e5e8a49e11e7489cf22c3007bc7082cc Mon Sep 17 00:00:00 2001
From: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com>
Date: Fri, 29 Nov 2019 20:15:45 +0200
Subject: [PATCH 1/2] Fix comparison function signature

This commit fixes build on CentOS 7 with GCC 4.8.5
---
 src/qt/recentrequeststablemodel.cpp | 9 ++++-----
 src/qt/recentrequeststablemodel.h   | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/qt/recentrequeststablemodel.cpp b/src/qt/recentrequeststablemodel.cpp
index 6d933f46d..18fa5f417 100644
--- a/src/qt/recentrequeststablemodel.cpp
+++ b/src/qt/recentrequeststablemodel.cpp
@@ -12,8 +12,7 @@
 #include <clientversion.h>
 #include <streams.h>
 
-#include <algorithm>
-
+#include <utility>
 
 RecentRequestsTableModel::RecentRequestsTableModel(WalletModel *parent) :
     QAbstractTableModel(parent), walletModel(parent)
@@ -214,10 +213,10 @@ void RecentRequestsTableModel::updateDisplayUnit()
     updateAmountColumnTitle();
 }
 
-bool RecentRequestEntryLessThan::operator()(RecentRequestEntry &left, RecentRequestEntry &right) const
+bool RecentRequestEntryLessThan::operator()(const RecentRequestEntry& left, const RecentRequestEntry& right) const
 {
-    RecentRequestEntry *pLeft = &left;
-    RecentRequestEntry *pRight = &right;
+    const RecentRequestEntry* pLeft = &left;
+    const RecentRequestEntry* pRight = &right;
     if (order == Qt::DescendingOrder)
         std::swap(pLeft, pRight);
 
diff --git a/src/qt/recentrequeststablemodel.h b/src/qt/recentrequeststablemodel.h
index 30578b7a0..f5085f726 100644
--- a/src/qt/recentrequeststablemodel.h
+++ b/src/qt/recentrequeststablemodel.h
@@ -45,7 +45,7 @@ class RecentRequestEntryLessThan
 public:
     RecentRequestEntryLessThan(int nColumn, Qt::SortOrder fOrder):
         column(nColumn), order(fOrder) {}
-    bool operator()(RecentRequestEntry &left, RecentRequestEntry &right) const;
+    bool operator()(const RecentRequestEntry& left, const RecentRequestEntry& right) const;
 
 private:
     int column;

From 98fbd1cdffaa69357091cc67e959ac21119dfa16 Mon Sep 17 00:00:00 2001
From: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com>
Date: Fri, 29 Nov 2019 21:18:24 +0200
Subject: [PATCH 2/2] Use correct C++11 header for std::swap()

---
 src/cuckoocache.h             | 4 ++--
 src/prevector.h               | 1 +
 src/qt/bantablemodel.cpp      | 2 +-
 src/qt/peertablemodel.cpp     | 2 +-
 src/test/checkqueue_tests.cpp | 1 +
 src/validation.h              | 1 -
 6 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/cuckoocache.h b/src/cuckoocache.h
index 674f47b95..4ad5818cd 100644
--- a/src/cuckoocache.h
+++ b/src/cuckoocache.h
@@ -6,11 +6,11 @@
 #define BITCOIN_CUCKOOCACHE_H
 
 #include <array>
-#include <algorithm>
 #include <atomic>
-#include <cstring>
 #include <cmath>
+#include <cstring>
 #include <memory>
+#include <utility>
 #include <vector>
 
 
diff --git a/src/prevector.h b/src/prevector.h
index d307495fb..4fb07688f 100644
--- a/src/prevector.h
+++ b/src/prevector.h
@@ -13,6 +13,7 @@
 #include <algorithm>
 #include <cstddef>
 #include <type_traits>
+#include <utility>
 
 #pragma pack(push, 1)
 /** Implements a drop-in replacement for std::vector<T> which stores up to N
diff --git a/src/qt/bantablemodel.cpp b/src/qt/bantablemodel.cpp
index 48201b420..b6c6984b1 100644
--- a/src/qt/bantablemodel.cpp
+++ b/src/qt/bantablemodel.cpp
@@ -8,7 +8,7 @@
 #include <net_types.h> // For banmap_t
 #include <qt/clientmodel.h>
 
-#include <algorithm>
+#include <utility>
 
 #include <QDebug>
 #include <QList>
diff --git a/src/qt/peertablemodel.cpp b/src/qt/peertablemodel.cpp
index af2a1bb0e..514ff35bc 100644
--- a/src/qt/peertablemodel.cpp
+++ b/src/qt/peertablemodel.cpp
@@ -10,7 +10,7 @@
 
 #include <interfaces/node.h>
 
-#include <algorithm>
+#include <utility>
 
 #include <QDebug>
 #include <QList>
diff --git a/src/test/checkqueue_tests.cpp b/src/test/checkqueue_tests.cpp
index 6745bb901..482fe3772 100644
--- a/src/test/checkqueue_tests.cpp
+++ b/src/test/checkqueue_tests.cpp
@@ -17,6 +17,7 @@
 #include <condition_variable>
 
 #include <unordered_set>
+#include <utility>
 
 BOOST_FIXTURE_TEST_SUITE(checkqueue_tests, TestingSetup)
 
diff --git a/src/validation.h b/src/validation.h
index d87113c41..54f97e721 100644
--- a/src/validation.h
+++ b/src/validation.h
@@ -23,7 +23,6 @@
 #include <versionbits.h>
 #include <serialize.h>
 
-#include <algorithm>
 #include <atomic>
 #include <map>
 #include <memory>