Resolved small merge conflict.

FuncAliasDeclaration::mangle() was wrongly put into '#if IN_DMD' block.
This commit is contained in:
Alexey Prokhin
2012-04-21 17:59:34 +04:00
parent 7e23eb5047
commit 21a926c936

View File

@@ -928,8 +928,8 @@ struct FuncAliasDeclaration : FuncDeclaration
const char *kind();
#if IN_DMD
Symbol *toSymbol();
char *mangle() { return toAliasFunc()->mangle(); }
#endif
char *mangle() { return toAliasFunc()->mangle(); }
FuncDeclaration *toAliasFunc();
};