BTCPrivate
/
BTCP-Rebase
mirror of https://github.com/BTCPrivate/BTCP-Rebase.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

[mining] Comment out GenerateBitcoins (should be replaced with 'generate') (-gen, -genproclimit have been removed), boost->STL array includes

This commit is contained in:
Jon Layton 2018-06-04 11:54:07 -05:00
parent f554aac4cf
commit 0dc88a7f01
6 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/primitives/joinsplit.h
View File

@ -19,7 +19,7 @@
#include <zcash/JoinSplit.hpp>
#include <zcash/Proof.hpp>
#include <boost/array.hpp>
#include <array>
class JSDescription
{

8
src/wallet/asyncrpcoperation_mergetoaddress.cpp
View File

@ -126,9 +126,9 @@ void AsyncRPCOperation_mergetoaddress::main()
#ifdef ENABLE_MINING
#ifdef ENABLE_WALLET
GenerateBitcoins(false, NULL, 0);
//GenerateBitcoins(false, NULL, 0);
#else
GenerateBitcoins(false, 0);
//GenerateBitcoins(false, 0);
#endif
#endif
@ -155,9 +155,9 @@ void AsyncRPCOperation_mergetoaddress::main()
#ifdef ENABLE_MINING
#ifdef ENABLE_WALLET
GenerateBitcoins(GetBoolArg("-gen", false), pwalletMain, GetArg("-genproclimit", 1));
//GenerateBitcoins(gArgs.GetBoolArg("-gen", false), pwalletMain, gArgs.GetArg("-genproclimit", 1));
#else
GenerateBitcoins(GetBoolArg("-gen", false), GetArg("-genproclimit", 1));
//GenerateBitcoins(gArgs.GetBoolArg("-gen", false), gArgs.GetArg("-genproclimit", 1));
#endif
#endif

8
src/wallet/asyncrpcoperation_sendmany.cpp
View File

@ -127,9 +127,9 @@ void AsyncRPCOperation_sendmany::main() {
#ifdef ENABLE_MINING
#ifdef ENABLE_WALLET
GenerateBitcoins(false, NULL, 0);
//GenerateBitcoins(false, NULL, 0);
#else
GenerateBitcoins(false, 0);
//GenerateBitcoins(false, 0);
#endif
#endif
@ -156,9 +156,9 @@ void AsyncRPCOperation_sendmany::main() {
#ifdef ENABLE_MINING
#ifdef ENABLE_WALLET
GenerateBitcoins(GetBoolArg("-gen",false), pwalletMain, GetArg("-genproclimit", 1));
//GenerateBitcoins(gArgs.GetBoolArg("-gen",false), pwalletMain, gArgs.GetArg("-genproclimit", 1));
#else
GenerateBitcoins(GetBoolArg("-gen",false), GetArg("-genproclimit", 1));
//GenerateBitcoins(gArgs.GetBoolArg("-gen",false), gArgs.GetArg("-genproclimit", 1));
#endif
#endif

8
src/wallet/asyncrpcoperation_shieldcoinbase.cpp
View File

@ -108,9 +108,9 @@ void AsyncRPCOperation_shieldcoinbase::main() {
#ifdef ENABLE_MINING
#ifdef ENABLE_WALLET
GenerateBitcoins(false, NULL, 0);
//GenerateBitcoins(false, NULL, 0);
#else
GenerateBitcoins(false, 0);
//GenerateBitcoins(false, 0);
#endif
#endif
@ -137,9 +137,9 @@ void AsyncRPCOperation_shieldcoinbase::main() {
#ifdef ENABLE_MINING
#ifdef ENABLE_WALLET
GenerateBitcoins(GetBoolArg("-gen",false), pwalletMain, GetArg("-genproclimit", 1));
//GenerateBitcoins(gArgs.GetBoolArg("-gen",false), pwalletMain, gArgs.GetArg("-genproclimit", 1));
#else
GenerateBitcoins(GetBoolArg("-gen",false), GetArg("-genproclimit", 1));
//GenerateBitcoins(gArgs.GetBoolArg("-gen",false), gArgs.GetArg("-genproclimit", 1));
#endif
#endif

2
src/zcash/JoinSplit.hpp
View File

@ -11,7 +11,7 @@
#include "uint256.h"
#include "uint252.h"
#include <boost/array.hpp>
#include <array>
namespace libzcash {

1
src/zcash/Note.hpp
View File

@ -5,6 +5,7 @@
#include "Zcash.h"
#include "Address.hpp"
#include "NoteEncryption.hpp"
#include <array>
namespace libzcash {