From e7d34f26371ec38c19e53939731d57be9ccef29b Mon Sep 17 00:00:00 2001 From: Sylvain Pion Date: Fri, 30 Jan 2004 10:11:04 +0000 Subject: [PATCH] - Remove obsolete _MSC_VER workaround. --- Packages/Triangulation_3/changes.txt | 3 +++ .../include/CGAL/Delaunay_triangulation_3.h | 15 --------------- 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/Packages/Triangulation_3/changes.txt b/Packages/Triangulation_3/changes.txt index 9ca594eb4b0..34f8afb3a57 100644 --- a/Packages/Triangulation_3/changes.txt +++ b/Packages/Triangulation_3/changes.txt @@ -1,3 +1,6 @@ +30/01/2004 Sylvain Pion +- Remove obsolete _MSC_VER workaround. + Version 1.190 (?? January 04) - Move random generator to CGAL::Random. diff --git a/Packages/Triangulation_3/include/CGAL/Delaunay_triangulation_3.h b/Packages/Triangulation_3/include/CGAL/Delaunay_triangulation_3.h index 0afc348e37d..440db6743e6 100644 --- a/Packages/Triangulation_3/include/CGAL/Delaunay_triangulation_3.h +++ b/Packages/Triangulation_3/include/CGAL/Delaunay_triangulation_3.h @@ -995,16 +995,8 @@ side_of_oriented_sphere(const Point &p0, const Point &p1, const Point &p2, // We are now in a degenerate case => we do a symbolic perturbation. // We sort the points lexicographically. -#if defined _MSC_VER && _MSC_VER >= 1300 // FIXME : Should use proper macro - std::vector points; - points.push_back(&p0); points.push_back(&p1); - points.push_back(&p2); points.push_back(&p3); - points.push_back(&p); - std::sort(points.begin(), points.end(), Perturbation_order(this)); -#else const Point * points[5] = {&p0, &p1, &p2, &p3, &p}; std::sort(points, points+5, Perturbation_order(this) ); -#endif // We successively look whether the leading monomial, then 2nd monomial // of the determinant has non null coefficient. @@ -1047,15 +1039,8 @@ coplanar_side_of_bounded_circle(const Point &p0, const Point &p1, // We are now in a degenerate case => we do a symbolic perturbation. // We sort the points lexicographically. -#if defined _MSC_VER && _MSC_VER >= 1300 // FIXME : should use the right macro - std::vector points; - points.push_back(&p0); points.push_back(&p1); - points.push_back(&p2); points.push_back(&p); - std::sort(points.begin(), points.end(), Perturbation_order(this)); -#else const Point * points[4] = {&p0, &p1, &p2, &p}; std::sort(points, points+4, Perturbation_order(this) ); -#endif Orientation local = coplanar_orientation(p0, p1, p2);