From ca3dbc7ca0f9ce52160e159766223073ab7a141d Mon Sep 17 00:00:00 2001 From: "Robin.Mueller" Date: Mon, 4 May 2020 18:33:06 +0200 Subject: [PATCH] reverted fixed array list container changes --- container/FixedArrayList.h | 28 +--------------------------- 1 file changed, 1 insertion(+), 27 deletions(-) diff --git a/container/FixedArrayList.h b/container/FixedArrayList.h index 5d93db90c..eeffcc870 100644 --- a/container/FixedArrayList.h +++ b/container/FixedArrayList.h @@ -2,44 +2,18 @@ #define FIXEDARRAYLIST_H_ #include - /** - * @brief Array List with a fixed maximum size - * @ingroup container + * \ingroup container */ template class FixedArrayList: public ArrayList { private: T data[MAX_SIZE]; public: - /** - * (Robin) Maybe we should also implement move assignment and move ctor. - * Or at least delete them. - */ FixedArrayList() : ArrayList(data, MAX_SIZE) { } - // (Robin): We could create a constructor to initialize the fixed array list with data and the known size field - // so it can be used for serialization too (with SerialFixedArrrayListAdapter) - // is this feasible? - /** - * Initialize a fixed array list with data and number of data fields. - * Endianness of entries can be swapped optionally. - * @param data_ - * @param count - * @param swapArrayListEndianess - */ - FixedArrayList(T * data_, count_t count, - bool swapArrayListEndianess = false): - ArrayList(data, MAX_SIZE) { - memcpy(this->data, data_, count * sizeof(T)); - this->size = count; - if(swapArrayListEndianess) { - ArrayList::swapArrayListEndianness(); - } - } - FixedArrayList(const FixedArrayList& other) : ArrayList(data, MAX_SIZE) { memcpy(this->data, other.data, sizeof(this->data));