diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2023-05-17 17:47:45 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2023-05-17 17:47:45 +0300 |
| commit | 4dcab10bf8a652c6513bf6c9eec3184f79d4d219 (patch) | |
| tree | 3cb870beefc8c0488532e0b424450780357ed7f5 /indra/llcommon/llinitdestroyclass.cpp | |
| parent | 42f16180a985fc0e4704a4e25489ada9d662631a (diff) | |
| parent | 5a70639b7992842a9f74ec81b11bac56608b8f2e (diff) | |
Merge branch 'main' into DRTVWR-580-maint-T
# Conflicts:
# doc/contributions.txt
# indra/llcharacter/llkeyframemotion.cpp
# indra/newview/llfilepicker.cpp
Diffstat (limited to 'indra/llcommon/llinitdestroyclass.cpp')
| -rw-r--r-- | indra/llcommon/llinitdestroyclass.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/indra/llcommon/llinitdestroyclass.cpp b/indra/llcommon/llinitdestroyclass.cpp index e6382a7924..e3b9e6d099 100644 --- a/indra/llcommon/llinitdestroyclass.cpp +++ b/indra/llcommon/llinitdestroyclass.cpp @@ -21,10 +21,9 @@ void LLCallbackRegistry::fireCallbacks() const { - for (FuncList::const_iterator fi = mCallbacks.begin(), fe = mCallbacks.end(); - fi != fe; ++fi) + for (FuncList::value_type pair : mCallbacks) { - LL_INFOS("LLInitDestroyClass") << "calling " << fi->first << "()" << LL_ENDL; - fi->second(); + LL_INFOS("LLInitDestroyClass") << "calling " << pair.first << "()" << LL_ENDL; + pair.second(); } } |