github-starred/ultimatepp
Watch
2
0
Fork
You've already forked ultimatepp
 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-10-06 00:30:10 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

Core: z.cpp fixed to compile with GCC

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@6669 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2013-12-18 07:56:59 +00:00
commit c5dd585539
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
uppsrc/Core/z.cpp
View file

@ -356,7 +356,7 @@ String ZCompress(const void *data, int64 len, Gate2<int64, int64> progress)
{
StringStream out;
MemReadStream in(data, len);
return ZCompress(out, in, progress) < 0 ? String::GetVoid() : out;
return ZCompress(out, in, progress) < 0 ? String::GetVoid() : out.GetResult();
}
String ZCompress(const String& s, Gate2<int64, int64> progress)
@ -368,7 +368,7 @@ String ZDecompress(const void *data, int64 len, Gate2<int64, int64> progress)
{
StringStream out;
MemReadStream in(data, len);
return ZDecompress(out, in, progress) < 0 ? String::GetVoid() : out;
return ZDecompress(out, in, progress) < 0 ? String::GetVoid() : out.GetResult();
}
String ZDecompress(const String& s, Gate2<int64, int64> progress)
@ -395,7 +395,7 @@ String GZCompress(const void *data, int len, Gate2<int64, int64> progress)
{
StringStream out;
MemReadStream in(data, len);
return GZCompress(out, in, progress) < 0 ? String::GetVoid() : out;
return GZCompress(out, in, progress) < 0 ? String::GetVoid() : out.GetResult();
}
String GZCompress(const String& s, Gate2<int64, int64> progress)
@ -412,7 +412,7 @@ String GZDecompress(const void *data, int len, Gate2<int64, int64> progress)
{
StringStream out;
MemReadStream in(data, len);
return GZDecompress(out, in, progress) < 0 ? String::GetVoid() : out;
return GZDecompress(out, in, progress) < 0 ? String::GetVoid() : out.GetResult();
}
String GZDecompress(const String& s, Gate2<int64, int64> progress)