From fc703660f6151e17e0a60bd5d35843668cb99e12 Mon Sep 17 00:00:00 2001 From: Jason Volk Date: Wed, 16 Jan 2019 15:17:04 -0800 Subject: [PATCH] ircd::m: Add selecting-key ctor for event from json::object. --- include/ircd/m/event/event.h | 4 +--- ircd/m/event.cc | 15 ++++++++++----- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/include/ircd/m/event/event.h b/include/ircd/m/event/event.h index d2143df29..7488c57e7 100644 --- a/include/ircd/m/event/event.h +++ b/include/ircd/m/event/event.h @@ -113,9 +113,7 @@ struct ircd::m::event using super_type::tuple; event(const json::object &); + event(const json::object &, const keys &); event() = default; - - using super_type::operator=; - event &operator=(const json::object &); }; #pragma GCC diagnostic pop diff --git a/ircd/m/event.cc b/ircd/m/event.cc index 5e8a82fc4..f1c48fa51 100644 --- a/ircd/m/event.cc +++ b/ircd/m/event.cc @@ -447,12 +447,17 @@ ircd::m::event::event(const json::object &source) { } -ircd::m::event & -ircd::m::event::operator=(const json::object &source) +ircd::m::event::event(const json::object &source, + const keys &keys) +:super_type +{ + source, keys +} +,source +{ + source +} { - this->super_type::operator=(source); - this->source = source; - return *this; } namespace ircd::m