Merge lp:~massing/dolfin/1.0.x-massing into lp:dolfin/1.0.x

[Andre Massing]

Fixes memory leak in IntersectionOperator (#923028)

=== modified file 'dolfin/intersection/IntersectionOperatorImplementation.h'
--- dolfin/intersection/IntersectionOperatorImplementation.h	2011-11-15 03:00:12 +0000
+++ dolfin/intersection/IntersectionOperatorImplementation.h	2012-10-09 18:50:37 +0000
@@ -18,7 +18,7 @@
 // Modified by Johannes Ring, 2009.
 //
 // First added:  2009-09-11
-// Last changed: 2011-11-11
+// Last changed: 2012-10-09
 
 #ifndef __INTERSECTIONOPERATORIMPLEMENTATION_H
 #define __INTERSECTIONOPERATORIMPLEMENTATION_H
@@ -55,6 +55,9 @@
     // Only default constructor, since the search tree has a dimension dependent type, hence encapsulates in the
     // inheriting IntersectionOperatorImplementation_d!
 
+    // Virtual destructor
+    virtual ~IntersectionOperatorImplementation() {}
+
     virtual void all_intersected_entities(const Point & point, std::set<uint> & ids_result) const = 0;
     virtual void all_intersected_entities(const std::vector<Point> & points, std::set<uint> & ids_result) const = 0;
 
@@ -98,6 +101,12 @@
       build_tree(labels, label);
     }
 
+    /// Destructor which ensures to reset AABB tree
+    virtual ~IntersectionOperatorImplementation_d()
+    {
+      tree.reset();
+    }
+
     virtual void all_intersected_entities(const Point& point, std::set<uint>& ids_result) const;
     virtual void all_intersected_entities(const std::vector<Point>& points, std::set<uint>& ids_result) const;