aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGavin Andresen <[email protected]>2012-02-22 11:00:38 -0500
committerGavin Andresen <[email protected]>2012-02-22 11:00:38 -0500
commite1bad25feec4ac7d26beb39cc61b62c2a0129cc2 (patch)
tree713cc35cd06454479bb8b66233179d56e3bd1829 /src
parentMerge branch 'fix_626' of https://github.com/sipa/bitcoin (diff)
parentFix #616: remove base_uint::operator&=(uint64 b) (diff)
downloaddiscoin-e1bad25feec4ac7d26beb39cc61b62c2a0129cc2.tar.xz
discoin-e1bad25feec4ac7d26beb39cc61b62c2a0129cc2.zip
Merge branch 'fix_616' of https://github.com/sipa/bitcoin
Diffstat (limited to 'src')
-rw-r--r--src/uint256.h7
1 files changed, 0 insertions, 7 deletions
diff --git a/src/uint256.h b/src/uint256.h
index 5b1ba9f6f..caf6fa118 100644
--- a/src/uint256.h
+++ b/src/uint256.h
@@ -92,13 +92,6 @@ public:
return *this;
}
- base_uint& operator&=(uint64 b)
- {
- pn[0] &= (unsigned int)b;
- pn[1] &= (unsigned int)(b >> 32);
- return *this;
- }
-
base_uint& operator|=(uint64 b)
{
pn[0] |= (unsigned int)b;