Remove AttributeArray out-of-core atomic

Signed-off-by: Dan Bailey <danbailey@ilm.com>

Author: danrbailey

openvdb/openvdb/points/AttributeArray.cc

@@ -61,7 +61,6 @@ AttributeArray::AttributeArray(const AttributeArray& rhs, const tbb::spin_mutex:
     : mIsUniform(rhs.mIsUniform)
     , mFlags(rhs.mFlags)
     , mUsePagedRead(rhs.mUsePagedRead)
-    , mOutOfCore(rhs.mOutOfCore.load())
     , mPageHandle()
 {
     if (mFlags & PARTIALREAD)       mCompressedBytes = rhs.mCompressedBytes;
@@ -78,7 +77,6 @@ AttributeArray::operator=(const AttributeArray& rhs)
     mIsUniform = rhs.mIsUniform;
     mFlags = rhs.mFlags;
     mUsePagedRead = rhs.mUsePagedRead;
-    mOutOfCore.store(rhs.mOutOfCore);
     if (mFlags & PARTIALREAD)       mCompressedBytes = rhs.mCompressedBytes;
     else if (rhs.mPageHandle)       mPageHandle = rhs.mPageHandle->copy();
     else                            mPageHandle.reset();

openvdb/openvdb/points/AttributeArray.h

@@ -363,10 +363,12 @@ class OPENVDB_API AttributeArray
     mutable tbb::spin_mutex mMutex;
     uint8_t mFlags = 0;
     uint8_t mUsePagedRead = 0;
+#if OPENVDB_ABI_VERSION_NUMBER < 14
     std::atomic<Index32> mOutOfCore{0}; // interpreted as bool
+#endif
     /// used for out-of-core, paged reading
     union {
-        compression::PageHandle::Ptr mPageHandle;
+        std::unique_ptr<compression::PageHandle> mPageHandle;
         size_t mCompressedBytes;
     };
 }; // class AttributeArray
@@ -1535,8 +1537,6 @@ TypedAttributeArray<ValueType_, Codec_>::readBuffers(std::istream& is)
         OPENVDB_THROW(IoError, "Cannot read paged AttributeArray buffers.");
     }
 
-    tbb::spin_mutex::scoped_lock lock(mMutex);
-
     this->deallocate();
 
     uint8_t bloscCompressed(0);
@@ -1586,8 +1586,6 @@ TypedAttributeArray<ValueType_, Codec_>::readPagedBuffers(compression::PagedInpu
 
     OPENVDB_ASSERT(mPageHandle);
 
-    tbb::spin_mutex::scoped_lock lock(mMutex);
-
     this->deallocate();
 
     is.read(mPageHandle, std::streamsize(mPageHandle->size()), false);