diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2021-05-13 22:10:43 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2021-05-13 22:10:43 -0400 |
| commit | d3d8203be4aec8ad90c0044e3a0ade1d91df64ea (patch) | |
| tree | f244144045e09df2a21a9271ab3a55ac3f356e3c /indra/llmessage/llcircuit.cpp | |
| parent | f7f6553cac78f1cf00cc1776de95f578e5853109 (diff) | |
SL-15258: Remove additional std library features dropped with C++17.
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) |