summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcallum_linden <none@none>2014-10-17 20:24:02 -0700
committercallum_linden <none@none>2014-10-17 20:24:02 -0700
commitb23afb709d194d5000963de55c2eb8d19031b0f7 (patch)
tree67202f708cdb2856070e28cdae1713641ada6977
parent0c2082d95e3df3b710cdbdb285c75ae90a7448b5 (diff)
Update to build on Xcode 6.0: fix Boost intrusive_ptr scoping issue
-rwxr-xr-xindra/llcommon/llrefcount.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llcommon/llrefcount.h b/indra/llcommon/llrefcount.h
index 72011d04a0..52b6f8eaa9 100755
--- a/indra/llcommon/llrefcount.h
+++ b/indra/llcommon/llrefcount.h
@@ -151,8 +151,8 @@ private:
* intrusive pointer support for LLThreadSafeRefCount
* this allows you to use boost::intrusive_ptr with any LLThreadSafeRefCount-derived type
*/
-namespace boost
-{
+// namespace boost
+// {
inline void intrusive_ptr_add_ref(LLThreadSafeRefCount* p)
{
p->ref();
@@ -172,7 +172,7 @@ namespace boost
{
p->unref();
}
-};
+//};