diff options
author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2023-01-16 07:05:01 +0200 |
---|---|---|
committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2023-01-16 07:05:01 +0200 |
commit | bea930071f470fb9a8d61fdd5dd8cc0deec9f95b (patch) | |
tree | 0c99e7eafdfb10463754c5645e3b5647cf7f36fa /indra/llcommon/llheteromap.cpp | |
parent | a0c3d69c620a92d73a1008f218680fb4d0ef9255 (diff) | |
parent | 5d6371f568f3dcd8eb7c88a9e5d65224522528d4 (diff) |
Merge branch 'contribute' into DRTVWR-577-maint-S
Diffstat (limited to 'indra/llcommon/llheteromap.cpp')
-rw-r--r-- | indra/llcommon/llheteromap.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/llcommon/llheteromap.cpp b/indra/llcommon/llheteromap.cpp index 7c19196e0c..c84e49d085 100644 --- a/indra/llcommon/llheteromap.cpp +++ b/indra/llcommon/llheteromap.cpp @@ -22,11 +22,11 @@ LLHeteroMap::~LLHeteroMap() { // For each entry in our map, we must call its deleter, which is the only // record we have of its original type. - for (TypeMap::iterator mi(mMap.begin()), me(mMap.end()); mi != me; ++mi) + for (TypeMap::value_type& pair : mMap) { - // mi->second is the std::pair; mi->second.first is the void*; - // mi->second.second points to the deleter function - (mi->second.second)(mi->second.first); - mi->second.first = NULL; + // pair.second is the std::pair; pair.second.first is the void*; + // pair.second.second points to the deleter function + (pair.second.second)(pair.second.first); + pair.second.first = NULL; } } |