TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-13 07:34:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge pull request #2072 from Areloch/VS2017_153_offsetof_patch

Browse source 
Hotfix to make VS2017 15.3 play nice.
This commit is contained in:
Areloch 2017-08-19 00:09:07 -05:00 • committed by GitHub
commit dc004f48ef
1 changed files with 7 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Engine/source/console/consoleTypes.h
View file

@ -48,6 +48,13 @@ template<typename T> inline const T nullAsType(){ return nullptr; }
/// @ingroup console_system Console System /// @ingroup console_system Console System
/// @{ /// @{
#if _MSC_VER >= 1911
#ifdef offsetof
#undef offsetof
#endif // offsetof
#define offsetof(s,m) ((size_t)&reinterpret_cast<char const volatile&>((((s*)0)->m)))
#endif
#ifndef Offset #ifndef Offset
#define Offset(x, cls) offsetof(cls, x) #define Offset(x, cls) offsetof(cls, x)
#endif #endif