summaryrefslogtreecommitdiff
path: root/indra/llcommon
diff options
context:
space:
mode:
authorRider Linden <rider@lindenlab.com>2015-06-30 17:13:51 -0700
committerRider Linden <rider@lindenlab.com>2015-06-30 17:13:51 -0700
commiteca87bb24f4703ad96f8fe800a4973402f015f32 (patch)
treec8553a4c0d224cfb9baff80ffb3ec1bf97011ac4 /indra/llcommon
parentddb63e7fb70eefea200fbb385efe86e50e5c1e12 (diff)
parent45ddc6e91da8e48a21fac1d317e66524db304a17 (diff)
Merge
Diffstat (limited to 'indra/llcommon')
-rwxr-xr-xindra/llcommon/llrefcount.h9
1 files changed, 4 insertions, 5 deletions
diff --git a/indra/llcommon/llrefcount.h b/indra/llcommon/llrefcount.h
index 3836a9b5fb..1107973569 100755
--- a/indra/llcommon/llrefcount.h
+++ b/indra/llcommon/llrefcount.h
@@ -144,14 +144,9 @@ private:
};
/**
- * intrusive pointer support
- * this allows you to use boost::intrusive_ptr with any LLRefCount-derived type
- */
-/**
* intrusive pointer support for LLThreadSafeRefCount
* this allows you to use boost::intrusive_ptr with any LLThreadSafeRefCount-derived type
*/
-
inline void intrusive_ptr_add_ref(LLThreadSafeRefCount* p)
{
p->ref();
@@ -162,6 +157,10 @@ inline void intrusive_ptr_release(LLThreadSafeRefCount* p)
p->unref();
}
+/**
+ * intrusive pointer support
+ * this allows you to use boost::intrusive_ptr with any LLRefCount-derived type
+ */
inline void intrusive_ptr_add_ref(LLRefCount* p)
{
p->ref();