fix errors for old mac os gcc
Merge branch 'master' of https://github.com/MEPP-team/MEPP