From 0475abc4bf18b4521b51eb78bf36aef58ec30676 Mon Sep 17 00:00:00 2001
From: Richo Healey <richo@psych0tik.net>
Date: Sat, 7 Dec 2013 21:15:08 -0800
Subject: [PATCH 1/2] Remove redundant declaration of insert

---
 src/serialize.h | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/src/serialize.h b/src/serialize.h
index 6e952fa6f..b7fdfc865 100644
--- a/src/serialize.h
+++ b/src/serialize.h
@@ -821,19 +821,6 @@ public:
             vch.insert(it, first, last);
     }
 
-    void insert(iterator it, std::vector<char>::const_iterator first, std::vector<char>::const_iterator last)
-    {
-        assert(last - first >= 0);
-        if (it == vch.begin() + nReadPos && (unsigned int)(last - first) <= nReadPos)
-        {
-            // special case for inserting at the front when there's room
-            nReadPos -= (last - first);
-            memcpy(&vch[nReadPos], &first[0], last - first);
-        }
-        else
-            vch.insert(it, first, last);
-    }
-
 #if !defined(_MSC_VER) || _MSC_VER >= 1300
     void insert(iterator it, const char* first, const char* last)
     {

From 72f94c76b7cbb1eadf01ee8865464c48781ad665 Mon Sep 17 00:00:00 2001
From: Richo Healey <richo@psych0tik.net>
Date: Sat, 7 Dec 2013 21:46:32 -0800
Subject: [PATCH 2/2] Explicit reference to namespace for array

---
 src/net.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/net.cpp b/src/net.cpp
index ebe01e7d2..774480653 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -58,7 +58,7 @@ static bool vfReachable[NET_MAX] = {};
 static bool vfLimited[NET_MAX] = {};
 static CNode* pnodeLocalHost = NULL;
 uint64 nLocalHostNonce = 0;
-array<int, THREAD_MAX> vnThreadsRunning;
+boost::array<int, THREAD_MAX> vnThreadsRunning;
 static std::vector<SOCKET> vhListenSocket;
 CAddrMan addrman;