| Index: third_party/WebKit/Source/wtf/RetainPtr.h
|
| diff --git a/third_party/WebKit/Source/wtf/RetainPtr.h b/third_party/WebKit/Source/wtf/RetainPtr.h
|
| index 56c155a73ea918ddcd0b59d761726348f81a8044..4528231ae6335031127a41c2199357c9fe00c70b 100644
|
| --- a/third_party/WebKit/Source/wtf/RetainPtr.h
|
| +++ b/third_party/WebKit/Source/wtf/RetainPtr.h
|
| @@ -106,11 +106,7 @@ public:
|
| PtrType operator->() const { return m_ptr; }
|
|
|
| bool operator!() const { return !m_ptr; }
|
| -
|
| - // This conversion operator allows implicit conversion to bool but not to
|
| - // other integer types.
|
| - typedef PtrType RetainPtr::*UnspecifiedBoolType;
|
| - operator UnspecifiedBoolType() const { return m_ptr ? &RetainPtr::m_ptr : 0; }
|
| + explicit operator bool() const { return m_ptr; }
|
|
|
| RetainPtr& operator=(const RetainPtr&);
|
| template <typename U> RetainPtr& operator=(const RetainPtr<U>&);
|
|
|