[Scummvm-git-logs] scummvm master -> 78fd3a9c4c035a1344c3b2f8057027adf18e0fcc
bonki
bonki at users.noreply.github.com
Fri Jun 29 00:25:52 CEST 2018
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:
78fd3a9c4c PINK: Don't unnecessarily cast away constness
Commit: 78fd3a9c4c035a1344c3b2f8057027adf18e0fcc
https://github.com/scummvm/scummvm/commit/78fd3a9c4c035a1344c3b2f8057027adf18e0fcc
Author: Adrian Frühwirth (bonki at users.noreply.github.com)
Date: 2018-06-29T00:22:23+02:00
Commit Message:
PINK: Don't unnecessarily cast away constness
Changed paths:
engines/pink/file.cpp
engines/pink/resource_mgr.cpp
diff --git a/engines/pink/file.cpp b/engines/pink/file.cpp
index 7a760d1..4a14745 100644
--- a/engines/pink/file.cpp
+++ b/engines/pink/file.cpp
@@ -97,7 +97,7 @@ void OrbFile::loadObject(Object *obj, ObjectDescription *objDesc) {
}
static int objDescComp(const void *a, const void *b) {
- return scumm_stricmp((char *)a, (char *)b);
+ return scumm_stricmp((const char *)a, (const char *)b);
}
ObjectDescription *OrbFile::getObjDesc(const char *name) {
diff --git a/engines/pink/resource_mgr.cpp b/engines/pink/resource_mgr.cpp
index 65b6c00..f9a2481 100644
--- a/engines/pink/resource_mgr.cpp
+++ b/engines/pink/resource_mgr.cpp
@@ -62,7 +62,7 @@ Common::String ResourceMgr::loadText(Common::String &name) {
}
static int resDescComp(const void *a, const void *b) {
- return scumm_stricmp((char *)a, (char *)b);
+ return scumm_stricmp((const char *)a, (const char *)b);
}
Common::SafeSeekableSubReadStream *ResourceMgr::getResourceStream(const Common::String &name) {
More information about the Scummvm-git-logs
mailing list