Merge branch 'gcc-7-fix' into 'master'

Fixed Build on gcc-7.2

See merge request !143
24 jobs for master in 41 minutes and 39 seconds (queued for 1 second)
Status Job ID Name Coverage
  Test
passed #36105
Linux
Doc-publish

00:00:26

passed #36099
VS2013
VS2013-32-bit-shared-apps

00:05:08

passed #36100
VS2013
VS2013-32-bit-shared-no-apps

00:03:34

passed #36103
VS2013
VS2013-32-bit-static-apps

00:04:32

passed #36104
VS2013
VS2013-32-bit-static-no-apps

00:04:00

passed #36097
VS2013
VS2013-64-bit-shared-apps

00:05:11

passed #36098
VS2013
VS2013-64-bit-shared-no-apps

00:04:10

passed #36101
VS2013
VS2013-64-bit-static-apps

00:05:08

passed #36102
VS2013
VS2013-64-bit-static-no-apps

00:04:23

passed #36091
VS2015
VS2015-32-bit-shared-apps

00:06:17

passed #36092
VS2015
VS2015-32-bit-shared-no-apps

00:04:59

passed #36095
VS2015
VS2015-32-bit-static-apps

00:05:41

passed #36096
VS2015
VS2015-32-bit-static-no-apps

00:05:06

passed #36089
VS2015
VS2015-64-bit-shared-apps

00:06:34

passed #36090
VS2015
VS2015-64-bit-shared-no-apps

00:05:19

passed #36093
VS2015
VS2015-64-bit-static-apps

00:07:08

passed #36094
VS2015
VS2015-64-bit-static-no-apps

00:05:35

passed #36083
Linux
clang-c++11

00:28:00

passed #36085
Linux
clang-c++14

00:29:07

passed #36088
Linux
cppcheck

00:02:00

passed #36082
Linux
gcc-c++11

00:04:40

passed #36084
Linux
gcc-c++14

00:04:42

passed #36086
Apple
macos-c++11

00:09:43

passed #36087
Apple
macos-c++98

00:09:50