Sfoglia il codice sorgente

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

zeromus 10 anni fa
parent
commit
7bb5dd4982
2 ha cambiato i file con 2 aggiunte e 3 eliminazioni
  1. 2 0
      squirrel/sqvm.cpp
  2. 0 3
      squirrel/sqvm.h

+ 2 - 0
squirrel/sqvm.cpp

@@ -15,6 +15,8 @@
 #include "sqclass.h"
 
 #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)
 {

+ 0 - 3
squirrel/sqvm.h

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