diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-08-27 19:24:05 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-08-27 19:24:05 +0300 |
| commit | 203ea3a70a775a09cbbffb1740ab7c58f1780baa (patch) | |
| tree | 828b0ea2336944d7ab0cc78704ae364966ec98a1 /indra/llmessage/llcircuit.cpp | |
| parent | 8e3f0778863a5aa337d1148a243ea91d238a8ac5 (diff) | |
| parent | 2e790e9b7250d5f79751fa5287c1993f3fa5c776 (diff) | |
Merge branch 'c++17' into DRTVWR-522-maint
Diffstat (limited to 'indra/llmessage/llcircuit.cpp')
| -rw-r--r-- | indra/llmessage/llcircuit.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/indra/llmessage/llcircuit.cpp b/indra/llmessage/llcircuit.cpp index 8baa2e328b..a39989515e 100644 --- a/indra/llmessage/llcircuit.cpp +++ b/indra/llmessage/llcircuit.cpp @@ -436,12 +436,11 @@ LLCircuit::LLCircuit(const F32Seconds circuit_heartbeat_interval, const F32Secon LLCircuit::~LLCircuit() { - // delete pointers in the map. - std::for_each(mCircuitData.begin(), - mCircuitData.end(), - llcompose1( - DeletePointerFunctor<LLCircuitData>(), - llselect2nd<circuit_data_map::value_type>())); + // delete pointers in the map. + for (auto circ_pair : mCircuitData) + { + delete circ_pair.second; + } } LLCircuitData *LLCircuit::addCircuitData(const LLHost &host, TPACKETID in_id) |