From 13324ebe2cc0f222228e00d84ceabd79d695c0fa Mon Sep 17 00:00:00 2001 From: Neil Date: Fri, 9 Jun 2017 11:31:14 +1000 Subject: Backport: Use min and max from std instead of own version from platform. Backport of changeset 6297:4bf96081f6e6. --- lexers/LexCoffeeScript.cxx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'lexers') 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 #include +#include + #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 -- cgit v1.2.3