diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2021-05-07 20:32:04 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2021-05-07 20:32:04 -0400 |
| commit | 26fb5d7af70f20c9a125575e1d93f7ff4bcd4f3c (patch) | |
| tree | 2eefde15cd779dfb8398f774c63c2d5b1cbcdfc9 /indra/newview/llwatchdog.cpp | |
| parent | ce65bc2f13409d75dbc6502c970030cc5ed2e5ad (diff) | |
SL-15241: Tweak viewer sources to permit compiling on Mac with C++17.
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 6273f10c69..52b3c33512 100644 --- a/indra/newview/llwatchdog.cpp +++ b/indra/newview/llwatchdog.cpp @@ -235,7 +235,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 @@ -243,7 +243,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()) { |