- writer.outputline(y.getType().getGenerateType() + " " + y.getSafeSymbol() + " = (" + y.getType().getGenerateType() + ") " + x.getSafeSymbol() + "_iterator.next();");
- // #ATTN#: key is called second because next() forwards ptr and key does not!
- writer.outputline(x.getType().getGenerateType() + " " + x.getSafeSymbol() + " = (" + x.getType().getGenerateType() + ") " + x.getSafeSymbol() + "_iterator.key();");
+ writer.addDeclaration(y.getType().getGenerateType().toString(), y.getSafeSymbol());
+ writer.outputline(y.getSafeSymbol() + " = (" + y.getType().getGenerateType() + ") next(&"+x.getSafeSymbol()+"_iterator);");
+ // #ATTN#: key is called second because next() forwards ptr and key does not!
+ writer.addDeclaration(x.getType().getGenerateType().toString(), x.getSafeSymbol());
+ writer.outputline(x.getSafeSymbol() + " = (" + x.getType().getGenerateType() + ") key(&"+x.getSafeSymbol()+"_iterator);");