MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-11-29 10:12:39 +01:00
Code Issues Releases Wiki Activity

modules/m_fetch: Simplify/fix comparator suite.

Browse source
This commit is contained in:
Jason Volk 2019-08-31 01:53:58 -07:00
parent 557c8a3c86
commit 1cad69bf41
1 changed files with 51 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
modules/m_fetch.cc
View file

@ -10,9 +10,14 @@
namespace ircd::m::fetch
{
static bool operator<(const request &a, const request &b) noexcept;
static bool operator==(const opts &a, const opts &b) noexcept;
static bool operator==(const request &a, const opts &b) noexcept;
static bool operator==(const opts &a, const request &b) noexcept;
static bool operator==(const request &a, const request &b) noexcept;
static bool operator<(const opts &a, const opts &b) noexcept;
static bool operator<(const request &a, const opts &b) noexcept;
static bool operator<(const opts &a, const request &b) noexcept;
static bool operator<(const request &a, const request &b) noexcept;
extern ctx::dock dock;
extern ctx::mutex requests_mutex;
@ -916,33 +921,63 @@ ircd::m::fetch::timedout(const request &request,
}
bool
ircd::m::fetch::operator<(const request &a,
const request &b)
ircd::m::fetch::operator<(const request &a, const request &b)
noexcept
{
return uint(a.opts.op) < uint(b.opts.op) &&
a.opts.event_id < b.opts.event_id &&
a.opts.room_id < b.opts.room_id;
return a.opts < b.opts;
}
bool
ircd::m::fetch::operator<(const request &a,
const opts &b)
ircd::m::fetch::operator<(const opts &a, const request &b)
noexcept
{
return uint(a.opts.op) < uint(b.op) &&
a.opts.event_id < b.event_id &&
a.opts.room_id < b.room_id;
return a < b.opts;
}
bool
ircd::m::fetch::operator<(const opts &a,
const request &b)
ircd::m::fetch::operator<(const request &a, const opts &b)
noexcept
{
return uint(a.op) < uint(b.opts.op) &&
a.event_id < b.opts.event_id &&
a.room_id < b.opts.room_id;
return a.opts < b;
}
bool
ircd::m::fetch::operator<(const opts &a, const opts &b)
noexcept
{
return uint(a.op) < uint(b.op) ||
a.event_id < b.event_id ||
a.room_id < b.room_id;
}
bool
ircd::m::fetch::operator==(const request &a, const request &b)
noexcept
{
return a.opts == b.opts;
}
bool
ircd::m::fetch::operator==(const opts &a, const request &b)
noexcept
{
return a == b.opts;
}
bool
ircd::m::fetch::operator==(const request &a, const opts &b)
noexcept
{
return a.opts == b;
}
bool
ircd::m::fetch::operator==(const opts &a, const opts &b)
noexcept
{
return uint(a.op) == uint(b.op) &&
a.event_id == b.event_id &&
a.room_id == b.room_id;
}
//