Merge pull request #1463 from fnc12/tidy-up-warnings

trueqbit · web-flow · commit 20855b89eede · 2025-10-22T13:37:20.000+02:00
Tidy up warnings
diff --git a/appveyor.yml b/appveyor.yml
@@ -108,7 +108,7 @@ for:
   install:
     - |-
       cd C:\Tools\vcpkg
-      git fetch --tags && git checkout 2025.08.27
+      git fetch --tags && git checkout 2025.09.17
       cd %APPVEYOR_BUILD_FOLDER%
       C:\Tools\vcpkg\bootstrap-vcpkg.bat -disableMetrics
       C:\Tools\vcpkg\vcpkg integrate install
@@ -142,7 +142,7 @@ for:
   install:
     - |-
       pushd $HOME/vcpkg
-      git fetch --tags && git checkout 2025.08.27
+      git fetch --tags && git checkout 2025.09.17
       popd
       $HOME/vcpkg/bootstrap-vcpkg.sh -disableMetrics
       $HOME/vcpkg/vcpkg integrate install --overlay-triplets=vcpkg/triplets
@@ -170,7 +170,7 @@ for:
   # using custom vcpkg triplets for building and linking dynamic dependent libraries
   install:
     - |-
-      git clone --depth 1 --branch 2025.08.27 https://github.com/microsoft/vcpkg.git $HOME/vcpkg
+      git clone --depth 1 --branch 2025.09.17 https://github.com/microsoft/vcpkg.git $HOME/vcpkg
       $HOME/vcpkg/bootstrap-vcpkg.sh -disableMetrics
       $HOME/vcpkg/vcpkg integrate install --overlay-triplets=vcpkg/triplets
       vcpkg install sqlite3[core,dbstat,math,json1,fts5,rtree,soundex] catch2 --overlay-triplets=vcpkg/triplets
diff --git a/dev/functional/config.h b/dev/functional/config.h
@@ -2,6 +2,8 @@
 
 #include "cxx_universal.h"
 #include "platform_definitions.h"
+// pull in SQLite3 configuration early, such that version and feature macros are globally available in sqlite_orm
+#include "sqlite3_config.h"
 
 #ifdef BUILD_SQLITE_ORM_MODULE
 #define SQLITE_ORM_EXPORT export
diff --git a/dev/functional/cxx_compiler_quirks.h b/dev/functional/cxx_compiler_quirks.h
@@ -20,6 +20,16 @@
 #define SQLITE_ORM_CLANG_SUPPRESS(warnoption, ...) __VA_ARGS__
 #endif
 
+#if defined(_MSC_VER) && !defined(__clang__)
+#define SQLITE_ORM_DO_PRAGMA(...) __pragma(__VA_ARGS__)
+#endif
+
+#if defined(_MSC_VER) && !defined(__clang__)
+#define SQLITE_ORM_MSVC_SUPPRESS(warncode, ...) SQLITE_ORM_DO_PRAGMA(warning(suppress : warncode))
+#else
+#define SQLITE_ORM_MSVC_SUPPRESS(warcode, ...) __VA_ARGS__
+#endif
+
 // clang has the bad habit of diagnosing missing brace-init-lists when constructing aggregates with base classes.
 // This is a false positive, since the C++ standard is quite clear that braces for nested or base objects may be omitted,
 // see https://en.cppreference.com/w/cpp/language/aggregate_initialization:
@@ -30,6 +40,9 @@
 // Because we know what we are doing, we suppress the diagnostic message
 #define SQLITE_ORM_CLANG_SUPPRESS_MISSING_BRACES(...) SQLITE_ORM_CLANG_SUPPRESS("-Wmissing-braces", __VA_ARGS__)
 
+// msvc has the bad habit of diagnosing overalignment of types with an explicit alignment specifier.
+#define SQLITE_ORM_MSVC_SUPPRESS_OVERALIGNMENT(...) SQLITE_ORM_MSVC_SUPPRESS(4324, __VA_ARGS__)
+
 #if defined(_MSC_VER) && (_MSC_VER < 1920)
 #define SQLITE_ORM_BROKEN_VARIADIC_PACK_EXPANSION
 // Type replacement may fail if an alias template has a non-type template parameter from a dependent expression in it,
diff --git a/dev/functional/finish_macros.h b/dev/functional/finish_macros.h
@@ -1,6 +1,10 @@
 #pragma once
 
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+
 #if defined(_MSC_VER)
 __pragma(pop_macro("max"))
 __pragma(pop_macro("min"))
