From c5f0825edb850ccb957ae81dd40823b0caa862af Mon Sep 17 00:00:00 2001 From: Gary Talent Date: Tue, 14 Jan 2020 20:07:46 -0600 Subject: [PATCH] [ox/mc] Fix signed/unsigned comparison in field bitmap --- deps/ox/src/ox/mc/presenceindicator.cpp | 4 ++-- deps/ox/src/ox/mc/presenceindicator.hpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/deps/ox/src/ox/mc/presenceindicator.cpp b/deps/ox/src/ox/mc/presenceindicator.cpp index f9e4292c..b3e7c367 100644 --- a/deps/ox/src/ox/mc/presenceindicator.cpp +++ b/deps/ox/src/ox/mc/presenceindicator.cpp @@ -17,7 +17,7 @@ FieldPresenceIndicator::FieldPresenceIndicator(uint8_t *mask, std::size_t maxLen m_maskLen = maxLen; } -ValErr FieldPresenceIndicator::get(int i) const { +ValErr FieldPresenceIndicator::get(std::size_t i) const { if (i / 8 < m_maskLen) { return (m_mask[i / 8] >> (i % 8)) & 1; } else { @@ -25,7 +25,7 @@ ValErr FieldPresenceIndicator::get(int i) const { } } -Error FieldPresenceIndicator::set(int i, bool on) { +Error FieldPresenceIndicator::set(std::size_t i, bool on) { if (i / 8 < m_maskLen) { if (on) { m_mask[i / 8] |= 1 << (i % 8); diff --git a/deps/ox/src/ox/mc/presenceindicator.hpp b/deps/ox/src/ox/mc/presenceindicator.hpp index 1b2c15c8..1a9fbeb1 100644 --- a/deps/ox/src/ox/mc/presenceindicator.hpp +++ b/deps/ox/src/ox/mc/presenceindicator.hpp @@ -22,9 +22,9 @@ class FieldPresenceIndicator { public: FieldPresenceIndicator(uint8_t *mask, std::size_t maxLen); - ValErr get(int i) const; + ValErr get(std::size_t i) const; - Error set(int i, bool on); + Error set(std::size_t i, bool on); void setFields(int) noexcept;