diff options
| author | Neil <nyamatongwe@gmail.com> | 2018-05-16 16:10:13 +1000 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2018-05-16 16:10:13 +1000 |
| commit | 27f9d447ab961b5ec314a290622afdb12ab5f0e2 (patch) | |
| tree | 307b837379966b4fbd44fecd55b9123d7fedde65 | |
| parent | 1172094322af0d3dfc03ff813b15ade18633c421 (diff) | |
| download | scintilla-mirror-27f9d447ab961b5ec314a290622afdb12ab5f0e2.tar.gz | |
Backport: Use standard library function.
Backport of changeset 6954:e8727d804074.
| -rw-r--r-- | lexers/LexPython.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lexers/LexPython.cxx b/lexers/LexPython.cxx index df80e499b..6cfb03b5e 100644 --- a/lexers/LexPython.cxx +++ b/lexers/LexPython.cxx @@ -15,6 +15,7 @@ #include <string> #include <vector> #include <map> +#include <algorithm> #include "ILexer.h" #include "Scintilla.h" @@ -929,7 +930,7 @@ void SCI_METHOD LexerPython::Fold(Sci_PositionU startPos, Sci_Position length, i } const int levelAfterComments = ((lineNext < docLines) ? indentNext & SC_FOLDLEVELNUMBERMASK : minCommentLevel); - const int levelBeforeComments = Maximum(indentCurrentLevel, levelAfterComments); + const int levelBeforeComments = std::max(indentCurrentLevel, levelAfterComments); // Now set all the indent levels on the lines we skipped // Do this from end to start. Once we encounter one line |