Merge #10546: Remove 33 unused Boost includes

laanwj · laanwj · commit 2c2d98806253 · 2017-06-11T15:37:15.000+02:00
49de096 Remove unused Boost includes (practicalswift) Tree-SHA512: ff2dad94f9eeb1dc50fcffd0e94e1686be04e4e5bc45f58ae955d630c15cd25bb8f5583d0aa1f2f263b5a723be79747ef3c6e6b417c7be7787c0abc8d1874019
diff --git a/src/bitcoind.cpp b/src/bitcoind.cpp
@@ -20,7 +20,6 @@
 #include "httprpc.h"
 #include "utilstrencodings.h"
 
-#include <boost/algorithm/string/predicate.hpp>
 #include <boost/thread.hpp>
 
 #include <stdio.h>
diff --git a/src/checkqueue.h b/src/checkqueue.h
@@ -12,7 +12,6 @@
 
 #include <boost/foreach.hpp>
 #include <boost/thread/condition_variable.hpp>
-#include <boost/thread/locks.hpp>
 #include <boost/thread/mutex.hpp>
 
 template <typename T>
diff --git a/src/coins.h b/src/coins.h
@@ -17,7 +17,6 @@
 #include <assert.h>
 #include <stdint.h>
 
-#include <boost/foreach.hpp>
 #include <unordered_map>
 
 /**
diff --git a/src/fs.cpp b/src/fs.cpp
@@ -1,7 +1,5 @@
 #include "fs.h"
 
-#include <boost/filesystem.hpp>
-
 namespace fsbridge {
 
 FILE *fopen(const fs::path& p, const char *mode)
diff --git a/src/init.cpp b/src/init.cpp
@@ -55,7 +55,6 @@
 #endif
 
 #include <boost/algorithm/string/classification.hpp>
-#include <boost/algorithm/string/predicate.hpp>
 #include <boost/algorithm/string/replace.hpp>
 #include <boost/algorithm/string/split.hpp>
 #include <boost/bind.hpp>
diff --git a/src/keystore.cpp b/src/keystore.cpp
@@ -9,8 +9,6 @@
 #include "pubkey.h"
 #include "util.h"
 
-#include <boost/foreach.hpp>
-
 bool CKeyStore::AddKey(const CKey &key) {
     return AddKeyPubKey(key, key.GetPubKey());
 }
diff --git a/src/keystore.h b/src/keystore.h
@@ -13,7 +13,6 @@
 #include "sync.h"
 
 #include <boost/signals2/signal.hpp>
-#include <boost/variant.hpp>
 
 /** A virtual base class for key stores */
 class CKeyStore
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
@@ -30,8 +30,6 @@
 #include "utilstrencodings.h"
 #include "validationinterface.h"
 
-#include <boost/thread.hpp>
-
 #if defined(NDEBUG)
 # error "Bitcoin cannot be compiled without assertions."
 #endif
diff --git a/src/qt/optionsdialog.cpp b/src/qt/optionsdialog.cpp
@@ -21,8 +21,6 @@
 #include "wallet/wallet.h" // for CWallet::GetRequiredFee()
 #endif
 
-#include <boost/thread.hpp>
-
 #include <QDataWidgetMapper>
 #include <QDir>
 #include <QIntValidator>
diff --git a/src/qt/transactiontablemodel.cpp b/src/qt/transactiontablemodel.cpp
@@ -26,8 +26,6 @@
 #include <QIcon>
 #include <QList>
 
