aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHennadii Stepanov <32963518+hebasto@users.noreply.github.com>2019-11-29 21:18:24 +0200
committerJoão Barbosa <joao.paulo.barbosa@gmail.com>2020-01-15 12:13:02 +0000
commitcd67b1dcb8f1eca8c0c7cecc6f4de27c7efe41d5 (patch)
treefa36bf70769791e1d9b3a9fa5b6baf6701b1e267
parentb8101fb7ac4bfa0e5c0ee2459b24bddaf59fe7c4 (diff)
Use correct C++11 header for std::swap()
Github-Pull: #17634 Rebased-From: 98fbd1cdffaa69357091cc67e959ac21119dfa16
-rw-r--r--src/cuckoocache.h4
-rw-r--r--src/prevector.h1
-rw-r--r--src/qt/bantablemodel.cpp2
-rw-r--r--src/qt/peertablemodel.cpp2
-rw-r--r--src/test/checkqueue_tests.cpp1
-rw-r--r--src/validation.h1
6 files changed, 6 insertions, 5 deletions
diff --git a/src/cuckoocache.h b/src/cuckoocache.h
index 4d0b094fa2..16a994393e 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 9d576321b6..34016879a5 100644
--- a/src/prevector.h
+++ b/src/prevector.h
@@ -14,6 +14,7 @@
#include <cstddef>
#include <iterator>
#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 efc726e09e..60a3178f96 100644
--- a/src/qt/bantablemodel.cpp
+++ b/src/qt/bantablemodel.cpp
@@ -10,7 +10,7 @@
#include <sync.h>
#include <util/time.h>
-#include <algorithm>
+#include <utility>
#include <QDebug>
#include <QList>
diff --git a/src/qt/peertablemodel.cpp b/src/qt/peertablemodel.cpp
index 99a9a12fe2..ed6fecce9d 100644
--- a/src/qt/peertablemodel.cpp
+++ b/src/qt/peertablemodel.cpp
@@ -11,7 +11,7 @@
#include <interfaces/node.h>
#include <sync.h>
-#include <algorithm>
+#include <utility>
#include <QDebug>
#include <QList>
diff --git a/src/test/checkqueue_tests.cpp b/src/test/checkqueue_tests.cpp
index d796444419..6c050ab964 100644
--- a/src/test/checkqueue_tests.cpp
+++ b/src/test/checkqueue_tests.cpp
@@ -18,6 +18,7 @@
#include <condition_variable>
#include <unordered_set>
+#include <utility>
// BasicTestingSetup not sufficient because nScriptCheckThreads is not set
// otherwise.
diff --git a/src/validation.h b/src/validation.h
index 96d249b6d3..4490a75e18 100644
--- a/src/validation.h
+++ b/src/validation.h
@@ -22,7 +22,6 @@
#include <txdb.h>
#include <versionbits.h>
-#include <algorithm>
#include <atomic>
#include <exception>
#include <map>