From ee825951d20dc60a2113b85e0fcd08e45ee49d5d Mon Sep 17 00:00:00 2001 From: Clement Jamin Date: Thu, 4 Sep 2014 16:06:29 +0200 Subject: [PATCH] Removed two local static variables Local static variables are not thread-safe --- Triangulation/include/CGAL/Delaunay_triangulation.h | 5 ++--- Triangulation/include/CGAL/Regular_triangulation.h | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/Triangulation/include/CGAL/Delaunay_triangulation.h b/Triangulation/include/CGAL/Delaunay_triangulation.h index 2397f0c8c42..a4cd4ef7333 100644 --- a/Triangulation/include/CGAL/Delaunay_triangulation.h +++ b/Triangulation/include/CGAL/Delaunay_triangulation.h @@ -739,9 +739,8 @@ Delaunay_triangulation ::insert_in_conflicting_cell(const Point & p, const Full_cell_handle s) { typedef std::vector Full_cell_h_vector; - static Full_cell_h_vector cs; // for storing conflicting full_cells. - cs.clear(); - // cs.reserve(64); + Full_cell_h_vector cs; // for storing conflicting full_cells. + cs.reserve(64); std::back_insert_iterator out(cs); Facet ft = compute_conflict_zone(p, s, out); return insert_in_hole(p, cs.begin(), cs.end(), ft); diff --git a/Triangulation/include/CGAL/Regular_triangulation.h b/Triangulation/include/CGAL/Regular_triangulation.h index 7700abd3ffb..1ff94456e49 100644 --- a/Triangulation/include/CGAL/Regular_triangulation.h +++ b/Triangulation/include/CGAL/Regular_triangulation.h @@ -802,9 +802,8 @@ Regular_triangulation ::insert_in_conflicting_cell(const Weighted_point & p, const Full_cell_handle s) { typedef std::vector Full_cell_h_vector; - static Full_cell_h_vector cs; // for storing conflicting full_cells. - cs.clear(); - // cs.reserve(64); + Full_cell_h_vector cs; // for storing conflicting full_cells. + cs.reserve(64); std::back_insert_iterator out(cs); Facet ft = compute_conflict_zone(p, s, out); return insert_in_hole(p, cs.begin(), cs.end(), ft);