Skip to content
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.

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

Make PagedArray to compile with clang14 with C++20 on the runner #1681

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion CHANGES
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
OpenVDB Version History
=======================

Version 10.1.0 - October 10, 2023
Version 10.1.0 - October 11, 2023
OpenVDB:
New features:
- Added points::replicate() for the replication of PointDataGrid points
Expand Down
2 changes: 1 addition & 1 deletion doc/changes.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

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

@par
Highlights:
Expand Down
10 changes: 0 additions & 10 deletions openvdb/openvdb/util/PagedArray.h
Original file line number Diff line number Diff line change
Expand Up @@ -635,11 +635,6 @@ class PagedArray<ValueT, Log2PageSize>::ConstIterator
const PagedArray* mParent;
};// Public class PagedArray::ConstIterator

#ifdef OPENVDB_HAS_CXX20
static_assert(std::random_access_iterator<PagedArray<int, 10UL>::ConstIterator>,
"ConstIterator must satisfy random_access_iterator concept");
#endif


////////////////////////////////////////////////////////////////////////////////

Expand Down Expand Up @@ -696,11 +691,6 @@ class PagedArray<ValueT, Log2PageSize>::Iterator
PagedArray* mParent;
};// Public class PagedArray::Iterator

#ifdef OPENVDB_HAS_CXX20
static_assert(std::random_access_iterator<PagedArray<int, 10UL>::Iterator>,
"Iterator must satisfy random_access_iterator concept");
#endif

////////////////////////////////////////////////////////////////////////////////

// Private member-class of PagedArray implementing a memory page
Expand Down
Loading