Merge pull request #548 from baldurk/vs2010-compile-fixes
authorJohn Kessenich <johnkslang@users.noreply.github.com>
Sun, 16 Oct 2016 05:09:31 +0000 (23:09 -0600)
committerGitHub <noreply@github.com>
Sun, 16 Oct 2016 05:09:31 +0000 (23:09 -0600)
VS2010 compile fixes

1  2 
StandAlone/StandAlone.cpp
glslang/MachineIndependent/ParseContextBase.cpp
glslang/MachineIndependent/ParseHelper.cpp
hlsl/hlslParseHelper.cpp

Simple merge
Simple merge