emacs
/
mu
mirror of https://github.com/djcb/mu.git
1
0
Fork 0
Code Issues Releases Wiki Activity

mu-regex: make backward-compatible with older glib

This commit is contained in:
Dirk-Jan C. Binnema 2022-12-31 00:10:24 +02:00
parent feb436ce96
commit 60e9d54a7c
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/utils/mu-regex.hh
View File

@ -28,6 +28,10 @@ namespace Mu {
* PCRE rather than std::regex because it is much faster. * PCRE rather than std::regex because it is much faster.
*/ */
struct Regex { struct Regex {
#if !GLIB_CHECK_VERSION(2,74,0) /* backward compat */
#define G_REGEX_DEFAULT (static_cast<GRegexCompileFlags>(0))
#define G_REGEX_MATCH_DEFAULT (static_cast<GRegexMatchFlags>(0))
#endif
/** /**
* Trivial constructor * Trivial constructor
* *
@ -35,7 +39,6 @@ struct Regex {
*/ */
Regex() noexcept: rx_{} {} Regex() noexcept: rx_{} {}
/** /**
* Construct a new Regex object * Construct a new Regex object
* *
@ -47,7 +50,7 @@ struct Regex {
*/ */
static Result<Regex> make(const std::string& ptrn, static Result<Regex> make(const std::string& ptrn,
GRegexCompileFlags cflags = G_REGEX_DEFAULT, GRegexCompileFlags cflags = G_REGEX_DEFAULT,
GRegexMatchFlags mflags = G_REGEX_MATCH_DEFAULT) noexcept try { GRegexMatchFlags mflags = G_REGEX_MATCH_DEFAULT) noexcept try {
return Regex(ptrn.c_str(), cflags, mflags); return Regex(ptrn.c_str(), cflags, mflags);
} catch (const Error& err) { } catch (const Error& err) {
return Err(err); return Err(err);