diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-08-27 19:24:05 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-08-27 19:24:05 +0300 |
| commit | 203ea3a70a775a09cbbffb1740ab7c58f1780baa (patch) | |
| tree | 828b0ea2336944d7ab0cc78704ae364966ec98a1 /indra/newview/llwatchdog.cpp | |
| parent | 8e3f0778863a5aa337d1148a243ea91d238a8ac5 (diff) | |
| parent | 2e790e9b7250d5f79751fa5287c1993f3fa5c776 (diff) | |
Merge branch 'c++17' into DRTVWR-522-maint
Diffstat (limited to 'indra/newview/llwatchdog.cpp')
| -rw-r--r-- | indra/newview/llwatchdog.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llwatchdog.cpp b/indra/newview/llwatchdog.cpp index 0aa0280b25..a3036ff6d0 100644 --- a/indra/newview/llwatchdog.cpp +++ b/indra/newview/llwatchdog.cpp @@ -224,7 +224,7 @@ void LLWatchdog::run() LL_INFOS() << "Watchdog thread delayed: resetting entries." << LL_ENDL; std::for_each(mSuspects.begin(), mSuspects.end(), - std::mem_fun(&LLWatchdogEntry::reset) + [](SuspectsRegistry::value_type suspect){ suspect->reset(); } ); } else @@ -232,7 +232,7 @@ void LLWatchdog::run() SuspectsRegistry::iterator result = std::find_if(mSuspects.begin(), mSuspects.end(), - std::not1(std::mem_fun(&LLWatchdogEntry::isAlive)) + [](SuspectsRegistry::value_type suspect){ return ! suspect->isAlive(); } ); if(result != mSuspects.end()) { |