| Index: Source/wtf/RefPtr.h
|
| diff --git a/Source/wtf/RefPtr.h b/Source/wtf/RefPtr.h
|
| index e8b6667f335501ffd28e0a2a6b88875609227133..fb901ac59463a0b892a8c72e0a2ea3c8c1fc1f4e 100644
|
| --- a/Source/wtf/RefPtr.h
|
| +++ b/Source/wtf/RefPtr.h
|
| @@ -50,19 +50,19 @@ namespace WTF {
|
| ALWAYS_INLINE ~RefPtr() { derefIfNotNull(m_ptr); }
|
|
|
| T* get() const { return m_ptr; }
|
| -
|
| +
|
| void clear();
|
| PassRefPtr<T> release() { PassRefPtr<T> tmp = adoptRef(m_ptr); m_ptr = 0; return tmp; }
|
|
|
| T& operator*() const { return *m_ptr; }
|
| ALWAYS_INLINE T* 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 T* (RefPtr::*UnspecifiedBoolType);
|
| operator UnspecifiedBoolType() const { return m_ptr ? &RefPtr::m_ptr : 0; }
|
| -
|
| +
|
| RefPtr& operator=(const RefPtr&);
|
| RefPtr& operator=(T*);
|
| RefPtr& operator=(const PassRefPtr<T>&);
|
| @@ -79,7 +79,7 @@ namespace WTF {
|
| private:
|
| T* m_ptr;
|
| };
|
| -
|
| +
|
| template<typename T> template<typename U> inline RefPtr<T>::RefPtr(const PassRefPtr<U>& o)
|
| : m_ptr(o.leakRef())
|
| {
|
| @@ -101,7 +101,7 @@ namespace WTF {
|
| derefIfNotNull(ptr);
|
| return *this;
|
| }
|
| -
|
| +
|
| template<typename T> template<typename U> inline RefPtr<T>& RefPtr<T>::operator=(const RefPtr<U>& o)
|
| {
|
| T* optr = o.get();
|
| @@ -111,7 +111,7 @@ namespace WTF {
|
| derefIfNotNull(ptr);
|
| return *this;
|
| }
|
| -
|
| +
|
| template<typename T> inline RefPtr<T>& RefPtr<T>::operator=(T* optr)
|
| {
|
| refIfNotNull(optr);
|
| @@ -148,43 +148,43 @@ namespace WTF {
|
| }
|
|
|
| template<typename T, typename U> inline bool operator==(const RefPtr<T>& a, const RefPtr<U>& b)
|
| - {
|
| - return a.get() == b.get();
|
| + {
|
| + return a.get() == b.get();
|
| }
|
|
|
| template<typename T, typename U> inline bool operator==(const RefPtr<T>& a, U* b)
|
| - {
|
| - return a.get() == b;
|
| + {
|
| + return a.get() == b;
|
| }
|
| -
|
| - template<typename T, typename U> inline bool operator==(T* a, const RefPtr<U>& b)
|
| +
|
| + template<typename T, typename U> inline bool operator==(T* a, const RefPtr<U>& b)
|
| {
|
| - return a == b.get();
|
| + return a == b.get();
|
| }
|
| -
|
| +
|
| template<typename T, typename U> inline bool operator!=(const RefPtr<T>& a, const RefPtr<U>& b)
|
| - {
|
| - return a.get() != b.get();
|
| + {
|
| + return a.get() != b.get();
|
| }
|
|
|
| template<typename T, typename U> inline bool operator!=(const RefPtr<T>& a, U* b)
|
| {
|
| - return a.get() != b;
|
| + return a.get() != b;
|
| }
|
|
|
| template<typename T, typename U> inline bool operator!=(T* a, const RefPtr<U>& b)
|
| - {
|
| - return a != b.get();
|
| + {
|
| + return a != b.get();
|
| }
|
| -
|
| +
|
| template<typename T, typename U> inline RefPtr<T> static_pointer_cast(const RefPtr<U>& p)
|
| - {
|
| - return RefPtr<T>(static_cast<T*>(p.get()));
|
| + {
|
| + return RefPtr<T>(static_cast<T*>(p.get()));
|
| }
|
|
|
| template<typename T, typename U> inline RefPtr<T> const_pointer_cast(const RefPtr<U>& p)
|
| - {
|
| - return RefPtr<T>(const_cast<T*>(p.get()));
|
| + {
|
| + return RefPtr<T>(const_cast<T*>(p.get()));
|
| }
|
|
|
| template<typename T> inline T* getPtr(const RefPtr<T>& p)
|
|
|