summaryrefslogtreecommitdiff
path: root/indra/llcommon/llinstancetracker.cpp
diff options
context:
space:
mode:
authorGraham Linden <graham@lindenlab.com>2019-05-08 10:37:34 -0700
committerGraham Linden <graham@lindenlab.com>2019-05-08 10:37:34 -0700
commit65cb4b6d20b52ffebdc93e0e19f99520f6364dde (patch)
treed2b6ff74ce2d40f5de91b95fe7b5e21701d6e181 /indra/llcommon/llinstancetracker.cpp
parentf14888b6166f91533e778e94701b74a9639ebefd (diff)
parent34322f8f37380df868703051230f2a4109602b3f (diff)
Merge 6.2.2
Diffstat (limited to 'indra/llcommon/llinstancetracker.cpp')
-rw-r--r--indra/llcommon/llinstancetracker.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/indra/llcommon/llinstancetracker.cpp b/indra/llcommon/llinstancetracker.cpp
index 11fc53f8c8..3f990f4869 100644
--- a/indra/llcommon/llinstancetracker.cpp
+++ b/indra/llcommon/llinstancetracker.cpp
@@ -36,17 +36,16 @@
void LLInstanceTrackerBase::StaticBase::incrementDepth()
{
- apr_atomic_inc32(&sIterationNestDepth);
+ ++sIterationNestDepth;
}
void LLInstanceTrackerBase::StaticBase::decrementDepth()
{
llassert(sIterationNestDepth);
- apr_atomic_dec32(&sIterationNestDepth);
+ --sIterationNestDepth;
}
U32 LLInstanceTrackerBase::StaticBase::getDepth()
{
- apr_uint32_t data = apr_atomic_read32(&sIterationNestDepth);
- return data;
+ return sIterationNestDepth;
}