Petr Onderka has uploaded a new change for review.
https://gerrit.wikimedia.org/r/84126
Change subject: LZMA doesn't require C++11
......................................................................
LZMA doesn't require C++11
Change-Id: If71e62dec6893feb0471caa616b08cee88336b0f
---
M LZMA/CPP/7zip/Bundles/LzmaCon/makefile.gcc
M LZMA/CPP/7zip/Common/WrapperStreams.cpp
2 files changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/dumps/incremental
refs/changes/26/84126/1
diff --git a/LZMA/CPP/7zip/Bundles/LzmaCon/makefile.gcc
b/LZMA/CPP/7zip/Bundles/LzmaCon/makefile.gcc
index 174d395..60ab1b5 100644
--- a/LZMA/CPP/7zip/Bundles/LzmaCon/makefile.gcc
+++ b/LZMA/CPP/7zip/Bundles/LzmaCon/makefile.gcc
@@ -1,5 +1,5 @@
PROG = liblzma.a
-CXX = g++ -O2 -Wall -std=c++11
+CXX = g++ -O2 -Wall
CXX_C = gcc -O2 -Wall
LIB = -lm
RM = rm -f
diff --git a/LZMA/CPP/7zip/Common/WrapperStreams.cpp
b/LZMA/CPP/7zip/Common/WrapperStreams.cpp
index 1ca3b20..8e74198 100644
--- a/LZMA/CPP/7zip/Common/WrapperStreams.cpp
+++ b/LZMA/CPP/7zip/Common/WrapperStreams.cpp
@@ -10,7 +10,7 @@
STDMETHODIMP CInWrapperStream::Read(void *data, UInt32 size, UInt32
*processedSize)
{
- auto read = wrappedStream->readsome((char*)data, size);
+ std::streamsize read = wrappedStream->readsome((char*)data, size);
if (wrappedStream->fail())
return E_FAIL;
@@ -39,4 +39,4 @@
*processedSize = size;
return S_OK;
-}
\ No newline at end of file
+}
--
To view, visit https://gerrit.wikimedia.org/r/84126
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If71e62dec6893feb0471caa616b08cee88336b0f
Gerrit-PatchSet: 1
Gerrit-Project: operations/dumps/incremental
Gerrit-Branch: gsoc
Gerrit-Owner: Petr Onderka <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
