official
/
OpenLCP
1
0
Fork 0
Code Releases 1 Activity

overridden virtual function should not be marked virtual in the derived class

This commit is contained in:
Kevin Matz 2021-08-19 18:28:23 -04:00
parent 00cb16a5e5
commit e5539ffc37
2 changed files with 31 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
otp/advertisement.h
View File

@ -36,7 +36,7 @@ class pdu
: public OTP::PDU::pdu
{
public:
virtual void iStream(PDU::Stream) override;
void iStream(PDU::Stream) override;
};
@ -49,9 +49,9 @@ struct module_identifier
uint16_t manufacturer;
uint16_t number;
virtual size_t streamSize() const override { return 4; }
virtual void iStream(PDU::Stream) override;
virtual void oStream(PDU::Stream) const override;
size_t streamSize() const override { return 4; }
void iStream(PDU::Stream) override;
void oStream(PDU::Stream) const override;
};
@ -64,9 +64,9 @@ struct module_data
uint32_t reserved;
std::vector<module_identifier> modules;
virtual size_t streamSize() const override { return 4 + (4 * modules.size()); }
virtual void iStream(PDU::Stream) override;
virtual void oStream(PDU::Stream) const override;
size_t streamSize() const override { return 4 + (4 * modules.size()); }
void iStream(PDU::Stream) override;
void oStream(PDU::Stream) const override;
};
} // namespace Module
@ -81,7 +81,7 @@ class pdu
: public OTP::PDU::pdu
{
public:
virtual void iStream(PDU::Stream) override;
void iStream(PDU::Stream) override;
};
@ -96,9 +96,9 @@ struct point_description
uint32_t point;
std::string name;
virtual size_t streamSize() const override { return 39; }
virtual void iStream(PDU::Stream) override;
virtual void oStream(PDU::Stream) const override;
size_t streamSize() const override { return 39; }
void iStream(PDU::Stream) override;
void oStream(PDU::Stream) const override;
};
@ -118,9 +118,9 @@ struct name_data
uint32_t reserved;
std::vector<point_description> points;
virtual size_t streamSize() const override { return 5 + (39 * points.size()); }
virtual void iStream(PDU::Stream) override;
virtual void oStream(PDU::Stream) const override;
size_t streamSize() const override { return 5 + (39 * points.size()); }
void iStream(PDU::Stream) override;
void oStream(PDU::Stream) const override;
};
} // namespace Name
@ -135,7 +135,7 @@ class pdu
: public OTP::PDU::pdu
{
public:
virtual void iStream(PDU::Stream) override;
void iStream(PDU::Stream) override;
};
@ -155,9 +155,9 @@ struct system_data
uint32_t reserved;
std::vector<uint8_t> systems;
virtual size_t streamSize() const override { return 5 + systems.size(); }
virtual void iStream(PDU::Stream) override;
virtual void oStream(PDU::Stream) const override;
size_t streamSize() const override { return 5 + systems.size(); }
void iStream(PDU::Stream) override;
void oStream(PDU::Stream) const override;
};
} // namespace System
@ -170,7 +170,7 @@ class pdu
: public OTP::PDU::pdu
{
public:
virtual void iStream(PDU::Stream) override;
void iStream(PDU::Stream) override;
};
@ -183,9 +183,9 @@ struct advertisement_data
uint32_t reserved;
PDU::Pdu payload;
virtual size_t streamSize() const override { return 4 + payload->streamSize(); }
virtual void iStream(PDU::Stream) override;
virtual void oStream(PDU::Stream) const override;
size_t streamSize() const override { return 4 + payload->streamSize(); }
void iStream(PDU::Stream) override;
void oStream(PDU::Stream) const override;
};

21
otp/base.h
View File

@ -44,9 +44,9 @@ struct base_data
std::string name;
PDU::Pdu payload;
virtual size_t streamSize() const override;
virtual void iStream(PDU::Stream) override;
virtual void oStream(PDU::Stream) const override;
size_t streamSize() const override;
void iStream(PDU::Stream) override;
void oStream(PDU::Stream) const override;
};
@ -60,9 +60,9 @@ struct base_footer
uint8_t length;
std::vector<uint8_t> data;
virtual size_t streamSize() const override { return data.size(); }
virtual void iStream(PDU::Stream) override;
virtual void oStream(PDU::Stream) const override;
size_t streamSize() const override { return data.size(); }
void iStream(PDU::Stream) override;
void oStream(PDU::Stream) const override;
};
@ -75,12 +75,9 @@ class pdu
public:
base_footer footer;
virtual size_t streamSize() const override;
virtual void iStream(PDU::Stream) override;
virtual void oStream(PDU::Stream) const override;
size_t streamSize() const override;
void iStream(PDU::Stream) override;
void oStream(PDU::Stream) const override;
};
} // OTP::Layer