From e7999f8450aca9c4c81e272470be438e6a183939 Mon Sep 17 00:00:00 2001 From: gingerBill Date: Fri, 3 Nov 2017 23:20:30 +0000 Subject: Foreign context cleanup --- src/check_type.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/check_type.cpp') 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 *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); -- cgit v1.2.3