[oilpan] Make the oilpan branch build on Mac.

Source/wtf/HashTable.h

 /*
  * Copyright (C) 2005, 2006, 2007, 2008, 2011, 2012 Apple Inc. All rights reserved.
  * Copyright (C) 2008 David Levin <levin@chromium.org>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
@@ skipping 115 matching lines @@
                 --m_position;
         }
 
         HashTableConstIterator(const HashTableType* table, PointerType position, PointerType endPosition, IteratorWitnessType witness)
             : m_position(position)
             , m_endPosition(endPosition)
 #if CHECK_HASHTABLE_ITERATORS
             , m_witness(witness)
 #endif
         {
-            Allocator::template IteratorWitness<HashTableType>::verify(witness, table);
+            Allocator::template IteratorWitness<HashTableType>::verifyWitness(witness, table);
             addIterator(table, this);
             skipEmptyBuckets();
         }
 
         HashTableConstIterator(const HashTableType* table, PointerType position, PointerType endPosition, HashItemKnownGoodTag, IteratorWitnessType witness)
             : m_position(position)
             , m_endPosition(endPosition)
 #if CHECK_HASHTABLE_ITERATORS
             , m_witness(witness)
 #endif
         {
-            Allocator::template IteratorWitness<HashTableType>::verify(witness, table);
+            Allocator::template IteratorWitness<HashTableType>::verifyWitness(witness, table);
             addIterator(table, this);
         }
 
     public:
         HashTableConstIterator()
 #if CHECK_HASHTABLE_ITERATORS
             : m_witness(0)
 #endif
         {
             addIterator(static_cast<const HashTableType*>(0), this);
@@ skipping 70 matching lines @@
         bool operator!=(const iterator& other) const
         {
             return *this != static_cast<const_iterator>(other);
         }
 
     private:
         void checkValidity() const
         {
 #if CHECK_HASHTABLE_ITERATORS
             ASSERT(m_table);
-            Allocator::template IteratorWitness<HashTableType>::verify(m_witness, m_table);
+            Allocator::template IteratorWitness<HashTableType>::verifyWitness(m_witness, m_table);
 #endif
         }
 
 
 #if CHECK_HASHTABLE_ITERATORS
         void checkValidity(const const_iterator& other) const
         {
             ASSERT(m_table);
-            Allocator::template IteratorWitness<HashTableType>::verify(m_witness, m_table);
+            Allocator::template IteratorWitness<HashTableType>::verifyWitness(m_witness, m_table);
             ASSERT_UNUSED(other, other.m_table);
             ASSERT(m_table == other.m_table);
         }
 #else
         void checkValidity(const const_iterator&) const { }
 #endif
 
         PointerType m_position;
         PointerType m_endPosition;
 
@@ skipping 1139 matching lines @@
     {
         typedef HashTable<T, U, V, W, X, Y, Allocator> HashTableType;
         typedef HashTableConstIterator<T, U, V, W, X, Y, Allocator> const_iterator;
 
 
         // Delete iterator from doubly-linked list of iterators.
         if (!it->m_table) {
             ASSERT(!it->m_next);
             ASSERT(!it->m_previous);
         } else {
-            Allocator::template IteratorWitness<HashTableType>::verify(it->m_witness, it->m_table);
+            Allocator::template IteratorWitness<HashTableType>::verifyWitness(it->m_witness, it->m_table);
             MutexLocker lock(*it->m_table->m_mutex);
             if (it->m_next) {
                 ASSERT(it->m_next->m_previous == it);
                 it->m_next->m_previous = it->m_previous;
             }
             if (it->m_previous) {
                 ASSERT(it->m_table->m_iterators != it);
                 ASSERT(it->m_previous->m_next == it);
                 it->m_previous->m_next = it->m_next;
             } else {
@@ skipping 97 matching lines @@
     inline bool operator!=(const HashTableIteratorAdapter<T, U>& a, const HashTableConstIteratorAdapter<T, U>& b)
     {
         return a.m_impl != b.m_impl;
     }
 
 } // namespace WTF
 
 #include <wtf/HashIterators.h>
 
 #endif // WTF_HashTable_h