aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGavin Andresen <gavinandresen@gmail.com>2010-12-17 16:23:47 -0500
committerGavin Andresen <gavinandresen@gmail.com>2010-12-17 16:23:47 -0500
commit5568d82c26d59aa90df22a6ac0900a93a5731aaf (patch)
tree005ea82c324209209f7f4e829445432ba2a7eab5
parent825076061772d4c8105f9ef22f1397b318eebff7 (diff)
parent1c0bf23ba2e0cf5127518856cb2f46f56fbc6a20 (diff)
downloadbitcoin-5568d82c26d59aa90df22a6ac0900a93a5731aaf.tar.xz
Merge remote branch 'refs/remotes/svn/trunk' into svn
-rw-r--r--rpc.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/rpc.cpp b/rpc.cpp
index 64ee104290..602de73e44 100644
--- a/rpc.cpp
+++ b/rpc.cpp
@@ -80,7 +80,7 @@ void WalletTxToJSON(const CWalletTx& wtx, Object& entry)
{
entry.push_back(Pair("confirmations", wtx.GetDepthInMainChain()));
entry.push_back(Pair("txid", wtx.GetHash().GetHex()));
- entry.push_back(Pair("time", wtx.GetTxTime()));
+ entry.push_back(Pair("time", (boost::int64_t)wtx.GetTxTime()));
foreach(const PAIRTYPE(string,string)& item, wtx.mapValue)
entry.push_back(Pair(item.first, item.second));
}