remove template c++11'ism in Heap.h

Source/platform/heap/Heap.h

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 1085 matching lines @@
     // with the visitor and the closure pointer. Returns false when there is
     // nothing more to do.
     static bool popAndInvokeWeakPointerCallback(Visitor*);
 
     // Register an ephemeron table for fixed-point iteration.
     static void registerWeakTable(void* containerObject, EphemeronCallback, EphemeronCallback);
 #if ENABLE(ASSERT)
     static bool weakTableRegistered(const void*);
 #endif
 
-    template<typename T, typename HeapTraits = HeapTypeTrait<T> > static Address allocate(size_t);
+    template<typename T, typename HeapTraits> static Address allocate(size_t);
+    // TODO(mostynb) remove this once c++11 is allowed, in favour of the one

[haraken, 2014/09/10 00:51:10]

TODO(mostynb) => FIXME

[Mostyn Bramley-Moore, 2014/09/10 08:09:16]

Done.

+    // above:
+    template<typename T> static Address allocate(size_t);
+
     template<typename T> static Address reallocate(void* previous, size_t);
 
     static void collectGarbage(ThreadState::StackState);
     static void collectGarbageForTerminatingThread(ThreadState*);
     static void collectAllGarbage();
     static void processMarkingStackEntries(int* numberOfMarkingThreads);
     static void processMarkingStackOnMultipleThreads();
     static void processMarkingStackInParallel();
     template<CallbackInvocationMode Mode> static void processMarkingStack();
     static void postMarkingProcessing();
@@ skipping 449 matching lines @@
 Address Heap::allocate(size_t size)
 {
     ThreadState* state = ThreadStateFor<ThreadingTrait<T>::Affinity>::state();
     ASSERT(state->isAllocationAllowed());
     const GCInfo* gcInfo = GCInfoTrait<T>::get();
     int heapIndex = HeapTraits::index(gcInfo->hasFinalizer());
     BaseHeap* heap = state->heap(heapIndex);
     return static_cast<typename HeapTraits::HeapType*>(heap)->allocate(size, gcInfo);
 }
 
+// TODO(mostynb) remove this once c++11 is allowed, in favour of the one above:

[haraken, 2014/09/10 00:51:10]

Ditto.

[Mostyn Bramley-Moore, 2014/09/10 08:09:16]

Done.

+template<typename T>
+Address Heap::allocate(size_t size)
+{
+    ThreadState* state = ThreadStateFor<ThreadingTrait<T>::Affinity>::state();
+    ASSERT(state->isAllocationAllowed());
+    const GCInfo* gcInfo = GCInfoTrait<T>::get();
+    int heapIndex = HeapTypeTrait<T>::index(gcInfo->hasFinalizer());
+    BaseHeap* heap = state->heap(heapIndex);
+    return static_cast<typename HeapTypeTrait<T>::HeapType*>(heap)->allocate(size, gcInfo);
+}
+
 template<typename T>
 Address Heap::reallocate(void* previous, size_t size)
 {
     if (!size) {
         // If the new size is 0 this is equivalent to either
         // free(previous) or malloc(0). In both cases we do
         // nothing and return 0.
         return 0;
     }
     ThreadState* state = ThreadStateFor<ThreadingTrait<T>::Affinity>::state();
@@ skipping 982 matching lines @@
 };
 
 template<typename T>
 struct IfWeakMember<WeakMember<T> > {
     static bool isDead(Visitor* visitor, const WeakMember<T>& t) { return !visitor->isAlive(t.get()); }
 };
 
 }
 
 #endif // Heap_h