diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2021-05-13 22:10:43 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2021-05-13 22:10:43 -0400 |
| commit | d3d8203be4aec8ad90c0044e3a0ade1d91df64ea (patch) | |
| tree | f244144045e09df2a21a9271ab3a55ac3f356e3c /indra/newview | |
| parent | f7f6553cac78f1cf00cc1776de95f578e5853109 (diff) | |
SL-15258: Remove additional std library features dropped with C++17.
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llexperiencelog.cpp | 4 | ||||
| -rw-r--r-- | indra/newview/llgesturemgr.cpp | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/indra/newview/llexperiencelog.cpp b/indra/newview/llexperiencelog.cpp index ee5d561927..c441fbc09f 100644 --- a/indra/newview/llexperiencelog.cpp +++ b/indra/newview/llexperiencelog.cpp @@ -149,10 +149,6 @@ std::string LLExperienceLog::getPermissionString( const LLSD& message, const std { buf.str(entry); } - else - { - buf.str(); - } } if(buf.str().empty()) diff --git a/indra/newview/llgesturemgr.cpp b/indra/newview/llgesturemgr.cpp index 950a6cfaef..eb0e77311b 100644 --- a/indra/newview/llgesturemgr.cpp +++ b/indra/newview/llgesturemgr.cpp @@ -752,7 +752,7 @@ S32 LLGestureMgr::getPlayingCount() const } -struct IsGesturePlaying : public std::unary_function<LLMultiGesture*, bool> +struct IsGesturePlaying { bool operator()(const LLMultiGesture* gesture) const { |