move TARGET and STK to sqvm.cpp instead of SQ to reduce probability of collisions in case inner headers are included

This commit is contained in:
zeromus 2016-05-05 10:23:44 -05:00
parent 5b50a56e56
commit 7bb5dd4982
2 changed files with 2 additions and 3 deletions

View File

@ -15,6 +15,8 @@
#include "sqclass.h" #include "sqclass.h"
#define TOP() (_stack._vals[_top-1]) #define TOP() (_stack._vals[_top-1])
#define TARGET _stack._vals[_stackbase+arg0]
#define STK(a) _stack._vals[_stackbase+(a)]
bool SQVM::BW_OP(SQUnsignedInteger op,SQObjectPtr &trg,const SQObjectPtr &o1,const SQObjectPtr &o2) bool SQVM::BW_OP(SQUnsignedInteger op,SQObjectPtr &trg,const SQObjectPtr &o1,const SQObjectPtr &o2)
{ {

View File

@ -28,9 +28,6 @@ struct SQExceptionTrap{
#define _INLINE #define _INLINE
#define STK(a) _stack._vals[_stackbase+(a)]
#define TARGET _stack._vals[_stackbase+arg0]
typedef sqvector<SQExceptionTrap> ExceptionsTraps; typedef sqvector<SQExceptionTrap> ExceptionsTraps;
struct SQVM : public CHAINABLE_OBJ struct SQVM : public CHAINABLE_OBJ