diff --git a/single_header/boost/fakeit.hpp b/single_header/boost/fakeit.hpp
index 1a270773..cbbcf359 100644
--- a/single_header/boost/fakeit.hpp
+++ b/single_header/boost/fakeit.hpp
@@ -2,7 +2,7 @@
 /*
  *  FakeIt - A Simplified C++ Mocking Framework
  *  Copyright (c) Eran Pe'er 2013
- *  Generated: 2021-04-11 20:16:42.931992
+ *  Generated: 2021-05-12 13:47:04.884568
  *  Distributed under the MIT License. Please refer to the LICENSE file at:
  *  https://github.com/eranpeer/FakeIt
  */
@@ -5275,11 +5275,9 @@ namespace fakeit {
     class VTUtils {
     public:
 
-#ifdef __GNUG__
-#ifndef __clang__
+#if defined(__GNUG__) && !defined(__clang__) && __GNUC__ >= 8
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wcast-function-type"
-#endif
 #endif
         template<typename C, typename R, typename ... arglist>
         static unsigned int getOffset(R (C::*vMethod)(arglist...)) {
@@ -5287,10 +5285,8 @@ namespace fakeit {
             VirtualOffsetSelector offsetSelctor;
             return (offsetSelctor.*sMethod)(0);
         }
-#ifdef __GNUG__
-#ifndef __clang__
+#if defined(__GNUG__) && !defined(__clang__) && __GNUC__ >= 8
 #pragma GCC diagnostic pop
-#endif
 #endif
 
         template<typename C>
@@ -6997,7 +6993,7 @@ namespace fakeit {
     template<int q>
     struct Times : public Quantity {
 
-        Times<q>() : Quantity(q) { }
+        Times() : Quantity(q) { }
 
         template<typename R>
         static Quantifier<R> of(const R &value) {
diff --git a/single_header/catch/fakeit.hpp b/single_header/catch/fakeit.hpp
index fb3014bc..e5e13c47 100644
--- a/single_header/catch/fakeit.hpp
+++ b/single_header/catch/fakeit.hpp
@@ -2,7 +2,7 @@
 /*
  *  FakeIt - A Simplified C++ Mocking Framework
  *  Copyright (c) Eran Pe'er 2013
- *  Generated: 2021-04-11 20:16:43.013491
+ *  Generated: 2021-05-12 13:47:04.979584
  *  Distributed under the MIT License. Please refer to the LICENSE file at:
  *  https://github.com/eranpeer/FakeIt
  */
@@ -5349,11 +5349,9 @@ namespace fakeit {
     class VTUtils {
     public:
 
-#ifdef __GNUG__
-#ifndef __clang__
+#if defined(__GNUG__) && !defined(__clang__) && __GNUC__ >= 8
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wcast-function-type"
-#endif
 #endif
         template<typename C, typename R, typename ... arglist>
         static unsigned int getOffset(R (C::*vMethod)(arglist...)) {
@@ -5361,10 +5359,8 @@ namespace fakeit {
             VirtualOffsetSelector offsetSelctor;
             return (offsetSelctor.*sMethod)(0);
         }
-#ifdef __GNUG__
-#ifndef __clang__
+#if defined(__GNUG__) && !defined(__clang__) && __GNUC__ >= 8
 #pragma GCC diagnostic pop
-#endif
 #endif
 
         template<typename C>
@@ -7071,7 +7067,7 @@ namespace fakeit {
     template<int q>
     struct Times : public Quantity {
 
-        Times<q>() : Quantity(q) { }
+        Times() : Quantity(q) { }
 
         template<typename R>
         static Quantifier<R> of(const R &value) {
diff --git a/single_header/cute/fakeit.hpp b/single_header/cute/fakeit.hpp
index 676cb4da..a274f6af 100644
--- a/single_header/cute/fakeit.hpp
+++ b/single_header/cute/fakeit.hpp
@@ -2,7 +2,7 @@
 /*
  *  FakeIt - A Simplified C++ Mocking Framework
  *  Copyright (c) Eran Pe'er 2013
- *  Generated: 2021-04-11 20:16:43.092492
+ *  Generated: 2021-05-12 13:47:05.100105
  *  Distributed under the MIT License. Please refer to the LICENSE file at:
  *  https://github.com/eranpeer/FakeIt
  */
@@ -5240,11 +5240,9 @@ namespace fakeit {
     class VTUtils {
     public:
 
-#ifdef __GNUG__
-#ifndef __clang__
+#if defined(__GNUG__) && !defined(__clang__) && __GNUC__ >= 8
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wcast-function-type"
-#endif
 #endif
         template<typename C, typename R, typename ... arglist>
         static unsigned int getOffset(R (C::*vMethod)(arglist...)) {
@@ -5252,10 +5250,8 @@ namespace fakeit {
             VirtualOffsetSelector offsetSelctor;
             return (offsetSelctor.*sMethod)(0);
         }
-#ifdef __GNUG__
-#ifndef __clang__
+#if defined(__GNUG__) && !defined(__clang__) && __GNUC__ >= 8
 #pragma GCC diagnostic pop
-#endif
 #endif
 
         template<typename C>
@@ -6962,7 +6958,7 @@ namespace fakeit {
     template<int q>
     struct Times : public Quantity {
 
-        Times<q>() : Quantity(q) { }
+        Times() : Quantity(q) { }
 
         template<typename R>
         static Quantifier<R> of(const R &value) {
diff --git a/single_header/gtest/fakeit.hpp b/single_header/gtest/fakeit.hpp
index 3bc345f8..a23a4da6 100644
--- a/single_header/gtest/fakeit.hpp
+++ b/single_header/gtest/fakeit.hpp
@@ -2,7 +2,7 @@
 /*
  *  FakeIt - A Simplified C++ Mocking Framework
  *  Copyright (c) Eran Pe'er 2013
- *  Generated: 2021-04-11 20:16:43.193991
+ *  Generated: 2021-05-12 13:47:05.218626
  *  Distributed under the MIT License. Please refer to the LICENSE file at:
  *  https://github.com/eranpeer/FakeIt
  */
@@ -5240,11 +5240,9 @@ namespace fakeit {
     class VTUtils {
     public:
 
-#ifdef __GNUG__
-#ifndef __clang__
+#if defined(__GNUG__) && !defined(__clang__) && __GNUC__ >= 8
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wcast-function-type"
-#endif
 #endif
         template<typename C, typename R, typename ... arglist>
         static unsigned int getOffset(R (C::*vMethod)(arglist...)) {
@@ -5252,10 +5250,8 @@ namespace fakeit {
             VirtualOffsetSelector offsetSelctor;
             return (offsetSelctor.*sMethod)(0);
         }
-#ifdef __GNUG__
-#ifndef __clang__
+#if defined(__GNUG__) && !defined(__clang__) && __GNUC__ >= 8
 #pragma GCC diagnostic pop
-#endif
 #endif
 
         template<typename C>
@@ -6962,7 +6958,7 @@ namespace fakeit {
     template<int q>
     struct Times : public Quantity {
 
-        Times<q>() : Quantity(q) { }
+        Times() : Quantity(q) { }
 
         template<typename R>
         static Quantifier<R> of(const R &value) {
diff --git a/single_header/mettle/fakeit.hpp b/single_header/mettle/fakeit.hpp
index 906ae445..91ae79cb 100644
--- a/single_header/mettle/fakeit.hpp
+++ b/single_header/mettle/fakeit.hpp
@@ -2,7 +2,7 @@
 /*
  *  FakeIt - A Simplified C++ Mocking Framework
  *  Copyright (c) Eran Pe'er 2013
- *  Generated: 2021-04-11 20:16:43.271493
+ *  Generated: 2021-05-12 13:47:05.328644
  *  Distributed under the MIT License. Please refer to the LICENSE file at:
  *  https://github.com/eranpeer/FakeIt
  */
@@ -5262,11 +5262,9 @@ namespace fakeit {
     class VTUtils {
     public:
 
-#ifdef __GNUG__
-#ifndef __clang__
+#if defined(__GNUG__) && !defined(__clang__) && __GNUC__ >= 8
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wcast-function-type"
-#endif
 #endif
         template<typename C, typename R, typename ... arglist>
         static unsigned int getOffset(R (C::*vMethod)(arglist...)) {
@@ -5274,10 +5272,8 @@ namespace fakeit {
             VirtualOffsetSelector offsetSelctor;
             return (offsetSelctor.*sMethod)(0);
         }
-#ifdef __GNUG__
-#ifndef __clang__
+#if defined(__GNUG__) && !defined(__clang__) && __GNUC__ >= 8
 #pragma GCC diagnostic pop
-#endif
 #endif
 
         template<typename C>
@@ -6984,7 +6980,7 @@ namespace fakeit {
     template<int q>
     struct Times : public Quantity {
 
-        Times<q>() : Quantity(q) { }
+        Times() : Quantity(q) { }
 
         template<typename R>
         static Quantifier<R> of(const R &value) {
diff --git a/single_header/mstest/fakeit.hpp b/single_header/mstest/fakeit.hpp
index 92244da0..7ab4d1a0 100644
--- a/single_header/mstest/fakeit.hpp
+++ b/single_header/mstest/fakeit.hpp
@@ -2,7 +2,7 @@
 /*
  *  FakeIt - A Simplified C++ Mocking Framework
  *  Copyright (c) Eran Pe'er 2013
- *  Generated: 2021-04-11 20:16:43.349491
+ *  Generated: 2021-05-12 13:47:05.433663
  *  Distributed under the MIT License. Please refer to the LICENSE file at:
  *  https://github.com/eranpeer/FakeIt
  */
@@ -5264,11 +5264,9 @@ namespace fakeit {
     class VTUtils {
     public:
 
-#ifdef __GNUG__
-#ifndef __clang__
+#if defined(__GNUG__) && !defined(__clang__) && __GNUC__ >= 8
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wcast-function-type"
-#endif
 #endif
         template<typename C, typename R, typename ... arglist>
         static unsigned int getOffset(R (C::*vMethod)(arglist...)) {
@@ -5276,10 +5274,8 @@ namespace fakeit {
             VirtualOffsetSelector offsetSelctor;
             return (offsetSelctor.*sMethod)(0);
         }
-#ifdef __GNUG__
-#ifndef __clang__
+#if defined(__GNUG__) && !defined(__clang__) && __GNUC__ >= 8
 #pragma GCC diagnostic pop
-#endif
 #endif
 
         template<typename C>
@@ -6986,7 +6982,7 @@ namespace fakeit {
     template<int q>
     struct Times : public Quantity {
 
-        Times<q>() : Quantity(q) { }
+        Times() : Quantity(q) { }
 
         template<typename R>
         static Quantifier<R> of(const R &value) {
diff --git a/single_header/nunit/fakeit.hpp b/single_header/nunit/fakeit.hpp
index 413efae9..c3cf6144 100644
--- a/single_header/nunit/fakeit.hpp
+++ b/single_header/nunit/fakeit.hpp
@@ -2,7 +2,7 @@
 /*
  *  FakeIt - A Simplified C++ Mocking Framework
  *  Copyright (c) Eran Pe'er 2013
- *  Generated: 2021-04-11 20:16:43.427492
+ *  Generated: 2021-05-12 13:47:05.538682
  *  Distributed under the MIT License. Please refer to the LICENSE file at:
  *  https://github.com/eranpeer/FakeIt
  */
@@ -5247,11 +5247,9 @@ namespace fakeit {
     class VTUtils {
     public:
 
-#ifdef __GNUG__
-#ifndef __clang__
+#if defined(__GNUG__) && !defined(__clang__) && __GNUC__ >= 8
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wcast-function-type"
-#endif
 #endif
         template<typename C, typename R, typename ... arglist>
         static unsigned int getOffset(R (C::*vMethod)(arglist...)) {
@@ -5259,10 +5257,8 @@ namespace fakeit {
             VirtualOffsetSelector offsetSelctor;
             return (offsetSelctor.*sMethod)(0);
         }
-#ifdef __GNUG__
-#ifndef __clang__
+#if defined(__GNUG__) && !defined(__clang__) && __GNUC__ >= 8
 #pragma GCC diagnostic pop
-#endif
 #endif
 
         template<typename C>
@@ -6969,7 +6965,7 @@ namespace fakeit {
     template<int q>
     struct Times : public Quantity {
 
-        Times<q>() : Quantity(q) { }
+        Times() : Quantity(q) { }
 
         template<typename R>
         static Quantifier<R> of(const R &value) {
diff --git a/single_header/qtest/fakeit.hpp b/single_header/qtest/fakeit.hpp
index 7c7c3e56..308ee5b0 100644
--- a/single_header/qtest/fakeit.hpp
+++ b/single_header/qtest/fakeit.hpp
@@ -2,7 +2,7 @@
 /*
  *  FakeIt - A Simplified C++ Mocking Framework
  *  Copyright (c) Eran Pe'er 2013
- *  Generated: 2021-04-11 20:16:43.506491
+ *  Generated: 2021-05-12 13:47:05.632198
  *  Distributed under the MIT License. Please refer to the LICENSE file at:
  *  https://github.com/eranpeer/FakeIt
  */
@@ -5248,11 +5248,9 @@ namespace fakeit {
     class VTUtils {
     public:
 
-#ifdef __GNUG__
-#ifndef __clang__
+#if defined(__GNUG__) && !defined(__clang__) && __GNUC__ >= 8
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wcast-function-type"
-#endif
 #endif
         template<typename C, typename R, typename ... arglist>
         static unsigned int getOffset(R (C::*vMethod)(arglist...)) {
@@ -5260,10 +5258,8 @@ namespace fakeit {
             VirtualOffsetSelector offsetSelctor;
             return (offsetSelctor.*sMethod)(0);
         }
-#ifdef __GNUG__
-#ifndef __clang__
+#if defined(__GNUG__) && !defined(__clang__) && __GNUC__ >= 8
 #pragma GCC diagnostic pop
-#endif
 #endif
 
         template<typename C>
@@ -6970,7 +6966,7 @@ namespace fakeit {
     template<int q>
     struct Times : public Quantity {
 
-        Times<q>() : Quantity(q) { }
+        Times() : Quantity(q) { }
 
         template<typename R>
         static Quantifier<R> of(const R &value) {
diff --git a/single_header/standalone/fakeit.hpp b/single_header/standalone/fakeit.hpp
index 148f741b..9f20d23a 100644
--- a/single_header/standalone/fakeit.hpp
+++ b/single_header/standalone/fakeit.hpp
@@ -2,7 +2,7 @@
 /*
  *  FakeIt - A Simplified C++ Mocking Framework
  *  Copyright (c) Eran Pe'er 2013
- *  Generated: 2021-04-11 20:16:43.585492
+ *  Generated: 2021-05-12 13:47:05.726214
  *  Distributed under the MIT License. Please refer to the LICENSE file at:
  *  https://github.com/eranpeer/FakeIt
  */
@@ -5316,11 +5316,9 @@ namespace fakeit {
     class VTUtils {
     public:
 
-#ifdef __GNUG__
-#ifndef __clang__
+#if defined(__GNUG__) && !defined(__clang__) && __GNUC__ >= 8
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wcast-function-type"
-#endif
 #endif
         template<typename C, typename R, typename ... arglist>
         static unsigned int getOffset(R (C::*vMethod)(arglist...)) {
@@ -5328,10 +5326,8 @@ namespace fakeit {
             VirtualOffsetSelector offsetSelctor;
             return (offsetSelctor.*sMethod)(0);
         }
-#ifdef __GNUG__
-#ifndef __clang__
+#if defined(__GNUG__) && !defined(__clang__) && __GNUC__ >= 8
 #pragma GCC diagnostic pop
-#endif
 #endif
 
         template<typename C>
@@ -7038,7 +7034,7 @@ namespace fakeit {
     template<int q>
     struct Times : public Quantity {
 
-        Times<q>() : Quantity(q) { }
+        Times() : Quantity(q) { }
 
         template<typename R>
         static Quantifier<R> of(const R &value) {
diff --git a/single_header/tpunit/fakeit.hpp b/single_header/tpunit/fakeit.hpp
index 7e2b2152..f0fa5b8f 100644
--- a/single_header/tpunit/fakeit.hpp
+++ b/single_header/tpunit/fakeit.hpp
@@ -2,7 +2,7 @@
 /*
  *  FakeIt - A Simplified C++ Mocking Framework
  *  Copyright (c) Eran Pe'er 2013
- *  Generated: 2021-04-11 20:16:43.663991
+ *  Generated: 2021-05-12 13:47:05.821231
  *  Distributed under the MIT License. Please refer to the LICENSE file at:
  *  https://github.com/eranpeer/FakeIt
  */
@@ -5287,11 +5287,9 @@ namespace fakeit {
     class VTUtils {
     public:
 
-#ifdef __GNUG__
-#ifndef __clang__
+#if defined(__GNUG__) && !defined(__clang__) && __GNUC__ >= 8
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wcast-function-type"
-#endif
 #endif
         template<typename C, typename R, typename ... arglist>
         static unsigned int getOffset(R (C::*vMethod)(arglist...)) {
@@ -5299,10 +5297,8 @@ namespace fakeit {
             VirtualOffsetSelector offsetSelctor;
             return (offsetSelctor.*sMethod)(0);
         }
-#ifdef __GNUG__
-#ifndef __clang__
+#if defined(__GNUG__) && !defined(__clang__) && __GNUC__ >= 8
 #pragma GCC diagnostic pop
-#endif
 #endif
 
         template<typename C>
@@ -7009,7 +7005,7 @@ namespace fakeit {
     template<int q>
     struct Times : public Quantity {
 
-        Times<q>() : Quantity(q) { }
+        Times() : Quantity(q) { }
 
         template<typename R>
         static Quantifier<R> of(const R &value) {