Implemented suggestions made during the review

fnc12 · Jun 21, 2024 · 43d3103 · 43d3103
1 parent 68ba295
commit 43d3103
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 12 deletions.
diff --git a/dev/function.h b/dev/function.h
@@ -325,10 +325,10 @@ namespace sqlite_orm {
          */
         template<typename UDF, typename... CallArgs>
 #ifdef SQLITE_ORM_RELAXED_CONSTEXPR_SUPPORTED
-        SQLITE_ORM_CONSTEVAL
+        SQLITE_ORM_CONSTEVAL void check_function_call() {
+#else
+        void check_function_call() {
 #endif
-            void
-            check_function_call() {
             using call_args_tuple = std::tuple<CallArgs...>;
             using function_params_tuple = typename callable_arguments<UDF>::args_tuple;
             constexpr size_t callArgsCount = std::tuple_size<call_args_tuple>::value;

diff --git a/include/sqlite_orm/sqlite_orm.h b/include/sqlite_orm/sqlite_orm.h
@@ -12949,10 +12949,10 @@ namespace sqlite_orm {
          */
         template<typename UDF, typename... CallArgs>
 #ifdef SQLITE_ORM_RELAXED_CONSTEXPR_SUPPORTED
-        SQLITE_ORM_CONSTEVAL
+        SQLITE_ORM_CONSTEVAL void check_function_call() {
+#else
+        void check_function_call() {
 #endif
-            void
-            check_function_call() {
             using call_args_tuple = std::tuple<CallArgs...>;
             using function_params_tuple = typename callable_arguments<UDF>::args_tuple;
             constexpr size_t callArgsCount = std::tuple_size<call_args_tuple>::value;

diff --git a/tests/user_defined_functions.cpp b/tests/user_defined_functions.cpp
@@ -80,11 +80,11 @@ struct MeanFunction {
     double total = 0;
     int count = 0;
 
-    static int wasInstantiatedCount;
+    static int ctorCallsCount;
     static int objectsCount;
 
     MeanFunction() {
-        ++wasInstantiatedCount;
+        ++ctorCallsCount;
         ++objectsCount;
     }
 
@@ -108,7 +108,7 @@ struct MeanFunction {
     }
 };
 
-int MeanFunction::wasInstantiatedCount = 0;
+int MeanFunction::ctorCallsCount = 0;
 int MeanFunction::objectsCount = 0;
 
 struct FirstFunction {
@@ -415,12 +415,12 @@ TEST_CASE("custom functions") {
     // expect two different aggregate function objects to be created, which provide two different results;
     // This ensures that `proxy_get_aggregate_step_udf()` uses `sqlite3_aggregate_context()` correctly
     {
-        MeanFunction::wasInstantiatedCount = 0;
+        MeanFunction::ctorCallsCount = 0;
         REQUIRE(MeanFunction::objectsCount == 0);
-        REQUIRE(MeanFunction::wasInstantiatedCount == 0);
+        REQUIRE(MeanFunction::ctorCallsCount == 0);
         auto rows = storage.select(columns(func<MeanFunction>(&User::id), func<MeanFunction>(c(&User::id) * 2)));
         REQUIRE(MeanFunction::objectsCount == 0);
-        REQUIRE(MeanFunction::wasInstantiatedCount == 2);
+        REQUIRE(MeanFunction::ctorCallsCount == 2);
         REQUIRE(int(std::get<0>(rows[0])) == 2);
         REQUIRE(int(std::get<1>(rows[0])) == 4);
     }