From dc38da5566801b001ee0196a4c70ed9135e750a8 Mon Sep 17 00:00:00 2001 From: Jason Volk Date: Fri, 11 May 2018 02:06:33 -0700 Subject: [PATCH] ircd::m: Add missing ADL-converted index(event) calls. --- ircd/m/dbs.cc | 6 +++--- modules/console.cc | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ircd/m/dbs.cc b/ircd/m/dbs.cc index 7c9b403b3..9fc787164 100644 --- a/ircd/m/dbs.cc +++ b/ircd/m/dbs.cc @@ -448,7 +448,7 @@ ircd::string_view ircd::m::dbs::state_root(const mutable_buffer &out, const id::event &event_id) { - return state_root(out, event::fetch::index(event_id)); + return state_root(out, index(event_id)); } ircd::string_view @@ -480,7 +480,7 @@ ircd::m::dbs::state_root(const mutable_buffer &out, const id::room &room_id, const id::event &event_id) { - return state_root(out, room_id, event::fetch::index(event_id)); + return state_root(out, room_id, index(event_id)); } ircd::string_view @@ -514,7 +514,7 @@ ircd::m::dbs::state_root(const mutable_buffer &out, const id::event &event_id, const uint64_t &depth) { - return state_root(out, room_id, event::fetch::index(event_id), depth); + return state_root(out, room_id, index(event_id), depth); } ircd::string_view diff --git a/modules/console.cc b/modules/console.cc index 52358d5d5..469bcf211 100644 --- a/modules/console.cc +++ b/modules/console.cc @@ -2055,7 +2055,7 @@ console_cmd__event(opt &out, const string_view &line) return true; case hash("idx"): - out << m::event::fetch::index(event) << std::endl; + out << index(event) << std::endl; return true; case hash("content"): @@ -2132,7 +2132,7 @@ console_cmd__event__erase(opt &out, const string_view &line) m::dbs::write_opts opts; opts.op = db::op::DELETE; - opts.idx = m::event::fetch::index(event); + opts.idx = index(event); m::dbs::write(txn, event, opts); txn();