From 755182c26634863bc668728d6796f50547526292 Mon Sep 17 00:00:00 2001 From: JoelKatz Date: Sat, 12 Jan 2013 03:38:15 -0800 Subject: [PATCH] Cleanups. --- src/cpp/ripple/SHAMap.h | 4 ++-- src/cpp/ripple/uint256.h | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/cpp/ripple/SHAMap.h b/src/cpp/ripple/SHAMap.h index a03eb76bd7..fb5fbc1553 100644 --- a/src/cpp/ripple/SHAMap.h +++ b/src/cpp/ripple/SHAMap.h @@ -204,9 +204,9 @@ public: bool isAccountState() const { return mType == tnACCOUNT_STATE; } // inner node functions - bool isInnerNode() const { return !mItem; } + bool isInnerNode() const { return !mItem; } bool setChildHash(int m, const uint256& hash); - bool isEmptyBranch(int m) const { return !mHashes[m]; } + bool isEmptyBranch(int m) const { return mHashes[m].isZero(); } bool isEmpty() const; int getBranchCount() const; void makeInner(); diff --git a/src/cpp/ripple/uint256.h b/src/cpp/ripple/uint256.h index 2937be12ac..872fce531d 100644 --- a/src/cpp/ripple/uint256.h +++ b/src/cpp/ripple/uint256.h @@ -298,22 +298,22 @@ public: unsigned char* begin() { - return (unsigned char*) &pn[0]; + return reinterpret_cast(pn); } unsigned char* end() { - return (unsigned char*) &pn[WIDTH]; + return reinterpret_cast(pn + WIDTH); } const unsigned char* begin() const { - return (const unsigned char*) &pn[0]; + return reinterpret_cast(pn); } const unsigned char* end() const { - return (unsigned char*) &pn[WIDTH]; + return reinterpret_cast(pn + WIDTH); } unsigned int size() const