Skip to content

Commit e6eb56f

Browse files
committed
Rename MultiPass tag class to PointDataGridMultiPass
Signed-off-by: Dan Bailey <danbailey@ilm.com>
1 parent 0fe923a commit e6eb56f

3 files changed

Lines changed: 5 additions & 5 deletions

File tree

openvdb/openvdb/Grid.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1199,14 +1199,14 @@ struct IsPointDataLeafNode<PointDataLeafNode<T, Log2Dim>> : std::true_type {};
11991199
/// requires multiple passes to read and write voxel data.
12001200
/// @details Multi-pass I/O allows leaf nodes to optimize their serialization layout
12011201
/// for delayed-load access patterns. Only @c PointDataLeafNode supports multi-pass I/O.
1202-
/// Defining a custom leaf node that inherits @c io::MultiPass is no longer permitted.
1202+
/// Defining a custom leaf node that inherits @c io::PointDataGridMultiPass is no longer permitted.
12031203
/// @sa points::IsPointDataLeafNode
12041204
template<typename LeafNodeType>
12051205
struct HasMultiPassIO {
12061206
static_assert(
1207-
!std::is_base_of<io::MultiPass, LeafNodeType>::value
1207+
!std::is_base_of<io::PointDataGridMultiPass, LeafNodeType>::value
12081208
|| points::IsPointDataLeafNode<LeafNodeType>::value,
1209-
"Only PointDataLeafNode may inherit from io::MultiPass; "
1209+
"Only PointDataLeafNode may inherit from io::PointDataGridMultiPass; "
12101210
"use points::IsPointDataLeafNode to test for multi-pass I/O support.");
12111211
static const bool value = points::IsPointDataLeafNode<LeafNodeType>::value;
12121212
};

openvdb/openvdb/io/io.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ std::ostream& operator<<(std::ostream&, const StreamMetadata::AuxDataMap&);
118118

119119
/// @brief Tag for multi-pass I/O. Only points::PointDataLeafNode may inherit from this.
120120
/// @sa Grid::hasMultiPassIO(), points::IsPointDataLeafNode
121-
struct MultiPass {};
121+
struct PointDataGridMultiPass {};
122122

123123

124124
////////////////////////////////////////

openvdb/openvdb/points/PointDataGrid.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ prefetch(PointDataTreeT&, bool /*position*/ = true, bool /*otherAttributes*/ = t
107107

108108

109109
template <typename T, Index Log2Dim>
110-
class PointDataLeafNode : public tree::LeafNode<T, Log2Dim>, io::MultiPass {
110+
class PointDataLeafNode : public tree::LeafNode<T, Log2Dim>, io::PointDataGridMultiPass {
111111

112112
public:
113113
using LeafNodeType = PointDataLeafNode<T, Log2Dim>;

0 commit comments

Comments
 (0)