diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2015-09-03 18:45:07 -0700 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2015-09-03 18:45:07 -0700 |
| commit | ca6ec120a9b6b99850c827eec2450f89e2331dca (patch) | |
| tree | 2347f3c94800d36d14e70da0fdf1b556f536bb41 | |
| parent | 88ba39b1626ef4342873f567440184cfdbe4516b (diff) | |
| parent | 10707c3673ca0cef9ecd09074f3b8253df7678b0 (diff) | |
| download | infinitytier-ca6ec120a9b6b99850c827eec2450f89e2331dca.tar.gz infinitytier-ca6ec120a9b6b99850c827eec2450f89e2331dca.zip | |
Merge branch 'netcon' of http://git.int.zerotier.com/zerotier/zerotierone into netcon
| -rw-r--r-- | netcon/NetconEthernetTap.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/netcon/NetconEthernetTap.cpp b/netcon/NetconEthernetTap.cpp index 4266521c..bc4cb928 100644 --- 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; |