dragonleo/NSIS
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Moved new and delete away from ResourceEditor into util.cpp

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@1838 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2002-11-27 16:04:34 +00:00
parent 0707a05326
commit 9ff5b1f33e
2 changed files with 16 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Source/ResourceEditor.cpp
View file

@ -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

17
Source/util.cpp
View file

@ -308,4 +308,19 @@ BYTE* get_dlg(HINSTANCE hUIFile, WORD dlgId, char* filename) {
}
return pbUIData;
}
#endif //NSIS_CONFIG_VISIBLE_SUPPORT
#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);
}