Replace malloc with aligned_alloc

Grzegorz Jabłoński
1 parent 70abbf1e
Showing 2 changed files with 5 additions and 5 deletions
examples11/04-vectortmpl/makefile
examples11/04-vectortmpl/vector.h
@@ -4,7 +4,7 @@ testvector: testvector.o
 	g++ -g -Wall $^ -o $@
 testvector.o: testvector.cpp vector.h
-	g++ -g -c -Wall -pedantic $< -o $@
+	g++ -std=c++17 -g -c -Wall -pedantic $< -o $@
 opnew: opnew.o
 	g++ -g -Wall $^ -o $@
@@ -22,7 +22,7 @@ public:
     cap = round_up_to_power_of_2(s);
-    data = static_cast<C *>(malloc(cap * sizeof(C)));
+    data = static_cast<C *>(std::aligned_alloc(alignof(C), cap * sizeof(C)));
     if (!data)
       throw bad_alloc();
     size = s;
@@ -57,7 +57,7 @@ public:
   vector(const vector<C> &s) {
     cap = s.cap;
-    data = static_cast<C *>(malloc(cap * sizeof(C)));
+    data = static_cast<C *>(std::aligned_alloc(alignof(C), cap * sizeof(C)));
     if (!data)
       throw bad_alloc();
     size = s.size;
@@ -110,13 +110,13 @@ public:
       if (cap > std::numeric_limits<decltype(size)>::max() / 2)
         throw bad_alloc();
       unsigned int newcap = (cap == 0) ? 1 : 2 * cap;
-      C *newdata = static_cast<C *>(malloc(newcap * sizeof(C)));
+      C *newdata = static_cast<C *>(std::aligned_alloc(alignof(C), newcap * sizeof(C)));
       if (!newdata)
         throw bad_alloc();
       unsigned i;
       try {
         for (i = 0; i < size; i++)
-          new (newdata + i) C(data[i]);
+          new (newdata + i) C(std::move(data[i]));
       } catch (...) {
         for (unsigned j = 0; j < i; ++j)
           (newdata + j)->~C();