highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-01-18 22:35:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'no-cryptopp' of https://github.com/tcatm/bitcoin

Browse Source
This commit is contained in:
Gavin Andresen
2011-10-05 10:38:10 -04:00
parent 8bc52d0692 452506fc41
commit b898c8fce6
28 changed files with 68 additions and 6057 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/bitcoinrpc.cpp
View File

@@ -4,7 +4,6 @@
// file license.txt or http://www.opensource.org/licenses/mit-license.php.
#include "headers.h"
#include "cryptopp/sha.h"
#include "db.h"
#include "net.h"
#include "init.h"
@@ -1628,7 +1627,7 @@ Value getwork(const Array& params, bool fHelp)
// Byte reverse
for (int i = 0; i < 128/4; i++)
((unsigned int*)pdata)[i] = CryptoPP::ByteReverse(((unsigned int*)pdata)[i]);
((unsigned int*)pdata)[i] = ByteReverse(((unsigned int*)pdata)[i]);
// Get saved block
if (!mapNewBlock.count(pdata->hashMerkleRoot))