diff options
| author | David Lönnhager <david.l@mullvad.net> | 2020-08-10 13:26:35 +0200 |
|---|---|---|
| committer | David Lönnhager <david.l@mullvad.net> | 2020-08-10 13:26:35 +0200 |
| commit | d20d34aaf8381f9b636a07b496ae37f467734472 (patch) | |
| tree | 64bba7d9be4a726382756e0ae74034883b867aab | |
| parent | 502d93565fe8dad97117b0e01e3ddf9e4d67474e (diff) | |
| parent | d83b63aec0d626d8aadf741bf6ae2edbec71ddf7 (diff) | |
| download | mullvadvpn-d20d34aaf8381f9b636a07b496ae37f467734472.tar.xz mullvadvpn-d20d34aaf8381f9b636a07b496ae37f467734472.zip | |
Merge branch 'fix-nsis-fail'
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | windows/nsis-plugins/src/tray/trayparser.cpp | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index b7eb48178b..d272e56117 100644 --- a/.travis.yml +++ b/.travis.yml @@ -141,7 +141,7 @@ matrix: before_install: &rust_windows_before_install - curl -s https://download.visualstudio.microsoft.com/download/pr/57d28351-e762-4ee1-aca4-16b6d3faaa33/34fa4c9bb790f310c908ff59071949289dc3ed503bcb44723c2e0b360c51ebab/vs_BuildTools.exe --output vs_BuildTools.exe - echo "34fa4c9bb790f310c908ff59071949289dc3ed503bcb44723c2e0b360c51ebab vs_BuildTools.exe" | sha256sum -c - - ./vs_BuildTools.exe --wait -q --norestart --add Microsoft.VisualStudio.Workload.VCTools\;includeRecommended --add Microsoft.Component.MSBuild --add Microsoft.VisualStudio.Component.VC.ATL + - ./vs_BuildTools.exe --wait -q --norestart --add Microsoft.VisualStudio.Workload.VCTools\;includeRecommended --add Microsoft.Component.MSBuild - git submodule update --init # Installing Go - curl -s https://dl.google.com/go/go1.13.6.windows-amd64.msi --output go-installer.msi diff --git a/windows/nsis-plugins/src/tray/trayparser.cpp b/windows/nsis-plugins/src/tray/trayparser.cpp index a2c454e046..6efff0b2f0 100644 --- a/windows/nsis-plugins/src/tray/trayparser.cpp +++ b/windows/nsis-plugins/src/tray/trayparser.cpp @@ -1,6 +1,7 @@ #include "stdafx.h" #include "trayparser.h" #include <libcommon/error.h> +#include <iterator> #include <algorithm> TrayParser::TrayParser(const std::vector<uint8_t> &blob) |