From ba09e48fc6c4f942bb1b2177ebb0ee1376585a55 Mon Sep 17 00:00:00 2001 From: JoelKatz Date: Mon, 5 Nov 2012 19:09:23 -0800 Subject: [PATCH] Cleanups. --- src/SHAMap.h | 2 +- src/SHAMapNodes.cpp | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/SHAMap.h b/src/SHAMap.h index 6acadf6679..7adc92bc2f 100644 --- a/src/SHAMap.h +++ b/src/SHAMap.h @@ -259,7 +259,7 @@ protected: public: SHAMapMissingNode(SHAMapType t, const SHAMapNode& nodeID, const uint256& nodeHash) : - std::runtime_error(nodeID.getString()), mType(t), mNodeID(nodeID), mNodeHash(nodeHash) + std::runtime_error("SHAMapMissingNode"), mType(t), mNodeID(nodeID), mNodeHash(nodeHash) { ; } SHAMapMissingNode(SHAMapType t, const SHAMapNode& nodeID, const uint256& nodeHash, const uint256& targetIndex) : diff --git a/src/SHAMapNodes.cpp b/src/SHAMapNodes.cpp index 0d4f134c45..f4caccb8bc 100644 --- a/src/SHAMapNodes.cpp +++ b/src/SHAMapNodes.cpp @@ -18,10 +18,12 @@ std::string SHAMapNode::getString() const { + static boost::format NodeID("NodeID(%s,%s)"); + if ((mDepth == 0) && (mNodeID.isZero())) return "NodeID(root)"; - return str(boost::format("NodeID(%s,%s)") + return str(NodeID % boost::lexical_cast(mDepth) % mNodeID.GetHex()); }