From 2081c2f386661821dd010892fa515bb12e2d425b Mon Sep 17 00:00:00 2001 From: Tushar Maheshwari Date: Sun, 25 Sep 2016 16:02:47 +0530 Subject: [PATCH] Fix appveyor build for Windows x86 - platform should remain "Win32" for appveyor's scripts to execute successfully - Finding middle ground between clang and MSVC --- appveyor.yml | 2 +- deps.bat | 5 +++-- src/uvw/stream.hpp | 4 ++++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 8571cfc0..ab609f51 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -7,7 +7,7 @@ environment: BUILD_DIR: "%APPVEYOR_BUILD_FOLDER%/build" platform: - - x86 + - Win32 - x64 configuration: diff --git a/deps.bat b/deps.bat index bd95c021..6d53eb44 100644 --- a/deps.bat +++ b/deps.bat @@ -2,7 +2,8 @@ set SRC_DIR=%~dp0 -if not defined platform set platform=x86 +if not defined ARCH set ARCH=x86 +if defined platform if "%platform%"=="x64" set ARCH=x64 @rem init/update submodules cd %SRC_DIR% @@ -16,7 +17,7 @@ git submodule update --init cd %SRC_DIR%deps\libuv @rem the arguments to vcbuild make all the difference to further builds -call vcbuild.bat release %platform% shared +call vcbuild.bat release %ARCH% shared if "%msbuild_platform%"=="x64" ( set CMAKE_GENERATOR_NAME=Visual Studio 14 2015 Win64 diff --git a/src/uvw/stream.hpp b/src/uvw/stream.hpp index 9e5682c6..431423d5 100644 --- a/src/uvw/stream.hpp +++ b/src/uvw/stream.hpp @@ -171,9 +171,13 @@ class StreamHandle: public Handle { } protected: +#ifdef _WIN32 StreamHandle(std::shared_ptr ref) noexcept : Handle{std::move(ref)} { } +#else + using Handle::Handle; +#endif public: /**