Start requring C++11 with explicit virtual overrides.

This commit is contained in:
Michael Hansen
2019-10-02 14:40:25 -07:00
parent f02a339072
commit 8d3752b4f0
7 changed files with 42 additions and 40 deletions

View File

@@ -11,13 +11,13 @@ public:
PycInt(int value = 0, int type = TYPE_INT)
: PycObject(type), m_value(value) { }
bool isEqual(PycRef<PycObject> obj) const
bool isEqual(PycRef<PycObject> obj) const override
{
return (type() == obj.type()) &&
(m_value == obj.cast<PycInt>()->m_value);
}
void load(class PycData* stream, class PycModule* mod);
void load(class PycData* stream, class PycModule* mod) override;
int value() const { return m_value; }
@@ -30,9 +30,9 @@ public:
PycLong(int type = TYPE_LONG)
: PycObject(type), m_size(0) { }
bool isEqual(PycRef<PycObject> obj) const;
bool isEqual(PycRef<PycObject> obj) const override;
void load(class PycData* stream, class PycModule* mod);
void load(class PycData* stream, class PycModule* mod) override;
int size() const { return m_size; }
const std::list<int>& value() const { return m_value; }
@@ -49,11 +49,11 @@ public:
PycFloat(int type = TYPE_FLOAT)
: PycObject(type), m_value(0) { }
~PycFloat() { if (m_value) delete[] m_value; }
~PycFloat() { delete[] m_value; }
bool isEqual(PycRef<PycObject> obj) const;
bool isEqual(PycRef<PycObject> obj) const override;
void load(class PycData* stream, class PycModule* mod);
void load(class PycData* stream, class PycModule* mod) override;
const char* value() const { return m_value; }
@@ -66,11 +66,11 @@ public:
PycComplex(int type = TYPE_COMPLEX)
: PycFloat(type), m_imag(0) { }
~PycComplex() { if (m_imag) delete[] m_imag; }
~PycComplex() { delete[] m_imag; }
bool isEqual(PycRef<PycObject> obj) const;
bool isEqual(PycRef<PycObject> obj) const override;
void load(class PycData* stream, class PycModule* mod);
void load(class PycData* stream, class PycModule* mod) override;
const char* imag() const { return m_imag; }
@@ -83,13 +83,13 @@ public:
PycCFloat(int type = TYPE_BINARY_FLOAT)
: PycObject(type), m_value(0.0) { }
bool isEqual(PycRef<PycObject> obj) const
bool isEqual(PycRef<PycObject> obj) const override
{
return (type() == obj.type()) &&
(m_value == obj.cast<PycCFloat>()->m_value);
}
void load(class PycData* stream, class PycModule* mod);
void load(class PycData* stream, class PycModule* mod) override;
double value() const { return m_value; }
@@ -102,13 +102,13 @@ public:
PycCComplex(int type = TYPE_BINARY_COMPLEX)
: PycCFloat(type), m_imag(0.0) { }
bool isEqual(PycRef<PycObject> obj) const
bool isEqual(PycRef<PycObject> obj) const override
{
return (PycCFloat::isEqual(obj)) &&
(m_imag == obj.cast<PycCComplex>()->m_imag);
}
void load(class PycData* stream, class PycModule* mod);
void load(class PycData* stream, class PycModule* mod) override;
double imag() const { return m_imag; }