diff options
| author | Grant Limberg <glimberg@gmail.com> | 2015-06-30 19:23:23 -0700 |
|---|---|---|
| committer | Grant Limberg <glimberg@gmail.com> | 2015-06-30 19:23:23 -0700 |
| commit | d853dbf2d88d4c7b0016e4416b7d046801e4f65a (patch) | |
| tree | 6e6e859a3da842b6158f04a2b110d0ed735eb9e8 /node/Node.cpp | |
| parent | aee8e95d4961195b3251bcc8581677a8f0c0cdd8 (diff) | |
| parent | 0cbbcf288455b8657134bf5be0861232daa6c7d9 (diff) | |
| download | infinitytier-d853dbf2d88d4c7b0016e4416b7d046801e4f65a.tar.gz infinitytier-d853dbf2d88d4c7b0016e4416b7d046801e4f65a.zip | |
Merge branch 'adamierymenko-dev' into android-jni
Diffstat (limited to 'node/Node.cpp')
| -rw-r--r-- | node/Node.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/node/Node.cpp b/node/Node.cpp index 85011434..8cdc6d62 100644 --- a/node/Node.cpp +++ b/node/Node.cpp @@ -251,7 +251,7 @@ ZT1_ResultCode Node::processBackgroundTasks(uint64_t now,volatile uint64_t *next // Attempt to contact network preferred relays that we don't have direct links to std::sort(networkRelays.begin(),networkRelays.end()); - std::unique(networkRelays.begin(),networkRelays.end()); + networkRelays.erase(std::unique(networkRelays.begin(),networkRelays.end()),networkRelays.end()); for(std::vector< std::pair<Address,InetAddress> >::const_iterator nr(networkRelays.begin());nr!=networkRelays.end();++nr) { if (nr->second) { SharedPtr<Peer> rp(RR->topology->getPeer(nr->first)); |