From 9bf81a2c04eddabd0f09ea9157e6e7c97bea88f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?louiz=E2=80=99?= Date: Sun, 28 Jan 2018 14:10:14 +0100 Subject: This should fix the int conversion warning on 32bits arch --- src/database/query.cpp | 2 +- src/database/query.hpp | 2 +- src/database/row.hpp | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/database/query.cpp b/src/database/query.cpp index 4054007..d27dc59 100644 --- a/src/database/query.cpp +++ b/src/database/query.cpp @@ -6,7 +6,7 @@ void actual_bind(Statement& statement, const std::string& value, int index) statement.bind_text(index, value); } -void actual_bind(Statement& statement, const std::size_t value, int index) +void actual_bind(Statement& statement, const std::int64_t value, int index) { statement.bind_int64(index, value); } diff --git a/src/database/query.hpp b/src/database/query.hpp index 547138f..8434944 100644 --- a/src/database/query.hpp +++ b/src/database/query.hpp @@ -12,7 +12,7 @@ #include void actual_bind(Statement& statement, const std::string& value, int index); -void actual_bind(Statement& statement, const std::size_t value, int index); +void actual_bind(Statement& statement, const std::int64_t value, int index); void actual_bind(Statement& statement, const OptionalBool& value, int index); #ifdef DEBUG_SQL_QUERIES diff --git a/src/database/row.hpp b/src/database/row.hpp index 130863a..4dc98be 100644 --- a/src/database/row.hpp +++ b/src/database/row.hpp @@ -42,7 +42,8 @@ struct Row if (id.value == Id::unset_value) { this->insert(*db); - std::get(this->columns).value = db->last_inserted_rowid; + if (db->last_inserted_rowid >= 0) + std::get(this->columns).value = static_cast(db->last_inserted_rowid); } else this->update(*db); -- cgit v1.2.3