1 files changed, 11 insertions, 26 deletions

diff --git a/CPP/7zip/Compress/CopyCoder.h b/CPP/7zip/Compress/CopyCoder.h
index a9d0b6d..cb93e4e 100644
--- a/CPP/7zip/Compress/CopyCoder.h
+++ b/CPP/7zip/Compress/CopyCoder.h
@@ -1,7 +1,7 @@
 // Compress/CopyCoder.h
 
-#ifndef __COMPRESS_COPY_CODER_H
-#define __COMPRESS_COPY_CODER_H
+#ifndef ZIP7_INC_COMPRESS_COPY_CODER_H
+#define ZIP7_INC_COMPRESS_COPY_CODER_H
 
 #include "../../Common/MyCom.h"
 
@@ -9,36 +9,21 @@
 
 namespace NCompress {
 
-class CCopyCoder:
-  public ICompressCoder,
-  public ICompressSetInStream,
-  public ISequentialInStream,
-  public ICompressSetFinishMode,
-  public ICompressGetInStreamProcessedSize,
-  public CMyUnknownImp
-{
+Z7_CLASS_IMP_COM_5(
+  CCopyCoder
+  , ICompressCoder
+  , ICompressSetInStream
+  , ISequentialInStream
+  , ICompressSetFinishMode
+  , ICompressGetInStreamProcessedSize
+)
   Byte *_buf;
   CMyComPtr<ISequentialInStream> _inStream;
 public:
   UInt64 TotalSize;
   
-  CCopyCoder(): _buf(0), TotalSize(0) {};
+  CCopyCoder(): _buf(NULL), TotalSize(0) {}
   ~CCopyCoder();
-
-  MY_UNKNOWN_IMP5(
-      ICompressCoder,
-      ICompressSetInStream,
-      ISequentialInStream,
-      ICompressSetFinishMode,
-      ICompressGetInStreamProcessedSize)
-
-  STDMETHOD(Code)(ISequentialInStream *inStream, ISequentialOutStream *outStream,
-      const UInt64 *inSize, const UInt64 *outSize, ICompressProgressInfo *progress);
-  STDMETHOD(SetInStream)(ISequentialInStream *inStream);
-  STDMETHOD(ReleaseInStream)();
-  STDMETHOD(Read)(void *data, UInt32 size, UInt32 *processedSize);
-  STDMETHOD(SetFinishMode)(UInt32 finishMode);
-  STDMETHOD(GetInStreamProcessedSize)(UInt64 *value);
 };
 
 HRESULT CopyStream(ISequentialInStream *inStream, ISequentialOutStream *outStream, ICompressProgressInfo *progress);