diff --git a/package/ci/appveyor-desktop-gles.bat b/package/ci/appveyor-desktop-gles.bat index 755cb6397..80d7b6e49 100644 --- a/package/ci/appveyor-desktop-gles.bat +++ b/package/ci/appveyor-desktop-gles.bat @@ -1,4 +1,4 @@ -call "C:/Program Files (x86)/Microsoft Visual Studio 14.0/VC/vcvarsall.bat" x64 || exit /b +call "C:/Program Files (x86)/Microsoft Visual Studio/2017/Community/VC/Auxiliary/Build/vcvarsall.bat" x64 || call "C:/Program Files (x86)/Microsoft Visual Studio 14.0/VC/vcvarsall.bat" x64 || exit /b set PATH=%APPVEYOR_BUILD_FOLDER%/openal/bin/Win64;%APPVEYOR_BUILD_FOLDER%\deps\bin;%PATH% rem Build Corrade diff --git a/package/ci/appveyor-desktop.bat b/package/ci/appveyor-desktop.bat index f377c182e..5c0c48b5d 100644 --- a/package/ci/appveyor-desktop.bat +++ b/package/ci/appveyor-desktop.bat @@ -1,4 +1,4 @@ -call "C:/Program Files (x86)/Microsoft Visual Studio 14.0/VC/vcvarsall.bat" x64 || exit /b +call "C:/Program Files (x86)/Microsoft Visual Studio/2017/Community/VC/Auxiliary/Build/vcvarsall.bat" x64 || call "C:/Program Files (x86)/Microsoft Visual Studio 14.0/VC/vcvarsall.bat" x64 || exit /b set PATH=%APPVEYOR_BUILD_FOLDER%/openal/bin/Win64;%APPVEYOR_BUILD_FOLDER%\deps\bin;%PATH% rem Build Corrade diff --git a/package/ci/appveyor-rt.bat b/package/ci/appveyor-rt.bat index 760f1d64f..35f49b90c 100644 --- a/package/ci/appveyor-rt.bat +++ b/package/ci/appveyor-rt.bat @@ -1,4 +1,4 @@ -call "C:/Program Files (x86)/Microsoft Visual Studio 14.0/VC/vcvarsall.bat" x64 || exit /b +call "C:/Program Files (x86)/Microsoft Visual Studio/2017/Community/VC/Auxiliary/Build/vcvarsall.bat" x64 || call "C:/Program Files (x86)/Microsoft Visual Studio 14.0/VC/vcvarsall.bat" x64 || exit /b set PATH=%APPVEYOR_BUILD_FOLDER%\deps-native\bin;%PATH% rem Build ANGLE diff --git a/package/ci/appveyor.yml b/package/ci/appveyor.yml index e37407c20..a922b7cb1 100644 --- a/package/ci/appveyor.yml +++ b/package/ci/appveyor.yml @@ -2,7 +2,9 @@ clone_depth: 1 -os: Visual Studio 2015 +image: +- Visual Studio 2015 +- Visual Studio 2017 environment: matrix: diff --git a/src/Magnum/Math/Algorithms/Test/KahanSumTest.cpp b/src/Magnum/Math/Algorithms/Test/KahanSumTest.cpp index d2126037f..f23f8202e 100644 --- a/src/Magnum/Math/Algorithms/Test/KahanSumTest.cpp +++ b/src/Magnum/Math/Algorithms/Test/KahanSumTest.cpp @@ -68,6 +68,7 @@ template struct Iterator { explicit Iterator(T value, std::size_t i = 0): _value{value}, _i{i} {} + bool operator==(const Iterator& other) const { return _i == other._i; } bool operator!=(const Iterator& other) const { return _i != other._i; } Iterator& operator++() { diff --git a/src/Magnum/Math/Test/DualTest.cpp b/src/Magnum/Math/Test/DualTest.cpp index fab2a6dfe..05da3e60a 100644 --- a/src/Magnum/Math/Test/DualTest.cpp +++ b/src/Magnum/Math/Test/DualTest.cpp @@ -106,9 +106,11 @@ void DualTest::construct() { CORRADE_COMPARE(b, 2.0f); CORRADE_COMPARE(c, -7.5f); +#if !defined(_MSC_VER) || (_MSC_VER > 1910) constexpr Dual d(3.0f); CORRADE_COMPARE(d.real(), 3.0f); CORRADE_COMPARE(d.dual(), 0.0f); +#endif CORRADE_VERIFY((std::is_nothrow_constructible::value)); } diff --git a/src/MagnumPlugins/MagnumFont/MagnumFont.cpp b/src/MagnumPlugins/MagnumFont/MagnumFont.cpp index f7aaacd4f..df35dc8f0 100644 --- a/src/MagnumPlugins/MagnumFont/MagnumFont.cpp +++ b/src/MagnumPlugins/MagnumFont/MagnumFont.cpp @@ -76,7 +76,7 @@ auto MagnumFont::doOpenData(const std::vector