Bananymous
/
banan-os
1
1
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BAN: fix Vector code 

one return value was missing and AddressOf functions were kinda ugly
This commit is contained in:
Bananymous 2023-01-18 17:16:19 +02:00
parent dd607ce86f
commit 64f0cc0d42
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
BAN/include/BAN/Vector.h
View File

@ -106,9 +106,9 @@ namespace BAN
size_type Capacity() const; size_type Capacity() const;
private: private:
const T* AddressOf(size_type, uint8_t* = nullptr) const;
T* AddressOf(size_type, uint8_t* = nullptr);
[[nodiscard]] ErrorOr<void> EnsureCapasity(size_type); [[nodiscard]] ErrorOr<void> EnsureCapasity(size_type);
const T* AddressOf(size_type, void* = nullptr) const;
T* AddressOf(size_type, void* = nullptr);
private: private:
uint8_t* m_data = nullptr; uint8_t* m_data = nullptr;
@ -155,6 +155,8 @@ namespace BAN
other.m_data = nullptr; other.m_data = nullptr;
other.m_capacity = 0; other.m_capacity = 0;
other.m_size = 0; other.m_size = 0;
return *this;
} }
template<typename T> template<typename T>
@ -403,19 +405,19 @@ namespace BAN
} }
template<typename T> template<typename T>
const T* Vector<T>::AddressOf(size_type index, uint8_t* base) const const T* Vector<T>::AddressOf(size_type index, void* base) const
{ {
if (base == nullptr) if (base == nullptr)
base = m_data; base = m_data;
return (T*)(base + index * sizeof(T)); return (T*)base + index;
} }
template<typename T> template<typename T>
T* Vector<T>::AddressOf(size_type index, uint8_t* base) T* Vector<T>::AddressOf(size_type index, void* base)
{ {
if (base == nullptr) if (base == nullptr)
base = m_data; base = m_data;
return (T*)(base + index * sizeof(T)); return (T*)base + index;
} }
} }