From 26d0935b9ff1803863a9bc58b4479867a489cf66 Mon Sep 17 00:00:00 2001 From: Bastien Bouclet Date: Sat, 5 Jan 2019 11:55:21 +0100 Subject: [PATCH] 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. --- backends/saves/savefile.cpp | 4 +++- common/savefile.h | 3 +-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/backends/saves/savefile.cpp b/backends/saves/savefile.cpp index 21f53b8de2a..059b7dba8d2 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 eb7e6f946e2..80cd03e0686 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 _wrapped; + WriteStream *_wrapped; public: OutSaveFile(WriteStream *w);