From 2d991e294e1933e64719a961f961f97b53891901 Mon Sep 17 00:00:00 2001 From: k-hara Date: Mon, 9 May 2016 23:25:49 +0900 Subject: [PATCH 1/2] fix mismatch of Scope class member declaration --- src/dscope.d | 1 + src/scope.h | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/dscope.d b/src/dscope.d index b0f189523a1a..c247561d9606 100644 --- a/src/dscope.d +++ b/src/dscope.d @@ -156,6 +156,7 @@ struct Scope int explicitProtection; // set if in an explicit protection attribute StorageClass stc; // storage class + DeprecatedDeclaration depdecl; // customized deprecation message uint flags; diff --git a/src/scope.h b/src/scope.h index 0a3ecf7a3d04..b4be856043bf 100644 --- a/src/scope.h +++ b/src/scope.h @@ -113,7 +113,8 @@ struct Scope int explicitProtection; // set if in an explicit protection attribute StorageClass stc; // storage class - char *depmsg; // customized deprecation message + + DeprecatedDeclaration *depdecl; // customized deprecation message unsigned flags; From 0d4db8dfc466fbde94aca590dddb41f66573adaf Mon Sep 17 00:00:00 2001 From: k-hara Date: Mon, 16 May 2016 10:56:32 +0900 Subject: [PATCH 2/2] ClassReferenceExp.getFieldAt has removed already --- src/ctfe.h | 1 - 1 file changed, 1 deletion(-) diff --git a/src/ctfe.h b/src/ctfe.h index 65a93b789e24..d5e731d4a39a 100644 --- a/src/ctfe.h +++ b/src/ctfe.h @@ -44,7 +44,6 @@ class ClassReferenceExp : public Expression StructLiteralExp *value; ClassReferenceExp(Loc loc, StructLiteralExp *lit, Type *type); ClassDeclaration *originalClass(); - VarDeclaration *getFieldAt(unsigned index); /// Return index of the field, or -1 if not found int getFieldIndex(Type *fieldtype, unsigned fieldoffset);