[Scummvm-cvs-logs] CVS: scummvm/common scummsys.h,1.17,1.18
Max Horn
fingolfin at users.sourceforge.net
Wed Mar 12 17:07:12 CET 2003
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm module.mk,1.10,1.11
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm/smush codec1.cpp,1.7,1.8 codec1.h,1.5,1.6 codec37.cpp,1.16,1.17 codec37.h,1.9,1.10 codec44.cpp,1.8,1.9 codec44.h,1.7,1.8 codec47.cpp,1.42,1.43 codec47.h,1.12,1.13 decoder.h,1.7,1.8 player.cpp,1.42,1.43
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/common
In directory sc8-pr-cvs1:/tmp/cvs-serv18595
Modified Files:
scummsys.h
Log Message:
added const qualifier
Index: scummsys.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/scummsys.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- scummsys.h 6 Mar 2003 21:45:27 -0000 1.17
+++ scummsys.h 13 Mar 2003 01:06:38 -0000 1.18
@@ -280,31 +280,31 @@
#endif
#if defined(SCUMM_NEED_ALIGNMENT)
- FORCEINLINE uint READ_LE_UINT16(void *ptr) {
+ FORCEINLINE uint READ_LE_UINT16(const void *ptr) {
return (((byte *)ptr)[1] << 8)|((byte *)ptr)[0];
}
#else
- FORCEINLINE uint READ_LE_UINT16(void *ptr) {
+ FORCEINLINE uint READ_LE_UINT16(const void *ptr) {
return *(uint16 *)(ptr);
}
#endif
- FORCEINLINE uint READ_BE_UINT16(void *ptr) {
+ FORCEINLINE uint READ_BE_UINT16(const void *ptr) {
return (((byte *)ptr)[0] << 8)|((byte *)ptr)[1];
}
#if defined(SCUMM_NEED_ALIGNMENT)
- FORCEINLINE uint32 READ_LE_UINT32(void *ptr) {
+ FORCEINLINE uint32 READ_LE_UINT32(const void *ptr) {
byte *b = (byte *)ptr;
return (b[3] << 24) + (b[2] <<16) + (b[1] << 8) + (b[0]);
}
#else
- FORCEINLINE uint32 READ_LE_UINT32(void *ptr) {
+ FORCEINLINE uint32 READ_LE_UINT32(const void *ptr) {
return *(uint32 *)(ptr);
}
#endif
- FORCEINLINE uint32 READ_BE_UINT32(void *ptr) {
+ FORCEINLINE uint32 READ_BE_UINT32(const void *ptr) {
byte *b = (byte *)ptr;
return (b[0] << 24) + (b[1] << 16) + (b[2] << 8) + (b[3]);
}
@@ -342,29 +342,29 @@
#define TO_LE_32 FROM_LE_32
#define TO_LE_16 FROM_LE_16
- uint32 FORCEINLINE READ_LE_UINT32(void *ptr) {
+ uint32 FORCEINLINE READ_LE_UINT32(const void *ptr) {
byte *b = (byte *)ptr;
return (b[3] << 24) + (b[2] << 16) + (b[1] << 8) + (b[0]);
}
- uint32 FORCEINLINE READ_BE_UINT32(void *ptr) {
+ uint32 FORCEINLINE READ_BE_UINT32(const void *ptr) {
return *(uint32 *)(ptr);
}
- uint FORCEINLINE READ_LE_UINT16(void *ptr) {
+ uint FORCEINLINE READ_LE_UINT16(const void *ptr) {
byte *b = (byte *)ptr;
return (b[1] << 8) + b[0];
}
- uint FORCEINLINE READ_BE_UINT16(void *ptr) {
+ uint FORCEINLINE READ_BE_UINT16(const void *ptr) {
return *(uint16 *)(ptr);
}
- uint FORCEINLINE READ_BE_UINT16_UNALIGNED(void *ptr) {
+ uint FORCEINLINE READ_BE_UINT16_UNALIGNED(const void *ptr) {
return (((byte *)ptr)[0] << 8)|((byte *)ptr)[1];
}
- uint32 FORCEINLINE READ_BE_UINT32_UNALIGNED(void *ptr) {
+ uint32 FORCEINLINE READ_BE_UINT32_UNALIGNED(const void *ptr) {
byte *b = (byte*)ptr;
return (b[0] << 24) + (b[1] << 16) + (b[2] << 8) + (b[3]);
}
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm module.mk,1.10,1.11
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm/smush codec1.cpp,1.7,1.8 codec1.h,1.5,1.6 codec37.cpp,1.16,1.17 codec37.h,1.9,1.10 codec44.cpp,1.8,1.9 codec44.h,1.7,1.8 codec47.cpp,1.42,1.43 codec47.h,1.12,1.13 decoder.h,1.7,1.8 player.cpp,1.42,1.43
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list