Changeset 8afe31 for molecuilder/src/joiner.cpp

Timestamp:

Oct 5, 2009, 4:05:53 PM (16 years ago)

Author:

Frederik Heber <heber@…>

Children:

58808e

Parents:

e1f6d7 (diff), bf497f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'ConcaveHull' into ConvexHull

Conflicts:

.gitignore
molecuilder/src/Makefile.am
molecuilder/src/atom.cpp
molecuilder/src/tesselation.cpp

no serious overlaps, just a free Frees that were not present in ConcaveHull were MemoryAllocator class was added.

File:

• molecuilder/src/joiner.cpp (modified) (3 diffs)

molecuilder/src/joiner.cpp

@@ -10 +10 @@
 #include "datacreator.hpp"
 #include "helpers.hpp"
+#include "memoryallocator.hpp"
 #include "parser.hpp"
 #include "periodentafel.hpp"
@@ -55 +56 @@
     return 1;
   } else {
-    dir = (char *) Malloc(sizeof(char)*(strlen(argv[2])+2), "main: *dir");
+    dir = Malloc<char>(strlen(argv[2]) + 2, "main: *dir");
     strcpy(dir, "/");
     strcat(dir, argv[2]);
@@ -240 +241 @@
   // exit
   delete(periode);
-  Free((void **)&dir, "main: *dir");
+  Free(&dir);
   cout << "done." << endl;
   return 0;