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

Qualify cref() by boost:: as there is a cref() in TR1 as well.

This commit is contained in:
Sylvain Pion 2008-03-11 14:45:12 +00:00
parent 7c7eb63fa7
commit 0308a5845c
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Convex_hull_2/include/CGAL/Convex_hull_2/ch_bykat_impl.h
View File

@ -83,18 +83,18 @@ ch_bykat(InputIterator first, InputIterator last,
H.push_back( a ); H.push_back( a );
L.push_back( P.begin() ); L.push_back( P.begin() );
R.push_back( l = std::partition(P.begin(), P.end(), R.push_back( l = std::partition(P.begin(), P.end(),
bind(left_turn, cref(a), cref(b), _1))); bind(left_turn, boost::cref(a), boost::cref(b), _1)));
r = std::partition( l, P.end(), bind(left_turn, cref(b), cref(a), _1)); r = std::partition( l, P.end(), bind(left_turn, boost::cref(b), boost::cref(a), _1));
for (;;) for (;;)
{ {
if ( l != r) if ( l != r)
{ {
Point_2 c = *std::min_element( l, r, bind(less_dist, cref(a), cref(b), _1, _2)); Point_2 c = *std::min_element( l, r, bind(less_dist, boost::cref(a), boost::cref(b), _1, _2));
H.push_back( b ); H.push_back( b );
L.push_back( l ); L.push_back( l );
R.push_back( l = std::partition(l, r, bind(left_turn, cref(b), cref(c), _1))); R.push_back( l = std::partition(l, r, bind(left_turn, boost::cref(b), boost::cref(c), _1)));
r = std::partition(l, r, bind(left_turn, cref(c), cref(a), _1)); r = std::partition(l, r, bind(left_turn, boost::cref(c), boost::cref(a), _1));
b = c; b = c;
} }
else else
@ -179,8 +179,8 @@ ch_bykat_with_threshold(InputIterator first, InputIterator last,
H.push_back( a ); H.push_back( a );
L.push_back( Pbegin ); L.push_back( Pbegin );
Left_turn_2 left_turn = ch_traits.left_turn_2_object(); Left_turn_2 left_turn = ch_traits.left_turn_2_object();
R.push_back( l = std::partition( Pbegin, Pend, bind(left_turn, cref(a), cref(b), _1))); R.push_back( l = std::partition( Pbegin, Pend, bind(left_turn, boost::cref(a), boost::cref(b), _1)));
r = std::partition( l, Pend, bind(left_turn, cref(b), cref(a), _1)); r = std::partition( l, Pend, bind(left_turn, boost::cref(b), boost::cref(a), _1));
Less_dist less_dist = ch_traits.less_signed_distance_to_line_2_object(); Less_dist less_dist = ch_traits.less_signed_distance_to_line_2_object();
for (;;) for (;;)
@ -189,11 +189,11 @@ ch_bykat_with_threshold(InputIterator first, InputIterator last,
{ {
if ( r-l > CGAL_ch_THRESHOLD ) if ( r-l > CGAL_ch_THRESHOLD )
{ {
Point_2 c = *std::min_element( l, r, bind(less_dist, cref(a), cref(b), _1, _2)); Point_2 c = *std::min_element( l, r, bind(less_dist, boost::cref(a), boost::cref(b), _1, _2));
H.push_back( b ); H.push_back( b );
L.push_back( l ); L.push_back( l );
R.push_back( l = std::partition(l, r, bind(left_turn, cref(b), cref(c), _1))); R.push_back( l = std::partition(l, r, bind(left_turn, boost::cref(b), boost::cref(c), _1)));
r = std::partition(l, r, bind(left_turn, cref(c), cref(a), _1)); r = std::partition(l, r, bind(left_turn, boost::cref(c), boost::cref(a), _1));
b = c; b = c;
} }
else else

2
Convex_hull_2/include/CGAL/Convex_hull_2/ch_jarvis_impl.h
View File

@ -68,7 +68,7 @@ ch_jarvis_march(ForwardIterator first, ForwardIterator last,
Point previous_point = start_p; ) Point previous_point = start_p; )
ForwardIterator it = std::min_element( first, last, ForwardIterator it = std::min_element( first, last,
bind(rotation_predicate, cref(start_p), _1, _2) ); bind(rotation_predicate, boost::cref(start_p), _1, _2) );
while (! equal_points(*it, stop_p) ) while (! equal_points(*it, stop_p) )
{ {
CGAL_ch_exactness_assertion( \ CGAL_ch_exactness_assertion( \