1 files changed, 29 insertions, 4 deletions

diff --git a/CPP/Common/MyBuffer2.h b/CPP/Common/MyBuffer2.h
index 372d478..23394f8 100644
--- a/CPP/Common/MyBuffer2.h
+++ b/CPP/Common/MyBuffer2.h
@@ -1,7 +1,7 @@
 // Common/MyBuffer2.h
 
-#ifndef __COMMON_MY_BUFFER2_H
-#define __COMMON_MY_BUFFER2_H
+#ifndef ZIP7_INC_COMMON_MY_BUFFER2_H
+#define ZIP7_INC_COMMON_MY_BUFFER2_H
 
 #include "../../C/Alloc.h"
 
@@ -12,7 +12,7 @@ class CMidBuffer
   Byte *_data;
   size_t _size;
 
-  CLASS_NO_COPY(CMidBuffer)
+  Z7_CLASS_NO_COPY(CMidBuffer)
 
 public:
   CMidBuffer(): _data(NULL), _size(0) {}
@@ -56,12 +56,37 @@ public:
 };
 
 
+class CAlignedBuffer1
+{
+  Byte *_data;
+
+  Z7_CLASS_NO_COPY(CAlignedBuffer1)
+
+public:
+  ~CAlignedBuffer1()
+  {
+    ISzAlloc_Free(&g_AlignedAlloc, _data);
+  }
+
+  CAlignedBuffer1(size_t size)
+  {
+    _data = NULL;
+    _data = (Byte *)ISzAlloc_Alloc(&g_AlignedAlloc, size);
+    if (!_data)
+      throw 1;
+  }
+
+  operator       Byte *()       { return _data; }
+  operator const Byte *() const { return _data; }
+};
+
+
 class CAlignedBuffer
 {
   Byte *_data;
   size_t _size;
 
-  CLASS_NO_COPY(CAlignedBuffer)
+  Z7_CLASS_NO_COPY(CAlignedBuffer)
 
 public:
   CAlignedBuffer(): _data(NULL), _size(0) {}