Simplify C++98 compat

cpputest · Oct 31, 2022 · b29cd69 · b29cd69
1 parent 8cc621c
commit b29cd69
Show file tree

Hide file tree

Showing 119 changed files with 1,032 additions and 1,039 deletions.
diff --git a/examples/AllTests/AllTests.cpp b/examples/AllTests/AllTests.cpp
@@ -34,12 +34,12 @@
 class MyDummyComparator : public MockNamedValueComparator
 {
 public:
-    virtual bool isEqual(const void* object1, const void* object2) _override
+    virtual bool isEqual(const void* object1, const void* object2) override
     {
         return object1 == object2;
     }
 
-    virtual SimpleString valueToString(const void* object) _override
+    virtual SimpleString valueToString(const void* object) override
     {
         return StringFrom(object);
     }

diff --git a/examples/AllTests/CircularBufferTest.cpp b/examples/AllTests/CircularBufferTest.cpp
@@ -33,11 +33,11 @@ TEST_GROUP(CircularBuffer)
 {
     CircularBuffer* buffer;
 
-    void setup() _override
+    void setup() override
     {
         buffer = new CircularBuffer();
     }
-    void teardown() _override
+    void teardown() override
     {
         delete buffer;
     }

diff --git a/examples/AllTests/EventDispatcherTest.cpp b/examples/AllTests/EventDispatcherTest.cpp
@@ -32,15 +32,15 @@
 class ObserverMock : public EventObserver
 {
 public:
-    virtual void notify(const Event& event, int timeOutInSeconds) _override
+    virtual void notify(const Event& event, int timeOutInSeconds) override
     {
         mock()
             .actualCall("notify")
             .onObject(this)
             .withParameterOfType("Event", "event", (void*)&event)
             .withParameter("timeOutInSeconds", timeOutInSeconds);
     }
-    virtual void notifyRegistration(EventObserver* newObserver) _override
+    virtual void notifyRegistration(EventObserver* newObserver) override
     {
         mock().actualCall("notifyRegistration").onObject(this).withParameter("newObserver", newObserver);
     }
@@ -49,11 +49,11 @@ class ObserverMock : public EventObserver
 class EventComparator : public MockNamedValueComparator
 {
 public:
-    virtual bool isEqual(const void* object1, const void* object2) _override
+    virtual bool isEqual(const void* object1, const void* object2) override
     {
         return ((const Event*)object1)->type == ((const Event*)object2)->type;
     }
-    virtual SimpleString valueToString(const void* object) _override
+    virtual SimpleString valueToString(const void* object) override
     {
         return StringFrom(((const Event*)object)->type);
     }
@@ -67,12 +67,12 @@ TEST_GROUP(EventDispatcher)
     ObserverMock observer2;
     EventComparator eventComparator;
 
-    void setup() _override
+    void setup() override
     {
         dispatcher = new EventDispatcher;
         mock().installComparator("Event", eventComparator);
     }
-    void teardown() _override
+    void teardown() override
     {
         delete dispatcher;
         mock().removeAllComparatorsAndCopiers();

diff --git a/examples/AllTests/FEDemoTest.cpp b/examples/AllTests/FEDemoTest.cpp
@@ -46,7 +46,7 @@ extern "C" {
 
 TEST_GROUP(FE_Demo)
 {
-    void setup() _override
+    void setup() override
     {
         IEEE754ExceptionsPlugin::disableInexact();
     }

diff --git a/examples/AllTests/HelloTest.cpp b/examples/AllTests/HelloTest.cpp
@@ -43,12 +43,12 @@ TEST_GROUP(HelloWorld)
         va_end(arguments);
         return 1;
     }
-    void setup() _override
+    void setup() override
     {
         buffer = new SimpleString();
         UT_PTR_SET(PrintFormated, &output_method);
     }
-    void teardown() _override
+    void teardown() override
     {
         delete buffer;
     }

diff --git a/examples/AllTests/MockDocumentationTest.cpp b/examples/AllTests/MockDocumentationTest.cpp
@@ -69,7 +69,7 @@ class ClassFromProductionCode
 class ClassFromProductionCodeMock : public ClassFromProductionCode
 {
 public:
-    virtual void importantFunction() _override
+    virtual void importantFunction() override
     {
         mock().actualCall("importantFunction").onObject(this);
     }
@@ -102,11 +102,11 @@ TEST(MockDocumentation, parameters)
 class MyTypeComparator : public MockNamedValueComparator
 {
 public:
-    virtual bool isEqual(const void* object1, const void* object2) _override
+    virtual bool isEqual(const void* object1, const void* object2) override
     {
         return object1 == object2;
     }
-    virtual SimpleString valueToString(const void* object) _override
+    virtual SimpleString valueToString(const void* object) override
     {
         return StringFrom(object);
     }
@@ -199,12 +199,12 @@ TEST(MockDocumentation, CInterface)
 
 TEST_GROUP(FooTestGroup)
 {
-    void setup() _override
+    void setup() override
     {
         // Init stuff
     }
 
-    void teardown() _override
+    void teardown() override
     {
         // Uninit stuff
     }
@@ -222,7 +222,7 @@ TEST(FooTestGroup, MoreFoo)
 
 TEST_GROUP(BarTestGroup)
 {
-    void setup() _override
+    void setup() override
     {
         // Init Bar
     }

diff --git a/examples/AllTests/MockPrinter.h b/examples/AllTests/MockPrinter.h
@@ -46,12 +46,12 @@ class MockPrinter : public Printer
     explicit MockPrinter() {}
     virtual ~MockPrinter() {}
 
-    virtual void Print(const char* s) _override
+    virtual void Print(const char* s) override
     {
         savedOutput.append(s);
     }
 
-    virtual void Print(long int value) _override
+    virtual void Print(long int value) override
     {
         SimpleString buffer;
         buffer = StringFromFormat("%ld", value);

diff --git a/examples/AllTests/PrinterTest.cpp b/examples/AllTests/PrinterTest.cpp
@@ -34,12 +34,12 @@ TEST_GROUP(Printer)
     Printer* printer;
     MockPrinter* mockPrinter;
 
-    void setup() _override
+    void setup() override
     {
         mockPrinter = new MockPrinter();
         printer = mockPrinter;
     }
-    void teardown() _override
+    void teardown() override
     {
         delete printer;
     }

diff --git a/include/CppUTest/CppUTestConfig.h b/include/CppUTest/CppUTestConfig.h
@@ -322,20 +322,18 @@ typedef struct cpputest_ulonglong cpputest_ulonglong;
 
 /* Visual C++ 10.0+ (2010+) supports the override keyword, but doesn't define the C++ version as C++11 */
 #if defined(__cplusplus) && ((__cplusplus >= 201103L) || (defined(_MSC_VER) && (_MSC_VER >= 1600)))
-#if !defined(__ghs__)
-#define CPPUTEST_COMPILER_FULLY_SUPPORTS_CXX11
-#define _override override
-#else
-/* GreenHills is not compatible with other compilers with regards to where
- * it expects the override specifier to be on methods that return function
- * pointers. Given this, it is easiest to not use the override specifier.
- */
-#define _override
-#endif
-#define NULLPTR nullptr
+  #if defined(__ghs__)
+    /* GreenHills is not compatible with other compilers with regards to where
+    * it expects the override specifier to be on methods that return function
+    * pointers. Given this, it is easiest to not use the override specifier.
+    */
+    #define override
+  #endif
 #else
-#define _override
-#define NULLPTR NULL
+  #define override
+  #ifndef nullptr
+    #define nullptr NULL
+  #endif
 #endif
 
 /* Visual C++ 11.0+ (2012+) supports the override keyword on destructors */

diff --git a/include/CppUTest/JUnitTestOutput.h b/include/CppUTest/JUnitTestOutput.h
@@ -40,20 +40,20 @@ class JUnitTestOutput: public TestOutput
     JUnitTestOutput();
     virtual ~JUnitTestOutput() _destructor_override;
 
-    virtual void printTestsStarted() _override;
-    virtual void printTestsEnded(const TestResult& result) _override;
-    virtual void printCurrentTestStarted(const UtestShell& test) _override;
-    virtual void printCurrentTestEnded(const TestResult& res) _override;
-    virtual void printCurrentGroupStarted(const UtestShell& test) _override;
-    virtual void printCurrentGroupEnded(const TestResult& res) _override;
+    virtual void printTestsStarted() override;
+    virtual void printTestsEnded(const TestResult& result) override;
+    virtual void printCurrentTestStarted(const UtestShell& test) override;
+    virtual void printCurrentTestEnded(const TestResult& res) override;
+    virtual void printCurrentGroupStarted(const UtestShell& test) override;
+    virtual void printCurrentGroupEnded(const TestResult& res) override;
 
-    virtual void printBuffer(const char*) _override;
-    virtual void print(const char*) _override;
-    virtual void print(long) _override;
-    virtual void print(size_t) _override;
-    virtual void printFailure(const TestFailure& failure) _override;
+    virtual void printBuffer(const char*) override;
+    virtual void print(const char*) override;
+    virtual void print(long) override;
+    virtual void print(size_t) override;
+    virtual void printFailure(const TestFailure& failure) override;
 
-    virtual void flush() _override;
+    virtual void flush() override;
 
     virtual SimpleString createFileName(const SimpleString& group);
     void setPackageName(const SimpleString &package);

diff --git a/include/CppUTest/MemoryLeakDetector.h b/include/CppUTest/MemoryLeakDetector.h
@@ -117,7 +117,7 @@ class MemoryLeakOutputStringBuffer
 struct MemoryLeakDetectorNode
 {
     MemoryLeakDetectorNode() :
-        size_(0), number_(0), memory_(NULLPTR), file_(NULLPTR), line_(0), allocator_(NULLPTR), period_(mem_leak_period_enabled), allocation_stage_(0), next_(NULLPTR)
+        size_(0), number_(0), memory_(nullptr), file_(nullptr), line_(0), allocator_(nullptr), period_(mem_leak_period_enabled), allocation_stage_(0), next_(nullptr)
     {
     }
 
@@ -140,7 +140,7 @@ struct MemoryLeakDetectorNode
 struct MemoryLeakDetectorList
 {
     MemoryLeakDetectorList() :
-        head_(NULLPTR)
+        head_(nullptr)
     {}
 
     void addNewNode(MemoryLeakDetectorNode* node);

diff --git a/include/CppUTest/MemoryLeakWarningPlugin.h b/include/CppUTest/MemoryLeakWarningPlugin.h
@@ -42,11 +42,11 @@ class MemoryLeakFailure;
 class MemoryLeakWarningPlugin: public TestPlugin
 {
 public:
-    MemoryLeakWarningPlugin(const SimpleString& name, MemoryLeakDetector* localDetector = NULLPTR);
+    MemoryLeakWarningPlugin(const SimpleString& name, MemoryLeakDetector* localDetector = nullptr);
     virtual ~MemoryLeakWarningPlugin() _destructor_override;
 
-    virtual void preTestAction(UtestShell& test, TestResult& result) _override;
-    virtual void postTestAction(UtestShell& test, TestResult& result) _override;
+    virtual void preTestAction(UtestShell& test, TestResult& result) override;
+    virtual void postTestAction(UtestShell& test, TestResult& result) override;
 
     virtual const char* FinalReport(size_t toBeDeletedLeaks = 0);
 

diff --git a/include/CppUTest/SimpleStringInternalCache.h b/include/CppUTest/SimpleStringInternalCache.h
@@ -81,14 +81,14 @@ class SimpleStringCacheAllocator : public TestMemoryAllocator
     SimpleStringCacheAllocator(SimpleStringInternalCache& cache, TestMemoryAllocator* previousAllocator);
     virtual ~SimpleStringCacheAllocator() _destructor_override;
 
-    virtual char* alloc_memory(size_t size, const char* file, size_t line) _override;
-    virtual void free_memory(char* memory, size_t size, const char* file, size_t line) _override;
+    virtual char* alloc_memory(size_t size, const char* file, size_t line) override;
+    virtual void free_memory(char* memory, size_t size, const char* file, size_t line) override;
 
-    virtual const char* name() const _override;
-    virtual const char* alloc_name() const _override;
-    virtual const char* free_name() const _override;
+    virtual const char* name() const override;
+    virtual const char* alloc_name() const override;
+    virtual const char* free_name() const override;
 
-    virtual TestMemoryAllocator* actualAllocator() _override;
+    virtual TestMemoryAllocator* actualAllocator() override;
     TestMemoryAllocator* originalAllocator();
 private:
     SimpleStringInternalCache& cache_;

diff --git a/include/CppUTest/TeamCityTestOutput.h b/include/CppUTest/TeamCityTestOutput.h
@@ -10,12 +10,12 @@ class TeamCityTestOutput: public ConsoleTestOutput
     TeamCityTestOutput(void);
     virtual ~TeamCityTestOutput(void) _destructor_override;
 
-    virtual void printCurrentTestStarted(const UtestShell& test) _override;
-    virtual void printCurrentTestEnded(const TestResult& res) _override;
-    virtual void printCurrentGroupStarted(const UtestShell& test) _override;
-    virtual void printCurrentGroupEnded(const TestResult& res) _override;
+    virtual void printCurrentTestStarted(const UtestShell& test) override;
+    virtual void printCurrentTestEnded(const TestResult& res) override;
+    virtual void printCurrentGroupStarted(const UtestShell& test) override;
+    virtual void printCurrentGroupEnded(const TestResult& res) override;
 
-    virtual void printFailure(const TestFailure& failure) _override;
+    virtual void printFailure(const TestFailure& failure) override;
 
 protected: