Fix inconsistent clang-format behaviour on MacOS vs Ubuntu

[nycrat]

Description of the task

Since Ubuntu installs clang-format 14 and MacOS installs clang-format 20, there are several inconsistencies in formatting. These differences should ideally be resolved by either updating the clang-format version to be the same or with an alternative solution.

For example (the additions is clang-format 20):

Another example:

Acceptance criteria

• Running ./scripts/lint_and_format.sh results in the same results for formatting c++ code on MacOS and Ubuntu

Blocked By