livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

BUILDFIX: gcc fixes

master
Richard Linden 2013-05-21 10:28:21 -07:00
parent 7aeac00e44
commit 269fb97eba
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
indra/llcommon/llpointer.h
View File

@ -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);
}
}
};