TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-04-29 16:25:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'vs2012-fixes' of https://github.com/eightyeight/Torque3D into eightyeight-vs2012-fixes

Browse source
This commit is contained in:
DavidWyand-GG 2012-09-27 10:09:41 -04:00
commit cdb7e60d67
2 changed files with 4 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Engine/source/platform/types.visualc.h
View file

@ -88,7 +88,9 @@ typedef unsigned _int64 U64;
# define FN_CDECL __cdecl ///< Calling convention # define FN_CDECL __cdecl ///< Calling convention
#endif #endif
#if _MSC_VER < 1700
#define for if(false) {} else for ///< Hack to work around Microsoft VC's non-C++ compliance on variable scoping #define for if(false) {} else for ///< Hack to work around Microsoft VC's non-C++ compliance on variable scoping
#endif
// disable warning caused by memory layer // disable warning caused by memory layer
// see msdn.microsoft.com "Compiler Warning (level 1) C4291" for more details // see msdn.microsoft.com "Compiler Warning (level 1) C4291" for more details

2
Engine/source/platform/typesWin32.h
View file

@ -116,8 +116,10 @@ static const F32 F32_MAX = F32(3.402823466e+38F); ///< Constant
#ifdef _MSC_VER #ifdef _MSC_VER
#if _MSC_VER < 1700
#define for if(false) {} else for ///< Hack to work around Microsoft VC's non-C++ compliance on variable scoping #define for if(false) {} else for ///< Hack to work around Microsoft VC's non-C++ compliance on variable scoping
#endif #endif
#endif
#endif //_NTYPES_H_ #endif //_NTYPES_H_