diff options
author | Pieter Wuille <pieter.wuille@gmail.com> | 2014-09-02 15:11:44 +0200 |
---|---|---|
committer | Pieter Wuille <pieter.wuille@gmail.com> | 2014-09-02 15:11:55 +0200 |
commit | b8d92236f61699846f67d8ce6cb55458a46f9de1 (patch) | |
tree | d4a9ff259c69469f9b1828d901ffe87659cca735 /src | |
parent | 6ce927cf107a3c876d9ad4663e86cccb5adbd77e (diff) | |
parent | 53efb09e4ceaa0ccb4e6271387f5013fe5e1ec75 (diff) |
Merge pull request #4812
53efb09 Discover some missing includes (jtimon)
8d5e510 Remove unused function StackString() and class CCoins; (jtimon)
Diffstat (limited to 'src')
-rw-r--r-- | src/bloom.cpp | 2 | ||||
-rw-r--r-- | src/core.cpp | 2 | ||||
-rw-r--r-- | src/core_write.cpp | 2 | ||||
-rw-r--r-- | src/qt/recentrequeststablemodel.cpp | 2 | ||||
-rw-r--r-- | src/script.cpp | 2 | ||||
-rw-r--r-- | src/script.h | 21 |
6 files changed, 10 insertions, 21 deletions
diff --git a/src/bloom.cpp b/src/bloom.cpp index 85a2ddc189..e34041336f 100644 --- a/src/bloom.cpp +++ b/src/bloom.cpp @@ -10,6 +10,8 @@ #include <math.h> #include <stdlib.h> +#include <boost/foreach.hpp> + #define LN2SQUARED 0.4804530139182014246671025263266649717305529515945455 #define LN2 0.6931471805599453094172321214581765680755001343602552 diff --git a/src/core.cpp b/src/core.cpp index e6636ae04f..8dcda0126a 100644 --- a/src/core.cpp +++ b/src/core.cpp @@ -7,6 +7,8 @@ #include "tinyformat.h" +#include <boost/foreach.hpp> + 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 e63b64d692..e66e75515c 100644 --- a/src/core_write.cpp +++ b/src/core_write.cpp @@ -11,6 +11,8 @@ #include "utilmoneystr.h" #include "base58.h" +#include <boost/foreach.hpp> + using namespace std; string EncodeHexTx(const CTransaction& tx) diff --git a/src/qt/recentrequeststablemodel.cpp b/src/qt/recentrequeststablemodel.cpp index 9e3976644e..0e5802922c 100644 --- a/src/qt/recentrequeststablemodel.cpp +++ b/src/qt/recentrequeststablemodel.cpp @@ -8,6 +8,8 @@ #include "guiutil.h" #include "optionsmodel.h" +#include <boost/foreach.hpp> + RecentRequestsTableModel::RecentRequestsTableModel(CWallet *wallet, WalletModel *parent) : walletModel(parent) { diff --git a/src/script.cpp b/src/script.cpp index 28c50a1358..21883bd41a 100644 --- a/src/script.cpp +++ b/src/script.cpp @@ -22,6 +22,8 @@ #include <boost/tuple/tuple_comparison.hpp> #include <boost/tuple/tuple.hpp> +#include <boost/foreach.hpp> + using namespace std; using namespace boost; diff --git a/src/script.h b/src/script.h index 8e6aedcc63..d17cfe3fa4 100644 --- a/src/script.h +++ b/src/script.h @@ -15,10 +15,8 @@ #include <string> #include <vector> -#include <boost/foreach.hpp> #include <boost/variant.hpp> -class CCoins; class CKeyStore; class CTransaction; struct CMutableTransaction; @@ -411,25 +409,6 @@ inline std::string ValueString(const std::vector<unsigned char>& vch) return HexStr(vch); } -inline std::string StackString(const std::vector<std::vector<unsigned char> >& vStack) -{ - std::string str; - BOOST_FOREACH(const std::vector<unsigned char>& vch, vStack) - { - if (!str.empty()) - str += " "; - str += ValueString(vch); - } - return str; -} - - - - - - - - /** Serialized script, used inside transaction inputs and outputs */ class CScript : public std::vector<unsigned char> { |