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

more fixes

This commit is contained in:
Sébastien Loriot 2023-11-23 14:55:30 +01:00
parent 6cd28f751e
commit 16de47d1e6
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Polygon_mesh_processing/include/CGAL/Polygon_mesh_processing/intersection.h
View File

@ -1428,12 +1428,12 @@ bool do_intersect(const TriangleMesh& tm,
#ifndef DOXYGEN_RUNNING #ifndef DOXYGEN_RUNNING
, const std::enable_if_t<!( , const std::enable_if_t<!(
std::is_same_v<TriangleMesh, Polyline> || // Added to please MSVC 2015 std::is_same_v<TriangleMesh, Polyline> || // Added to please MSVC 2015
!boost::has_range_iterator<Polyline>::type>::value || // not a range !boost::has_range_iterator<Polyline>::value || // not a range
boost::has_range_iterator< boost::has_range_iterator<
typename boost::mpl::eval_if< typename boost::mpl::eval_if<
boost::has_range_iterator<Polyline>, boost::has_range_iterator<Polyline>,
boost::range_value<Polyline>, boost::range_value<Polyline>,
std::false_type std::false_type>::type
>::value >::value
) )
>* = 0 >* = 0

1
QP_solver/test/QP_solver/test_solver.cpp
View File

@ -282,6 +282,7 @@ bool process(const std::string& filename,
{ {
using std::cout; using std::cout;
using std::endl; using std::endl;
using CGAL::check_tag;
// extract verbosity: // extract verbosity:
const int verbosity = options.find("Verbosity")->second; const int verbosity = options.find("Verbosity")->second;

4
Triangulation_3/include/CGAL/Regular_triangulation_3.h
View File

@ -612,8 +612,8 @@ public:
insert(boost::zip_iterator< boost::tuple<InputIterator_1,InputIterator_2> > first, insert(boost::zip_iterator< boost::tuple<InputIterator_1,InputIterator_2> > first,
boost::zip_iterator< boost::tuple<InputIterator_1,InputIterator_2> > last, boost::zip_iterator< boost::tuple<InputIterator_1,InputIterator_2> > last,
std::enable_if_t< std::enable_if_t<
typename std::is_convertible_v< typename std::iterator_traits<InputIterator_1>::value_type, Weighted_point > && std::is_convertible_v< typename std::iterator_traits<InputIterator_1>::value_type, Weighted_point > &&
typename std::is_convertible_v< typename std::iterator_traits<InputIterator_2>::value_type, typename internal::Info_check<typename Triangulation_data_structure::Vertex>::type > std::is_convertible_v< typename std::iterator_traits<InputIterator_2>::value_type, typename internal::Info_check<typename Triangulation_data_structure::Vertex>::type >
>* =nullptr) >* =nullptr)
{ {
return insert_with_info< return insert_with_info<