Index: src/splay-tree.h |
diff --git a/src/splay-tree.h b/src/splay-tree.h |
index 388f9b5429f889bc7aebcefaf90ba543a7f3178d..8844d8a8ffeb2d62a856ff19a1bdc2ff58e8aa24 100644 |
--- a/src/splay-tree.h |
+++ b/src/splay-tree.h |
@@ -66,9 +66,13 @@ class SplayTree { |
AllocationPolicy allocator = AllocationPolicy())) { |
return allocator.New(static_cast<int>(size)); |
} |
- INLINE(void operator delete(void* p, size_t)) { |
+ INLINE(void operator delete(void* p)) { |
AllocationPolicy::Delete(p); |
} |
+ // Please the MSVC compiler. We should never have to execute this. |
+ INLINE(void operator delete(void* p, AllocationPolicy policy)) { |
+ UNREACHABLE(); |
+ } |
// Inserts the given key in this tree with the given value. Returns |
// true if a node was inserted, otherwise false. If found the locator |
@@ -119,9 +123,14 @@ class SplayTree { |
INLINE(void* operator new(size_t size, AllocationPolicy allocator)) { |
return allocator.New(static_cast<int>(size)); |
} |
- INLINE(void operator delete(void* p, size_t)) { |
+ INLINE(void operator delete(void* p)) { |
return AllocationPolicy::Delete(p); |
} |
+ // Please the MSVC compiler. We should never have to execute |
+ // this. |
+ INLINE(void operator delete(void* p, AllocationPolicy allocator)) { |
+ UNREACHABLE(); |
+ } |
Key key() { return key_; } |
Value value() { return value_; } |