aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorNeil <nyamatongwe@gmail.com>2014-04-29 11:54:46 +1000
committerNeil <nyamatongwe@gmail.com>2014-04-29 11:54:46 +1000
commitca404c02432f1ab90f235eb452168d35e6f14936 (patch)
treee71de804085c2607800bfd88031ed474f06652d9
parentb358909987be5f7c92e990939e7a2a5f0dafdb3a (diff)
downloadscintilla-mirror-ca404c02432f1ab90f235eb452168d35e6f14936.tar.gz
Fix some warnings instead of relying upon #pragma to hide them
-rw-r--r--lexers/LexCPP.cxx4
-rw-r--r--lexers/LexHTML.cxx4
-rw-r--r--lexers/LexLua.cxx2
-rw-r--r--src/Editor.cxx2
4 files changed, 6 insertions, 6 deletions
diff --git a/lexers/LexCPP.cxx b/lexers/LexCPP.cxx
index e140cd639..fbc2a4578 100644
--- a/lexers/LexCPP.cxx
+++ b/lexers/LexCPP.cxx
@@ -101,7 +101,7 @@ void highlightTaskMarker(StyleContext &sc, LexAccessor &styler,
if (caseSensitive)
marker[i] = ch;
else
- marker[i] = tolower(ch);
+ marker[i] = static_cast<char>(tolower(ch));
i++;
}
marker[i] = '\0';
@@ -621,7 +621,7 @@ void SCI_METHOD LexerCPP::Lex(unsigned int startPos, int length, int initStyle,
}
}
- StyleContext sc(startPos, length, initStyle, styler, static_cast<char>(0xff));
+ StyleContext sc(startPos, length, initStyle, styler, static_cast<unsigned char>(0xff));
LinePPState preproc = vlls.ForLine(lineCurrent);
bool definitionsChanged = false;
diff --git a/lexers/LexHTML.cxx b/lexers/LexHTML.cxx
index 501e5486a..f5da934d2 100644
--- a/lexers/LexHTML.cxx
+++ b/lexers/LexHTML.cxx
@@ -577,7 +577,7 @@ static void ColouriseHyperTextDoc(unsigned int startPos, int length, int initSty
WordList &keywords6 = *keywordlists[5]; // SGML (DTD) keywords
// Lexer for HTML requires more lexical states (8 bits worth) than most lexers
- styler.StartAt(startPos, static_cast<char>(STYLE_MAX));
+ styler.StartAt(startPos, static_cast<unsigned char>(STYLE_MAX));
char prevWord[200];
prevWord[0] = '\0';
char phpStringDelimiter[200]; // PHP is not limited in length, we are
@@ -609,7 +609,7 @@ static void ColouriseHyperTextDoc(unsigned int startPos, int length, int initSty
if (startPos == 0)
state = SCE_H_DEFAULT;
}
- styler.StartAt(startPos, static_cast<char>(STYLE_MAX));
+ styler.StartAt(startPos, static_cast<unsigned char>(STYLE_MAX));
int lineCurrent = styler.GetLine(startPos);
int lineState;
diff --git a/lexers/LexLua.cxx b/lexers/LexLua.cxx
index 62bb44dd1..fd0d70fd4 100644
--- a/lexers/LexLua.cxx
+++ b/lexers/LexLua.cxx
@@ -141,7 +141,7 @@ static void ColouriseLuaDoc(
char s[100];
while (setWord.Contains(c = sc.GetRelative(ln))) { // get potential label
if (i < 90)
- s[i++] = c;
+ s[i++] = static_cast<char>(c);
ln++;
}
s[i] = '\0'; int lbl = ln;
diff --git a/src/Editor.cxx b/src/Editor.cxx
index 1b51f7426..2ad5f5863 100644
--- a/src/Editor.cxx
+++ b/src/Editor.cxx
@@ -7306,7 +7306,7 @@ void Editor::AddStyledText(char *buffer, int appendLength) {
for (i = 0; i < textLength; i++) {
text[i] = buffer[i*2+1];
}
- pdoc->StartStyling(CurrentPosition(), static_cast<char>(0xff));
+ pdoc->StartStyling(CurrentPosition(), static_cast<unsigned char>(0xff));
pdoc->SetStyles(textLength, text.c_str());
SetEmptySelection(sel.MainCaret() + lengthInserted);
}