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

Restore compilation in gcc-4.6

This commit is contained in:
Dmitry-Me 2019-12-27 18:26:44 +03:00
parent d977761e76
commit 147cf9319f
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/exprengine.cpp
View File

@ -197,7 +197,7 @@ namespace {
structVal->member[memberName] = value; structVal->member[memberName] = value;
} }
std::string getNewSymbolName() override { std::string getNewSymbolName() OVERRIDE {
return "$" + std::to_string(++(*symbolValueIndex)); return "$" + std::to_string(++(*symbolValueIndex));
} }

32
lib/exprengine.h
View File

@ -123,14 +123,14 @@ namespace ExprEngine {
, minValue(minValue) , minValue(minValue)
, maxValue(maxValue) { , maxValue(maxValue) {
} }
std::string getRange() const override { std::string getRange() const OVERRIDE {
if (minValue == maxValue) if (minValue == maxValue)
return str(minValue); return str(minValue);
return str(minValue) + ":" + str(maxValue); return str(minValue) + ":" + str(maxValue);
} }
bool isEqual(DataBase *dataBase, int value) const override; bool isEqual(DataBase *dataBase, int value) const OVERRIDE;
bool isGreaterThan(DataBase *dataBase, int value) const override; bool isGreaterThan(DataBase *dataBase, int value) const OVERRIDE;
bool isLessThan(DataBase *dataBase, int value) const override; bool isLessThan(DataBase *dataBase, int value) const OVERRIDE;
int128_t minValue; int128_t minValue;
int128_t maxValue; int128_t maxValue;
@ -144,12 +144,12 @@ namespace ExprEngine {
, maxValue(maxValue) { , maxValue(maxValue) {
} }
bool isEqual(DataBase *dataBase, int value) const override { bool isEqual(DataBase *dataBase, int value) const OVERRIDE {
(void)dataBase; (void)dataBase;
return value >= minValue && value <= maxValue; return value >= minValue && value <= maxValue;
} }
std::string getRange() const override { std::string getRange() const OVERRIDE {
return std::to_string(minValue) + ":" + std::to_string(maxValue); return std::to_string(minValue) + ":" + std::to_string(maxValue);
} }
@ -165,7 +165,7 @@ namespace ExprEngine {
, null(null) , null(null)
, uninitData(uninitData) { , uninitData(uninitData) {
} }
std::string getRange() const override; std::string getRange() const OVERRIDE;
ValuePtr data; ValuePtr data;
bool null; bool null;
bool uninitData; bool uninitData;
@ -177,7 +177,7 @@ namespace ExprEngine {
ConditionalValue(const std::string &name, const Vector &values) : Value(name, ValueType::ConditionalValue), values(values) {} ConditionalValue(const std::string &name, const Vector &values) : Value(name, ValueType::ConditionalValue), values(values) {}
std::string getSymbolicExpression() const override; std::string getSymbolicExpression() const OVERRIDE;
Vector values; Vector values;
}; };
@ -189,7 +189,7 @@ namespace ExprEngine {
ArrayValue(const std::string &name, ValuePtr size, ValuePtr value); ArrayValue(const std::string &name, ValuePtr size, ValuePtr value);
ArrayValue(DataBase *data, const Variable *var); ArrayValue(DataBase *data, const Variable *var);
std::string getSymbolicExpression() const override; std::string getSymbolicExpression() const OVERRIDE;
void assign(ValuePtr index, ValuePtr value); void assign(ValuePtr index, ValuePtr value);
void clear(); void clear();
@ -207,7 +207,7 @@ namespace ExprEngine {
public: public:
StringLiteralValue(const std::string &name, const std::string &s) : Value(name, ValueType::StringLiteralValue), string(s) {} StringLiteralValue(const std::string &name, const std::string &s) : Value(name, ValueType::StringLiteralValue), string(s) {}
std::string getRange() const override { std::string getRange() const OVERRIDE {
return "\"" + string + "\""; return "\"" + string + "\"";
} }
@ -221,7 +221,7 @@ namespace ExprEngine {
public: public:
explicit StructValue(const std::string &name) : Value(name, ValueType::StructValue) {} explicit StructValue(const std::string &name) : Value(name, ValueType::StructValue) {}
std::string getSymbolicExpression() const override; std::string getSymbolicExpression() const OVERRIDE;
ValuePtr getValueOfMember(const std::string &name) const { ValuePtr getValueOfMember(const std::string &name) const {
auto it = member.find(name); auto it = member.find(name);
@ -237,7 +237,7 @@ namespace ExprEngine {
, varId(varId) , varId(varId)
{} {}
std::string getRange() const override { std::string getRange() const OVERRIDE {
return "&@" + std::to_string(varId); return "&@" + std::to_string(varId);
} }
@ -253,9 +253,9 @@ namespace ExprEngine {
, op2(op2) { , op2(op2) {
} }
bool isEqual(DataBase *dataBase, int value) const override; bool isEqual(DataBase *dataBase, int value) const OVERRIDE;
bool isGreaterThan(DataBase *dataBase, int value) const override; bool isGreaterThan(DataBase *dataBase, int value) const OVERRIDE;
bool isLessThan(DataBase *dataBase, int value) const override; virtual bool isLessThan(DataBase *dataBase, int value) const OVERRIDE;
std::string getExpr(DataBase *dataBase) const; std::string getExpr(DataBase *dataBase) const;
@ -279,7 +279,7 @@ namespace ExprEngine {
, sign(sign) { , sign(sign) {
} }
std::string getSymbolicExpression() const override; std::string getSymbolicExpression() const OVERRIDE;
ExprEngine::ValuePtr inputValue; ExprEngine::ValuePtr inputValue;
int bits; int bits;