8
0
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-24 04:03:03 +01:00
This commit is contained in:
robocop 2008-12-21 06:12:41 +00:00
parent f8af66385d
commit 78df1ae72d
3 changed files with 9 additions and 9 deletions

View File

@ -649,7 +649,7 @@ bool IntlUtil::readAttributeChar(Jrd::CharSet* cs, const UCHAR** s, const UCHAR*
static void unicodeDestroy(texttype* tt) static void unicodeDestroy(texttype* tt)
{ {
delete [] const_cast<ASCII*>(tt->texttype_name); delete[] const_cast<ASCII*>(tt->texttype_name);
delete static_cast<TextTypeImpl*>(tt->texttype_impl); delete static_cast<TextTypeImpl*>(tt->texttype_impl);
} }

View File

@ -40,9 +40,9 @@
#define NAME(name, id) id, #define NAME(name, id) id,
typedef enum nam_i { nam_MIN, enum name_ids { nam_MIN,
#include "../jrd/names.h" #include "../jrd/names.h"
nam_MAX} name_ids; nam_MAX};
#undef NAME #undef NAME

View File

@ -454,7 +454,7 @@ USHORT GetVersion(const TEXT* filename, DWORD& verMS, DWORD& verLS,
if (! GetFileVersionInfo(const_cast<TEXT*>(filename), 0, rsize, hver)) if (! GetFileVersionInfo(const_cast<TEXT*>(filename), 0, rsize, hver))
{ {
ULONG werr = GetLastError(); ULONG werr = GetLastError();
delete [] hver; delete[] hver;
CloseHandle(hfile); CloseHandle(hfile);
return (*err_handler) (werr, "GetFileVersionInfo()"); return (*err_handler) (werr, "GetFileVersionInfo()");
} }
@ -465,14 +465,14 @@ USHORT GetVersion(const TEXT* filename, DWORD& verMS, DWORD& verLS,
if (! VerQueryValue(hver, "\\", (void**)&ffi, &uiUnused)) if (! VerQueryValue(hver, "\\", (void**)&ffi, &uiUnused))
{ {
ULONG werr = GetLastError(); ULONG werr = GetLastError();
delete [] hver; delete[] hver;
return (*err_handler) (werr, "VerQueryValue()"); return (*err_handler) (werr, "VerQueryValue()");
} }
verMS = ffi->dwFileVersionMS; verMS = ffi->dwFileVersionMS;
verLS = ffi->dwFileVersionLS; verLS = ffi->dwFileVersionLS;
delete [] hver; delete[] hver;
return FB_SUCCESS; return FB_SUCCESS;
} }