Replace SAFE_DELETE / SAFE_DELETE_ARRAY macros
SAFE_DELETE -> RageUtil::SafeDelete SAFE_DELETE_ARRAY -> RageUtil::SafeDeleteArray Update JsonUtil.h to include RageUtil.h - MSVC doesn't need it included for some reason, but GCC and XCode does.
This commit is contained in:
+2
-2
@@ -677,7 +677,7 @@ ZRESULT TZip::open_file(const TCHAR *fn)
|
||||
hfin = new RageFile();
|
||||
if( !hfin->Open(fn) )
|
||||
{
|
||||
SAFE_DELETE( hfin );
|
||||
RageUtil::SafeDelete( hfin );
|
||||
return ZR_NOFILE;
|
||||
}
|
||||
isize = hfin->GetFileSize();
|
||||
@@ -755,7 +755,7 @@ unsigned TZip::read(char *srcbuf, unsigned size)
|
||||
ZRESULT TZip::iclose()
|
||||
{
|
||||
if (hfin!=0)
|
||||
SAFE_DELETE( hfin);
|
||||
RageUtil::SafeDelete( hfin);
|
||||
bool mismatch = (isize!=-1 && isize!=ired);
|
||||
isize=ired; // and crc has been being updated anyway
|
||||
if (mismatch)
|
||||
|
||||
Reference in New Issue
Block a user