Merge pull request #1628 from jdumas/jdumas/cpp20

danrbailey · web-flow · commit d41e3a5b345a · 2023-09-26T11:44:10.000-07:00
Fix C++20 compatibility by removing deprecated shared_ptr::unique()
diff --git a/openvdb/openvdb/points/AttributeSet.cc b/openvdb/openvdb/points/AttributeSet.cc
@@ -280,7 +280,8 @@ AttributeSet::isShared(size_t pos) const
 {
     assert(pos != INVALID_POS);
     assert(pos < mAttrs.size());
-    return !mAttrs[pos].unique();
+    // Warning: In multithreaded environment, the value returned by use_count is approximate.
+    return mAttrs[pos].use_count() != 1;
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -280,7 +280,8 @@ AttributeSet::isShared(size_t pos) const`
`280`	`280`	`{`
`281`	`281`	`assert(pos != INVALID_POS);`
`282`	`282`	`assert(pos < mAttrs.size());`
`283`		`- return !mAttrs[pos].unique();`
	`283`	`+ // Warning: In multithreaded environment, the value returned by use_count is approximate.`
	`284`	`+ return mAttrs[pos].use_count() != 1;`
`284`	`285`	`}`
`285`	`286`
`286`	`287`