summaryrefslogtreecommitdiffstats
path: root/vespalib
diff options
context:
space:
mode:
authorArne Juul <arnej@verizonmedia.com>2020-05-28 11:17:01 +0000
committerArne Juul <arnej@verizonmedia.com>2020-05-28 11:17:01 +0000
commitaef6f8956f85f0ab76735456225bdb5af1b516a2 (patch)
tree32445bdbf4ab0ee45f5e7d9852af65bf0ed015f9 /vespalib
parente68078428d1b48bbae8bfefad572b7221b862b37 (diff)
rename regex option MultiLine -> DotMatchesNewline
Diffstat (limited to 'vespalib')
-rw-r--r--vespalib/src/vespa/vespalib/regex/regex.cpp2
-rw-r--r--vespalib/src/vespa/vespalib/regex/regex.h6
2 files changed, 4 insertions, 4 deletions
diff --git a/vespalib/src/vespa/vespalib/regex/regex.cpp b/vespalib/src/vespa/vespalib/regex/regex.cpp
index fcae9b3f11a..ebdbb256d19 100644
--- a/vespalib/src/vespa/vespalib/regex/regex.cpp
+++ b/vespalib/src/vespa/vespalib/regex/regex.cpp
@@ -58,7 +58,7 @@ Regex Regex::from_pattern(std::string_view pattern, uint32_t opt_mask) {
if ((opt_mask & Options::IgnoreCase) != 0) {
opts.set_case_sensitive(false);
}
- if ((opt_mask & Options::MultiLine) != 0) {
+ if ((opt_mask & Options::DotMatchesNewline) != 0) {
opts.set_dot_nl(true);
}
return Regex(std::make_shared<const Impl>(pattern, opts));
diff --git a/vespalib/src/vespa/vespalib/regex/regex.h b/vespalib/src/vespa/vespalib/regex/regex.h
index 01207ee3e49..0c80f4e5d3a 100644
--- a/vespalib/src/vespa/vespalib/regex/regex.h
+++ b/vespalib/src/vespa/vespalib/regex/regex.h
@@ -43,9 +43,9 @@ class Regex {
public:
// TODO consider using type-safe parameter instead.
enum Options {
- None = 0,
- IgnoreCase = 1,
- MultiLine = 2
+ None = 0,
+ IgnoreCase = 1,
+ DotMatchesNewline = 2
};
~Regex();