diff --git a/src/libs/glsl/glsl.g b/src/libs/glsl/glsl.g index e5fff79691b..91b26748314 100644 --- a/src/libs/glsl/glsl.g +++ b/src/libs/glsl/glsl.g @@ -321,7 +321,7 @@ private: inline int consumeToken() { if (_index < int(_tokens.size())) return _index++; - return _tokens.size() - 1; + return static_cast(_tokens.size()) - 1; } inline const Token &tokenAt(int index) const { if (index == 0) @@ -468,30 +468,30 @@ Parser::Parser(Engine *engine, const char *source, unsigned size, int variant) switch (tk.kind) { case T_LEFT_PAREN: - parenStack.push(_tokens.size()); + parenStack.push(static_cast(_tokens.size())); break; case T_LEFT_BRACKET: - bracketStack.push(_tokens.size()); + bracketStack.push(static_cast(_tokens.size())); break; case T_LEFT_BRACE: - braceStack.push(_tokens.size()); + braceStack.push(static_cast(_tokens.size())); break; case T_RIGHT_PAREN: if (! parenStack.empty()) { - _tokens[parenStack.top()].matchingBrace = _tokens.size(); + _tokens[parenStack.top()].matchingBrace = static_cast(_tokens.size()); parenStack.pop(); } break; case T_RIGHT_BRACKET: if (! bracketStack.empty()) { - _tokens[bracketStack.top()].matchingBrace = _tokens.size(); + _tokens[bracketStack.top()].matchingBrace = static_cast(_tokens.size()); bracketStack.pop(); } break; case T_RIGHT_BRACE: if (! braceStack.empty()) { - _tokens[braceStack.top()].matchingBrace = _tokens.size(); + _tokens[braceStack.top()].matchingBrace = static_cast(_tokens.size()); braceStack.pop(); } break; diff --git a/src/libs/glsl/glslparser.cpp b/src/libs/glsl/glslparser.cpp index fb108413eaa..1f10c464b21 100644 --- a/src/libs/glsl/glslparser.cpp +++ b/src/libs/glsl/glslparser.cpp @@ -58,30 +58,30 @@ Parser::Parser(Engine *engine, const char *source, unsigned size, int variant) switch (tk.kind) { case T_LEFT_PAREN: - parenStack.push(_tokens.size()); + parenStack.push(static_cast(_tokens.size())); break; case T_LEFT_BRACKET: - bracketStack.push(_tokens.size()); + bracketStack.push(static_cast(_tokens.size())); break; case T_LEFT_BRACE: - braceStack.push(_tokens.size()); + braceStack.push(static_cast(_tokens.size())); break; case T_RIGHT_PAREN: if (! parenStack.empty()) { - _tokens[parenStack.top()].matchingBrace = _tokens.size(); + _tokens[parenStack.top()].matchingBrace = static_cast(_tokens.size()); parenStack.pop(); } break; case T_RIGHT_BRACKET: if (! bracketStack.empty()) { - _tokens[bracketStack.top()].matchingBrace = _tokens.size(); + _tokens[bracketStack.top()].matchingBrace = static_cast(_tokens.size()); bracketStack.pop(); } break; case T_RIGHT_BRACE: if (! braceStack.empty()) { - _tokens[braceStack.top()].matchingBrace = _tokens.size(); + _tokens[braceStack.top()].matchingBrace = static_cast(_tokens.size()); braceStack.pop(); } break; diff --git a/src/libs/glsl/glslparser.h b/src/libs/glsl/glslparser.h index 0ef6bbcbad1..f0ccf82cb9e 100644 --- a/src/libs/glsl/glslparser.h +++ b/src/libs/glsl/glslparser.h @@ -114,7 +114,7 @@ private: inline int consumeToken() { if (_index < int(_tokens.size())) return _index++; - return _tokens.size() - 1; + return static_cast(_tokens.size()) - 1; } inline const Token &tokenAt(int index) const { if (index == 0)