diff options
| author | nyamatongwe <devnull@localhost> | 2010-01-26 22:25:03 +0000 |
|---|---|---|
| committer | nyamatongwe <devnull@localhost> | 2010-01-26 22:25:03 +0000 |
| commit | 101ee5a0fee21c9b8ed72734af6a6f744085a24d (patch) | |
| tree | aac6422a5cbd96548adbff5d3d16b429838b76fd | |
| parent | 68c15f67832a984bbcab327c29039c1210addd40 (diff) | |
| download | scintilla-mirror-101ee5a0fee21c9b8ed72734af6a6f744085a24d.tar.gz | |
Fix to allow compiling on old version of GCC 3.3.3. Bug #2940511.
| -rw-r--r-- | src/Editor.cxx | 4 | ||||
| -rw-r--r-- | src/PositionCache.cxx | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/Editor.cxx b/src/Editor.cxx index b57b0c85a..e1dcb38bc 100644 --- a/src/Editor.cxx +++ b/src/Editor.cxx @@ -2909,7 +2909,9 @@ void Editor::DrawLine(Surface *surface, ViewStyle &vsDraw, int line, int lineVis if (subLine == (ll->lines - 1)) { virtualSpaces = sel.VirtualSpaceFor(pdoc->LineEnd(line)); } - SelectionSegment virtualSpaceRange(SelectionPosition(posLineStart), SelectionPosition(posLineStart + lineEnd, virtualSpaces)); + SelectionPosition posStart(posLineStart); + SelectionPosition posEnd(posLineStart + lineEnd, virtualSpaces); + SelectionSegment virtualSpaceRange(posStart, posEnd); for (size_t r=0; r<sel.Count(); r++) { int alpha = (r == sel.Main()) ? vsDraw.selAlpha : vsDraw.selAdditionalAlpha; if (alpha != SC_ALPHA_NOALPHA) { diff --git a/src/PositionCache.cxx b/src/PositionCache.cxx index fa2d581e1..7bb0106fa 100644 --- a/src/PositionCache.cxx +++ b/src/PositionCache.cxx @@ -413,7 +413,9 @@ BreakFinder::BreakFinder(LineLayout *ll_, int lineStart_, int lineEnd_, int posL } if (breakForSelection) { - SelectionSegment segmentLine(SelectionPosition(posLineStart), SelectionPosition(posLineStart + lineEnd)); + SelectionPosition posStart(posLineStart); + SelectionPosition posEnd(posLineStart + lineEnd); + SelectionSegment segmentLine(posStart, posEnd); for (size_t r=0; r<ll->psel->Count(); r++) { SelectionSegment portion = ll->psel->Range(r).Intersect(segmentLine); if (!(portion.start == portion.end)) { |