From d18302cb54d5ad000495b3f6a72eae303a39e4e6 Mon Sep 17 00:00:00 2001 From: Shane Grant Date: Sun, 3 Nov 2019 21:21:44 -0800 Subject: [PATCH] Add MSVC 2019 to build, default ctor for static object relates #592 --- appveyor.yml | 13 +++++++++---- include/cereal/details/static_object.hpp | 3 ++- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 5371cd479..1e62961ad 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,5 +1,5 @@ # can use variables like {build} and {branch} -version: 1.2.{build} +version: 1.3.{build} pull_requests: do_not_increment_build_number: true @@ -22,9 +22,14 @@ environment: - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 VS_VERSION_MAJOR: 15 BOOST_ROOT: C:\Libraries\boost_1_66_0 - # - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 Preview - # VS_VERSION_MAJOR: 16 - # BOOST_ROOT: C:\Libraries\boost_1_66_0 + - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 + VS_VERSION_MAJOR: 16 + BOOST_ROOT: C:\Libraries\boost_1_71_0 + +matrix: + exclude: + - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 + - platform: Win32 platform: - Win32 diff --git a/include/cereal/details/static_object.hpp b/include/cereal/details/static_object.hpp index cd30348c3..470a792e0 100644 --- a/include/cereal/details/static_object.hpp +++ b/include/cereal/details/static_object.hpp @@ -94,7 +94,8 @@ namespace cereal std::unique_lock lock; #else public: - LockGuard(LockGuard const &) = default; // prevents implicit copy ctor warning + LockGuard() = default; + LockGuard(LockGuard const &) = default; // prevents implicit copy ctor warning ~LockGuard() CEREAL_NOEXCEPT {} // prevents variable not used #endif };