Merge pull request #358 from eranpeer/fix-msvc-apple-clang-errors

Fix some warnings on some compilers.

Author: FranckRJ

.github/workflows/ci_linux_clang.yml

@@ -81,6 +81,13 @@ jobs:
             cc: "clang-18", cxx: "clang++-18",
             cxx_standard: 23
           }
+          - {
+            name: "Ubuntu 24.04 Clang 18 C++26",
+            os: ubuntu-24.04,
+            build_type: Debug,
+            cc: "clang-18", cxx: "clang++-18",
+            cxx_standard: 26
+          }
           - {
             name: "Ubuntu 24.04 Clang with sanitizers",
             os: ubuntu-24.04,

.github/workflows/ci_linux_gcc.yml

@@ -75,6 +75,13 @@ jobs:
             cc: "gcc-14", cxx: "g++-14",
             cxx_standard: 23
           }
+          - {
+            name: "Ubuntu 24.04 GCC 14 C++26",
+            os: ubuntu-24.04,
+            build_type: Debug,
+            cc: "gcc-14", cxx: "g++-14",
+            cxx_standard: 26
+          }
           - {
             name: "Ubuntu 24.04 GCC with sanitizers",
             os: ubuntu-24.04,

.github/workflows/ci_macos_appleclang.yml

@@ -17,35 +17,53 @@ jobs:
       matrix:
         config:
           - {
-            name: "macOS 15 AppleClang 15 C++11",
+            name: "macOS 14 AppleClang 15 C++11",
+            os: macos-14,
+            build_type: Debug,
+            cxx_standard: 11
+          }
+          - {
+            name: "macOS 14 AppleClang 15 C++20",
+            os: macos-14,
+            build_type: Debug,
+            cxx_standard: 20
+          }
+          - {
+            name: "macOS 15 AppleClang 17 C++11",
             os: macos-15,
             build_type: Debug,
             cxx_standard: 11
           }
           - {
-            name: "macOS 15 AppleClang 15 C++14",
+            name: "macOS 15 AppleClang 17 C++14",
             os: macos-15,
             build_type: Debug,
             cxx_standard: 14
           }
           - {
-            name: "macOS 15 AppleClang 15 C++17",
+            name: "macOS 15 AppleClang 17 C++17",
             os: macos-15,
             build_type: Debug,
             cxx_standard: 17
           }
           - {
-            name: "macOS 15 AppleClang 15 C++20",
+            name: "macOS 15 AppleClang 17 C++20",
             os: macos-15,
             build_type: Debug,
             cxx_standard: 20
           }
           - {
-            name: "macOS 15 AppleClang 15 C++23",
+            name: "macOS 15 AppleClang 17 C++23",
             os: macos-15,
             build_type: Debug,
             cxx_standard: 23
           }
+          - {
+            name: "macOS 15 AppleClang 17 C++26",
+            os: macos-15,
+            build_type: Debug,
+            cxx_standard: 26
+          }
           - {
             name: "macOS 15 AppleClang with sanitizers",
             os: macos-15,

.github/workflows/ci_windows_msvc.yml

@@ -110,6 +110,22 @@ jobs:
             architecture: "x64",
             cxx_standard: 23
           }
+          - {
+            name: "Windows 2025 MSVC 2022 Win32 C++26",
+            os: windows-2025,
+            build_type: Debug,
+            generator: "Visual Studio 17 2022",
+            architecture: "Win32",
+            cxx_standard: 26
+          }
+          - {
+            name: "Windows 2025 MSVC 2022 x64 C++26",
+            os: windows-2025,
+            build_type: Debug,
+            generator: "Visual Studio 17 2022",
+            architecture: "x64",
+            cxx_standard: 26
+          }
     steps:
       - uses: actions/checkout@v3
       - name: Build project

include/fakeit/EventFormatter.hpp

@@ -17,6 +17,8 @@ namespace fakeit {
 
     struct EventFormatter {
 
+        virtual ~EventFormatter() = default;
+
         virtual std::string format(const fakeit::UnexpectedMethodCallEvent &e) = 0;
 
         virtual std::string format(const fakeit::SequenceVerificationEvent &e) = 0;

include/fakeit/EventHandler.hpp

@@ -12,6 +12,8 @@
 namespace fakeit {
 
     struct VerificationEventHandler {
+        virtual ~VerificationEventHandler() = default;
+
         virtual void handle(const SequenceVerificationEvent &e) = 0;
 
         virtual void handle(const NoMoreInvocationsVerificationEvent &e) = 0;

include/fakeit/SequenceVerificationProgress.hpp

@@ -62,7 +62,7 @@ namespace fakeit {
 
     public:
 
-        ~SequenceVerificationProgress() FAKEIT_THROWS { };
+        virtual ~SequenceVerificationProgress() FAKEIT_THROWS = default;
 
         operator bool() const {
             return Terminator(_expectationPtr);

include/fakeit/Xaction.hpp

@@ -11,6 +11,8 @@
 namespace fakeit {
 
     struct Xaction {
+        virtual ~Xaction() = default;
+
         virtual void commit() = 0;
     };
 }

include/mockutils/MethodProxyCreator.hpp

@@ -11,6 +11,8 @@ namespace fakeit {
     struct InvocationHandlerCollection {
         static const unsigned int VtCookieIndex = 0;
 
+        virtual ~InvocationHandlerCollection() = default;
+
         virtual Destructible *getInvocatoinHandlerPtrById(unsigned int index) = 0;
 
         static InvocationHandlerCollection *getInvocationHandlerCollection(void *instance) {

include/mockutils/VTUtils.hpp

@@ -26,6 +26,9 @@ namespace fakeit {
 #if defined(__GNUG__) && !defined(__clang__) && __GNUC__ >= 8
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wcast-function-type"
+#elif defined(__clang__) && ((defined(__apple_build_version__) && __clang_major__ >= 17) || (!defined(__apple_build_version__) && __clang_major__ >= 19))
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wcast-function-type-mismatch"
 #endif
         template<typename C, typename R, typename ... arglist>
         static unsigned int getOffset(R (C::*vMethod)(arglist...)) {
@@ -35,6 +38,8 @@ namespace fakeit {
         }
 #if defined(__GNUG__) && !defined(__clang__) && __GNUC__ >= 8
 #pragma GCC diagnostic pop
+#elif defined(__clang__) && ((defined(__apple_build_version__) && __clang_major__ >= 17) || (!defined(__apple_build_version__) && __clang_major__ >= 19))
+#pragma clang diagnostic pop
 #endif
 
         template<typename C>