diff options
| author | gingerBill <bill@gingerbill.org> | 2017-11-03 23:20:30 +0000 |
|---|---|---|
| committer | gingerBill <bill@gingerbill.org> | 2017-11-03 23:20:30 +0000 |
| commit | e7999f8450aca9c4c81e272470be438e6a183939 (patch) | |
| tree | 8fdce22138c0e317b12e1c6b00fbedb3ba06f06a /src/check_type.cpp | |
| parent | 0b29e42adb1a9eebec6c5ecc630be91a41af07f1 (diff) | |
Foreign context cleanup
Diffstat (limited to 'src/check_type.cpp')
| -rw-r--r-- | src/check_type.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/check_type.cpp b/src/check_type.cpp index b2536e685..2d881fbe0 100644 --- a/src/check_type.cpp +++ b/src/check_type.cpp @@ -82,7 +82,7 @@ void check_struct_field_decl(Checker *c, AstNode *decl, Array<Entity *> *fields, if (!vd->is_mutable) return; - bool is_using = (vd->flags&VarDeclFlag_using) != 0; + bool is_using = vd->is_using; if (is_using && vd->names.count > 1) { error(vd->names[0], "Cannot apply `using` to more than one of the same type"); @@ -1891,8 +1891,8 @@ bool check_procedure_type(Checker *c, Type *type, AstNode *proc_type_node, Array ProcCallingConvention cc = pt->calling_convention; if (cc == ProcCC_ForeignBlockDefault) { cc = ProcCC_CDecl; - if (c->context.default_foreign_cc > 0) { - cc = c->context.default_foreign_cc; + if (c->context.foreign_context.default_cc > 0) { + cc = c->context.foreign_context.default_cc; } } GB_ASSERT(cc > 0); |