Merge pull request #226 from baldurk/warning-fixes

SPIRV/GlslangToSpv.cpp

@@ -2125,7 +2125,7 @@ void TGlslangToSpvTraverser::updateMemberOffset(const glslang::TType& /*structTy
 bool TGlslangToSpvTraverser::isShaderEntrypoint(const glslang::TIntermAggregate* node)
 {
     // have to ignore mangling and just look at the base name
-    int firstOpen = node->getName().find('(');
+    size_t firstOpen = node->getName().find('(');
     return node->getName().compare(0, firstOpen, glslangIntermediate->getEntryPoint().c_str()) == 0;
 }
 

glslang/Include/Types.h

@@ -999,9 +999,9 @@ public:
             qualifier.storage = EvqGlobal;
     }
 
-    void init(const TSourceLoc& loc, bool global = false)
+    void init(const TSourceLoc& l, bool global = false)
     {
-        initType(loc);
+        initType(l);
         sampler.clear();
         initQualifiers(global);
         shaderQualifiers.init();