From cd67b1dcb8f1eca8c0c7cecc6f4de27c7efe41d5 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: Use correct C++11 header for std::swap() Github-Pull: #17634 Rebased-From: 98fbd1cdffaa69357091cc67e959ac21119dfa16 --- 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 4d0b094fa2..16a994393e 100644 --- a/src/cuckoocache.h +++ b/src/cuckoocache.h @@ -6,11 +6,11 @@ #define BITCOIN_CUCKOOCACHE_H #include -#include #include -#include #include +#include #include +#include #include 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 #include #include +#include #pragma pack(push, 1) /** Implements a drop-in replacement for std::vector 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 #include -#include +#include #include #include 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 #include -#include +#include #include #include 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 #include +#include // 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 #include -#include #include #include #include -- cgit v1.2.3