Skip to content

Commit 1c8b51b

Browse files
authored
Merge pull request ifcquery#124 from lamorlette-cintoo/bugfix/deprecated-std-iterator
removed use of std::iterator which is deprecated in C++17
2 parents aa90dfb + 6287d24 commit 1c8b51b

File tree

1 file changed

+6
-4
lines changed
  • external/Carve/src/include/carve

1 file changed

+6
-4
lines changed

external/Carve/src/include/carve/mesh.hpp

+6-4
Original file line numberDiff line numberDiff line change
@@ -731,10 +731,12 @@ class MeshSet {
731731

732732
public:
733733
template <typename face_type>
734-
struct FaceIter
735-
: public std::iterator<std::random_access_iterator_tag, face_type> {
736-
typedef std::iterator<std::random_access_iterator_tag, face_type> super;
737-
typedef typename super::difference_type difference_type;
734+
struct FaceIter {
735+
typedef std::random_access_iterator_tag iterator_category;
736+
typedef face_type value_type;
737+
typedef std::ptrdiff_t difference_type;
738+
typedef face_type* pointer;
739+
typedef face_type& reference;
738740

739741
const MeshSet<ndim>* obj;
740742
size_t mesh, face;

0 commit comments

Comments
 (0)