From a75a7547b4ea104208e222e521f44471ba7669e5 Mon Sep 17 00:00:00 2001
From: Adam Ierymenko <adam.ierymenko@gmail.com>
Date: Fri, 24 Oct 2014 17:11:23 -0700
Subject: Deadlock fix...

---
 testnet/SimNetSocketManager.hpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'testnet/SimNetSocketManager.hpp')

diff --git a/testnet/SimNetSocketManager.hpp b/testnet/SimNetSocketManager.hpp
index 69f49556..82092b78 100644
--- a/testnet/SimNetSocketManager.hpp
+++ b/testnet/SimNetSocketManager.hpp
@@ -30,7 +30,7 @@
 
 #include <map>
 #include <utility>
-#include <queue>
+#include <vector>
 
 #include "../node/Constants.hpp"
 #include "../node/SocketManager.hpp"
@@ -98,7 +98,7 @@ public:
 	{
 		{
 			Mutex::Lock _l(_inbox_m);
-			_inbox.push(std::pair< InetAddress,Buffer<ZT_SOCKET_MAX_MESSAGE_LEN> >(from,Buffer<ZT_SOCKET_MAX_MESSAGE_LEN>(data,len)));
+			_inbox.push_back(std::pair< InetAddress,Buffer<ZT_SOCKET_MAX_MESSAGE_LEN> >(from,Buffer<ZT_SOCKET_MAX_MESSAGE_LEN>(data,len)));
 		}
 		_waitCond.signal();
 	}
@@ -116,7 +116,7 @@ private:
 	SharedPtr<Socket> _mySocket;
 	TransferStats _totals;
 
-	std::queue< std::pair< InetAddress,Buffer<ZT_SOCKET_MAX_MESSAGE_LEN> > > _inbox;
+	std::vector< std::pair< InetAddress,Buffer<ZT_SOCKET_MAX_MESSAGE_LEN> > > _inbox;
 	Mutex _inbox_m;
 
 	std::map< InetAddress,TransferStats > _stats;
-- 
cgit v1.2.3