New return value syntax for HashTable and HashMap nested types

Source/wtf/HashMap.h

 /*
  * Copyright (C) 2005, 2006, 2007, 2008, 2011 Apple Inc. All rights reserved.
  *
  * 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,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 269 matching lines @@
         return m_impl.capacity();
     }
 
     template<typename T, typename U, typename V, typename W, typename X, typename Y>
     inline bool HashMap<T, U, V, W, X, Y>::isEmpty() const
     {
         return m_impl.isEmpty();
     }
 
     template<typename T, typename U, typename V, typename W, typename X, typename Y>
-    inline typename HashMap<T, U, V, W, X, Y>::iterator HashMap<T, U, V, W, X, Y>::begin()
+    inline auto HashMap<T, U, V, W, X, Y>::begin() -> iterator
     {
         return m_impl.begin();
     }
 
     template<typename T, typename U, typename V, typename W, typename X, typename Y>
-    inline typename HashMap<T, U, V, W, X, Y>::iterator HashMap<T, U, V, W, X, Y>::end()
+    inline auto HashMap<T, U, V, W, X, Y>::end() -> iterator
     {
         return m_impl.end();
     }
 
     template<typename T, typename U, typename V, typename W, typename X, typename Y>
-    inline typename HashMap<T, U, V, W, X, Y>::const_iterator HashMap<T, U, V, W, X, Y>::begin() const
+    inline auto HashMap<T, U, V, W, X, Y>::begin() const -> const_iterator
     {
         return m_impl.begin();
     }
 
     template<typename T, typename U, typename V, typename W, typename X, typename Y>
-    inline typename HashMap<T, U, V, W, X, Y>::const_iterator HashMap<T, U, V, W, X, Y>::end() const
+    inline auto HashMap<T, U, V, W, X, Y>::end() const -> const_iterator
     {
         return m_impl.end();
     }
 
     template<typename T, typename U, typename V, typename W, typename X, typename Y>
-    inline typename HashMap<T, U, V, W, X, Y>::iterator HashMap<T, U, V, W, X, Y>::find(KeyPeekInType key)
+    inline auto HashMap<T, U, V, W, X, Y>::find(KeyPeekInType key) -> iterator
     {
         return m_impl.find(key);
     }
 
     template<typename T, typename U, typename V, typename W, typename X, typename Y>
-    inline typename HashMap<T, U, V, W, X, Y>::const_iterator HashMap<T, U, V, W, X, Y>::find(KeyPeekInType key) const
+    auto HashMap<T, U, V, W, X, Y>::find(KeyPeekInType key) const -> const_iterator
     {
         return m_impl.find(key);
     }
 
     template<typename T, typename U, typename V, typename W, typename X, typename Y>
     inline bool HashMap<T, U, V, W, X, Y>::contains(KeyPeekInType key) const
     {
         return m_impl.contains(key);
     }
 
     template<typename T, typename U, typename V, typename W, typename X, typename Y>
     template<typename HashTranslator, typename TYPE>
-    inline typename HashMap<T, U, V, W, X, Y>::iterator
-    HashMap<T, U, V, W, X, Y>::find(const TYPE& value)
+    auto HashMap<T, U, V, W, X, Y>::find(const TYPE& value) -> iterator
     {
         return m_impl.template find<HashMapTranslatorAdapter<ValueTraits, HashTranslator>>(value);
     }
 
     template<typename T, typename U, typename V, typename W, typename X, typename Y>
     template<typename HashTranslator, typename TYPE>
-    inline typename HashMap<T, U, V, W, X, Y>::const_iterator
-    HashMap<T, U, V, W, X, Y>::find(const TYPE& value) const
+    auto HashMap<T, U, V, W, X, Y>::find(const TYPE& value) const -> const_iterator
     {
         return m_impl.template find<HashMapTranslatorAdapter<ValueTraits, HashTranslator>>(value);
     }
 
     template<typename T, typename U, typename V, typename W, typename X, typename Y>
     template<typename HashTranslator, typename TYPE>
     inline bool
     HashMap<T, U, V, W, X, Y>::contains(const TYPE& value) const
     {
         return m_impl.template contains<HashMapTranslatorAdapter<ValueTraits, HashTranslator>>(value);
     }
 
     template<typename T, typename U, typename V, typename W, typename X, typename Y>
-    typename HashMap<T, U, V, W, X, Y>::AddResult
-    HashMap<T, U, V, W, X, Y>::inlineAdd(KeyPeekInType key, MappedPassInReferenceType mapped)
+    auto HashMap<T, U, V, W, X, Y>::inlineAdd(KeyPeekInType key, MappedPassInReferenceType mapped) -> AddResult
     {
         return m_impl.template add<HashMapTranslator<ValueTraits, HashFunctions>>(key, mapped);
     }
 
     template<typename T, typename U, typename V, typename W, typename X, typename Y>
-    typename HashMap<T, U, V, W, X, Y>::AddResult
-    HashMap<T, U, V, W, X, Y>::set(KeyPeekInType key, MappedPassInType mapped)
+    auto HashMap<T, U, V, W, X, Y>::set(KeyPeekInType key, MappedPassInType mapped) -> AddResult
     {
         AddResult result = inlineAdd(key, mapped);
         if (!result.isNewEntry) {
             // The inlineAdd call above found an existing hash table entry; we need to set the mapped value.
             MappedTraits::store(mapped, result.storedValue->value);
         }
         return result;
     }
 
     template<typename T, typename U, typename V, typename W, typename X, typename Y>
     template<typename HashTranslator, typename TYPE>
-    typename HashMap<T, U, V, W, X, Y>::AddResult
-    HashMap<T, U, V, W, X, Y>::add(const TYPE& key, MappedPassInType value)
+    auto HashMap<T, U, V, W, X, Y>::add(const TYPE& key, MappedPassInType value) -> AddResult
     {
         return m_impl.template addPassingHashCode<HashMapTranslatorAdapter<ValueTraits, HashTranslator>>(key, value);
     }
 
     template<typename T, typename U, typename V, typename W, typename X, typename Y>
-    typename HashMap<T, U, V, W, X, Y>::AddResult
-    HashMap<T, U, V, W, X, Y>::add(KeyPeekInType key, MappedPassInType mapped)
+    auto HashMap<T, U, V, W, X, Y>::add(KeyPeekInType key, MappedPassInType mapped) -> AddResult
     {
         return inlineAdd(key, mapped);
     }
 
     template<typename T, typename U, typename V, typename W, typename X, typename Y>
-    typename HashMap<T, U, V, W, X, Y>::MappedPeekType
-    HashMap<T, U, V, W, X, Y>::get(KeyPeekInType key) const
+    auto HashMap<T, U, V, W, X, Y>::get(KeyPeekInType key) const -> MappedPeekType
     {
         ValueType* entry = const_cast<HashTableType&>(m_impl).lookup(key);
         if (!entry)
             return MappedTraits::peek(MappedTraits::emptyValue());
         return MappedTraits::peek(entry->value);
     }
 
     template<typename T, typename U, typename V, typename W, typename X, typename Y>
     inline void HashMap<T, U, V, W, X, Y>::remove(iterator it)
     {
         m_impl.remove(it.m_impl);
     }
 
     template<typename T, typename U, typename V, typename W, typename X, typename Y>
     inline void HashMap<T, U, V, W, X, Y>::remove(KeyPeekInType key)
     {
         remove(find(key));
     }
 
     template<typename T, typename U, typename V, typename W, typename X, typename Y>
     inline void HashMap<T, U, V, W, X, Y>::clear()
     {
         m_impl.clear();
     }
 
     template<typename T, typename U, typename V, typename W, typename X, typename Y>
-    typename HashMap<T, U, V, W, X, Y>::MappedPassOutType
-    HashMap<T, U, V, W, X, Y>::take(KeyPeekInType key)
+    auto HashMap<T, U, V, W, X, Y>::take(KeyPeekInType key) -> MappedPassOutType
     {
         iterator it = find(key);
         if (it == end())
             return MappedTraits::passOut(MappedTraits::emptyValue());
         MappedPassOutType result = MappedTraits::passOut(it->value);
         remove(it);
         return result;
     }
 
     template<typename T, typename U, typename V, typename W, typename X, typename Y>
@@ skipping 69 matching lines @@
 struct NeedsTracing<HashMap<T, U, V, W, X>> {
     static const bool value = false;
 };
 #endif
 
 } // namespace WTF
 
 using WTF::HashMap;
 
 #endif /* WTF_HashMap_h */