fixed build warnings (including bug report #1005303 )

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@3628 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2004-08-14 17:35:05 +00:00
parent efa2113031
commit d855dafe58
6 changed files with 8 additions and 5 deletions

View file

@ -96,7 +96,7 @@ class CInTree: public CLZInWindow
public: public:
CInTree(); CInTree();
~CInTree(); virtual ~CInTree();
HRESULT Create(UINT32 sizeHistory, UINT32 keepAddBufferBefore, UINT32 matchMaxLen, HRESULT Create(UINT32 sizeHistory, UINT32 keepAddBufferBefore, UINT32 matchMaxLen,
UINT32 keepAddBufferAfter, UINT32 sizeReserv = (1<<17)); UINT32 keepAddBufferAfter, UINT32 sizeReserv = (1<<17));
HRESULT Init(ISequentialInStream *stream); HRESULT Init(ISequentialInStream *stream);

View file

@ -62,6 +62,7 @@ class CInTree2: public CInTree
virtual void BeforeMoveBlock(); virtual void BeforeMoveBlock();
virtual void AfterMoveBlock(); virtual void AfterMoveBlock();
public: public:
virtual ~CInTree2() {}
void SetCallback(IMatchFinderCallback *callback) void SetCallback(IMatchFinderCallback *callback)
{ {
_callback = callback; _callback = callback;
@ -102,6 +103,7 @@ public:
void SetWindowReservSize(UINT32 reservWindowSize) void SetWindowReservSize(UINT32 reservWindowSize)
{ m_WindowReservSize = reservWindowSize; } { m_WindowReservSize = reservWindowSize; }
*/ */
virtual ~CMatchFinderBinTree() {}
}; };
} }

View file

@ -30,7 +30,7 @@ protected:
void Free(); void Free();
public: public:
CLZInWindow(): _bufferBase(0) {} CLZInWindow(): _bufferBase(0) {}
~CLZInWindow(); virtual ~CLZInWindow();
void Create(UINT32 keepSizeBefore, UINT32 keepSizeAfter, void Create(UINT32 keepSizeBefore, UINT32 keepSizeAfter,
UINT32 keepSizeReserv = (1<<17)); UINT32 keepSizeReserv = (1<<17));

View file

@ -249,6 +249,7 @@ private:
public: public:
CEncoder(); CEncoder();
virtual ~CEncoder() {}
void SetWriteEndMarkerMode(bool writeEndMarker) void SetWriteEndMarkerMode(bool writeEndMarker)
{ _writeEndMark= writeEndMarker; } { _writeEndMark= writeEndMarker; }

View file

@ -132,7 +132,7 @@ void NSISCALL myDelete(char *buf, int flags)
if (fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) if (fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
{ {
#ifdef NSIS_SUPPORT_RMDIR #ifdef NSIS_SUPPORT_RMDIR
if ((flags & DEL_DIR | DEL_RECURSE) == (DEL_DIR | DEL_RECURSE)) if ((flags & (DEL_DIR | DEL_RECURSE)) == (DEL_DIR | DEL_RECURSE))
{ {
myDelete(buf,flags); myDelete(buf,flags);
} }

View file

@ -447,11 +447,11 @@ int ZEXPORT inflate(z_streamp z)
while (s->sub.trees.index < 4 + (s->sub.trees.table >> 10)) while (s->sub.trees.index < 4 + (s->sub.trees.table >> 10))
{ {
NEEDBITS(3) NEEDBITS(3)
s->sub.trees.t_blens[border[s->sub.trees.index++]] = (uInt)b & 7; s->sub.trees.t_blens[(int)border[s->sub.trees.index++]] = (uInt)b & 7;
DUMPBITS(3) DUMPBITS(3)
} }
while (s->sub.trees.index < 19) while (s->sub.trees.index < 19)
s->sub.trees.t_blens[border[s->sub.trees.index++]] = 0; s->sub.trees.t_blens[(int)border[s->sub.trees.index++]] = 0;
s->sub.trees.bb = 7; s->sub.trees.bb = 7;
{ {