generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-10-26 10:32:56 +01:00
Code Issues Projects Releases Wiki Activity

merge fixes from develop

Browse Source
This commit is contained in:
Günter Obiltschnig
2018-12-30 21:16:19 +01:00
parent 19228eedd9
commit b543e074a1
9 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CppParser/src/Parser.cpp
View File

@@ -161,7 +161,7 @@ void Parser::parse()
std::string m(exc.message());
std::string where(_currentPath);
where.append("(");
where.append(NumberFormatter::format(_istr.getCurrentLineNumber()));
where.append(NumberFormatter::format(static_cast<int>(_istr.getCurrentLineNumber())));
where.append(")");
throw SyntaxException(m, where);
}
@@ -373,7 +373,7 @@ const Token* Parser::parseBaseClassList(const Token* pNext, Struct* pClass)
}
const Token* Parser::parseClassMembers(const Token* pNext, Struct* pClass)
const Token* Parser::parseClassMembers(const Token* pNext, Struct* /*pClass*/)
{
poco_assert (isOperator(pNext, OperatorToken::OP_OPENBRACE));