work around GCC 4.8 compiler errors with objects used in dinit()

danmar · Aug 2, 2023 · ab88131 · ab88131
1 parent baccbc6
commit ab88131
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 3 deletions.
diff --git a/test/helpers.h b/test/helpers.h
@@ -106,4 +106,17 @@ class PreprocessorHelper
 #define dinit(T, ...) \
     ([&] { T ${}; __VA_ARGS__; return $; }())
 
+#if (defined(__GNUC__) && (__GNUC__ >= 5)) || defined(__clang__)
+// work around Clang compilation error
+// error: default member initializer for 'y' needed within definition of enclosing class 'X' outside of member functions
+// work around GCC compilation error
+// error: default member initializer for ‘x::y::z’ required before the end of its enclosing class
+// see https://stackoverflow.com/questions/53408962
+#define DINIT_NOEXCEPT noexcept
+#else
+// work around GCC 4.8 compilation error
+// error: function 'x()' defaulted on its first declaration with an exception-specification that differs from the implicit declaration 'x()'
+#define DINIT_NOEXCEPT
+#endif
+
 #endif // helpersH
diff --git a/test/testprocessexecutor.cpp b/test/testprocessexecutor.cpp
@@ -48,7 +48,7 @@ class TestProcessExecutor : public TestFixture {
 
     struct CheckOptions
     {
-        CheckOptions() noexcept = default;
+        CheckOptions() DINIT_NOEXCEPT = default;
         SHOWTIME_MODES showtime = SHOWTIME_MODES::SHOWTIME_NONE;
         const char* plistOutput = nullptr;
         std::vector<std::string> filesList;

diff --git a/test/testsingleexecutor.cpp b/test/testsingleexecutor.cpp
@@ -63,7 +63,7 @@ class TestSingleExecutorBase : public TestFixture {
 
     struct CheckOptions
     {
-        CheckOptions() noexcept = default;
+        CheckOptions() DINIT_NOEXCEPT = default;
         SHOWTIME_MODES showtime = SHOWTIME_MODES::SHOWTIME_NONE;
         const char* plistOutput = nullptr;
         std::vector<std::string> filesList;

diff --git a/test/testthreadexecutor.cpp b/test/testthreadexecutor.cpp
@@ -48,7 +48,7 @@ class TestThreadExecutor : public TestFixture {
 
     struct CheckOptions
     {
-        CheckOptions() noexcept = default;
+        CheckOptions() DINIT_NOEXCEPT = default;
         SHOWTIME_MODES showtime = SHOWTIME_MODES::SHOWTIME_NONE;
         const char* plistOutput = nullptr;
         std::vector<std::string> filesList;