drinkingtea/nostalgia
2
0
Fork 0
Code Issues 4 Pull Requests Actions Releases 13 Activity

[ox] Fix to build with MinGW

Browse Source
This commit is contained in:
Gary Talent
2018-05-05 02:34:55 -05:00
parent 1e82dacd6d
commit 610f6f4246
5 changed files with 24 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
deps/ox/src/ox/ptrarith/nodebuffer.hpp vendored
View File

@@ -204,7 +204,7 @@ typename NodeBuffer<size_t, Item>::ItemPtr NodeBuffer<size_t, Item>::ptr(size_t
template<typename size_t, typename Item>
typename NodeBuffer<size_t, Item>::ItemPtr NodeBuffer<size_t, Item>::malloc(size_t size) {
auto fullSize = size + sizeof(Item);
size_t fullSize = size + sizeof(Item);
if (m_header.size - m_header.bytesUsed >= fullSize) {
auto last = lastItem();
size_t addr = 0;

2
deps/ox/src/ox/ptrarith/ptr.hpp vendored
View File

@@ -88,7 +88,7 @@ inline Ptr<T, size_t, minOffset>::Ptr(void *dataStart, size_t dataSize, size_t i
if (itemSize >= sizeof(T) and
dataStart and
itemStart >= minOffset and
itemStart + itemSize <= dataSize) {
static_cast<std::size_t>(itemStart + itemSize) <= dataSize) {
m_dataStart = reinterpret_cast<uint8_t*>(dataStart);
m_dataSize = dataSize;
m_itemOffset = itemStart;