diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2015-06-23 11:13:20 -0700 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2015-06-23 11:13:20 -0700 |
| commit | daebce499402b489e4825cf8927c57be9b744397 (patch) | |
| tree | f766b175c4084e3501ae8b0747b4329136ba29f9 /node/Multicaster.cpp | |
| parent | 4aa8449fe1861a702139fb2afe78ddecf7029c63 (diff) | |
| parent | def9cf2a6a6991bf19ceb74877152cdc6c149db7 (diff) | |
| download | infinitytier-daebce499402b489e4825cf8927c57be9b744397.tar.gz infinitytier-daebce499402b489e4825cf8927c57be9b744397.zip | |
Merge pull request #192 from mwarning/replace_erase
replace vector::erase, was missed in a previous commit (ref #186)
Diffstat (limited to 'node/Multicaster.cpp')
| -rw-r--r-- | node/Multicaster.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/node/Multicaster.cpp b/node/Multicaster.cpp index 29e89189..8a15bac1 100644 --- a/node/Multicaster.cpp +++ b/node/Multicaster.cpp @@ -330,7 +330,9 @@ void Multicaster::_add(uint64_t now,uint64_t nwid,const MulticastGroup &mg,Multi for(std::vector<OutboundMulticast>::iterator tx(gs.txQueue.begin());tx!=gs.txQueue.end();) { if (tx->atLimit()) { - gs.txQueue.erase(tx++); + // erase element (replace by last) + *tx = gs.txQueue.back(); + gs.txQueue.pop_back(); } else { tx->sendIfNew(RR,member); if (tx->atLimit()) { |