2 files changed, 50 insertions, 3 deletions

diff --git a/CPP/Common/Common0.h b/CPP/Common/Common0.h
index 55606cd..5781a95 100644
--- a/CPP/Common/Common0.h
+++ b/CPP/Common/Common0.h
@@ -126,8 +126,9 @@ if compiled with new GCC libstdc++, GCC libstdc++ can use:
 #pragma GCC diagnostic ignored "-Wglobal-constructors"
 #pragma GCC diagnostic ignored "-Wexit-time-destructors"
 
-#if defined(Z7_LLVM_CLANG_VERSION) && __clang_major__ >= 18 // 18.1.0RC
-#pragma GCC diagnostic ignored "-Wswitch-default"
+#if defined(Z7_LLVM_CLANG_VERSION) && __clang_major__ >= 18 /* 18.1.0RC */ \
+  || defined(Z7_APPLE_CLANG_VERSION) && __clang_major__ >= 16 // for APPLE=17 (LLVM=19)
+  #pragma GCC diagnostic ignored "-Wswitch-default"
 #endif
 // #pragma GCC diagnostic ignored "-Wunused-private-field"
 // #pragma GCC diagnostic ignored "-Wnonportable-system-include-path"
diff --git a/CPP/Common/MyBuffer.h b/CPP/Common/MyBuffer.h
index 80f0205..08c10a3 100644
--- a/CPP/Common/MyBuffer.h
+++ b/CPP/Common/MyBuffer.h
@@ -202,7 +202,53 @@ public:
   }
 };
 
-typedef CObjArray<Byte> CByteArr;
+
+/* CSmallObjArray can be used for Byte arrays
+   or for arrays whose total size in bytes does not exceed size_t ranges.
+   So there is no need to use Z7_ARRAY_NEW macro in CSmallObjArray code. */
+template <class T> class CSmallObjArray
+{
+protected:
+  T *_items;
+private:
+  // we disable copy
+  CSmallObjArray(const CSmallObjArray &buffer);
+  void operator=(const CSmallObjArray &buffer);
+public:
+  void Free()
+  {
+    delete []_items;
+    _items = NULL;
+  }
+  CSmallObjArray(size_t size): _items(NULL)
+  {
+    if (size != 0)
+    {
+      // Z7_ARRAY_NEW(_items, T, size)
+      _items = new T[size];
+    }
+  }
+  CSmallObjArray(): _items(NULL) {}
+  ~CSmallObjArray() { delete []_items; }
+  
+  operator       T *()       { return _items; }
+  operator const T *() const { return _items; }
+  const T* ConstData()    const { return _items; }
+        T* NonConstData() const { return _items; }
+        T* NonConstData()       { return _items; }
+  // const T* Data() const         { return _items; }
+  //       T* Data()               { return _items; }
+  
+  void Alloc(size_t newSize)
+  {
+    delete []_items;
+    _items = NULL;
+    // Z7_ARRAY_NEW(_items, T, newSize)
+    _items = new T[newSize];
+  }
+};
+
+typedef CSmallObjArray<Byte> CByteArr;
 typedef CObjArray<bool> CBoolArr;
 typedef CObjArray<int> CIntArr;
 typedef CObjArray<unsigned> CUIntArr;