Changeset 424d1ce for molecuilder/src/analyzer.cpp

Timestamp:

Oct 5, 2009, 6:45:06 PM (16 years ago)

Author:

Frederik Heber <heber@…>

Children:

4bc937

Parents:

ef36b84 (diff), 9c32a1 (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 'ConvexHull' into ActOnAll

Conflicts:

molecuilder/src/Makefile.am

Boost implementation commit was overlapping with ActOnAllTest

File:

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

molecuilder/src/analyzer.cpp

@@ -10 +10 @@
 #include "datacreator.hpp"
 #include "helpers.hpp"
+#include "memoryallocator.hpp"
 #include "parser.hpp"
 #include "periodentafel.hpp"
@@ -72 +73 @@
     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]);
@@ -555 +556 @@
   // ++++++++++++++++ exit ++++++++++++++++++++++++++++++++++
   delete(periode);
-  Free((void **)&dir, "main: *dir");
+  Free(&dir);
   cout << "done." << endl;
   return 0;