OSDN > Pesquisar Software > Text Editors > Alpha > SCM > hg > alpha > Commit

Alpha
Fork

alpha: Commit

diff -r a29b7837b494 -r e8e14d478ece ascension/src/kernel/undo.cpp

--- a/ascension/src/kernel/undo.cpp Fri Oct 27 00:20:30 2017 +0900

+++ b/ascension/src/kernel/undo.cpp Wed Jan 10 00:13:19 2018 +0900

		@@ -745,8 +745,8 @@
745	745	firstLine.text_.replace(offsetInLine(beginning), erasedLength, temp);
746	746	}
747	747	} catch(...) {
748		- const ascension::detail::GapVector<Line*>::const_iterator b(std::begin(lines_) + kernel::line(end) + 1);
749		- const ascension::detail::GapVector<Line*>::const_iterator e(b + allocatedLines.size());
	748	+ const auto b(std::next(std::begin(lines_), kernel::line(end) + 1));
	749	+ const auto e(std::next(b, allocatedLines.size()));
750	750	std::for_each(b, e, std::default_delete<Line>());
751	751	lines_.erase(b, e);
752	752	throw;

		@@ -763,7 +763,7 @@
763	763
764	764	// 5. remove lines to erase
765	765	if(!boost::empty(region)) {
766		- const auto b(std::begin(lines_) + kernel::line(beginning) + 1), e(std::begin(lines_) + kernel::line(end) + 1);
	766	+ const auto b(std::next(std::begin(lines_), kernel::line(beginning) + 1)), e(std::next(std::begin(lines_), kernel::line(end) + 1));
767	767	std::for_each(b, e, std::default_delete<Line>());
768	768	lines_.erase(b, e);
769	769	}