lisacvuk
/
Minetest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix -Wterminate warning on GCC 6 

Fixes #4137
master
est31 2016-07-08 06:24:22 +02:00
parent 795f1c75cb
commit 483cca78a1
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/database-sqlite3.cpp
View File

@ -56,8 +56,14 @@ SQLite format specification:
SQLOK(sqlite3_prepare_v2(m_database, query, -1, &m_stmt_##name, NULL),\ SQLOK(sqlite3_prepare_v2(m_database, query, -1, &m_stmt_##name, NULL),\
"Failed to prepare query '" query "'") "Failed to prepare query '" query "'")
#define FINALIZE_STATEMENT(statement) \ #define SQLOK_ERRSTREAM(s, m) \
SQLOK(sqlite3_finalize(statement), "Failed to finalize " #statement) if ((s) != SQLITE_OK) { \
errorstream << (m) << ": " \
<< sqlite3_errmsg(m_database) << std::endl; \
}
#define FINALIZE_STATEMENT(statement) SQLOK_ERRSTREAM(sqlite3_finalize(statement), \
"Failed to finalize " #statement)
int Database_SQLite3::busyHandler(void *data, int count) int Database_SQLite3::busyHandler(void *data, int count)
{ {
@ -289,6 +295,6 @@ Database_SQLite3::~Database_SQLite3()
FINALIZE_STATEMENT(m_stmt_end) FINALIZE_STATEMENT(m_stmt_end)
FINALIZE_STATEMENT(m_stmt_delete) FINALIZE_STATEMENT(m_stmt_delete)
SQLOK(sqlite3_close(m_database), "Failed to close database"); SQLOK_ERRSTREAM(sqlite3_close(m_database), "Failed to close database");
} }