From a3163a5ae7dc701c23b183258cd23c979039414b Mon Sep 17 00:00:00 2001 From: Jason Volk Date: Tue, 17 Sep 2019 18:29:43 -0700 Subject: [PATCH] ircd::m: Use util::boolean for m::redacted. --- include/ircd/m/redacted.h | 13 +------------ ircd/m.cc | 2 +- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/include/ircd/m/redacted.h b/include/ircd/m/redacted.h index 297023130..8a24bf8db 100644 --- a/include/ircd/m/redacted.h +++ b/include/ircd/m/redacted.h @@ -17,12 +17,8 @@ namespace ircd::m } struct ircd::m::redacted +:boolean { - bool ret; - - public: - operator const bool &() const; - redacted(const event::idx &); redacted(const event::id &); explicit redacted(const event &); @@ -43,10 +39,3 @@ ircd::m::redacted::redacted(const event::id &event_id) index(event_id, std::nothrow) } {} - -inline ircd::m::redacted::operator -const bool &() -const -{ - return ret; -} diff --git a/ircd/m.cc b/ircd/m.cc index 4709862d8..4aeb51f81 100644 --- a/ircd/m.cc +++ b/ircd/m.cc @@ -1653,7 +1653,7 @@ ircd::m::vm::sequence::get(const eval &eval) // ircd::m::redacted::redacted(const event::idx &event_idx) -:ret +:boolean { event_idx? event::refs(event_idx).has(dbs::ref::M_ROOM_REDACTION):