diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-05-13 11:45:13 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-05-13 11:45:20 +0200 |
| commit | bfae70aae686e4631090bd0064fa6ac6eeed17d2 (patch) | |
| tree | 91e3b06618e0aa222197fa854648d2a939b469d6 /src/rpcmining.cpp | |
| parent | 29c1fbbb97710a9c31ae594870fc41539425889c (diff) | |
| parent | d56e30ca898469cf5988b0fc9847ec79b43be49c (diff) | |
Merge pull request #4129
d56e30c removed a few unnecessary casts (Kamil Domanski)
3e74ac2 json_spirit: #include <stdint.h> (Kamil Domanski)
4b61a6a switch from boost int types to <stdint.h> (Kamil Domanski)
Diffstat (limited to 'src/rpcmining.cpp')
| -rw-r--r-- | src/rpcmining.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/rpcmining.cpp b/src/rpcmining.cpp index cb903b585a..23876c603d 100644 --- a/src/rpcmining.cpp +++ b/src/rpcmining.cpp @@ -88,7 +88,7 @@ Value GetNetworkHashPS(int lookup, int height) { uint256 workDiff = pb->nChainWork - pb0->nChainWork; int64_t timeDiff = maxTime - minTime; - return (boost::int64_t)(workDiff.getdouble() / timeDiff); + return (int64_t)(workDiff.getdouble() / timeDiff); } Value getnetworkhashps(const Array& params, bool fHelp) @@ -226,8 +226,8 @@ Value gethashespersec(const Array& params, bool fHelp) ); if (GetTimeMillis() - nHPSTimerStart > 8000) - return (boost::int64_t)0; - return (boost::int64_t)dHashesPerSec; + return (int64_t)0; + return (int64_t)dHashesPerSec; } #endif |