Merge branch 'master' into 816

1 files changed, 0 insertions, 47 deletions

diff --git a/other-licenses/7zstub/src/Common/DynamicBuffer.h b/other-licenses/7zstub/src/Common/DynamicBuffer.h
deleted file mode 100644
index e75e3c473..000000000
--- a/other-licenses/7zstub/src/Common/DynamicBuffer.h
+++ /dev/null
@@ -1,47 +0,0 @@
-// Common/DynamicBuffer.h

-

-#ifndef __COMMON_DYNAMICBUFFER_H

-#define __COMMON_DYNAMICBUFFER_H

-

-#include "Buffer.h"

-

-template <class T> class CDynamicBuffer: public CBuffer<T>

-{    

-  void GrowLength(size_t size)

-  {

-    size_t delta;

-    if (this->_capacity > 64)

-      delta = this->_capacity / 4;

-    else if (this->_capacity > 8)

-      delta = 16;

-    else

-      delta = 4;

-    delta = MyMax(delta, size);

-    SetCapacity(this->_capacity + delta);

-  }

-public:

-  CDynamicBuffer(): CBuffer<T>() {};

-  CDynamicBuffer(const CDynamicBuffer &buffer): CBuffer<T>(buffer) {};

-  CDynamicBuffer(size_t size): CBuffer<T>(size) {};

-  CDynamicBuffer& operator=(const CDynamicBuffer &buffer)

-  {

-    this->Free();

-    if(buffer._capacity > 0)

-    {

-      SetCapacity(buffer._capacity);

-      memmove(this->_items, buffer._items, buffer._capacity * sizeof(T));

-    }

-    return *this;

-  }

-  void EnsureCapacity(size_t capacity)

-  {

-    if (this->_capacity < capacity)

-      GrowLength(capacity - this->_capacity);

-  }

-};

-

-typedef CDynamicBuffer<char> CCharDynamicBuffer;

-typedef CDynamicBuffer<wchar_t> CWCharDynamicBuffer;

-typedef CDynamicBuffer<unsigned char> CByteDynamicBuffer;

-

-#endif