Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-14 12:38:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Adding override/final to overridden virtual methods.

Browse source 
C++11 compilers complain about overridden virtual methods
not being specified as either final or overridden.
This commit is contained in:
Seth Hall 2016-01-16 23:35:31 -05:00
parent ad61267ce6
commit a58c308427
15 changed files with 282 additions and 282 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/probabilistic/BloomFilter.h
View file

@ -158,11 +158,11 @@ public:
static size_t K(size_t cells, size_t capacity);
// Overridden from BloomFilter.
virtual bool Empty() const;
virtual void Clear();
virtual bool Merge(const BloomFilter* other);
virtual BasicBloomFilter* Clone() const;
virtual string InternalState() const;
virtual bool Empty() const override;
virtual void Clear() override;
virtual bool Merge(const BloomFilter* other) override;
virtual BasicBloomFilter* Clone() const override;
virtual string InternalState() const override;
protected:
DECLARE_SERIAL(BasicBloomFilter);
@ -173,8 +173,8 @@ protected:
BasicBloomFilter();
// Overridden from BloomFilter.
virtual void Add(const HashKey* key);
virtual size_t Count(const HashKey* key) const;
virtual void Add(const HashKey* key) override;
virtual size_t Count(const HashKey* key) const override;
private:
BitVector* bits;
@ -203,11 +203,11 @@ public:
~CountingBloomFilter();
// Overridden from BloomFilter.
virtual bool Empty() const;
virtual void Clear();
virtual bool Merge(const BloomFilter* other);
virtual CountingBloomFilter* Clone() const;
virtual string InternalState() const;
virtual bool Empty() const override;
virtual void Clear() override;
virtual bool Merge(const BloomFilter* other) override;
virtual CountingBloomFilter* Clone() const override;
virtual string InternalState() const override;
protected:
DECLARE_SERIAL(CountingBloomFilter);
@ -218,8 +218,8 @@ protected:
CountingBloomFilter();
// Overridden from BloomFilter.
virtual void Add(const HashKey* key);
virtual size_t Count(const HashKey* key) const;
virtual void Add(const HashKey* key) override;
virtual size_t Count(const HashKey* key) const override;
private:
CounterVector* cells;

12
src/probabilistic/Hasher.h
View file

@ -191,9 +191,9 @@ public:
DefaultHasher(size_t k, size_t seed);
// Overridden from Hasher.
virtual digest_vector Hash(const void* x, size_t n) const /* final */;
virtual DefaultHasher* Clone() const /* final */;
virtual bool Equals(const Hasher* other) const /* final */;
virtual digest_vector Hash(const void* x, size_t n) const final;
virtual DefaultHasher* Clone() const final;
virtual bool Equals(const Hasher* other) const final;
DECLARE_SERIAL(DefaultHasher);
@ -219,9 +219,9 @@ public:
DoubleHasher(size_t k, size_t seed);
// Overridden from Hasher.
virtual digest_vector Hash(const void* x, size_t n) const /* final */;
virtual DoubleHasher* Clone() const /* final */;
virtual bool Equals(const Hasher* other) const /* final */;
virtual digest_vector Hash(const void* x, size_t n) const final;
virtual DoubleHasher* Clone() const final;
virtual bool Equals(const Hasher* other) const final;
DECLARE_SERIAL(DoubleHasher);