MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-09-26 18:38:52 +02:00
Code Issues Releases Wiki Activity

ircd:Ⓜ️ Use universal lambda construction for query template; inline linkage.

Browse source
This commit is contained in:
Jason Volk 2020-12-11 16:35:03 -08:00
parent 5748c21c3e
commit ce7ede99cf
2 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -45,7 +45,7 @@ namespace ircd::m
} }
template<class T> template<class T>
typename std::enable_if<std::is_integral<T>::value, T>::type inline typename std::enable_if<std::is_integral<T>::value, T>::type
ircd::m::get(std::nothrow_t, ircd::m::get(std::nothrow_t,
const event::idx &event_idx, const event::idx &event_idx,
const string_view &key, const string_view &key,
@ -56,7 +56,7 @@ ircd::m::get(std::nothrow_t,
} }
template<class T> template<class T>
typename std::enable_if<std::is_integral<T>::value, T>::type inline typename std::enable_if<std::is_integral<T>::value, T>::type
ircd::m::get(const event::idx &event_idx, ircd::m::get(const event::idx &event_idx,
const string_view &key) const string_view &key)
{ {
@ -71,7 +71,7 @@ ircd::m::get(const event::idx &event_idx,
} }
template<class T> template<class T>
typename std::enable_if<std::is_integral<T>::value, bool>::type inline typename std::enable_if<std::is_integral<T>::value, bool>::type
ircd::m::get(const event::idx &event_idx, ircd::m::get(const event::idx &event_idx,
const string_view &key, const string_view &key,
T &ret) T &ret)

21
include/ircd/m/query.h
View file

@ -13,7 +13,7 @@
namespace ircd::m namespace ircd::m
{ {
template<class R> R query(std::nothrow_t, const event::idx &, const string_view &key, R&& def, const std::function<R (const string_view &)> &); template<class R, class F> R query(std::nothrow_t, const event::idx &, const string_view &key, R&& def, F&&);
template<class F> auto query(std::nothrow_t, const event::idx &, const string_view &key, F&&); template<class F> auto query(std::nothrow_t, const event::idx &, const string_view &key, F&&);
template<class R, class F> R query(const event::idx &, const string_view &key, R&& def, F&&); template<class R, class F> R query(const event::idx &, const string_view &key, R&& def, F&&);
@ -26,7 +26,7 @@ namespace ircd::m
/// rather than make further use of it. /// rather than make further use of it.
/// ///
template<class F> template<class F>
auto inline auto
ircd::m::query(const event::idx &event_idx, ircd::m::query(const event::idx &event_idx,
const string_view &key, const string_view &key,
F&& closure) F&& closure)
@ -45,7 +45,7 @@ ircd::m::query(const event::idx &event_idx,
template<class R, template<class R,
class F> class F>
R inline R
ircd::m::query(const event::idx &event_idx, ircd::m::query(const event::idx &event_idx,
const string_view &key, const string_view &key,
R&& r, R&& r,
@ -60,7 +60,7 @@ ircd::m::query(const event::idx &event_idx,
/// return a default value. /// return a default value.
/// ///
template<class F> template<class F>
auto inline auto
ircd::m::query(std::nothrow_t, ircd::m::query(std::nothrow_t,
const event::idx &event_idx, const event::idx &event_idx,
const string_view &key, const string_view &key,
@ -87,15 +87,20 @@ ircd::m::query(std::nothrow_t,
/// non-throwing behavior when the event_idx/key(column) is not found by /// non-throwing behavior when the event_idx/key(column) is not found by
/// returning a default value supplied by the caller. /// returning a default value supplied by the caller.
/// ///
template<class R> template<class R,
R class F>
inline R
ircd::m::query(std::nothrow_t, ircd::m::query(std::nothrow_t,
const event::idx &event_idx, const event::idx &event_idx,
const string_view &key, const string_view &key,
R&& default_, R&& default_,
const std::function<R (const string_view &)> &closure) F&& closure)
{ {
R ret{std::forward<R>(default_)}; R ret
{
std::forward<R>(default_)
};
m::get(std::nothrow, event_idx, key, [&ret, &closure] m::get(std::nothrow, event_idx, key, [&ret, &closure]
(const string_view &value) (const string_view &value)
{ {