Browse Source

Merge pull request #4349

09eb201 Remove `using namespace std` from header file (Wladimir J. van der Laan)
tags/v0.15.1
Wladimir J. van der Laan 7 years ago
parent
commit
529047fcd1
No account linked to committer's email address

+ 1
- 0
src/bitcoin-cli.cpp View File

@@ -12,6 +12,7 @@

#include <boost/filesystem/operations.hpp>

using namespace std;
using namespace boost;
using namespace boost::asio;
using namespace json_spirit;

+ 1
- 0
src/chainparams.cpp View File

@@ -10,6 +10,7 @@

#include <boost/assign/list_of.hpp>

using namespace std;
using namespace boost::assign;

//

+ 10
- 12
src/chainparams.h View File

@@ -12,13 +12,11 @@

#include <vector>

using namespace std;

typedef unsigned char MessageStartChars[MESSAGE_START_SIZE];

struct CDNSSeedData {
string name, host;
CDNSSeedData(const string &strName, const string &strHost) : name(strName), host(strHost) {}
std::string name, host;
CDNSSeedData(const std::string &strName, const std::string &strHost) : name(strName), host(strHost) {}
};

/**
@@ -51,7 +49,7 @@ public:

const uint256& HashGenesisBlock() const { return hashGenesisBlock; }
const MessageStartChars& MessageStart() const { return pchMessageStart; }
const vector<unsigned char>& AlertKey() const { return vAlertPubKey; }
const std::vector<unsigned char>& AlertKey() const { return vAlertPubKey; }
int GetDefaultPort() const { return nDefaultPort; }
const uint256& ProofOfWorkLimit() const { return bnProofOfWorkLimit; }
int SubsidyHalvingInterval() const { return nSubsidyHalvingInterval; }
@@ -74,16 +72,16 @@ public:
bool RequireStandard() const { return fRequireStandard; }
/* Make standard checks */
bool RPCisTestNet() const { return fRPCisTestNet; }
const string& DataDir() const { return strDataDir; }
const std::string& DataDir() const { return strDataDir; }
/* Make miner stop after a block is found. In RPC, don't return
* until nGenProcLimit blocks are generated */
bool MineBlocksOnDemand() const { return fMineBlocksOnDemand; }
Network NetworkID() const { return networkID; }
/* Return the BIP70 network string (main, test or regtest) */
std::string NetworkIDString() const { return strNetworkID; }
const vector<CDNSSeedData>& DNSSeeds() const { return vSeeds; }
const std::vector<CDNSSeedData>& DNSSeeds() const { return vSeeds; }
const std::vector<unsigned char>& Base58Prefix(Base58Type type) const { return base58Prefixes[type]; }
const vector<CAddress>& FixedSeeds() const { return vFixedSeeds; }
const std::vector<CAddress>& FixedSeeds() const { return vFixedSeeds; }
int RPCPort() const { return nRPCPort; }
protected:
CChainParams() {}
@@ -91,7 +89,7 @@ protected:
uint256 hashGenesisBlock;
MessageStartChars pchMessageStart;
// Raw pub key bytes for the broadcast alert signing key.
vector<unsigned char> vAlertPubKey;
std::vector<unsigned char> vAlertPubKey;
int nDefaultPort;
int nRPCPort;
uint256 bnProofOfWorkLimit;
@@ -99,14 +97,14 @@ protected:
int nEnforceBlockUpgradeMajority;
int nRejectBlockOutdatedMajority;
int nToCheckBlockUpgradeMajority;
string strDataDir;
std::string strDataDir;
int nMinerThreads;
vector<CDNSSeedData> vSeeds;
std::vector<CDNSSeedData> vSeeds;
std::vector<unsigned char> base58Prefixes[MAX_BASE58_TYPES];
Network networkID;
std::string strNetworkID;
CBlock genesis;
vector<CAddress> vFixedSeeds;
std::vector<CAddress> vFixedSeeds;
bool fRequireRPCPassword;
bool fMiningRequiresPeers;
bool fDefaultCheckMemPool;

+ 2
- 0
src/miner.cpp View File

@@ -11,6 +11,8 @@
#ifdef ENABLE_WALLET
#include "wallet.h"
#endif

using namespace std;
//////////////////////////////////////////////////////////////////////////////
//
// BitcoinMiner

+ 1
- 0
src/qt/paymentrequestplus.cpp View File

@@ -17,6 +17,7 @@
#include <QDebug>
#include <QSslCertificate>

using namespace std;

class SSLVerifyError : public std::runtime_error
{

+ 1
- 1
src/qt/paymentrequestplus.h View File

@@ -24,7 +24,7 @@ public:
PaymentRequestPlus() { }

bool parse(const QByteArray& data);
bool SerializeToString(string* output) const;
bool SerializeToString(std::string* output) const;

bool IsInitialized() const;
QString getPKIType() const;

+ 1
- 0
src/qt/paymentserver.cpp View File

@@ -44,6 +44,7 @@
#include <QUrlQuery>
#endif

using namespace std;
using namespace boost;

const int BITCOIN_IPC_CONNECT_TIMEOUT = 1000; // milliseconds

+ 2
- 0
src/qt/transactiondesc.cpp View File

@@ -18,6 +18,8 @@
#include <stdint.h>
#include <string>

using namespace std;

QString TransactionDesc::FormatTxStatus(const CWalletTx& wtx)
{
AssertLockHeld(cs_main);

+ 2
- 0
src/qt/walletmodel.cpp View File

@@ -24,6 +24,8 @@
#include <QSet>
#include <QTimer>

using namespace std;

WalletModel::WalletModel(CWallet *wallet, OptionsModel *optionsModel, QObject *parent) :
QObject(parent), wallet(wallet), optionsModel(optionsModel), addressTableModel(0),
transactionTableModel(0),

Loading…
Cancel
Save