From 7bad78c2c83d73b7e0518f3e1b835f0157b80ec6 Mon Sep 17 00:00:00 2001
From: Ben Woosley <ben.woosley@gmail.com>
Date: Tue, 13 Nov 2018 04:15:09 -0500
Subject: Drop defunct IS_TRIVIALLY_CONSTRUCTIBLE handling from prevector.h

It's now only referenced from the bench, so leave it there. This allows us to
drop the associated includes as well.
---
 src/bench/prevector.cpp | 10 +++++++++-
 src/compat.h            | 10 ----------
 src/prevector.h         |  2 --
 3 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/src/bench/prevector.cpp b/src/bench/prevector.cpp
index 8cc404b9e2..00e5d7e7a0 100644
--- a/src/bench/prevector.cpp
+++ b/src/bench/prevector.cpp
@@ -2,13 +2,21 @@
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
-#include <compat.h>
 #include <prevector.h>
 #include <serialize.h>
 #include <streams.h>
+#include <type_traits>
 
 #include <bench/bench.h>
 
+// GCC 4.8 is missing some C++11 type_traits,
+// https://www.gnu.org/software/gcc/gcc-5/changes.html
+#if defined(__GNUC__) && !defined(__clang__) && __GNUC__ < 5
+#define IS_TRIVIALLY_CONSTRUCTIBLE std::has_trivial_default_constructor
+#else
+#define IS_TRIVIALLY_CONSTRUCTIBLE std::is_trivially_default_constructible
+#endif
+
 struct nontrivial_t {
     int x;
     nontrivial_t() :x(-1) {}
diff --git a/src/compat.h b/src/compat.h
index d228611160..049579c365 100644
--- a/src/compat.h
+++ b/src/compat.h
@@ -10,16 +10,6 @@
 #include <config/bitcoin-config.h>
 #endif
 
-#include <type_traits>
-
-// GCC 4.8 is missing some C++11 type_traits,
-// https://www.gnu.org/software/gcc/gcc-5/changes.html
-#if defined(__GNUC__) && !defined(__clang__) && __GNUC__ < 5
-#define IS_TRIVIALLY_CONSTRUCTIBLE std::has_trivial_default_constructor
-#else
-#define IS_TRIVIALLY_CONSTRUCTIBLE std::is_trivially_default_constructible
-#endif
-
 #ifdef WIN32
 #ifdef _WIN32_WINNT
 #undef _WIN32_WINNT
diff --git a/src/prevector.h b/src/prevector.h
index aa77573746..7865299706 100644
--- a/src/prevector.h
+++ b/src/prevector.h
@@ -15,8 +15,6 @@
 #include <iterator>
 #include <type_traits>
 
-#include <compat.h>
-
 #pragma pack(push, 1)
 /** Implements a drop-in replacement for std::vector<T> which stores up to N
  *  elements directly (without heap allocation). The types Size and Diff are
-- 
cgit v1.2.3