Remove Serializable's virtual destructor. It didn't do anything anyway.
To still make the compiler happy, add virtual destructors to all descendants of Serializable.
This commit is contained in:
parent
92ab65ba52
commit
97d0794c7c
|
@ -48,6 +48,8 @@ struct Color : public Serializable
|
||||||
Color(const Vec4 &norm);
|
Color(const Vec4 &norm);
|
||||||
Color(const Color &o);
|
Color(const Color &o);
|
||||||
|
|
||||||
|
virtual ~Color() {}
|
||||||
|
|
||||||
bool operator==(const Color &o) const;
|
bool operator==(const Color &o) const;
|
||||||
|
|
||||||
void updateInternal();
|
void updateInternal();
|
||||||
|
@ -95,6 +97,8 @@ struct Tone : public Serializable
|
||||||
Tone(double red, double green, double blue, double gray = 0);
|
Tone(double red, double green, double blue, double gray = 0);
|
||||||
Tone(const Tone &o);
|
Tone(const Tone &o);
|
||||||
|
|
||||||
|
virtual ~Tone() {}
|
||||||
|
|
||||||
bool operator==(const Tone &o) const;
|
bool operator==(const Tone &o) const;
|
||||||
|
|
||||||
void updateInternal();
|
void updateInternal();
|
||||||
|
@ -140,6 +144,8 @@ struct Rect : public Serializable
|
||||||
: x(0), y(0), width(0), height(0)
|
: x(0), y(0), width(0), height(0)
|
||||||
{}
|
{}
|
||||||
|
|
||||||
|
virtual ~Rect() {}
|
||||||
|
|
||||||
Rect(int x, int y, int width, int height);
|
Rect(int x, int y, int width, int height);
|
||||||
Rect(const Rect &o);
|
Rect(const Rect &o);
|
||||||
Rect(const IntRect &r);
|
Rect(const IntRect &r);
|
||||||
|
|
|
@ -24,8 +24,6 @@
|
||||||
|
|
||||||
struct Serializable
|
struct Serializable
|
||||||
{
|
{
|
||||||
virtual ~Serializable() {}
|
|
||||||
|
|
||||||
virtual int serialSize() const = 0;
|
virtual int serialSize() const = 0;
|
||||||
virtual void serialize(char *buffer) const = 0;
|
virtual void serialize(char *buffer) const = 0;
|
||||||
};
|
};
|
||||||
|
|
|
@ -31,7 +31,7 @@ class Table : public Serializable
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
Table(int x, int y = 1, int z = 1);
|
Table(int x, int y = 1, int z = 1);
|
||||||
~Table();
|
virtual ~Table();
|
||||||
|
|
||||||
int xSize() const { return m_x; }
|
int xSize() const { return m_x; }
|
||||||
int ySize() const { return m_y; }
|
int ySize() const { return m_y; }
|
||||||
|
|
Loading…
Reference in New Issue