diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-04-10 10:30:08 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-10 10:30:08 +0300 |
| commit | 8701e0973450da9c3c1dd905e73011bdeb09c93e (patch) | |
| tree | aecadf995f0174cc41f7cb9846a1382a930d8f82 /indra/llcommon/llsys.cpp | |
| parent | 37392be4171303db08a4842b7882b4cb758a8f8d (diff) | |
| parent | 8fa956a16e616191e21bf001eabc4670453debcd (diff) | |
Merge pull request #1178 from secondlife/marchcat/b-merge
Release (Maint W) -> Maint B merge
Diffstat (limited to 'indra/llcommon/llsys.cpp')
| -rw-r--r-- | indra/llcommon/llsys.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcommon/llsys.cpp b/indra/llcommon/llsys.cpp index 988c74229c..7473de988c 100644 --- a/indra/llcommon/llsys.cpp +++ b/indra/llcommon/llsys.cpp @@ -906,7 +906,7 @@ void LLMemoryInfo::stream(std::ostream& s) const // Now stream stats BOOST_FOREACH(const MapEntry& pair, inMap(mStatsMap)) { - s << pfx << std::setw(narrow(key_width+1)) << (pair.first + ':') << ' '; + s << pfx << std::setw(narrow<size_t>(key_width+1)) << (pair.first + ':') << ' '; LLSD value(pair.second); if (value.isInteger()) s << std::setw(12) << value.asInteger(); |