From 47908a890726f424371c9784b8508cff163c2c78 Mon Sep 17 00:00:00 2001
From: Gavin Andresen <gavinandresen@gmail.com>
Date: Thu, 10 Feb 2011 19:24:22 -0500
Subject: [PATCH] Visual C++ compatibility fixes

---
 rpc.cpp     | 6 +++---
 serialize.h | 2 ++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/rpc.cpp b/rpc.cpp
index 055e0cf1..69b09bcf 100644
--- a/rpc.cpp
+++ b/rpc.cpp
@@ -1015,13 +1015,13 @@ Value listtransactions(const Array& params, bool fHelp)
         for (map<uint256, CWalletTx>::iterator it = mapWallet.begin(); it != mapWallet.end(); ++it)
         {
             CWalletTx* wtx = &((*it).second);
-            txByTime.insert(make_pair(wtx->GetTxTime(), TxPair(wtx, 0)));
+            txByTime.insert(make_pair(wtx->GetTxTime(), TxPair(wtx, (CAccountingEntry*)0)));
         }
         list<CAccountingEntry> acentries;
         walletdb.ListAccountCreditDebit(strAccount, acentries);
         foreach(CAccountingEntry& entry, acentries)
         {
-            txByTime.insert(make_pair(entry.nTime, TxPair(0, &entry)));
+            txByTime.insert(make_pair(entry.nTime, TxPair((CWalletTx*)0, &entry)));
         }
 
         // Now: iterate backwards until we have nCount items to return:
@@ -1762,7 +1762,7 @@ void ThreadRPCServer2(void* parg)
         map<string, string> mapHeaders;
         string strRequest;
 
-        boost::thread api_caller(ReadHTTP, ref(stream), ref(mapHeaders), ref(strRequest));
+        boost::thread api_caller(ReadHTTP, boost::ref(stream), boost::ref(mapHeaders), boost::ref(strRequest));
         if (!api_caller.timed_join(boost::posix_time::seconds(GetArg("-rpctimeout", 30))))
         {   // Timed out:
             acceptor.cancel();
diff --git a/serialize.h b/serialize.h
index 45dec955..522bbfb4 100644
--- a/serialize.h
+++ b/serialize.h
@@ -763,6 +763,8 @@ struct secure_allocator : public std::allocator<T>
     typedef typename base::value_type value_type;
     secure_allocator() throw() {}
     secure_allocator(const secure_allocator& a) throw() : base(a) {}
+    template <typename U>
+    secure_allocator(const secure_allocator<U>& a) throw() : base(a) {}
     ~secure_allocator() throw() {}
     template<typename _Other> struct rebind
     { typedef secure_allocator<_Other> other; };