瀏覽代碼

Merge pull request #1342 from Azaezel/Offsetof

offsetof is actually a standard thing nowadays it would seem
Daniel Buckmaster 10 年之前
父節點
當前提交
5caf62b19f
共有 1 個文件被更改,包括 1 次插入5 次删除
  1. 1 5
      Engine/source/console/consoleTypes.h

+ 1 - 5
Engine/source/console/consoleTypes.h

@@ -48,11 +48,7 @@
 /// @{
 /// @{
 
 
 #ifndef Offset
 #ifndef Offset
-#if defined(TORQUE_COMPILER_GCC) && (__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 1))
-#define Offset(m,T) ((int)(&((T *)1)->m) - 1)
-#else
-#define Offset(x, cls) ((dsize_t)((const char *)&(((cls *)0)->x)-(const char *)0))
-#endif
+#define Offset(x, cls) offsetof(cls, x)
 #endif
 #endif
 
 
 class GFXShader;
 class GFXShader;