diff options
| author | Frank LENORMAND <lenormf@gmail.com> | 2019-11-25 11:34:39 +0100 |
|---|---|---|
| committer | Frank LENORMAND <lenormf@gmail.com> | 2019-11-25 11:34:39 +0100 |
| commit | 7512f5eae63e721a7abb51985cbecaf41af94121 (patch) | |
| tree | b7c6e9dbe77c1c8fec9db47f2591dbc71fa11f55 /src | |
| parent | 7b3ab2378081fee6a9a4fd3c2790bd80dc16e35e (diff) | |
src: Use `begin()` to get iterators
When compiling the code with `-Wp,-D_GLIBCXX_ASSERTIONS`, the process
gets aborted, likely because iterators to standard containers are
not obtained in a safe way.
Fixes #3226.
Diffstat (limited to 'src')
| -rw-r--r-- | src/buffer.cc | 2 | ||||
| -rw-r--r-- | src/normal.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/buffer.cc b/src/buffer.cc index 6088c8a8..90a4e9f2 100644 --- a/src/buffer.cc +++ b/src/buffer.cc @@ -282,7 +282,7 @@ void Buffer::reload(StringView data, timespec fs_timestamp) parsed_lines.lines[(int)(d.posB + line)]}); m_changes.push_back({ Change::Insert, cur_line, cur_line + d.len }); - m_lines.insert(it, &parsed_lines.lines[d.posB], &parsed_lines.lines[d.posB + d.len]); + m_lines.insert(it, parsed_lines.lines.begin() + d.posB, parsed_lines.lines.begin() + d.posB + d.len); it = m_lines.begin() + (int)(cur_line + d.len); } else if (d.mode == Diff::Remove) diff --git a/src/normal.cc b/src/normal.cc index 1b287e5f..fd46dab9 100644 --- a/src/normal.cc +++ b/src/normal.cc @@ -512,7 +512,7 @@ BufferCoord apply_diff(Buffer& buffer, BufferCoord pos, StringView before, Strin lines_after.begin(), (int)lines_after.size()); auto byte_count = [](auto&& lines, int first, int count) { - return std::accumulate(&lines[first], &lines[first+count], 0_byte, + return std::accumulate(lines.begin() + first, lines.begin() + first + count, 0_byte, [](ByteCount l, StringView s) { return l + s.length(); }); }; |
