diff options
| author | Jonathan "Geenz" Goodman <geenz@lindenlab.com> | 2025-10-30 20:09:05 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-10-30 20:09:05 -0400 |
| commit | 02f8d44c9c9cf7c1996d509c527a13f143b120c0 (patch) | |
| tree | 1cbca40cedfb2df8cf3b2c7f489b8585c7294693 /indra/llcommon/llfasttimer.cpp | |
| parent | fa055104fc66f7b8779b3d3d399cd9cbb4057e76 (diff) | |
| parent | 1a2f73368ee8298cfb68cdeb114cc9b98f95174b (diff) | |
Merge pull request #4827 from RyeMutt/rye/linux64
Linux Support Part 1
Diffstat (limited to 'indra/llcommon/llfasttimer.cpp')
| -rw-r--r-- | indra/llcommon/llfasttimer.cpp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/indra/llcommon/llfasttimer.cpp b/indra/llcommon/llfasttimer.cpp index 1c5fe9d2f5..c5a7a0e56b 100644 --- a/indra/llcommon/llfasttimer.cpp +++ b/indra/llcommon/llfasttimer.cpp @@ -387,6 +387,11 @@ void BlockTimer::logStats() } +#if defined(LL_GNUC) && GCC_VERSION >= 130000 +# pragma GCC diagnostic push +# pragma GCC diagnostic ignored "-Wnonnull" +#endif + //static void BlockTimer::dumpCurTimes() { @@ -418,8 +423,12 @@ void BlockTimer::dumpCurTimes() << num_calls << " calls"; LL_INFOS() << out_str.str() << LL_ENDL; + } } -} + +#if defined(LL_GNUC) && GCC_VERSION >= 130000 +# pragma GCC diagnostic push +#endif //static void BlockTimer::writeLog(std::ostream& os) |