From f48c696baf826cc0e2b9dd94c1459c3ae14f835f Mon Sep 17 00:00:00 2001 From: Nicolas Werner Date: Sat, 27 May 2023 02:16:31 +0200 Subject: Work around ICE on MSVC See https://developercommunity.visualstudio.com/t/Internal-compile-error-while-compiling-c/1227337 for details... --- src/GridImagePackModel.cpp | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) (limited to 'src') diff --git a/src/GridImagePackModel.cpp b/src/GridImagePackModel.cpp index 95cbd265..bd39405e 100644 --- a/src/GridImagePackModel.cpp +++ b/src/GridImagePackModel.cpp @@ -225,10 +225,13 @@ GridImagePackModel::data(const QModelIndex &index, int role) const auto endOffset = std::min((offset + 1) * columns, pack.images.size()); for (std::size_t img = offset * columns; img < endOffset; img++) { const auto &data = pack.images.at(img); - imgs.push_back({.url = QString::fromStdString(data.first.url), - .shortcode = data.second, - .body = QString::fromStdString(data.first.body), - .descriptor_ = std::vector{ + // See + // https://developercommunity.visualstudio.com/t/Internal-compile-error-while-compiling-c/1227337 + imgs.push_back({/*.url =*/QString::fromStdString(data.first.url), + /*.shortcode =*/data.second, + /*.body =*/QString::fromStdString(data.first.body), + /*.descriptor_=*/ + std::vector{ pack.room_id, pack.state_key, data.second.toStdString(), @@ -265,10 +268,13 @@ GridImagePackModel::data(const QModelIndex &index, int role) const currentSearchResult[img].first == firstEntry.first; img++) { const auto &data = pack.images.at(currentSearchResult[img].second); - imgs.push_back({.url = QString::fromStdString(data.first.url), - .shortcode = data.second, - .body = QString::fromStdString(data.first.body), - .descriptor_ = std::vector{ + // See + // https://developercommunity.visualstudio.com/t/Internal-compile-error-while-compiling-c/1227337 + imgs.push_back({/*.url = */ QString::fromStdString(data.first.url), + /*.shortcode = */ data.second, + /*.body = */ QString::fromStdString(data.first.body), + /*.descriptor_ = */ + std::vector{ pack.room_id, pack.state_key, data.second.toStdString(), -- cgit 1.4.1