From f2e49a0ed57063cd6bc8a384203a797a47edd824 Mon Sep 17 00:00:00 2001
From: sigman <sigman78@gmail.com>
Date: Sat, 10 Jun 2017 17:18:24 +0300
Subject: [PATCH 1/2] [appveyor] Add vs2017 to the build images

---
 package/ci/appveyor-desktop-gles.bat | 2 +-
 package/ci/appveyor-desktop.bat      | 2 +-
 package/ci/appveyor-rt.bat           | 2 +-
 package/ci/appveyor.yml              | 4 +++-
 4 files changed, 6 insertions(+), 4 deletions(-)

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:

From 9c5a53167a0f24f578472cc8e28fc00b0d9661c1 Mon Sep 17 00:00:00 2001
From: sigman <sigman78@gmail.com>
Date: Mon, 12 Jun 2017 15:36:04 +0300
Subject: [PATCH 2/2] Fix vs2017 build

---
 src/Magnum/Math/Algorithms/Test/KahanSumTest.cpp | 1 +
 src/Magnum/Math/Test/DualTest.cpp                | 2 ++
 src/MagnumPlugins/MagnumFont/MagnumFont.cpp      | 2 +-
 3 files changed, 4 insertions(+), 1 deletion(-)

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<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++() {
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<Dual, Float, Float>::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<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;