Merge pull request #152 from fsb4000/Label

[novacoin.git] / src / wallet.h

diff --git a/src/wallet.h b/src/wallet.h
index c1a987e..ec937ec 100644 (file)
--- a/src/wallet.h
+++ b/src/wallet.h
@@ -228,7 +228,7 @@ public:
     std::string SendMoney(CScript scriptPubKey, int64_t nValue, CWalletTx& wtxNew, bool fAskFee=false);
     std::string SendMoneyToDestination(const CTxDestination &address, int64_t nValue, CWalletTx& wtxNew, bool fAskFee=false);
 
-    bool NewKeyPool();
+    bool NewKeyPool(unsigned int nSize = 0);
     bool TopUpKeyPool(unsigned int nSize = 0);
     int64_t AddReserveKey(const CKeyPool& keypool);
     void ReserveKeyFromKeyPool(int64_t& nIndex, CKeyPool& keypool);
@@ -328,7 +328,7 @@ public:
 
     unsigned int GetKeyPoolSize()
     {
-        return setKeyPool.size();
+        return (unsigned int)(setKeyPool.size());
     }
 
     bool GetTransaction(const uint256 &hashTx, CWalletTx& wtx);