Make MSVC and Clang happy.
Make MSVC and Clang happy.

... and ClangFormat too while we are at it!

cellml/libcellml,hsorby/libcellml,hsorby/libcellml,nickerso/libcellml,nickerso/libcellml,cellml/libcellml,nickerso/libcellml,hsorby/libcellml,cellml/libcellml,cellml/libcellml,hsorby/libcellml,nickerso/libcellml