| Index: Source/platform/heap/Heap.h
|
| diff --git a/Source/platform/heap/Heap.h b/Source/platform/heap/Heap.h
|
| index f006bb647cb850a3598420fbc56b7a2093ee1fda..2c0ef8038596942ac27a3e792f0a3126c6b71708 100644
|
| --- a/Source/platform/heap/Heap.h
|
| +++ b/Source/platform/heap/Heap.h
|
| @@ -1616,31 +1616,31 @@ template<
|
| typename MappedArg,
|
| typename HashArg = typename DefaultHash<KeyArg>::Hash,
|
| typename KeyTraitsArg = HashTraits<KeyArg>,
|
| - typename MappedTraitsArg = HashTraits<MappedArg> >
|
| + typename MappedTraitsArg = HashTraits<MappedArg>>
|
| class HeapHashMap : public HashMap<KeyArg, MappedArg, HashArg, KeyTraitsArg, MappedTraitsArg, HeapAllocator> { };
|
|
|
| template<
|
| typename ValueArg,
|
| typename HashArg = typename DefaultHash<ValueArg>::Hash,
|
| - typename TraitsArg = HashTraits<ValueArg> >
|
| + typename TraitsArg = HashTraits<ValueArg>>
|
| class HeapHashSet : public HashSet<ValueArg, HashArg, TraitsArg, HeapAllocator> { };
|
|
|
| template<
|
| typename ValueArg,
|
| typename HashArg = typename DefaultHash<ValueArg>::Hash,
|
| - typename TraitsArg = HashTraits<ValueArg> >
|
| + typename TraitsArg = HashTraits<ValueArg>>
|
| class HeapLinkedHashSet : public LinkedHashSet<ValueArg, HashArg, TraitsArg, HeapAllocator> { };
|
|
|
| template<
|
| typename ValueArg,
|
| size_t inlineCapacity = 0, // The inlineCapacity is just a dummy to match ListHashSet (off-heap).
|
| typename HashArg = typename DefaultHash<ValueArg>::Hash>
|
| -class HeapListHashSet : public ListHashSet<ValueArg, inlineCapacity, HashArg, HeapListHashSetAllocator<ValueArg, inlineCapacity> > { };
|
| +class HeapListHashSet : public ListHashSet<ValueArg, inlineCapacity, HashArg, HeapListHashSetAllocator<ValueArg, inlineCapacity>> { };
|
|
|
| template<
|
| typename Value,
|
| typename HashFunctions = typename DefaultHash<Value>::Hash,
|
| - typename Traits = HashTraits<Value> >
|
| + typename Traits = HashTraits<Value>>
|
| class HeapHashCountedSet : public HashCountedSet<Value, HashFunctions, Traits, HeapAllocator> { };
|
|
|
| template<typename T, size_t inlineCapacity = 0>
|
| @@ -2392,7 +2392,7 @@ struct GCInfoTrait<HeapHashSet<T, U, V>> : public GCInfoTrait<HashSet<T, U, V, H
|
| template<typename T, typename U, typename V>
|
| struct GCInfoTrait<HeapLinkedHashSet<T, U, V>> : public GCInfoTrait<LinkedHashSet<T, U, V, HeapAllocator>> { };
|
| template<typename T, size_t inlineCapacity, typename U>
|
| -struct GCInfoTrait<HeapListHashSet<T, inlineCapacity, U>> : public GCInfoTrait<ListHashSet<T, inlineCapacity, U, HeapListHashSetAllocator<T, inlineCapacity>> > { };
|
| +struct GCInfoTrait<HeapListHashSet<T, inlineCapacity, U>> : public GCInfoTrait<ListHashSet<T, inlineCapacity, U, HeapListHashSetAllocator<T, inlineCapacity>>> { };
|
| template<typename T, size_t inlineCapacity>
|
| struct GCInfoTrait<HeapVector<T, inlineCapacity>> : public GCInfoTrait<Vector<T, inlineCapacity, HeapAllocator>> { };
|
| template<typename T, size_t inlineCapacity>
|
|
|