ModdingRX/YimMenu
Archived
1
0
Fork 0
Code Actions Releases Activity

Fixed atArray operator<< to allow for pointer handling and not handling endl scenario properly.

Browse Source
This commit is contained in:
gir489 2020-04-17 11:52:54 -04:00
parent f4f2f41093
commit 3c94c7f832
1 changed files with 17 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
BigBaseV2/src/gta/array.hpp
View File

@ -150,32 +150,17 @@ namespace rage
m_count = newSize; m_count = newSize;
} }
T* begin() T* begin() const
{ {
return m_data; return &m_data[0];
} }
T* end() T* end() const
{ {
return m_data + m_size; return &m_data[m_size];
} }
const T* begin() const T* data() const
{
return m_data;
}
const T* end() const
{
return m_data + m_size;
}
T* data()
{
return m_data;
}
const T* data() const
{ {
return m_data; return m_data;
} }
@ -195,13 +180,23 @@ namespace rage
return m_data[index]; return m_data[index];
} }
#pragma warning(disable:4312)
friend std::ostream& operator<<(std::ostream& o, const atArray<T>& j) friend std::ostream& operator<<(std::ostream& o, const atArray<T>& j)
{ {
o << "Array Size: " << j.size() << std::endl; o << "Array Size: " << j.size() << std::endl;
for (T item : j) for(int i = 0; i < j.size(); i++)
o << "\tArray Item: " << item << " [" << HEX_TO_UPPER(item) << "]" << (j.end() == item) ? "" : std::endl; {
T item = j[i];
if (std::is_pointer<T>())
o << "\tArray Pointer: " << HEX_TO_UPPER(item) << " Item: [" << HEX_TO_UPPER(*(std::uint64_t*)item) << "]"; // C4312 for 64-bit targets
else
o << "\tArray Item: " << item;
if (i != j.size() - 1)
o << std::endl;
}
return o; return o;
} }
#pragma warning(default:4312)
const T& operator[](std::uint16_t index) const const T& operator[](std::uint16_t index) const
{ {