From 2741ab785cfbef22765d153bb3fd2789619b4a7f Mon Sep 17 00:00:00 2001 From: Jason Volk Date: Mon, 21 Sep 2020 18:45:08 -0700 Subject: [PATCH] ircd::db: Inline trivial operator wrappers. --- include/ircd/db/cell.h | 13 +++++++++++++ include/ircd/db/column.h | 14 ++++++++++++++ include/ircd/db/domain.h | 7 +++++++ ircd/db.cc | 34 ---------------------------------- 4 files changed, 34 insertions(+), 34 deletions(-) diff --git a/include/ircd/db/cell.h b/include/ircd/db/cell.h index 16c89e328..3f8e454c7 100644 --- a/include/ircd/db/cell.h +++ b/include/ircd/db/cell.h @@ -133,3 +133,16 @@ ircd::db::operator<<(std::ostream &s, const cell &c) s << string_view{c}; return s; } + +inline ircd::db::cell::operator +string_view() +{ + return val(); +} + +inline ircd::db::cell::operator +string_view() +const +{ + return val(); +} diff --git a/include/ircd/db/column.h b/include/ircd/db/column.h index ec8b6f656..1ed1186c0 100644 --- a/include/ircd/db/column.h +++ b/include/ircd/db/column.h @@ -280,6 +280,20 @@ struct ircd::db::column::const_reverse_iterator using const_iterator_base::const_iterator_base; }; +inline const ircd::db::column::const_iterator_base::value_type * +ircd::db::column::const_iterator_base::operator->() +const +{ + return &operator*(); +} + +inline bool +ircd::db::column::const_iterator_base::operator!() +const noexcept +{ + return !static_cast(*this); +} + inline ircd::db::column::const_iterator_base::operator gopts &() { diff --git a/include/ircd/db/domain.h b/include/ircd/db/domain.h index c107faa6f..8c15aaa47 100644 --- a/include/ircd/db/domain.h +++ b/include/ircd/db/domain.h @@ -97,3 +97,10 @@ struct ircd::db::domain::const_reverse_iterator using domain::const_iterator_base::const_iterator_base; }; + +inline const ircd::db::domain::const_iterator_base::value_type * +ircd::db::domain::const_iterator_base::operator->() +const +{ + return &this->operator*(); +} diff --git a/ircd/db.cc b/ircd/db.cc index 29a01fba7..dc2be0d9e 100644 --- a/ircd/db.cc +++ b/ircd/db.cc @@ -6011,19 +6011,6 @@ ircd::db::cell::operator()(const op &op, write(cell::delta{op, *this, val}, sopts); } -ircd::db::cell::operator -string_view() -{ - return val(); -} - -ircd::db::cell::operator -string_view() -const -{ - return val(); -} - ircd::string_view ircd::db::cell::val() { @@ -6266,13 +6253,6 @@ const return val; } -const ircd::db::domain::const_iterator_base::value_type * -ircd::db::domain::const_iterator_base::operator->() -const -{ - return &this->operator*(); -} - /////////////////////////////////////////////////////////////////////////////// // // db/column.h @@ -7411,20 +7391,6 @@ const return val; } -const ircd::db::column::const_iterator_base::value_type * -ircd::db::column::const_iterator_base::operator->() -const -{ - return &operator*(); -} - -bool -ircd::db::column::const_iterator_base::operator!() -const noexcept -{ - return !static_cast(*this); -} - ircd::db::column::const_iterator_base::operator bool() const noexcept {