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

molecuilder/src/tesselation.cpp

@@ -8 +8 @@
 #include "helpers.hpp"
 #include "linkedcell.hpp"
+#include "memoryallocator.hpp"
 #include "tesselation.hpp"
 #include "tesselationhelpers.hpp"
@@ -551 +552 @@
 TesselPoint::~TesselPoint()
 {
+  Free<char *>(&Name, "~TesselPoint - *Name");
 };