aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/converters.h1
-rw-r--r--lib/events/eventloader.h2
2 files changed, 3 insertions, 0 deletions
diff --git a/lib/converters.h b/lib/converters.h
index c1d1e9f9..688f7bbd 100644
--- a/lib/converters.h
+++ b/lib/converters.h
@@ -74,6 +74,7 @@ struct JsonConverter : JsonObjectUnpacker<T> {
}
}
+ using JsonObjectUnpacker<T>::load;
static T load(const QJsonObject& jo)
{
// 'else' below are required to suppress code generation for unused
diff --git a/lib/events/eventloader.h b/lib/events/eventloader.h
index 7dde9786..15271ab1 100644
--- a/lib/events/eventloader.h
+++ b/lib/events/eventloader.h
@@ -50,9 +50,11 @@ inline StateEventPtr loadStateEvent(const QString& matrixType,
template <typename EventT>
struct JsonConverter<event_ptr_tt<EventT>>
: JsonObjectUnpacker<event_ptr_tt<EventT>> {
+ using JsonObjectUnpacker<event_ptr_tt<EventT>>::load;
static auto load(const QJsonObject& jo)
{
return loadEvent<EventT>(jo);
}
};
+
} // namespace Quotient