cuberite/SQLiteCpp
1
0
Fork 0
mirror of https://github.com/cuberite/SQLiteCpp.git synced 2025-08-04 17:56:13 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #134 from drivehappy/master

Browse Source 
Warning cleanup under MSVC and Clang
This commit is contained in:
Sébastien Rombauts 2017-08-21 11:08:35 +02:00 committed by GitHub
commit 3c3b23a712
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Database.cpp
View File

@ -211,6 +211,10 @@ void Database::createFunction(const char* apFuncName,
void Database::loadExtension(const char* apExtensionName, const char *apEntryPointName) void Database::loadExtension(const char* apExtensionName, const char *apEntryPointName)
{ {
#ifdef SQLITE_OMIT_LOAD_EXTENSION #ifdef SQLITE_OMIT_LOAD_EXTENSION
// Unused
(void)apExtensionName;
(void)apEntryPointName;
throw std::runtime_error("sqlite extensions are disabled"); throw std::runtime_error("sqlite extensions are disabled");
#else #else
#ifdef SQLITE_DBCONFIG_ENABLE_LOAD_EXTENSION // Since SQLite 3.13 (2016-05-18): #ifdef SQLITE_DBCONFIG_ENABLE_LOAD_EXTENSION // Since SQLite 3.13 (2016-05-18):
@ -232,7 +236,7 @@ void Database::loadExtension(const char* apExtensionName, const char *apEntryPoi
// Set the key for the current sqlite database instance. // Set the key for the current sqlite database instance.
void Database::key(const std::string& aKey) const void Database::key(const std::string& aKey) const
{ {
int pass_len = aKey.length(); int pass_len = static_cast<int>(aKey.length());
#ifdef SQLITE_HAS_CODEC #ifdef SQLITE_HAS_CODEC
if (pass_len > 0) { if (pass_len > 0) {
const int ret = sqlite3_key(mpSQLite, aKey.c_str(), pass_len); const int ret = sqlite3_key(mpSQLite, aKey.c_str(), pass_len);