Merge pull request AcademySoftwareFoundation#74 from khang/fix-shared…

…-ptrs Change SharedPtr to shared_ptr.
dneg · Nov 2, 2016 · 777c793 · 777c793
2 parents 55f3291 + 9c7509d
commit 777c793
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/openvdb_points/tools/AttributeArray.h b/openvdb_points/tools/AttributeArray.h
@@ -190,8 +190,8 @@ class AttributeArray
     };
 #endif
 
-    using Ptr = SharedPtr<AttributeArray>;
-    using ConstPtr = SharedPtr<const AttributeArray>;
+    using Ptr           = std::shared_ptr<AttributeArray>;
+    using ConstPtr      = std::shared_ptr<const AttributeArray>;
 
     using FactoryMethod = Ptr (*)(size_t, Index);
 
@@ -434,8 +434,8 @@ template<typename ValueType_, typename Codec_ = NullCodec>
 class TypedAttributeArray: public AttributeArray
 {
 public:
-    using Ptr           = SharedPtr<TypedAttributeArray>;
-    using ConstPtr      = SharedPtr<const TypedAttributeArray>;
+    using Ptr           = std::shared_ptr<TypedAttributeArray>;
+    using ConstPtr      = std::shared_ptr<const TypedAttributeArray>;
 
     using ValueType     = ValueType_;
     using Codec         = Codec_;
@@ -605,7 +605,7 @@ class AttributeHandle
 {
 public:
     using Handle    = AttributeHandle<ValueType, CodecType, Strided, Interleaved>;
-    using Ptr       = SharedPtr<Handle>;
+    using Ptr       = std::shared_ptr<Handle>;
     using UniquePtr = std::unique_ptr<Handle>;
 
 protected:
@@ -669,7 +669,7 @@ class AttributeWriteHandle : public AttributeHandle<ValueType, CodecType, Stride
 {
 public:
     using Handle    = AttributeWriteHandle<ValueType, CodecType, Strided, Interleaved>;
-    using Ptr       = SharedPtr<Handle>;
+    using Ptr       = std::shared_ptr<Handle>;
     using ScopedPtr = std::unique_ptr<Handle>;
 
     static Ptr create(AttributeArray& array, const bool expand = true);

diff --git a/openvdb_points/tools/AttributeSet.cc b/openvdb_points/tools/AttributeSet.cc
@@ -88,7 +88,6 @@ namespace {
 
 AttributeSet::AttributeSet()
     : mDescr(new Descriptor())
-    , mAttrs()
 {
 }
 
@@ -136,8 +135,8 @@ size_t
 AttributeSet::memUsage() const
 {
     size_t bytes = sizeof(*this) + mDescr->memUsage();
-    for (size_t n = 0, N = mAttrs.size(); n < N; ++n) {
-        bytes += mAttrs[n]->memUsage();
+    for (const auto& attr : mAttrs) {
+        bytes += attr->memUsage();
     }
     return bytes;
 }