From 218aca1b134f86f1f96da663510c6e438b6f879f Mon Sep 17 00:00:00 2001 From: drivehappy Date: Thu, 3 Aug 2017 13:33:08 -0700 Subject: [PATCH 1/3] Fixing warning under MSVC. --- src/Database.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Database.cpp b/src/Database.cpp index 164f3e3..f7e74d3 100644 --- a/src/Database.cpp +++ b/src/Database.cpp @@ -232,7 +232,7 @@ void Database::loadExtension(const char* apExtensionName, const char *apEntryPoi // Set the key for the current sqlite database instance. void Database::key(const std::string& aKey) const { - int pass_len = aKey.length(); + int pass_len = static_cast(aKey.length()); #ifdef SQLITE_HAS_CODEC if (pass_len > 0) { const int ret = sqlite3_key(mpSQLite, aKey.c_str(), pass_len); From 6adc4cd5a81be36bb4aee243928ae7c205a53931 Mon Sep 17 00:00:00 2001 From: drivehappy Date: Thu, 3 Aug 2017 13:34:16 -0700 Subject: [PATCH 2/3] Fixing unused parameter warning under Clang. --- src/Database.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/Database.cpp b/src/Database.cpp index f7e74d3..6c9ea30 100644 --- a/src/Database.cpp +++ b/src/Database.cpp @@ -211,6 +211,10 @@ void Database::createFunction(const char* apFuncName, void Database::loadExtension(const char* apExtensionName, const char *apEntryPointName) { #ifdef SQLITE_OMIT_LOAD_EXTENSION + // Unused + (void)apExtensionName; + (void)apEntryPointName; + throw std::runtime_error("sqlite extensions are disabled"); #else #ifdef SQLITE_DBCONFIG_ENABLE_LOAD_EXTENSION // Since SQLite 3.13 (2016-05-18): From d39ff3475ec1d8d2220fa7f65bbb5433c04c6380 Mon Sep 17 00:00:00 2001 From: drivehappy Date: Thu, 3 Aug 2017 15:36:26 -0700 Subject: [PATCH 3/3] Fixing tab indentation to use spaces. --- src/Database.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Database.cpp b/src/Database.cpp index 6c9ea30..b27470c 100644 --- a/src/Database.cpp +++ b/src/Database.cpp @@ -211,9 +211,9 @@ void Database::createFunction(const char* apFuncName, void Database::loadExtension(const char* apExtensionName, const char *apEntryPointName) { #ifdef SQLITE_OMIT_LOAD_EXTENSION - // Unused - (void)apExtensionName; - (void)apEntryPointName; + // Unused + (void)apExtensionName; + (void)apEntryPointName; throw std::runtime_error("sqlite extensions are disabled"); #else