Merge 9c5a53167a into f1f34df6a0

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

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

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

package/ci/appveyor.yml

@@ -2,7 +2,9 @@
 
 clone_depth: 1
 
-os: Visual Studio 2015
+image: 
+- Visual Studio 2015
+- Visual Studio 2017
 
 environment:
   matrix:

src/Magnum/Math/Algorithms/Test/KahanSumTest.cpp

@@ -68,6 +68,7 @@ template<class T> 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++() {

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<Dual, Float, Float>::value));
 }

src/MagnumPlugins/MagnumFont/MagnumFont.cpp

@@ -76,7 +76,7 @@ auto MagnumFont::doOpenData(const std::vector<std::pair<std::string, Containers:
     }
 
     /* Open the configuration file */
-    std::istringstream in({data[0].second.begin(), data[0].second.size()});
+    std::istringstream in(std::string{data[0].second.begin(), data[0].second.size()});
     Utility::Configuration conf(in, Utility::Configuration::Flag::SkipComments);
     if(!conf.isValid() || conf.isEmpty()) {
         Error() << "Text::MagnumFont::openData(): cannot open file" << data[0].first;