diff options
author | Arne H Juul <arnej@yahoo-inc.com> | 2017-04-10 15:57:28 +0200 |
---|---|---|
committer | Arne H Juul <arnej@yahoo-inc.com> | 2017-04-10 15:57:28 +0200 |
commit | fed5ab7a8c969fd64231395eac4e652e6fa76d99 (patch) | |
tree | 0663dcadbf3214a9fc20ef5db8f66a8cca123285 /vespamalloc | |
parent | 7b5f43fd68e33cd6afe7150430732ee02b1c4ffa (diff) |
add override in vespamalloc module
Diffstat (limited to 'vespamalloc')
-rw-r--r-- | vespamalloc/src/tests/allocfree/allocfree.cpp | 8 | ||||
-rw-r--r-- | vespamalloc/src/tests/allocfree/linklist.cpp | 8 | ||||
-rw-r--r-- | vespamalloc/src/tests/allocfree/producerconsumer.h | 6 | ||||
-rw-r--r-- | vespamalloc/src/tests/doubledelete/expectsignal.cpp | 4 | ||||
-rw-r--r-- | vespamalloc/src/tests/overwrite/expectsignal.cpp | 4 | ||||
-rw-r--r-- | vespamalloc/src/tests/overwrite/overwrite.cpp | 2 | ||||
-rw-r--r-- | vespamalloc/src/tests/test.cpp | 2 | ||||
-rw-r--r-- | vespamalloc/src/tests/test1/testatomic.cpp | 4 | ||||
-rw-r--r-- | vespamalloc/src/tests/thread/racemanythreads.cpp | 2 | ||||
-rw-r--r-- | vespamalloc/src/tests/thread/thread.cpp | 4 |
10 files changed, 22 insertions, 22 deletions
diff --git a/vespamalloc/src/tests/allocfree/allocfree.cpp b/vespamalloc/src/tests/allocfree/allocfree.cpp index 7e81aaa9c1d..cdb471e35d2 100644 --- a/vespamalloc/src/tests/allocfree/allocfree.cpp +++ b/vespamalloc/src/tests/allocfree/allocfree.cpp @@ -19,7 +19,7 @@ public: FreeWorker(uint32_t maxQueue, bool inverse) : Consumer (maxQueue, inverse) {} private: - virtual void consume(void * p) { free(p); } + virtual void consume(void * p) override { free(p); } }; //----------------------------------------------------------------------------- @@ -30,7 +30,7 @@ public: : Producer(cnt, target), _size(size) {} private: uint32_t _size; - virtual void * produce() { return malloc(_size); } + virtual void * produce() override { return malloc(_size); } }; //----------------------------------------------------------------------------- @@ -41,8 +41,8 @@ public: : ProducerConsumer(cnt, inverse), _size(size) { } private: uint32_t _size; - virtual void * produce() { return malloc(_size); } - virtual void consume(void * p) { free(p); } + virtual void * produce() override { return malloc(_size); } + virtual void consume(void * p) override { free(p); } }; //----------------------------------------------------------------------------- diff --git a/vespamalloc/src/tests/allocfree/linklist.cpp b/vespamalloc/src/tests/allocfree/linklist.cpp index 9642c987899..06acfa8df8a 100644 --- a/vespamalloc/src/tests/allocfree/linklist.cpp +++ b/vespamalloc/src/tests/allocfree/linklist.cpp @@ -61,7 +61,7 @@ public: LinkIn(List::AtomicHeadPtr & list, uint32_t maxQueue, bool inverse); private: List::AtomicHeadPtr & _head; - virtual void consume(void * p) { + virtual void consume(void * p) override { List * l((List *) p); if ( ! ((l >= &globalList[0]) && (l < &globalList[NumBlocks]))) { abort(); } List::linkIn(_head, l, l); @@ -82,7 +82,7 @@ public: : Producer(cnt, target), _head(list) {} private: List::AtomicHeadPtr & _head; - virtual void * produce() { + virtual void * produce() override { void *p = List::linkOut(_head); List *l((List *)p); if ( ! ((l >= &globalList[0]) && (l < &globalList[NumBlocks]))) { abort(); } @@ -98,13 +98,13 @@ public: : ProducerConsumer(cnt, inverse), _head(list) { } private: List::AtomicHeadPtr & _head; - virtual void * produce() { + virtual void * produce() override { void *p = List::linkOut(_head); List *l((List *)p); if ( !((l >= &globalList[0]) && (l < &globalList[NumBlocks]))) { abort(); } return p; } - virtual void consume(void * p) { + virtual void consume(void * p) override { List * l((List *) p); if ( !((l >= &globalList[0]) && (l < &globalList[NumBlocks]))) { abort(); } List::linkIn(_head, l, l); diff --git a/vespamalloc/src/tests/allocfree/producerconsumer.h b/vespamalloc/src/tests/allocfree/producerconsumer.h index c9b7be3258f..07edb4af9ab 100644 --- a/vespamalloc/src/tests/allocfree/producerconsumer.h +++ b/vespamalloc/src/tests/allocfree/producerconsumer.h @@ -22,7 +22,7 @@ public: virtual ~Consumer(); void enqueue(const MemList &mem) { _queue.enqueue(mem); } void close() { _queue.close(); } - void Run(FastOS_ThreadInterface *t, void *); + void Run(FastOS_ThreadInterface *t, void *) override; uint64_t operations() const { return _operations; } }; @@ -35,7 +35,7 @@ private: public: Producer(uint32_t cnt, Consumer &target); virtual ~Producer(); - void Run(FastOS_ThreadInterface *t, void *); + void Run(FastOS_ThreadInterface *t, void *) override; uint64_t operations() const { return _operations; } }; @@ -50,7 +50,7 @@ private: public: ProducerConsumer(uint32_t cnt, bool inverse); virtual ~ProducerConsumer(); - void Run(FastOS_ThreadInterface *t, void *); + void Run(FastOS_ThreadInterface *t, void *) override; uint64_t operationsConsumed() const { return _operationsConsumed; } uint64_t operationsProduced() const { return _operationsProduced; } }; diff --git a/vespamalloc/src/tests/doubledelete/expectsignal.cpp b/vespamalloc/src/tests/doubledelete/expectsignal.cpp index f1fb6eb5694..3237339fb97 100644 --- a/vespamalloc/src/tests/doubledelete/expectsignal.cpp +++ b/vespamalloc/src/tests/doubledelete/expectsignal.cpp @@ -7,9 +7,9 @@ using namespace vespalib; class Test : public TestApp { public: - int Main(); + int Main() override; private: - virtual bool useProcessStarter() const { return true; } + virtual bool useProcessStarter() const override { return true; } }; int Test::Main() diff --git a/vespamalloc/src/tests/overwrite/expectsignal.cpp b/vespamalloc/src/tests/overwrite/expectsignal.cpp index f1fb6eb5694..3237339fb97 100644 --- a/vespamalloc/src/tests/overwrite/expectsignal.cpp +++ b/vespamalloc/src/tests/overwrite/expectsignal.cpp @@ -7,9 +7,9 @@ using namespace vespalib; class Test : public TestApp { public: - int Main(); + int Main() override; private: - virtual bool useProcessStarter() const { return true; } + virtual bool useProcessStarter() const override { return true; } }; int Test::Main() diff --git a/vespamalloc/src/tests/overwrite/overwrite.cpp b/vespamalloc/src/tests/overwrite/overwrite.cpp index 8c35fe841fe..507e8d84c8c 100644 --- a/vespamalloc/src/tests/overwrite/overwrite.cpp +++ b/vespamalloc/src/tests/overwrite/overwrite.cpp @@ -6,7 +6,7 @@ using namespace vespalib; class Test : public TestApp { public: - int Main(); + int Main() override; ~Test(); private: void testFillValue(char *a); diff --git a/vespamalloc/src/tests/test.cpp b/vespamalloc/src/tests/test.cpp index d6208fdc240..9f5bd826a6b 100644 --- a/vespamalloc/src/tests/test.cpp +++ b/vespamalloc/src/tests/test.cpp @@ -26,7 +26,7 @@ void testdd() class Thread : public FastOS_Runnable { private: - void Run(FastOS_ThreadInterface * ti, void * arg); + void Run(FastOS_ThreadInterface * ti, void * arg) override; }; int main(int, char *[]) diff --git a/vespamalloc/src/tests/test1/testatomic.cpp b/vespamalloc/src/tests/test1/testatomic.cpp index 78d94429a3f..cf627e11c77 100644 --- a/vespamalloc/src/tests/test1/testatomic.cpp +++ b/vespamalloc/src/tests/test1/testatomic.cpp @@ -7,7 +7,7 @@ class Test : public vespalib::TestApp { public: - int Main(); + int Main() override; private: template<typename T> void testSwap(T initial); @@ -19,7 +19,7 @@ template <typename T> class Stress : public FastOS_Runnable { private: - void Run(FastOS_ThreadInterface * ti, void * arg); + void Run(FastOS_ThreadInterface * ti, void * arg) override; void stressSwap(T & value); public: Stress(T * value) : _value(value), _successCount(0), _failedCount(0) { } diff --git a/vespamalloc/src/tests/thread/racemanythreads.cpp b/vespamalloc/src/tests/thread/racemanythreads.cpp index ba5cc8b7a1c..8f366acea3a 100644 --- a/vespamalloc/src/tests/thread/racemanythreads.cpp +++ b/vespamalloc/src/tests/thread/racemanythreads.cpp @@ -19,7 +19,7 @@ class Test : public TestApp { public: ~Test(); - int Main(); + int Main() override; }; Test::~Test() diff --git a/vespamalloc/src/tests/thread/thread.cpp b/vespamalloc/src/tests/thread/thread.cpp index 49631c0f7e5..6261a0f8eb6 100644 --- a/vespamalloc/src/tests/thread/thread.cpp +++ b/vespamalloc/src/tests/thread/thread.cpp @@ -19,9 +19,9 @@ class Test : public TestApp { public: ~Test(); - int Main(); + int Main() override; private: - virtual bool useIPCHelper() const { return true; } + virtual bool useIPCHelper() const override { return true; } }; Test::~Test() |