Skip to content

Commit aff3d07

Browse files
committed
Fix some frontend C++ header regressions
1 parent 896cfe4 commit aff3d07

File tree

5 files changed

+5
-5
lines changed

5 files changed

+5
-5
lines changed

dmd/declaration.h

-3
Original file line numberDiff line numberDiff line change
@@ -866,9 +866,6 @@ class UnitTestDeclaration : public FuncDeclaration
866866
class NewDeclaration : public FuncDeclaration
867867
{
868868
public:
869-
Parameters *parameters;
870-
VarArg varargs;
871-
872869
NewDeclaration *syntaxCopy(Dsymbol *);
873870
const char *kind() const;
874871
bool isVirtual() const;

dmd/expression.h

+2-1
Original file line numberDiff line numberDiff line change
@@ -784,6 +784,7 @@ class DotIdExp : public UnaExp
784784
Identifier *ident;
785785
bool noderef; // true if the result of the expression will never be dereferenced
786786
bool wantsym; // do not replace Symbol with its initializer during semantic()
787+
bool arrow; // ImportC: if -> instead of .
787788

788789
static DotIdExp *create(Loc loc, Expression *e, Identifier *ident);
789790
void accept(Visitor *v) { v->visit(this); }
@@ -1336,7 +1337,7 @@ class CondExp : public BinExp
13361337

13371338
class GenericExp : Expression
13381339
{
1339-
Expression cntlExp;
1340+
Expression *cntlExp;
13401341
Types *types;
13411342
Expressions *exps;
13421343

dmd/mtype.h

+1
Original file line numberDiff line numberDiff line change
@@ -583,6 +583,7 @@ struct ParameterList
583583
Parameters* parameters;
584584
StorageClass stc;
585585
VarArg varargs;
586+
bool hasIdentifierList; // true if C identifier-list style
586587

587588
size_t length();
588589
Parameter *operator[](size_t i) { return Parameter::getNth(parameters, i); }

dmd/root/outbuffer.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ struct OutBuffer
2222
DArray<unsigned char> data;
2323
d_size_t offset;
2424
bool notlinehead;
25-
void* fileMapping; // pointer to a file mapping object not used on the C++ side
25+
void *fileMapping; // pointer to a file mapping object not used on the C++ side
2626
public:
2727
bool doindent;
2828
bool spaces;

dmd/tokens.h

+1
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,7 @@ enum
191191
TOKarrow,
192192
TOKcolonColon,
193193
TOKwchar_tLiteral,
194+
TOKcompoundLiteral,
194195

195196
TOKinline,
196197
TOKregister,

0 commit comments

Comments
 (0)