diff options
| author | kh1 <karsten.heimrich@nokia.com> | 2012-08-21 12:05:11 +0200 |
|---|---|---|
| committer | Tim Jenssen <tim.jenssen@nokia.com> | 2012-08-24 14:27:53 +0200 |
| commit | 3e5c51e1f7b99eda252e06968520d212eb5f5fe4 (patch) | |
| tree | a04e2034316e024f0648a657369772c7f46bb0a8 /src/libs/7zip/win/CPP/7zip/Common/StreamObjects.cpp | |
| parent | f9814b28ce934541f16d12d54534bea543143c01 (diff) | |
Revert "Fixes required for errorless MinGW-w64 compilation are done."wip/componentview
This reverts commit 9cad5d54cf0d78e92b4ee831299d83b657f42f2e as it
breaks compressing the meta folder (Windows 7, VS 2010).
Change-Id: I24d4ec37941487fc3cc998706d33cd5d8b9f011a
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 bb2df1797..3c86c3aeb 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); // PQR for MinGW-w64: requires _buffer address here. + memcpy(dest, _buffer, _size); } 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) |