diff options
author | Gavin Andresen <gavinandresen@gmail.com> | 2010-12-17 16:23:47 -0500 |
---|---|---|
committer | Gavin Andresen <gavinandresen@gmail.com> | 2010-12-17 16:23:47 -0500 |
commit | 5568d82c26d59aa90df22a6ac0900a93a5731aaf (patch) | |
tree | 005ea82c324209209f7f4e829445432ba2a7eab5 | |
parent | 825076061772d4c8105f9ef22f1397b318eebff7 (diff) | |
parent | 1c0bf23ba2e0cf5127518856cb2f46f56fbc6a20 (diff) |
Merge remote branch 'refs/remotes/svn/trunk' into svn
-rw-r--r-- | rpc.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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)); } |