| Index: third_party/WebKit/Source/wtf/PassOwnPtr.h
|
| diff --git a/third_party/WebKit/Source/wtf/PassOwnPtr.h b/third_party/WebKit/Source/wtf/PassOwnPtr.h
|
| index ad3190d3b7027559486b9bdf06305a31356f03b3..131cb381798fbc7a3498bdcbf64db7bf16be3618 100644
|
| --- a/third_party/WebKit/Source/wtf/PassOwnPtr.h
|
| +++ b/third_party/WebKit/Source/wtf/PassOwnPtr.h
|
| @@ -64,11 +64,7 @@ public:
|
| PtrType operator->() const { ASSERT(m_ptr); 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 PassOwnPtr::*UnspecifiedBoolType;
|
| - operator UnspecifiedBoolType() const { return m_ptr ? &PassOwnPtr::m_ptr : 0; }
|
| + explicit operator bool() const { return m_ptr; }
|
|
|
| template <typename U> friend PassOwnPtr<U> adoptPtr(U*);
|
| template <typename U> friend PassOwnPtr<U[]> adoptArrayPtr(U*);
|
|
|