From 37677ededc8e7a982d1c4744d54f25933eabd005 Mon Sep 17 00:00:00 2001 From: Andreas Fabri Date: Thu, 19 Nov 2015 09:08:02 +0100 Subject: [PATCH] cleanup: reinsert the repetitive code that was temporarily in a repetitively included .h --- .../include/CGAL/Delaunay_triangulation_2.h | 22 ++++++++++++++----- .../CGAL/Delaunay_triangulation_2_tls.h | 7 ------ 2 files changed, 17 insertions(+), 12 deletions(-) delete mode 100644 Triangulation_2/include/CGAL/Delaunay_triangulation_2_tls.h diff --git a/Triangulation_2/include/CGAL/Delaunay_triangulation_2.h b/Triangulation_2/include/CGAL/Delaunay_triangulation_2.h index 931653b7577..56e2b24fd4d 100644 --- a/Triangulation_2/include/CGAL/Delaunay_triangulation_2.h +++ b/Triangulation_2/include/CGAL/Delaunay_triangulation_2.h @@ -1053,8 +1053,10 @@ remove_and_give_new_faces(Vertex_handle v, OutputItFaces fit) afi++) *fit++ = afi; } else { - -#include "Delaunay_triangulation_2_tls.h" + static CGAL_THREAD_LOCAL_VARIABLE(int, maxd,30); + static CGAL_THREAD_LOCAL_VARIABLE(std::vector , f, maxd); + static CGAL_THREAD_LOCAL_VARIABLE(std::vector, i, maxd); + static CGAL_THREAD_LOCAL_VARIABLE(std::vector, w, maxd); int d; 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; } -#include "Delaunay_triangulation_2_tls.h" + static CGAL_THREAD_LOCAL_VARIABLE(int, maxd,30); + static CGAL_THREAD_LOCAL_VARIABLE(std::vector , f, maxd); + static CGAL_THREAD_LOCAL_VARIABLE(std::vector, i, maxd); + static CGAL_THREAD_LOCAL_VARIABLE(std::vector, w, maxd); remove_degree_init(v,f,w,i,d,maxd); if (d == 0) return; // dim is going down @@ -2223,7 +2228,10 @@ move_if_no_collision(Vertex_handle v, const Point &p) { { int d; -#include "Delaunay_triangulation_2_tls.h" + static CGAL_THREAD_LOCAL_VARIABLE(int, maxd,30); + static CGAL_THREAD_LOCAL_VARIABLE(std::vector , f, maxd); + static CGAL_THREAD_LOCAL_VARIABLE(std::vector, i, maxd); + static CGAL_THREAD_LOCAL_VARIABLE(std::vector, w, maxd); remove_degree_init(v,f,w,i,d,maxd); 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 , f, maxd); + static CGAL_THREAD_LOCAL_VARIABLE(std::vector, i, maxd); + static CGAL_THREAD_LOCAL_VARIABLE(std::vector, w, maxd); + int d; remove_degree_init(v,f,w,i,d,maxd); remove_degree_triangulate(v,f,w,i,d); diff --git a/Triangulation_2/include/CGAL/Delaunay_triangulation_2_tls.h b/Triangulation_2/include/CGAL/Delaunay_triangulation_2_tls.h deleted file mode 100644 index c0c54347d72..00000000000 --- a/Triangulation_2/include/CGAL/Delaunay_triangulation_2_tls.h +++ /dev/null @@ -1,7 +0,0 @@ - - -static CGAL_THREAD_LOCAL_VARIABLE(int, maxd,30); -static CGAL_THREAD_LOCAL_VARIABLE(std::vector , f, maxd); -static CGAL_THREAD_LOCAL_VARIABLE(std::vector, i, maxd); -static CGAL_THREAD_LOCAL_VARIABLE(std::vector, w, maxd); -