[Scummvm-git-logs] scummvm master -> 7f913c831d32d597faa377950ce9529c7c5fd18c

Tkachov Tkachov at users.noreply.github.com
Wed Aug 31 07:41:30 CEST 2016


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

Summary:
7f913c831d DS, N64: Fix openForSaving()


Commit: 7f913c831d32d597faa377950ce9529c7c5fd18c
    https://github.com/scummvm/scummvm/commit/7f913c831d32d597faa377950ce9529c7c5fd18c
Author: Alexander Tkachev (alexander at tkachov.ru)
Date: 2016-08-31T12:38:40+06:00

Commit Message:
DS, N64: Fix openForSaving()

Fails to build because OutSaveFile's name should've been qualified.

Changed paths:
    backends/platform/ds/arm9/source/gbampsave.cpp
    backends/platform/n64/framfs_save_manager.h
    backends/platform/n64/pakfs_save_manager.h



diff --git a/backends/platform/ds/arm9/source/gbampsave.cpp b/backends/platform/ds/arm9/source/gbampsave.cpp
index 3b4fb45..9991a32 100644
--- a/backends/platform/ds/arm9/source/gbampsave.cpp
+++ b/backends/platform/ds/arm9/source/gbampsave.cpp
@@ -67,7 +67,7 @@ Common::OutSaveFile *GBAMPSaveFileManager::openForSaving(const Common::String &f
 	Common::WriteStream *stream = DS::DSFileStream::makeFromPath(fileSpec, true);
 	// Use a write buffer
 	stream = Common::wrapBufferedWriteStream(stream, SAVE_BUFFER_SIZE);
-	return new OutSaveFile(stream);
+	return new Common::OutSaveFile(stream);
 }
 
 Common::InSaveFile *GBAMPSaveFileManager::openForLoading(const Common::String &filename) {
diff --git a/backends/platform/n64/framfs_save_manager.h b/backends/platform/n64/framfs_save_manager.h
index 4696794..24f9bf1 100644
--- a/backends/platform/n64/framfs_save_manager.h
+++ b/backends/platform/n64/framfs_save_manager.h
@@ -121,7 +121,7 @@ public:
 	virtual Common::OutSaveFile *openForSaving(const Common::String &filename, bool compress = true) {
 		OutFRAMSave *s = new OutFRAMSave(filename.c_str());
 		if (!s->err()) {
-			return new OutSaveFile(compress ? Common::wrapCompressedWriteStream(s) : s);
+			return new Common::OutSaveFile(compress ? Common::wrapCompressedWriteStream(s) : s);
 		} else {
 			delete s;
 			return 0;
diff --git a/backends/platform/n64/pakfs_save_manager.h b/backends/platform/n64/pakfs_save_manager.h
index f69d910..8e16d1f 100644
--- a/backends/platform/n64/pakfs_save_manager.h
+++ b/backends/platform/n64/pakfs_save_manager.h
@@ -123,7 +123,7 @@ public:
 	virtual Common::OutSaveFile *openForSaving(const Common::String &filename, bool compress = true) {
 		OutPAKSave *s = new OutPAKSave(filename.c_str());
 		if (!s->err()) {
-			return new OutSaveFile(compress ? Common::wrapCompressedWriteStream(s) : s);
+			return new Common::OutSaveFile(compress ? Common::wrapCompressedWriteStream(s) : s);
 		} else {
 			delete s;
 			return NULL;





More information about the Scummvm-git-logs mailing list