diff options
| author | Neil <nyamatongwe@gmail.com> | 2016-11-05 15:04:09 +1100 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2016-11-05 15:04:09 +1100 |
| commit | 1e36c7e89248cf5f9e4353673918e79cfcaeb857 (patch) | |
| tree | cbac5d80a9bb74195dbee65c85db786ee515e7f4 | |
| parent | d489cd587b72a62eddc8da9b6e9ef56221bbd334 (diff) | |
| download | scintilla-mirror-1e36c7e89248cf5f9e4353673918e79cfcaeb857.tar.gz | |
StyleContext no longer needs mask argument.
Remove warning suppression pragma no longer needed for Perl's StyleContext.
| -rw-r--r-- | lexers/LexCPP.cxx | 2 | ||||
| -rw-r--r-- | lexers/LexPerl.cxx | 2 | ||||
| -rw-r--r-- | lexlib/LexerModule.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/lexers/LexCPP.cxx b/lexers/LexCPP.cxx index 64387a085..ec040fbf6 100644 --- a/lexers/LexCPP.cxx +++ b/lexers/LexCPP.cxx @@ -692,7 +692,7 @@ void SCI_METHOD LexerCPP::Lex(Sci_PositionU startPos, Sci_Position length, int i } } - StyleContext sc(startPos, length, initStyle, styler, static_cast<unsigned char>(0xff)); + StyleContext sc(startPos, length, initStyle, styler); LinePPState preproc = vlls.ForLine(lineCurrent); bool definitionsChanged = false; diff --git a/lexers/LexPerl.cxx b/lexers/LexPerl.cxx index 3b10b47e6..b3c5d5899 100644 --- a/lexers/LexPerl.cxx +++ b/lexers/LexPerl.cxx @@ -755,7 +755,7 @@ void SCI_METHOD LexerPerl::Lex(Sci_PositionU startPos, Sci_Position length, int backPos++; } - StyleContext sc(startPos, endPos - startPos, initStyle, styler, static_cast<char>(STYLE_MAX)); + StyleContext sc(startPos, endPos - startPos, initStyle, styler); for (; sc.More(); sc.Forward()) { diff --git a/lexlib/LexerModule.h b/lexlib/LexerModule.h index 356ff27e9..a561cf151 100644 --- a/lexlib/LexerModule.h +++ b/lexlib/LexerModule.h @@ -67,7 +67,7 @@ inline int Maximum(int a, int b) { // Shut up annoying Visual C++ warnings: #ifdef _MSC_VER -#pragma warning(disable: 4244 4309 4456 4457) +#pragma warning(disable: 4244 4456 4457) #endif // Turn off shadow warnings for lexers as may be maintained by others |