Merge branch 'contribute' into DRTVWR-582-maint-U

# Conflicts:
#	indra/llaudio/llaudioengine.cpp

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;
     }
 }