@@ -6881,7 +6881,7 @@ Expression *evaluateIfBuiltin(UnionExp *pue, InterState *istate, Loc loc,
const char *id = fd->ident->toChars();
size_t idlen = strlen(id);
if (nargs == 2 && (idlen == 10 || idlen == 11) &&
- startswith (id, "_aApply"))
+ !strncmp(id, "_aApply", 7))
{
// Functions from aApply.d and aApplyR.d in the runtime
bool rvs = (idlen == 11); // true if foreach_reverse
@@ -673,7 +673,7 @@ public:
cd == ClassDeclaration::object ||
cd == Type::typeinfoclass ||
cd == Module::moduleinfo ||
- startswith (cd->ident->toChars(), "TypeInfo_"))
+ strncmp(cd->ident->toChars(), "TypeInfo_", 9) == 0)
{
// Don't mangle parent
ad->parent = NULL;
@@ -3212,7 +3212,7 @@ public:
}
else if (p->type->ty == Tident &&
strlen(((TypeIdentifier *)p->type)->ident->toChars()) > 3 &&
- startswith (((TypeIdentifier *)p->type)->ident->toChars(), "__T"))
+ strncmp(((TypeIdentifier *)p->type)->ident->toChars(), "__T", 3) == 0)
{
// print parameter name, instead of undetermined type parameter
buf->writestring(p->ident->toChars());
@@ -73,11 +73,11 @@ const char *Identifier::toHChars2()
{ p = toChars();
if (*p == '_')
{
- if (startswith(p, "_staticCtor"))
+ if (strncmp(p, "_staticCtor", 11) == 0)
p = "static this";
- else if (startswith(p, "_staticDtor"))
+ else if (strncmp(p, "_staticDtor", 11) == 0)
p = "static ~this";
- else if (startswith(p, "__invariant"))
+ else if (strncmp(p, "__invariant", 11) == 0)
p = "invariant";
}
}