diff options
| author | tjenssen <tim.jenssen@nokia.com> | 2012-08-08 17:31:38 +0200 |
|---|---|---|
| committer | Tim Jenssen <tim.jenssen@nokia.com> | 2012-08-10 13:12:47 +0200 |
| commit | 9cad5d54cf0d78e92b4ee831299d83b657f42f2e (patch) | |
| tree | e1914be8eadfd06ad64ff5dd31d200a4cf95df86 /src/libs/7zip/win/CPP/7zip/Common/StreamObjects.cpp | |
| parent | 0188b08e8dc218fb66f59522ffa7c02643a9577a (diff) | |
Fixes required for errorless MinGW-w64 compilation are done.
Change-Id: Iedc83b536df9f00e3737d7c92c4a57d6c0feb07a
Reviewed-by: Niels Weber <niels.2.weber@nokia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
Diffstat (limited to 'src/libs/7zip/win/CPP/7zip/Common/StreamObjects.cpp')
| -rw-r--r-- | src/libs/7zip/win/CPP/7zip/Common/StreamObjects.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libs/7zip/win/CPP/7zip/Common/StreamObjects.cpp b/src/libs/7zip/win/CPP/7zip/Common/StreamObjects.cpp index 3c86c3aeb..bb2df1797 100644 --- a/src/libs/7zip/win/CPP/7zip/Common/StreamObjects.cpp +++ b/src/libs/7zip/win/CPP/7zip/Common/StreamObjects.cpp @@ -78,7 +78,7 @@ Byte *CDynBufSeqOutStream::GetBufPtrForWriting(size_t addSize) void CDynBufSeqOutStream::CopyToBuffer(CByteBuffer &dest) const { dest.SetCapacity(_size); - memcpy(dest, _buffer, _size); + memcpy(dest, &_buffer, _size); // PQR for MinGW-w64: requires _buffer address here. } STDMETHODIMP CDynBufSeqOutStream::Write(const void *data, UInt32 size, UInt32 *processedSize) @@ -205,7 +205,7 @@ STDMETHODIMP CCachedInStream::Read(void *data, UInt32 size, UInt32 *processedSiz return S_OK; } - + STDMETHODIMP CCachedInStream::Seek(Int64 offset, UInt32 seekOrigin, UInt64 *newPosition) { switch(seekOrigin) |