From 2a1338ce2d7c813db6f650154e2e3b6fdde06ff5 Mon Sep 17 00:00:00 2001 From: Neil Date: Sat, 21 Apr 2018 08:43:03 +1000 Subject: Backport: Tighten definition of regular expression iterators so they are noexcept and define all the standard member functions. This cascades to all methods called by the iterators, affecting Document, CellBuffer, Partitioning, SplitVector and UTF-8 and DBCS functions. Other trivial functions declared noexcept. Backport of changeset 6724:f2dfdc0dddd3. --- src/PositionCache.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/PositionCache.cxx') diff --git a/src/PositionCache.cxx b/src/PositionCache.cxx index 2086b7190..1e62f4629 100644 --- a/src/PositionCache.cxx +++ b/src/PositionCache.cxx @@ -497,7 +497,7 @@ TextSegment BreakFinder::Next() { charWidth = UTF8DrawBytes(reinterpret_cast(&ll->chars[nextBreak]), static_cast(lineRange.end - nextBreak)); else if (encodingFamily == efDBCS) - charWidth = pdoc->IsDBCSLeadByte(ll->chars[nextBreak]) ? 2 : 1; + charWidth = pdoc->IsDBCSLeadByteNoExcept(ll->chars[nextBreak]) ? 2 : 1; const Representation *repr = preprs->RepresentationFromCharacter(&ll->chars[nextBreak], charWidth); if (((nextBreak > 0) && (ll->styles[nextBreak] != ll->styles[nextBreak - 1])) || repr || -- cgit v1.2.3