Commit eae41fc2 authored by Jakob Otto's avatar Jakob Otto

Fix override warnings

parent 6507c9da
...@@ -63,7 +63,7 @@ public: ...@@ -63,7 +63,7 @@ public:
} }
// -- overridden member functions -------------------------------------------- // -- overridden member functions --------------------------------------------
error begin_object(uint16_t& nr, std::string& name) { error begin_object(uint16_t& nr, std::string& name) override {
if (auto err = apply(nr)) if (auto err = apply(nr))
return err; return err;
if (nr != 0) if (nr != 0)
...@@ -71,15 +71,15 @@ public: ...@@ -71,15 +71,15 @@ public:
return apply(name); return apply(name);
} }
error end_object() { error end_object() override {
return none; return none;
} }
error begin_sequence(size_t& list_size) { error begin_sequence(size_t& list_size) override {
// Use varbyte encoding to compress sequence size on the wire. // Use varbyte encoding to compress sequence size on the wire.
uint32_t x = 0; uint32_t x = 0;
int n = 0; int n = 0;
uint8_t low7; uint8_t low7 = 0;
do { do {
if (auto err = apply_impl(low7)) if (auto err = apply_impl(low7))
return err; return err;
...@@ -90,11 +90,11 @@ public: ...@@ -90,11 +90,11 @@ public:
return none; return none;
} }
error end_sequence() { error end_sequence() override {
return none; return none;
} }
error apply_raw(size_t num_bytes, void* storage) { error apply_raw(size_t num_bytes, void* storage) override {
if (!range_check(num_bytes)) if (!range_check(num_bytes))
return sec::end_of_stream; return sec::end_of_stream;
memcpy(storage, current_, num_bytes); memcpy(storage, current_, num_bytes);
...@@ -125,47 +125,47 @@ public: ...@@ -125,47 +125,47 @@ public:
} }
protected: protected:
error apply_impl(int8_t& x) { error apply_impl(int8_t& x) override {
return apply_raw(sizeof(int8_t), &x); return apply_raw(sizeof(int8_t), &x);
} }
error apply_impl(uint8_t& x) { error apply_impl(uint8_t& x) override {
return apply_raw(sizeof(uint8_t), &x); return apply_raw(sizeof(uint8_t), &x);
} }
error apply_impl(int16_t& x) { error apply_impl(int16_t& x) override {
return apply_int(*this, x); return apply_int(*this, x);
} }
error apply_impl(uint16_t& x) { error apply_impl(uint16_t& x) override {
return apply_int(*this, x); return apply_int(*this, x);
} }
error apply_impl(int32_t& x) { error apply_impl(int32_t& x) override {
return apply_int(*this, x); return apply_int(*this, x);
} }
error apply_impl(uint32_t& x) { error apply_impl(uint32_t& x) override {
return apply_int(*this, x); return apply_int(*this, x);
} }
error apply_impl(int64_t& x) { error apply_impl(int64_t& x) override {
return apply_int(*this, x); return apply_int(*this, x);
} }
error apply_impl(uint64_t& x) { error apply_impl(uint64_t& x) override {
return apply_int(*this, x); return apply_int(*this, x);
} }
error apply_impl(float& x) { error apply_impl(float& x) override {
return apply_float(*this, x); return apply_float(*this, x);
} }
error apply_impl(double& x) { error apply_impl(double& x) override {
return apply_float(*this, x); return apply_float(*this, x);
} }
error apply_impl(long double& x) { error apply_impl(long double& x) override {
// The IEEE-754 conversion does not work for long double // The IEEE-754 conversion does not work for long double
// => fall back to string serialization (even though it sucks). // => fall back to string serialization (even though it sucks).
std::string tmp; std::string tmp;
...@@ -175,7 +175,8 @@ protected: ...@@ -175,7 +175,8 @@ protected:
iss >> x; iss >> x;
return none; return none;
} }
error apply_impl(std::string& x) {
error apply_impl(std::string& x) override {
size_t str_size; size_t str_size;
if (auto err = begin_sequence(str_size)) if (auto err = begin_sequence(str_size))
return err; return err;
...@@ -186,7 +187,7 @@ protected: ...@@ -186,7 +187,7 @@ protected:
return end_sequence(); return end_sequence();
} }
error apply_impl(std::u16string& x) { error apply_impl(std::u16string& x) override {
auto str_size = x.size(); auto str_size = x.size();
if (auto err = begin_sequence(str_size)) if (auto err = begin_sequence(str_size))
return err; return err;
...@@ -200,7 +201,7 @@ protected: ...@@ -200,7 +201,7 @@ protected:
return none; return none;
} }
error apply_impl(std::u32string& x) { error apply_impl(std::u32string& x) override {
auto str_size = x.size(); auto str_size = x.size();
if (auto err = begin_sequence(str_size)) if (auto err = begin_sequence(str_size))
return err; return err;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment