Use malloc and free and fix some warnings

Vanier-Robotics · Jun 8, 2023 · bc89af8 · bc89af8
1 parent d6375ec
commit bc89af8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/ArduinoExtra/Array.h b/ArduinoExtra/Array.h
@@ -29,7 +29,7 @@ class Array
      * 
      * Note the array is always full so the size is also the maximum capacity
      */
-    const size_t getSize()
+    size_t getSize()
     {
         return S;
     }

diff --git a/ArduinoExtra/Vector.h b/ArduinoExtra/Vector.h
@@ -58,7 +58,7 @@ class Vector
         }
 
         clear();
-        ::operator delete(m_data, m_capacity * sizeof(T));
+        free(reinterpret_cast<void*>(m_data));
     }
 
     /**
@@ -193,7 +193,7 @@ class Vector
      * @return true vector is empty
      * @return false vector is not empty
      */
-    const bool isEmpty() const
+    bool isEmpty() const
     {
         return (m_size == 0);
     }
@@ -207,7 +207,7 @@ class Vector
     void reAllocate(size_t newCapacity)
     {
         // allocate new block of memory
-        T* newBlock = (T*)::operator new(newCapacity * sizeof(T));
+        T* newBlock = reinterpret_cast<T*>(malloc(newCapacity * sizeof(T)));
 
         if (newCapacity < m_size)
         {
@@ -227,7 +227,7 @@ class Vector
         }
 
         // delete old elements
-        ::operator delete(m_data, m_capacity * sizeof(T));
+        free(reinterpret_cast<void*>(m_data));
         m_data     = newBlock;
         m_capacity = newCapacity;
     }