Merge pull request #4206

79d06dc Remove redundant c_str (R E Broadley)
This commit is contained in:
Wladimir J. van der Laan
2014-05-25 16:20:21 +02:00
7 changed files with 15 additions and 15 deletions

View File

@@ -859,13 +859,13 @@ public:
{
return strprintf("CBlockIndex(pprev=%p, nHeight=%d, merkle=%s, hashBlock=%s)",
pprev, nHeight,
hashMerkleRoot.ToString().c_str(),
GetBlockHash().ToString().c_str());
hashMerkleRoot.ToString(),
GetBlockHash().ToString());
}
void print() const
{
LogPrintf("%s\n", ToString().c_str());
LogPrintf("%s\n", ToString());
}
// Check whether this block index entry is valid up to the passed validity level.
@@ -950,14 +950,14 @@ public:
std::string str = "CDiskBlockIndex(";
str += CBlockIndex::ToString();
str += strprintf("\n hashBlock=%s, hashPrev=%s)",
GetBlockHash().ToString().c_str(),
hashPrev.ToString().c_str());
GetBlockHash().ToString(),
hashPrev.ToString());
return str;
}
void print() const
{
LogPrintf("%s\n", ToString().c_str());
LogPrintf("%s\n", ToString());
}
};