diff options
| author | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2014-10-13 17:05:07 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2014-10-14 09:11:16 +0200 |
| commit | 53d70cef06876c306b4aaaadd36365dc8431fd8a (patch) | |
| tree | 2d37dee13a62754b76a7a8a6f50551c7d1f1dec7 /Source/WTF | |
| parent | 18c42734c0f7668b184c81ca6e77eb0a6cff4f14 (diff) | |
| download | qtwebkit-53d70cef06876c306b4aaaadd36365dc8431fd8a.tar.gz | |
Get rid of old harmattan workaround hurting Qt on ARM
Change-Id: Ieecee7c05e78117e8c9fc335f60970e2144ede81
Reviewed-by: Michael Bruning <michael.bruning@digia.com>
Diffstat (limited to 'Source/WTF')
| -rw-r--r-- | Source/WTF/wtf/PassRefPtr.h | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/Source/WTF/wtf/PassRefPtr.h b/Source/WTF/wtf/PassRefPtr.h index 1e1c777ad..848fc5fd3 100644 --- a/Source/WTF/wtf/PassRefPtr.h +++ b/Source/WTF/wtf/PassRefPtr.h @@ -32,28 +32,18 @@ namespace WTF { inline void adopted(const void*) { } -#if !(PLATFORM(QT) && CPU(ARM)) - #define REF_DEREF_INLINE ALWAYS_INLINE -#else - // Older version of gcc used by Harmattan SDK fails to build with ALWAYS_INLINE. - // See https://bugs.webkit.org/show_bug.cgi?id=37253 for details. - #define REF_DEREF_INLINE inline -#endif - - template<typename T> REF_DEREF_INLINE void refIfNotNull(T* ptr) + template<typename T> ALWAYS_INLINE void refIfNotNull(T* ptr) { if (LIKELY(ptr != 0)) ptr->ref(); } - template<typename T> REF_DEREF_INLINE void derefIfNotNull(T* ptr) + template<typename T> ALWAYS_INLINE void derefIfNotNull(T* ptr) { if (LIKELY(ptr != 0)) ptr->deref(); } - #undef REF_DEREF_INLINE - template<typename T> class PassRefPtr { public: PassRefPtr() : m_ptr(0) { } |