marko10_000
/
openclonk
forked from Mirrors/openclonk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix build on systems with non-long regex index types

console-destruction
Lukas Werling 2016-09-18 19:40:32 +02:00
parent 823b13d764
commit 880981ad31
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/script/C4Script.cpp
View File

@ -525,7 +525,7 @@ static Nillable<C4ValueArray *> FnRegexSearch(C4PropList * _this, C4String *sour
int char_pos = GetCharacterCount(std::string(data.getData(), pos + m.position()).c_str());
(*out)[i++] = C4VInt(char_pos);
if (flags & Regex_FirstOnly) break;
pos += m.position() + std::max(m.length(), 1l);
pos += m.position() + std::max<size_t>(m.length(), 1);
}
return out;
}
@ -556,7 +556,7 @@ static Nillable<C4ValueArray *> FnRegexMatch(C4PropList * _this, C4String *sourc
}
(*out)[i++] = C4VArray(match);
if (flags & Regex_FirstOnly) break;
pos += m.position() + std::max(m.length(), 1l);
pos += m.position() + std::max<size_t>(m.length(), 1);
}
return out;
}
@ -581,10 +581,10 @@ static Nillable<C4ValueArray *> FnRegexSplit(C4PropList * _this, C4String *sourc
{
// As we're advancing by one character for zero-length matches, always
// include at least one character here.
std::string substr(data.getData() + pos, std::max(m.position(), 1l));
std::string substr(data.getData() + pos, std::max<size_t>(m.position(), 1));
(*out)[i++] = C4VString(String(substr.c_str()));
if (flags & Regex_FirstOnly) break;
pos += m.position() + std::max(m.length(), 1l);
pos += m.position() + std::max<size_t>(m.length(), 1);
}
if (pos <= data.getLength())
{