Unverified Commit 36be19fc by John Kessenich Committed by GitHub

Merge pull request #1954 from corporateshark/master

Fix warning: size_t->int implicit cast
parents 18d6b6b6 d48881c7
...@@ -137,7 +137,7 @@ public: ...@@ -137,7 +137,7 @@ public:
if (it == ioMapper.end()) { if (it == ioMapper.end()) {
// seperate pipe i/o params from uniforms and blocks // seperate pipe i/o params from uniforms and blocks
// in is only for input in first stage as out is only for last stage. check traverse in call stack. // in is only for input in first stage as out is only for last stage. check traverse in call stack.
ioMapper[name.c_str()] = ioItems.size(); ioMapper[name.c_str()] = static_cast<int>(ioItems.size());
ioItems.push_back( ioItems.push_back(
TObjectReflection(name.c_str(), type, 0, mapToGlType(type), mapToGlArraySize(type), 0)); TObjectReflection(name.c_str(), type, 0, mapToGlType(type), mapToGlArraySize(type), 0));
EShLanguageMask& stages = ioItems.back().stages; EShLanguageMask& stages = ioItems.back().stages;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment