Skip to content

use typedefs instead of inheriting from iterator #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Schmluk merged 1 commit into from
Apr 16, 2025
Merged

use typedefs instead of inheriting from iterator #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 14 additions & 7 deletions include/spatial_hash/layer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,9 @@
* -------------------------------------------------------------------------- */
#pragma once

#include <cstddef>
#include <functional>
#include <iterator>
#include <memory>
#include <utility>
#include <vector>
Expand Down Expand Up @@ -204,10 +206,14 @@ class Layer {

public:
// Iterators.
class iterator
: public std::iterator<std::forward_iterator_tag, BlockT, std::ptrdiff_t, BlockT*, BlockT&> {
class iterator {
public:
using MapIt = typename BlockMap::iterator;
using iterator_category = std::forward_iterator_tag;
using difference_type = std::ptrdiff_t;
using value_type = BlockT;
using pointer = BlockT*;
using reference = Block&;

explicit iterator(MapIt it) : it_(it) {}
iterator& operator++() {
Expand All @@ -228,13 +234,14 @@ class Layer {
MapIt it_;
};

class const_iterator : public std::iterator<std::forward_iterator_tag,
const BlockT,
std::ptrdiff_t,
BlockT const*,
const BlockT&> {
class const_iterator {
public:
using MapIt = typename BlockMap::const_iterator;
using iterator_category = std::forward_iterator_tag;
using difference_type = std::ptrdiff_t;
using value_type = const BlockT;
using pointer = const BlockT*;
using reference = const Block&;

explicit const_iterator(MapIt it) : it_(it) {}
const_iterator& operator++() {
Expand Down
24 changes: 14 additions & 10 deletions include/spatial_hash/voxel_layer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,12 +276,14 @@ class VoxelLayer : protected Grid<GlobalIndex>, public BlockLayer<BlockT> {
: blocks_(blocks), num_voxels_(num_voxels) {}
virtual ~VoxelIterable() = default;

class iterator : public std::iterator<std::forward_iterator_tag,
VoxelType,
std::ptrdiff_t,
VoxelType*,
VoxelType&> {
class iterator {
public:
using iterator_category = std::forward_iterator_tag;
using difference_type = std::ptrdiff_t;
using value_type = VoxelType;
using pointer = VoxelType*;
using reference = VoxelType&;

iterator(MapIt map_it, MapIt map_end, size_t voxel_idx, size_t num_voxels)
: map_it_(map_it), map_end_(map_end), voxel_idx_(voxel_idx), num_voxels_(num_voxels) {}

Expand Down Expand Up @@ -315,12 +317,14 @@ class VoxelLayer : protected Grid<GlobalIndex>, public BlockLayer<BlockT> {
const size_t num_voxels_;
};

class const_iterator : public std::iterator<std::forward_iterator_tag,
VoxelType,
std::ptrdiff_t,
VoxelType*,
VoxelType&> {
class const_iterator {
public:
using iterator_category = std::forward_iterator_tag;
using difference_type = std::ptrdiff_t;
using value_type = const VoxelType;
using pointer = const VoxelType*;
using reference = const VoxelType&;

const_iterator(MapIt map_it, MapIt map_end, size_t voxel_idx, size_t num_voxels)
: map_it_(map_it), map_end_(map_end), voxel_idx_(voxel_idx), num_voxels_(num_voxels) {}

Expand Down