alx/mu4e
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lib: replace CATCH_BLOCK macros with template magic

Browse Source
This commit is contained in:
Dirk-Jan C. Binnema
2021-10-18 12:22:26 +03:00
parent 7156ff7fac
commit 49637dbc3a
6 changed files with 172 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/mu-query-match-deciders.cc
View File

@ -98,12 +98,14 @@ struct MatchDecider : public Xapian::MatchDecider {
DeciderInfo & decider_info_;
private:
Option<std::string> opt_string (const Xapian::Document &doc, MuMsgFieldId id) const noexcept
try {
auto &&val{doc.get_value (id)};
return val.empty() ? Nothing : Some (val);
}
MU_XAPIAN_CATCH_BLOCK_RETURN (Nothing);
Option<std::string> opt_string (const Xapian::Document &doc, MuMsgFieldId id)
const noexcept {
std::string val = xapian_try([&]{ return doc.get_value (id);}, std::string{""});
if (val.empty())
return Nothing;
else
return Some(std::move(val));
}
};
struct MatchDeciderLeader final : public MatchDecider {