diff options
| author | Neil <nyamatongwe@gmail.com> | 2017-06-09 11:31:14 +1000 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2017-06-09 11:31:14 +1000 |
| commit | 13324ebe2cc0f222228e00d84ceabd79d695c0fa (patch) | |
| tree | b301543b52452f29a28011cf4970246ef1781ffe /lexers/LexCoffeeScript.cxx | |
| parent | dbefd4e6e1d808505086b3374106ff26ac2a6452 (diff) | |
| download | scintilla-mirror-13324ebe2cc0f222228e00d84ceabd79d695c0fa.tar.gz | |
Backport: Use min and max from std instead of own version from platform.
Backport of changeset 6297:4bf96081f6e6.
Diffstat (limited to 'lexers/LexCoffeeScript.cxx')
| -rw-r--r-- | lexers/LexCoffeeScript.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lexers/LexCoffeeScript.cxx b/lexers/LexCoffeeScript.cxx index 63ee172e2..b835c52ec 100644 --- a/lexers/LexCoffeeScript.cxx +++ b/lexers/LexCoffeeScript.cxx @@ -14,6 +14,8 @@ #include <assert.h> #include <ctype.h> +#include <algorithm> + #include "Platform.h" #include "ILexer.h" #include "Scintilla.h" @@ -427,7 +429,7 @@ static void FoldCoffeeScriptDoc(Sci_PositionU startPos, Sci_Position length, int } const int levelAfterComments = indentNext & SC_FOLDLEVELNUMBERMASK; - const int levelBeforeComments = Platform::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 |