Ticket #631: destory.diff

lemon/bits/array_map.

@@ -219 +219 @@
           int jd = nf->id(it);;
           if (id != jd) {
             allocator.construct(&(new_values[jd]), values[jd]);
-            allocator.destroy(&(values[jd]));
+            std::allocator_traits<std::allocator<Value>>::destroy(allocator, &(values[jd]));
           }
         }
         if (capacity != 0) allocator.deallocate(values, capacity);
@@ -261 +261 @@
           }
           if (found) continue;
           allocator.construct(&(new_values[id]), values[id]);
-          allocator.destroy(&(values[id]));
+          std::allocator_traits<std::allocator<Value>>::destroy(allocator, &(values[id]));
         }
         if (capacity != 0) allocator.deallocate(values, capacity);
         values = new_values;
@@ -279 +279 @@
     // and it overrides the erase() member function of the observer base.
     virtual void erase(const Key& key) {
       int id = Parent::notifier()->id(key);
-      allocator.destroy(&(values[id]));
+      std::allocator_traits<std::allocator<Value>>::destroy(allocator, &(values[id]));
     }
 
     // \brief Erase more keys from the map.
@@ -289 +289 @@
     virtual void erase(const std::vector<Key>& keys) {
       for (int i = 0; i < int(keys.size()); ++i) {
         int id = Parent::notifier()->id(keys[i]);
-        allocator.destroy(&(values[id]));
+        std::allocator_traits<std::allocator<Value>>::destroy(allocator, &(values[id]));
       }
     }
 
@@ -317 +317 @@
         Item it;
         for (nf->first(it); it != INVALID; nf->next(it)) {
           int id = nf->id(it);
-          allocator.destroy(&(values[id]));
+          std::allocator_traits<std::allocator<Value>>::destroy(allocator, &(values[id]));
         }
         allocator.deallocate(values, capacity);
         capacity = 0;

lemon/path.

@@ -582 +582 @@
     void clear() {
       while (first != 0) {
         last = first->next;
-        alloc.destroy(first);
+        std::allocator_traits<std::allocator<Node>>::destroy(alloc, first);
         alloc.deallocate(first, 1);
         first = last;
       }
@@ -617 +617 @@
       } else {
         last = 0;
       }
-      alloc.destroy(node);
+      std::allocator_traits<std::allocator<Node>>::destroy(alloc, node);
       alloc.deallocate(node, 1);
     }
 
@@ -650 +650 @@
       } else {
         first = 0;
       }
-      alloc.destroy(node);
+      std::allocator_traits<std::allocator<Node>>::destroy(alloc, node);
       alloc.deallocate(node, 1);
     }