Fierelier/notepad-plus-plus-legacy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- avoid build issue for unicode:

Browse Source 
2>..\lexers\LexUser.cxx(1406): error C2664: 'void GenerateVector(vvstring &,const char *,char *,int)' : cannot convert argument 3 from 'const wchar_t [3]' to 'char *'
2>          Types pointed to are unrelated; conversion requires reinterpret_cast, C-style cast or function-style cast
This commit is contained in:
Christian Grasser 2015-06-11 10:10:19 +02:00
parent 324a29a848
commit 2a9b099a08
1 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
scintilla/lexers/LexUser.cxx
View File

@ -1403,36 +1403,36 @@ static void ColouriseUserDoc(unsigned int startPos, int length, int initStyle, W
const char * sComments = styler.pprops->Get("userDefine.comments");
// 'GenerateVector' converts strings into vvstring objects
GenerateVector(commentLineOpen, sComments, TEXT("00"), 0);
GenerateVector(commentLineContinue, sComments, TEXT("01"), commentLineOpen.size());
GenerateVector(commentLineClose, sComments, TEXT("02"), commentLineOpen.size());
GenerateVector(commentOpen, sComments, TEXT("03"), 0);
GenerateVector(commentClose, sComments, TEXT("04"), commentOpen.size());
GenerateVector(commentLineOpen, sComments, "00", 0);
GenerateVector(commentLineContinue, sComments, "01", commentLineOpen.size());
GenerateVector(commentLineClose, sComments, "02", commentLineOpen.size());
GenerateVector(commentOpen, sComments, "03", 0);
GenerateVector(commentClose, sComments, "04", commentOpen.size());
GenerateVector(delim1Open, sDelimiters, TEXT("00"), 0);
GenerateVector(delim1Escape, sDelimiters, TEXT("01"), delim1Open.size());
GenerateVector(delim1Close, sDelimiters, TEXT("02"), delim1Open.size());
GenerateVector(delim2Open, sDelimiters, TEXT("03"), 0);
GenerateVector(delim2Escape, sDelimiters, TEXT("04"), delim2Open.size());
GenerateVector(delim2Close, sDelimiters, TEXT("05"), delim2Open.size());
GenerateVector(delim3Open, sDelimiters, TEXT("06"), 0);
GenerateVector(delim3Escape, sDelimiters, TEXT("07"), delim3Open.size());
GenerateVector(delim3Close, sDelimiters, TEXT("08"), delim3Open.size());
GenerateVector(delim4Open, sDelimiters, TEXT("09"), 0);
GenerateVector(delim4Escape, sDelimiters, TEXT("10"), delim4Open.size());
GenerateVector(delim4Close, sDelimiters, TEXT("11"), delim4Open.size());
GenerateVector(delim5Open, sDelimiters, TEXT("12"), 0);
GenerateVector(delim5Escape, sDelimiters, TEXT("13"), delim5Open.size());
GenerateVector(delim5Close, sDelimiters, TEXT("14"), delim5Open.size());
GenerateVector(delim6Open, sDelimiters, TEXT("15"), 0);
GenerateVector(delim6Escape, sDelimiters, TEXT("16"), delim6Open.size());
GenerateVector(delim6Close, sDelimiters, TEXT("17"), delim6Open.size());
GenerateVector(delim7Open, sDelimiters, TEXT("18"), 0);
GenerateVector(delim7Escape, sDelimiters, TEXT("19"), delim7Open.size());
GenerateVector(delim7Close, sDelimiters, TEXT("20"), delim7Open.size());
GenerateVector(delim8Open, sDelimiters, TEXT("21"), 0);
GenerateVector(delim8Escape, sDelimiters, TEXT("22"), delim8Open.size());
GenerateVector(delim8Close, sDelimiters, TEXT("23"), delim8Open.size());
GenerateVector(delim1Open, sDelimiters, "00", 0);
GenerateVector(delim1Escape, sDelimiters, "01", delim1Open.size());
GenerateVector(delim1Close, sDelimiters, "02", delim1Open.size());
GenerateVector(delim2Open, sDelimiters, "03", 0);
GenerateVector(delim2Escape, sDelimiters, "04", delim2Open.size());
GenerateVector(delim2Close, sDelimiters, "05", delim2Open.size());
GenerateVector(delim3Open, sDelimiters, "06", 0);
GenerateVector(delim3Escape, sDelimiters, "07", delim3Open.size());
GenerateVector(delim3Close, sDelimiters, "08", delim3Open.size());
GenerateVector(delim4Open, sDelimiters, "09", 0);
GenerateVector(delim4Escape, sDelimiters, "10", delim4Open.size());
GenerateVector(delim4Close, sDelimiters, "11", delim4Open.size());
GenerateVector(delim5Open, sDelimiters, "12", 0);
GenerateVector(delim5Escape, sDelimiters, "13", delim5Open.size());
GenerateVector(delim5Close, sDelimiters, "14", delim5Open.size());
GenerateVector(delim6Open, sDelimiters, "15", 0);
GenerateVector(delim6Escape, sDelimiters, "16", delim6Open.size());
GenerateVector(delim6Close, sDelimiters, "17", delim6Open.size());
GenerateVector(delim7Open, sDelimiters, "18", 0);
GenerateVector(delim7Escape, sDelimiters, "19", delim7Open.size());
GenerateVector(delim7Close, sDelimiters, "20", delim7Open.size());
GenerateVector(delim8Open, sDelimiters, "21", 0);
GenerateVector(delim8Escape, sDelimiters, "22", delim8Open.size());
GenerateVector(delim8Close, sDelimiters, "23", delim8Open.size());
operators1.clear();
foldersInCode1Open.clear();