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

mu: rework xapian dependencies a bit

Browse Source 
Reduce the places where we need to include Xapian, and add a few places where
the (meson build) didn't explicitly have a Xapian dep where needed.
This commit is contained in:
Dirk-Jan C. Binnema
2021-11-03 12:30:37 +02:00
parent 1c95d28cde
commit 8028f88a51
9 changed files with 76 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
lib/utils/mu-utils.hh
View File

@ -29,7 +29,6 @@
#include <ostream>
#include <iostream>
#include <type_traits>
#include <xapian.h>
namespace Mu {
@ -277,35 +276,6 @@ private:
const bool color_;
};
template <typename Func>
void
xapian_try(Func&& func) noexcept
try {
func();
} catch (const Xapian::Error& xerr) {
g_critical("%s: xapian error '%s'", __func__, xerr.get_msg().c_str());
} catch (const std::runtime_error& re) {
g_critical("%s: error: %s", __func__, re.what());
} catch (...) {
g_critical("%s: caught exception", __func__);
}
template <typename Func, typename Default = std::invoke_result<Func>>
auto
xapian_try(Func&& func, Default&& def) noexcept -> std::decay_t<decltype(func())>
try {
return func();
} catch (const Xapian::Error& xerr) {
g_critical("%s: xapian error '%s'", __func__, xerr.get_msg().c_str());
return static_cast<Default>(def);
} catch (const std::runtime_error& re) {
g_critical("%s: error: %s", __func__, re.what());
return static_cast<Default>(def);
} catch (...) {
g_critical("%s: caught exception", __func__);
return static_cast<Default>(def);
}
/// Allow using enum structs as bitflags
#define MU_TO_NUM(ET, ELM) std::underlying_type_t<ET>(ELM)
#define MU_TO_ENUM(ET, NUM) static_cast<ET>(NUM)