From 8dda8c54910b8344b0041f84571fa243f0b68d87 Mon Sep 17 00:00:00 2001 From: Michael Hoffmann Date: Mon, 25 Mar 2002 15:05:01 +0000 Subject: [PATCH] Removed Sqrt. Fixed demos for LEDA namespace (as suggested by Matthias). --- .../demo/Matrix_search/all_furthest_neighbors_2_demo.C | 3 +++ .../demo/Matrix_search/extremal_polygon_2_demo.C | 4 ++++ .../demo/Matrix_search/rectangular_p_center_2_demo.C | 6 +++--- .../Matrix_search/include/CGAL/Extremal_polygon_traits_2.h | 7 ------- Packages/Matrix_search/version | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Packages/Matrix_search/demo/Matrix_search/all_furthest_neighbors_2_demo.C b/Packages/Matrix_search/demo/Matrix_search/all_furthest_neighbors_2_demo.C index fb5acd2f804..736ef1c5971 100644 --- a/Packages/Matrix_search/demo/Matrix_search/all_furthest_neighbors_2_demo.C +++ b/Packages/Matrix_search/demo/Matrix_search/all_furthest_neighbors_2_demo.C @@ -55,6 +55,9 @@ using CGAL::all_furthest_neighbors_2; using CGAL::cgalize; using CGAL::RED; +#if defined(LEDA_NAMESPACE) +using leda::button_release_event; +#endif typedef double FT; typedef CGAL::Window_stream Window; diff --git a/Packages/Matrix_search/demo/Matrix_search/extremal_polygon_2_demo.C b/Packages/Matrix_search/demo/Matrix_search/extremal_polygon_2_demo.C index 7be4be527b4..02bd39a4730 100644 --- a/Packages/Matrix_search/demo/Matrix_search/extremal_polygon_2_demo.C +++ b/Packages/Matrix_search/demo/Matrix_search/extremal_polygon_2_demo.C @@ -55,6 +55,10 @@ using std::copy; using std::max; typedef CGAL::Window_stream Window; +#if defined(LEDA_NAMESPACE) +using leda::button_release_event; +#endif + using std::vector; using CGAL::Cartesian; using CGAL::Random_access_circulator_from_container; diff --git a/Packages/Matrix_search/demo/Matrix_search/rectangular_p_center_2_demo.C b/Packages/Matrix_search/demo/Matrix_search/rectangular_p_center_2_demo.C index 233803dbe0d..3671f4d55ca 100644 --- a/Packages/Matrix_search/demo/Matrix_search/rectangular_p_center_2_demo.C +++ b/Packages/Matrix_search/demo/Matrix_search/rectangular_p_center_2_demo.C @@ -339,7 +339,7 @@ main(int argc, char* argv[]) << " and " << number_of_piercing_points << " points." << endl; #ifdef CGAL_PCENTER_CHECK - CGAL::Infinity_distance_2< K > dist; + CGAL::I_Infinity_distance_2< K > dist; for (iterator i = input_points.begin(); i != input_points.end(); ++i) { iterator j = centers.begin(); do { @@ -385,8 +385,8 @@ main(int argc, char* argv[]) #ifdef CGAL_PCENTER_CHECK // check that there is at least one square with two points // on opposite sides - CGAL::Signed_x_distance_2< K > xdist; - CGAL::Signed_y_distance_2< K > ydist; + CGAL::I_Signed_x_distance_2< K > xdist; + CGAL::I_Signed_y_distance_2< K > ydist; bool boundary = false; for (iterator i = centers.begin(); i != centers.end(); ++i) { int left = 0, right = 0, bottom = 0, top = 0; diff --git a/Packages/Matrix_search/include/CGAL/Extremal_polygon_traits_2.h b/Packages/Matrix_search/include/CGAL/Extremal_polygon_traits_2.h index f9b8c323d30..11f9688e885 100644 --- a/Packages/Matrix_search/include/CGAL/Extremal_polygon_traits_2.h +++ b/Packages/Matrix_search/include/CGAL/Extremal_polygon_traits_2.h @@ -162,13 +162,6 @@ CGAL_END_NAMESPACE #endif // CGAL_USE_LEDA CGAL_BEGIN_NAMESPACE -template < class FT_ > -struct Sqrt : public CGAL_STD::binary_function< FT_, FT_, FT_ > -{ - typedef Arity_tag< 1 > Arity; - typedef FT_ FT; - FT operator()(const FT& x) const { return CGAL_NTS sqrt(x); } -}; template < class K_ > struct Extremal_polygon_perimeter_traits_2 { typedef K_ K; diff --git a/Packages/Matrix_search/version b/Packages/Matrix_search/version index 833a164ecde..4c54d1a3e39 100644 --- a/Packages/Matrix_search/version +++ b/Packages/Matrix_search/version @@ -1 +1 @@ -1.53 (05 February 2002) +1.54 (25 March 2002)