Changeset 35425 in webkit for trunk/JavaScriptCore/wtf/Vector.h

Timestamp:

Jul 29, 2008, 11:51:26 AM (17 years ago)

Author:

Adam Roben

Message:

Change Vector::find to return an index instead of an iterator

Indices are more natural than iterators when working with Vector.

Reviewed by John Sullivan.

• wtf/Vector.h: (WTF::Vector::find): Changed to iterate the Vector manually and return the index of the found item, rather than an iterator. When the item could not be found, we return WTF::notFound.

File:

• trunk/JavaScriptCore/wtf/Vector.h (modified) (3 diffs)

trunk/JavaScriptCore/wtf/Vector.h

@@ -37 +37 @@
     using std::max;
     
+    const size_t notFound = static_cast<size_t>(-1);
+
     template <bool needsDestruction, typename T>
     class VectorDestructor;
@@ -461 +463 @@
         const T& last() const { return at(size() - 1); }
 
-        template<typename U> iterator find(const U& value) { return std::find(begin(), end(), value); }
-        template<typename U> const_iterator find(const U& value) const { return std::find(begin(), end(), value); }
+        template<typename U> size_t find(const U&) const;
 
         void shrink(size_t size);
@@ -586 +587 @@
 
         return *this;
+    }
+
+    template<typename T, size_t inlineCapacity>
+    template<typename U>
+    size_t Vector<T, inlineCapacity>::find(const U& value) const
+    {
+        for (size_t i = 0; i < size(); ++i) {
+            if (at(i) == value)
+                return i;
+        }
+        return notFound;
     }