From f353c7841d9aec6ccc65ae2841f20b420872833f Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Thu, 1 Feb 2018 09:42:50 +0900 Subject: Add GCC 4.9.2 to the workaround path for FileTransferInfo code Closes #161. Doesn't make GCC 4.9.2 officially supported but libqmatrixclient can be compiled with it as of now. --- room.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/room.cpp b/room.cpp index 4270875c..79304494 100644 --- a/room.cpp +++ b/room.cpp @@ -99,7 +99,7 @@ class Room::Private struct FileTransferPrivateInfo { -#if defined(_MSC_VER) && _MSC_VER < 1910 +#if (defined(_MSC_VER) && _MSC_VER < 1910) || (defined(__GNUC__) && __GNUC__ <= 4) FileTransferPrivateInfo() = default; FileTransferPrivateInfo(BaseJob* j, QString fileName) : job(j), localFileInfo(fileName) @@ -561,7 +561,7 @@ FileTransferInfo Room::fileTransferInfo(const QString& id) const total = INT_MAX; } -#if defined(_MSC_VER) && _MSC_VER < 1910 +#if (defined(_MSC_VER) && _MSC_VER < 1910) || (defined(__GNUC__) && __GNUC__ <= 4) // A workaround for MSVC 2015 that fails with "error C2440: 'return': // cannot convert from 'initializer list' to 'QMatrixClient::FileTransferInfo'" FileTransferInfo fti; -- cgit v1.2.3