diff options
| author | Ash Wolf <ninji@wuffs.org> | 2023-01-15 12:14:05 +0000 |
|---|---|---|
| committer | Ash Wolf <ninji@wuffs.org> | 2023-01-15 12:14:05 +0000 |
| commit | 35d488e972a9dd75ce3867c000405f128b79c615 (patch) | |
| tree | e3319a23d9aa0d4725f88a99fdd5131488a334a9 /compiler_and_linker/unsorted/CTemplateClass.c | |
| parent | 8078e7f897aaae9b492b22475060052d68b9c547 (diff) | |
| download | MWCC-35d488e972a9dd75ce3867c000405f128b79c615.tar.gz MWCC-35d488e972a9dd75ce3867c000405f128b79c615.zip | |
reorganise things a bit to align further with the actual names/structure
Diffstat (limited to 'compiler_and_linker/unsorted/CTemplateClass.c')
| -rw-r--r-- | compiler_and_linker/unsorted/CTemplateClass.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/compiler_and_linker/unsorted/CTemplateClass.c b/compiler_and_linker/unsorted/CTemplateClass.c index e180159..45d07b8 100644 --- a/compiler_and_linker/unsorted/CTemplateClass.c +++ b/compiler_and_linker/unsorted/CTemplateClass.c @@ -281,7 +281,7 @@ TemplateMember *CTemplClass_DefineMember(TemplClass *tmclass, Object *object, Fi static void CTemplClass_ParseBody(TemplClass *templ, short mode, SInt32 *offset) { DeclInfo di; - templ->align = copts.align_mode; + templ->align = copts.structalignment; memclrw(&di, sizeof(di)); di.file = CPrep_BrowserCurrentFile(); @@ -794,7 +794,7 @@ TemplClass *CTemplClass_DefineNestedClass(TemplClass *parent, HashNameNode *name CDecl_DefineClass(parent->theclass.nspace, name, TYPE_CLASS(templ), mode, 0, 1); templ->theclass.flags = CLASS_FLAGS_100; - templ->align = copts.align_mode; + templ->align = copts.structalignment; action = galloc(sizeof(TemplateAction)); memclrw(action, sizeof(TemplateAction)); @@ -1614,10 +1614,10 @@ Boolean CTempl_InstantiateTemplateClass(TypeClass *tclass) { declE.x8 = templ->lex_order_count; declE.xC = templ->flags & TEMPLCLASS_FLAGS_1; - saveAlignMode = copts.align_mode; - copts.align_mode = templ->align; + saveAlignMode = copts.structalignment; + copts.structalignment = templ->align; CDecl_CompleteClass(&declE, TYPE_CLASS(inst)); - copts.align_mode = saveAlignMode; + copts.structalignment = saveAlignMode; if (templ->theclass.align > inst->theclass.align) { inst->theclass.align = templ->theclass.align; |