Try to fix name mangling issues with GCC and static call operators

Author: trueqbit

tests/CMakeLists.txt

@@ -55,10 +55,7 @@ if(SQLITE_ORM_OMITS_CODECVT)
     target_compile_definitions(unit_tests PRIVATE SQLITE_ORM_OMITS_CODECVT=1)
 endif()
 
-if(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
-    # GCC would complain about name mangling errors (with type traits for locally defined lambdas) if the ABI version is not set to 0
-    add_compile_options(-fabi-version=0)
-elseif(MSVC)
+if(MSVC)
     target_compile_options(unit_tests PUBLIC
         # multi-processor compilation
         /MP

tests/static_tests/function_static_tests.cpp

@@ -315,29 +315,30 @@ TEST_CASE("function static") {
             }
 #endif
         };
+#ifdef SQLITE_ORM_STATIC_CALL_OPERATOR_SUPPORTED
+        constexpr auto lambda_static = [](unsigned long errcode) static {
+            return errcode != 0;
+        };
+#endif
 
         SECTION("detect overloaded call operator") {
-            constexpr auto lambda = [](unsigned long errcode) {
-                return errcode != 0;
-            };
+            constexpr auto lambda = [](unsigned long) {};
             using lambda_type = std::remove_const_t<decltype(lambda)>;
 
             STATIC_REQUIRE(
-                polyfill::is_detected_v<internal::overloaded_callop_t, bool(unsigned long) const, lambda_type>);
+                polyfill::is_detected_v<internal::overloaded_callop_t, void(unsigned long) const, lambda_type>);
             STATIC_REQUIRE_FALSE(
-                polyfill::is_detected_v<internal::overloaded_static_callop_t, bool(unsigned long) const, lambda_type>);
+                polyfill::is_detected_v<internal::overloaded_static_callop_t, void(unsigned long) const, lambda_type>);
         }
 #ifdef SQLITE_ORM_STATIC_CALL_OPERATOR_SUPPORTED
         SECTION("detect overloaded static call operator") {
-            constexpr auto lambda = [](unsigned long errcode) static {
-                return errcode != 0;
-            };
-            using lambda_type = std::remove_const_t<decltype(lambda)>;
+            constexpr auto lambda_static = [](unsigned long) static {};
+            using lambda_type = std::remove_const_t<decltype(lambda_static)>;
 
             STATIC_REQUIRE_FALSE(
-                polyfill::is_detected_v<internal::overloaded_callop_t, bool(unsigned long), lambda_type>);
+                polyfill::is_detected_v<internal::overloaded_callop_t, void(unsigned long), lambda_type>);
             STATIC_REQUIRE(
-                polyfill::is_detected_v<internal::overloaded_static_callop_t, bool(unsigned long), lambda_type>);
+                polyfill::is_detected_v<internal::overloaded_static_callop_t, void(unsigned long), lambda_type>);
         }
 #endif
         SECTION("freestanding function") {
@@ -424,11 +425,11 @@ TEST_CASE("function static") {
         }
 #ifdef SQLITE_ORM_STATIC_CALL_OPERATOR_SUPPORTED
         SECTION("static lambda") {
-            constexpr auto lambda = [](unsigned long errcode) static {
+            constexpr auto lambda_static = [](unsigned long errcode) static {
                 return errcode != 0;
             };
-            using lambda_type = std::remove_const_t<decltype(lambda)>;
-            constexpr auto quotedScalar = "f"_scalar.quote(lambda);
+            using lambda_type = std::remove_const_t<decltype(lambda_static)>;
+            constexpr auto quotedScalar = "f"_scalar.quote(lambda_static);
             using quoted_type = std::remove_const_t<decltype(quotedScalar)>;
 
             STATIC_REQUIRE(quotedScalar._nme[0] == 'f' && quotedScalar._nme[1] == '\0');