From 1552d36d7a44355a0f0fe7491aefa84737f8cae6 Mon Sep 17 00:00:00 2001 From: Jason Turner Date: Wed, 14 Jan 2015 20:01:32 -0700 Subject: [PATCH 1/2] Fix spelling of ANALYZE to analyze --- .decent_ci-Windows.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.decent_ci-Windows.yaml b/.decent_ci-Windows.yaml index 69fee14..f1d4865 100644 --- a/.decent_ci-Windows.yaml +++ b/.decent_ci-Windows.yaml @@ -2,21 +2,21 @@ compilers: - name: Visual Studio version: 14 cmake_extra_flags: -DBUILD_SAMPLES:BOOL=ON -DBUILD_PACKAGE:BOOL=ON -DBUILD_TESTING:BOOL=ON -DCOMMIT_SHA=%COMMIT_SHA% - compiler_extra_flags: /ANALYZE + compiler_extra_flags: /analyze skip_packaging: true - name: Visual Studio version: 14 architecture: Win64 cmake_extra_flags: -DBUILD_SAMPLES:BOOL=ON -DBUILD_PACKAGE:BOOL=ON -DBUILD_TESTING:BOOL=ON -DCOMMIT_SHA=%COMMIT_SHA% - compiler_extra_flags: /ANALYZE + compiler_extra_flags: /analyze skip_packaging: true - name: Visual Studio version: 12 cmake_extra_flags: -DBUILD_SAMPLES:BOOL=ON -DBUILD_PACKAGE:BOOL=ON -DBUILD_TESTING:BOOL=ON -DCOMMIT_SHA=%COMMIT_SHA% - compiler_extra_flags: /ANALYZE + compiler_extra_flags: /analyze - name: Visual Studio version: 12 architecture: Win64 cmake_extra_flags: -DBUILD_SAMPLES:BOOL=ON -DBUILD_PACKAGE:BOOL=ON -DBUILD_TESTING:BOOL=ON -DCOMMIT_SHA=%COMMIT_SHA% - compiler_extra_flags: /ANALYZE + compiler_extra_flags: /analyze From 5b6e6042f33b8804ea00b297833b4a77d86b9407 Mon Sep 17 00:00:00 2001 From: Jason Turner Date: Wed, 14 Jan 2015 20:41:41 -0700 Subject: [PATCH 2/2] Work around MSVC 2014 issue with future have to wrap std::future::valid in a lambda due to noexcept?! --- include/chaiscript/dispatchkit/bootstrap_stl.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/chaiscript/dispatchkit/bootstrap_stl.hpp b/include/chaiscript/dispatchkit/bootstrap_stl.hpp index b3be6fc..dc27fe1 100644 --- a/include/chaiscript/dispatchkit/bootstrap_stl.hpp +++ b/include/chaiscript/dispatchkit/bootstrap_stl.hpp @@ -574,7 +574,7 @@ namespace chaiscript { m->add(user_type(), type); - m->add(fun(&FutureType::valid), "valid"); + m->add(fun([](const FutureType &t) { return t.valid(); }), "valid"); m->add(fun(&FutureType::get), "get"); m->add(fun(&FutureType::wait), "wait");