From d4276bfbecc493ef0cfd77aae83ec519c3f9fb78 Mon Sep 17 00:00:00 2001 From: JoelKatz Date: Tue, 20 Dec 2011 16:54:47 -0800 Subject: [PATCH] Style changes. --- uint256.h | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/uint256.h b/uint256.h index 4ee67d263..a4983c47c 100644 --- a/uint256.h +++ b/uint256.h @@ -91,21 +91,21 @@ public: base_uint& operator^=(uint64 b) { - pn[0] ^= (unsigned int)b; + pn[0] ^= (unsigned int)(b & 0xffffffffu); pn[1] ^= (unsigned int)(b >> 32); return *this; } base_uint& operator&=(uint64 b) { - pn[0] &= (unsigned int)b; + pn[0] &= (unsigned int)(b & 0xffffffffu); pn[1] &= (unsigned int)(b >> 32); return *this; } base_uint& operator|=(uint64 b) { - pn[0] |= (unsigned int)b; + pn[0] |= (unsigned int)(b & 0xffffffffu); pn[1] |= (unsigned int)(b >> 32); return *this; } @@ -164,16 +164,14 @@ public: base_uint& operator+=(uint64 b64) { - base_uint b; - b = b64; + base_uint b(b64); *this += b; return *this; } base_uint& operator-=(uint64 b64) { - base_uint b; - b = b64; + base_uint b(b64); *this += -b; return *this; } @@ -272,7 +270,7 @@ public: friend inline bool operator==(const base_uint& a, uint64 b) { - if (a.pn[0] != (unsigned int)b) + if (a.pn[0] != (unsigned int)(b & 0xffffffffu)) return false; if (a.pn[1] != (unsigned int)(b >> 32)) return false; @@ -440,7 +438,7 @@ public: uint160(uint64 b) { - pn[0] = (unsigned int)b; + pn[0] = (unsigned int)(b & 0xffffffffu); pn[1] = (unsigned int)(b >> 32); for (int i = 2; i < WIDTH; i++) pn[i] = 0; @@ -448,7 +446,7 @@ public: uint160& operator=(uint64 b) { - pn[0] = (unsigned int)b; + pn[0] = (unsigned int)(b & 0xffffffffu); pn[1] = (unsigned int)(b >> 32); for (int i = 2; i < WIDTH; i++) pn[i] = 0; @@ -556,7 +554,7 @@ public: uint256(uint64 b) { - pn[0] = (unsigned int)b; + pn[0] = (unsigned int)(b & 0xffffffff); pn[1] = (unsigned int)(b >> 32); for (int i = 2; i < WIDTH; i++) pn[i] = 0; @@ -564,7 +562,7 @@ public: uint256& operator=(uint64 b) { - pn[0] = (unsigned int)b; + pn[0] = (unsigned int)(b & 0xffffffff); pn[1] = (unsigned int)(b >> 32); for (int i = 2; i < WIDTH; i++) pn[i] = 0;