Remove legacy heap [re]alloc templates

djphoenix · Nov 22, 2016 · 0215689 · 0215689
1 parent f1f11cf
commit 0215689
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 11 deletions.
diff --git a/src/kernlib/include/list.hpp b/src/kernlib/include/list.hpp
@@ -29,7 +29,7 @@ class List {
   Item& insert() {
     if (count == capacity) {
       capacity += MAX(256 / sizeof(Item), (size_t)1);
-      items = Heap::realloc(items, sizeof(Item) * capacity);
+      items = static_cast<Item*>(Heap::realloc(items, sizeof(Item) * capacity));
     }
     return items[count++];
   }

diff --git a/src/platform/cpu.cpp b/src/platform/cpu.cpp
@@ -206,7 +206,7 @@ char* CPU::getFeaturesStr() {
     end--;
   end[0] = 0;
 
-  buf = Heap::realloc(buf, strlen(buf) + 1);
+  buf = static_cast<char*>(Heap::realloc(buf, strlen(buf) + 1));
 
   return buf;
 }

diff --git a/src/platform/include/heap.hpp b/src/platform/include/heap.hpp
@@ -30,15 +30,6 @@ class Heap {
   static void* realloc(void *addr, size_t size, size_t align = 4);
 
   static void free(void* addr);
-
-  template<typename T> static inline T* alloc(
-      size_t size = sizeof(T), size_t align = 4) {
-    return static_cast<T*>(alloc(size, align));
-  }
-  template<typename T> static inline T* realloc(
-      T *addr, size_t size, size_t align = 4) {
-    return static_cast<T*>(realloc(static_cast<void*>(addr), size, align));
-  }
 };
 
 #define ALIGNED_NEW(align) \