diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2021-10-01 14:06:42 +0100 |
|---|---|---|
| committer | Jonathan Wakely <jwakely@redhat.com> | 2021-10-01 15:04:03 +0100 |
| commit | 17374dab3eefd282977ad90743c9aff97f2e41ce (patch) | |
| tree | c2955fe3f1ba3e0ca7703dbda87e9f4e036fd3a6 | |
| parent | 94311bf34704ebecf745043fe2df03df201052fe (diff) | |
| download | gcc-17374dab3eefd282977ad90743c9aff97f2e41ce.zip gcc-17374dab3eefd282977ad90743c9aff97f2e41ce.tar.gz gcc-17374dab3eefd282977ad90743c9aff97f2e41ce.tar.bz2 | |
libstdc++: Define basic_regex::multiline for non-strict modes
The regex_constants::multiline constant is defined for non-strict C++11
and C++14 modes, on the basis that the feature is a DR (even though it
was really a new feature addition to C++17 and probably shouldn't have
gone through the issues list).
This makes the basic_regex::multiline constant defined consistently with
the regex_constants::multiline one.
For strict C++11 and C++14 mode we don't define them, because multiline
is not a reserved name in those standards.
libstdc++-v3/ChangeLog:
* include/bits/regex.h (basic_regex::multiline): Define for
non-strict C++11 and C++14 modes.
* include/bits/regex_constants.h (regex_constants::multiline):
Add _GLIBCXX_RESOLVE_LIB_DEFECTS comment.
| -rw-r--r-- | libstdc++-v3/include/bits/regex.h | 2 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/regex_constants.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/libstdc++-v3/include/bits/regex.h b/libstdc++-v3/include/bits/regex.h index 664944b..ff908da 100644 --- a/libstdc++-v3/include/bits/regex.h +++ b/libstdc++-v3/include/bits/regex.h @@ -424,7 +424,7 @@ _GLIBCXX_BEGIN_NAMESPACE_CXX11 static constexpr flag_type awk = regex_constants::awk; static constexpr flag_type grep = regex_constants::grep; static constexpr flag_type egrep = regex_constants::egrep; -#if __cplusplus >= 201703L +#if __cplusplus >= 201703L || !defined __STRICT_ANSI__ static constexpr flag_type multiline = regex_constants::multiline; #endif ///@} diff --git a/libstdc++-v3/include/bits/regex_constants.h b/libstdc++-v3/include/bits/regex_constants.h index af689ff..0fd2879 100644 --- a/libstdc++-v3/include/bits/regex_constants.h +++ b/libstdc++-v3/include/bits/regex_constants.h @@ -171,6 +171,8 @@ namespace regex_constants static_cast<syntax_option_type>(1 << _S_egrep); #if __cplusplus >= 201703L || !defined __STRICT_ANSI__ + // _GLIBCXX_RESOLVE_LIB_DEFECTS + // 2503. multiline option should be added to syntax_option_type /** * Specifies that the `^` anchor matches at the beginning of a line, * and the `$` anchor matches at the end of a line, not only at the |