From 8d5e5102f6f80c037b6bbc2985b778fd40c80d1c Mon Sep 17 00:00:00 2001 From: jtimon Date: Sat, 23 Aug 2014 03:52:54 +0200 Subject: [PATCH 1/2] Remove unused function StackString() and class CCoins; --- src/script.h | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/src/script.h b/src/script.h index 8e6aedcc6..c1f5aa1dd 100644 --- a/src/script.h +++ b/src/script.h @@ -18,7 +18,6 @@ #include #include -class CCoins; class CKeyStore; class CTransaction; struct CMutableTransaction; @@ -411,25 +410,6 @@ inline std::string ValueString(const std::vector& vch) return HexStr(vch); } -inline std::string StackString(const std::vector >& vStack) -{ - std::string str; - BOOST_FOREACH(const std::vector& vch, vStack) - { - if (!str.empty()) - str += " "; - str += ValueString(vch); - } - return str; -} - - - - - - - - /** Serialized script, used inside transaction inputs and outputs */ class CScript : public std::vector { From 53efb09e4ceaa0ccb4e6271387f5013fe5e1ec75 Mon Sep 17 00:00:00 2001 From: jtimon Date: Sat, 23 Aug 2014 05:09:47 +0200 Subject: [PATCH 2/2] Discover some missing includes --- src/bloom.cpp | 2 ++ src/core.cpp | 2 ++ src/core_write.cpp | 2 ++ src/qt/recentrequeststablemodel.cpp | 2 ++ src/script.cpp | 2 ++ src/script.h | 1 - 6 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/bloom.cpp b/src/bloom.cpp index 85a2ddc18..e34041336 100644 --- a/src/bloom.cpp +++ b/src/bloom.cpp @@ -10,6 +10,8 @@ #include #include +#include + #define LN2SQUARED 0.4804530139182014246671025263266649717305529515945455 #define LN2 0.6931471805599453094172321214581765680755001343602552 diff --git a/src/core.cpp b/src/core.cpp index e6636ae04..8dcda0126 100644 --- a/src/core.cpp +++ b/src/core.cpp @@ -7,6 +7,8 @@ #include "tinyformat.h" +#include + std::string COutPoint::ToString() const { return strprintf("COutPoint(%s, %u)", hash.ToString().substr(0,10), n); diff --git a/src/core_write.cpp b/src/core_write.cpp index e63b64d69..e66e75515 100644 --- a/src/core_write.cpp +++ b/src/core_write.cpp @@ -11,6 +11,8 @@ #include "utilmoneystr.h" #include "base58.h" +#include + using namespace std; string EncodeHexTx(const CTransaction& tx) diff --git a/src/qt/recentrequeststablemodel.cpp b/src/qt/recentrequeststablemodel.cpp index 9e3976644..0e5802922 100644 --- a/src/qt/recentrequeststablemodel.cpp +++ b/src/qt/recentrequeststablemodel.cpp @@ -8,6 +8,8 @@ #include "guiutil.h" #include "optionsmodel.h" +#include + RecentRequestsTableModel::RecentRequestsTableModel(CWallet *wallet, WalletModel *parent) : walletModel(parent) { diff --git a/src/script.cpp b/src/script.cpp index 28c50a135..21883bd41 100644 --- a/src/script.cpp +++ b/src/script.cpp @@ -22,6 +22,8 @@ #include #include +#include + using namespace std; using namespace boost; diff --git a/src/script.h b/src/script.h index c1f5aa1dd..d17cfe3fa 100644 --- a/src/script.h +++ b/src/script.h @@ -15,7 +15,6 @@ #include #include -#include #include class CKeyStore;