Merge pull request cpputest#1137 from jgonzalezdr/fixClangErrors2

Fix clang 5.0.0 errors

Author: basvodde

appveyor.yml

@@ -24,6 +24,10 @@ environment:
     PlatformToolset: v90
   - Platform: Win32
     PlatformToolset: v100
+  - Platform: Win32
+    PlatformToolset: v110
+  - Platform: Win32
+    PlatformToolset: v120
   - Platform: Win32
     PlatformToolset: v140
   - Platform: x64

include/CppUTest/CommandLineArguments.h

@@ -37,7 +37,7 @@ class TestPlugin;
 class CommandLineArguments
 {
 public:
-    explicit CommandLineArguments(int ac, const char** av);
+    explicit CommandLineArguments(int ac, const char *const *av);
     virtual ~CommandLineArguments();
 
     bool parse(TestPlugin* plugin);
@@ -63,7 +63,7 @@ class CommandLineArguments
         OUTPUT_ECLIPSE, OUTPUT_JUNIT, OUTPUT_TEAMCITY
     };
     int ac_;
-    const char** av_;
+    const char *const *av_;
 
     bool verbose_;
     bool color_;
@@ -77,19 +77,19 @@ class CommandLineArguments
     OutputType outputType_;
     SimpleString packageName_;
 
-    SimpleString getParameterField(int ac, const char** av, int& i, const SimpleString& parameterName);
-    void SetRepeatCount(int ac, const char** av, int& index);
-    void AddGroupFilter(int ac, const char** av, int& index);
-    void AddStrictGroupFilter(int ac, const char** av, int& index);
-    void AddExcludeGroupFilter(int ac, const char** av, int& index);
-    void AddExcludeStrictGroupFilter(int ac, const char** av, int& index);
-    void AddNameFilter(int ac, const char** av, int& index);
-    void AddStrictNameFilter(int ac, const char** av, int& index);
-    void AddExcludeNameFilter(int ac, const char** av, int& index);
-    void AddExcludeStrictNameFilter(int ac, const char** av, int& index);
-    void AddTestToRunBasedOnVerboseOutput(int ac, const char** av, int& index, const char* parameterName);
-    bool SetOutputType(int ac, const char** av, int& index);
-    void SetPackageName(int ac, const char** av, int& index);
+    SimpleString getParameterField(int ac, const char *const *av, int& i, const SimpleString& parameterName);
+    void SetRepeatCount(int ac, const char *const *av, int& index);
+    void AddGroupFilter(int ac, const char *const *av, int& index);
+    void AddStrictGroupFilter(int ac, const char *const *av, int& index);
+    void AddExcludeGroupFilter(int ac, const char *const *av, int& index);
+    void AddExcludeStrictGroupFilter(int ac, const char *const *av, int& index);
+    void AddNameFilter(int ac, const char *const *av, int& index);
+    void AddStrictNameFilter(int ac, const char *const *av, int& index);
+    void AddExcludeNameFilter(int ac, const char *const *av, int& index);
+    void AddExcludeStrictNameFilter(int ac, const char *const *av, int& index);
+    void AddTestToRunBasedOnVerboseOutput(int ac, const char *const *av, int& index, const char* parameterName);
+    bool SetOutputType(int ac, const char *const *av, int& index);
+    void SetPackageName(int ac, const char *const *av, int& index);
 
     CommandLineArguments(const CommandLineArguments&);
     CommandLineArguments& operator=(const CommandLineArguments&);

include/CppUTest/CommandLineTestRunner.h

