diff options
| author | David Schulz <david.schulz@theqtcompany.com> | 2016-04-20 09:33:21 +0200 |
|---|---|---|
| committer | David Schulz <david.schulz@theqtcompany.com> | 2016-04-22 07:37:31 +0000 |
| commit | cc04b84917ef0f90e2017bf652b7327ce5edda9c (patch) | |
| tree | fe374cd50bb8e9f18c4b747f97a0712e41124d16 /src/libs/glsl | |
| parent | 89c2b2cd327a1f929924265622c80e22719998d4 (diff) | |
Fix compiler warnings on windows.
Ignore some warnings inside 3rd party code and fix a lot of conversion
warnings.
Change-Id: I909f2f31a4639015bf7dd028d2d435ff1d1167bc
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
Diffstat (limited to 'src/libs/glsl')
| -rw-r--r-- | src/libs/glsl/glslparser.cpp | 12 | ||||
| -rw-r--r-- | src/libs/glsl/glslparser.h | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/libs/glsl/glslparser.cpp b/src/libs/glsl/glslparser.cpp index 5886934902..6d8401531e 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 0eb54df0d2..7b44f2870f 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) |