[Scummvm-cvs-logs] CVS: scummvm/scumm imuse.cpp,1.11,1.12 saveload.cpp,1.10,1.11 saveload.h,1.2,1.3
Max Horn
fingolfin at users.sourceforge.net
Sat Sep 21 19:54:01 CEST 2002
Update of /cvsroot/scummvm/scummvm/scumm
In directory usw-pr-cvs1:/tmp/cvs-serv28959/scumm
Modified Files:
imuse.cpp saveload.cpp saveload.h
Log Message:
tied to fix 'non-POD type' warning in some GCC versions; moved some common code to saveload.h
Index: imuse.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- imuse.cpp 11 Sep 2002 13:28:33 -0000 1.11
+++ imuse.cpp 22 Sep 2002 02:53:15 -0000 1.12
@@ -2914,14 +2914,6 @@
/*******************************************************************/
-#define OFFS(type,item) ((int)(&((type*)0)->item))
-#define SIZE(type,item) sizeof(((type*)0)->item)
-#define MKLINE(type,item,saveas) {OFFS(type,item),saveas,SIZE(type,item)}
-#define MKARRAY(type,item,saveas,num) {OFFS(type,item),128|saveas,SIZE(type,item)}, {num,0,0}
-#define MKEND() {0xFFFF,0xFF,0xFF}
-
-#define MKREF(type,item,refid) {OFFS(type,item),refid,0xFF}
-
enum {
TYPE_PART = 1,
TYPE_PLAYER = 2,
Index: saveload.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/saveload.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- saveload.cpp 22 Sep 2002 01:17:53 -0000 1.10
+++ saveload.cpp 22 Sep 2002 02:53:15 -0000 1.11
@@ -210,12 +210,6 @@
return true;
}
-#define OFFS(type,item) ((int)(&((type*)0)->item))
-#define SIZE(type,item) sizeof(((type*)0)->item)
-#define MKLINE(type,item,saveas) {OFFS(type,item),saveas,SIZE(type,item)}
-#define MKARRAY(type,item,saveas,num) {OFFS(type,item),128|saveas,SIZE(type,item)}, {num,0,0}
-#define MKEND() {0xFFFF,0xFF,0xFF}
-
void Scumm::saveOrLoad(Serializer *s)
{
const SaveLoadEntry objectEntries[] = {
Index: saveload.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/saveload.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- saveload.h 26 Aug 2002 16:47:14 -0000 1.2
+++ saveload.h 22 Sep 2002 02:53:15 -0000 1.3
@@ -22,6 +22,14 @@
#ifndef SAVELOAD_H
#define SAVELOAD_H
+#define OFFS(type,item) ((int)(&((type*)0)->type::item))
+#define SIZE(type,item) sizeof(((type*)0)->type::item)
+#define MKLINE(type,item,saveas) {OFFS(type,item),saveas,SIZE(type,item)}
+#define MKARRAY(type,item,saveas,num) {OFFS(type,item),128|saveas,SIZE(type,item)}, {num,0,0}
+#define MKEND() {0xFFFF,0xFF,0xFF}
+
+#define MKREF(type,item,refid) {OFFS(type,item),refid,0xFF}
+
enum {
sleByte = 1,
sleUint8 = 1,
More information about the Scummvm-git-logs
mailing list