From ffda895f95dec8b0cac9e0dee82426d65aa1d50c Mon Sep 17 00:00:00 2001 From: Jan Date: Wed, 4 Dec 2019 13:48:15 +0100 Subject: [PATCH] ZoneCodeGenerator: Fix being able to load strings for non const char pointers --- .../Generating/Templates/Loading/SinglePointer.stg | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/ZoneCodeGenerator/Generating/Templates/Loading/SinglePointer.stg b/src/ZoneCodeGenerator/Generating/Templates/Loading/SinglePointer.stg index a072d429..313688ea 100644 --- a/src/ZoneCodeGenerator/Generating/Templates/Loading/SinglePointer.stg +++ b/src/ZoneCodeGenerator/Generating/Templates/Loading/SinglePointer.stg @@ -45,7 +45,11 @@ if ($TypeVarName(structure)$->$member.Member.Name$$PrintArrayIndices(reference)$ >> LoadSinglePointer_String(context, structure, member, reference) ::= <% +$if(member.Member.VariableType.IsConst)$ varXString = &$TypeVarName(structure)$->$member.Member.Name$$PrintArrayIndices(reference)$;$\n$ +$else$ +varXString = const_cast(&$TypeVarName(structure)$->$member.Member.Name$$PrintArrayIndices(reference)$);$\n$ +$endif$ LoadXString(false); %>