GitLab

G++ supports a more limited version of designated initialisers.
Reorder fields to be in the right order.  Make nested initialisers
explicit.
Signed-off-by: Michael Hope <mlhx@google.com>