diff options
| author | Dan Goodliffe <dan@randomdan.homeip.net> | 2019-03-30 11:43:42 +0000 |
|---|---|---|
| committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2019-03-30 11:43:42 +0000 |
| commit | 5995bd64852aeaef3b59444b72229d7077575620 (patch) | |
| tree | 05e98389af9c9aa45fd151b36eaf5e87e30c4a11 | |
| parent | Bring inline with clang-tidy checks (diff) | |
| download | libdbpp-sqlite-1.4.1.tar.bz2 libdbpp-sqlite-1.4.1.tar.xz libdbpp-sqlite-1.4.1.zip | |
Tidy fixes for latest clanglibdbpp-sqlite-1.4.1
| -rw-r--r-- | libsqlitepp/sqlite-command.cpp | 20 | ||||
| -rw-r--r-- | libsqlitepp/sqlite-selectcommand.cpp | 14 |
2 files changed, 17 insertions, 17 deletions
diff --git a/libsqlitepp/sqlite-command.cpp b/libsqlitepp/sqlite-command.cpp index 0ae59d1..0020679 100644 --- a/libsqlitepp/sqlite-command.cpp +++ b/libsqlitepp/sqlite-command.cpp @@ -21,56 +21,56 @@ SQLite::Command::~Command() void SQLite::Command::bindParamI(unsigned int n, int v) { - if (sqlite3_bind_int(stmt, n + 1, v) != SQLITE_OK) { + if (sqlite3_bind_int(stmt, (int)n + 1, v) != SQLITE_OK) { throw Error(c->db); } } void SQLite::Command::bindParamI(unsigned int n, long int v) { - if (sqlite3_bind_int64(stmt, n + 1, v) != SQLITE_OK) { + if (sqlite3_bind_int64(stmt, (int)n + 1, v) != SQLITE_OK) { throw Error(c->db); } } void SQLite::Command::bindParamI(unsigned int n, long long int v) { - if (sqlite3_bind_int64(stmt, n + 1, v) != SQLITE_OK) { + if (sqlite3_bind_int64(stmt, (int)n + 1, v) != SQLITE_OK) { throw Error(c->db); } } void SQLite::Command::bindParamI(unsigned int n, unsigned int v) { - if (sqlite3_bind_int64(stmt, n + 1, v) != SQLITE_OK) { + if (sqlite3_bind_int64(stmt, (int)n + 1, v) != SQLITE_OK) { throw Error(c->db); } } void SQLite::Command::bindParamI(unsigned int n, long unsigned int v) { - if (sqlite3_bind_int64(stmt, n + 1, v) != SQLITE_OK) { + if (sqlite3_bind_int64(stmt, (int)n + 1, v) != SQLITE_OK) { throw Error(c->db); } } void SQLite::Command::bindParamI(unsigned int n, long long unsigned int v) { - if (sqlite3_bind_int64(stmt, n + 1, v) != SQLITE_OK) { + if (sqlite3_bind_int64(stmt, (int)n + 1, v) != SQLITE_OK) { throw Error(c->db); } } void SQLite::Command::bindParamF(unsigned int n, double v) { - if (sqlite3_bind_double(stmt, n + 1, v) != SQLITE_OK) { + if (sqlite3_bind_double(stmt, (int)n + 1, v) != SQLITE_OK) { throw Error(c->db); } } void SQLite::Command::bindParamF(unsigned int n, float v) { - if (sqlite3_bind_double(stmt, n + 1, v) != SQLITE_OK) { + if (sqlite3_bind_double(stmt, (int)n + 1, v) != SQLITE_OK) { throw Error(c->db); } } @@ -82,7 +82,7 @@ SQLite::Command::bindParamS(unsigned int n, const Glib::ustring & s) void SQLite::Command::bindParamS(unsigned int n, const std::string_view & s) { - if (sqlite3_bind_text(stmt, n + 1, s.data(), s.length(), SQLITE_STATIC) != SQLITE_OK) { + if (sqlite3_bind_text(stmt, (int)n + 1, s.data(), s.length(), SQLITE_STATIC) != SQLITE_OK) { throw Error(c->db); } } @@ -104,7 +104,7 @@ SQLite::Command::bindParamT(unsigned int, const boost::posix_time::ptime &) void SQLite::Command::bindNull(unsigned int n) { - if (sqlite3_bind_null(stmt, n + 1) != SQLITE_OK) { + if (sqlite3_bind_null(stmt, (int)n + 1) != SQLITE_OK) { throw Error(c->db); } } diff --git a/libsqlitepp/sqlite-selectcommand.cpp b/libsqlitepp/sqlite-selectcommand.cpp index 197356c..7ad8486 100644 --- a/libsqlitepp/sqlite-selectcommand.cpp +++ b/libsqlitepp/sqlite-selectcommand.cpp @@ -14,22 +14,22 @@ namespace SQLite { { } - bool isNull() const override { - return (SQLITE_NULL == sqlite3_column_type(stmt, colNo)); + [[nodiscard]] bool isNull() const override { + return (SQLITE_NULL == sqlite3_column_type(stmt, (int)colNo)); } void apply(DB::HandleField & h) const override { - switch (sqlite3_column_type(stmt, colNo)) { + switch (sqlite3_column_type(stmt, (int)colNo)) { case SQLITE_INTEGER: - h.integer(sqlite3_column_int64(stmt, colNo)); + h.integer(sqlite3_column_int64(stmt, (int)colNo)); return; case SQLITE_FLOAT: - h.floatingpoint(sqlite3_column_double(stmt, colNo)); + h.floatingpoint(sqlite3_column_double(stmt, (int)colNo)); return; case SQLITE_TEXT: { - auto t = sqlite3_column_text(stmt, colNo); - auto l = sqlite3_column_bytes(stmt, colNo); + auto t = sqlite3_column_text(stmt, (int)colNo); + auto l = sqlite3_column_bytes(stmt, (int)colNo); h.string({ reinterpret_cast<const char *>(t), (std::size_t)l }); return; } |