MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2025-02-16 16:50:12 +01:00
Code Issues Releases Wiki Activity

ircd:Ⓜ️:dbs: Workaround issues with incorrect std::tuple references.

Browse source
This commit is contained in:
Jason Volk 2018-04-12 14:08:48 -07:00
parent 8bf0b4d093
commit f9ade26b24
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
include/ircd/m/dbs.h
View file

@ -32,15 +32,15 @@ namespace ircd::m::dbs
// Lowlevel util
string_view room_state_key(const mutable_buffer &out, const id::room &, const string_view &type, const string_view &state_key);
string_view room_state_key(const mutable_buffer &out, const id::room &, const string_view &type);
std::tuple<string_view, string_view> room_state_key(const string_view &amalgam);
std::pair<string_view, string_view> room_state_key(const string_view &amalgam);
string_view room_origins_key(const mutable_buffer &out, const id::room &, const string_view &origin, const id::user &member);
string_view room_origins_key(const mutable_buffer &out, const id::room &, const string_view &origin);
std::tuple<string_view, string_view> room_origins_key(const string_view &amalgam);
std::pair<string_view, string_view> room_origins_key(const string_view &amalgam);
string_view room_events_key(const mutable_buffer &out, const id::room &, const uint64_t &depth, const id::event &);
string_view room_events_key(const mutable_buffer &out, const id::room &, const uint64_t &depth);
std::tuple<uint64_t, string_view> room_events_key(const string_view &amalgam);
std::pair<uint64_t, string_view> room_events_key(const string_view &amalgam);
// Get the state root for an event (with as much information as you have)
string_view state_root(const mutable_buffer &out, const id::room &, const id::event &, const uint64_t &depth);

6
ircd/m/dbs.cc
View file

@ -560,7 +560,7 @@ ircd::m::dbs::room_events_key(const mutable_buffer &out_,
return { data(out_), data(out) };
}
std::tuple<uint64_t, ircd::string_view>
std::pair<uint64_t, ircd::string_view>
ircd::m::dbs::room_events_key(const string_view &amalgam)
{
const auto &key
@ -685,7 +685,7 @@ ircd::m::dbs::room_origins_key(const mutable_buffer &out_,
return { data(out_), data(out) };
}
std::tuple<ircd::string_view, ircd::string_view>
std::pair<ircd::string_view, ircd::string_view>
ircd::m::dbs::room_origins_key(const string_view &amalgam)
{
const auto &key
@ -788,7 +788,7 @@ ircd::m::dbs::room_state_key(const mutable_buffer &out_,
return { data(out_), data(out) };
}
std::tuple<ircd::string_view, ircd::string_view>
std::pair<ircd::string_view, ircd::string_view>
ircd::m::dbs::room_state_key(const string_view &amalgam)
{
const auto &key