diff options
| author | Callum Linden <callum@lindenlab.com> | 2022-08-29 10:14:06 -0700 |
|---|---|---|
| committer | Callum Linden <callum@lindenlab.com> | 2022-08-29 10:14:06 -0700 |
| commit | a3f7f7d8c08e19d338911e107707f756469716bc (patch) | |
| tree | c86773c81cbcb03300132eb684134b878aeca357 /indra/newview/llwatchdog.cpp | |
| parent | 35de5fc912c908fb1c3c5257f28e72ffebe796c4 (diff) | |
| parent | 592abc460c96b63b1b1e0d15914f7b64a0c88038 (diff) | |
Merge remote-tracking branch 'origin/more-c++17' into DRTVWR-568
Diffstat (limited to 'indra/newview/llwatchdog.cpp')
| -rw-r--r-- | indra/newview/llwatchdog.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/indra/newview/llwatchdog.cpp b/indra/newview/llwatchdog.cpp index 0aa0280b25..ceff5cc8ee 100644 --- a/indra/newview/llwatchdog.cpp +++ b/indra/newview/llwatchdog.cpp @@ -222,18 +222,17 @@ void LLWatchdog::run() if(current_run_delta > (WATCHDOG_SLEEP_TIME_USEC * TIME_ELAPSED_MULTIPLIER)) { LL_INFOS() << "Watchdog thread delayed: resetting entries." << LL_ENDL; - std::for_each(mSuspects.begin(), - mSuspects.end(), - std::mem_fun(&LLWatchdogEntry::reset) - ); + for (const auto& suspect : mSuspects) + { + suspect->reset(); + } } else { SuspectsRegistry::iterator result = std::find_if(mSuspects.begin(), - mSuspects.end(), - std::not1(std::mem_fun(&LLWatchdogEntry::isAlive)) - ); + mSuspects.end(), + [](const LLWatchdogEntry* suspect){ return ! suspect->isAlive(); }); if(result != mSuspects.end()) { // error!!! |