1 files changed, 29 insertions, 20 deletions

diff --git a/CPP/Common/MyBuffer.h b/CPP/Common/MyBuffer.h
index 18ab6fa..bc829f4 100644
--- a/CPP/Common/MyBuffer.h
+++ b/CPP/Common/MyBuffer.h
@@ -1,13 +1,15 @@
 // Common/MyBuffer.h
 
-#ifndef __COMMON_MY_BUFFER_H
-#define __COMMON_MY_BUFFER_H
+#ifndef ZIP7_INC_COMMON_MY_BUFFER_H
+#define ZIP7_INC_COMMON_MY_BUFFER_H
+
+#include <string.h>
 
 #include "Defs.h"
 #include "MyTypes.h"
 
 /* 7-Zip now uses CBuffer only as CByteBuffer.
-   So there is no need to use MY_ARRAY_NEW macro in CBuffer code. */
+   So there is no need to use Z7_ARRAY_NEW macro in CBuffer code. */
 
 template <class T> class CBuffer
 {
@@ -20,16 +22,23 @@ public:
     if (_items)
     {
       delete []_items;
-      _items = 0;
+      _items = NULL;
     }
     _size = 0;
   }
   
-  CBuffer(): _items(0), _size(0) {};
-  CBuffer(size_t size): _items(0), _size(0) { _items = new T[size]; _size = size; }
-  CBuffer(const CBuffer &buffer): _items(0), _size(0)
+  CBuffer(): _items(NULL), _size(0) {}
+  CBuffer(size_t size): _items(NULL), _size(0)
+  {
+    if (size != 0)
+    {
+      _items = new T[size];
+      _size = size;
+    }
+  }
+  CBuffer(const CBuffer &buffer): _items(NULL), _size(0)
   {
-    size_t size = buffer._size;
+    const size_t size = buffer._size;
     if (size != 0)
     {
       _items = new T[size];
@@ -136,7 +145,7 @@ typedef CBuffer<unsigned char> CByteBuffer;
 
 class CByteBuffer_Wipe: public CByteBuffer
 {
-  CLASS_NO_COPY(CByteBuffer_Wipe)
+  Z7_CLASS_NO_COPY(CByteBuffer_Wipe)
 public:
   // CByteBuffer_Wipe(): CBuffer<unsigned char>() {}
   CByteBuffer_Wipe(size_t size): CBuffer<unsigned char>(size) {}
@@ -157,17 +166,17 @@ public:
   void Free()
   {
     delete []_items;
-    _items = 0;
+    _items = NULL;
   }
-  CObjArray(size_t size): _items(0)
+  CObjArray(size_t size): _items(NULL)
   {
     if (size != 0)
     {
-      MY_ARRAY_NEW(_items, T, size)
+      Z7_ARRAY_NEW(_items, T, size)
       // _items = new T[size];
     }
   }
-  CObjArray(): _items(0) {};
+  CObjArray(): _items(NULL) {}
   ~CObjArray() { delete []_items; }
   
   operator       T *()       { return _items; }
@@ -176,8 +185,8 @@ public:
   void Alloc(size_t newSize)
   {
     delete []_items;
-    _items = 0;
-    MY_ARRAY_NEW(_items, T, newSize)
+    _items = NULL;
+    Z7_ARRAY_NEW(_items, T, newSize)
     // _items = new T[newSize];
   }
 };
@@ -201,12 +210,12 @@ public:
   void Free()
   {
     delete []_items;
-    _items = 0;
+    _items = NULL;
     _size = 0;
   }
-  CObjArray2(): _items(0), _size(0) {};
+  CObjArray2(): _items(NULL), _size(0) {}
   /*
-  CObjArray2(const CObjArray2 &buffer): _items(0), _size(0)
+  CObjArray2(const CObjArray2 &buffer): _items(NULL), _size(0)
   {
     size_t newSize = buffer._size;
     if (newSize != 0)
@@ -221,7 +230,7 @@ public:
   }
   */
   /*
-  CObjArray2(size_t size): _items(0), _size(0)
+  CObjArray2(size_t size): _items(NULL), _size(0)
   {
     if (size != 0)
     {
@@ -247,7 +256,7 @@ public:
     T *newBuffer = NULL;
     if (size != 0)
     {
-      MY_ARRAY_NEW(newBuffer, T, size)
+      Z7_ARRAY_NEW(newBuffer, T, size)
       // newBuffer = new T[size];
     }
     delete []_items;