Merge pull request #1940 from tsuoranta/fix-gcc9

author John Kessenich <johnkslang@users.noreply.github.com>

Mon, 27 Jan 2020 08:02:08 +0000 (01:02 -0700)

committer GitHub <noreply@github.com>

Mon, 27 Jan 2020 08:02:08 +0000 (01:02 -0700)
author John Kessenich <johnkslang@users.noreply.github.com>
Mon, 27 Jan 2020 08:02:08 +0000 (01:02 -0700)
committer GitHub <noreply@github.com>
Mon, 27 Jan 2020 08:02:08 +0000 (01:02 -0700)
diff --cc CMakeLists.txt
Simple merge
diff --cc SPIRV/SpvBuilder.h
Simple merge
diff --cc glslang/MachineIndependent/iomapper.cpp
Simple merge
author	John Kessenich <johnkslang@users.noreply.github.com>
	Mon, 27 Jan 2020 08:02:08 +0000 (01:02 -0700)
committer	GitHub <noreply@github.com>
	Mon, 27 Jan 2020 08:02:08 +0000 (01:02 -0700)
		1	2
CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history
SPIRV/SpvBuilder.h	patch \|	diff1 \|	diff2 \|	blob \| history
glslang/MachineIndependent/iomapper.cpp	patch \|	diff1 \|	diff2 \|	blob \| history