[Scummvm-git-logs] scummvm master -> 26d0935b9ff1803863a9bc58b4479867a489cf66

[bgK]

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:
26d0935b9f COMMON: Remove usage of ScopedPtr in OutSaveFile


Commit: 26d0935b9ff1803863a9bc58b4479867a489cf66
    https://github.com/scummvm/scummvm/commit/26d0935b9ff1803863a9bc58b4479867a489cf66
Author: Bastien Bouclet (bastien.bouclet at gmail.com)
Date: 2019-01-05T12:02:19+01:00

Commit Message:
COMMON: Remove usage of ScopedPtr in OutSaveFile

It's not very useful. However this is mostly to test the theory that the
build failure we've been experiencing in
engines/scumm/he/logic/football.cpp with the osx builder on buildbot is
related to the size of the intermediary assembly source file.

Changed paths:
    backends/saves/savefile.cpp
    common/savefile.h


diff --git a/backends/saves/savefile.cpp b/backends/saves/savefile.cpp
index 21f53b8..059b7db 100644
--- a/backends/saves/savefile.cpp
+++ b/backends/saves/savefile.cpp
@@ -31,7 +31,9 @@ namespace Common {
 
 OutSaveFile::OutSaveFile(WriteStream *w): _wrapped(w) {}
 
-OutSaveFile::~OutSaveFile() {}
+OutSaveFile::~OutSaveFile() {
+	delete _wrapped;
+}
 
 bool OutSaveFile::err() const { return _wrapped->err(); }
 
diff --git a/common/savefile.h b/common/savefile.h
index eb7e6f9..80cd03e 100644
--- a/common/savefile.h
+++ b/common/savefile.h
@@ -28,7 +28,6 @@
 #include "common/stream.h"
 #include "common/str-array.h"
 #include "common/error.h"
-#include "common/ptr.h"
 
 namespace Common {
 
@@ -47,7 +46,7 @@ typedef SeekableReadStream InSaveFile;
  */
 class OutSaveFile: public WriteStream {
 protected:
-	ScopedPtr<WriteStream> _wrapped;
+	WriteStream *_wrapped;
 
 public:
 	OutSaveFile(WriteStream *w);