Commit 3c42b882 authored by Dominik Charousset's avatar Dominik Charousset

Make result member public

parent 8484a3b8
...@@ -30,9 +30,7 @@ public: ...@@ -30,9 +30,7 @@ public:
using super::super; using super::super;
size_t result() const noexcept { size_t result = 0;
return result_;
}
result_type begin_object(type_id_t) override; result_type begin_object(type_id_t) override;
...@@ -75,9 +73,6 @@ public: ...@@ -75,9 +73,6 @@ public:
result_type apply(span<const byte> x) override; result_type apply(span<const byte> x) override;
result_type apply(const std::vector<bool>& xs) override; result_type apply(const std::vector<bool>& xs) override;
private:
size_t result_ = 0;
}; };
template <class T> template <class T>
...@@ -85,7 +80,7 @@ size_t serialized_size(actor_system& sys, const T& x) { ...@@ -85,7 +80,7 @@ size_t serialized_size(actor_system& sys, const T& x) {
serialized_size_inspector f{sys}; serialized_size_inspector f{sys};
auto err = f(x); auto err = f(x);
static_cast<void>(err); static_cast<void>(err);
return f.result(); return f.result;
} }
template <class T> template <class T>
...@@ -93,7 +88,7 @@ size_t serialized_size(const T& x) { ...@@ -93,7 +88,7 @@ size_t serialized_size(const T& x) {
serialized_size_inspector f{nullptr}; serialized_size_inspector f{nullptr};
auto err = f(x); auto err = f(x);
static_cast<void>(err); static_cast<void>(err);
return f.result(); return f.result;
} }
} // namespace caf::detail } // namespace caf::detail
...@@ -46,7 +46,7 @@ error serialized_size_inspector::begin_sequence(size_t list_size) { ...@@ -46,7 +46,7 @@ error serialized_size_inspector::begin_sequence(size_t list_size) {
x >>= 7; x >>= 7;
} }
*i++ = static_cast<uint8_t>(x) & 0x7f; *i++ = static_cast<uint8_t>(x) & 0x7f;
result_ += static_cast<size_t>(i - buf); result += static_cast<size_t>(i - buf);
return none; return none;
} }
...@@ -55,57 +55,57 @@ error serialized_size_inspector::end_sequence() { ...@@ -55,57 +55,57 @@ error serialized_size_inspector::end_sequence() {
} }
error serialized_size_inspector::apply(bool) { error serialized_size_inspector::apply(bool) {
result_ += sizeof(uint8_t); result += sizeof(uint8_t);
return none; return none;
} }
error serialized_size_inspector::apply(int8_t x) { error serialized_size_inspector::apply(int8_t x) {
result_ += sizeof(x); result += sizeof(x);
return none; return none;
} }
error serialized_size_inspector::apply(uint8_t x) { error serialized_size_inspector::apply(uint8_t x) {
result_ += sizeof(x); result += sizeof(x);
return none; return none;
} }
error serialized_size_inspector::apply(int16_t x) { error serialized_size_inspector::apply(int16_t x) {
result_ += sizeof(x); result += sizeof(x);
return none; return none;
} }
error serialized_size_inspector::apply(uint16_t x) { error serialized_size_inspector::apply(uint16_t x) {
result_ += sizeof(x); result += sizeof(x);
return none; return none;
} }
error serialized_size_inspector::apply(int32_t x) { error serialized_size_inspector::apply(int32_t x) {
result_ += sizeof(x); result += sizeof(x);
return none; return none;
} }
error serialized_size_inspector::apply(uint32_t x) { error serialized_size_inspector::apply(uint32_t x) {
result_ += sizeof(x); result += sizeof(x);
return none; return none;
} }
error serialized_size_inspector::apply(int64_t x) { error serialized_size_inspector::apply(int64_t x) {
result_ += sizeof(x); result += sizeof(x);
return none; return none;
} }
error serialized_size_inspector::apply(uint64_t x) { error serialized_size_inspector::apply(uint64_t x) {
result_ += sizeof(x); result += sizeof(x);
return none; return none;
} }
error serialized_size_inspector::apply(float x) { error serialized_size_inspector::apply(float x) {
result_ += sizeof(x); result += sizeof(x);
return none; return none;
} }
error serialized_size_inspector::apply(double x) { error serialized_size_inspector::apply(double x) {
result_ += sizeof(x); result += sizeof(x);
return none; return none;
} }
...@@ -120,30 +120,30 @@ error serialized_size_inspector::apply(long double x) { ...@@ -120,30 +120,30 @@ error serialized_size_inspector::apply(long double x) {
error serialized_size_inspector::apply(string_view x) { error serialized_size_inspector::apply(string_view x) {
CAF_IGNORE_UNUSED(begin_sequence(x.size())); CAF_IGNORE_UNUSED(begin_sequence(x.size()));
result_ += x.size(); result += x.size();
return end_sequence(); return end_sequence();
} }
error serialized_size_inspector::apply(const std::u16string& x) { error serialized_size_inspector::apply(const std::u16string& x) {
CAF_IGNORE_UNUSED(begin_sequence(x.size())); CAF_IGNORE_UNUSED(begin_sequence(x.size()));
result_ += x.size() * sizeof(uint16_t); result += x.size() * sizeof(uint16_t);
return end_sequence(); return end_sequence();
} }
error serialized_size_inspector::apply(const std::u32string& x) { error serialized_size_inspector::apply(const std::u32string& x) {
CAF_IGNORE_UNUSED(begin_sequence(x.size())); CAF_IGNORE_UNUSED(begin_sequence(x.size()));
result_ += x.size() * sizeof(uint32_t); result += x.size() * sizeof(uint32_t);
return end_sequence(); return end_sequence();
} }
error serialized_size_inspector::apply(span<const byte> x) { error serialized_size_inspector::apply(span<const byte> x) {
result_ += x.size(); result += x.size();
return none; return none;
} }
error serialized_size_inspector::apply(const std::vector<bool>& xs) { error serialized_size_inspector::apply(const std::vector<bool>& xs) {
CAF_IGNORE_UNUSED(begin_sequence(xs.size())); CAF_IGNORE_UNUSED(begin_sequence(xs.size()));
result_ += (xs.size() + static_cast<size_t>(xs.size() % 8 != 0)) / 8; result += (xs.size() + static_cast<size_t>(xs.size() % 8 != 0)) / 8;
return end_sequence(); return end_sequence();
} }
......
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