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(
613613 " return ret;\n " +
614614 "}\n " ,
615615 propertyName ,
616- generateStringViewNotPresentCondition (token .version ()),
616+ generateStringViewNotPresentCondition (token .version (), outermostStruct ),
617617 lengthOfLengthField ,
618618 lengthCType ,
619619 structName ,
@@ -1032,7 +1032,9 @@ private static CharSequence generateArrayFieldNotPresentCondition(final int sinc
10321032 sinceVersion );
10331033 }
10341034
1035- private static CharSequence generateStringViewNotPresentCondition (final int sinceVersion )
1035+ private static CharSequence generateStringViewNotPresentCondition (
1036+ final int sinceVersion ,
1037+ final String outermostStruct )
10361038 {
10371039 if (0 == sinceVersion )
10381040 {
@@ -1042,9 +1044,11 @@ private static CharSequence generateStringViewNotPresentCondition(final int sinc
10421044 return String .format (
10431045 " if (codec->acting_version < %1$d)\n " +
10441046 " {\n " +
1045- " return { NULL, 0 };\n " +
1047+ " struct %2$s_string_view ret = { NULL, 0 };\n " +
1048+ " return ret;\n " +
10461049 " }\n \n " ,
1047- sinceVersion );
1050+ sinceVersion ,
1051+ outermostStruct );
10481052 }
10491053
10501054 private static CharSequence generateTypeFieldNotPresentCondition (final int sinceVersion )
You can’t perform that action at this time.
0 commit comments