From d6711c0b513f8378084964fac7afb1957d69e0a0 Mon Sep 17 00:00:00 2001 From: Michael Hoffmann Date: Thu, 19 Jun 2008 12:09:55 +0000 Subject: [PATCH] Fix some stupid warnings of Sunpro. --- .../CGAL/Rectangular_p_center_traits_2.h | 6 ----- .../include/CGAL/pierce_rectangles_2.h | 23 ++++++++----------- 2 files changed, 10 insertions(+), 19 deletions(-) diff --git a/Matrix_search/include/CGAL/Rectangular_p_center_traits_2.h b/Matrix_search/include/CGAL/Rectangular_p_center_traits_2.h index 2d03eb8a142..c5ed0bd6a08 100644 --- a/Matrix_search/include/CGAL/Rectangular_p_center_traits_2.h +++ b/Matrix_search/include/CGAL/Rectangular_p_center_traits_2.h @@ -32,8 +32,6 @@ CGAL_BEGIN_NAMESPACE template < class A, class S > struct Select : public std::binary_function< A, A, A > { - typedef Arity_tag< 2 > Arity; - Select() {} Select(const S& s) : s_(s) {} A operator()(const A& a, const A& b) const @@ -49,7 +47,6 @@ struct I_Signed_x_distance_2 : public std::binary_function< Point_2< R >, Point_2< R >, typename R::FT > { - typedef Arity_tag< 2 > Arity; typename R::FT operator()(const Point_2< R >& q1, const Point_2< R >& q2) const { return q1.x() - q2.x(); } @@ -59,7 +56,6 @@ struct I_Signed_y_distance_2 : public std::binary_function< Point_2< R >, Point_2< R >, typename R::FT > { - typedef Arity_tag< 2 > Arity; typename R::FT operator()(const Point_2< R >& q1, const Point_2< R >& q2) const { return q1.y() - q2.y(); } @@ -69,7 +65,6 @@ struct I_Infinity_distance_2 : public std::binary_function< Point_2< R >, Point_2< R >, typename R::FT > { - typedef Arity_tag< 2 > Arity; typename R::FT operator()(const Point_2< R >& q1, const Point_2< R >& q2) const { BOOST_USING_STD_MAX(); @@ -83,7 +78,6 @@ struct I_Signed_infinity_distance_2 : public std::binary_function< Point_2< R >, Point_2< R >, typename R::FT > { - typedef Arity_tag< 2 > Arity; typename R::FT operator()(const Point_2< R >& q1, const Point_2< R >& q2) const { diff --git a/Matrix_search/include/CGAL/pierce_rectangles_2.h b/Matrix_search/include/CGAL/pierce_rectangles_2.h index 5fe97f8d726..77a6f6c7380 100644 --- a/Matrix_search/include/CGAL/pierce_rectangles_2.h +++ b/Matrix_search/include/CGAL/pierce_rectangles_2.h @@ -479,6 +479,7 @@ four_cover_points( return four_cover_points(d, o, ok, t); } // four_cover_points(f, l, o, ok, t) + template < class OutputIterator, class Traits > OutputIterator two_cover_points( @@ -497,9 +498,6 @@ two_cover_points( typename Traits::Signed_infinity_distance_2 sdist = d.traits.signed_infinity_distance_2_object(); - Min< FT > minft; - less< FT > lessft; - if (sdist(d[2], d[0]) <= FT(0)) { // the location domain is degenerate and [f,l) is one-pierceable *o++ = d[0]; @@ -512,9 +510,9 @@ two_cover_points( if (d.end() == find_if(d.begin(), d.end(), - bind(lessft, + bind(less(), d.r, - bind(minft, + bind(Min(), bind(dist, d[0], _1), bind(dist, d[2], _1))))) { @@ -528,9 +526,9 @@ two_cover_points( if (d.end() == find_if(d.begin(), d.end(), - bind(lessft, + bind(less(), d.r, - bind(minft, + bind(Min(), bind(dist, d[1], _1), bind(dist, d[3], _1))))) { @@ -544,6 +542,7 @@ two_cover_points( ok = false; return o; } // two_cover_points(d, o, ok, t) + template < class OutputIterator, class Traits > OutputIterator three_cover_points( @@ -564,7 +563,6 @@ three_cover_points( typedef typename Loc_domain< Traits >::Iterator Iterator; typename Traits::Infinity_distance_2 dist = d.traits.infinity_distance_2_object(); - less< FT > lessft; // test the four corners: for (int k = 0; k < 4; ++k) { @@ -574,7 +572,7 @@ three_cover_points( // find first point not covered by the rectangle at d[k] Iterator i = find_if(d.begin(), d.end(), - bind(lessft, d.r, bind(dist, corner, _1))); + bind(less(), d.r, bind(dist, corner, _1))); // are all points already covered? if (i == d.end()) { @@ -617,7 +615,7 @@ three_cover_points( CGAL_optimisation_expensive_assertion( save_end == find_if(d.end(), save_end, - bind(lessft, d.r, bind(dist, corner, _1)))); + bind(less(), d.r, bind(dist, corner, _1)))); CGAL_optimisation_expensive_assertion( d.end() == find_if(d.begin(), d.end(), bind(std::greater_equal(), @@ -673,7 +671,6 @@ four_cover_points(Staircases< Traits >& d, OutputIterator o, bool& ok) typedef typename Staircases< Traits >::Citerator Citerator; typedef typename Staircases< Traits >::Intervall Intervall; - less< FT > lessft; Infinity_distance_2 dist = d.traits.infinity_distance_2_object(); Less_x_2 lessx = d.traits.less_x_2_object(); Less_y_2 lessy = d.traits.less_y_2_object(); @@ -713,7 +710,7 @@ four_cover_points(Staircases< Traits >& d, OutputIterator o, bool& ok) // find first point not covered by the rectangle at d[k] Iterator i = find_if(d.begin(), d.end(), - bind(lessft, d.r, bind(dist, corner, _1))); + bind(less(), d.r, bind(dist, corner, _1))); // are all points already covered? if (i == d.end()) { @@ -756,7 +753,7 @@ four_cover_points(Staircases< Traits >& d, OutputIterator o, bool& ok) CGAL_optimisation_expensive_assertion( save_end == find_if(d.end(), save_end, - bind(lessft, d.r, bind(dist, corner, _1)))); + bind(less(), d.r, bind(dist, corner, _1)))); CGAL_optimisation_expensive_assertion( d.end() == find_if(d.begin(), d.end(), bind(std::greater_equal(),