-#endif  // defined(_MSC_VER)
+#endif
diff --git a/dev/functional/start_macros.h b/dev/functional/start_macros.h
@@ -1,5 +1,13 @@
 #pragma once
 
+// Clang has the annoying habit of warning about future C++ features that it claims to support through a feature macro.
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wc++20-extensions"
+#pragma clang diagnostic ignored "-Wc++23-extensions"
+#pragma clang diagnostic ignored "-Wc++26-extensions"
+#endif
+
 #if defined(_MSC_VER)
 __pragma(push_macro("min"))
 #undef min
diff --git a/dev/statement_serializer.h b/dev/statement_serializer.h
@@ -1511,7 +1511,7 @@ namespace sqlite_orm {
 
         template<class Ctx, class... Args>
         std::set<std::pair<std::string, std::string>> collect_table_names(const set_t<Args...>& set, const Ctx& ctx) {
-            auto collector = make_table_name_collector(ctx.db_objects);
+            table_name_collector collector{ctx.db_objects};
             // note: we are only interested in the table name on the left-hand side of the assignment operator expression
             iterate_tuple(set.assigns, [&collector](const auto& assignmentOperator) {
                 iterate_ast(assignmentOperator.lhs, collector);
@@ -1527,7 +1527,7 @@ namespace sqlite_orm {
 
         template<class Ctx, class T, satisfies<is_select, T> = true>
         std::set<std::pair<std::string, std::string>> collect_table_names(const T& sel, const Ctx& ctx) {
-            auto collector = make_table_name_collector(ctx.db_objects);
+            table_name_collector collector{ctx.db_objects};
             iterate_ast(sel, collector);
             return std::move(collector.table_names);
         }
diff --git a/dev/storage_base.h b/dev/storage_base.h
@@ -724,7 +724,7 @@ namespace sqlite_orm {
                     *other.connection,
                     std::bind(&storage_base::on_open_internal, this, std::placeholders::_1))),
                 cachedForeignKeysCount(other.cachedForeignKeysCount),
-                executor{std::move(other.executor.will_run_query), std::move(other.executor.did_run_query)} {
+                executor{other.executor.will_run_query, other.executor.did_run_query} {
                 if (this->inMemory) {
                     this->connection->retain();
                 }
diff --git a/dev/table_name_collector.h b/dev/table_name_collector.h
@@ -92,12 +92,6 @@ namespace sqlite_orm {
                 this->table_names.emplace(lookup_table_name<T>(this->db_objects), "");
             }
         };
-
-        template<class DBOs, satisfies<is_db_objects, DBOs> = true>
-        table_name_collector<DBOs> make_table_name_collector(const DBOs& dbObjects) {
-            return {dbObjects};
-        }
-
     }
 
 }
diff --git a/dev/type_traits.h b/dev/type_traits.h
@@ -9,7 +9,6 @@
 #endif
 #endif
 
-#include "functional/cxx_core_features.h"
 #include "functional/cxx_type_traits_polyfill.h"
 
 namespace sqlite_orm {
diff --git a/include/sqlite_orm/sqlite_orm.h b/include/sqlite_orm/sqlite_orm.h
@@ -1,5 +1,13 @@
 #pragma once
 
+// Clang has the annoying habit of warning about future C++ features that it claims to support through a feature macro.
+#ifdef __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wc++20-extensions"
+#pragma clang diagnostic ignored "-Wc++23-extensions"
+#pragma clang diagnostic ignored "-Wc++26-extensions"
+#endif
+
 #if defined(_MSC_VER)
 __pragma(push_macro("min"))
 #undef min
@@ -8,9 +16,6 @@ __pragma(push_macro("max"))
 #endif  // defined(_MSC_VER)
 #pragma once
 
-#include <sqlite3.h>
-#pragma once
-
 // #include "cxx_universal.h"
 
 /*
@@ -158,6 +163,16 @@ using std::nullptr_t;
 #define SQLITE_ORM_CLANG_SUPPRESS(warnoption, ...) __VA_ARGS__
 #endif
 
+#if defined(_MSC_VER) && !defined(__clang__)
+#define SQLITE_ORM_DO_PRAGMA(...) __pragma(__VA_ARGS__)
+#endif
+
+#if defined(_MSC_VER) && !defined(__clang__)
+#define SQLITE_ORM_MSVC_SUPPRESS(warncode, ...) SQLITE_ORM_DO_PRAGMA(warning(suppress : warncode))
+#else
+#define SQLITE_ORM_MSVC_SUPPRESS(warcode, ...) __VA_ARGS__
+#endif
+
 // clang has the bad habit of diagnosing missing brace-init-lists when constructing aggregates with base classes.
 // This is a false positive, since the C++ standard is quite clear that braces for nested or base objects may be omitted,
 // see https://en.cppreference.com/w/cpp/language/aggregate_initialization:
@@ -168,6 +183,9 @@ using std::nullptr_t;
 // Because we know what we are doing, we suppress the diagnostic message
 #define SQLITE_ORM_CLANG_SUPPRESS_MISSING_BRACES(...) SQLITE_ORM_CLANG_SUPPRESS("-Wmissing-braces", __VA_ARGS__)
 
+// msvc has the bad habit of diagnosing overalignment of types with an explicit alignment specifier.
+#define SQLITE_ORM_MSVC_SUPPRESS_OVERALIGNMENT(...) SQLITE_ORM_MSVC_SUPPRESS(4324, __VA_ARGS__)
+
 #if defined(_MSC_VER) && (_MSC_VER < 1920)
 #define SQLITE_ORM_BROKEN_VARIADIC_PACK_EXPANSION
 // Type replacement may fail if an alias template has a non-type template parameter from a dependent expression in it,
@@ -238,6 +256,11 @@ using std::nullptr_t;
 #error "Unknown target platform detected"
 #endif
 
+// pull in SQLite3 configuration early, such that version and feature macros are globally available in sqlite_orm
+// #include "sqlite3_config.h"
+
+#include <sqlite3.h>
+
 #ifdef BUILD_SQLITE_ORM_MODULE
 #define SQLITE_ORM_EXPORT export
 #else
@@ -1826,8 +1849,6 @@ namespace sqlite_orm {
 #endif
 #endif
 
-// #include "functional/cxx_core_features.h"
-
 // #include "functional/cxx_type_traits_polyfill.h"
 
 namespace sqlite_orm {
@@ -14676,12 +14697,6 @@ namespace sqlite_orm {
                 this->table_names.emplace(lookup_table_name<T>(this->db_objects), "");
             }
         };
-
-        template<class DBOs, satisfies<is_db_objects, DBOs> = true>
-        table_name_collector<DBOs> make_table_name_collector(const DBOs& dbObjects) {
-            return {dbObjects};
-        }
-
     }
 
 }
@@ -18948,7 +18963,7 @@ namespace sqlite_orm {
                     *other.connection,
                     std::bind(&storage_base::on_open_internal, this, std::placeholders::_1))),
                 cachedForeignKeysCount(other.cachedForeignKeysCount),
-                executor{std::move(other.executor.will_run_query), std::move(other.executor.did_run_query)} {
+                executor{other.executor.will_run_query, other.executor.did_run_query} {
                 if (this->inMemory) {
                     this->connection->retain();
                 }
@@ -21932,7 +21947,7 @@ namespace sqlite_orm {
 
         template<class Ctx, class... Args>
         std::set<std::pair<std::string, std::string>> collect_table_names(const set_t<Args...>& set, const Ctx& ctx) {
-            auto collector = make_table_name_collector(ctx.db_objects);
+            table_name_collector collector{ctx.db_objects};
             // note: we are only interested in the table name on the left-hand side of the assignment operator expression
             iterate_tuple(set.assigns, [&collector](const auto& assignmentOperator) {
                 iterate_ast(assignmentOperator.lhs, collector);
@@ -21948,7 +21963,7 @@ namespace sqlite_orm {
 
         template<class Ctx, class T, satisfies<is_select, T> = true>
         std::set<std::pair<std::string, std::string>> collect_table_names(const T& sel, const Ctx& ctx) {
-            auto collector = make_table_name_collector(ctx.db_objects);
+            table_name_collector collector{ctx.db_objects};
             iterate_ast(sel, collector);
             return std::move(collector.table_names);
         }
@@ -26449,7 +26464,11 @@ SQLITE_ORM_EXPORT namespace sqlite_orm {
 #endif
 #pragma once
 
+#ifdef __clang__
+#pragma clang diagnostic pop
+#endif
+
 #if defined(_MSC_VER)
 __pragma(pop_macro("max"))
 __pragma(pop_macro("min"))
-#endif  // defined(_MSC_VER)
+#endif
diff --git a/not_single_header_include/sqlite_orm/sqlite_orm.h b/not_single_header_include/sqlite_orm/sqlite_orm.h
@@ -1,7 +1,5 @@
 #pragma once
 #include "../../dev/functional/start_macros.h"
-// pull in the SQLite3 configuration early, such that version and feature macros are globally available in sqlite_orm
-#include "../../dev/functional/sqlite3_config.h"
 // though each header is required to include everything it needs
 // we include the configuration and all underlying c++ core features in order to make it universally available
 #include "../../dev/functional/config.h"
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -74,6 +74,11 @@ if(MSVC)
         target_link_options(unit_tests PRIVATE "/ENTRY:wmainCRTStartup")
     endif()
 endif()
+if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+    target_compile_options(unit_tests PUBLIC
+        # disabled due to unit tests still testing deprecated features
+        -Wno-deprecated-declarations)
+endif()
 
 target_precompile_headers(unit_tests PRIVATE
     <sqlite3.h>
diff --git a/tests/ast_iterator_tests.cpp b/tests/ast_iterator_tests.cpp
@@ -34,15 +34,14 @@ TEST_CASE("ast_iterator") {
     };
 #ifdef SQLITE_ORM_EXPLICIT_GENERIC_LAMBDA_SUPPORTED
     const auto nodeLambda = overloaded{
-        [&typeIndexes]<class UDF, class... CallArgs>(polyfill::bool_constant<true>,
+        [&typeIndexes]<class UDF, class... CallArgs>(std::true_type,
                                                      const internal::function_call<UDF, CallArgs...>& udfCall) {
             typeIndexes.push_back(typeid(udfCall.name));
         },
-        [&typeIndexes](polyfill::bool_constant<true>, const internal::named_collate_base& collateCall) {
+        [&typeIndexes](std::true_type, const internal::named_collate_base& collateCall) {
             typeIndexes.push_back(typeid(collateCall));
         },
-        [&typeIndexes]<class T, class X, class Y, class Z>(polyfill::bool_constant<true>,
-                                                           const internal::highlight_t<T, X, Y, Z>&) {
+        [&typeIndexes]<class T, class X, class Y, class Z>(std::true_type, const internal::highlight_t<T, X, Y, Z>&) {
             typeIndexes.push_back(typeid(T));
         },
         // swallow leaf expressions
diff --git a/tests/pointer_passing_interface.cpp b/tests/pointer_passing_interface.cpp
@@ -48,8 +48,6 @@ TEST_CASE("pointer-passing") {
 
         int64_pointer_binding operator()() const {
             return bind_pointer<int64_pointer_binding>(new int64{-1});
-            // outline: low-level; must compile
-            return bind_carray_pointer(new int64{-1}, delete_int64{});
         }
 
         static const char* name() {
diff --git a/tests/table_name_collector.cpp b/tests/table_name_collector.cpp
diff --git a/tests/user_defined_functions.cpp b/tests/user_defined_functions.cpp
diff --git a/third_party/amalgamate/config.json b/third_party/amalgamate/config.json

Original file line number	Diff line number	Diff line change
`@@ -724,7 +724,7 @@ namespace sqlite_orm {`
`724`	`724`	`*other.connection,`
`725`	`725`	`std::bind(&storage_base::on_open_internal, this, std::placeholders::_1))),`
`726`	`726`	`cachedForeignKeysCount(other.cachedForeignKeysCount),`
`727`		`- executor{std::move(other.executor.will_run_query), std::move(other.executor.did_run_query)} {`
	`727`	`+ executor{other.executor.will_run_query, other.executor.did_run_query} {`
`728`	`728`	`if (this->inMemory) {`
`729`	`729`	`this->connection->retain();`
`730`	`730`	`}`
Original file line number	Diff line number	Diff line change
`@@ -92,12 +92,6 @@ namespace sqlite_orm {`
`92`	`92`	`this->table_names.emplace(lookup_table_name<T>(this->db_objects), "");`
`93`	`93`	`}`
`94`	`94`	`};`
`95`		`-`
`96`		`- template<class DBOs, satisfies<is_db_objects, DBOs> = true>`
`97`		`- table_name_collector<DBOs> make_table_name_collector(const DBOs& dbObjects) {`
`98`		`- return {dbObjects};`
`99`		`- }`
`100`		`-`
`101`	`95`	`}`
`102`	`96`
`103`	`97`	`}`