diff options
author | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2017-08-13 07:14:48 +0000 |
---|---|---|
committer | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2017-08-13 07:14:48 +0000 |
commit | 4b4995cda35627e06c43e25ecbe07c1bc1859bb5 (patch) | |
tree | 143ed02a389bab62f44043a54cbc70f69e312e2f /Build/source/libs/xpdf/xpdf-src/goo/gmempp.cc | |
parent | 00d00899c484b81967558f43c4fe4a896ffdf610 (diff) |
xpdf 4.00
git-svn-id: svn://tug.org/texlive/trunk@45031 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs/xpdf/xpdf-src/goo/gmempp.cc')
-rw-r--r-- | Build/source/libs/xpdf/xpdf-src/goo/gmempp.cc | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/Build/source/libs/xpdf/xpdf-src/goo/gmempp.cc b/Build/source/libs/xpdf/xpdf-src/goo/gmempp.cc index b1ee970d38a..fe5790b1f58 100644 --- a/Build/source/libs/xpdf/xpdf-src/goo/gmempp.cc +++ b/Build/source/libs/xpdf/xpdf-src/goo/gmempp.cc @@ -10,23 +10,42 @@ #include <aconf.h> #include "gmem.h" +// NB: do not include gmempp.h here. #ifdef DEBUG_MEM void *operator new(size_t size) { - return gmalloc((int)size); + return gmalloc((int)size, 1); +} + +void *operator new(size_t size, int dummy) { + return gmalloc((int)size, 0); } void *operator new[](size_t size) { - return gmalloc((int)size); + return gmalloc((int)size, 1); +} + +void *operator new[](size_t size, int dummy) { + return gmalloc((int)size, 0); } void operator delete(void *p) { gfree(p); } +// This is only called if a constructor throws an exception. +void operator delete(void *p, int dummy) { + gfree(p); +} + void operator delete[](void *p) { gfree(p); } +// This is only called if a constructor throws an exception. +void operator delete[](void *p, int dummy) { + gfree(p); +} + #endif |