File tree Expand file tree Collapse file tree 1 file changed +8
-4
lines changed
sbe-tool/src/main/java/uk/co/real_logic/sbe/generation/c Expand file tree Collapse file tree 1 file changed +8
-4
lines changed Original file line number Diff line number Diff line change @@ -613,7 +613,7 @@ private CharSequence generateVarData(
613
613
" return ret;\n " +
614
614
"}\n " ,
615
615
propertyName ,
616
- generateStringViewNotPresentCondition (token .version ()),
616
+ generateStringViewNotPresentCondition (token .version (), outermostStruct ),
617
617
lengthOfLengthField ,
618
618
lengthCType ,
619
619
structName ,
@@ -1032,7 +1032,9 @@ private static CharSequence generateArrayFieldNotPresentCondition(final int sinc
1032
1032
sinceVersion );
1033
1033
}
1034
1034
1035
- private static CharSequence generateStringViewNotPresentCondition (final int sinceVersion )
1035
+ private static CharSequence generateStringViewNotPresentCondition (
1036
+ final int sinceVersion ,
1037
+ final String outermostStruct )
1036
1038
{
1037
1039
if (0 == sinceVersion )
1038
1040
{
@@ -1042,9 +1044,11 @@ private static CharSequence generateStringViewNotPresentCondition(final int sinc
1042
1044
return String .format (
1043
1045
" if (codec->acting_version < %1$d)\n " +
1044
1046
" {\n " +
1045
- " return { NULL, 0 };\n " +
1047
+ " struct %2$s_string_view ret = { NULL, 0 };\n " +
1048
+ " return ret;\n " +
1046
1049
" }\n \n " ,
1047
- sinceVersion );
1050
+ sinceVersion ,
1051
+ outermostStruct );
1048
1052
}
1049
1053
1050
1054
private static CharSequence generateTypeFieldNotPresentCondition (final int sinceVersion )
You can’t perform that action at this time.
0 commit comments