summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlouiz’ <louiz@louiz.org>2018-07-03 20:15:36 +0200
committerlouiz’ <louiz@louiz.org>2018-07-14 13:36:53 +0200
commit458ea53db3edc7318e88a2612baa793a1232cc75 (patch)
tree1952508dac6b0c0cbf9b5c77ba598fd145b38420
parent0d886d5f32dda3be5827ed2c84f9bf2806b69601 (diff)
downloadbiboumi-458ea53db3edc7318e88a2612baa793a1232cc75.tar.gz
biboumi-458ea53db3edc7318e88a2612baa793a1232cc75.tar.bz2
biboumi-458ea53db3edc7318e88a2612baa793a1232cc75.tar.xz
biboumi-458ea53db3edc7318e88a2612baa793a1232cc75.zip
Fix a compile error with GCC 5.x
fix #3366
-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 6e08ee1..4867f52 100644
--- a/src/database/database.cpp
+++ b/src/database/database.cpp
@@ -242,9 +242,9 @@ std::tuple<bool, std::vector<Database::MucLogLine>> Database::get_muc_logs(const
}
if (paging == Database::Paging::first)
- return {complete, result};
+ return std::make_tuple(complete, result);
else
- return {complete, {result.crbegin(), result.crend()}};
+ return std::make_tuple(complete, std::vector<Database::MucLogLine>(result.crbegin(), result.crend()));
}
Database::MucLogLine Database::get_muc_log(const std::string& owner, const std::string& chan_name, const std::string& server,