diff options
| author | Nikolai Kosjar <nikolai.kosjar@qt.io> | 2017-09-28 12:01:21 +0200 |
|---|---|---|
| committer | Nikolai Kosjar <nikolai.kosjar@qt.io> | 2017-09-28 10:40:26 +0000 |
| commit | c354eff5e95cfb488c2f5c6e8d7d269cc6ad22b6 (patch) | |
| tree | a9f1762a80a71aec76b1a3d1dbffb69686d5ac4c | |
| parent | aca8e8643c67a22f82a8e8c35fd95e3a7512b480 (diff) | |
| download | qt-creator-c354eff5e95cfb488c2f5c6e8d7d269cc6ad22b6.tar.gz | |
GLSL: Fix conversion warnings on Windows
This was actually already fixed with
Fix compiler warnings on windows.
commit cc04b84917ef0f90e2017bf652b7327ce5edda9c.
However, glslparser.{h,cpp} were changed, which are generated from
glsl.g. Fix the warnings in the source file glsl.g so the next time the
parser is re-generated the changes are not lost.
Change-Id: If7e5f45ff1a93d1d7b6c9213697884f5a7e9ec5f
Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
| -rw-r--r-- | src/libs/glsl/glsl.g | 14 | ||||
| -rw-r--r-- | src/libs/glsl/glslparser.cpp | 12 | ||||
| -rw-r--r-- | src/libs/glsl/glslparser.h | 2 |
3 files changed, 14 insertions, 14 deletions
diff --git a/src/libs/glsl/glsl.g b/src/libs/glsl/glsl.g index e5fff79691..91b2674831 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<int>(_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<int>(_tokens.size())); break; case T_LEFT_BRACKET: - bracketStack.push(_tokens.size()); + bracketStack.push(static_cast<int>(_tokens.size())); break; case T_LEFT_BRACE: - braceStack.push(_tokens.size()); + braceStack.push(static_cast<int>(_tokens.size())); break; case T_RIGHT_PAREN: if (! parenStack.empty()) { - _tokens[parenStack.top()].matchingBrace = _tokens.size(); + _tokens[parenStack.top()].matchingBrace = static_cast<int>(_tokens.size()); parenStack.pop(); } break; case T_RIGHT_BRACKET: if (! bracketStack.empty()) { - _tokens[bracketStack.top()].matchingBrace = _tokens.size(); + _tokens[bracketStack.top()].matchingBrace = static_cast<int>(_tokens.size()); bracketStack.pop(); } break; case T_RIGHT_BRACE: if (! braceStack.empty()) { - _tokens[braceStack.top()].matchingBrace = _tokens.size(); + _tokens[braceStack.top()].matchingBrace = static_cast<int>(_tokens.size()); braceStack.pop(); } break; diff --git a/src/libs/glsl/glslparser.cpp b/src/libs/glsl/glslparser.cpp index fb108413ea..1f10c464b2 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<int>(_tokens.size())); break; case T_LEFT_BRACKET: - bracketStack.push(_tokens.size()); + bracketStack.push(static_cast<int>(_tokens.size())); break; case T_LEFT_BRACE: - braceStack.push(_tokens.size()); + braceStack.push(static_cast<int>(_tokens.size())); break; case T_RIGHT_PAREN: if (! parenStack.empty()) { - _tokens[parenStack.top()].matchingBrace = _tokens.size(); + _tokens[parenStack.top()].matchingBrace = static_cast<int>(_tokens.size()); parenStack.pop(); } break; case T_RIGHT_BRACKET: if (! bracketStack.empty()) { - _tokens[bracketStack.top()].matchingBrace = _tokens.size(); + _tokens[bracketStack.top()].matchingBrace = static_cast<int>(_tokens.size()); bracketStack.pop(); } break; case T_RIGHT_BRACE: if (! braceStack.empty()) { - _tokens[braceStack.top()].matchingBrace = _tokens.size(); + _tokens[braceStack.top()].matchingBrace = static_cast<int>(_tokens.size()); braceStack.pop(); } break; diff --git a/src/libs/glsl/glslparser.h b/src/libs/glsl/glslparser.h index 0ef6bbcbad..f0ccf82cb9 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<int>(_tokens.size()) - 1; } inline const Token &tokenAt(int index) const { if (index == 0) |