[ci] Switch back to c++2a Okay I guess we can be bothered to fix things up for next version of C++. Reverts meat of c0b3b9b2584c6dcb5fc37e3b49e26fba718d0e6c