diff options
Diffstat (limited to 'gcc/d')
-rw-r--r-- | gcc/d/dmd/MERGE | 2 | ||||
-rw-r--r-- | gcc/d/dmd/declaration.h | 4 | ||||
-rw-r--r-- | gcc/d/dmd/func.d | 4 |
3 files changed, 7 insertions, 3 deletions
diff --git a/gcc/d/dmd/MERGE b/gcc/d/dmd/MERGE index 57973b1..1be4da4 100644 --- a/gcc/d/dmd/MERGE +++ b/gcc/d/dmd/MERGE @@ -1,4 +1,4 @@ -51be8bb729cfa41ff5af4f5b2a9b7b9902bfdaa1 +fde0f8c40a1b8eb78c3485cb0e940035bfe6fb00 The first line of this file holds the git revision number of the last merge done from the dlang/dmd repository. diff --git a/gcc/d/dmd/declaration.h b/gcc/d/dmd/declaration.h index c535e4c..c7e4552 100644 --- a/gcc/d/dmd/declaration.h +++ b/gcc/d/dmd/declaration.h @@ -128,6 +128,10 @@ public: short inuse; // used to detect cycles uint8_t bitFields; + LINK _linkage() const; + LINK _linkage(LINK v); + bool noUnderscore() const; + const char *kind() const override; uinteger_t size(Loc loc) override final; diff --git a/gcc/d/dmd/func.d b/gcc/d/dmd/func.d index cc17be7..e96c332 100644 --- a/gcc/d/dmd/func.d +++ b/gcc/d/dmd/func.d @@ -1006,12 +1006,12 @@ extern (C++) class FuncDeclaration : Declaration /********************************** * Generate a FuncDeclaration for a runtime library function. */ - extern (D) static FuncDeclaration genCfunc(Parameters* fparams, Type treturn, const(char)* name, STC stc = STC.none) + extern(D) static FuncDeclaration genCfunc(Parameters* fparams, Type treturn, const(char)* name, STC stc = STC.none) { return genCfunc(fparams, treturn, Identifier.idPool(name[0 .. strlen(name)]), stc); } - extern (D) static FuncDeclaration genCfunc(Parameters* fparams, Type treturn, Identifier id, STC stc = STC.none) + extern(D) static FuncDeclaration genCfunc(Parameters* fparams, Type treturn, Identifier id, STC stc = STC.none) { FuncDeclaration fd; TypeFunction tf; |