Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • molecuilder/src/tesselationunittest.cpp

    ref36b84 r424d1ce  
    8484  delete(TesselStruct);
    8585  for (LinkedNodes::iterator Runner = Corners.begin(); Runner != Corners.end(); Runner++) {
    86     delete((*Runner)->Name);
     86    delete[]((*Runner)->Name);
    8787    delete((*Runner)->node);
    8888    delete(*Runner);
     
    178178    for (set<BoundaryTriangleSet*>::iterator TriangleRunner = triangles->begin(); TriangleRunner != triangles->end(); TriangleRunner++)
    179179      CPPUNIT_ASSERT_EQUAL( true, (*TriangleRunner)->ContainsBoundaryPoint(Walker) );
     180    delete(triangles);
    180181  }
    181182}
Note: See TracChangeset for help on using the changeset viewer.