[Scummvm-cvs-logs] scummvm master -> 5eb592a1c92d6069529dc3a78b06a9d40d384ed7
bluegr
md5 at scummvm.org
Tue Dec 13 21:48:36 CET 2011
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:
5eb592a1c9 WIN32: Fix build by adapting to the latest Archive changes
Commit: 5eb592a1c92d6069529dc3a78b06a9d40d384ed7
https://github.com/scummvm/scummvm/commit/5eb592a1c92d6069529dc3a78b06a9d40d384ed7
Author: Filippos Karapetis (md5 at scummvm.org)
Date: 2011-12-13T12:47:46-08:00
Commit Message:
WIN32: Fix build by adapting to the latest Archive changes
Changed paths:
backends/platform/sdl/win32/win32.cpp
diff --git a/backends/platform/sdl/win32/win32.cpp b/backends/platform/sdl/win32/win32.cpp
index b82afca..3e09aa2 100644
--- a/backends/platform/sdl/win32/win32.cpp
+++ b/backends/platform/sdl/win32/win32.cpp
@@ -258,7 +258,7 @@ public:
virtual bool hasFile(const Common::String &name) const;
virtual int listMembers(Common::ArchiveMemberList &list) const;
- virtual Common::ArchiveMemberPtr getMember(const Common::String &name) const;
+ virtual const Common::ArchiveMemberPtr getMember(const Common::String &name) const;
virtual Common::SeekableReadStream *createReadStreamForMember(const Common::String &name) const;
private:
typedef Common::List<Common::String> FilenameList;
@@ -297,7 +297,7 @@ int Win32ResourceArchive::listMembers(Common::ArchiveMemberList &list) const {
return count;
}
-Common::ArchiveMemberPtr Win32ResourceArchive::getMember(const Common::String &name) const {
+const Common::ArchiveMemberPtr Win32ResourceArchive::getMember(const Common::String &name) const {
return Common::ArchiveMemberPtr(new Common::GenericArchiveMember(name, this));
}
More information about the Scummvm-git-logs
mailing list