diff options
Diffstat (limited to 'JavaScriptCore/wtf/HashSet.h')
| -rw-r--r-- | JavaScriptCore/wtf/HashSet.h | 47 |
1 files changed, 8 insertions, 39 deletions
diff --git a/JavaScriptCore/wtf/HashSet.h b/JavaScriptCore/wtf/HashSet.h index 4429490..66639e4 100644 --- a/JavaScriptCore/wtf/HashSet.h +++ b/JavaScriptCore/wtf/HashSet.h @@ -48,7 +48,7 @@ namespace WTF { HashFunctions, ValueTraits, ValueTraits> HashTableType; public: - typedef HashTableIteratorAdapter<HashTableType, ValueType> iterator; + typedef HashTableConstIteratorAdapter<HashTableType, ValueType> iterator; typedef HashTableConstIteratorAdapter<HashTableType, ValueType> const_iterator; void swap(HashSet&); @@ -57,13 +57,10 @@ namespace WTF { int capacity() const; bool isEmpty() const; - iterator begin(); - iterator end(); - const_iterator begin() const; - const_iterator end() const; + iterator begin() const; + iterator end() const; - iterator find(const ValueType&); - const_iterator find(const ValueType&) const; + iterator find(const ValueType&) const; bool contains(const ValueType&) const; // An alternate version of find() that finds the object by hashing and comparing @@ -71,8 +68,7 @@ namespace WTF { // must have the following function members: // static unsigned hash(const T&); // static bool equal(const ValueType&, const T&); - template<typename T, typename HashTranslator> iterator find(const T&); - template<typename T, typename HashTranslator> const_iterator find(const T&) const; + template<typename T, typename HashTranslator> iterator find(const T&) const; template<typename T, typename HashTranslator> bool contains(const T&) const; // The return value is a pair of an interator to the new value's location, @@ -137,37 +133,19 @@ namespace WTF { } template<typename T, typename U, typename V> - inline typename HashSet<T, U, V>::iterator HashSet<T, U, V>::begin() + inline typename HashSet<T, U, V>::iterator HashSet<T, U, V>::begin() const { return m_impl.begin(); } template<typename T, typename U, typename V> - inline typename HashSet<T, U, V>::iterator HashSet<T, U, V>::end() + inline typename HashSet<T, U, V>::iterator HashSet<T, U, V>::end() const { return m_impl.end(); } template<typename T, typename U, typename V> - inline typename HashSet<T, U, V>::const_iterator HashSet<T, U, V>::begin() const - { - return m_impl.begin(); - } - - template<typename T, typename U, typename V> - inline typename HashSet<T, U, V>::const_iterator HashSet<T, U, V>::end() const - { - return m_impl.end(); - } - - template<typename T, typename U, typename V> - inline typename HashSet<T, U, V>::iterator HashSet<T, U, V>::find(const ValueType& value) - { - return m_impl.find(value); - } - - template<typename T, typename U, typename V> - inline typename HashSet<T, U, V>::const_iterator HashSet<T, U, V>::find(const ValueType& value) const + inline typename HashSet<T, U, V>::iterator HashSet<T, U, V>::find(const ValueType& value) const { return m_impl.find(value); } @@ -181,15 +159,6 @@ namespace WTF { template<typename Value, typename HashFunctions, typename Traits> template<typename T, typename HashTranslator> typename HashSet<Value, HashFunctions, Traits>::iterator - inline HashSet<Value, HashFunctions, Traits>::find(const T& value) - { - typedef HashSetTranslatorAdapter<ValueType, ValueTraits, T, HashTranslator> Adapter; - return m_impl.template find<T, Adapter>(value); - } - - template<typename Value, typename HashFunctions, typename Traits> - template<typename T, typename HashTranslator> - typename HashSet<Value, HashFunctions, Traits>::const_iterator inline HashSet<Value, HashFunctions, Traits>::find(const T& value) const { typedef HashSetTranslatorAdapter<ValueType, ValueTraits, T, HashTranslator> Adapter; |