[Scummvm-git-logs] scummvm master -> 9743161b00f399e68bad30116aac31875483153d

[lephilousophe]

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

Summary:
37e997730c PSP: Fix build
ced1ffd336 PSP: Ensure functions signatures match the parent ones
9743161b00 DREAMCAST: Fix build


Commit: 37e997730cdf5760fde2ab7b0f5cb8d6c1a63b78
    https://github.com/scummvm/scummvm/commit/37e997730cdf5760fde2ab7b0f5cb8d6c1a63b78
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2021-07-09T17:20:28+02:00

Commit Message:
PSP: Fix build

Changed paths:
    backends/fs/psp/psp-stream.cpp


diff --git a/backends/fs/psp/psp-stream.cpp b/backends/fs/psp/psp-stream.cpp
index 8cefd414e4..7568fffcdb 100644
--- a/backends/fs/psp/psp-stream.cpp
+++ b/backends/fs/psp/psp-stream.cpp
@@ -130,11 +130,11 @@ bool PspIoStream::eos() const {
 	return _eos;
 }
 
-int32 PspIoStream::pos() const {
+int64 PspIoStream::pos() const {
 	return _pos;
 }
 
-int32 PspIoStream::size() const {
+int64 PspIoStream::size() const {
 	return _fileSize;
 }
 
@@ -151,7 +151,7 @@ bool PspIoStream::physicalSeekFromCur(int32 offset) {
 	return true;
 }
 
-bool PspIoStream::seek(int32 offs, int whence) {
+bool PspIoStream::seek(int64 offs, int whence) {
 	DEBUG_ENTER_FUNC();
 	PSP_DEBUG_PRINT_FUNC("offset[0x%x], whence[%d], _pos[0x%x], _physPos[0x%x]\n", offs, whence, _pos, _physicalPos);
 	_eos = false;


Commit: ced1ffd336ec1731b6b66d8091ec283b826c5205
    https://github.com/scummvm/scummvm/commit/ced1ffd336ec1731b6b66d8091ec283b826c5205
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2021-07-09T17:20:28+02:00

Commit Message:
PSP: Ensure functions signatures match the parent ones

Changed paths:
    backends/fs/psp/psp-stream.h


diff --git a/backends/fs/psp/psp-stream.h b/backends/fs/psp/psp-stream.h
index cbc397a167..c19b94752b 100644
--- a/backends/fs/psp/psp-stream.h
+++ b/backends/fs/psp/psp-stream.h
@@ -71,21 +71,21 @@ public:
 
 	SceUID open();		// open the file pointed to by the file path
 
-	bool err() const;
-	void clearErr();
-	bool eos() const;
+	bool err() const override;
+	void clearErr() override;
+	bool eos() const override;
 
-	virtual uint32 write(const void *dataPtr, uint32 dataSize);
-	virtual bool flush();
+	virtual uint32 write(const void *dataPtr, uint32 dataSize) override;
+	virtual bool flush() override;
 
-	virtual int64 pos() const;
-	virtual int64 size() const;
-	virtual bool seek(int64 offs, int whence = SEEK_SET);
-	virtual uint32 read(void *dataPtr, uint32 dataSize);
+	virtual int64 pos() const override;
+	virtual int64 size() const override;
+	virtual bool seek(int64 offs, int whence = SEEK_SET) override;
+	virtual uint32 read(void *dataPtr, uint32 dataSize) override;
 
 	// for suspending
-	int suspend();		/* Suspendable interface (power manager) */
-	int resume();		/* " " */
+	int suspend() override;		/* Suspendable interface (power manager) */
+	int resume() override;		/* " " */
 };
 
 #endif /* PSPSTREAM_H_ */


Commit: 9743161b00f399e68bad30116aac31875483153d
    https://github.com/scummvm/scummvm/commit/9743161b00f399e68bad30116aac31875483153d
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2021-07-09T17:20:28+02:00

Commit Message:
DREAMCAST: Fix build

Changed paths:
    backends/platform/dc/vmsave.cpp


diff --git a/backends/platform/dc/vmsave.cpp b/backends/platform/dc/vmsave.cpp
index f2d52a7fb4..ab5a3e77a2 100644
--- a/backends/platform/dc/vmsave.cpp
+++ b/backends/platform/dc/vmsave.cpp
@@ -385,7 +385,7 @@ bool InVMSave::skip(uint32 offset)
   return true;
 }
 
-bool InVMSave::seek(int32 offs, int whence)
+bool InVMSave::seek(int64 offs, int whence)
 {
   switch(whence) {
   case SEEK_SET: