Split CMerkleTx::SetMerkleBranch

[novacoin.git] / src / rpcblockchain.cpp

diff --git a/src/rpcblockchain.cpp b/src/rpcblockchain.cpp
index 83ca8fd..d19869d 100644 (file)
--- a/src/rpcblockchain.cpp
+++ b/src/rpcblockchain.cpp
@@ -13,7 +13,7 @@
 using namespace json_spirit;
 using namespace std;
 
-extern void TxToJSON(const CTransaction& tx, const uint256 hashBlock, json_spirit::Object& entry);
+extern void TxToJSON(const CTransaction& tx, const uint256& hashBlock, json_spirit::Object& entry);
 extern enum Checkpoints::CPMode CheckpointsMode;
 
 double GetDifficulty(const CBlockIndex* blockindex)
@@ -104,7 +104,7 @@ Object blockToJSON(const CBlock& block, const CBlockIndex* blockindex, bool fPri
     Object result;
     result.push_back(Pair("hash", block.GetHash().GetHex()));
     CMerkleTx txGen(block.vtx[0]);
-    txGen.SetMerkleBranch(&block);
+    txGen.SetMerkleBranch(block);
     result.push_back(Pair("confirmations", (int)txGen.GetDepthInMainChain()));
     result.push_back(Pair("size", (int)::GetSerializeSize(block, SER_NETWORK, PROTOCOL_VERSION)));
     result.push_back(Pair("height", blockindex->nHeight));
@@ -282,7 +282,7 @@ bool ExportBlock(const string& strBlockHash, const CDataStream& ssBlock)
         pathDest /= strBlockHash;
 
     try {
-        boost::iostreams::stream_buffer<boost::iostreams::file_sink> buf(pathDest.c_str());
+        boost::iostreams::stream_buffer<boost::iostreams::file_sink> buf(pathDest.string());
         ostream                     exportStream(&buf);
         exportStream << HexStr(ssBlock.begin(), ssBlock.end());
         exportStream.flush();