diff options
| author | Erik Kundiman <erik@megapahit.org> | 2024-04-20 14:08:23 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2024-04-20 14:08:23 +0800 |
| commit | 23a35d763bca645ce628d80ebd939c979590724c (patch) | |
| tree | 434e8413c209d8a29fe93ed17ea2717817660a7e /indra/llcommon/lltrace.cpp | |
| parent | 1a4517e5af8f43433fc2547658615dce4073d9a3 (diff) | |
| parent | 78174fc8658caeddfd8306ec19eb0e1c2975368e (diff) | |
Merge tag '7.1.5-release'
source for viewer 7.1.5.8443591509
Diffstat (limited to 'indra/llcommon/lltrace.cpp')
| -rw-r--r-- | indra/llcommon/lltrace.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/indra/llcommon/lltrace.cpp b/indra/llcommon/lltrace.cpp index ff671a8370..87457ad907 100644 --- a/indra/llcommon/lltrace.cpp +++ b/indra/llcommon/lltrace.cpp @@ -33,8 +33,6 @@ namespace LLTrace { -MemStatHandle gTraceMemStat("LLTrace"); - StatBase::StatBase( const char* name, const char* description ) : mName(name), mDescription(description ? description : "") @@ -65,7 +63,7 @@ void TimeBlockTreeNode::setParent( BlockTimerStatHandle* parent ) llassert_always(parent != mBlock); llassert_always(parent != NULL); - TimeBlockTreeNode* parent_tree_node = get_thread_recorder()->getTimeBlockTreeNode(narrow(parent->getIndex())); + TimeBlockTreeNode* parent_tree_node = get_thread_recorder()->getTimeBlockTreeNode(narrow<size_t>(parent->getIndex())); if (!parent_tree_node) return; if (mParent) |