From cc2622184dd970ff3ca5e34fcbe8a84dc4f18cbd Mon Sep 17 00:00:00 2001 From: Sylvain Pion Date: Sun, 18 Jan 2004 12:40:49 +0000 Subject: [PATCH] - Remove obsolete workaround CGAL_MSVC_DUMMY_ARGUMENT (VC++ <= 7.0). --- Packages/Convex_hull_3/changes.txt | 4 ++++ Packages/Convex_hull_3/include/CGAL/convex_hull_3.h | 5 +---- Packages/Union_find/changes.txt | 6 ++++-- Packages/Union_find/include/CGAL/Union_find.h | 4 ++-- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/Packages/Convex_hull_3/changes.txt b/Packages/Convex_hull_3/changes.txt index e08214651a2..5b6862a2282 100644 --- a/Packages/Convex_hull_3/changes.txt +++ b/Packages/Convex_hull_3/changes.txt @@ -1,3 +1,7 @@ +2.52 (18 Jan 2004) +- Remove obsolete workaround CGAL_MSVC_DUMMY_ARGUMENT (VC++ <= 7.0). + +================================ CGAL 3.0 ============================== 2.51 (21 October 2003) [af] - Fixed typo in section heading diff --git a/Packages/Convex_hull_3/include/CGAL/convex_hull_3.h b/Packages/Convex_hull_3/include/CGAL/convex_hull_3.h index 0650e84ac0b..423022dcfa8 100644 --- a/Packages/Convex_hull_3/include/CGAL/convex_hull_3.h +++ b/Packages/Convex_hull_3/include/CGAL/convex_hull_3.h @@ -767,10 +767,7 @@ template < class InputIterator, class Traits, class Items, #endif class HDS, class Alloc> void convex_hull_3(InputIterator first, InputIterator beyond, - Polyhedron_3& polyhedron - CGAL_MSVC_DUMMY_ARGUMENT) - - + Polyhedron_3& polyhedron ) #else diff --git a/Packages/Union_find/changes.txt b/Packages/Union_find/changes.txt index a6f3487fe86..a0d4e16aa98 100644 --- a/Packages/Union_find/changes.txt +++ b/Packages/Union_find/changes.txt @@ -1,5 +1,7 @@ -Union_find Package: Release changes ----------------------------------------------------------------------- +1.10 (18 Jan 2004) +- Remove obsolete workaround CGAL_MSVC_DUMMY_ARGUMENT (VC++ <= 7.0). + +================================ CGAL 3.0 ========================== 1.9 (22 Oct 2003) - new headers diff --git a/Packages/Union_find/include/CGAL/Union_find.h b/Packages/Union_find/include/CGAL/Union_find.h index ec153548174..cddf00474a8 100644 --- a/Packages/Union_find/include/CGAL/Union_find.h +++ b/Packages/Union_find/include/CGAL/Union_find.h @@ -140,7 +140,7 @@ private: } // if we would have a const_pointer, see the cast return r; // in the fct. below. We keep the mutable as reminder. } - const_pointer find( const_pointer p CGAL_MSVC_DUMMY_ARGUMENT) const { + const_pointer find( const_pointer p ) const { return find( const_cast(p)); } bool is_valid(const_handle v) const { return v != const_handle(0); } @@ -184,7 +184,7 @@ public: handle find( handle p) const { return find(p.ptr()); } - const_handle find( const_handle p CGAL_MSVC_DUMMY_ARGUMENT) const { + const_handle find( const_handle p ) const { // returns a canonical handle of the set that contains |p|, // i.e., |P.same_set(p,q)| iff |P.find(p)| and |P.find(q)| return // the same handle. Precond: |p| is a handle in the union find structure.