-#include <boost/foreach.hpp>
-
 // Amount column is right-aligned it contains numbers
 static int column_alignments[] = {
         Qt::AlignLeft|Qt::AlignVCenter, /* status */
diff --git a/src/rpc/client.cpp b/src/rpc/client.cpp
@@ -10,7 +10,6 @@
 #include <set>
 #include <stdint.h>
 
-#include <boost/algorithm/string/case_conv.hpp> // for to_lower()
 #include <univalue.h>
 
 class CRPCConvertParam
diff --git a/src/rpc/server.cpp b/src/rpc/server.cpp
@@ -18,9 +18,7 @@
 
 #include <boost/bind.hpp>
 #include <boost/foreach.hpp>
-#include <boost/shared_ptr.hpp>
 #include <boost/signals2/signal.hpp>
-#include <boost/thread.hpp>
 #include <boost/algorithm/string/case_conv.hpp> // for to_upper()
 #include <boost/algorithm/string/classification.hpp>
 #include <boost/algorithm/string/split.hpp>
diff --git a/src/sync.h b/src/sync.h
@@ -9,7 +9,6 @@
 #include "threadsafety.h"
 
 #include <boost/thread/condition_variable.hpp>
-#include <boost/thread/locks.hpp>
 #include <boost/thread/mutex.hpp>
 #include <boost/thread/recursive_mutex.hpp>
 
diff --git a/src/test/DoS_tests.cpp b/src/test/DoS_tests.cpp
@@ -18,8 +18,6 @@
 
 #include <stdint.h>
 
-#include <boost/date_time/posix_time/posix_time_types.hpp>
-#include <boost/foreach.hpp>
 #include <boost/test/unit_test.hpp>
 
 // Tests these internal-to-net_processing.cpp methods:
diff --git a/src/test/base58_tests.cpp b/src/test/base58_tests.cpp
@@ -15,7 +15,6 @@
 #include "utilstrencodings.h"
 #include "test/test_bitcoin.h"
 
-#include <boost/foreach.hpp>
 #include <boost/test/unit_test.hpp>
 
 #include <univalue.h>
diff --git a/src/test/bloom_tests.cpp b/src/test/bloom_tests.cpp
@@ -19,7 +19,6 @@
 #include <vector>
 
 #include <boost/test/unit_test.hpp>
-#include <boost/tuple/tuple.hpp>
 
 BOOST_FIXTURE_TEST_SUITE(bloom_tests, BasicTestingSetup)
 
diff --git a/src/test/cuckoocache_tests.cpp b/src/test/cuckoocache_tests.cpp
@@ -7,8 +7,6 @@
 #include "test/test_bitcoin.h"
 #include "random.h"
 #include <thread>
-#include <boost/thread.hpp>
-
 
 /** Test Suite for CuckooCache
  *
diff --git a/src/test/dbwrapper_tests.cpp b/src/test/dbwrapper_tests.cpp
@@ -7,8 +7,6 @@
 #include "random.h"
 #include "test/test_bitcoin.h"
 
-#include <boost/assign/std/vector.hpp> // for 'operator+=()'
-#include <boost/assert.hpp>
 #include <boost/test/unit_test.hpp>
 
 // Test if a string consists entirely of null characters
diff --git a/src/test/sigopcount_tests.cpp b/src/test/sigopcount_tests.cpp
@@ -12,7 +12,6 @@
 
 #include <vector>
 
-#include <boost/foreach.hpp>
 #include <boost/test/unit_test.hpp>
 
 // Helpers:
diff --git a/src/test/streams_tests.cpp b/src/test/streams_tests.cpp
@@ -7,7 +7,6 @@
 #include "test/test_bitcoin.h"
 
 #include <boost/assign/std/vector.hpp> // for 'operator+=()'
-#include <boost/assert.hpp>
 #include <boost/test/unit_test.hpp>
 
 using namespace boost::assign; // bring 'operator+=()' into scope
diff --git a/src/test/test_bitcoin.cpp b/src/test/test_bitcoin.cpp
@@ -25,8 +25,6 @@
 
 #include <memory>
 
-#include <boost/thread.hpp>
-
 uint256 insecure_rand_seed = GetRandHash();
 FastRandomContext insecure_rand_ctx(insecure_rand_seed);
 
diff --git a/src/torcontrol.cpp b/src/torcontrol.cpp
@@ -18,7 +18,6 @@
 #include <boost/bind.hpp>
 #include <boost/signals2/signal.hpp>
 #include <boost/foreach.hpp>
-#include <boost/algorithm/string/predicate.hpp>
 #include <boost/algorithm/string/split.hpp>
 #include <boost/algorithm/string/classification.hpp>
 #include <boost/algorithm/string/replace.hpp>
diff --git a/src/util.cpp b/src/util.cpp
@@ -77,11 +77,8 @@
 #endif
 
 #include <boost/algorithm/string/case_conv.hpp> // for to_lower()
-#include <boost/algorithm/string/join.hpp>
 #include <boost/algorithm/string/predicate.hpp> // for startswith() and endswith()
-#include <boost/foreach.hpp>
 #include <boost/program_options/detail/config_file.hpp>
-#include <boost/program_options/parsers.hpp>
 #include <boost/thread.hpp>
 #include <openssl/crypto.h>
 #include <openssl/rand.h>
diff --git a/src/util.h b/src/util.h
@@ -28,7 +28,6 @@
 #include <vector>
 
 #include <boost/signals2/signal.hpp>
-#include <boost/thread/exceptions.hpp>
 
 static const bool DEFAULT_LOGTIMEMICROS = false;
 static const bool DEFAULT_LOGIPS        = false;
diff --git a/src/validation.cpp b/src/validation.cpp
@@ -44,7 +44,6 @@
 
 #include <boost/algorithm/string/replace.hpp>
 #include <boost/algorithm/string/join.hpp>
-#include <boost/math/distributions/poisson.hpp>
 #include <boost/thread.hpp>
 
 #if defined(NDEBUG)
diff --git a/src/wallet/db.cpp b/src/wallet/db.cpp
@@ -20,7 +20,6 @@
 
 #include <boost/foreach.hpp>
 #include <boost/thread.hpp>
-#include <boost/version.hpp>
 
 //
 // CDB
diff --git a/src/wallet/test/wallet_tests.cpp b/src/wallet/test/wallet_tests.cpp
@@ -15,7 +15,6 @@
 #include "validation.h"
 #include "wallet/test/wallet_test_fixture.h"
 
-#include <boost/foreach.hpp>
 #include <boost/test/unit_test.hpp>
 #include <univalue.h>
 
diff --git a/src/wallet/walletdb.cpp b/src/wallet/walletdb.cpp
@@ -18,7 +18,6 @@
 
 #include <atomic>
 
-#include <boost/version.hpp>
 #include <boost/foreach.hpp>
 #include <boost/thread.hpp>
 

Original file line number	Diff line number	Diff line change
`@@ -9,8 +9,6 @@`
`9`	`9`	`#include "pubkey.h"`
`10`	`10`	`#include "util.h"`
`11`	`11`
`12`		`-#include <boost/foreach.hpp>`
`13`		`-`
`14`	`12`	`bool CKeyStore::AddKey(const CKey &key) {`
`15`	`13`	`return AddKeyPubKey(key, key.GetPubKey());`
`16`	`14`	`}`