diff options
author | gabriel lee <gabriel@lindenlab.com> | 2010-02-02 10:58:47 +0000 |
---|---|---|
committer | gabriel lee <gabriel@lindenlab.com> | 2010-02-02 10:58:47 +0000 |
commit | 95d0df4ab05c4cfcc78f684ab28d36b9cc84410e (patch) | |
tree | b1621cd22044edade98019af9d1b77383e3b88ef /indra/llcommon/llpointer.h | |
parent | 5dfdb0d5a41143512180390193ce79644bcb9469 (diff) | |
parent | 4ad357ec70e15afdfe78816990cb23c7ba17619c (diff) |
merged back my last changes
Diffstat (limited to 'indra/llcommon/llpointer.h')
-rw-r--r-- | indra/llcommon/llpointer.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/llcommon/llpointer.h b/indra/llcommon/llpointer.h index 2c37eadcc6..e6c736a263 100644 --- a/indra/llcommon/llpointer.h +++ b/indra/llcommon/llpointer.h @@ -95,7 +95,6 @@ public: bool notNull() const { return (mPointer != NULL); } operator Type*() const { return mPointer; } - operator const Type*() const { return mPointer; } bool operator !=(Type* ptr) const { return (mPointer != ptr); } bool operator ==(Type* ptr) const { return (mPointer == ptr); } bool operator ==(const LLPointer<Type>& ptr) const { return (mPointer == ptr.mPointer); } |