diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2023-02-15 15:11:35 -0500 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2023-02-15 15:11:35 -0500 |
| commit | aec39a0f9f7f16a7970e96bad552ca684af57e3f (patch) | |
| tree | 742bfd7fee6d2cf98a9a93b5fc3d17ff2ca6557c /indra/llcommon/llinstancetracker.h | |
| parent | 6ef3df54b3ff0dcfed3000819209a7633e53a32b (diff) | |
| parent | 23a3da37a91ea80311b5820c48a12d56b989f69d (diff) | |
SL-18330: Merge branch 'contribute' into sl-18330-merge
Diffstat (limited to 'indra/llcommon/llinstancetracker.h')
| -rw-r--r-- | indra/llcommon/llinstancetracker.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llcommon/llinstancetracker.h b/indra/llcommon/llinstancetracker.h index 02535a59e7..34f2a5985a 100644 --- a/indra/llcommon/llinstancetracker.h +++ b/indra/llcommon/llinstancetracker.h @@ -99,7 +99,7 @@ public: return mSelf; } - static S32 instanceCount() + static size_t instanceCount() { return LockStatic()->mMap.size(); } @@ -363,7 +363,7 @@ public: return mSelf; } - static S32 instanceCount() + static size_t instanceCount() { return LockStatic()->mSet.size(); } |