Changeset 164190 in webkit

Timestamp:

Feb 16, 2014, 1:11:44 AM (12 years ago)

Author:

zandobersek@gmail.com

Message:

Reintroduce const qualifiers for return types of (Filter|Transform)Iterator::operator*()
​https://bugs.webkit.org/show_bug.cgi?id=126875

The const qualifiers for the return types of FilterIterator::operator*() and TransformIterator::operator*()
were removed in r161797 and r161802 because of compilation failures when using GCC and having an Iterator
type that already had the const qualifier. std::remove_const is now used to appease GCC and enforce the const
qualifier on the return type, regardless of the Iterator type and its qualifiers.

• wtf/IteratorAdaptors.h:

(WTF::FilterIterator::operator*):
(WTF::TransformIterator::operator*):

Location:

trunk/Source/WTF

Files:

• ChangeLog (modified) (1 diff)
• wtf/IteratorAdaptors.h (modified) (3 diffs)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2014-02-16  Zan Dobersek  <zdobersek@igalia.com>
+
+        Reintroduce const qualifiers for return types of (Filter|Transform)Iterator::operator*()
+        https://bugs.webkit.org/show_bug.cgi?id=126875
+
+        The const qualifiers for the return types of FilterIterator::operator*() and TransformIterator::operator*()
+        were removed in r161797 and r161802 because of compilation failures when using GCC and having an Iterator
+        type that already had the const qualifier. std::remove_const is now used to appease GCC and enforce the const
+        qualifier on the return type, regardless of the Iterator type and its qualifiers.
+
+        * wtf/IteratorAdaptors.h:
+        (WTF::FilterIterator::operator*):
+        (WTF::TransformIterator::operator*):
+
 2014-02-15  Filip Pizlo  <fpizlo@apple.com>
 

trunk/Source/WTF/wtf/IteratorAdaptors.h

@@ -27 +27 @@
 #define WTF_IteratorAdaptors_h
 
+#include <type_traits>
+
 namespace WTF {
 
@@ -51 +53 @@
     }
 
-    decltype(*std::declval<Iterator>()) operator*() const
+    const typename std::remove_const<decltype(*std::declval<Iterator>())>::type operator*() const
     {
         ASSERT(m_iter != m_end);
@@ -88 +90 @@
     }
 
-    decltype(std::declval<Transform>()(*std::declval<Iterator>())) operator*() const
+    const typename std::remove_const<decltype(std::declval<Transform>()(*std::declval<Iterator>()))>::type operator*() const
     {
         return m_transform(*m_iter);