From 47cb949973a05cea6fb3a13ffd19b6e07e7720ae Mon Sep 17 00:00:00 2001 From: Kitsune Ral Date: Sat, 24 Mar 2018 15:25:40 +0900 Subject: Work around a bug in MSVC leading to "ambiguous call" compilation error --- converters.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/converters.h b/converters.h index f7d99f48..bba298e0 100644 --- a/converters.h +++ b/converters.h @@ -28,6 +28,9 @@ namespace QMatrixClient inline QJsonValue toJson(const QJsonValue& val) { return val; } inline QJsonObject toJson(const QJsonObject& o) { return o; } inline QJsonArray toJson(const QJsonArray& arr) { return arr; } +#ifdef _MSC_VER // MSVC gets lost and doesn't know which overload to use + inline QJsonValue toJson(const QString& s) { return s; } +#endif template inline QJsonArray toJson(const QVector& vals) -- cgit v1.2.3