summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorRichard Linden <none@none>2013-05-21 10:28:21 -0700
committerRichard Linden <none@none>2013-05-21 10:28:21 -0700
commit269fb97eba380baf5674178294bf86fb01cd712c (patch)
tree1e887688ebc0c7e8184c649e5872d3187fc97294 /indra
parent7aeac00e444ebf3fdc73bdc4be3c47bb9ae65e43 (diff)
BUILDFIX: gcc fixes
Diffstat (limited to 'indra')
-rw-r--r--indra/llcommon/llpointer.h9
1 files changed, 5 insertions, 4 deletions
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);
}
}
};