equal
deleted
inserted
replaced
1 /* |
1 /* |
2 * Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved. |
2 * Copyright (c) 1999, 2018, Oracle and/or its affiliates. All rights reserved. |
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 * |
4 * |
5 * This code is free software; you can redistribute it and/or modify it |
5 * This code is free software; you can redistribute it and/or modify it |
6 * under the terms of the GNU General Public License version 2 only, as |
6 * under the terms of the GNU General Public License version 2 only, as |
7 * published by the Free Software Foundation. Oracle designates this |
7 * published by the Free Software Foundation. Oracle designates this |
54 } |
54 } |
55 |
55 |
56 return ptr; |
56 return ptr; |
57 } |
57 } |
58 |
58 |
59 #if _MSC_VER >= 1200 |
|
60 void operator delete(void *ptr, const char*, int) { |
59 void operator delete(void *ptr, const char*, int) { |
61 DASSERTMSG(FALSE, "This version of 'delete' should never get called!!!"); |
60 DASSERTMSG(FALSE, "This version of 'delete' should never get called!!!"); |
62 } |
61 } |
63 #endif |
62 |
|
63 void operator delete[](void *ptr, const char*, int) { |
|
64 DASSERTMSG(FALSE, "This version of 'delete' should never get called!!!"); |
|
65 } |
|
66 |
64 void operator delete(void *ptr) throw() { |
67 void operator delete(void *ptr) throw() { |
65 DMem_FreeBlock(ptr); |
68 DMem_FreeBlock(ptr); |
66 } |
69 } |
67 |
70 |
68 //////////////////////////////////////////////////////////////////////////////////// |
71 //////////////////////////////////////////////////////////////////////////////////// |