Commit 6d6b5f63 authored by louiz’'s avatar louiz’

Merge branch 'v6' into 'master'

compat: revert to using sqlite's close() function for compat with older distros.

See merge request !17
parents c1984733 103e508f
...@@ -35,7 +35,7 @@ void Database::open(const std::string& filename) ...@@ -35,7 +35,7 @@ void Database::open(const std::string& filename)
if (res != SQLITE_OK) if (res != SQLITE_OK)
{ {
log_error("Failed to open database file ", filename, ": ", sqlite3_errmsg(new_db)); 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(""); throw std::runtime_error("");
} }
Database::db = new_db; Database::db = new_db;
...@@ -238,7 +238,7 @@ std::vector<Database::RosterItem> Database::get_full_roster() ...@@ -238,7 +238,7 @@ std::vector<Database::RosterItem> Database::get_full_roster()
void Database::close() void Database::close()
{ {
sqlite3_close_v2(Database::db); sqlite3_close(Database::db);
Database::db = nullptr; Database::db = nullptr;
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment