Merge pull request #5433 from sloriot/CGAL-last_bind

Remove last bind
This commit is contained in:
Laurent Rineau 2021-03-03 17:10:13 +01:00
commit 6f8f36462f
7 changed files with 5 additions and 14 deletions

View File

@ -18,7 +18,6 @@
#include <CGAL/algorithm.h>
#include <algorithm>
#include <boost/bind.hpp>
namespace CGAL {
@ -139,8 +138,6 @@ ch_brute_force_check_2(ForwardIterator1 first1, ForwardIterator1 last1,
ForwardIterator2 first2, ForwardIterator2 last2,
const Traits& ch_traits)
{
using namespace boost;
typedef typename Traits::Left_turn_2 Left_of_line;
ForwardIterator1 iter11;
ForwardIterator2 iter21;
@ -165,12 +162,13 @@ ch_brute_force_check_2(ForwardIterator1 first1, ForwardIterator1 last1,
while (iter22 != last2)
{
iter11 = std::find_if( first1, last1,
bind(left_turn, *iter22++, *iter21++, _1) );
[left_turn, iter22, iter21](const auto& p){ return left_turn(*iter22, *iter21, p); } );
++iter22; ++iter21;
if (iter11 != last1 ) return false;
}
iter11 = std::find_if( first1, last1,
bind(left_turn, *first2, *iter21, _1) );
[left_turn, first2, iter21](const auto& p){ return left_turn(*first2, *iter21, p); } );
if (iter11 != last1 ) return false;
return true;
}
@ -203,7 +201,8 @@ ch_brute_force_chain_check_2(ForwardIterator1 first1,
while (iter22 != last2)
{
iter11 = std::find_if( first1, last1,
bind(left_turn, *iter22++, *iter21++, _1) );
[left_turn, iter22, iter21](const auto& p){ return left_turn(*iter22, *iter21, p); } );
++iter22; ++iter21;
if (iter11 != last1 ) return false;
}

View File

@ -2,8 +2,6 @@
#include <CGAL/iterator.h>
#include <CGAL/point_generators_2.h>
#include <boost/bind.hpp>
typedef CGAL::Exact_predicates_exact_constructions_kernel K;
typedef K::Point_2 Point;
typedef K::Segment_2 Segment;

View File

@ -36,7 +36,6 @@
#include <CGAL/boost/iterator/transform_iterator.hpp>
#include <boost/bind.hpp>
#include <boost/format.hpp>
#include <boost/iterator/function_output_iterator.hpp>
#include <boost/optional.hpp>

View File

@ -34,7 +34,6 @@
#include <CGAL/vector.h>
#include <CGAL/Partition_2/Rotation_tree_node_2.h>
#include <boost/bind.hpp>
namespace CGAL {

View File

@ -27,8 +27,6 @@
#include <CGAL/result_of.h>
#include <CGAL/Timer.h>
#include <boost/bind.hpp>
#include <iterator>
#include <map>
#include <set>

View File

@ -22,7 +22,6 @@
#include <CGAL/Object.h>
#include <CGAL/internal/Has_nested_type_Bare_point.h>
#include <boost/bind.hpp>
#include <boost/mpl/if.hpp>
#include <boost/mpl/identity.hpp>
#include <boost/utility/result_of.hpp>

View File

@ -55,7 +55,6 @@
#include <CGAL/point_generators_3.h>
#endif
#include <boost/bind.hpp>
#include <boost/mpl/if.hpp>
#include <boost/mpl/identity.hpp>
#include <boost/property_map/function_property_map.hpp>