From c43a0e49ab3eddde4ea44a6c4a3d598b8f40dcad Mon Sep 17 00:00:00 2001 From: Jason Volk Date: Wed, 16 Jan 2019 16:13:40 -0800 Subject: [PATCH] ircd::db: Tweak cell::valid() stack. --- ircd/db.cc | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/ircd/db.cc b/ircd/db.cc index 2b06f22a1..509dae0e3 100644 --- a/ircd/db.cc +++ b/ircd/db.cc @@ -9059,32 +9059,32 @@ const return likely(valid())? db::key(*it) : string_view{}; } -bool -ircd::db::cell::valid() -const -{ - return bool(it) && db::valid(*it); -} - bool ircd::db::cell::valid(const string_view &s) const { - return bool(it) && db::valid_eq(*it, s); + return valid() && db::valid_eq(*it, s); } bool ircd::db::cell::valid_gt(const string_view &s) const { - return bool(it) && db::valid_gt(*it, s); + return valid() && db::valid_gt(*it, s); } bool ircd::db::cell::valid_lte(const string_view &s) const { - return bool(it) && db::valid_lte(*it, s); + return valid() && db::valid_lte(*it, s); +} + +bool +ircd::db::cell::valid() +const +{ + return bool(it) && db::valid(*it); } ///////////////////////////////////////////////////////////////////////////////