summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlouiz’ <louiz@louiz.org>2018-07-03 20:15:36 +0200
committerlouiz’ <louiz@louiz.org>2018-07-03 20:15:36 +0200
commit38dc895a9b29ca6b860bc3889da38d0ceb340c63 (patch)
treee7ead7e27022dda4cbb2dba3a83edbd2633a6d19
parentac8cd7082b070eb74ccd3d5b669c419941fc29ac (diff)
downloadbiboumi-38dc895a9b29ca6b860bc3889da38d0ceb340c63.tar.gz
biboumi-38dc895a9b29ca6b860bc3889da38d0ceb340c63.tar.bz2
biboumi-38dc895a9b29ca6b860bc3889da38d0ceb340c63.tar.xz
biboumi-38dc895a9b29ca6b860bc3889da38d0ceb340c63.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,