From 7512f5eae63e721a7abb51985cbecaf41af94121 Mon Sep 17 00:00:00 2001
From: Frank LENORMAND <lenormf@gmail.com>
Date: Mon, 25 Nov 2019 11:34:39 +0100
Subject: 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.
---
 src/normal.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/normal.cc')

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(); });
     };
 
-- 
cgit v1.2.3