Skip to content

Commit ebe8767

Browse files
author
Stanislav Fomichev
committed
ynl-gen-cpp: don't use c-style initializers for ynl_ntf_info
More strict/old compilers do not like them: error: designator order for field ‘ynl_ntf_info::policy’ does not match declaration order in ‘ynl_ntf_info’ Signed-off-by: Stanislav Fomichev <stfomichev@gmail.com>
1 parent 69464b7 commit ebe8767

File tree

1 file changed

+5
-7
lines changed

1 file changed

+5
-7
lines changed

ynl-gen-cpp.py

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1563,7 +1563,7 @@ def put_typol(cw, struct):
15631563
cw.nl()
15641564

15651565
cw.block_start(line=f"struct ynl_policy_nest {struct.render_name}_nest =")
1566-
cw.p(f".max_attr = {type_max},")
1566+
cw.p(f".max_attr = static_cast<unsigned int>({type_max}),")
15671567
cw.p(f".table = {struct.render_name}_policy.data(),")
15681568
cw.block_end(line=";")
15691569
cw.nl()
@@ -2082,12 +2082,10 @@ def policy_should_be_static(family):
20822082

20832083

20842084
def _render_user_ntf_entry(ri, op):
2085-
ri.cw.block_start(line=f"arr[{op.enum_name}] = ")
2086-
# ri.cw.p(f".alloc_sz\t= sizeof({type_name(ri, 'event')}),")
2087-
ri.cw.p(f".cb\t\t= {op_prefix(ri, 'reply', deref=True)}_parse,")
2088-
ri.cw.p(f".policy\t\t= &{ri.struct['reply'].render_name}_nest,")
2089-
# ri.cw.p(f".free\t\t= (void *){op_prefix(ri, 'notify')}_free,")
2090-
ri.cw.block_end(line=";")
2085+
ri.cw.p(f"arr[{op.enum_name}].policy\t\t= &{ri.struct['reply'].render_name}_nest;")
2086+
ri.cw.p(f"arr[{op.enum_name}].cb\t\t= {op_prefix(ri, 'reply', deref=True)}_parse;")
2087+
# ri.cw.p(f"arr[{op.enum_name}].alloc_sz\t= sizeof({type_name(ri, 'event')});")
2088+
# ri.cw.p(f"arr[{op.enum_name}].free\t\t= (void *){op_prefix(ri, 'notify')}_free;")
20912089

20922090

20932091
def render_user_family(family, cw, prototype):

0 commit comments

Comments
 (0)