Revert "Balder/enforce override 2"

2 files changed, 8 insertions, 9 deletions

diff --git a/vespamalloc/src/tests/allocfree/allocfree.cpp b/vespamalloc/src/tests/allocfree/allocfree.cpp
index 0806d3a8453..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:
-    void consume(void * p) override { free(p); }
+    virtual void consume(void * p) override { free(p); }
 };
 
 //-----------------------------------------------------------------------------
@@ -30,7 +30,7 @@ public:
         : Producer(cnt, target), _size(size) {}
 private:
     uint32_t _size;
-    void * produce() override { return malloc(_size); }
+    virtual void * produce()       override { return malloc(_size); }
 };
 
 //-----------------------------------------------------------------------------
@@ -41,9 +41,8 @@ public:
         : ProducerConsumer(cnt, inverse), _size(size) { }
 private:
     uint32_t _size;
-
-    void * produce() override { return malloc(_size); }
-    void consume(void * p) override { 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 ff33fca4661..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;
-    void consume(void * p) override {
+    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;
-    void * produce()  override {
+    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;
-    void * produce() override {
+    virtual void * produce()       override {
         void *p = List::linkOut(_head);
         List *l((List *)p);
         if ( !((l >= &globalList[0]) && (l < &globalList[NumBlocks]))) { abort(); }
         return p;
     }
-    void consume(void * p) override {
+    virtual void consume(void * p) override {
         List * l((List *) p);
         if ( !((l >= &globalList[0]) && (l < &globalList[NumBlocks]))) { abort(); }
         List::linkIn(_head, l, l);