summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorlouiz’ <louiz@louiz.org>2017-09-21 17:53:58 +0200
committerlouiz’ <louiz@louiz.org>2017-09-21 17:53:58 +0200
commit6d6b5f633bfdde953f5f21c65303474a785ea0a1 (patch)
tree2e3589e7cf96210fc78097531794fa085d33149b /src
parentc1984733c4c50d7a4a7d5ae767ce87bcb3bea1c7 (diff)
parent103e508f3b1c623f687c092790ea0f73d92e65f3 (diff)
downloadbiboumi-6d6b5f633bfdde953f5f21c65303474a785ea0a1.tar.gz
biboumi-6d6b5f633bfdde953f5f21c65303474a785ea0a1.tar.bz2
biboumi-6d6b5f633bfdde953f5f21c65303474a785ea0a1.tar.xz
biboumi-6d6b5f633bfdde953f5f21c65303474a785ea0a1.zip
Merge branch 'v6' into 'master'
compat: revert to using sqlite's close() function for compat with older distros. See merge request !17
Diffstat (limited to 'src')
-rw-r--r--src/database/database.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/database/database.cpp b/src/database/database.cpp
index a2b88e2..8afe6f1 100644
--- a/src/database/database.cpp
+++ b/src/database/database.cpp
@@ -35,7 +35,7 @@ void Database::open(const std::string& filename)
if (res != SQLITE_OK)
{
log_error("Failed to open database file ", filename, ": ", sqlite3_errmsg(new_db));
- sqlite3_close_v2(new_db);
+ sqlite3_close(new_db);
throw std::runtime_error("");
}
Database::db = new_db;
@@ -238,7 +238,7 @@ std::vector<Database::RosterItem> Database::get_full_roster()
void Database::close()
{
- sqlite3_close_v2(Database::db);
+ sqlite3_close(Database::db);
Database::db = nullptr;
}