Merge branch 'netcon' of http://git.int.zerotier.com/zerotier/zerotierone into netcon

2015-09-03 18:45:07 -07:00
parent 88ba39b162 10707c3673
commit ca6ec120a9
1 changed files with 1 additions and 1 deletions
--- a/netcon/NetconEthernetTap.cpp
+++ b/netcon/NetconEthernetTap.cpp
@@ -101,7 +101,7 @@ bool NetconEthernetTap::addIp(const InetAddress &ip)
 bool NetconEthernetTap::removeIp(const InetAddress &ip)
 {
 	Mutex::Lock _l(_ips_m);
-	std::vector<InetAddress> i(std::find(_ips.begin(),_ips.end(),ip));
+	std::vector<InetAddress>::iterator i(std::find(_ips.begin(),_ips.end(),ip));
 	if (i == _ips.end())
 		return false;