diff --git a/CHANGELOG.md b/CHANGELOG.md index f81dd623..4e3f0d32 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ Version 226: * make_strand is in net:: * Fix HTTP parser static string calculation * Move parser definitions to .ipp +* Appveyor uses msvc-14.0 -------------------------------------------------------------------------------- diff --git a/Jamfile b/Jamfile index 46c00a29..56994a53 100644 --- a/Jamfile +++ b/Jamfile @@ -103,6 +103,7 @@ project /boost/beast BOOST_COROUTINES_NO_DEPRECATION_WARNING=1 msvc:"/bigobj" msvc-14.1:"/permissive-" + msvc-14.2:"/permissive-" msvc:_SCL_SECURE_NO_WARNINGS=1 msvc:_CRT_SECURE_NO_WARNINGS=1 msvc:_SILENCE_CXX17_ALLOCATOR_VOID_DEPRECATION_WARNING diff --git a/appveyor.yml b/appveyor.yml index 4e3d9275..12bde12c 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -103,8 +103,8 @@ install: build: off test_script: - - b2 variant=release cxxstd=11 address-model=64 libs/beast/example - - b2 variant=release cxxstd=11 address-model=64 --verbose-test libs/beast/test//run-fat-tests + - b2 variant=release cxxstd=11 address-model=64 toolset=msvc-14.0 libs/beast/example + - b2 variant=release cxxstd=11 address-model=64 toolset=msvc-14.0 --verbose-test libs/beast/test//run-fat-tests cache: - c:\tools\vcpkg\installed\