From 269fb97eba380baf5674178294bf86fb01cd712c Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Tue, 21 May 2013 10:28:21 -0700
Subject: BUILDFIX: gcc fixes
---
indra/llcommon/llpointer.h | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
(limited to 'indra')
diff --git a/indra/llcommon/llpointer.h b/indra/llcommon/llpointer.h
index 3273a85af1..c83e55577d 100644
--- a/indra/llcommon/llpointer.h
+++ b/indra/llcommon/llpointer.h
@@ -170,7 +170,8 @@ class LLCopyOnWritePointer : public LLPointer<Type>
{
public:
typedef LLCopyOnWritePointer<Type> self_t;
-
+ typedef LLPointer<Type> pointer_t;
+
LLCopyOnWritePointer()
{}
@@ -185,14 +186,14 @@ public:
Type* write()
{
makeUnique();
- return mPointer;
+ return pointer_t::mPointer;
}
void makeUnique()
{
- if (LLPointer<Type>::notNull() && mPointer->getNumRefs() > 1)
+ if (pointer_t::notNull() && pointer_t::mPointer->getNumRefs() > 1)
{
- *(LLPointer<Type>*)(this) = new Type(*mPointer);
+ *(pointer_t*)(this) = new Type(*pointer_t::mPointer);
}
}
};
--
cgit v1.2.3