diff options
| author | Kamil Domanski <[email protected]> | 2014-08-07 15:39:49 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2014-08-30 06:27:34 +0200 |
| commit | 9f3d47677973cb894fdbb437b9b322e2062a1bf1 (patch) | |
| tree | 80c9de460575ebbfdf914f3574c80e95d31a9522 /src/core.cpp | |
| parent | Merge pull request #4789 (diff) | |
| download | discoin-9f3d47677973cb894fdbb437b9b322e2062a1bf1.tar.xz discoin-9f3d47677973cb894fdbb437b9b322e2062a1bf1.zip | |
changed field types in some structures to equivalent unambiguous types
Conflicts:
src/core.cpp
Rebased-By: Wladimir J. van der Laan
Github-Pull: #4180
Diffstat (limited to 'src/core.cpp')
| -rw-r--r-- | src/core.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core.cpp b/src/core.cpp index 71d6fea61..e6636ae04 100644 --- a/src/core.cpp +++ b/src/core.cpp @@ -12,14 +12,14 @@ std::string COutPoint::ToString() const return strprintf("COutPoint(%s, %u)", hash.ToString().substr(0,10), n); } -CTxIn::CTxIn(COutPoint prevoutIn, CScript scriptSigIn, unsigned int nSequenceIn) +CTxIn::CTxIn(COutPoint prevoutIn, CScript scriptSigIn, uint32_t nSequenceIn) { prevout = prevoutIn; scriptSig = scriptSigIn; nSequence = nSequenceIn; } -CTxIn::CTxIn(uint256 hashPrevTx, unsigned int nOut, CScript scriptSigIn, unsigned int nSequenceIn) +CTxIn::CTxIn(uint256 hashPrevTx, uint32_t nOut, CScript scriptSigIn, uint32_t nSequenceIn) { prevout = COutPoint(hashPrevTx, nOut); scriptSig = scriptSigIn; |