isledecomp/isle-portable
1
0
Fork 0
mirror of https://github.com/isledecomp/isle-portable.git synced 2024-11-22 15:37:55 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

move override macro to compat.h

Browse source
This commit is contained in:
itsmattkc 2023-07-12 14:12:03 -07:00
parent 67115e32d3
commit f707af34db
5 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
LEGO1/compat.h
View file

@ -11,4 +11,11 @@
#define COMPAT_CONST #define COMPAT_CONST
#endif #endif
#endif // ISLECOMPAT_H // We use `override` so newer compilers can tell us our vtables are valid,
// however this keyword was added in C++11, so we define it as empty for
// compatibility with older compilers.
#if defined(_MSC_VER) && _MSC_VER <= 1200 // 1200 corresponds to VC6.0 but "override" was probably added even later
#define override
#endif
#endif // ISLECOMPAT_H

3
LEGO1/legostream.h
View file

@ -1,6 +1,7 @@
#ifndef LEGOSTREAM_H #ifndef LEGOSTREAM_H
#define LEGOSTREAM_H #define LEGOSTREAM_H
#include "compat.h"
#include "decomp.h" #include "decomp.h"
#include "mxtypes.h" #include "mxtypes.h"
@ -70,4 +71,4 @@ class LegoMemoryStream : public LegoStream
MxU32 m_offset; MxU32 m_offset;
}; };
#endif // LEGOSTREAM_H #endif // LEGOSTREAM_H

5
LEGO1/mxcore.h
View file

@ -3,6 +3,7 @@
#include <string.h> #include <string.h>
#include "compat.h"
#include "mxtypes.h" #include "mxtypes.h"
class MxParam; class MxParam;
@ -14,8 +15,8 @@ class MxCore
public: public:
__declspec(dllexport) MxCore(); __declspec(dllexport) MxCore();
__declspec(dllexport) virtual ~MxCore(); // vtable+00 __declspec(dllexport) virtual ~MxCore(); // vtable+00
__declspec(dllexport) virtual MxLong Notify(MxParam &p); // vtable+04 __declspec(dllexport) virtual MxResult Notify(MxParam &p); // vtable+04
virtual MxLong Tickle(); // vtable+08 virtual MxResult Tickle(); // vtable+08
// OFFSET: LEGO1 0x100144c0 // OFFSET: LEGO1 0x100144c0
inline virtual const char *ClassName() const // vtable+0c inline virtual const char *ClassName() const // vtable+0c

3
LEGO1/mxthread.h
View file

@ -1,6 +1,7 @@
#ifndef MXTHREAD_H #ifndef MXTHREAD_H
#define MXTHREAD_H #define MXTHREAD_H
#include "compat.h"
#include "mxtypes.h" #include "mxtypes.h"
#include "mxsemaphore.h" #include "mxsemaphore.h"
@ -54,4 +55,4 @@ class MxTickleThread : public MxThread
MxS32 m_frequencyMS; MxS32 m_frequencyMS;
}; };
#endif // MXTHREAD_H #endif // MXTHREAD_H

4
LEGO1/mxtypes.h
View file

@ -39,8 +39,4 @@ typedef MxU8 MxBool;
#define FALSE 0 #define FALSE 0
#endif #endif
#if defined(_MSC_VER) && _MSC_VER <= 1200 // 1200 corresponds to VC6.0 but "override" was probably added even later
#define override
#endif
#endif // MXTYPE_H #endif // MXTYPE_H