summaryrefslogtreecommitdiff
path: root/indra/llcommon
diff options
context:
space:
mode:
authorcallum_linden <none@none>2014-10-17 20:24:58 -0700
committercallum_linden <none@none>2014-10-17 20:24:58 -0700
commit3d35d2f78da8a12336df3f12374d91614db2f035 (patch)
treee7ec047a35bfc36c7e13506c6a162c422c5c6e7d /indra/llcommon
parentb23afb709d194d5000963de55c2eb8d19031b0f7 (diff)
Update to build on Xcode 6.0: fix Boost intrusive_ptr scoping issue (part 2 - tidy up)
Diffstat (limited to 'indra/llcommon')
-rwxr-xr-xindra/llcommon/llrefcount.h36
1 files changed, 16 insertions, 20 deletions
diff --git a/indra/llcommon/llrefcount.h b/indra/llcommon/llrefcount.h
index 52b6f8eaa9..3836a9b5fb 100755
--- a/indra/llcommon/llrefcount.h
+++ b/indra/llcommon/llrefcount.h
@@ -151,29 +151,25 @@ private:
* intrusive pointer support for LLThreadSafeRefCount
* this allows you to use boost::intrusive_ptr with any LLThreadSafeRefCount-derived type
*/
-// namespace boost
-// {
- inline void intrusive_ptr_add_ref(LLThreadSafeRefCount* p)
- {
- p->ref();
- }
- inline void intrusive_ptr_release(LLThreadSafeRefCount* p)
- {
- p->unref();
- }
-
- inline void intrusive_ptr_add_ref(LLRefCount* p)
- {
- p->ref();
- }
+inline void intrusive_ptr_add_ref(LLThreadSafeRefCount* p)
+{
+ p->ref();
+}
- inline void intrusive_ptr_release(LLRefCount* p)
- {
- p->unref();
- }
-//};
+inline void intrusive_ptr_release(LLThreadSafeRefCount* p)
+{
+ p->unref();
+}
+inline void intrusive_ptr_add_ref(LLRefCount* p)
+{
+ p->ref();
+}
+inline void intrusive_ptr_release(LLRefCount* p)
+{
+ p->unref();
+}
#endif