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

fixed test 

removed warning
This commit is contained in:
Sven Oesau 2024-01-08 13:13:21 +01:00
parent de06eb02ff
commit d5a764c41c
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Property_map/include/CGAL/Property_container.h
View File

@ -15,8 +15,9 @@
#include <CGAL/assertions.h> #include <CGAL/assertions.h>
#include <map> #include <map>
#include <optional>
#include <iterator>
// todo: maybe this could be avoided
#include <boost/property_map/property_map.hpp> #include <boost/property_map/property_map.hpp>
#ifndef DOXYGEN_RUNNING #ifndef DOXYGEN_RUNNING
@ -492,14 +493,14 @@ public:
auto unused_end = unused_begin; auto unused_end = unused_begin;
// Determine if the group fits // Determine if the group fits
if (std::distance(unused_begin, m_active_indices.end()) >= n) if (std::distance(unused_begin, m_active_indices.end()) >= static_cast<typename std::iterator_traits<std::vector<bool>::iterator>::difference_type>(n))
unused_end = std::find_if( unused_end = std::find_if(
unused_begin, (std::min)(unused_begin + n, m_active_indices.end()), unused_begin, (std::min)(unused_begin + n, m_active_indices.end()),
[](bool used) { return used; } [](bool used) { return used; }
); );
// If the discovered range was large enough // If the discovered range was large enough
if (std::distance(unused_begin, unused_end) >= n) { if (std::distance(unused_begin, unused_end) >= static_cast<typename std::iterator_traits<std::vector<bool>::iterator>::difference_type>(n)) {
// Mark the indices as used, and reset the properties of each of them // Mark the indices as used, and reset the properties of each of them
// todo: it would be better to provide a function to set a range // todo: it would be better to provide a function to set a range

2
Property_map/test/Property_map/test_Property_container.cpp
View File

@ -1,7 +1,7 @@
#include <CGAL/Property_container.h> #include <CGAL/Property_container.h>
using namespace CGAL::Properties; using namespace CGAL::Properties::Experimental;
void test_property_creation() { void test_property_creation() {