Revert "Balder/enforce override 2"

2 files changed, 9 insertions, 5 deletions

diff --git a/storageframework/src/tests/thread/taskthreadtest.cpp b/storageframework/src/tests/thread/taskthreadtest.cpp
index a6698be3676..bca5c81ef01 100644
--- a/storageframework/src/tests/thread/taskthreadtest.cpp
+++ b/storageframework/src/tests/thread/taskthreadtest.cpp
@@ -34,7 +34,7 @@ namespace {
 
     struct MyThread : public TaskThread<Task> {
         MyThread(ThreadLock& lock) : TaskThread<Task>(lock) {}
-        ThreadWaitInfo doNonCriticalTick(ThreadIndex) override {
+        virtual ThreadWaitInfo doNonCriticalTick(ThreadIndex) override {
             return ThreadWaitInfo::NO_MORE_CRITICAL_WORK_KNOWN;
         }
     };
diff --git a/storageframework/src/tests/thread/tickingthreadtest.cpp b/storageframework/src/tests/thread/tickingthreadtest.cpp
index c9d54fe557a..c65b809e5da 100644
--- a/storageframework/src/tests/thread/tickingthreadtest.cpp
+++ b/storageframework/src/tests/thread/tickingthreadtest.cpp
@@ -13,6 +13,9 @@ namespace defaultimplementation {
 
 struct TickingThreadTest : public CppUnit::TestFixture
 {
+    void setUp() override {}
+    void tearDown() override {}
+
     void testTicksBeforeWaitBasic();
     void testTicksBeforeWaitLiveUpdate();
     void testDestroyWithoutStarting();
@@ -59,7 +62,7 @@ struct MyApp : public TickingThread {
 
     void start(ThreadPool& p) { _threadPool->start(p); }
 
-    ThreadWaitInfo doCriticalTick(ThreadIndex index) override {
+    virtual ThreadWaitInfo doCriticalTick(ThreadIndex index) override {
         assert(index < _context.size());
         Context& c(_context[index]);
         if (_doCritOverlapTest) {
@@ -71,12 +74,13 @@ struct MyApp : public TickingThread {
         ++c._critTickCount;
         return ThreadWaitInfo::NO_MORE_CRITICAL_WORK_KNOWN;
     }
-    ThreadWaitInfo doNonCriticalTick(ThreadIndex index) override {
+    virtual ThreadWaitInfo doNonCriticalTick(ThreadIndex index) override {
         assert(index < _context.size());
         Context& c(_context[index]);
         ++c._nonCritTickCount;
         return ThreadWaitInfo::NO_MORE_CRITICAL_WORK_KNOWN;
     }
+
     uint64_t getMinCritTick() {
         uint64_t min = std::numeric_limits<uint64_t>().max();
         for (uint32_t i=0; i<_context.size(); ++i) {
@@ -310,7 +314,7 @@ struct BroadcastApp : public TickingThread {
 
     void start(ThreadPool& p) { _threadPool->start(p); }
 
-    ThreadWaitInfo doCriticalTick(ThreadIndex) override {
+    virtual ThreadWaitInfo doCriticalTick(ThreadIndex) override {
         if (!_queue.empty()) {
             for (uint32_t i=0; i<_queue.size(); ++i) {
                 printTaskInfo(_queue[i], "activating");
@@ -321,7 +325,7 @@ struct BroadcastApp : public TickingThread {
         }
         return ThreadWaitInfo::NO_MORE_CRITICAL_WORK_KNOWN;
     }
-    ThreadWaitInfo doNonCriticalTick(ThreadIndex) override {
+    virtual ThreadWaitInfo doNonCriticalTick(ThreadIndex) override {
         if (!_active.empty()) {
             for (uint32_t i=0; i<_active.size(); ++i) {
                 printTaskInfo(_queue[i], "processing");