From 84713f825dab6861993419fbd441f75389b51346 Mon Sep 17 00:00:00 2001 From: Wilfried Karel Date: Thu, 9 May 2024 16:10:48 +0200 Subject: [PATCH 1/5] basic-error-message While `throw_sqlite_error` is called with the return value of `sqlite3_errmsg` everywhere, `throw_sqlite_error` uses this argument only for extended result codes, and discards it for basic ones. ced361fec35623863b24775b715b474f0b6b9cae must have left that out by accident. --- hdr/sqlite_modern_cpp/errors.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hdr/sqlite_modern_cpp/errors.h b/hdr/sqlite_modern_cpp/errors.h index 14501dd7..6af48d78 100644 --- a/hdr/sqlite_modern_cpp/errors.h +++ b/hdr/sqlite_modern_cpp/errors.h @@ -48,7 +48,7 @@ namespace sqlite { case SQLITE_ ## NAME: switch(error_code) { \ derived \ case SQLITE_ ## NAME: \ - default: throw name(error_code, sql); \ + default: throw name(error_code, sql, errmsg); \ } #if SQLITE_VERSION_NUMBER < 3010000 From 1071b8fdcd60b0030e256d412309d9e9cd267a56 Mon Sep 17 00:00:00 2001 From: Wilfried Karel Date: Fri, 14 Feb 2025 12:34:55 +0100 Subject: [PATCH 2/5] VS 2022 --- hdr/sqlite_modern_cpp.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/hdr/sqlite_modern_cpp.h b/hdr/sqlite_modern_cpp.h index 09665d38..b7de9178 100644 --- a/hdr/sqlite_modern_cpp.h +++ b/hdr/sqlite_modern_cpp.h @@ -31,6 +31,9 @@ namespace sqlite { index_binding_helper(const index_binding_helper &) = delete; #if __cplusplus < 201703 || _MSVC_LANG <= 201703 index_binding_helper(index_binding_helper &&) = default; +#elif _MSVC_LANG > 201703 + index_binding_helper(typename std::conditional::type index_, T value_) : + index(index_), value(value_) { } #endif typename std::conditional::type index; T value; From 63f2c60c365b43ab78d53dd3bc015538b991ef61 Mon Sep 17 00:00:00 2001 From: Wilfried Karel Date: Fri, 14 Feb 2025 19:36:12 +0100 Subject: [PATCH 3/5] GCC 13 --- hdr/sqlite_modern_cpp.h | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/hdr/sqlite_modern_cpp.h b/hdr/sqlite_modern_cpp.h index b7de9178..140d87bb 100644 --- a/hdr/sqlite_modern_cpp.h +++ b/hdr/sqlite_modern_cpp.h @@ -28,14 +28,16 @@ namespace sqlite { template struct index_binding_helper { + using Index = std::conditional_t; + index_binding_helper(const index_binding_helper &) = delete; -#if __cplusplus < 201703 || _MSVC_LANG <= 201703 +#if __cplusplus < 201703 || _MSVC_LANG && _MSVC_LANG <= 201703 index_binding_helper(index_binding_helper &&) = default; -#elif _MSVC_LANG > 201703 - index_binding_helper(typename std::conditional::type index_, T value_) : - index(index_), value(value_) { } #endif - typename std::conditional::type index; + index_binding_helper(Index index_, T value_) : + index(index_), value(value_) { } + + Index index; T value; }; From 1cec6f5dac10880b593d57b31cfd928ca6622792 Mon Sep 17 00:00:00 2001 From: Wilfried Karel Date: Sun, 18 May 2025 23:51:45 +0200 Subject: [PATCH 4/5] VC 2022 --- hdr/sqlite_modern_cpp.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hdr/sqlite_modern_cpp.h b/hdr/sqlite_modern_cpp.h index 140d87bb..edb1555b 100644 --- a/hdr/sqlite_modern_cpp.h +++ b/hdr/sqlite_modern_cpp.h @@ -31,7 +31,7 @@ namespace sqlite { using Index = std::conditional_t; index_binding_helper(const index_binding_helper &) = delete; -#if __cplusplus < 201703 || _MSVC_LANG && _MSVC_LANG <= 201703 +#if __cplusplus < 201703 || _MSVC_LANG // && _MSVC_LANG <= 201703 index_binding_helper(index_binding_helper &&) = default; #endif index_binding_helper(Index index_, T value_) : From aba507bc211956d4aad650e292324567b5860094 Mon Sep 17 00:00:00 2001 From: Wilfried Karel Date: Tue, 20 May 2025 23:10:46 +0200 Subject: [PATCH 5/5] GCC-13 CMAKE_CXX_STANDARD 20 --- hdr/sqlite_modern_cpp.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hdr/sqlite_modern_cpp.h b/hdr/sqlite_modern_cpp.h index edb1555b..69db4189 100644 --- a/hdr/sqlite_modern_cpp.h +++ b/hdr/sqlite_modern_cpp.h @@ -31,9 +31,9 @@ namespace sqlite { using Index = std::conditional_t; index_binding_helper(const index_binding_helper &) = delete; -#if __cplusplus < 201703 || _MSVC_LANG // && _MSVC_LANG <= 201703 +//#if __cplusplus < 201703 || _MSVC_LANG // && _MSVC_LANG <= 201703 index_binding_helper(index_binding_helper &&) = default; -#endif +//#endif index_binding_helper(Index index_, T value_) : index(index_), value(value_) { }