walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Removed code that became unnecessary after 7be01da8e9. 

Fixed wrong comment in cli/pathmatch.h (doxygen warning)
This commit is contained in:
PKEuS 2012-04-13 11:08:46 +02:00
parent 51789d8e20
commit 05a6638468
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cli/pathmatch.h
View File

@ -34,14 +34,14 @@ public:
/** /**
* The constructor. * The constructor.
* @param masks List of masks. * @param masks List of masks.
* @param caseSensitive Match the case of the characters when
* matching paths?
*/ */
PathMatch(const std::vector<std::string> &masks, bool caseSensitive = true); PathMatch(const std::vector<std::string> &masks, bool caseSensitive = true);
/** /**
* @brief Match path against list of masks. * @brief Match path against list of masks.
* @param path Path to match. * @param path Path to match.
* @param caseSensitive Match the case of the characters when
* matching paths?
* @return true if any of the masks match the path, false otherwise. * @return true if any of the masks match the path, false otherwise.
*/ */
bool Match(const std::string &path) const; bool Match(const std::string &path) const;

4
lib/templatesimplifier.cpp
View File

@ -942,7 +942,7 @@ bool TemplateSimplifier::simplifyCalculations(Token *_tokens)
continue; continue;
// Integer operations // Integer operations
if (Token::Match(op, ">>|<<|&|%or%|^|%")) { if (Token::Match(op, ">>|<<|&|^|%or%")) {
const char cop = op->str()[0]; const char cop = op->str()[0];
const MathLib::bigint leftInt(MathLib::toLongNumber(tok->str())); const MathLib::bigint leftInt(MathLib::toLongNumber(tok->str()));
const MathLib::bigint rightInt(MathLib::toLongNumber(tok->strAt(2))); const MathLib::bigint rightInt(MathLib::toLongNumber(tok->strAt(2)));
@ -954,8 +954,6 @@ bool TemplateSimplifier::simplifyCalculations(Token *_tokens)
result = MathLib::toString<MathLib::bigint>(leftInt | rightInt); result = MathLib::toString<MathLib::bigint>(leftInt | rightInt);
else if (cop == '^') else if (cop == '^')
result = MathLib::toString<MathLib::bigint>(leftInt ^ rightInt); result = MathLib::toString<MathLib::bigint>(leftInt ^ rightInt);
else if (cop == '%')
result = MathLib::toString<MathLib::bigint>(leftInt % rightInt);
else if (cop == '<') { else if (cop == '<') {
if (tok->previous()->str() != "<<") // Ensure that its not a shift operator as used for streams if (tok->previous()->str() != "<<") // Ensure that its not a shift operator as used for streams
result = MathLib::toString<MathLib::bigint>(leftInt << rightInt); result = MathLib::toString<MathLib::bigint>(leftInt << rightInt);