From 69c4a496ddb45297209e0080984e95e7f33a5bf6 Mon Sep 17 00:00:00 2001 From: Alex Szpakowski Date: Sat, 18 Jun 2022 17:59:55 -0300 Subject: [PATCH] Fix a few minor compiler warnings --- src/common/Stream.cpp | 2 +- src/modules/audio/openal/Pool.cpp | 2 +- src/modules/data/DataStream.cpp | 14 +++++++------- src/modules/system/sdl/System.h | 10 +++++----- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/common/Stream.cpp b/src/common/Stream.cpp index 01d4c593d..f8e13f540 100644 --- a/src/common/Stream.cpp +++ b/src/common/Stream.cpp @@ -69,7 +69,7 @@ bool Stream::write(Data *src) bool Stream::write(Data *src, int64 offset, int64 size) { - if (offset < 0 || size < 0 || offset + size > src->getSize()) + if (offset < 0 || size < 0 || offset + size > (int64) src->getSize()) throw love::Exception("Offset and size parameters do not fit within the given Data's size."); return write((const uint8 *) src->getData() + offset, size); diff --git a/src/modules/audio/openal/Pool.cpp b/src/modules/audio/openal/Pool.cpp index 667cf67b4..276bde1cf 100644 --- a/src/modules/audio/openal/Pool.cpp +++ b/src/modules/audio/openal/Pool.cpp @@ -34,7 +34,7 @@ static Variant::SharedTable *putSourcesAsSharedTable(std::vectorpairs.emplace_back((double) (i + 1), Variant(&Source::type, sources[i])); return table; diff --git a/src/modules/data/DataStream.cpp b/src/modules/data/DataStream.cpp index 54962845b..a9c6bfa1f 100644 --- a/src/modules/data/DataStream.cpp +++ b/src/modules/data/DataStream.cpp @@ -34,19 +34,19 @@ love::Type DataStream::type("DataStream", &Stream::type); DataStream::DataStream(Data *data) : data(data) - , offset(0) - , size(data->getSize()) , memory((const uint8 *) data->getData()) , writableMemory((uint8 *) data->getData()) // TODO: disallow writing sometimes? + , offset(0) + , size(data->getSize()) { } DataStream::DataStream(const DataStream &other) : data(other.data) - , offset(0) - , size(other.size) , memory(other.memory) , writableMemory(other.writableMemory) + , offset(0) + , size(other.size) { } @@ -79,7 +79,7 @@ int64 DataStream::read(void* data, int64 size) if (size <= 0) return 0; - if (offset >= getSize()) + if ((int64) offset >= getSize()) return 0; int64 readsize = std::min(size, getSize() - offset); @@ -95,7 +95,7 @@ bool DataStream::write(const void* data, int64 size) if (size <= 0 || writableMemory == nullptr) return false; - if (offset >= getSize()) + if ((int64) offset >= getSize()) return false; int64 writesize = std::min(size, getSize() - offset); @@ -123,7 +123,7 @@ bool DataStream::seek(int64 pos, SeekOrigin origin) else if (origin == SEEKORIGIN_END) pos += size; - if (pos < 0 || pos > size) + if (pos < 0 || pos > (int64) size) return false; offset = pos; diff --git a/src/modules/system/sdl/System.h b/src/modules/system/sdl/System.h index 0f0258dd4..167b115e0 100644 --- a/src/modules/system/sdl/System.h +++ b/src/modules/system/sdl/System.h @@ -43,14 +43,14 @@ public: virtual ~System() {} // Implements Module. - const char *getName() const; + const char *getName() const override; - int getProcessorCount() const; + int getProcessorCount() const override; - void setClipboardText(const std::string &text) const; - std::string getClipboardText() const; + void setClipboardText(const std::string &text) const override; + std::string getClipboardText() const override; - PowerState getPowerInfo(int &seconds, int &percent) const; + PowerState getPowerInfo(int &seconds, int &percent) const override; std::vector getPreferredLocales() const override; private: