diff options
| author | Karen Arutyunov <karen@codesynthesis.com> | 2021-03-04 17:27:49 +0300 |
|---|---|---|
| committer | Karen Arutyunov <karen@codesynthesis.com> | 2021-03-04 21:59:30 +0300 |
| commit | 3c9f227c44f4688250df9399ea3d2f89ee7d53b6 (patch) | |
| tree | 55bdd8e385427195f7c8e8bf90649d4b05224f22 | |
| parent | a31e93b680558d5e37d88024d4bd985bb6855af5 (diff) | |
Enable regex linkage failure workaround for all libcpp versions
| -rw-r--r-- | libbuild2/script/regex.hxx | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/libbuild2/script/regex.hxx b/libbuild2/script/regex.hxx index 566ff92..e043c99 100644 --- a/libbuild2/script/regex.hxx +++ b/libbuild2/script/regex.hxx @@ -25,10 +25,10 @@ namespace build2 enum class char_flags: uint16_t { icase = 0x1, // Case-insensitive match. - idot = 0x2, // Invert '.' escaping. + idot = 0x2, // Invert '.' escaping. - none = 0 - }; + none = 0 + }; // Restricts valid standard flags to just {icase}, extends with custom // flags {idot}. @@ -66,9 +66,9 @@ namespace build2 enum class line_type { special, - literal, - regex - }; + literal, + regex + }; struct line_char { @@ -625,7 +625,8 @@ namespace std // specialize the class template to behave as the __match_any<line_char> // instantiation does (that luckily has all the functions in place). // -#if defined(_LIBCPP_VERSION) && _LIBCPP_VERSION <= 11000 +//#if defined(_LIBCPP_VERSION) && _LIBCPP_VERSION <= 11000 +#ifdef _LIBCPP_VERSION template <> class __match_any_but_newline<build2::script::regex::line_char> : public __match_any<build2::script::regex::line_char> |