Commit 8672f5cb authored by Mark Andrews's avatar Mark Andrews

Merge branch '842-broken-build' into 'master'

rename struct members to avoid a name collision on BSD and MacOS

Closes #842

See merge request !1406
parents 64745bbc 995134ce
Pipeline #9113 passed with stages
in 54 seconds