[Scummvm-cvs-logs] scummvm master -> d085f4f4e26f018347292bf9d3c0a5037bbe0e65

lordhoto lordhoto at gmail.com
Tue Dec 13 18:33:16 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:
d085f4f4e2 WIN32: (Hopefully) fix compilation by adapting to latest Archive changes.


Commit: d085f4f4e26f018347292bf9d3c0a5037bbe0e65
    https://github.com/scummvm/scummvm/commit/d085f4f4e26f018347292bf9d3c0a5037bbe0e65
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2011-12-13T09:29:40-08:00

Commit Message:
WIN32: (Hopefully) fix compilation by adapting to 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 a2c8e43..b82afca 100644
--- a/backends/platform/sdl/win32/win32.cpp
+++ b/backends/platform/sdl/win32/win32.cpp
@@ -256,9 +256,9 @@ class Win32ResourceArchive : public Common::Archive {
 public:
 	Win32ResourceArchive();
 
-	virtual bool hasFile(const Common::String &name);
-	virtual int listMembers(Common::ArchiveMemberList &list);
-	virtual Common::ArchiveMemberPtr getMember(const Common::String &name);
+	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 Common::SeekableReadStream *createReadStreamForMember(const Common::String &name) const;
 private:
 	typedef Common::List<Common::String> FilenameList;
@@ -279,7 +279,7 @@ Win32ResourceArchive::Win32ResourceArchive() {
 	EnumResourceNames(NULL, MAKEINTRESOURCE(256), &EnumResNameProc, (LONG_PTR)this);
 }
 
-bool Win32ResourceArchive::hasFile(const Common::String &name) {
+bool Win32ResourceArchive::hasFile(const Common::String &name) const {
 	for (FilenameList::const_iterator i = _files.begin(); i != _files.end(); ++i) {
 		if (i->equalsIgnoreCase(name))
 			return true;
@@ -288,7 +288,7 @@ bool Win32ResourceArchive::hasFile(const Common::String &name) {
 	return false;
 }
 
-int Win32ResourceArchive::listMembers(Common::ArchiveMemberList &list) {
+int Win32ResourceArchive::listMembers(Common::ArchiveMemberList &list) const {
 	int count = 0;
 
 	for (FilenameList::const_iterator i = _files.begin(); i != _files.end(); ++i, ++count)
@@ -297,7 +297,7 @@ int Win32ResourceArchive::listMembers(Common::ArchiveMemberList &list) {
 	return count;
 }
 
-Common::ArchiveMemberPtr Win32ResourceArchive::getMember(const Common::String &name) {
+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