Merge pull request #1681 from apradhana/v10.1.0_rc_fix

Make PagedArray to compile with clang14 with C++20 on the runner
AcademySoftwareFoundation · Oct 11, 2023 · 87a508c · 87a508c
2 parents 8443745 + 6f8851e
commit 87a508c
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 12 deletions.
diff --git a/CHANGES b/CHANGES
@@ -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

diff --git a/doc/changes.txt b/doc/changes.txt
@@ -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:

diff --git a/openvdb/openvdb/util/PagedArray.h b/openvdb/openvdb/util/PagedArray.h
@@ -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
-
 
 ////////////////////////////////////////////////////////////////////////////////
 
@@ -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