Merge pull request #2286 from gavinandresen/fix2285

gavinandresen · gavinandresen · commit 2f0fa79db290 · 2013-02-11T16:01:24.000-08:00
Do not use C++11 std::vector.data()
diff --git a/src/rpcmining.cpp b/src/rpcmining.cpp
@@ -307,7 +307,7 @@ Value getblocktemplate(const Array& params, bool fHelp)
         }
         entry.push_back(Pair("depends", deps));
 
-        int index_in_template = &tx - pblock->vtx.data();
+        int index_in_template = i - 1;
         entry.push_back(Pair("fee", pblocktemplate->vTxFees[index_in_template]));
         entry.push_back(Pair("sigops", pblocktemplate->vTxSigOps[index_in_template]));
 

Original file line number	Diff line number	Diff line change
`@@ -307,7 +307,7 @@ Value getblocktemplate(const Array& params, bool fHelp)`
`307`	`307`	`}`
`308`	`308`	`entry.push_back(Pair("depends", deps));`
`309`	`309`
`310`		`- int index_in_template = &tx - pblock->vtx.data();`
	`310`	`+ int index_in_template = i - 1;`
`311`	`311`	`entry.push_back(Pair("fee", pblocktemplate->vTxFees[index_in_template]));`
`312`	`312`	`entry.push_back(Pair("sigops", pblocktemplate->vTxSigOps[index_in_template]));`
`313`	`313`