aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorNeil <nyamatongwe@gmail.com>2018-09-16 08:58:56 +1000
committerNeil <nyamatongwe@gmail.com>2018-09-16 08:58:56 +1000
commit7b848b8c5f0ae43f3b7e4cc9ebacededfa517a2c (patch)
tree1ad14a8251239dd95e113b9b40ab6faef1facbf5
parentc074a75e2915680eff813d388d9e5915708ed4e1 (diff)
downloadscintilla-mirror-7b848b8c5f0ae43f3b7e4cc9ebacededfa517a2c.tar.gz
Backport: Moved declaration to avoid warnings from linters.
Backport of changeset 7087:e408638433a4.
-rw-r--r--src/Document.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Document.cxx b/src/Document.cxx
index df3f0d5f5..e038e5203 100644
--- a/src/Document.cxx
+++ b/src/Document.cxx
@@ -2983,7 +2983,6 @@ std::regex_constants::match_flag_type MatchFlags(const Document *doc, Sci::Posit
template<typename Iterator, typename Regex>
bool MatchOnLines(const Document *doc, const Regex &regexp, const RESearchRange &resr, RESearch &search) {
- bool matched = false;
std::match_results<Iterator> match;
// MSVC and libc++ have problems with ^ and $ matching line ends inside a range.
@@ -2997,9 +2996,10 @@ bool MatchOnLines(const Document *doc, const Regex &regexp, const RESearchRange
Iterator itStart(doc, resr.startPos);
Iterator itEnd(doc, resr.endPos);
const std::regex_constants::match_flag_type flagsMatch = MatchFlags(doc, resr.startPos, resr.endPos);
- matched = std::regex_search(itStart, itEnd, match, regexp, flagsMatch);
+ const bool matched = std::regex_search(itStart, itEnd, match, regexp, flagsMatch);
#else
// Line by line.
+ bool matched = false;
for (Sci::Line line = resr.lineRangeStart; line != resr.lineRangeBreak; line += resr.increment) {
const Range lineRange = resr.LineRange(line);
Iterator itStart(doc, lineRange.start);