diff options
| author | Nat Linden <nat@lindenlab.com> | 2022-09-19 21:21:21 +0000 |
|---|---|---|
| committer | Nat Linden <nat@lindenlab.com> | 2022-09-19 21:21:21 +0000 |
| commit | 9ac0b3da77ca0c54161803f23cc37c09e871799d (patch) | |
| tree | ec9575c248d6e9cd01d8d15471ceb952c7dba738 /indra/llcommon/lltracethreadrecorder.cpp | |
| parent | 5f1c8d311904bd3937f5ba70476e16233f7d21c1 (diff) | |
| parent | f39be1dfd30032f10f21cccc29e93c1c49f01df5 (diff) | |
SL-18068: Merged DRTVWR-565-maint-P into sl-18068
Diffstat (limited to 'indra/llcommon/lltracethreadrecorder.cpp')
| -rw-r--r-- | indra/llcommon/lltracethreadrecorder.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llcommon/lltracethreadrecorder.cpp b/indra/llcommon/lltracethreadrecorder.cpp index 090d3297a0..26db15eaa0 100644 --- a/indra/llcommon/lltracethreadrecorder.cpp +++ b/indra/llcommon/lltracethreadrecorder.cpp @@ -308,13 +308,13 @@ ThreadRecorder* get_master_thread_recorder() return sMasterThreadRecorder; } -LLThreadLocalPointer<ThreadRecorder>& get_thread_recorder_ptr() +ThreadRecorder*& get_thread_recorder_ptr() { - static LLThreadLocalPointer<ThreadRecorder> s_thread_recorder; + static thread_local ThreadRecorder* s_thread_recorder; return s_thread_recorder; } -const LLThreadLocalPointer<ThreadRecorder>& get_thread_recorder() +ThreadRecorder* get_thread_recorder() { return get_thread_recorder_ptr(); } |