diff options
| author | Neil <nyamatongwe@gmail.com> | 2017-03-31 23:21:05 +1100 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2017-03-31 23:21:05 +1100 |
| commit | 9a3399828738c816bd40d2e0e87b36894a0e67e7 (patch) | |
| tree | 8046324259fe1625e849ae46d2d9ebbb599e271f /src/Document.cxx | |
| parent | 20a8cd5d081f553232f7443d4e2b73f83ca389d3 (diff) | |
| download | scintilla-mirror-9a3399828738c816bd40d2e0e87b36894a0e67e7.tar.gz | |
Prefer standard min/max over Platform's as adapts to changed types.
Diffstat (limited to 'src/Document.cxx')
| -rw-r--r-- | src/Document.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Document.cxx b/src/Document.cxx index 344534868..8c4fd36dc 100644 --- a/src/Document.cxx +++ b/src/Document.cxx @@ -448,7 +448,7 @@ Sci::Line Document::GetLastChild(Sci::Line lineParent, int level, Sci::Line last if (level == -1) level = LevelNumber(GetLevel(lineParent)); Sci::Line maxLine = LinesTotal(); - Sci::Line lookLastLine = (lastLine != -1) ? Platform::Minimum(LinesTotal() - 1, lastLine) : -1; + Sci::Line lookLastLine = (lastLine != -1) ? std::min(LinesTotal() - 1, lastLine) : -1; Sci::Line lineMaxSubord = lineParent; while (lineMaxSubord < maxLine - 1) { EnsureStyledTo(LineStart(lineMaxSubord + 2)); @@ -488,7 +488,7 @@ Sci::Line Document::GetFoldParent(Sci::Line line) const { void Document::GetHighlightDelimiters(HighlightDelimiter &highlightDelimiter, Sci::Line line, Sci::Line lastLine) { int level = GetLevel(line); - Sci::Line lookLastLine = Platform::Maximum(line, lastLine) + 1; + Sci::Line lookLastLine = std::max(line, lastLine) + 1; Sci::Line lookLine = line; int lookLineLevel = level; @@ -1863,7 +1863,7 @@ long Document::FindText(Sci::Position minPos, Sci::Position maxPos, const char * const Sci::Position lengthFind = *length; //Platform::DebugPrintf("Find %d %d %s %d\n", startPos, endPos, ft->lpstrText, lengthFind); - const Sci::Position limitPos = Platform::Maximum(startPos, endPos); + const Sci::Position limitPos = std::max(startPos, endPos); Sci::Position pos = startPos; if (!forward) { // Back all of a character |