Merge pull request #341 from svost/c++11

[novacoin.git] / src / rpcmining.cpp

diff --git a/src/rpcmining.cpp b/src/rpcmining.cpp
index 95107df..61ba258 100644 (file)
--- a/src/rpcmining.cpp
+++ b/src/rpcmining.cpp
@@ -12,8 +12,6 @@
 #include "bitcoinrpc.h"
 
 #include <boost/format.hpp>
-#include <boost/assign/list_of.hpp>
-#include <boost/iterator/counting_iterator.hpp>
 
 using namespace json_spirit;
 using namespace std;
@@ -84,7 +82,7 @@ Value scaninput(const Array& params, bool fHelp)
             "    days - time window, 90 days by default.\n"
         );
 
-    RPCTypeCheck(params, boost::assign::list_of(obj_type));
+    RPCTypeCheck(params, { obj_type });
 
     auto scanParams = params[0].get_obj();
 
@@ -161,7 +159,7 @@ Value scaninput(const Array& params, bool fHelp)
         }
         else
         {
-            vInputs = vector<int>(boost::counting_iterator<int>( 0 ), boost::counting_iterator<int>( tx.vout.size() ));
+            for (size_t i = 0; i != tx.vout.size(); ++i) vInputs.push_back(i);
         }
 
         CTxDB txdb("r");
@@ -181,7 +179,7 @@ Value scaninput(const Array& params, bool fHelp)
         if (!GetKernelStakeModifier(block.GetHash(), nStakeModifier))
             throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "No kernel stake modifier generated yet");
 
-        std::pair<uint32_t, uint32_t> interval;
+        pair<uint32_t, uint32_t> interval;
         interval.first = GetTime();
         // Only count coins meeting min age requirement
         if (nStakeMinAge + block.nTime > interval.first)
@@ -206,7 +204,7 @@ Value scaninput(const Array& params, bool fHelp)
             ssKernel << block.nTime << (txindex.pos.nTxPos - txindex.pos.nBlockPos) << tx.nTime << nOut;
             auto itK = ssKernel.begin();
 
-            std::vector<std::pair<uint256, uint32_t> > result;
+            vector<pair<uint256, uint32_t> > result;
             if (ScanKernelForward((unsigned char *)&itK[0], nBits, tx.nTime, tx.vout[nOut].nValue, interval, result))
             {
                 for(const auto& solution : result)
@@ -287,7 +285,7 @@ Value getworkex(const Array& params, bool fHelp)
         IncrementExtraNonce(pblock, pindexPrev, nExtraNonce);
 
         // Save
-        mapNewBlock[pblock->hashMerkleRoot] = make_pair(pblock, pblock->vtx[0].vin[0].scriptSig);
+        mapNewBlock[pblock->hashMerkleRoot] = { pblock, pblock->vtx[0].vin[0].scriptSig };
 
         // Prebuild hash buffers
         char pmidstate[32];
@@ -298,11 +296,11 @@ Value getworkex(const Array& params, bool fHelp)
         auto hashTarget = CBigNum().SetCompact(pblock->nBits).getuint256();
 
         auto coinbaseTx = pblock->vtx[0];
-        std::vector<uint256> merkle = pblock->GetMerkleBranch(0);
+        auto merkle = pblock->GetMerkleBranch(0);
 
         Object result;
         result.push_back(Pair("data",     HexStr(BEGIN(pdata), END(pdata))));
-        result.push_back(Pair("target",   HexStr(BEGIN(hashTarget), END(hashTarget))));
+        result.push_back(Pair("target",   HexStr(hashTarget.begin(), hashTarget.end())));
 
         CDataStream ssTx(SER_NETWORK, PROTOCOL_VERSION);
         ssTx << coinbaseTx;
@@ -311,7 +309,7 @@ Value getworkex(const Array& params, bool fHelp)
         Array merkle_arr;
 
         for(uint256 merkleh :  merkle) {
-            merkle_arr.push_back(HexStr(BEGIN(merkleh), END(merkleh)));
+            merkle_arr.push_back(HexStr(merkleh.begin(), merkleh.end()));
         }
 
         result.push_back(Pair("merkle", merkle_arr));
@@ -426,7 +424,7 @@ Value getwork(const Array& params, bool fHelp)
         IncrementExtraNonce(pblock, pindexPrev, nExtraNonce);
 
         // Save
-        mapNewBlock[pblock->hashMerkleRoot] = make_pair(pblock, pblock->vtx[0].vin[0].scriptSig);
+        mapNewBlock[pblock->hashMerkleRoot] = { pblock, pblock->vtx[0].vin[0].scriptSig };
 
         // Pre-build hash buffers
         char pmidstate[32];
@@ -440,7 +438,7 @@ Value getwork(const Array& params, bool fHelp)
         result.push_back(Pair("midstate", HexStr(BEGIN(pmidstate), END(pmidstate)))); // deprecated
         result.push_back(Pair("data",     HexStr(BEGIN(pdata), END(pdata))));
         result.push_back(Pair("hash1",    HexStr(BEGIN(phash1), END(phash1)))); // deprecated
-        result.push_back(Pair("target",   HexStr(BEGIN(hashTarget), END(hashTarget))));
+        result.push_back(Pair("target",   HexStr(hashTarget.begin(), hashTarget.end())));
         return result;
     }
     else
@@ -492,7 +490,7 @@ Value getblocktemplate(const Array& params, bool fHelp)
             "  \"height\" : height of the next block\n"
             "See https://en.bitcoin.it/wiki/BIP_0022 for full specification.");
 
-    std::string strMode = "template";
+    string strMode = "template";
     if (params.size() > 0)
     {
         const Object& oparam = params[0].get_obj();
@@ -642,7 +640,7 @@ Value submitblock(const Array& params, bool fHelp)
     try {
         ssBlock >> block;
     }
-    catch (const std::exception&) {
+    catch (const exception&) {
         throw JSONRPCError(RPC_DESERIALIZATION_ERROR, "Block decode failed");
     }