diff options
Diffstat (limited to 'src/script.h')
| -rw-r--r-- | src/script.h | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/script.h b/src/script.h index b671e15963..e3c6b15b6d 100644 --- a/src/script.h +++ b/src/script.h @@ -5,6 +5,8 @@ #ifndef H_BITCOIN_SCRIPT #define H_BITCOIN_SCRIPT +#include <stdint.h> + #include "base58.h" #include <string> @@ -219,7 +221,7 @@ inline std::string StackString(const std::vector<std::vector<unsigned char> >& v class CScript : public std::vector<unsigned char> { protected: - CScript& push_int64(int64 n) + CScript& push_int64(int64_t n) { if (n == -1 || (n >= 1 && n <= 16)) { @@ -233,7 +235,7 @@ protected: return *this; } - CScript& push_uint64(uint64 n) + CScript& push_uint64(uint64_t n) { if (n >= 1 && n <= 16) { @@ -273,12 +275,12 @@ public: explicit CScript(short b) { operator<<(b); } explicit CScript(int b) { operator<<(b); } explicit CScript(long b) { operator<<(b); } - explicit CScript(int64 b) { operator<<(b); } + explicit CScript(int64_t b) { operator<<(b); } explicit CScript(unsigned char b) { operator<<(b); } explicit CScript(unsigned int b) { operator<<(b); } explicit CScript(unsigned short b) { operator<<(b); } explicit CScript(unsigned long b) { operator<<(b); } - explicit CScript(uint64 b) { operator<<(b); } + explicit CScript(uint64_t b) { operator<<(b); } explicit CScript(opcodetype b) { operator<<(b); } explicit CScript(const uint256& b) { operator<<(b); } @@ -290,12 +292,12 @@ public: CScript& operator<<(short b) { return push_int64(b); } CScript& operator<<(int b) { return push_int64(b); } CScript& operator<<(long b) { return push_int64(b); } - CScript& operator<<(int64 b) { return push_int64(b); } + CScript& operator<<(int64_t b) { return push_int64(b); } CScript& operator<<(unsigned char b) { return push_uint64(b); } CScript& operator<<(unsigned int b) { return push_uint64(b); } CScript& operator<<(unsigned short b) { return push_uint64(b); } CScript& operator<<(unsigned long b) { return push_uint64(b); } - CScript& operator<<(uint64 b) { return push_uint64(b); } + CScript& operator<<(uint64_t b) { return push_uint64(b); } CScript& operator<<(opcodetype opcode) { |