xenia/kakoune
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'jjthrash/not-warnings'

Browse Source
This commit is contained in:
Maxime Coste 2015-02-06 23:22:17 +00:00
commit 5b6b04ef9c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/buffer.cc
View File

@ -32,7 +32,7 @@ Buffer::Buffer(String name, Flags flags, BufferLines lines,
for (auto& line : lines) for (auto& line : lines)
{ {
kak_assert(not line->length == 0 and line->data()[line->length-1] == '\n'); kak_assert(not (line->length == 0) and line->data()[line->length-1] == '\n');
} }
static_cast<BufferLines&>(m_lines) = std::move(lines); static_cast<BufferLines&>(m_lines) = std::move(lines);
@ -174,7 +174,7 @@ void Buffer::reload(BufferLines lines, time_t fs_timestamp)
for (size_t l = 0; l < lines.size(); ++l) for (size_t l = 0; l < lines.size(); ++l)
{ {
auto& line = lines[l]; auto& line = lines[l];
kak_assert(not line->length == 0 and line->data()[line->length-1] == '\n'); kak_assert(not (line->length == 0) and line->data()[line->length-1] == '\n');
if (not (m_flags & Flags::NoUndo)) if (not (m_flags & Flags::NoUndo))
m_current_undo_group.emplace_back( m_current_undo_group.emplace_back(
Modification::Insert, LineCount{(int)l}, SharedString{line}); Modification::Insert, LineCount{(int)l}, SharedString{line});