Changeset 8afe31 for molecuilder/src/atom.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/atom.cpp (modified) (4 diffs)

molecuilder/src/atom.cpp

@@ -6 +6 @@
 
 #include "atom.hpp"
+#include "memoryallocator.hpp"
 
 /************************************* Functions for class atom *************************************/
@@ -38 +39 @@
   previous = NULL;
   next = NULL;
-  father = this;  // generally, father is itself
+  father = pointer;  // generally, father is itself
   Ancestor = NULL;
   GraphNr = -1;
@@ -53 +54 @@
   nr = -1;
   sort = &nr;
+  node = &x;
 }
 
@@ -60 +62 @@
 atom::~atom()
 {
-  Free((void **)&ComponentNr, "atom::~atom: *ComponentNr");
-  Free((void **)&Name, "atom::~atom: *Name");
+  Free<int>(&ComponentNr, "atom::~atom: *ComponentNr");
+  Free<char *>(&Name, "atom::~atom: *Name");
 };