Merge pull request #174 from mgadams/alias_proto_warnings

Fix warnings/errors for strict aliasing & function prototypes
This commit is contained in:
John Kessenich
2016-02-24 21:43:59 -07:00
11 changed files with 39 additions and 17 deletions

4
SPIRV/disassemble.cpp Executable file → Normal file
View File

@@ -59,7 +59,7 @@ const char* GlslStd450DebugNames[spv::GLSLstd450Count];
namespace spv {
void Kill(std::ostream& out, const char* message)
static void Kill(std::ostream& out, const char* message)
{
out << std::endl << "Disassembly failed: " << message << std::endl;
exit(1);
@@ -481,7 +481,7 @@ void SpirvStream::disassembleInstruction(Id resultId, Id /*typeId*/, Op opCode,
return;
}
void GLSLstd450GetDebugNames(const char** names)
static void GLSLstd450GetDebugNames(const char** names)
{
for (int i = 0; i < GLSLstd450Count; ++i)
names[i] = "Unknown";