[Scummvm-git-logs] scummvm master -> 9fda7aa12a5d754c794b1379cdf83241dfa0f18b

[sev-]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
0a4580a34c COMMON: Add missing override keyword
9fda7aa12a COMMON: Fix warning


Commit: 0a4580a34c199734e46770da054c52e8270b11e3
    https://github.com/scummvm/scummvm/commit/0a4580a34c199734e46770da054c52e8270b11e3
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2022-11-24T00:18:37+01:00

Commit Message:
COMMON: Add missing override keyword

Changed paths:
    common/gzio.h


diff --git a/common/gzio.h b/common/gzio.h
index 320f6e6be1e..b013684f506 100644
--- a/common/gzio.h
+++ b/common/gzio.h
@@ -54,10 +54,10 @@ public:
 
 	uint32 read(void *dataPtr, uint32 dataSize) override;
 
-	bool eos() const { return _eos; }
+	bool eos() const override { return _eos; }
 	bool err() const override { return _err; }
 	void clearErr() override { _eos = false; _err = false; }
-  
+
 	int64 pos() const override { return _streamPos; }
 	int64 size() const override { return _uncompressedSize; }
 


Commit: 9fda7aa12a5d754c794b1379cdf83241dfa0f18b
    https://github.com/scummvm/scummvm/commit/9fda7aa12a5d754c794b1379cdf83241dfa0f18b
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2022-11-24T00:19:27+01:00

Commit Message:
COMMON: Fix warning

Changed paths:
    common/clickteam.h


diff --git a/common/clickteam.h b/common/clickteam.h
index f9dba586bdc..ab89b172742 100644
--- a/common/clickteam.h
+++ b/common/clickteam.h
@@ -61,12 +61,12 @@ public:
 	ClickteamTag* getTag(ClickteamTagId tagId) const;
 
 	static ClickteamInstaller* open(Common::SeekableReadStream *stream, DisposeAfterUse::Flag dispose = DisposeAfterUse::NO);
-	
+
 private:
 	class ClickteamFileDescriptor {
 	private:
 		Common::String _fileName;
-		
+
 		// Offset of the file contents relative to the beginning of block3
 		uint32 _fileDataOffset;
 		// Offset of file descriptor
@@ -85,14 +85,14 @@ private:
 	ClickteamInstaller(Common::HashMap<Common::String, ClickteamFileDescriptor, Common::IgnoreCase_Hash, Common::IgnoreCase_EqualTo> files,
 			   Common::HashMap<uint16, Common::SharedPtr<ClickteamTag>> tags,
 			   uint32 crcXor, uint32 block3Offset, uint32 block3Size, Common::SeekableReadStream *stream, DisposeAfterUse::Flag dispose)
-		: _files(files), _tags(tags), _crcXor(crcXor), _block3Offset(block3Offset), _block3Size(block3Size), _stream(stream, dispose) {
+		: _files(files), _tags(tags), _crcXor(crcXor), _block3Offset(block3Offset), /*_block3Size(block3Size), */_stream(stream, dispose) {
 	}
 
 	Common::HashMap<Common::String, ClickteamFileDescriptor, Common::IgnoreCase_Hash, Common::IgnoreCase_EqualTo> _files;
 	Common::HashMap<uint16, Common::SharedPtr<ClickteamTag>> _tags;
 	Common::DisposablePtr<Common::SeekableReadStream> _stream;
 	mutable Common::HashMap<Common::String, Common::ScopedPtr<byte, Common::ArrayDeleter<byte>>, Common::IgnoreCase_Hash, Common::IgnoreCase_EqualTo> _cache;
-	uint32 _crcXor, _block3Offset, _block3Size;
+	uint32 _crcXor, _block3Offset/*, _block3Size*/;
 };
 }
 #endif