From 32761a6cee1d0dee366b885b7b9c777e67885688 Mon Sep 17 00:00:00 2001 From: Lorry Tar Creator Date: Sun, 10 Apr 2016 09:28:39 +0000 Subject: webkitgtk-2.4.11 --- Source/JavaScriptCore/API/JSRetainPtr.h | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) (limited to 'Source/JavaScriptCore/API/JSRetainPtr.h') diff --git a/Source/JavaScriptCore/API/JSRetainPtr.h b/Source/JavaScriptCore/API/JSRetainPtr.h index e40084080..574f7aaf1 100644 --- a/Source/JavaScriptCore/API/JSRetainPtr.h +++ b/Source/JavaScriptCore/API/JSRetainPtr.h @@ -10,7 +10,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. Neither the name of Apple Inc. ("Apple") nor the names of + * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of * its contributors may be used to endorse or promote products derived * from this software without specific prior written permission. * @@ -57,8 +57,11 @@ public: T operator->() const { return m_ptr; } bool operator!() const { return !m_ptr; } - explicit operator bool() const { return m_ptr; } + // This conversion operator allows implicit conversion to bool but not to other integer types. + typedef T JSRetainPtr::*UnspecifiedBoolType; + operator UnspecifiedBoolType() const { return m_ptr ? &JSRetainPtr::m_ptr : 0; } + JSRetainPtr& operator=(const JSRetainPtr&); template JSRetainPtr& operator=(const JSRetainPtr&); JSRetainPtr& operator=(T); @@ -72,16 +75,6 @@ private: T m_ptr; }; -inline JSRetainPtr adopt(JSStringRef o) -{ - return JSRetainPtr(Adopt, o); -} - -inline JSRetainPtr adopt(JSGlobalContextRef o) -{ - return JSRetainPtr(Adopt, o); -} - template inline JSRetainPtr::JSRetainPtr(const JSRetainPtr& o) : m_ptr(o.m_ptr) { -- cgit v1.2.1