@@ -41,10 +41,10 @@ class TestRegistry;
 class CommandLineTestRunner
 {
 public:
-    static int RunAllTests(int ac, const char** av);
+    static int RunAllTests(int ac, const char *const *av);
     static int RunAllTests(int ac, char** av);
 
-    CommandLineTestRunner(int ac, const char** av, TestRegistry* registry);
+    CommandLineTestRunner(int ac, const char *const *av, TestRegistry* registry);
     virtual ~CommandLineTestRunner();
 
     int runAllTestsMain();

include/CppUTest/CppUTestConfig.h

@@ -267,8 +267,17 @@ typedef struct cpputest_ulonglong cpputest_ulonglong;
 #if defined(__cplusplus) && ((__cplusplus >= 201103L) || (defined(_MSC_VER) && (_MSC_VER >= 1600)))
 #define CPPUTEST_COMPILER_FULLY_SUPPORTS_CXX11
 #define _override override
+#define NULLPTR nullptr
 #else
 #define _override
+#define NULLPTR NULL
+#endif
+
+/* Visual C++ 11.0+ (2012+) supports the override keyword on destructors */
+#if defined(__cplusplus) && ((__cplusplus >= 201103L) || (defined(_MSC_VER) && (_MSC_VER >= 1700)))
+#define _destructor_override override
+#else
+#define _destructor_override
 #endif
 
 /* MinGW-w64 prefers to act like Visual C++, but we want the ANSI behaviors instead */
@@ -279,4 +288,5 @@ typedef struct cpputest_ulonglong cpputest_ulonglong;
  #pragma clang diagnostic pop
 #endif
 
+
 #endif

include/CppUTest/JUnitTestOutput.h

@@ -38,7 +38,7 @@ class JUnitTestOutput: public TestOutput
 {
 public:
     JUnitTestOutput();
-    virtual ~JUnitTestOutput();
+    virtual ~JUnitTestOutput() _destructor_override;
 
     virtual void printTestsStarted() _override;
     virtual void printTestsEnded(const TestResult& result) _override;

include/CppUTest/MemoryLeakDetector.h

@@ -117,7 +117,7 @@ class MemoryLeakOutputStringBuffer
 struct MemoryLeakDetectorNode
 {
     MemoryLeakDetectorNode() :
-        size_(0), number_(0), memory_(0), file_(0), line_(0), allocator_(0), period_(mem_leak_period_enabled), next_(0)
+        size_(0), number_(0), memory_(NULLPTR), file_(NULLPTR), line_(0), allocator_(NULLPTR), period_(mem_leak_period_enabled), next_(NULLPTR)
     {
     }
 
@@ -139,7 +139,7 @@ struct MemoryLeakDetectorNode
 struct MemoryLeakDetectorList
 {
     MemoryLeakDetectorList() :
-        head_(0)
+        head_(NULLPTR)
     {}
 
     void addNewNode(MemoryLeakDetectorNode* node);

include/CppUTest/MemoryLeakWarningPlugin.h

@@ -42,8 +42,8 @@ class MemoryLeakFailure;
 class MemoryLeakWarningPlugin: public TestPlugin
 {
 public:
-    MemoryLeakWarningPlugin(const SimpleString& name, MemoryLeakDetector* localDetector = 0);
-    virtual ~MemoryLeakWarningPlugin();
+    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;

include/CppUTest/SimpleString.h

@@ -97,7 +97,7 @@ class SimpleString
     static size_t StrLen(const char*);
     static int StrNCmp(const char* s1, const char* s2, size_t n);
     static char* StrNCpy(char* s1, const char* s2, size_t n);
-    static char* StrStr(const char* s1, const char* s2);
+    static const char* StrStr(const char* s1, const char* s2);
     static char ToLower(char ch);
     static int MemCmp(const void* s1, const void *s2, size_t n);
     static char* allocStringBuffer(size_t size, const char* file, int line);

include/CppUTest/TeamCityTestOutput.h

@@ -8,7 +8,7 @@ class TeamCityTestOutput: public ConsoleTestOutput
 {
 public:
     TeamCityTestOutput(void);
-    virtual ~TeamCityTestOutput(void);
+    virtual ~TeamCityTestOutput(void) _destructor_override;
 
     virtual void printCurrentTestStarted(const UtestShell& test) _override;
     virtual void printCurrentTestEnded(const TestResult& res) _override;

include/CppUTest/TestMemoryAllocator.h

@@ -56,9 +56,9 @@ class TestMemoryAllocator
     virtual char* alloc_memory(size_t size, const char* file, int line);
     virtual void free_memory(char* memory, const char* file, int line);
 
-    virtual const char* name();
-    virtual const char* alloc_name();
-    virtual const char* free_name();
+    virtual const char* name() const;
+    virtual const char* alloc_name() const;
+    virtual const char* free_name() const;
 
     virtual bool isOfEqualType(TestMemoryAllocator* allocator);