Browse Source

Merge pull request #4812

53efb09 Discover some missing includes (jtimon)
8d5e510 Remove unused function StackString() and class CCoins; (jtimon)
pull/1/head
Pieter Wuille 8 years ago
parent
commit
b8d92236f6
No known key found for this signature in database
GPG Key ID: 8F653255C87992E0
  1. 2
      src/bloom.cpp
  2. 2
      src/core.cpp
  3. 2
      src/core_write.cpp
  4. 2
      src/qt/recentrequeststablemodel.cpp
  5. 2
      src/script.cpp
  6. 21
      src/script.h

2
src/bloom.cpp

@ -10,6 +10,8 @@ @@ -10,6 +10,8 @@
#include <math.h>
#include <stdlib.h>
#include <boost/foreach.hpp>
#define LN2SQUARED 0.4804530139182014246671025263266649717305529515945455
#define LN2 0.6931471805599453094172321214581765680755001343602552

2
src/core.cpp

@ -7,6 +7,8 @@ @@ -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);

2
src/core_write.cpp

@ -11,6 +11,8 @@ @@ -11,6 +11,8 @@
#include "utilmoneystr.h"
#include "base58.h"
#include <boost/foreach.hpp>
using namespace std;
string EncodeHexTx(const CTransaction& tx)

2
src/qt/recentrequeststablemodel.cpp

@ -8,6 +8,8 @@ @@ -8,6 +8,8 @@
#include "guiutil.h"
#include "optionsmodel.h"
#include <boost/foreach.hpp>
RecentRequestsTableModel::RecentRequestsTableModel(CWallet *wallet, WalletModel *parent) :
walletModel(parent)
{

2
src/script.cpp

@ -22,6 +22,8 @@ @@ -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;

21
src/script.h

@ -15,10 +15,8 @@ @@ -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) @@ -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>
{

Loading…
Cancel
Save