KSat/fsfw
16
5
Fork 0
forked from fsfw/fsfw
Code Issues Pull Requests Releases Wiki Activity

ksat_master #5

Manually merged
muellerr merged 169 commits from ksat_master into master 2020-04-08 19:35:26 +02:00
Conversation 0 Commits 169 Files Changed 150 +2 -2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 52c05e2f3d - Show all commits

4
container/ArrayList.h
View File

@ -223,7 +223,6 @@ public:
return (maxSize_ - size); return (maxSize_ - size);
} }
private: private:
/** /**
* This is the copy constructor * This is the copy constructor
@ -236,6 +235,7 @@ private:
ArrayList(const ArrayList& other) : ArrayList(const ArrayList& other) :
size(other.size), entries(other.entries), maxSize_(other.maxSize_), size(other.size), entries(other.entries), maxSize_(other.maxSize_),
allocated(false) {} allocated(false) {}
protected: protected:
/** /**
* pointer to the array in which the entries are stored * pointer to the array in which the entries are stored
@ -269,6 +269,6 @@ protected:
++i; ++i;
} }
} }
}; };
#endif /* ARRAYLIST_H_ */ #endif /* ARRAYLIST_H_ */