EventAdderImpl: fix -Wshadow, -Wconversion
All checks were successful
continuous-integration/drone/push Build is passing

This commit is contained in:
surtur 2022-01-14 07:10:16 +01:00
parent bb1d895d4e
commit 508eaaa67f
Signed by: wanderer
GPG Key ID: 19CE1EC1D9E0486D

View File

@ -4,29 +4,33 @@
#include "event_adder.h" #include "event_adder.h"
#include "pool.h" #include "pool.h"
#include <cstdint>
namespace fortuna { namespace fortuna {
namespace accumulator { namespace accumulator {
class EventAdderImpl final : public EventAdder { class EventAdderImpl final : public EventAdder {
private: public:
static constexpr const uint8_t p_size{32}; static constexpr const uint8_t p_size{32};
uint8_t pool;
static unsigned int source_id; private:
static accumulator::Pool pools[p_size]; uint8_t pool_id;
static unsigned int _source_id;
static accumulator::Pool _pools[p_size];
public: public:
EventAdderImpl(const unsigned int source_id, EventAdderImpl(const unsigned int source_id,
const accumulator::Pool pools[32]) { const accumulator::Pool pools[p_size]) {
this->source_id = source_id; this->_source_id = source_id;
for (unsigned int i = 0; i < this->p_size; i++) { for (uint8_t i{0}; i < this->p_size; i++) {
this->pools[i] = pools[i]; this->_pools[i] = pools[i];
} }
this->pool = 0; this->pool_id = 0;
} }
void add(std::vector<char> event) override { void add(std::vector<char> event) override {
this->pool = (this->pool + 1) % p_size; this->pool_id = static_cast<uint8_t>((this->pool_id + 1) % p_size);
pools[this->pool].add_entropy(source_id, event); _pools[this->pool_id].add_entropy(_source_id, event);
} }
}; };