From 9ea47a20a3e23debd329707feaec8f26625b8f9e Mon Sep 17 00:00:00 2001 From: Christian Zimmermann Date: Thu, 18 Apr 2024 13:56:24 +0200 Subject: [PATCH] arrays: formatIsTrivial -> public --- src/include/array/marray.h | 4 +--- src/include/array/slice.h | 7 ++----- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/src/include/array/marray.h b/src/include/array/marray.h index 779f77b..794aeec 100644 --- a/src/include/array/marray.h +++ b/src/include/array/marray.h @@ -44,11 +44,9 @@ namespace CNORXZ virtual const_iterator cbegin() const override; virtual const_iterator cend() const override; virtual bool isView() const override; + virtual bool formatIsTrivial() const override final; SERIALIZATION_FUNCTIONS; - - protected: - virtual bool formatIsTrivial() const override final; private: Vector mCont; diff --git a/src/include/array/slice.h b/src/include/array/slice.h index 6acb184..e681e93 100644 --- a/src/include/array/slice.h +++ b/src/include/array/slice.h @@ -47,11 +47,10 @@ namespace CNORXZ virtual const_iterator cbegin() const override; virtual const_iterator cend() const override; virtual bool isView() const override final; - - protected: - virtual bool formatIsTrivial() const override final; + protected: + const CArrayBase* mCParent = nullptr; /**< pointer to the original container */ YFormat mBlockSizes; /**< the format */ SizeT mOff = 0; /** pointer offset w.r.t. the original pointer */ @@ -89,8 +88,6 @@ namespace CNORXZ virtual const_iterator cbegin() const override; virtual const_iterator cend() const override; virtual bool isView() const override final; - - protected: virtual bool formatIsTrivial() const override final; private: