aboutsummaryrefslogtreecommitdiff
path: root/src/uint256.h
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2011-12-21 22:33:19 +0100
committerWladimir J. van der Laan <laanwj@gmail.com>2011-12-21 22:33:19 +0100
commitbde280b9a4da2652716c8ffdeed9ebfa4461cc70 (patch)
treef2d96b0c74da35b701513a629817c7e944798827 /src/uint256.h
parent21d9f36781604e4ca9fc35dc65265593423b73e9 (diff)
Revert "Use standard C99 (and Qt) types for 64-bit integers"
This reverts commit 21d9f36781604e4ca9fc35dc65265593423b73e9.
Diffstat (limited to 'src/uint256.h')
-rw-r--r--src/uint256.h41
1 files changed, 21 insertions, 20 deletions
diff --git a/src/uint256.h b/src/uint256.h
index 20438993cd..d3da1f26d2 100644
--- a/src/uint256.h
+++ b/src/uint256.h
@@ -5,14 +5,15 @@
#ifndef BITCOIN_UINT256_H
#define BITCOIN_UINT256_H
-#include <stdint.h>
-
#include "serialize.h"
#include <limits.h>
#include <string>
#include <vector>
+typedef long long int64;
+typedef unsigned long long uint64;
+
inline int Testuint256AdHoc(std::vector<std::string> vArg);
@@ -54,7 +55,7 @@ public:
}
- base_uint& operator=(uint64_t b)
+ base_uint& operator=(uint64 b)
{
pn[0] = (unsigned int)b;
pn[1] = (unsigned int)(b >> 32);
@@ -84,21 +85,21 @@ public:
return *this;
}
- base_uint& operator^=(uint64_t b)
+ base_uint& operator^=(uint64 b)
{
pn[0] ^= (unsigned int)b;
pn[1] ^= (unsigned int)(b >> 32);
return *this;
}
- base_uint& operator&=(uint64_t b)
+ base_uint& operator&=(uint64 b)
{
pn[0] &= (unsigned int)b;
pn[1] &= (unsigned int)(b >> 32);
return *this;
}
- base_uint& operator|=(uint64_t b)
+ base_uint& operator|=(uint64 b)
{
pn[0] |= (unsigned int)b;
pn[1] |= (unsigned int)(b >> 32);
@@ -141,10 +142,10 @@ public:
base_uint& operator+=(const base_uint& b)
{
- uint64_t carry = 0;
+ uint64 carry = 0;
for (int i = 0; i < WIDTH; i++)
{
- uint64_t n = carry + pn[i] + b.pn[i];
+ uint64 n = carry + pn[i] + b.pn[i];
pn[i] = n & 0xffffffff;
carry = n >> 32;
}
@@ -157,7 +158,7 @@ public:
return *this;
}
- base_uint& operator+=(uint64_t b64)
+ base_uint& operator+=(uint64 b64)
{
base_uint b;
b = b64;
@@ -165,7 +166,7 @@ public:
return *this;
}
- base_uint& operator-=(uint64_t b64)
+ base_uint& operator-=(uint64 b64)
{
base_uint b;
b = b64;
@@ -265,7 +266,7 @@ public:
return true;
}
- friend inline bool operator==(const base_uint& a, uint64_t b)
+ friend inline bool operator==(const base_uint& a, uint64 b)
{
if (a.pn[0] != (unsigned int)b)
return false;
@@ -282,7 +283,7 @@ public:
return (!(a == b));
}
- friend inline bool operator!=(const base_uint& a, uint64_t b)
+ friend inline bool operator!=(const base_uint& a, uint64 b)
{
return (!(a == b));
}
@@ -419,7 +420,7 @@ public:
return *this;
}
- uint160(uint64_t b)
+ uint160(uint64 b)
{
pn[0] = (unsigned int)b;
pn[1] = (unsigned int)(b >> 32);
@@ -427,7 +428,7 @@ public:
pn[i] = 0;
}
- uint160& operator=(uint64_t b)
+ uint160& operator=(uint64 b)
{
pn[0] = (unsigned int)b;
pn[1] = (unsigned int)(b >> 32);
@@ -450,8 +451,8 @@ public:
}
};
-inline bool operator==(const uint160& a, uint64_t b) { return (base_uint160)a == b; }
-inline bool operator!=(const uint160& a, uint64_t b) { return (base_uint160)a != b; }
+inline bool operator==(const uint160& a, uint64 b) { return (base_uint160)a == b; }
+inline bool operator!=(const uint160& a, uint64 b) { return (base_uint160)a != b; }
inline const uint160 operator<<(const base_uint160& a, unsigned int shift) { return uint160(a) <<= shift; }
inline const uint160 operator>>(const base_uint160& a, unsigned int shift) { return uint160(a) >>= shift; }
inline const uint160 operator<<(const uint160& a, unsigned int shift) { return uint160(a) <<= shift; }
@@ -533,7 +534,7 @@ public:
return *this;
}
- uint256(uint64_t b)
+ uint256(uint64 b)
{
pn[0] = (unsigned int)b;
pn[1] = (unsigned int)(b >> 32);
@@ -541,7 +542,7 @@ public:
pn[i] = 0;
}
- uint256& operator=(uint64_t b)
+ uint256& operator=(uint64 b)
{
pn[0] = (unsigned int)b;
pn[1] = (unsigned int)(b >> 32);
@@ -564,8 +565,8 @@ public:
}
};
-inline bool operator==(const uint256& a, uint64_t b) { return (base_uint256)a == b; }
-inline bool operator!=(const uint256& a, uint64_t b) { return (base_uint256)a != b; }
+inline bool operator==(const uint256& a, uint64 b) { return (base_uint256)a == b; }
+inline bool operator!=(const uint256& a, uint64 b) { return (base_uint256)a != b; }
inline const uint256 operator<<(const base_uint256& a, unsigned int shift) { return uint256(a) <<= shift; }
inline const uint256 operator>>(const base_uint256& a, unsigned int shift) { return uint256(a) >>= shift; }
inline const uint256 operator<<(const uint256& a, unsigned int shift) { return uint256(a) <<= shift; }