From 9ff5b1f33e889b3bf48e4f1ad92eff443af73180 Mon Sep 17 00:00:00 2001 From: kichik Date: Wed, 27 Nov 2002 16:04:34 +0000 Subject: [PATCH] Moved new and delete away from ResourceEditor into util.cpp git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@1838 212acab6-be3b-0410-9dea-997c60f758d6 --- Source/ResourceEditor.cpp | 10 ---------- Source/util.cpp | 17 ++++++++++++++++- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/Source/ResourceEditor.cpp b/Source/ResourceEditor.cpp index a4dc594d..0741638e 100644 --- a/Source/ResourceEditor.cpp +++ b/Source/ResourceEditor.cpp @@ -30,16 +30,6 @@ #define ALIGN(dwToAlign, dwAlignOn) dwToAlign = (dwToAlign%dwAlignOn == 0) ? dwToAlign : dwToAlign - (dwToAlign%dwAlignOn) + dwAlignOn #define RALIGN(dwToAlign, dwAlignOn) ((dwToAlign%dwAlignOn == 0) ? dwToAlign : dwToAlign - (dwToAlign%dwAlignOn) + dwAlignOn) -void *operator new(size_t size) { - void *p = malloc(size); - if (!p) - throw bad_alloc(); - return p; -} -void operator delete(void *p) { - if (p) free(p); -} - ////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////// // CResourceEditor diff --git a/Source/util.cpp b/Source/util.cpp index efa46078..9ddaa676 100644 --- a/Source/util.cpp +++ b/Source/util.cpp @@ -308,4 +308,19 @@ BYTE* get_dlg(HINSTANCE hUIFile, WORD dlgId, char* filename) { } return pbUIData; } -#endif //NSIS_CONFIG_VISIBLE_SUPPORT \ No newline at end of file +#endif //NSIS_CONFIG_VISIBLE_SUPPORT + +void *operator new(size_t size) { + void *p = malloc(size); + if (!p) + throw bad_alloc(); + return p; +} + +void operator delete(void *p) { + if (p) free(p); +} + +void operator delete [](void *p) { + if (p) free(p); +} \ No newline at end of file