Title: [155232] trunk/Source/WTF
Revision
155232
Author
akl...@apple.com
Date
2013-09-06 19:35:57 -0700 (Fri, 06 Sep 2013)

Log Message

Remove old workaround for Nokia's Harmattan GCC on Qt/ARM.
<https://webkit.org/b/37253>

Reviewed by Anders Carlsson.

Apparently this was a workaround for GCC getting stuck in an infinite loop
when building for ARM in a Nokia SDK over 2 years ago.

I think it's safe to remove this now, but if I'm wrong, and you're reading
this ChangeLog wondering why I did this to you, feel free to put it back in.

* wtf/PassRefPtr.h:
(WTF::refIfNotNull):
(WTF::derefIfNotNull):

Modified Paths

Diff

Modified: trunk/Source/WTF/ChangeLog (155231 => 155232)


--- trunk/Source/WTF/ChangeLog	2013-09-07 02:34:32 UTC (rev 155231)
+++ trunk/Source/WTF/ChangeLog	2013-09-07 02:35:57 UTC (rev 155232)
@@ -1,5 +1,22 @@
 2013-09-06  Andreas Kling  <akl...@apple.com>
 
+        Remove old workaround for Nokia's Harmattan GCC on Qt/ARM.
+        <https://webkit.org/b/37253>
+
+        Reviewed by Anders Carlsson.
+
+        Apparently this was a workaround for GCC getting stuck in an infinite loop
+        when building for ARM in a Nokia SDK over 2 years ago.
+
+        I think it's safe to remove this now, but if I'm wrong, and you're reading
+        this ChangeLog wondering why I did this to you, feel free to put it back in.
+
+        * wtf/PassRefPtr.h:
+        (WTF::refIfNotNull):
+        (WTF::derefIfNotNull):
+
+2013-09-06  Andreas Kling  <akl...@apple.com>
+
         Remove unused RefPtr(PlacementNewAdopt) constructor.
         <https://webkit.org/b/120914>
 

Modified: trunk/Source/WTF/wtf/PassRefPtr.h (155231 => 155232)


--- trunk/Source/WTF/wtf/PassRefPtr.h	2013-09-07 02:34:32 UTC (rev 155231)
+++ trunk/Source/WTF/wtf/PassRefPtr.h	2013-09-07 02:35:57 UTC (rev 155232)
@@ -32,28 +32,18 @@
 
     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) { }
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to