drinkingtea/nostalgia
drinkingtea/nostalgia
2
0
Fork 0
Code Issues 6 Pull Requests Actions Releases 9 Activity

[ox/buffer] Remove and and or keywords

Browse Source
This commit is contained in:
Gary Talent 2018-05-06 09:53:06 -05:00
parent 610f6f4246
commit 99b77e868d
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -191,9 +191,9 @@ typename NodeBuffer<size_t, Item>::ItemPtr NodeBuffer<size_t, Item>::ptr(size_t
auto itemSpace = m_header.size - itemOffset;
auto item = reinterpret_cast<Item*>(reinterpret_cast<uint8_t*>(this) + itemOffset);
oxTrace("ox::ptrarith::NodeBuffer::ptr::itemOffset") << itemOffset << m_header.size - sizeof(Item);
if (itemOffset >= sizeof(Header) and
itemOffset < m_header.size - sizeof(Item) and
itemSpace >= static_cast<size_t>(sizeof(Item)) and
if (itemOffset >= sizeof(Header) &&
itemOffset < m_header.size - sizeof(Item) &&
itemSpace >= static_cast<size_t>(sizeof(Item)) &&
itemSpace >= item->fullSize()) {
return ItemPtr(this, m_header.size, itemOffset, item->fullSize());
} else {
@ -270,7 +270,7 @@ void NodeBuffer<size_t, Item>::free(ItemPtr item) {
template<typename size_t, typename Item>
Error NodeBuffer<size_t, Item>::setSize(size_t size) {
auto last = lastItem();
if ((last.valid() and last.end() >= size) or size < sizeof(m_header)) {
if ((last.valid() && last.end() >= size) || size < sizeof(m_header)) {
return 1;
} else {
m_header.size = size;

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

@ -85,9 +85,9 @@ inline Ptr<T, size_t, minOffset>::Ptr(std::nullptr_t) {
template<typename T, typename size_t, size_t minOffset>
inline Ptr<T, size_t, minOffset>::Ptr(void *dataStart, size_t dataSize, size_t itemStart, size_t itemSize) {
// do some sanity checks before assuming this is valid
if (itemSize >= sizeof(T) and
dataStart and
itemStart >= minOffset and
if (itemSize >= sizeof(T) &&
dataStart &&
itemStart >= minOffset &&
static_cast<std::size_t>(itemStart + itemSize) <= dataSize) {
m_dataStart = reinterpret_cast<uint8_t*>(dataStart);
m_dataSize = dataSize;
@ -171,7 +171,7 @@ inline T &Ptr<T, size_t, minOffset>::operator*() {
template<typename T, typename size_t, size_t minOffset>
inline Ptr<T, size_t, minOffset>::operator size_t() const {
if (m_dataStart and m_itemOffset) {
if (m_dataStart && m_itemOffset) {
return m_itemOffset;
}
return 0;