github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-07-11 22:03:01 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

ide: CppParser fixed to compile in CLANG11

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@8434 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2015-05-12 06:44:09 +00:00
parent 30412847e4
commit 22af95ab6a
4 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
uppsrc/CppBase/macro.cpp
View file

@ -68,7 +68,7 @@ String CppMacro::Expand(const Vector<String>& p, const Vector<String>& ep) const
variadic = true;
pp.Trim(pp.GetCount() - 1);
}
Index<String> param(pick(Split(pp, ',')));
Index<String> param(Split(pp, ','));
static String VA_ARGS("__VA_ARGS__"); // static - Speed optimization
while(*s) {
if(IsAlpha(*s) || *s == '_') {

2
uppsrc/CppBase/ppfile.cpp
View file

@ -17,7 +17,7 @@ bool IsHFile(const String& path)
void SetSpaces(String& l, int pos, int count)
{
StringBuffer s = l;
StringBuffer s(l);
memset(~s + pos, ' ', count);
l = s;
}

2
uppsrc/ide/Browser/Base.cpp
View file

@ -208,7 +208,7 @@ bool CheckFile(const SourceFileInfo& f, const String& path)
return f.included_id_macros == included_id_macros;
}
void ParseFiles(Progress& pi, const Index<int> parse_file)
void ParseFiles(Progress& pi, const Index<int>& parse_file)
{
pi.SetTotal(parse_file.GetCount());
pi.SetPos(0);

2
uppsrc/ide/Browser/Sch.cpp
View file

@ -108,5 +108,5 @@ Vector<String> PreprocessSchFile(const char *fn)
}
catch(CParser::Error)
{}
return Vector<String>() << r << rr;
return pick(Vector<String>() << r << rr);
}