summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2013-12-06 22:06:50 -0800
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-12-09 21:49:19 +0100
commitf31505c3ea464d2e200504a6280b3ba982b6e724 (patch)
tree36a24fc759932fff6f44d7d54d50ee3ad4bda679
parentd67f351a6495573eb9544c39b7c2b37f226dc871 (diff)
downloadqttools-f31505c3ea464d2e200504a6280b3ba982b6e724.tar.gz
qttools-f31505c3ea464d2e200504a6280b3ba982b6e724.tar.bz2
qttools-f31505c3ea464d2e200504a6280b3ba982b6e724.zip
Make getChar() return int
All the calls to this function are: yyCh = getChar(); and yyCh is an int. This solves a sign-change warning found by ICC: cpp.cpp(427): warning #68: integer conversion resulted in a change of sign Change-Id: I1fe00005ab5095316b49fb0a0b71bbb60141a57e Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
-rw-r--r--src/linguist/lupdate/cpp.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/linguist/lupdate/cpp.cpp b/src/linguist/lupdate/cpp.cpp
index 5371cfc7..b282e8f5 100644
--- a/src/linguist/lupdate/cpp.cpp
+++ b/src/linguist/lupdate/cpp.cpp
@@ -239,7 +239,7 @@ private:
std::ostream &yyMsg(int line = 0);
- uint getChar();
+ int getChar();
uint getToken();
bool getMacroArgs();
@@ -417,7 +417,7 @@ void CppParser::setInput(QTextStream &ts, const QString &fileName)
The 0 doesn't produce any token.
*/
-uint CppParser::getChar()
+int CppParser::getChar()
{
const ushort *uc = yyInPtr;
forever {
@@ -455,7 +455,7 @@ uint CppParser::getChar()
yyAtNewline = false;
}
yyInPtr = uc;
- return c;
+ return int(c);
}
}