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

cleanup: reinsert the repetitive code that was temporarily in a repetitively included .h

This commit is contained in:
Andreas Fabri 2015-11-19 09:08:02 +01:00
parent 0910d20ef6
commit 37677ededc
2 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Triangulation_2/include/CGAL/Delaunay_triangulation_2.h
View File

@ -1053,8 +1053,10 @@ remove_and_give_new_faces(Vertex_handle v, OutputItFaces fit)
afi++) *fit++ = afi; afi++) *fit++ = afi;
} }
else { else {
static CGAL_THREAD_LOCAL_VARIABLE(int, maxd,30);
#include "Delaunay_triangulation_2_tls.h" static CGAL_THREAD_LOCAL_VARIABLE(std::vector<Face_handle> , f, maxd);
static CGAL_THREAD_LOCAL_VARIABLE(std::vector<int>, i, maxd);
static CGAL_THREAD_LOCAL_VARIABLE(std::vector<Vertex_handle>, w, maxd);
int d; int d;
remove_degree_init(v,f,w,i,d,maxd); remove_degree_init(v,f,w,i,d,maxd);
@ -1079,7 +1081,10 @@ remove(Vertex_handle v)
if ( this->dimension() <= 1) { Triangulation::remove(v); return; } if ( this->dimension() <= 1) { Triangulation::remove(v); return; }
#include "Delaunay_triangulation_2_tls.h" static CGAL_THREAD_LOCAL_VARIABLE(int, maxd,30);
static CGAL_THREAD_LOCAL_VARIABLE(std::vector<Face_handle> , f, maxd);
static CGAL_THREAD_LOCAL_VARIABLE(std::vector<int>, i, maxd);
static CGAL_THREAD_LOCAL_VARIABLE(std::vector<Vertex_handle>, w, maxd);
remove_degree_init(v,f,w,i,d,maxd); remove_degree_init(v,f,w,i,d,maxd);
if (d == 0) return; // dim is going down if (d == 0) return; // dim is going down
@ -2223,7 +2228,10 @@ move_if_no_collision(Vertex_handle v, const Point &p) {
{ {
int d; int d;
#include "Delaunay_triangulation_2_tls.h" static CGAL_THREAD_LOCAL_VARIABLE(int, maxd,30);
static CGAL_THREAD_LOCAL_VARIABLE(std::vector<Face_handle> , f, maxd);
static CGAL_THREAD_LOCAL_VARIABLE(std::vector<int>, i, maxd);
static CGAL_THREAD_LOCAL_VARIABLE(std::vector<Vertex_handle>, w, maxd);
remove_degree_init(v,f,w,i,d,maxd); remove_degree_init(v,f,w,i,d,maxd);
remove_degree_triangulate(v,f,w,i,d); remove_degree_triangulate(v,f,w,i,d);
@ -2438,7 +2446,11 @@ move_if_no_collision_and_give_new_faces(Vertex_handle v,
{ {
#include "Delaunay_triangulation_2_tls.h" static CGAL_THREAD_LOCAL_VARIABLE(int, maxd,30);
static CGAL_THREAD_LOCAL_VARIABLE(std::vector<Face_handle> , f, maxd);
static CGAL_THREAD_LOCAL_VARIABLE(std::vector<int>, i, maxd);
static CGAL_THREAD_LOCAL_VARIABLE(std::vector<Vertex_handle>, w, maxd);
int d; int d;
remove_degree_init(v,f,w,i,d,maxd); remove_degree_init(v,f,w,i,d,maxd);
remove_degree_triangulate(v,f,w,i,d); remove_degree_triangulate(v,f,w,i,d);

7
Triangulation_2/include/CGAL/Delaunay_triangulation_2_tls.h
View File

@ -1,7 +0,0 @@
static CGAL_THREAD_LOCAL_VARIABLE(int, maxd,30);
static CGAL_THREAD_LOCAL_VARIABLE(std::vector<Face_handle> , f, maxd);
static CGAL_THREAD_LOCAL_VARIABLE(std::vector<int>, i, maxd);
static CGAL_THREAD_LOCAL_VARIABLE(std::vector<Vertex_handle>, w, maxd);