Update ChunkContainer.hpp

src/XAD/ChunkContainer.hpp

@@ -133,24 +133,26 @@ class ChunkContainer
     }
 
     ChunkContainer(ChunkContainer&& o) noexcept
-        : chunkList_(std::move(o.chunkList_)), chunk_(o.chunk_), idx_(o.idx_)
-    {
+        : chunkList_(std::move(o.chunkList_)), chunk_(o.chunk_), idx_(o.idx_) {
+        o.chunk_ = 0;
+        o.idx_ = 0;
     }
 
-    ChunkContainer& operator=(ChunkContainer&& o)
-    {
-        _free_memory();
-        chunkList_ = std::move(o.chunkList_);
-        chunk_ = o.chunk_;
-        idx_ = o.idx_;
+    ChunkContainer& operator=(ChunkContainer&& o) noexcept {
+        if (this != &o) {
+            _free_memory();
+            chunkList_ = std::move(o.chunkList_);
+            chunk_ = o.chunk_;
+            idx_ = o.idx_;
+            o.chunk_ = 0;
+            o.idx_ = 0;
+        }
         return *this;
     }
-
     ChunkContainer(const ChunkContainer&) = delete;
     ChunkContainer& operator=(const ChunkContainer&) = delete;
 
     ~ChunkContainer() { _free_memory(); }
-
     void reserve(size_type s)
     {
         size_type nc = getNumChunks(s);
@@ -438,21 +440,21 @@ class ChunkContainer
   private:
     std::vector<char*> chunkList_;
     size_type chunk_, idx_;
-
     void check_space()
     {
         if (XAD_VERY_LIKELY(chunk_ == chunkList_.size() - 1))
-        {
-            char* chunk = reinterpret_cast<char*>(
-                detail::aligned_alloc(ALIGNMENT, sizeof(value_type) * chunk_size));
-            if (chunk == NULL)
-                throw std::bad_alloc();
-            chunkList_.push_back(chunk);
+    {
+        char* chunk = reinterpret_cast<char*>(
+            detail::aligned_alloc(ALIGNMENT, sizeof(value_type) * chunk_size));
+        if (chunk == nullptr) {
+            throw std::bad_alloc();
         }
-        ++chunk_;
-        idx_ = 0;
+        chunkList_.push_back(chunk);
     }
-
+    ++chunk_;
+    idx_ = 0;
+}
+
     void check_space(size_type i) { reserve(chunk_ * chunk_size + idx_ + i); }
 
     void _free_memory()