diff options
author | Ychebotarev ProductEngine <ychebotarev@productengine.com> | 2010-02-02 13:20:00 +0200 |
---|---|---|
committer | Ychebotarev ProductEngine <ychebotarev@productengine.com> | 2010-02-02 13:20:00 +0200 |
commit | fb174d1de39a2b551030da09e0dd9262b79278df (patch) | |
tree | e68c81bfbb13de6eff99436a6acb4b2179dd2012 /indra/llcommon/llpointer.h | |
parent | e6538ddbe95f0c297e67b9f5decabfcb6241ed2a (diff) | |
parent | 9b0518dd8e46dfe74eaa0f7622b1486dbde32b82 (diff) |
merge
--HG--
branch : product-engine
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); } |