diff --git a/src/vtbackend/Line.cpp b/src/vtbackend/Line.cpp index f965cfe1b9..b9d0f49c41 100644 --- a/src/vtbackend/Line.cpp +++ b/src/vtbackend/Line.cpp @@ -173,9 +173,9 @@ struct TrivialLineInflater { vtParserLog()("Inflating TrivialLineBuffer: '{}'", input.text.data() ? crispy::escape(input.text.data()) : ""); auto lineSegmenter = unicode::grapheme_line_segmenter { *this, input.text.view() }; - auto result = lineSegmenter.process(std::numeric_limits<unsigned>::max()); + [[maybe_unused]] auto result = lineSegmenter.process(std::numeric_limits<unsigned>::max()); assert(result.stop_condition == unicode::StopCondition::EndOfInput); - auto const flushed = lineSegmenter.flush(std::numeric_limits<unsigned>::max()); + [[maybe_unused]] auto const flushed = lineSegmenter.flush(std::numeric_limits<unsigned>::max()); assert(flushed.stop_condition == unicode::StopCondition::EndOfInput); vtParserLog()("Inflated {}/{} columns", columns.size(), input.displayWidth); diff --git a/src/vtbackend/Screen.h b/src/vtbackend/Screen.h index 8e01778b3d..66582139f0 100644 --- a/src/vtbackend/Screen.h +++ b/src/vtbackend/Screen.h @@ -673,8 +673,8 @@ inline bool Screen<Cell>::isContiguousToCurrentLine(std::string_view continuatio #if !defined(_WIN32) return line.isTrivialBuffer() && line.trivialBuffer().text.view().end() == continuationChars.begin(); #else - auto const end = line.trivialBuffer().text.data() + line.trivialBuffer().text.size(); - auto const next = continuationChars.data(); + char const* const end = line.trivialBuffer().text.data() + line.trivialBuffer().text.size(); + char const* const next = continuationChars.data(); return line.isTrivialBuffer() && end == next; // TODO: && line.trivialBuffer().text.view().end() == continuationChars.begin(); #endif diff --git a/src/vtbackend/ViCommands.cpp b/src/vtbackend/ViCommands.cpp index a3dc30655a..9ebca8fd48 100644 --- a/src/vtbackend/ViCommands.cpp +++ b/src/vtbackend/ViCommands.cpp @@ -114,7 +114,7 @@ namespace return terminal.alternateScreen().grid().rightMostNonEmptyAt(lineOffset); } - constexpr std::optional<std::pair<char, bool>> matchingPairOfChar(char32_t input) noexcept + constexpr std::optional<std::pair<char32_t, bool>> matchingPairOfChar(char32_t input) noexcept { auto constexpr Pairs = std::array { std::pair { U'(', U')' },