songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Replace static with CGAL_STATIC_THREAD_LOCAL_VARIABLE 

(Merged from `cgal/releases/CGAL-4.8-branch`)
This commit is contained in:
Laurent Rineau 2016-04-13 11:45:08 +02:00
parent 9cbae0394d 6ac37a9ad4
commit 24273a8b5c
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Triangulation/include/CGAL/Delaunay_triangulation.h
View File

@ -20,6 +20,7 @@
#ifndef CGAL_DELAUNAY_COMPLEX_H #ifndef CGAL_DELAUNAY_COMPLEX_H
#define CGAL_DELAUNAY_COMPLEX_H #define CGAL_DELAUNAY_COMPLEX_H
#include <CGAL/tss.h>
#include <CGAL/Triangulation.h> #include <CGAL/Triangulation.h>
#include <CGAL/Dimension.h> #include <CGAL/Dimension.h>
#include <CGAL/Default.h> #include <CGAL/Default.h>
@ -779,10 +780,11 @@ typename Delaunay_triangulation<DCTraits, TDS>::Vertex_handle
Delaunay_triangulation<DCTraits, TDS> Delaunay_triangulation<DCTraits, TDS>
::insert_in_conflicting_cell(const Point & p, const Full_cell_handle s) ::insert_in_conflicting_cell(const Point & p, const Full_cell_handle s)
{ {
// for storing conflicting full_cells.
typedef std::vector<Full_cell_handle> Full_cell_h_vector; typedef std::vector<Full_cell_handle> Full_cell_h_vector;
static Full_cell_h_vector cs; // for storing conflicting full_cells. CGAL_STATIC_THREAD_LOCAL_VARIABLE(Full_cell_h_vector,cs,0);
cs.clear(); cs.clear();
// cs.reserve(64);
std::back_insert_iterator<Full_cell_h_vector> out(cs); std::back_insert_iterator<Full_cell_h_vector> out(cs);
Facet ft = compute_conflict_zone(p, s, out); Facet ft = compute_conflict_zone(p, s, out);
return insert_in_hole(p, cs.begin(), cs.end(), ft); return insert_in_hole(p, cs.begin(), cs.end(), ft);