Merge branch 'upstream/dev' into feature/modules-support

fnc12 · Jul 22, 2024 · ea04817 · ea04817
2 parents 1a3d518 + 8c15e4b
commit ea04817
Show file tree

Hide file tree

Showing 7 changed files with 343 additions and 85 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -113,7 +113,7 @@ for:
   install:
     - |-
       cd C:\Tools\vcpkg
-      git fetch --tags && git checkout 2024.06.15
+      git fetch --tags && git checkout 2024.07.12
       cd %APPVEYOR_BUILD_FOLDER%
       C:\Tools\vcpkg\bootstrap-vcpkg.bat -disableMetrics
       C:\Tools\vcpkg\vcpkg integrate install
@@ -146,7 +146,7 @@ for:
   install:
     - |-
       pushd $HOME/vcpkg
-      git fetch --tags && git checkout 2024.06.15
+      git fetch --tags && git checkout 2024.07.12
       popd
       $HOME/vcpkg/bootstrap-vcpkg.sh -disableMetrics
       $HOME/vcpkg/vcpkg integrate install --overlay-triplets=vcpkg/triplets
@@ -174,7 +174,7 @@ for:
   # using custom vcpkg triplets for building and linking dynamic dependent libraries
   install:
     - |-
-      git clone --depth 1 --branch 2024.06.15 https://github.com/microsoft/vcpkg.git $HOME/vcpkg
+      git clone --depth 1 --branch 2024.07.12 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,soundex] catch2 --overlay-triplets=vcpkg/triplets

diff --git a/dev/pragma.h b/dev/pragma.h
@@ -151,14 +151,14 @@ namespace sqlite_orm {
                         auto& res = *(std::vector<sqlite_orm::table_xinfo>*)data;
                         if(argc) {
                             auto index = 0;
-                            auto cid = std::atoi(argv[index++]);
+                            auto cid = atoi(argv[index++]);
                             std::string name = argv[index++];
                             std::string type = argv[index++];
-                            bool notnull = !!std::atoi(argv[index++]);
+                            bool notnull = !!atoi(argv[index++]);
                             std::string dflt_value = argv[index] ? argv[index] : "";
                             ++index;
-                            auto pk = std::atoi(argv[index++]);
-                            auto hidden = std::atoi(argv[index++]);
+                            auto pk = atoi(argv[index++]);
+                            auto hidden = atoi(argv[index++]);
                             res.emplace_back(cid,
                                              std::move(name),
                                              std::move(type),
@@ -188,13 +188,13 @@ namespace sqlite_orm {
                         auto& res = *(std::vector<sqlite_orm::table_info>*)data;
                         if(argc) {
                             auto index = 0;
-                            auto cid = std::atoi(argv[index++]);
+                            auto cid = atoi(argv[index++]);
                             std::string name = argv[index++];
                             std::string type = argv[index++];
-                            bool notnull = !!std::atoi(argv[index++]);
+                            bool notnull = !!atoi(argv[index++]);
                             std::string dflt_value = argv[index] ? argv[index] : "";
                             ++index;
-                            auto pk = std::atoi(argv[index++]);
+                            auto pk = atoi(argv[index++]);
                             res.emplace_back(cid, std::move(name), std::move(type), notnull, std::move(dflt_value), pk);
                         }
                         return 0;

diff --git a/dev/statement_binder.h b/dev/statement_binder.h
@@ -6,10 +6,10 @@
 #include <memory>  //  std::default_delete
 #include <string>  //  std::string, std::wstring
 #include <vector>  //  std::vector
-#include <cstring>  //  ::strncpy, ::strlen
+#include <cstring>  //  strncpy, strlen
 #include "functional/cxx_string_view.h"
 #ifndef SQLITE_ORM_STRING_VIEW_SUPPORTED
-#include <cwchar>  //  ::wcsncpy, ::wcslen
+#include <cwchar>  //  wcsncpy, wcslen
 #endif
 #ifndef SQLITE_ORM_OMITS_CODECVT
 #include <locale>  // std::wstring_convert

diff --git a/dev/storage_base.h b/dev/storage_base.h
@@ -2,6 +2,7 @@
 
 #include <sqlite3.h>
 #ifndef _IMPORT_STD_MODULE
+#include <cstdlib>  // atoi
 #include <memory>  //  std::allocator
 #include <functional>  //  std::function, std::bind, std::bind_front
 #include <string>  //  std::string
@@ -171,7 +172,7 @@ namespace sqlite_orm {
                     [](void* data, int argc, char** argv, char** /*azColName*/) -> int {
                         auto& res = *(bool*)data;
                         if(argc) {
-                            res = !!std::atoi(argv[0]);
+                            res = !!atoi(argv[0]);
                         }
                         return 0;
                     },