From 6040a8d855f5488d3344194e942aaca735362bf3 Mon Sep 17 00:00:00 2001 From: Ben Payne Date: Wed, 4 Mar 2015 15:54:16 -0500 Subject: [PATCH] Fix macro token pasting errors when compiling with clang-cl --- Engine/source/gfx/D3D9/gfxD3D9Device.h | 2 +- Engine/source/gfx/D3D9/gfxD3D9EnumTranslate.h | 2 +- Engine/source/gfx/D3D9/pc/gfxD3D9EnumTranslate.pc.cpp | 6 +++--- Engine/source/platformWin32/winDirectInput.cpp | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Engine/source/gfx/D3D9/gfxD3D9Device.h b/Engine/source/gfx/D3D9/gfxD3D9Device.h index 48d860f23..87fb80833 100644 --- a/Engine/source/gfx/D3D9/gfxD3D9Device.h +++ b/Engine/source/gfx/D3D9/gfxD3D9Device.h @@ -76,7 +76,7 @@ inline void D3D9Assert( HRESULT hr, const char *info ) // Typedefs #define D3DX_FUNCTION(fn_name, fn_return, fn_args) \ - typedef fn_return (WINAPI *D3DXFNPTR##fn_name##)##fn_args##; + typedef fn_return (WINAPI *D3DXFNPTR##fn_name)fn_args; #include "gfx/D3D9/d3dx9Functions.h" #undef D3DX_FUNCTION diff --git a/Engine/source/gfx/D3D9/gfxD3D9EnumTranslate.h b/Engine/source/gfx/D3D9/gfxD3D9EnumTranslate.h index b0ec97eae..a8ccc0496 100644 --- a/Engine/source/gfx/D3D9/gfxD3D9EnumTranslate.h +++ b/Engine/source/gfx/D3D9/gfxD3D9EnumTranslate.h @@ -55,7 +55,7 @@ extern _D3DDECLTYPE GFXD3D9DeclType[GFXDeclType_COUNT]; #define GFXREVERSE_LOOKUP( tablearray, enumprefix, val ) \ for( S32 i = enumprefix##_FIRST; i < enumprefix##_COUNT; i++ ) \ - if( (S32)tablearray##[i] == val ) \ + if( (S32)tablearray[i] == val ) \ { \ val = i; \ break; \ diff --git a/Engine/source/gfx/D3D9/pc/gfxD3D9EnumTranslate.pc.cpp b/Engine/source/gfx/D3D9/pc/gfxD3D9EnumTranslate.pc.cpp index 1126693d1..29063f4e4 100644 --- a/Engine/source/gfx/D3D9/pc/gfxD3D9EnumTranslate.pc.cpp +++ b/Engine/source/gfx/D3D9/pc/gfxD3D9EnumTranslate.pc.cpp @@ -47,13 +47,13 @@ _D3DDECLTYPE GFXD3D9DeclType[GFXDeclType_COUNT]; #define INIT_LOOKUPTABLE( tablearray, enumprefix, type ) \ for( S32 i = enumprefix##_FIRST; i < enumprefix##_COUNT; i++ ) \ - tablearray##[i] = (##type##)GFX_UNINIT_VAL; + tablearray[i] = (type)GFX_UNINIT_VAL; #define VALIDATE_LOOKUPTABLE( tablearray, enumprefix ) \ for( S32 i = enumprefix##_FIRST; i < enumprefix##_COUNT; i++ ) \ - if( (S32)tablearray##[i] == GFX_UNINIT_VAL ) \ + if( (S32)tablearray[i] == GFX_UNINIT_VAL ) \ Con::warnf( "GFXD3D9EnumTranslate: Unassigned value in " #tablearray ": %i", i ); \ - else if( (S32)tablearray##[i] == GFX_UNSUPPORTED_VAL ) \ + else if( (S32)tablearray[i] == GFX_UNSUPPORTED_VAL ) \ Con::warnf( "GFXD3D9EnumTranslate: Unsupported value in " #tablearray ": %i", i ); //------------------------------------------------------------------------------ diff --git a/Engine/source/platformWin32/winDirectInput.cpp b/Engine/source/platformWin32/winDirectInput.cpp index e56f86265..2fd8084ef 100644 --- a/Engine/source/platformWin32/winDirectInput.cpp +++ b/Engine/source/platformWin32/winDirectInput.cpp @@ -450,7 +450,7 @@ int DInputManager::getXInputState(S32 controllerID, S32 property, bool current) switch(property) { #define CHECK_PROP_ANALOG(prop, stateTest) \ - case prop: (current) ? retVal = mXInputStateNew[controllerID].state.Gamepad.##stateTest : retVal = mXInputStateOld[controllerID].state.Gamepad.##stateTest; return retVal; + case prop: (current) ? retVal = mXInputStateNew[controllerID].state.Gamepad.stateTest : retVal = mXInputStateOld[controllerID].state.Gamepad.stateTest; return retVal; CHECK_PROP_ANALOG(XI_THUMBLX, sThumbLX) CHECK_PROP_ANALOG(XI_THUMBLY, sThumbLY)