songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed return type of boost::function1 call

This commit is contained in:
Andreas Fabri 2008-11-12 13:45:58 +00:00
parent 4f69d413d6
commit 2a0b967172
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Matrix_search/include/CGAL/rectangular_3_center_2.h
View File

@ -914,7 +914,7 @@ rectangular_3_center_2_type2(
op.place_y_square(op.place_y_square(Q_r_empty, Q_r, *pos.second, r), op.place_y_square(op.place_y_square(Q_r_empty, Q_r, *pos.second, r),
r, r,
rad); rad);
boost::function1<FT,FT> le_rad = bind(greater_equal<FT>(), rad, _1); boost::function1<bool,FT> le_rad = bind(greater_equal<FT>(), rad, _1);
RandomAccessIterator b1 = RandomAccessIterator b1 =
partition(m, l, bind(le_rad, bind(op.distance(), q_t, _1))); partition(m, l, bind(le_rad, bind(op.distance(), q_t, _1)));
RandomAccessIterator b2 = RandomAccessIterator b2 =
@ -944,7 +944,7 @@ rectangular_3_center_2_type2(
Point q_r = op.place_y_square(q_r_afap, r, op.delta()(*m)); Point q_r = op.place_y_square(q_r_afap, r, op.delta()(*m));
// check for covering // check for covering
boost::function1<FT,FT> boost::function1<bool,FT>
le_delta_m = bind(greater_equal<FT>(), op.delta()(*m), _1); le_delta_m = bind(greater_equal<FT>(), op.delta()(*m), _1);
RandomAccessIterator b1 = RandomAccessIterator b1 =
partition(m + 1, e, partition(m + 1, e,
@ -987,7 +987,7 @@ rectangular_3_center_2_type2(
// to Q_t and Q_r are covered by q_t and q_r // to Q_t and Q_r are covered by q_t and q_r
if ((Q_t_empty || op.compute_x_distance(q_t, Q_t) <= op.delta()(*m)) && if ((Q_t_empty || op.compute_x_distance(q_t, Q_t) <= op.delta()(*m)) &&
(Q_r_empty || op.compute_y_distance(q_r, Q_r) <= op.delta()(*m))) { (Q_r_empty || op.compute_y_distance(q_r, Q_r) <= op.delta()(*m))) {
boost::function1<FT,FT> boost::function1<bool,FT>
greater_delta_m = bind(less< FT >(), op.delta()(*m)); greater_delta_m = bind(less< FT >(), op.delta()(*m));
CGAL_optimisation_assertion_code(RandomAccessIterator iii =) CGAL_optimisation_assertion_code(RandomAccessIterator iii =)
find_if(e, find_if(e,
@ -1001,7 +1001,7 @@ rectangular_3_center_2_type2(
} }
// check whether the points in [f,s) are covered // check whether the points in [f,s) are covered
{ {
boost::function1<FT,FT> boost::function1<bool,FT>
le_delta_m = bind(greater_equal<FT>(), op.delta()(*m)); le_delta_m = bind(greater_equal<FT>(), op.delta()(*m));
RandomAccessIterator iii = RandomAccessIterator iii =
partition(f, s, bind(le_delta_m, bind(op.delta(), _1))); partition(f, s, bind(le_delta_m, bind(op.delta(), _1)));
@ -1016,7 +1016,7 @@ rectangular_3_center_2_type2(
// partition the range [m+1, e) into ranges // partition the range [m+1, e) into ranges
// [m+1, b1), [b1, b2), [b2, b3) and [b3, e) // [m+1, b1), [b1, b2), [b2, b3) and [b3, e)
// R G cap q_t G cap q_r none // R G cap q_t G cap q_r none
boost::function1<FT,FT> boost::function1<bool,FT>
le_delta_m = bind(greater_equal<FT>(), op.delta()(*m), _1); le_delta_m = bind(greater_equal<FT>(), op.delta()(*m), _1);
RandomAccessIterator b2 = RandomAccessIterator b2 =
partition(m + 1, e, bind(le_delta_m, bind(op.distance(), q_t, _1))); partition(m + 1, e, bind(le_delta_m, bind(op.distance(), q_t, _1)));
@ -1146,7 +1146,7 @@ rectangular_3_center_2_type2(
// partition the range [s_b+1, e) into ranges // partition the range [s_b+1, e) into ranges
// [s_b+1, b1), [b1, b2), [b2, b3) and [b3, e) // [s_b+1, b1), [b1, b2), [b2, b3) and [b3, e)
// R G cap q_t G cap q_r none // R G cap q_t G cap q_r none
boost::function1<FT,FT> boost::function1<bool,FT>
le_delta_sb = bind(greater_equal<FT>(), op.delta()(*s_b), _1); le_delta_sb = bind(greater_equal<FT>(), op.delta()(*s_b), _1);
b2 = partition(s_b + 1, e, bind(le_delta_sb, b2 = partition(s_b + 1, e, bind(le_delta_sb,
bind(op.distance(), q_t, _1))); bind(op.distance(), q_t, _1)));
@ -1243,7 +1243,7 @@ rectangular_3_center_2_type2(
q_r = op.place_y_square(q_r_afap, r, op.delta()(*next)); q_r = op.place_y_square(q_r_afap, r, op.delta()(*next));
// again check for covering // again check for covering
boost::function1<FT,FT> boost::function1<bool,FT>
le_delta_next = bind(greater_equal<FT>(), op.delta()(*next), _1); le_delta_next = bind(greater_equal<FT>(), op.delta()(*next), _1);
b2 = partition(s_b, e, b2 = partition(s_b, e,
bind(le_delta_next, bind(op.distance(), q_t, _1))); bind(le_delta_next, bind(op.distance(), q_t, _1)));
@ -1347,7 +1347,7 @@ rectangular_3_center_2_type2(
q_r = op.place_y_square(q_r_afap, r, try_rho); q_r = op.place_y_square(q_r_afap, r, try_rho);
// check for covering // check for covering
boost::function1<FT,FT> boost::function1<bool,FT>
greater_rho_max = bind(less<FT>(), try_rho, _1); greater_rho_max = bind(less<FT>(), try_rho, _1);
if ((!Q_t_empty && op.compute_x_distance(q_t, Q_t) > try_rho) || if ((!Q_t_empty && op.compute_x_distance(q_t, Q_t) > try_rho) ||
(!Q_r_empty && op.compute_y_distance(q_r, Q_r) > try_rho) || (!Q_r_empty && op.compute_y_distance(q_r, Q_r) > try_rho) ||