Skip to content

Commit 87a508c

Browse files
authored
Merge pull request #1681 from apradhana/v10.1.0_rc_fix
Make PagedArray to compile with clang14 with C++20 on the runner
2 parents 8443745 + 6f8851e commit 87a508c

File tree

3 files changed

+2
-12
lines changed

3 files changed

+2
-12
lines changed

CHANGES

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
OpenVDB Version History
22
=======================
33

4-
Version 10.1.0 - October 10, 2023
4+
Version 10.1.0 - October 11, 2023
55
OpenVDB:
66
New features:
77
- Added points::replicate() for the replication of PointDataGrid points

doc/changes.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
@htmlonly <a name="v10_1_0_changes"></a>@endhtmlonly
66
@par
7-
<B>Version 10.1.0</B> - <I>October 10, 2023</I>
7+
<B>Version 10.1.0</B> - <I>October 11, 2023</I>
88

99
@par
1010
Highlights:

openvdb/openvdb/util/PagedArray.h

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -635,11 +635,6 @@ class PagedArray<ValueT, Log2PageSize>::ConstIterator
635635
const PagedArray* mParent;
636636
};// Public class PagedArray::ConstIterator
637637

638-
#ifdef OPENVDB_HAS_CXX20
639-
static_assert(std::random_access_iterator<PagedArray<int, 10UL>::ConstIterator>,
640-
"ConstIterator must satisfy random_access_iterator concept");
641-
#endif
642-
643638

644639
////////////////////////////////////////////////////////////////////////////////
645640

@@ -696,11 +691,6 @@ class PagedArray<ValueT, Log2PageSize>::Iterator
696691
PagedArray* mParent;
697692
};// Public class PagedArray::Iterator
698693

699-
#ifdef OPENVDB_HAS_CXX20
700-
static_assert(std::random_access_iterator<PagedArray<int, 10UL>::Iterator>,
701-
"Iterator must satisfy random_access_iterator concept");
702-
#endif
703-
704694
////////////////////////////////////////////////////////////////////////////////
705695

706696
// Private member-class of PagedArray implementing a memory page

0 commit comments

Comments
 (0)