Merge pull request #1269 from bkaradzic/master
authorJohn Kessenich <johnkslang@users.noreply.github.com>
Wed, 7 Mar 2018 21:31:57 +0000 (14:31 -0700)
committerGitHub <noreply@github.com>
Wed, 7 Mar 2018 21:31:57 +0000 (14:31 -0700)
commita51525059f3f264c2337ae72997ca4e7ad7e17d0
tree3a9039fc67b651b93dab4071f62ac4d871ead90a
parent9c82dd10cf117c5b20e8e0f5083ea88fa941e8cb
parent1e5c946326e09f9e951be88b9e7081dbce83d078
Merge pull request #1269 from bkaradzic/master

Fixed GCC+Clang errors and warnings on Linux and OSX.
glslang/Include/intermediate.h
hlsl/hlslParseHelper.cpp