jory/upx
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

submodules: update for new version

Browse Source
This commit is contained in:
Markus F.X.J. Oberhumer 2022-10-04 15:33:27 +02:00
parent fd4882abcf
commit f67cec4752
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/compress_lzma.cpp
View File

@ -33,15 +33,9 @@
#if (ACC_CC_CLANG)
# pragma clang diagnostic ignored "-Wshadow"
#endif
#if (ACC_CC_CLANG >= 0x0b0000)
# pragma clang diagnostic ignored "-Wsuggest-override"
#endif
#if (ACC_CC_GNUC >= 0x040200)
# pragma GCC diagnostic ignored "-Wshadow"
#endif
#if (ACC_CC_GNUC >= 0x0a0000)
# pragma GCC diagnostic ignored "-Wsuggest-override"
#endif
#if (ACC_CC_MSC)
# pragma warning(disable: 4456) // -Wno-shadow
#endif
@ -252,7 +246,7 @@ struct InStream: public ISequentialInStream, public CMyUnknownImp
void Init(const Byte *data, size_t size) {
b_buf = data; b_size = size; b_pos = 0;
}
STDMETHOD(Read)(void *data, UInt32 size, UInt32 *processedSize);
STDMETHOD(Read)(void *data, UInt32 size, UInt32 *processedSize) override;
};
STDMETHODIMP InStream::Read(void *data, UInt32 size, UInt32 *processedSize)
@ -278,7 +272,7 @@ struct OutStream : public ISequentialOutStream, public CMyUnknownImp
b_buf[b_pos++] = c;
return S_OK;
}
STDMETHOD(Write)(const void *data, UInt32 size, UInt32 *processedSize);
STDMETHOD(Write)(const void *data, UInt32 size, UInt32 *processedSize) override;
};
STDMETHODIMP OutStream::Write(const void *data, UInt32 size, UInt32 *processedSize)
@ -295,7 +289,7 @@ struct ProgressInfo : public ICompressProgressInfo, public CMyUnknownImp
{
virtual ~ProgressInfo() { }
MY_UNKNOWN_IMP
STDMETHOD(SetRatioInfo)(const UInt64 *inSize, const UInt64 *outSize);
STDMETHOD(SetRatioInfo)(const UInt64 *inSize, const UInt64 *outSize) override;
upx_callback_p cb;
};

2
vendor/lzma-sdk vendored

@ -1 +1 @@
Subproject commit 0def675572209872f35f0638420bf49fa438d49c
Subproject commit a0fe54d99fd15cc2747d0bdce6ffb51e18e06275