Merge branch 'master' into 816

1 files changed, 0 insertions, 23 deletions

diff --git a/other-licenses/7zstub/src/7zip/Archive/Common/OutStreamWithCRC.cpp b/other-licenses/7zstub/src/7zip/Archive/Common/OutStreamWithCRC.cpp
deleted file mode 100644
index 6199562ee..000000000
--- a/other-licenses/7zstub/src/7zip/Archive/Common/OutStreamWithCRC.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-// OutStreamWithCRC.cpp

-

-#include "StdAfx.h"

-

-#include "OutStreamWithCRC.h"

-

-STDMETHODIMP COutStreamWithCRC::Write(const void *data, 

-    UInt32 size, UInt32 *processedSize)

-{

-  UInt32 realProcessedSize;

-  HRESULT result;

-  if(!_stream)

-  {

-    realProcessedSize = size;

-    result = S_OK;

-  }

-  else

-    result = _stream->Write(data, size, &realProcessedSize);

-  _crc.Update(data, realProcessedSize);

-  if(processedSize != NULL)

-    *processedSize = realProcessedSize;

-  return result;

-}