aboutsummaryrefslogtreecommitdiff
path: root/src/main.cpp
diff options
context:
space:
mode:
authorWladimir J. van der Laan <[email protected]>2015-06-05 07:00:57 +0200
committerWladimir J. van der Laan <[email protected]>2015-06-05 07:11:44 +0200
commit3fce72eaa3ea75aa911e32c4d96313848338cede (patch)
tree8604bec497a9137315589e468ba8f79e1f7a0fd7 /src/main.cpp
parentMerge pull request #6234 (diff)
parentuse const references where appropriate (diff)
downloaddiscoin-3fce72eaa3ea75aa911e32c4d96313848338cede.tar.xz
discoin-3fce72eaa3ea75aa911e32c4d96313848338cede.zip
Merge pull request #6206
a9ac95c use const references where appropriate (Philip Kaufmann)
Diffstat (limited to 'src/main.cpp')
-rw-r--r--src/main.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main.cpp b/src/main.cpp
index 760cda5de..e9a5f7efd 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -693,7 +693,7 @@ bool CheckFinalTx(const CTransaction &tx)
/**
* Check transaction inputs to mitigate two
* potential denial-of-service attacks:
- *
+ *
* 1. scriptSigs with extra data stuffed into them,
* not consumed by scriptPubKey (or P2SH script)
* 2. P2SH scripts with a crazy number of expensive
@@ -2148,7 +2148,7 @@ static int64_t nTimeFlush = 0;
static int64_t nTimeChainState = 0;
static int64_t nTimePostConnect = 0;
-/**
+/**
* Connect a new block to chainActive. pblock is either NULL or a pointer to a CBlock
* corresponding to pindexNew, to bypass loading it again from disk.
*/
@@ -3696,7 +3696,7 @@ void static CheckBlockIndex()
// CAlert
//
-string GetWarnings(string strFor)
+std::string GetWarnings(const std::string& strFor)
{
int nPriority = 0;
string strStatusBar;